gds-api-adapters 36.1.0 → 36.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcbac32e46d147fa75d158358e3f43b858dc717f
-  data.tar.gz: f0085c380372ea653dbe604d12b956ce47cfb6c9
+  metadata.gz: 159f3160e4dabd497fa880d34c3bdcf5e6cf969b
+  data.tar.gz: f797232c04c2cdb65463bc09ea6ac76f47ccdecb
 SHA512:
-  metadata.gz: 777ae29ce2fd0b642452b4bf84c292a0aa2b198b1945ddccfce464841c6c119ac912e8308b228fd8dceee1ef4185e0809b7eeaf8ca6e2c155b4e8f6495724a35
-  data.tar.gz: 5a7182ee26869c0ee8da18208538a3032a5501980109974bea46f482ee5ab40d570dacfc1f0236cbd90f877ca20faef423fed7369b51db91370a7c63d7036f0d
+  metadata.gz: a2c0eb54200b50436293a626f340a340f7d6d1f17374e8a2fa8c59fbd8daaff402050a8763f908acaabd7c1ef4e75549022fcdd218898380b3dd9111feb6c286
+  data.tar.gz: 78ed4872691ad3e45156ef2671e4839a1ac708caa76ca8a8e0b001bafd62d4a42c9d17a5489d6a2fd65ddb3fedf3dd036b5fc2a1ceaf33cdc5c00c6f675571ae

data/lib/gds_api/asset_manager.rb

@@ -91,6 +91,29 @@ class GdsApi::AssetManager < GdsApi::Base
     get_json("#{base_url}/assets/#{id}")
   end
 
+  # Deletes an asset given an id
+  #
+  # Makes a +DELETE+ request to the asset manager api to delete an asset.
+  #
+  # @param id [String] The asset identifier (a UUID).
+  # @return [GdsApi::Response] The wrapped http response from the api. Behaves
+  #   both as a +Hash+ and an +OpenStruct+, and responds to the following:
+  #     :id           the URL of the asset
+  #     :name         the filename of the asset that will be served
+  #     :content_type the content_type of the asset
+  #     :file_url     the URL from which the asset will be served when it has
+  #                   passed a virus scan
+  #     :state        One of 'unscanned', 'clean', or 'infected'. Unless the state is
+  #                   'clean' the asset at the :file_url will 404
+  #
+  # @raise [HTTPErrorResponse] if the request returns an error
+  # @example Delete a file from disk
+  #   uuid = '594602dd-75b3-4e6f-b5d1-cacf8c4d4164'
+  #   asset_manager.delete_asset(uuid)
+  def delete_asset(id)
+    delete_json("#{base_url}/assets/#{id}")
+  end
+
   private
     def base_url
       endpoint

data/lib/gds_api/test_helpers/publishing_api_v2.rb

@@ -169,8 +169,13 @@ module GdsApi
       #)
       def publishing_api_has_content(items, params = {})
         url = PUBLISHING_API_V2_ENDPOINT + "/content"
-        per_page = params.fetch(:per_page, 50)
-        page = params.fetch(:page, 1)
+        if params.respond_to? :fetch
+          per_page = params.fetch(:per_page, 50)
+          page = params.fetch(:page, 1)
+        else
+          per_page = 50
+          page = 1
+        end
         number_of_pages = items.count < per_page ? 1 : items.count / per_page
 
         body = {

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '36.1.0'
+  VERSION = '36.2.0'
 end

data/test/asset_manager_test.rb

@@ -22,6 +22,14 @@ describe GdsApi::AssetManager do
     }
   }
 
+  before do
+    GdsApi.config.always_raise_for_not_found = true
+  end
+
+  after do
+    GdsApi.config.always_raise_for_not_found = false
+  end
+
   it "creates an asset with a file" do
     req = stub_request(:post, "#{base_api_url}/assets").
       with(:body => %r{Content\-Disposition: form\-data; name="asset\[file\]"; filename="hello\.txt"\r\nContent\-Type: text/plain}).
@@ -33,10 +41,12 @@ describe GdsApi::AssetManager do
     assert_requested(req)
   end
 
-  it "returns nil when an asset does not exist" do
+  it "returns not found when an asset does not exist" do
     asset_manager_does_not_have_an_asset("not-really-here")
 
-    assert_nil api.asset("not-really-here")
+    assert_raises GdsApi::HTTPNotFound do
+      api.asset("not-really-here")
+    end
   end
 
   describe "an asset exists" do
@@ -69,4 +79,14 @@ describe GdsApi::AssetManager do
       assert_equal "http://fooey.gov.uk/media/photo.jpg", asset.file_url
     end
   end
+
+  it "deletes an asset for the given id" do
+    req = stub_request(:delete, "#{base_api_url}/assets/#{asset_id}").
+      to_return(:body => JSON.dump(asset_manager_response), :status => 200)
+
+    response = api.delete_asset(asset_id)
+
+    assert_equal "#{base_api_url}/assets/#{asset_id}", response.asset.id
+    assert_requested(req)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 36.1.0
+  version: 36.2.0
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek