gds-api-adapters 103.4.3 → 103.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e2d0b360ae0c79b7c043da8ca1eb34eeed1967cc9b4bbb40e857708d03a2be2
-  data.tar.gz: 66b220a1b77ea7b0dedbd3a96707572293f1be96be1a56203c5db3e68acdbd34
+  metadata.gz: a16eeb04e5ae0282ef96464d7bdefeabb36af1abad68f13b668c48c8da9863de
+  data.tar.gz: be9ba8b486eb72d934c453190ea418ceda3f201be539d61f54e21b94ad84fb6e
 SHA512:
-  metadata.gz: 6e63df1944c2be46ad0f150535fb7925d933d9a39801789a739fe317d16173ee0ad9cade9ccb6b52aacef7e5edefeaf3ea881ed11b2a02fb21b04c32cd16a5bc
-  data.tar.gz: f49f78dc28da952d0a8441ed84e8cbaea59a2183e09fa41d0aec6badde07726cef28a805207b7bf842f61845a02f132c97d788b47f891bc00b8dd5c2bfc805ad
+  metadata.gz: 22e8d2982e271859a39da521b80271440916bb242f279f8b5f59c212ee1f51443975b71e038cd45f76b86e4b7e87114e1a0a2c95a7286af4dc230ccd0a218e8e
+  data.tar.gz: 169ff661db18aec63bcdedd26b533c5e0fcd6b3e742e5b22bed2fb195efca3049ffe1ae486cb33ba2888100f6714fcfa27c60eb71f0a3168ec9da455038cd59e

data/lib/gds_api/content_store.rb

@@ -5,6 +5,9 @@ require_relative "exceptions"
 
 class GdsApi::ContentStore < GdsApi::Base
   def content_item(base_path)
+    validator = GdsApi::Validators::BasePathValidator.new(base_path)
+    raise GdsApi::HTTPBadRequest, validator.errors unless validator.valid?
+
     get_json(content_item_url(base_path))
   rescue GdsApi::HTTPNotFound => e
     raise ItemNotFound.build_from(e)

data/lib/gds_api/test_helpers/asset_manager.rb

@@ -166,11 +166,6 @@ module GdsApi
           .to_return(status: 404)
       end
 
-      def stub_asset_manager_restore_asset_conflict(asset_id)
-        stub_request(:post, "#{ASSET_MANAGER_ENDPOINT}/assets/#{asset_id}/restore")
-          .to_return(status: 409)
-      end
-
       def stub_asset_manager_restore_asset_failure(asset_id)
         stub_request(:post, "#{ASSET_MANAGER_ENDPOINT}/assets/#{asset_id}/restore")
           .to_return(status: 500)

data/lib/gds_api/validators/base_path_validator.rb

@@ -10,11 +10,13 @@ module GdsApi
       end
 
       def valid?
-        !(base_path.nil? || no_leading_slash? || too_long? || potential_path_traversal? || ends_with_a_period? || invalid_chars?)
+        return true unless base_path
+
+        !(no_leading_slash? || too_long? || potential_path_traversal? || ends_with_a_period? || invalid_chars?)
       end
 
       def errors
-        return { base_path_invalid: ["must not be nil"] } if base_path.nil?
+        return {} unless base_path
 
         errors = []
         errors << [:base_path_invalid, "must start with a /"] if no_leading_slash?

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = "103.4.3".freeze
+  VERSION = "103.5.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 103.4.3
+  version: 103.5.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -163,6 +163,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: minitest-mock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -412,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.19
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Adapters to work with GDS APIs
 test_files: []