gds-api-adapters 52.6.0 → 52.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: accf0f5721d9f46ecb702af9350c6c473283f8730f28248dbe511b1510659c85
-  data.tar.gz: 27d8cb31d8ffec45ac356c963f2d1c0fb53b71b3e01598e408093a5dbff1a5a2
+  metadata.gz: 8e8fb67f01e255a264b4c5af3bfc7726d1147caad20049d9ec32f4e87244c754
+  data.tar.gz: 8de0575d7e68cb46dd177a63ab6ab7fdee11238b191f611d38491367fe8a6f4d
 SHA512:
-  metadata.gz: 636879880957a7bb7d8f4f516ed6a2fef9e0e7c8599928f5602d4a826115b4e3c0d32f3ba8f1908ae6cfe2ba626d88f0fc89644d5bd798a01d59c64b83ee618e
-  data.tar.gz: d0867f25e9925feef2b27260430470ab6e640f7bbc60383917626d1899dcbe221c67671274a861b8764cf7d24c0bd291b38bd7e8ba6389c5e047b12d2b76d937
+  metadata.gz: 74cfbd519a7fee3bdbff93ac43dffefcfb26adb3c2dbbc8673b8e13e75a5fb97dd27252063a22fa7d5a140945ed87c3df9d0ec4da5cbb619d3507b5369fe3e9e
+  data.tar.gz: 3664cbb17b43ed08f7d434e2e6d2ecb0cd09b78667b12b9957ffa3b36e8badca38ec905227ee40ef853a3b1bab516683d1b7a150791a69cb23d5ccfb346ce85f

data/lib/gds_api/govuk_headers.rb

@@ -6,7 +6,7 @@ module GdsApi
       end
 
       def headers
-        header_data.select { |_k, v| !(v.nil? || v.empty?) }
+        header_data.reject { |_k, v| (v.nil? || v.empty?) }
       end
 
       def clear_headers

data/lib/gds_api/imminence.rb

@@ -2,7 +2,7 @@ require_relative 'base'
 
 class GdsApi::Imminence < GdsApi::Base
   def api_url(type, params)
-    vals = [:limit, :lat, :lng, :postcode].select { |p| params.include? p }
+    vals = %i[limit lat lng postcode].select { |p| params.include? 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

@@ -259,26 +259,21 @@ module GdsApi
       end
 
       return ::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}")
-
     rescue RestClient::Exceptions::Timeout => e
       logger.error loggable.merge(status: 'timeout', error_message: e.message, error_class: e.class.name, end_time: Time.now.to_f).to_json
       raise GdsApi::TimedOutException.new
-
     rescue URI::InvalidURIError => e
       logger.error loggable.merge(status: 'invalid_uri', error_message: e.message, error_class: e.class.name, end_time: Time.now.to_f).to_json
       raise GdsApi::InvalidUrl
-
     rescue RestClient::Exception => e
       # Log the error here, since we have access to loggable, but raise the
       # exception up to the calling method to deal with
       loggable.merge!(status: e.http_code, end_time: Time.now.to_f, body: e.http_body)
       logger.warn loggable.to_json
       raise
-
     rescue Errno::ECONNRESET => e
       logger.error loggable.merge(status: 'connection_reset', error_message: e.message, error_class: e.class.name, end_time: Time.now.to_f).to_json
       raise GdsApi::TimedOutException.new

data/lib/gds_api/null_cache.rb

@@ -4,10 +4,8 @@ module GdsApi
       nil
     end
 
-    def []=(k, v)
-    end
+    def []=(k, v); end
 
-    def store(k, v, expiry_time = nil)
-    end
+    def store(k, v, expiry_time = nil); end
   end
 end

data/lib/gds_api/publishing_api.rb

@@ -12,6 +12,7 @@ class GdsApi::PublishingApi < GdsApi::Base
     e
   end
 
+  # @deprecated Use GdsApi::PublishingApiV2
   def put_path(base_path, payload)
     put_json(paths_url(base_path), payload)
   end

data/lib/gds_api/publishing_api_v2.rb

@@ -104,10 +104,7 @@ class GdsApi::PublishingApiV2 < GdsApi::Base
       update_type: update_type
     }
 
-    optional_keys = [
-      :locale,
-      :previous_version,
-    ]
+    optional_keys = %i[locale previous_version]
 
     params = merge_optional_keys(params, options, optional_keys)
 
@@ -174,10 +171,7 @@ class GdsApi::PublishingApiV2 < GdsApi::Base
   #
   # @see https://github.com/alphagov/publishing-api/blob/master/doc/api.md#post-v2contentcontent_iddiscard-draft
   def discard_draft(content_id, options = {})
-    optional_keys = [
-      :locale,
-      :previous_version,
-    ]
+    optional_keys = %i[locale previous_version]
 
     params = merge_optional_keys({}, options, optional_keys)
 
@@ -291,7 +285,7 @@ class GdsApi::PublishingApiV2 < GdsApi::Base
       links: params.fetch(:links)
     }
 
-    payload = merge_optional_keys(payload, params, [:previous_version, :bulk_publishing])
+    payload = merge_optional_keys(payload, params, %i[previous_version bulk_publishing])
 
     patch_json(links_url(content_id), payload)
   end
@@ -422,6 +416,19 @@ class GdsApi::PublishingApiV2 < GdsApi::Base
     post_json("#{endpoint}/v2/links/by-content-id", content_ids: content_ids).to_hash
   end
 
+  # Reserves a path for a publishing application
+  #
+  # Returns success or failure only.
+  #
+  # @param payload [Hash]
+  # @option payload [Hash] publishing_app The publishing application, like `content-tagger`
+  #
+  # @see https://docs.publishing.service.gov.uk/apis/publishing-api/api.html#put-pathsbase_path
+  def put_path(base_path, payload)
+    url = "#{endpoint}/paths#{base_path}"
+    put_json(url, payload)
+  end
+
 private
 
   def content_url(content_id, params = {})

data/lib/gds_api/response.rb

@@ -87,7 +87,7 @@ module GdsApi
       when Hash
         Hash[value.map { |k, v|
           # NOTE: Don't bother transforming if the value is nil
-          if 'web_url' == k && v
+          if k == 'web_url' && v
             # Use relative URLs to route when the web_url value is on the
             # same domain as the site root. Note that we can't just use the
             # `route_to` method, as this would give us technically correct

data/lib/gds_api/router.rb

@@ -19,7 +19,7 @@ class GdsApi::Router < GdsApi::Base
 
   def get_route(path, type = nil)
     if type
-      $stderr.puts "DEPRECATION WARNING: passing type to GdsApi::Router#get_route is deprecated and will be removed in a future version. Caller: #{caller[0]}"
+      warn "DEPRECATION WARNING: passing type to GdsApi::Router#get_route is deprecated and will be removed in a future version. Caller: #{caller(1..1)}"
     end
     get_json("#{endpoint}/routes?incoming_path=#{CGI.escape(path)}")
   end

data/lib/gds_api/test_helpers/mapit.rb

@@ -23,7 +23,7 @@ module GdsApi
           "postcode"  => postcode
         }
 
-        area_response = Hash[areas.map.with_index {|area, i|
+        area_response = Hash[areas.map.with_index { |area, i|
           [i, {
             'codes' => {
               'ons' => area['ons'],
@@ -31,7 +31,8 @@ module GdsApi
               'govuk_slug' => area['govuk_slug']
             },
             'name' => area['name'],
-            'type' => area['type']
+            'type' => area['type'],
+            'country_name' => area['country_name']
           }]
         }]
 

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '52.6.0'.freeze
+  VERSION = '52.7.0'.freeze
 end

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 52.6.0
+  version: 52.7.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: plek
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.0
-- !ruby/object:Gem::Dependency
-  name: null_logger
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,35 +53,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: null_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-cache
+  name: plek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: rack-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: govuk-content-schema-test-helpers
   requirement: !ruby/object:Gem::Requirement