gds-api-adapters 2.11.0 → 3.0.0

data/lib/gds_api/content_api.rb

@@ -32,20 +32,20 @@ class GdsApi::ContentApi < GdsApi::Base
     get_json!("#{base_url}/with_tag.json?tag=#{CGI.escape(tag)}&sort=#{sort_by}")
   end
 
-  def artefact(slug, edition=nil)
+  def artefact(slug, params={})
+    edition = params[:edition]
+    snac = params[:snac]
+
     url = "#{base_url}/#{slug}.json"
-    if edition
-      if options.include?(:bearer_token)
-        url += "?edition=#{edition}"
-      else
-        raise GdsApi::NoBearerToken
-      end
+    query = params.map { |k,v| "#{k}=#{v}" }
+    if query.any?
+      url += "?#{query.join("&")}"
     end
-    get_json(url)
-  end
 
-  def artefact_with_snac_code(slug, snac)
-    get_json("#{base_url}/#{slug}.json?snac=#{CGI.escape(snac)}")
+    if edition && ! options.include?(:bearer_token)
+      raise GdsApi::NoBearerToken
+    end
+    get_json(url)
   end
 
   def local_authority(snac_code)

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '2.11.0'
+  VERSION = '3.0.0'
 end

data/test/content_api_test.rb

@@ -29,14 +29,14 @@ describe GdsApi::ContentApi do
     it "should be able to fetch unpublished editions when authenticated" do
       api = GdsApi::ContentApi.new('test', { bearer_token: 'MY_BEARER_TOKEN' })
       content_api_has_unpublished_artefact("devolution-uk", 3)
-      response = api.artefact("devolution-uk", 3)
+      response = api.artefact("devolution-uk", edition: 3)
       assert_equal "http://contentapi.test.gov.uk/devolution-uk.json", response["id"]
     end
 
     it "should raise an exception if no bearer token is used when fetching unpublished editions" do
       content_api_has_unpublished_artefact("devolution-uk", 3)
       assert_raises GdsApi::NoBearerToken do
-        @api.artefact("devolution-uk", 3)
+        @api.artefact("devolution-uk", edition: 3)
       end
     end
   end
@@ -80,7 +80,7 @@ describe GdsApi::ContentApi do
           }
         }
       })
-      response = @api.artefact_with_snac_code('licence-example', '1234')
+      response = @api.artefact('licence-example', snac: '1234')
 
       assert_equal "Licence Example", response["title"]
       assert_equal [ "England", "Wales" ], response["details"]["licence"]["availability"]
@@ -92,10 +92,21 @@ describe GdsApi::ContentApi do
                   :body => {"test" => "ing"}.to_json,
                   :headers => {})
 
-      @api.artefact_with_snac_code("licence-example","snacks!")
+      @api.artefact("licence-example", snac: "snacks!")
 
       assert_requested :get, "#{@base_api_url}/licence-example.json?snac=snacks%21"
     end
+
+    it "should return an unpublished artefact with a snac code" do
+      body = artefact_for_slug('licence-example')
+      url = "#{CONTENT_API_ENDPOINT}/licence-example.json?snac=1234&edition=1"
+      stub_request(:get, url).to_return(status: 200, body: body.to_json)
+
+      api = GdsApi::ContentApi.new('test', { bearer_token: 'MY_BEARER_TOKEN' })
+      response = api.artefact('licence-example', snac: '1234', edition: '1')
+
+      assert_equal "Licence example", response["title"]
+    end
   end
 
   describe "local authorities" do

metadata

@@ -2,7 +2,7 @@
 name: gds-api-adapters
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.11.0
+  version: 3.0.0
 platform: ruby
 authors: 
 - James Stewart
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-02 00:00:00 Z
+date: 2012-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plek
@@ -205,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1655582362177723413
+      hash: -4542127059758374490
       segments: 
       - 0
       version: "0"
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1655582362177723413
+      hash: -4542127059758374490
       segments: 
       - 0
       version: "0"