gds-api-adapters 3.3.0 → 3.3.1

data/lib/gds_api/test_helpers/content_api.rb

@@ -10,7 +10,7 @@ module GdsApi
         body = plural_response_base.merge(
           "results" => slugs.map do |slug|
             {
-              "id" => "http://contentapi.test.gov.uk/tags/#{CGI.escape(slug)}.json",
+              "id" => "#{CONTENT_API_ENDPOINT}/tags/#{CGI.escape(slug)}.json",
               "web_url" => nil,
               "title" => titleize_slug(slug),
               "details" => {
@@ -19,7 +19,7 @@ module GdsApi
               },
               "parent" => nil,
               "content_with_tag" => {
-                "id" => "http://contentapi.test.gov.uk/with_tag.json?tag=#{CGI.escape(slug)}",
+                "id" => "#{CONTENT_API_ENDPOINT}/with_tag.json?tag=#{CGI.escape(slug)}",
                 "web_url" => "http://www.test.gov.uk/browse/#{slug}"
               }
             }
@@ -42,8 +42,11 @@ module GdsApi
             artefact_for_slug(artefact_slug)
           end
         )
-        url = "https://contentapi.test.alphagov.co.uk/with_tag.json?sort=alphabetical&tag=#{CGI.escape(slug)}"
-        stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
+        sort_orders = ["alphabetical", "curated"]
+        sort_orders.each do |order|
+          url = "#{CONTENT_API_ENDPOINT}/with_tag.json?sort=#{order}&tag=#{CGI.escape(slug)}"
+          stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
+        end
       end
 
       def content_api_has_subsections(parent_slug, subsection_slugs)
@@ -51,7 +54,7 @@ module GdsApi
         body = plural_response_base.merge(
           "results" => subsection_slugs.map do |slug|
             {
-              "id" => "http://contentapi.test.gov.uk/tags/#{CGI.escape(slug)}.json",
+              "id" => "#{CONTENT_API_ENDPOINT}/tags/#{CGI.escape(slug)}.json",
               "web_url" => nil,
               "title" => titleize_slug(slug),
               "details" => {
@@ -60,7 +63,7 @@ module GdsApi
               },
               "parent" => parent_section,
               "content_with_tag" => {
-                "id" => "http://contentapi.test.gov.uk/with_tag.json?tag=#{CGI.escape(slug)}",
+                "id" => "#{CONTENT_API_ENDPOINT}/with_tag.json?tag=#{CGI.escape(slug)}",
                 "web_url" => "http://www.test.gov.uk/browse/#{slug}"
               }
             }
@@ -117,7 +120,7 @@ module GdsApi
         singular_response_base.merge(
           "title" => titleize_slug(slug),
           "format" => "guide",
-          "id" => "http://contentapi.test.gov.uk/#{slug}.json",
+          "id" => "#{CONTENT_API_ENDPOINT}/#{slug}.json",
           "web_url" => "http://frontend.test.gov.uk/#{slug}",
           "details" => {
             "need_id" => "1234",
@@ -184,7 +187,7 @@ module GdsApi
         artefact["related"] = related_artefact_slugs.map do |related_slug|
           {
             "title" => titleize_slug(related_slug),
-            "id" => "https://contentapi.test.alphagov.co.uk/#{CGI.escape(related_slug)}.json",
+            "id" => "#{CONTENT_API_ENDPOINT}/#{CGI.escape(related_slug)}.json",
             "web_url" => "https://www.test.gov.uk/#{related_slug}",
             "details" => {}
           }
@@ -198,12 +201,12 @@ module GdsApi
         end
         {
           "title" => titleize_slug(slug.split('/').last),
-          "id" => "https://contentapi.test.alphagov.co.uk/tags/#{CGI.escape(slug)}.json",
+          "id" => "#{CONTENT_API_ENDPOINT}/tags/#{CGI.escape(slug)}.json",
           "details" => {
             "type" => tag_type
           },
           "content_with_tag" => {
-            "id" => "https://contentapi.test.alphagov.co.uk/with_tag.json?tag=#{CGI.escape(slug)}",
+            "id" => "#{CONTENT_API_ENDPOINT}/with_tag.json?tag=#{CGI.escape(slug)}",
             "web_url" => "https://www.test.gov.uk/browse/#{slug}",
           },
           "parent" => parent

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '3.3.0'
+  VERSION = '3.3.1'
 end

data/test/content_api_test.rb

@@ -15,7 +15,7 @@ describe GdsApi::ContentApi do
       content_api_has_root_sections(["crime"])
       response = @api.sections
       first_section = response["results"][0]
-      assert_equal "http://contentapi.test.gov.uk/tags/crime.json", first_section["id"]
+      assert_equal "https://contentapi.test.alphagov.co.uk/tags/crime.json", first_section["id"]
     end
   end
 
@@ -23,14 +23,14 @@ describe GdsApi::ContentApi do
     it "should show the artefact" do
       content_api_has_an_artefact("devolution-uk")
       response = @api.artefact("devolution-uk")
-      assert_equal "http://contentapi.test.gov.uk/devolution-uk.json", response["id"]
+      assert_equal "https://contentapi.test.alphagov.co.uk/devolution-uk.json", response["id"]
     end
 
     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", edition: 3)
-      assert_equal "http://contentapi.test.gov.uk/devolution-uk.json", response["id"]
+      assert_equal "https://contentapi.test.alphagov.co.uk/devolution-uk.json", response["id"]
     end
 
     it "should raise an exception if no bearer token is used when fetching unpublished editions" do

metadata

@@ -2,7 +2,7 @@
 name: gds-api-adapters
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors: 
 - James Stewart
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-08 00:00:00 Z
+date: 2012-10-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plek
@@ -155,43 +155,43 @@ extra_rdoc_files: []
 
 files: 
 - lib/gds_api/version.rb
-- lib/gds_api/typhoeus_client.rb
-- lib/gds_api/base.rb
-- lib/gds_api/licence_application.rb
-- lib/gds_api/contactotron.rb
+- lib/gds_api/publisher.rb
 - lib/gds_api/panopticon/registerer.rb
-- lib/gds_api/needotron.rb
-- lib/gds_api/imminence.rb
-- lib/gds_api/rummager.rb
+- lib/gds_api/typhoeus_client.rb
 - lib/gds_api/content_api.rb
-- lib/gds_api/exceptions.rb
-- lib/gds_api/json_client.rb
-- lib/gds_api/core-ext/openstruct.rb
-- lib/gds_api/response.rb
-- lib/gds_api/publisher.rb
-- lib/gds_api/test_helpers/licence_application.rb
-- lib/gds_api/test_helpers/contactotron.rb
-- lib/gds_api/test_helpers/imminence.rb
-- lib/gds_api/test_helpers/content_api.rb
+- lib/gds_api/imminence.rb
+- lib/gds_api/contactotron.rb
 - lib/gds_api/test_helpers/publisher.rb
+- lib/gds_api/test_helpers/content_api.rb
+- lib/gds_api/test_helpers/imminence.rb
+- lib/gds_api/test_helpers/contactotron.rb
+- lib/gds_api/test_helpers/licence_application.rb
 - lib/gds_api/test_helpers/panopticon.rb
 - lib/gds_api/test_helpers/json_client_helper.rb
-- lib/gds_api/part_methods.rb
+- lib/gds_api/licence_application.rb
+- lib/gds_api/base.rb
+- lib/gds_api/json_client.rb
+- lib/gds_api/response.rb
+- lib/gds_api/rummager.rb
 - lib/gds_api/panopticon.rb
+- lib/gds_api/core-ext/openstruct.rb
+- lib/gds_api/part_methods.rb
+- lib/gds_api/needotron.rb
+- lib/gds_api/exceptions.rb
 - lib/gds_api/helpers.rb
 - README.md
 - Rakefile
-- test/rummager_test.rb
-- test/publisher_api_test.rb
-- test/licence_application_api_test.rb
+- test/contactotron_api_test.rb
 - test/panopticon_api_test.rb
+- test/publisher_api_test.rb
+- test/rummager_test.rb
 - test/imminence_api_test.rb
+- test/panopticon_registerer_test.rb
+- test/content_api_test.rb
 - test/json_client_test.rb
-- test/test_helper.rb
 - test/gds_api_base_test.rb
-- test/content_api_test.rb
-- test/panopticon_registerer_test.rb
-- test/contactotron_api_test.rb
+- test/licence_application_api_test.rb
+- test/test_helper.rb
 homepage: http://github.com/alphagov/gds-api-adapters
 licenses: []
 
@@ -205,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 604582119140206169
+      hash: 259809380172045694
       segments: 
       - 0
       version: "0"
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 604582119140206169
+      hash: 259809380172045694
       segments: 
       - 0
       version: "0"
@@ -226,14 +226,14 @@ signing_key:
 specification_version: 3
 summary: Adapters to work with GDS APIs
 test_files: 
-- test/rummager_test.rb
-- test/publisher_api_test.rb
-- test/licence_application_api_test.rb
+- test/contactotron_api_test.rb
 - test/panopticon_api_test.rb
+- test/publisher_api_test.rb
+- test/rummager_test.rb
 - test/imminence_api_test.rb
+- test/panopticon_registerer_test.rb
+- test/content_api_test.rb
 - test/json_client_test.rb
-- test/test_helper.rb
 - test/gds_api_base_test.rb
-- test/content_api_test.rb
-- test/panopticon_registerer_test.rb
-- test/contactotron_api_test.rb
+- test/licence_application_api_test.rb
+- test/test_helper.rb