gds-api-adapters 16.5.0 → 17.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/lib/gds_api/content_api.rb +1 -0
  2. data/lib/gds_api/test_helpers/content_api.rb +15 -32
  3. data/lib/gds_api/version.rb +1 -1
  4. data/test/content_api_test.rb +10 -0
  5. metadata +40 -40
data/lib/gds_api/content_api.rb CHANGED
@@ -32,6 +32,7 @@ class GdsApi::ContentApi < GdsApi::Base
32
32
  ]
33
33
  params << "sort=#{options[:sort]}" if options.has_key?(:sort)
34
34
  params << "draft=true" if options[:draft]
35
+ params << "cachebust=#{Time.now.utc.to_i}#{rand(1000)}" if options[:bust_cache]
35
36
 
36
37
  get_list!("#{base_url}/tags.json?#{params.join('&')}")
37
38
  end
data/lib/gds_api/test_helpers/content_api.rb CHANGED
@@ -95,22 +95,14 @@ module GdsApi
95
95
  draft_tags = options.fetch(:draft).map { |tag| tag_result(tag, type, state: 'draft') }
96
96
 
97
97
  body = plural_response_base.merge("results" => (live_tags + draft_tags))
98
- url = "#{CONTENT_API_ENDPOINT}/tags.json?type=#{type}&draft=true"
99
- stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
98
+ stub_request(:get, "#{CONTENT_API_ENDPOINT}/tags.json")
99
+ .with(query: hash_including({"type" => type, "draft" => "true"}))
100
+ .to_return(status: 200, body: body.to_json, headers: {})
100
101
 
101
102
  body = plural_response_base.merge("results" => live_tags)
102
- url = "#{CONTENT_API_ENDPOINT}/tags.json?type=#{type}"
103
- stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
104
-
105
- if options[:sort_order]
106
- body = plural_response_base.merge("results" => (live_tags + draft_tags))
107
- url = "#{CONTENT_API_ENDPOINT}/tags.json?type=#{type}&draft=true&sort=#{options[:sort_order]}"
108
- stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
109
-
110
- body = plural_response_base.merge("results" => live_tags)
111
- url = "#{CONTENT_API_ENDPOINT}/tags.json?type=#{type}&sort=#{options[:sort_order]}"
112
- stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
113
- end
103
+ stub_request(:get, "#{CONTENT_API_ENDPOINT}/tags.json")
104
+ .with(query: {"type" => type})
105
+ .to_return(status: 200, body: body.to_json, headers: {})
114
106
  end
115
107
 
116
108
  def content_api_does_not_have_tags(tag_type, slugs)
@@ -120,12 +112,9 @@ module GdsApi
120
112
  }
121
113
  }
122
114
 
123
- [
124
- "#{CONTENT_API_ENDPOINT}/tags.json?type=#{tag_type}",
125
- "#{CONTENT_API_ENDPOINT}/tags.json?draft=true&type=#{tag_type}"
126
- ].each do |url|
127
- stub_request(:get, url).to_return(status: 404, body: body.to_json, headers: {})
128
- end
115
+ stub_request(:get, "#{CONTENT_API_ENDPOINT}/tags.json")
116
+ .with(query: hash_including({"type" => tag_type}))
117
+ .to_return(status: 404, body: body.to_json, headers: {})
129
118
  end
130
119
 
131
120
  def content_api_has_tags(tag_type, slugs_or_tags)
@@ -133,12 +122,9 @@ module GdsApi
133
122
  "results" => slugs_or_tags.map { |tag| tag_result(tag, tag_type) }
134
123
  )
135
124
 
136
- [
137
- "#{CONTENT_API_ENDPOINT}/tags.json?type=#{tag_type}",
138
- "#{CONTENT_API_ENDPOINT}/tags.json?draft=true&type=#{tag_type}"
139
- ].each do |url|
140
- stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
141
- end
125
+ stub_request(:get, "#{CONTENT_API_ENDPOINT}/tags.json")
126
+ .with(query: hash_including({"type" => tag_type}))
127
+ .to_return(status: 200, body: body.to_json, headers: {})
142
128
  end
143
129
 
144
130
  def content_api_has_sorted_tags(tag_type, sort_order, slugs_or_tags)
@@ -146,12 +132,9 @@ module GdsApi
146
132
  "results" => slugs_or_tags.map { |tag| tag_result(tag, tag_type) }
147
133
  )
148
134
 
149
- [
150
- "#{CONTENT_API_ENDPOINT}/tags.json?sort=#{sort_order}&type=#{tag_type}",
151
- "#{CONTENT_API_ENDPOINT}/tags.json?draft=true&sort=#{sort_order}&type=#{tag_type}"
152
- ].each do |url|
153
- stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
154
- end
135
+ stub_request(:get, "#{CONTENT_API_ENDPOINT}/tags.json")
136
+ .with(query: hash_including({"type" => tag_type, "sort" => sort_order}))
137
+ .to_return(status: 200, body: body.to_json, headers: {})
155
138
  end
156
139
 
157
140
  def content_api_has_child_tags(tag_type, parent_slug_or_hash, child_tag_ids)
data/lib/gds_api/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GdsApi
2
- VERSION = '16.5.0'
2
+ VERSION = '17.0.0'
3
3
  end
data/test/content_api_test.rb CHANGED
@@ -427,6 +427,16 @@ describe GdsApi::ContentApi do
427
427
  assert_equal "Kaya", response.results[1].items[0].title
428
428
  assert_equal "Exodus", response.results[1].items[1].title
429
429
  end
430
+
431
+ it "permits cache busting" do
432
+ content_api_has_tags("specialist_sector", ["oil-and-gas/licensing"])
433
+
434
+ @api.tags("specialist_sector")
435
+ assert_requested :get, "#{@base_api_url}/tags.json?type=specialist_sector"
436
+
437
+ @api.tags("specialist_sector", bust_cache: true)
438
+ assert_requested :get, Regexp.new("#{@base_api_url}/tags.json\\?cachebust=\\d+&type=specialist_sector")
439
+ end
430
440
  end
431
441
 
432
442
  describe "licence" do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gds-api-adapters
3
3
  version: !ruby/object:Gem::Version
4
- version: 16.5.0
4
+ version: 17.0.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-11-28 00:00:00.000000000 Z
12
+ date: 2014-12-01 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: plek
16
- requirement: &9915220 !ruby/object:Gem::Requirement
16
+ requirement: &20703760 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *9915220
24
+ version_requirements: *20703760
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: null_logger
27
- requirement: &9913660 !ruby/object:Gem::Requirement
27
+ requirement: &20702000 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *9913660
35
+ version_requirements: *20702000
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: link_header
38
- requirement: &9912640 !ruby/object:Gem::Requirement
38
+ requirement: &20700960 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *9912640
46
+ version_requirements: *20700960
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: lrucache
49
- requirement: &9911100 !ruby/object:Gem::Requirement
49
+ requirement: &20699660 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 0.1.1
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *9911100
57
+ version_requirements: *20699660
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rest-client
60
- requirement: &9910040 !ruby/object:Gem::Requirement
60
+ requirement: &20698460 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.6.3
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *9910040
68
+ version_requirements: *20698460
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rack-cache
71
- requirement: &9940000 !ruby/object:Gem::Requirement
71
+ requirement: &20728340 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *9940000
79
+ version_requirements: *20728340
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rdoc
82
- requirement: &9938620 !ruby/object:Gem::Requirement
82
+ requirement: &20727100 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - =
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '3.12'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *9938620
90
+ version_requirements: *20727100
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rake
93
- requirement: &9935700 !ruby/object:Gem::Requirement
93
+ requirement: &20724200 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 0.9.2.2
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *9935700
101
+ version_requirements: *20724200
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: webmock
104
- requirement: &9949840 !ruby/object:Gem::Requirement
104
+ requirement: &20721680 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '1.19'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *9949840
112
+ version_requirements: *20721680
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: mocha
115
- requirement: &9943920 !ruby/object:Gem::Requirement
115
+ requirement: &20732940 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 0.12.4
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *9943920
123
+ version_requirements: *20732940
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: minitest
126
- requirement: &9972480 !ruby/object:Gem::Requirement
126
+ requirement: &20762200 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 3.4.0
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *9972480
134
+ version_requirements: *20762200
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: rack
137
- requirement: &9969220 !ruby/object:Gem::Requirement
137
+ requirement: &20758360 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *9969220
145
+ version_requirements: *20758360
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: rack-test
148
- requirement: &9995780 !ruby/object:Gem::Requirement
148
+ requirement: &20784240 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: '0'
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *9995780
156
+ version_requirements: *20784240
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: simplecov
159
- requirement: &9993100 !ruby/object:Gem::Requirement
159
+ requirement: &20781900 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ~>
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: 0.5.4
165
165
  type: :development
166
166
  prerelease: false
167
- version_requirements: *9993100
167
+ version_requirements: *20781900
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: simplecov-rcov
170
- requirement: &9989880 !ruby/object:Gem::Requirement
170
+ requirement: &20779160 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: '0'
176
176
  type: :development
177
177
  prerelease: false
178
- version_requirements: *9989880
178
+ version_requirements: *20779160
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: gem_publisher
181
- requirement: &10009680 !ruby/object:Gem::Requirement
181
+ requirement: &20799460 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ~>
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: 1.1.1
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *10009680
189
+ version_requirements: *20799460
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: timecop
192
- requirement: &10008820 !ruby/object:Gem::Requirement
192
+ requirement: &20797320 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ~>
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: 0.5.1
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *10008820
200
+ version_requirements: *20797320
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: pry
203
- requirement: &10007140 !ruby/object:Gem::Requirement
203
+ requirement: &20795800 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ! '>='
@@ -208,7 +208,7 @@ dependencies:
208
208
  version: '0'
209
209
  type: :development
210
210
  prerelease: false
211
- version_requirements: *10007140
211
+ version_requirements: *20795800
212
212
  description: A set of adapters providing easy access to the GDS GOV.UK APIs
213
213
  email:
214
214
  - jystewart@gmail.com
@@ -346,7 +346,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
346
346
  version: '0'
347
347
  segments:
348
348
  - 0
349
- hash: 1363356250440266527
349
+ hash: 2402884316445534514
350
350
  required_rubygems_version: !ruby/object:Gem::Requirement
351
351
  none: false
352
352
  requirements:
@@ -355,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
355
355
  version: '0'
356
356
  segments:
357
357
  - 0
358
- hash: 1363356250440266527
358
+ hash: 2402884316445534514
359
359
  requirements: []
360
360
  rubyforge_project:
361
361
  rubygems_version: 1.8.11