gds-api-adapters 38.0.0 → 38.1.0

data/test/rummager_test.rb

@@ -12,28 +12,28 @@ describe GdsApi::Rummager do
   it "#advanced_search should raise an exception if the service at the search URI returns a 500" do
     stub_request(:get, /example.com\/advanced_search/).to_return(status: [500, "Internal Server Error"])
     assert_raises(GdsApi::HTTPServerError) do
-      GdsApi::Rummager.new("http://example.com").advanced_search({keywords: "query"})
+      GdsApi::Rummager.new("http://example.com").advanced_search(keywords: "query")
     end
   end
 
   it "#advanced_search should raise an exception if the service at the search URI returns a 404" do
     stub_request(:get, /example.com\/advanced_search/).to_return(status: [404, "Not Found"])
     assert_raises(GdsApi::HTTPNotFound) do
-      GdsApi::Rummager.new("http://example.com").advanced_search({keywords: "query"})
+      GdsApi::Rummager.new("http://example.com").advanced_search(keywords: "query")
     end
   end
 
   it "#advanced_search should raise an exception if the service at the search URI times out" do
     stub_request(:get, /example.com\/advanced_search/).to_timeout
     assert_raises(GdsApi::TimedOutException) do
-      GdsApi::Rummager.new("http://example.com").advanced_search({keywords: "query"})
+      GdsApi::Rummager.new("http://example.com").advanced_search(keywords: "query")
     end
   end
 
   it "#advanced_search should return the search deserialized from json" do
-    search_results = [{"title" => "document-title"}]
+    search_results = [{ "title" => "document-title" }]
     stub_request(:get, /example.com\/advanced_search/).to_return(body: search_results.to_json)
-    results = GdsApi::Rummager.new("http://example.com").advanced_search({keywords: "query"})
+    results = GdsApi::Rummager.new("http://example.com").advanced_search(keywords: "query")
 
     assert_equal search_results, results.to_hash
   end
@@ -46,18 +46,18 @@ describe GdsApi::Rummager do
 
   it "#advanced_search should return an empty set of results without making request if arguments is nil" do
     assert_raises(ArgumentError) do
-      results = GdsApi::Rummager.new("http://example.com").advanced_search(nil)
+      GdsApi::Rummager.new("http://example.com").advanced_search(nil)
     end
   end
 
   it "#advanced_search should request the search results in JSON format" do
-    GdsApi::Rummager.new("http://example.com").advanced_search({keywords: "query"})
+    GdsApi::Rummager.new("http://example.com").advanced_search(keywords: "query")
 
-    assert_requested :get, /.*/, headers: {"Accept" => "application/json"}
+    assert_requested :get, /.*/, headers: { "Accept" => "application/json" }
   end
 
   it "#advanced_search should issue a request for all the params supplied" do
-    GdsApi::Rummager.new("http://example.com").advanced_search({keywords: "query & stuff", topics: ["1","2"], order: {public_timestamp: "desc"}})
+    GdsApi::Rummager.new("http://example.com").advanced_search(keywords: "query & stuff", topics: %w(1 2), order: { public_timestamp: "desc" })
 
     assert_requested :get, /keywords=query%20%26%20stuff/
     assert_requested :get, /topics\[\]=1&topics\[\]=2/
@@ -83,7 +83,7 @@ describe GdsApi::Rummager do
   it "#search should raise an exception if the service at the search URI returns a 400" do
     stub_request(:get, /example.com\/search/).to_return(
       status: [400, "Bad Request"],
-      body: %q("error":"Filtering by \"coffee\" is not allowed"),
+      body: '"error":"Filtering by \"coffee\" is not allowed"',
     )
     assert_raises(GdsApi::HTTPClientError) do
       GdsApi::Rummager.new("http://example.com").search(q: "query", filter_coffee: "tea")
@@ -93,7 +93,7 @@ describe GdsApi::Rummager do
   it "#search should raise an exception if the service at the search URI returns a 422" do
     stub_request(:get, /example.com\/search/).to_return(
       status: [422, "Bad Request"],
-      body: %q("error":"Filtering by \"coffee\" is not allowed"),
+      body: '"error":"Filtering by \"coffee\" is not allowed"',
     )
     assert_raises(GdsApi::HTTPClientError) do
       GdsApi::Rummager.new("http://example.com").search(q: "query", filter_coffee: "tea")
@@ -108,7 +108,7 @@ describe GdsApi::Rummager do
   end
 
   it "#search should return the search deserialized from json" do
-    search_results = [{"title" => "document-title"}]
+    search_results = [{ "title" => "document-title" }]
     stub_request(:get, /example.com\/search/).to_return(body: search_results.to_json)
     results = GdsApi::Rummager.new("http://example.com").search(q: "query")
     assert_equal search_results, results.to_hash
@@ -117,13 +117,13 @@ describe GdsApi::Rummager do
   it "#search should request the search results in JSON format" do
     GdsApi::Rummager.new("http://example.com").search(q: "query")
 
-    assert_requested :get, /.*/, headers: {"Accept" => "application/json"}
+    assert_requested :get, /.*/, headers: { "Accept" => "application/json" }
   end
 
   it "#search should issue a request for all the params supplied" do
     GdsApi::Rummager.new("http://example.com").search(
       q: "query & stuff",
-      filter_topics: ["1", "2"],
+      filter_topics: %w(1 2),
       order: "-public_timestamp",
     )
 

data/test/support_api_test.rb

@@ -11,11 +11,11 @@ describe GdsApi::SupportApi do
   end
 
   it "can report a problem" do
-    request_details = {certain: "details"}
+    request_details = { certain: "details" }
 
     stub_post = stub_request(:post, "#{@base_api_url}/anonymous-feedback/problem-reports").
-      with(:body => {"problem_report" => request_details}.to_json).
-      to_return(:status => 201)
+      with(body: { "problem_report" => request_details }.to_json).
+      to_return(status: 201)
 
     @api.create_problem_report(request_details)
 
@@ -23,11 +23,11 @@ describe GdsApi::SupportApi do
   end
 
   it "can pass service feedback" do
-    request_details = {"transaction-completed-values"=>"1", "details"=>"abc"}
+    request_details = { "transaction-completed-values" => "1", "details" => "abc" }
 
     stub_post = stub_request(:post, "#{@base_api_url}/anonymous-feedback/service-feedback").
-      with(:body => {"service_feedback" => request_details}.to_json).
-      to_return(:status => 201)
+      with(body: { "service_feedback" => request_details }.to_json).
+      to_return(status: 201)
 
     @api.create_service_feedback(request_details)
 
@@ -35,11 +35,11 @@ describe GdsApi::SupportApi do
   end
 
   it "can submit long-form anonymous feedback" do
-    request_details = {certain: "details"}
+    request_details = { certain: "details" }
 
     stub_post = stub_request(:post, "#{@base_api_url}/anonymous-feedback/long-form-contacts").
-      with(:body => {"long_form_contact" => request_details}.to_json).
-      to_return(:status => 201)
+      with(body: { "long_form_contact" => request_details }.to_json).
+      to_return(status: 201)
 
     @api.create_anonymous_long_form_contact(request_details)
 
@@ -47,10 +47,10 @@ describe GdsApi::SupportApi do
   end
 
   it "fetches problem report daily totals" do
-    response_body = {"data" => ["results"]}
+    response_body = { "data" => ["results"] }
 
     stub_get = stub_request(:get, "#{@base_api_url}/anonymous-feedback/problem-reports/2014-07-12/totals").
-      to_return(:status => 200, body: response_body.to_json)
+      to_return(status: 200, body: response_body.to_json)
 
     result = @api.problem_report_daily_totals_for(Date.new(2014, 7, 12))
 
@@ -115,7 +115,7 @@ describe GdsApi::SupportApi do
 
   describe "POST /anonymous-feedback/global-export-requests" do
     it "makes a POST request to the support API" do
-      params = {from_date: "1 June 2016", to_date: "8 June 2016", notification_email: "foo@example.com"}
+      params = { from_date: "1 June 2016", to_date: "8 June 2016", notification_email: "foo@example.com" }
       stub_post = stub_support_global_export_request_creation(params)
 
       @api.create_global_export_request(params)
@@ -125,7 +125,7 @@ describe GdsApi::SupportApi do
 
   describe "POST /page-improvements" do
     it "makes a POST request to the support API" do
-      params = {description: "The title could be better."}
+      params = { description: "The title could be better." }
       stub_post = stub_create_page_improvement(params)
 
       @api.create_page_improvement(params)

data/test/support_test.rb

@@ -11,11 +11,11 @@ describe GdsApi::Support do
   end
 
   it "can create an FOI request" do
-    request_details = {"foi_request"=>{"requester"=>{"name"=>"A", "email"=>"a@b.com"}, "details"=>"abc"}}
+    request_details = { "foi_request" => { "requester" => { "name" => "A", "email" => "a@b.com" }, "details" => "abc" } }
 
     stub_post = stub_request(:post, "#{@base_api_url}/foi_requests").
-      with(:body => {"foi_request" => request_details}.to_json).
-      to_return(:status => 201)
+      with(body: { "foi_request" => request_details }.to_json).
+      to_return(status: 201)
 
     @api.create_foi_request(request_details)
 
@@ -29,11 +29,11 @@ describe GdsApi::Support do
   end
 
   it "can report a problem" do
-    request_details = {certain: "details"}
+    request_details = { certain: "details" }
 
     stub_post = stub_request(:post, "#{@base_api_url}/anonymous_feedback/problem_reports").
-      with(:body => {"problem_report" => request_details}.to_json).
-      to_return(:status => 201)
+      with(body: { "problem_report" => request_details }.to_json).
+      to_return(status: 201)
 
     @api.create_problem_report(request_details)
 
@@ -41,11 +41,11 @@ describe GdsApi::Support do
   end
 
   it "can submit long-form anonymous feedback" do
-    request_details = {certain: "details"}
+    request_details = { certain: "details" }
 
     stub_post = stub_request(:post, "#{@base_api_url}/anonymous_feedback/long_form_contacts").
-      with(:body => {"long_form_contact" => request_details}.to_json).
-      to_return(:status => 201)
+      with(body: { "long_form_contact" => request_details }.to_json).
+      to_return(status: 201)
 
     @api.create_anonymous_long_form_contact(request_details)
 
@@ -53,11 +53,11 @@ describe GdsApi::Support do
   end
 
   it "can create a named contact" do
-    request_details = {certain: "details"}
+    request_details = { certain: "details" }
 
     stub_post = stub_request(:post, "#{@base_api_url}/named_contacts").
-      with(:body => {"named_contact" => request_details}.to_json).
-      to_return(:status => 201)
+      with(body: { "named_contact" => request_details }.to_json).
+      to_return(status: 201)
 
     @api.create_named_contact(request_details)
 
@@ -71,11 +71,11 @@ describe GdsApi::Support do
   end
 
   it "can pass service feedback" do
-    request_details = {"transaction-completed-values"=>"1", "details"=>"abc"}
+    request_details = { "transaction-completed-values" => "1", "details" => "abc" }
 
     stub_post = stub_request(:post, "#{@base_api_url}/anonymous_feedback/service_feedback").
-      with(:body => {"service_feedback" => request_details}.to_json).
-      to_return(:status => 201)
+      with(body: { "service_feedback" => request_details }.to_json).
+      to_return(status: 201)
 
     @api.create_service_feedback(request_details)
 
@@ -91,6 +91,5 @@ describe GdsApi::Support do
   it "gets the correct feedback URL" do
     assert_equal("#{@base_api_url}/anonymous_feedback?path=foo",
                  @api.feedback_url('foo'))
-
   end
 end

data/test/test_helper.rb

@@ -45,7 +45,7 @@ module PactTest
 end
 
 def load_fixture_file(filename)
-  File.open( File.join( File.dirname(__FILE__), "fixtures", filename ), :encoding => 'utf-8' )
+  File.open(File.join(File.dirname(__FILE__), "fixtures", filename), encoding: 'utf-8')
 end
 
 require 'webmock/minitest'

data/test/test_helpers/email_alert_api_test.rb

@@ -12,13 +12,13 @@ describe GdsApi::TestHelpers::EmailAlertApi do
     before { stub_any_email_alert_api_call }
 
     it "matches a post request with any empty attributes by default" do
-      email_alert_api.send_alert({ "foo" => "bar" })
+      email_alert_api.send_alert("foo" => "bar")
       assert_email_alert_sent
     end
 
     it "matches a post request subset of attributes" do
-      email_alert_api.send_alert({ "foo" => "bar", "baz" => "qux" })
-      assert_email_alert_sent({ "foo" => "bar" })
+      email_alert_api.send_alert("foo" => "bar", "baz" => "qux")
+      assert_email_alert_sent("foo" => "bar")
     end
   end
 end

data/test/test_helpers/pact_helper.rb

@@ -1,4 +1,4 @@
-PUBLISHING_API_PORT=3001
+PUBLISHING_API_PORT = 3001
 
 def publishing_api_host
   "http://localhost:#{PUBLISHING_API_PORT}"

data/test/test_helpers/panopticon_test.rb

@@ -10,7 +10,7 @@ describe GdsApi::TestHelpers::Panopticon do
 
     assert(
       WebMock::StubRegistry.instance.registered_request?(expected_signature),
-      "Stub is not registered:\n\t#{expected_signature.to_s}"
+      "Stub is not registered:\n\t#{expected_signature}"
     )
   end
 

data/test/test_helpers/publishing_api_test.rb

@@ -9,7 +9,7 @@ describe GdsApi::TestHelpers::PublishingApi do
 
   describe '#request_json_matching predicate' do
     describe "nested required attribute" do
-      let(:matcher) { request_json_matching({"a" => {"b" => 1}}) }
+      let(:matcher) { request_json_matching("a" => { "b" => 1 }) }
 
       it "matches a body with exact same nested hash strucure" do
         assert matcher.call(stub("request", body: '{"a": {"b": 1}}'))
@@ -33,7 +33,7 @@ describe GdsApi::TestHelpers::PublishingApi do
     end
 
     describe "hash to match uses symbol keys" do
-      let(:matcher) { request_json_matching({a: 1}) }
+      let(:matcher) { request_json_matching(a: 1) }
 
       it "matches a json body" do
         assert matcher.call(stub("request", body: '{"a": 1}'))
@@ -55,7 +55,7 @@ describe GdsApi::TestHelpers::PublishingApi do
     end
 
     describe "one required attribute" do
-      let(:matcher) { request_json_including({"a" => 1}) }
+      let(:matcher) { request_json_including("a" => 1) }
 
       it "does not match an empty body" do
         refute matcher.call(stub("request", body: "{}"))
@@ -75,7 +75,7 @@ describe GdsApi::TestHelpers::PublishingApi do
     end
 
     describe "nested required attribute" do
-      let(:matcher) { request_json_including({"a" => {"b" => 1}}) }
+      let(:matcher) { request_json_including("a" => { "b" => 1 }) }
 
       it "matches a body with exact same nested hash strucure" do
         assert matcher.call(stub("request", body: '{"a": {"b": 1}}'))
@@ -95,7 +95,7 @@ describe GdsApi::TestHelpers::PublishingApi do
     end
 
     describe "hash to match uses symbol keys" do
-      let(:matcher) { request_json_including({a: {b: 1}}) }
+      let(:matcher) { request_json_including(a: { b: 1 }) }
 
       it "matches a json body" do
         assert matcher.call(stub("request", body: '{"a": {"b": 1}}'))
@@ -103,7 +103,7 @@ describe GdsApi::TestHelpers::PublishingApi do
     end
 
     describe "nested arrays" do
-      let(:matcher) { request_json_including({"a" => [1]}) }
+      let(:matcher) { request_json_including("a" => [1]) }
 
       it "matches a body with exact same inner array" do
         assert matcher.call(stub("request", body: '{"a": [1]}'))
@@ -115,7 +115,7 @@ describe GdsApi::TestHelpers::PublishingApi do
     end
 
     describe "hashes in nested arrays" do
-      let(:matcher) { request_json_including({"a" => [{"b" => 1}, 2]}) }
+      let(:matcher) { request_json_including("a" => [{ "b" => 1 }, 2]) }
 
       it "matches a body with exact same inner array" do
         assert matcher.call(stub("request", body: '{"a": [{"b": 1}, 2]}'))

data/test/test_helpers/publishing_api_v2_test.rb

@@ -45,7 +45,7 @@ describe GdsApi::TestHelpers::PublishingApiV2 do
 
   describe "#publishing_api_has_content" do
     it "stubs the call to get content items" do
-      publishing_api_has_content([{"content_id" => "2878337b-bed9-4e7f-85b6-10ed2cbcd504"}])
+      publishing_api_has_content([{ "content_id" => "2878337b-bed9-4e7f-85b6-10ed2cbcd504" }])
 
       response = publishing_api.get_content_items({})['results']
 
@@ -83,13 +83,11 @@ describe GdsApi::TestHelpers::PublishingApiV2 do
           { "content_id" => content_id_2 },
           { "content_id" => content_id_3 },
         ],
-        {
-          page: 1,
+                  page: 1,
           per_page: 2
-        }
       )
 
-      response = publishing_api.get_content_items({ page: 1, per_page: 2 })
+      response = publishing_api.get_content_items(page: 1, per_page: 2)
       records = response['results']
 
       assert_equal(response['total'], 3)
@@ -110,13 +108,11 @@ describe GdsApi::TestHelpers::PublishingApiV2 do
           { "content_id" => content_id_1 },
           { "content_id" => content_id_2 },
         ],
-        {
-          page: 10,
+                  page: 10,
           per_page: 2
-        }
       )
 
-      response = publishing_api.get_content_items({ page: 10, per_page: 2 })
+      response = publishing_api.get_content_items(page: 10, per_page: 2)
       records = response['results']
 
       assert_equal(records, [])

data/test/worldwide_api_test.rb

@@ -21,7 +21,7 @@ describe GdsApi::Worldwide do
     end
 
     it "should handle the pagination" do
-      country_slugs = (1..50).map {|n| "country-#{n}" }
+      country_slugs = (1..50).map { |n| "country-#{n}" }
       worldwide_api_has_locations(country_slugs)
 
       response = @api.world_locations
@@ -32,7 +32,7 @@ describe GdsApi::Worldwide do
     end
 
     it "should raise error if endpoint 404s" do
-      stub_request(:get, "#{@base_api_url}/api/world-locations").to_return(:status => 404)
+      stub_request(:get, "#{@base_api_url}/api/world-locations").to_return(status: 404)
       assert_raises GdsApi::HTTPNotFound do
         @api.world_locations
       end
@@ -73,7 +73,7 @@ describe GdsApi::Worldwide do
     end
 
     it "should raise error on 404" do
-      stub_request(:get, "#{@base_api_url}/api/world-locations/non-existent/organisations").to_return(:status => 404)
+      stub_request(:get, "#{@base_api_url}/api/world-locations/non-existent/organisations").to_return(status: 404)
       assert_raises GdsApi::HTTPNotFound do
         @api.organisations_for_world_location('non-existent')
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 38.0.0
+  version: 38.1.0
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
@@ -347,7 +347,6 @@ files:
 - lib/gds_api/business_support_api.rb
 - lib/gds_api/content_api.rb
 - lib/gds_api/content_store.rb
-- lib/gds_api/core-ext/openstruct.rb
 - lib/gds_api/email_alert_api.rb
 - lib/gds_api/exceptions.rb
 - lib/gds_api/gov_uk_delivery.rb