Skip to content

Commit 9eed566

Browse files
KKulmaKKulma
authored
Merge pull request #28 from KKulma/dev
Dev
2 parents 0e0d050 + 15d65fd commit 9eed566

26 files changed

+3268
-101
lines changed

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
* text=auto
2+
tests/fixtures/**/* -diff

‎DESCRIPTION

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@ Suggests:
3131
knitr,
3232
rmarkdown,
3333
testthat (>= 2.1.0),
34-
covr
34+
covr,
35+
vcr
3536
VignetteBuilder: knitr

‎R/utils.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ get_data <- function(call) {
1111
}
1212

1313
if (response$status_code != 200) {
14-
stop(paste0("ERROR: The status call is ", response$status_code))
14+
stop(paste0("ERROR: API request failed; status call is ", response$status_code))
1515
}
1616

1717
response_content <-

‎renv.lock

Lines changed: 84 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@
3030
"Repository": "CRAN",
3131
"Hash": "e8a22846fff485f0be3770c2da758713"
3232
},
33-
"assertthat": {
34-
"Package": "assertthat",
35-
"Version": "0.2.1",
36-
"Source": "Repository",
37-
"Repository": "CRAN",
38-
"Hash": "50c838a310445e954bc13f26f26a6ecf"
39-
},
4033
"base64enc": {
4134
"Package": "base64enc",
4235
"Version": "0.1-3",
@@ -53,17 +46,17 @@
5346
},
5447
"callr": {
5548
"Package": "callr",
56-
"Version": "3.5.1",
49+
"Version": "3.7.0",
5750
"Source": "Repository",
5851
"Repository": "CRAN",
59-
"Hash": "b7d7f1e926dfcd57c74ce93f5c048e80"
52+
"Hash": "461aa75a11ce2400245190ef5d3995df"
6053
},
6154
"cli": {
6255
"Package": "cli",
63-
"Version": "2.2.0",
56+
"Version": "2.5.0",
6457
"Source": "Repository",
6558
"Repository": "CRAN",
66-
"Hash": "3ef298932294b775fa0a3eeaa3a645b0"
59+
"Hash": "a94ba44cee3ea571e813721e64184172"
6760
},
6861
"cpp11": {
6962
"Package": "cpp11",
@@ -79,6 +72,13 @@
7972
"Repository": "CRAN",
8073
"Hash": "0d57bc8e27b7ba9e45dba825ebc0de6b"
8174
},
75+
"crul": {
76+
"Package": "crul",
77+
"Version": "1.1.0",
78+
"Source": "Repository",
79+
"Repository": "CRAN",
80+
"Hash": "345d571cc120a54c91ac952c6da4392e"
81+
},
8282
"curl": {
8383
"Package": "curl",
8484
"Version": "4.3",
@@ -88,10 +88,10 @@
8888
},
8989
"desc": {
9090
"Package": "desc",
91-
"Version": "1.2.0",
91+
"Version": "1.3.0",
9292
"Source": "Repository",
9393
"Repository": "CRAN",
94-
"Hash": "6c8fe8fa26a23b79949375d372c7b395"
94+
"Hash": "b6963166f7f10b970af1006c462ce6cd"
9595
},
9696
"diffobj": {
9797
"Package": "diffobj",
@@ -135,6 +135,13 @@
135135
"Repository": "CRAN",
136136
"Hash": "7fce217eaaf8016e72065e85c73027b5"
137137
},
138+
"fauxpas": {
139+
"Package": "fauxpas",
140+
"Version": "0.5.0",
141+
"Source": "Repository",
142+
"Repository": "CRAN",
143+
"Hash": "4a92318a9d58a8e66b7d0689db3157b5"
144+
},
138145
"generics": {
139146
"Package": "generics",
140147
"Version": "0.1.0",
@@ -158,10 +165,17 @@
158165
},
159166
"htmltools": {
160167
"Package": "htmltools",
161-
"Version": "0.5.0",
168+
"Version": "0.5.1.1",
169+
"Source": "Repository",
170+
"Repository": "CRAN",
171+
"Hash": "af2c2531e55df5cf230c4b5444fc973c"
172+
},
173+
"httpcode": {
174+
"Package": "httpcode",
175+
"Version": "0.3.0",
162176
"Source": "Repository",
163177
"Repository": "CRAN",
164-
"Hash": "7d651b7131794fe007b1ad6f21aaa401"
178+
"Hash": "13641a1c6d2cc98801b76764078e17ea"
165179
},
166180
"httr": {
167181
"Package": "httr",
@@ -179,17 +193,17 @@
179193
},
180194
"knitr": {
181195
"Package": "knitr",
182-
"Version": "1.30",
196+
"Version": "1.33",
183197
"Source": "Repository",
184198
"Repository": "CRAN",
185-
"Hash": "eed7ee0d02eee88d53881cdc92457c62"
199+
"Hash": "0bc1b5da1b0eb07cd4b727e95e9ff0b8"
186200
},
187201
"lifecycle": {
188202
"Package": "lifecycle",
189-
"Version": "0.2.0",
203+
"Version": "1.0.0",
190204
"Source": "Repository",
191205
"Repository": "CRAN",
192-
"Hash": "361811f31f71f8a617a9a68bf63f1f42"
206+
"Hash": "3471fb65971f1a7b2d4ae7848cf2db8d"
193207
},
194208
"lubridate": {
195209
"Package": "lubridate",
@@ -233,13 +247,6 @@
233247
"Repository": "CRAN",
234248
"Hash": "3b3dd89b2ee115a8b54e93a34cd546b4"
235249
},
236-
"pkgbuild": {
237-
"Package": "pkgbuild",
238-
"Version": "1.1.0",
239-
"Source": "Repository",
240-
"Repository": "CRAN",
241-
"Hash": "404684bc4e3685007f9720adf13b06c1"
242-
},
243250
"pkgconfig": {
244251
"Package": "pkgconfig",
245252
"Version": "2.0.3",
@@ -249,10 +256,10 @@
249256
},
250257
"pkgload": {
251258
"Package": "pkgload",
252-
"Version": "1.1.0",
259+
"Version": "1.2.1",
253260
"Source": "Repository",
254261
"Repository": "CRAN",
255-
"Hash": "b6b150cd4709e0c0c9b5d51ac4376282"
262+
"Hash": "463642747f81879e6752485aefb831cf"
256263
},
257264
"praise": {
258265
"Package": "praise",
@@ -261,19 +268,12 @@
261268
"Repository": "CRAN",
262269
"Hash": "a555924add98c99d2f411e37e7d25e9f"
263270
},
264-
"prettyunits": {
265-
"Package": "prettyunits",
266-
"Version": "1.1.1",
267-
"Source": "Repository",
268-
"Repository": "CRAN",
269-
"Hash": "95ef9167b75dde9d2ccc3c7528393e7e"
270-
},
271271
"processx": {
272272
"Package": "processx",
273-
"Version": "3.4.5",
273+
"Version": "3.5.2",
274274
"Source": "Repository",
275275
"Repository": "CRAN",
276-
"Hash": "22aab6098cb14edd0a5973a8438b569b"
276+
"Hash": "0cbca2bc4d16525d009c4dbba156b37c"
277277
},
278278
"ps": {
279279
"Package": "ps",
@@ -305,17 +305,17 @@
305305
},
306306
"rlang": {
307307
"Package": "rlang",
308-
"Version": "0.4.9",
308+
"Version": "0.4.10",
309309
"Source": "Repository",
310310
"Repository": "CRAN",
311-
"Hash": "9d7aba7bed9a79e2403b4777428a2b12"
311+
"Hash": "599df23c40a4fce9c7b4764f28c37857"
312312
},
313313
"rmarkdown": {
314314
"Package": "rmarkdown",
315-
"Version": "2.5",
315+
"Version": "2.7",
316316
"Source": "Repository",
317317
"Repository": "CRAN",
318-
"Hash": "20a0a94af9e8f7040510447763aab3e9"
318+
"Hash": "edbf4cb1aefae783fd8d3a008ae51943"
319319
},
320320
"rprojroot": {
321321
"Package": "rprojroot",
@@ -354,10 +354,10 @@
354354
},
355355
"testthat": {
356356
"Package": "testthat",
357-
"Version": "3.0.0",
357+
"Version": "3.0.2",
358358
"Source": "Repository",
359359
"Repository": "CRAN",
360-
"Hash": "13298cedd051cb7b8a8972d380b559a6"
360+
"Hash": "495e0434d9305716b6a87031570ce109"
361361
},
362362
"tibble": {
363363
"Package": "tibble",
@@ -387,13 +387,34 @@
387387
"Repository": "CRAN",
388388
"Hash": "264b4a31d35bb6833566a7763356ab63"
389389
},
390+
"triebeard": {
391+
"Package": "triebeard",
392+
"Version": "0.3.0",
393+
"Source": "Repository",
394+
"Repository": "CRAN",
395+
"Hash": "847a9d113b78baca4a9a8639609ea228"
396+
},
397+
"urltools": {
398+
"Package": "urltools",
399+
"Version": "1.7.3",
400+
"Source": "Repository",
401+
"Repository": "CRAN",
402+
"Hash": "e86a704261a105f4703f653e05defa3e"
403+
},
390404
"utf8": {
391405
"Package": "utf8",
392406
"Version": "1.1.4",
393407
"Source": "Repository",
394408
"Repository": "CRAN",
395409
"Hash": "4a5081acfb7b81a572e4384a7aaf2af1"
396410
},
411+
"vcr": {
412+
"Package": "vcr",
413+
"Version": "0.6.0",
414+
"Source": "Repository",
415+
"Repository": "CRAN",
416+
"Hash": "ca3372b3b4e975473eb0db03bf4d464e"
417+
},
397418
"vctrs": {
398419
"Package": "vctrs",
399420
"Version": "0.3.5",
@@ -403,24 +424,38 @@
403424
},
404425
"waldo": {
405426
"Package": "waldo",
406-
"Version": "0.2.3",
427+
"Version": "0.2.5",
428+
"Source": "Repository",
429+
"Repository": "CRAN",
430+
"Hash": "20c45f1d511a3f730b7b469f4d11e104"
431+
},
432+
"webmockr": {
433+
"Package": "webmockr",
434+
"Version": "0.8.0",
435+
"Source": "Repository",
436+
"Repository": "CRAN",
437+
"Hash": "754886d5a40436ca6d1714222cf51a8f"
438+
},
439+
"whisker": {
440+
"Package": "whisker",
441+
"Version": "0.4",
407442
"Source": "Repository",
408443
"Repository": "CRAN",
409-
"Hash": "181d1a31b1ba2009ef20926f2ee0570c"
444+
"Hash": "ca970b96d894e90397ed20637a0c1bbe"
410445
},
411446
"withr": {
412447
"Package": "withr",
413-
"Version": "2.3.0",
448+
"Version": "2.4.2",
414449
"Source": "Repository",
415450
"Repository": "CRAN",
416-
"Hash": "7307d79f58d1885b38c4f4f1a8cb19dd"
451+
"Hash": "ad03909b44677f930fa156d47d7a3aeb"
417452
},
418453
"xfun": {
419454
"Package": "xfun",
420-
"Version": "0.19",
455+
"Version": "0.22",
421456
"Source": "Repository",
422457
"Repository": "CRAN",
423-
"Hash": "a42372606cb76f34da9d090326e9f955"
458+
"Hash": "eab2f8ba53809c321813e72ecbbd19ba"
424459
},
425460
"yaml": {
426461
"Package": "yaml",

‎tests/fixtures/gb_no_dates.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
http_interactions:
2+
- request:
3+
method: get
4+
uri: https://api.carbonintensity.org.uk/intensity/
5+
body:
6+
encoding: ''
7+
string: ''
8+
headers:
9+
Accept: application/json, text/xml, application/xml, */*
10+
response:
11+
status:
12+
status_code: 200
13+
category: Success
14+
reason: OK
15+
message: 'Success: (200) OK'
16+
headers:
17+
content-type: application/json
18+
content-length: '193'
19+
date: Fri, 30 Apr 2021 23:01:57 GMT
20+
x-amzn-requestid: cbdb84be-4134-45e2-a265-fe230e3ebf26
21+
access-control-allow-origin: '*'
22+
x-amz-apigw-id: enrf0FnqrPEFmlQ=
23+
x-amzn-trace-id: Root=1-608c8c65-137497d25103be300b3ca5b3;Sampled=0
24+
x-cache: Miss from cloudfront
25+
via: 1.1 89033043c124289b2dedc4a7c50bd2e1.cloudfront.net (CloudFront)
26+
x-amz-cf-pop: LHR3-C1
27+
x-amz-cf-id: Zrn30LWAZis3IDov8wPSSTVm5VHMVOLdAkslcBdKBh0SvafUH_GZYw==
28+
body:
29+
encoding: UTF-8
30+
file: no
31+
string: "{ \r\n \"data\":[{ \r\n \"from\": \"2021-04-30T22:30Z\",\r\n \"to\":
32+
\"2021-04-30T23:00Z\",\r\n \"intensity\": {\r\n \"forecast\": 255,\r\n
33+
\ \"actual\": null, \r\n \"index\": \"moderate\"\r\n }\r\n }]\r\n}"
34+
recorded_at: 2021-04-30 23:01:57 GMT
35+
recorded_with: vcr/0.6.0, webmockr/0.8.0

0 commit comments

Comments
 (0)