gds-api-adapters 4.1.0 → 4.1.1

data/lib/gds_api/base.rb

@@ -1,6 +1,7 @@
 require_relative 'json_client'
 require 'cgi'
 require 'null_logger'
+require 'plek'
 
 class GdsApi::Base
   class InvalidAPIURL < StandardError

data/lib/gds_api/test_helpers/content_api.rb

@@ -5,7 +5,9 @@ require_relative 'content_api/artefact_stub'
 module GdsApi
   module TestHelpers
     module ContentApi
-      CONTENT_API_ENDPOINT = 'https://contentapi.test.alphagov.co.uk'
+      # Generally true. If you are initializing the client differently,
+      # you could redefine/override the constant or stub directly.
+      CONTENT_API_ENDPOINT = Plek.current.find('contentapi')
 
       # Takes an array of slugs, or hashes with section details (including a slug).
       # Will stub out content_api calls for tags of type section to return these sections

data/lib/gds_api/test_helpers/imminence.rb

@@ -3,7 +3,10 @@ require 'gds_api/test_helpers/json_client_helper'
 module GdsApi
   module TestHelpers
     module Imminence
-      IMMINENCE_API_HOST = "imminence.test.alphagov.co.uk"
+      # Generally true. If you are initializing the client differently,
+      # you could redefine/override the constant or stub directly.
+      IMMINENCE_API_HOST = URI.parse(Plek.current.find('imminence')).host
+
       def imminence_has_places(latitude, longitude, details)
         response = JSON.dump(details['details'])
 

data/lib/gds_api/test_helpers/licence_application.rb

@@ -3,7 +3,9 @@ require 'gds_api/test_helpers/json_client_helper'
 module GdsApi
   module TestHelpers
     module LicenceApplication
-      LICENCE_APPLICATION_ENDPOINT = "https://licensify.test.alphagov.co.uk"
+      # Generally true. If you are initializing the client differently,
+      # you could redefine/override the constant or stub directly.
+      LICENCE_APPLICATION_ENDPOINT = Plek.current.find("licensify")
 
       def licence_exists(identifier, licence)
         licence = licence.to_json unless licence.is_a?(String)

data/lib/gds_api/test_helpers/panopticon.rb

@@ -3,7 +3,9 @@ require 'gds_api/test_helpers/json_client_helper'
 module GdsApi
   module TestHelpers
     module Panopticon
-      PANOPTICON_ENDPOINT = 'https://panopticon.test.alphagov.co.uk'
+      # Generally true. If you are initializing the client differently,
+      # you could redefine/override the constant or stub directly.
+      PANOPTICON_ENDPOINT = Plek.current.find('panopticon')
 
       def stringify_hash_keys(input_hash)
         input_hash.inject({}) do |options, (key, value)|

data/lib/gds_api/test_helpers/publisher.rb

@@ -3,7 +3,9 @@ require 'gds_api/test_helpers/json_client_helper'
 module GdsApi
   module TestHelpers
     module Publisher
-      PUBLISHER_ENDPOINT = "https://publisher.test.alphagov.co.uk"
+      # Generally true. If you are initializing the client differently,
+      # you could redefine/override the constant or stub directly.
+      PUBLISHER_ENDPOINT = Plek.current.find("publisher")
 
       def publication_exists(details, options = {})
         json = JSON.dump(details)

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/test/content_api_test.rb

@@ -6,7 +6,7 @@ describe GdsApi::ContentApi do
   include GdsApi::TestHelpers::ContentApi
 
   before do
-    @base_api_url = "https://contentapi.test.alphagov.co.uk"
+    @base_api_url = Plek.current.find("contentapi")
     @api = GdsApi::ContentApi.new(@base_api_url)
   end
 
@@ -15,7 +15,7 @@ describe GdsApi::ContentApi do
       content_api_has_root_sections(["crime"])
       response = @api.sections
       first_section = response["results"][0]
-      assert_equal "https://contentapi.test.alphagov.co.uk/tags/crime.json", first_section["id"]
+      assert_equal "#{@base_api_url}/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 "https://contentapi.test.alphagov.co.uk/devolution-uk.json", response["id"]
+      assert_equal "#{@base_api_url}/devolution-uk.json", response["id"]
     end
 
     it "should be able to fetch unpublished editions when authenticated" do
       api = GdsApi::ContentApi.new(@base_api_url, { bearer_token: 'MY_BEARER_TOKEN' })
       content_api_has_unpublished_artefact("devolution-uk", 3)
       response = api.artefact("devolution-uk", edition: 3)
-      assert_equal "https://contentapi.test.alphagov.co.uk/devolution-uk.json", response["id"]
+      assert_equal "#{@base_api_url}/devolution-uk.json", response["id"]
     end
 
     it "should raise an exception if no bearer token is used when fetching unpublished editions" do
@@ -304,19 +304,19 @@ describe GdsApi::ContentApi do
 
         assert_requested :get, %r{\A#{@base_api_url}/business_support_schemes\.json}, :times => 2
 
-        first_batch = ids[0..190]
+        first_batch = ids[0..191]
         assert_requested :get, "#{@base_api_url}/business_support_schemes.json?identifiers=#{first_batch.join(',')}"
-        second_batch = ids[191..299]
+        second_batch = ids[192..299]
         assert_requested :get, "#{@base_api_url}/business_support_schemes.json?identifiers=#{second_batch.join(',')}"
       end
 
       it "should merge the responses into a single GdsApi::Response" do
         ids = (1..300).map {|n| sprintf "%09d", n } # each id is 9 chars long
-        first_batch = ids[0..190]
+        first_batch = ids[0..191]
         stub_request(:get, "#{@base_api_url}/business_support_schemes.json").
           with(:query => {"identifiers" => first_batch.join(',')}).
           to_return(:status => 200, :body => api_response_for_results(first_batch).to_json) # We're stubbing response that just return the requested ids
-        second_batch = ids[191..299]
+        second_batch = ids[192..299]
         stub_request(:get, "#{@base_api_url}/business_support_schemes.json").
           with(:query => {"identifiers" => second_batch.join(',')}).
           to_return(:status => 200, :body => api_response_for_results(second_batch).to_json)

data/test/test_helper.rb

@@ -1,3 +1,8 @@
+# Ensure that in tests, we get a consistent domain back from Plek < 1.0.0
+# Without this, content API tests re chunking of requests with long URLs would
+# pass/fail in dev/CI.
+ENV['RACK_ENV'] = "test"
+
 require 'bundler'
 Bundler.setup :default, :development, :test
 

metadata

@@ -2,7 +2,7 @@
 name: gds-api-adapters
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors: 
 - James Stewart
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-26 00:00:00 Z
+date: 2012-11-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plek
@@ -214,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -316804673231244671
+      hash: 3713358432051665576
       segments: 
       - 0
       version: "0"
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -316804673231244671
+      hash: 3713358432051665576
       segments: 
       - 0
       version: "0"