gds-api-adapters 59.0.0 → 59.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea4856342a5a29a9b5bdfd101a1df68c4685673ef36a4841b9b52628dd33e94e
-  data.tar.gz: 51c94fbec84e8403b08559b1c6bc8feab2322b24ebbfee19d333607e0f8e9bd7
+  metadata.gz: 5545c2f65d5f31f2aaf737590b5204ee385ec783ad553d09515ac0b7e3d73929
+  data.tar.gz: 850f74dc5f709157bad18d79308edd76ae3323b8e33d867ebfda9f075eb82b65
 SHA512:
-  metadata.gz: 69021b367b2910f54b7c03cb09dc39c46c5f2e430539631f6f75b9a53bf77a38ff8f2e9c36eab0cb959bfde1cada2be5b04a9c5bea6ad484cb0de89a3b1e73fe
-  data.tar.gz: d93067152fb831d8526435825f9cc30f430e67d3f4f29d67e5328825e8f41a99b05cc51f812ad43426a8fdab3f668a57926862b2236a27b9fa8a1ee535118361
+  metadata.gz: ce46e8885c9e7b37cffa51ff0a3666270e825ccc073c17659d23d85ed15598f190eb8b016f599aec26275c829062106e3d7500b76f74a0b88bfa194d76568901
+  data.tar.gz: af840ab6b6d7053d2e746bdfe64fc5a00daeba7105d7bbabf771ba54c74e539579cd95d3de2131936d06113063865644f096a858cd4a0ca352e270f9f6791721

data/Rakefile

@@ -37,5 +37,5 @@ end
 
 desc "Run the linter against changed files"
 task :lint do
-  sh "bundle exec govuk-lint-ruby --diff --cached --format clang"
+  sh "bundle exec govuk-lint-ruby --format clang lib test"
 end

data/lib/gds_api/base.rb

@@ -41,6 +41,7 @@ class GdsApi::Base
   def initialize(endpoint_url, options = {})
     options[:endpoint_url] = endpoint_url
     raise InvalidAPIURL unless endpoint_url =~ URI::RFC3986_Parser::RFC3986_URI
+
     base_options = { logger: GdsApi::Base.logger }
     default_options = base_options.merge(GdsApi::Base.default_options || {})
     @options = default_options.merge(options)

data/lib/gds_api/content_store.rb

@@ -65,6 +65,7 @@ private
     def redirect_for_path(path)
       redirects_by_segments.find do |r|
         next true if r["path"] == path
+
         route_prefix_match?(r["path"], path) if r["type"] == "prefix"
       end
     end

data/lib/gds_api/imminence.rb

@@ -3,7 +3,7 @@ require_relative 'base'
 class GdsApi::Imminence < GdsApi::Base
   def api_url(type, params)
     vals = %i[limit lat lng postcode].select { |p| params.include? p }
-    querystring = URI.encode_www_form vals.map { |p| [p, params[p]] }
+    querystring = URI.encode_www_form(vals.map { |p| [p, params[p]] })
     "#{@endpoint}/places/#{type}.json?#{querystring}"
   end
 

data/lib/gds_api/json_client.rb

@@ -12,7 +12,7 @@ module GdsApi
     attr_accessor :logger, :options
 
     def initialize(options = {})
-      if options[:disable_timeout] || options[:timeout].to_i < 0
+      if options[:disable_timeout] || options[:timeout].to_i.negative?
         raise "It is no longer possible to disable the timeout."
       end
 
@@ -101,10 +101,10 @@ module GdsApi
       rescue RestClient::Exception => e
         # Attempt to parse the body as JSON if possible
         error_details = begin
-          e.http_body ? JSON.parse(e.http_body) : nil
-        rescue JSON::ParserError
-          nil
-        end
+                          e.http_body ? JSON.parse(e.http_body) : nil
+                        rescue JSON::ParserError
+                          nil
+                        end
         raise build_specific_http_error(e, url, error_details, params)
       end
 
@@ -174,7 +174,7 @@ module GdsApi
         method_params = with_ssl_options(method_params)
       end
 
-      return ::RestClient::Request.execute(method_params)
+      ::RestClient::Request.execute(method_params)
     rescue Errno::ECONNREFUSED => e
       logger.error loggable.merge(status: 'refused', error_message: e.message, error_class: e.class.name, end_time: Time.now.to_f).to_json
       raise GdsApi::EndpointNotFound.new("Could not connect to #{url}")

data/lib/gds_api/licence_application.rb

@@ -7,6 +7,7 @@ class GdsApi::LicenceApplication < GdsApi::Base
 
   def details_for_licence(id, snac_code = nil)
     return nil if id.nil?
+
     get_json(build_licence_url(id, snac_code))
   end
 

data/lib/gds_api/rummager.rb

@@ -31,6 +31,7 @@ module GdsApi
 
       def add_document(id, document, index_name)
         raise(InvalidIndex, index_name) unless index_name == 'metasearch'
+
         post_json(
           "#{base_url}/v2/metasearch/documents",
           document.merge(
@@ -41,6 +42,7 @@ module GdsApi
 
       def delete_document(id, index_name)
         raise(InvalidIndex, index_name) unless index_name == 'metasearch'
+
         delete_json("#{base_url}/v2/metasearch/documents/#{id}")
       end
     end
@@ -114,6 +116,7 @@ module GdsApi
     # @deprecated Only in use by Whitehall. Use the `#search` method.
     def advanced_search(args)
       raise ArgumentError.new("Args cannot be blank") if args.nil? || args.empty?
+
       request_path = "#{base_url}/advanced_search?#{Rack::Utils.build_nested_query(args)}"
       get_json(request_path)
     end

data/lib/gds_api/support_api.rb

@@ -51,9 +51,8 @@ class GdsApi::SupportApi < GdsApi::Base
     post_json("#{endpoint}/anonymous-feedback/content_improvement", params)
   end
 
-  def anonymous_feedback(options = {})
-    uri = "#{endpoint}/anonymous-feedback" + query_string(options)
-    get_json(uri)
+  def anonymous_feedback(params = {})
+    post_json("#{endpoint}/anonymous-feedback", params)
   end
 
   def organisation_summary(organisation_slug, options = {})

data/lib/gds_api/test_helpers/content_item_helpers.rb

@@ -1,4 +1,3 @@
-
 module GdsApi
   module TestHelpers
     module ContentItemHelpers

data/lib/gds_api/test_helpers/organisations.rb

@@ -52,7 +52,8 @@ module GdsApi
 
           stub_request(:get, links[:self]).
             to_return(status: 200, body: page_details.to_json, headers: { "Link" => link_headers.join(", ") })
-          if i == 0
+
+          if i.zero?
             # First page exists at URL with and without page param
             stub_request(:get, links[:self].sub(/\?page=1/, '')).
               to_return(status: 200, body: page_details.to_json, headers: { "Link" => link_headers.join(", ") })

data/lib/gds_api/test_helpers/publishing_api.rb

@@ -123,6 +123,7 @@ module GdsApi
         case expected_value
         when Hash
           return false unless actual_value.is_a?(Hash)
+
           expected_value.all? do |expected_sub_key, expected_sub_value|
             actual_value.has_key?(expected_sub_key.to_s) &&
               values_match_recursively(expected_sub_value, actual_value[expected_sub_key.to_s])
@@ -130,6 +131,7 @@ module GdsApi
         when Array
           return false unless actual_value.is_a?(Array)
           return false unless actual_value.size == expected_value.size
+
           expected_value.each.with_index.all? do |expected_sub_value, i|
             values_match_recursively(expected_sub_value, actual_value[i])
           end

data/lib/gds_api/test_helpers/publishing_api_v2.rb

@@ -609,6 +609,7 @@ module GdsApi
 
         results = editions.map do |edition|
           next edition unless params[:fields]
+
           edition.select { |k| params[:fields].include?(k) }
         end
 

data/lib/gds_api/test_helpers/router.rb

@@ -43,12 +43,14 @@ module GdsApi
       end
 
       def stub_route_registration(path, type, backend_id)
-        route = { route: {
-                    incoming_path: path,
-                    route_type: type,
-                    handler: 'backend',
-                    backend_id: backend_id }
-                }
+        route = {
+          route: {
+            incoming_path: path,
+            route_type: type,
+            handler: 'backend',
+            backend_id: backend_id
+          }
+        }
 
         register_stub = stub_route_put(route)
         commit_stub = stub_router_commit
@@ -56,14 +58,16 @@ module GdsApi
       end
 
       def stub_redirect_registration(path, type, destination, redirect_type, segments_mode = nil)
-        redirect = { route: {
-                      incoming_path: path,
-                      route_type: type,
-                      handler: 'redirect',
-                      redirect_to: destination,
-                      redirect_type: redirect_type,
-                      segments_mode: segments_mode }
-                  }
+        redirect = {
+          route: {
+            incoming_path: path,
+            route_type: type,
+            handler: 'redirect',
+            redirect_to: destination,
+            redirect_type: redirect_type,
+            segments_mode: segments_mode,
+          }
+        }
 
         register_stub = stub_route_put(redirect)
         commit_stub = stub_router_commit
@@ -71,11 +75,13 @@ module GdsApi
       end
 
       def stub_gone_route_registration(path, type)
-        route = { route: {
-                      incoming_path: path,
-                      route_type: type,
-                      handler: 'gone' }
-                  }
+        route = {
+          route: {
+            incoming_path: path,
+            route_type: type,
+            handler: 'gone',
+          }
+        }
 
         register_stub = stub_route_put(route)
         commit_stub = stub_router_commit

data/lib/gds_api/test_helpers/rummager.rb

@@ -60,6 +60,7 @@ module GdsApi
         if id =~ %r{^/}
           raise ArgumentError, 'Rummager id must not start with a slash'
         end
+
         if index
           assert_requested(
             :delete,
@@ -133,8 +134,8 @@ module GdsApi
       def search_results_found
         File.read(
           File.expand_path(
-            "../../../../test/fixtures/services_and_info_fixture.json",
-            __FILE__
+            "../../../test/fixtures/services_and_info_fixture.json",
+            __dir__
           )
         )
       end
@@ -142,8 +143,8 @@ module GdsApi
       def no_search_results_found
         File.read(
           File.expand_path(
-            "../../../../test/fixtures/no_services_and_info_data_found_fixture.json",
-            __FILE__
+            "../../../test/fixtures/no_services_and_info_data_found_fixture.json",
+            __dir__
           )
         )
       end
@@ -151,8 +152,8 @@ module GdsApi
       def sub_sector_organisations_results
         File.read(
           File.expand_path(
-            "../../../../test/fixtures/sub_sector_organisations.json",
-            __FILE__
+            "../../../test/fixtures/sub_sector_organisations.json",
+            __dir__
           )
         )
       end
@@ -160,8 +161,8 @@ module GdsApi
       def new_policies_results
         File.read(
           File.expand_path(
-            "../../../../test/fixtures/new_policies_for_dwp.json",
-            __FILE__
+            "../../../test/fixtures/new_policies_for_dwp.json",
+            __dir__
           )
         )
       end
@@ -169,8 +170,8 @@ module GdsApi
       def old_policies_results
         File.read(
           File.expand_path(
-            "../../../../test/fixtures/old_policies_for_dwp.json",
-            __FILE__
+            "../../../test/fixtures/old_policies_for_dwp.json",
+            __dir__
           )
         )
       end

data/lib/gds_api/test_helpers/support_api.rb

@@ -79,9 +79,9 @@ module GdsApi
       end
 
       def stub_support_api_anonymous_feedback(params, response_body = {})
-        stub_http_request(:get, "#{SUPPORT_API_ENDPOINT}/anonymous-feedback").
-          with(query: params).
-          to_return(status: 200, body: response_body.to_json)
+        stub_http_request(:post, "#{SUPPORT_API_ENDPOINT}/anonymous-feedback")
+          .with(body: params)
+          .to_return(status: 200, body: response_body.to_json)
       end
 
       def stub_support_api_anonymous_feedback_organisation_summary(slug, ordering = nil, response_body = {})

data/lib/gds_api/test_helpers/worldwide.rb

@@ -30,7 +30,7 @@ module GdsApi
 
           links = { self: "#{WORLDWIDE_API_ENDPOINT}/api/world-locations?page=#{i + 1}" }
           links[:next] = "#{WORLDWIDE_API_ENDPOINT}/api/world-locations?page=#{i + 2}" if pages[i + 1]
-          links[:previous] = "#{WORLDWIDE_API_ENDPOINT}/api/world-locations?page=#{i}" unless i == 0
+          links[:previous] = "#{WORLDWIDE_API_ENDPOINT}/api/world-locations?page=#{i}" unless i.zero?
           page_details["_response_info"]["links"] = []
           link_headers = []
           links.each do |rel, href|
@@ -40,7 +40,8 @@ module GdsApi
 
           stub_request(:get, links[:self]).
             to_return(status: 200, body: page_details.to_json, headers: { "Link" => link_headers.join(", ") })
-          if i == 0
+
+          if i.zero?
             # First page exists at URL with and without page param
             stub_request(:get, links[:self].sub(/\?page=1/, '')).
               to_return(status: 200, body: page_details.to_json, headers: { "Link" => link_headers.join(", ") })

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '59.0.0'.freeze
+  VERSION = '59.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 59.0.0
+  version: 59.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement