gds-api-adapters 2.5.0 → 2.6.0

data/lib/gds_api/content_api.rb

@@ -9,15 +9,19 @@ class GdsApi::ContentApi < GdsApi::Base
   end
 
   def with_tag(tag)
-    get_json!("#{base_url}/with_tag.json?tag=#{tag}&include_children=1")
+    get_json!("#{base_url}/with_tag.json?tag=#{CGI.escape(tag)}&include_children=1")
   end
 
   def curated_list(tag)
-    get_json("#{base_url}/with_tag.json?tag=#{tag}&sort=curated")
+    get_json("#{base_url}/with_tag.json?tag=#{CGI.escape(tag)}&sort=curated")
   end
 
   def artefact(slug)
-    get_json("#{base_url}/#{slug}.json")
+    get_json("#{base_url}/#{CGI.escape(slug)}.json")
+  end
+
+  def artefact_with_snac_code(slug, snac)
+    get_json("#{base_url}/#{CGI.escape(slug)}.json?snac=#{CGI.escape(snac)}")
   end
 
   def local_authority(snac_code)

data/lib/gds_api/test_helpers/content_api.rb

@@ -34,6 +34,11 @@ module GdsApi
         stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
       end
 
+      def content_api_has_an_artefact_with_snac_code(slug, snac, body = artefact_for_slug(slug))
+        url = "#{CONTENT_API_ENDPOINT}/#{slug}.json?snac=#{snac}"
+        stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
+      end
+
       def content_api_does_not_have_an_artefact(slug)
         body = {
           "_response_info" => {

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/test/content_api_test.rb

@@ -33,6 +33,37 @@ describe GdsApi::ContentApi do
     end
   end
 
+  describe "licence" do
+    it "should return an artefact with licence for a snac code" do
+      response = content_api_has_an_artefact_with_snac_code("licence-example", '1234', {
+        "title" => "Licence Example",
+        "slug" => "licence-example",
+        "details" => {
+          "licence" => {
+            "location_specific" => false,
+            "availability" => [ "England", "Wales" ],
+            "authorities" => [ ]
+          }
+        }
+      })
+      response = @api.artefact_with_snac_code('licence-example', '1234')
+
+      assert_equal "Licence Example", response["title"]
+      assert_equal [ "England", "Wales" ], response["details"]["licence"]["availability"]
+    end
+
+    it "should escape snac code when searching for licence" do
+      stub_request(:get, "#{@base_api_url}/licence-example.json?snac=snacks%21").
+        to_return(:status => 200,
+                  :body => {"test" => "ing"}.to_json,
+                  :headers => {})
+
+      @api.artefact_with_snac_code("licence-example","snacks!")
+
+      assert_requested :get, "#{@base_api_url}/licence-example.json?snac=snacks%21"
+    end
+  end
+
   describe "local authorities" do
     it "should return nil if no local authority found" do
       stub_request(:get, "#{@base_api_url}/local_authorities/does-not-exist.json").

metadata

@@ -1,292 +1,239 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gds-api-adapters
-version: !ruby/object:Gem::Version
-  version: 2.5.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 2.6.0
 platform: ruby
-authors:
+authors: 
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-21 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: plek
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: null_logger
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: lrucache
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '3.12'
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: "3.12"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: webmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
+      - !ruby/object:Gem::Version 
+        version: "1.8"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.12.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.12.4
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 3.4.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.4.0
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: gem_publisher
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.1
+  version_requirements: *id012
 description: A set of adapters providing easy access to the GDS gov.uk APIs
-email:
+email: 
 - jystewart@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/gds_api/base.rb
-- lib/gds_api/contactotron.rb
+
+files: 
 - lib/gds_api/content_api.rb
-- lib/gds_api/core-ext/openstruct.rb
-- lib/gds_api/exceptions.rb
-- lib/gds_api/helpers.rb
-- lib/gds_api/imminence.rb
-- lib/gds_api/json_client.rb
 - lib/gds_api/licence_application.rb
-- lib/gds_api/needotron.rb
-- lib/gds_api/panopticon/registerer.rb
-- lib/gds_api/panopticon.rb
-- lib/gds_api/part_methods.rb
-- lib/gds_api/publisher.rb
-- lib/gds_api/response.rb
-- lib/gds_api/rummager.rb
-- lib/gds_api/test_helpers/contactotron.rb
 - lib/gds_api/test_helpers/content_api.rb
-- lib/gds_api/test_helpers/imminence.rb
-- lib/gds_api/test_helpers/json_client_helper.rb
 - lib/gds_api/test_helpers/licence_application.rb
-- lib/gds_api/test_helpers/panopticon.rb
+- lib/gds_api/test_helpers/contactotron.rb
+- lib/gds_api/test_helpers/json_client_helper.rb
 - lib/gds_api/test_helpers/publisher.rb
+- lib/gds_api/test_helpers/panopticon.rb
+- lib/gds_api/test_helpers/imminence.rb
+- lib/gds_api/part_methods.rb
+- lib/gds_api/needotron.rb
+- lib/gds_api/rummager.rb
 - lib/gds_api/typhoeus_client.rb
+- lib/gds_api/json_client.rb
+- lib/gds_api/contactotron.rb
+- lib/gds_api/response.rb
+- lib/gds_api/panopticon/registerer.rb
+- lib/gds_api/publisher.rb
+- lib/gds_api/exceptions.rb
 - lib/gds_api/version.rb
+- lib/gds_api/helpers.rb
+- lib/gds_api/base.rb
+- lib/gds_api/panopticon.rb
+- lib/gds_api/core-ext/openstruct.rb
+- lib/gds_api/imminence.rb
 - README.md
 - Rakefile
-- test/contactotron_api_test.rb
-- test/content_api_test.rb
-- test/gds_api_base_test.rb
 - test/imminence_api_test.rb
-- test/json_client_test.rb
+- test/contactotron_api_test.rb
+- test/rummager_test.rb
 - test/licence_application_api_test.rb
-- test/panopticon_api_test.rb
-- test/panopticon_registerer_test.rb
+- test/json_client_test.rb
 - test/publisher_api_test.rb
-- test/rummager_test.rb
+- test/panopticon_registerer_test.rb
+- test/panopticon_api_test.rb
 - test/test_helper.rb
+- test/gds_api_base_test.rb
+- test/content_api_test.rb
 homepage: http://github.com/alphagov/gds-api-adapters
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -727284254732097634
+      segments: 
       - 0
-      hash: -3693356680320886442
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -727284254732097634
+      segments: 
       - 0
-      hash: -3693356680320886442
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Adapters to work with GDS APIs
-test_files:
-- test/contactotron_api_test.rb
-- test/content_api_test.rb
-- test/gds_api_base_test.rb
+test_files: 
 - test/imminence_api_test.rb
-- test/json_client_test.rb
+- test/contactotron_api_test.rb
+- test/rummager_test.rb
 - test/licence_application_api_test.rb
-- test/panopticon_api_test.rb
-- test/panopticon_registerer_test.rb
+- test/json_client_test.rb
 - test/publisher_api_test.rb
-- test/rummager_test.rb
+- test/panopticon_registerer_test.rb
+- test/panopticon_api_test.rb
 - test/test_helper.rb
+- test/gds_api_base_test.rb
+- test/content_api_test.rb