gds-api-adapters 0.0.39 → 0.0.40

data/lib/gds_api/json_client.rb

@@ -17,7 +17,7 @@ module GdsApi
 
     def initialize(options = {})
       @logger = options[:logger] || GdsApi::Base.logger
-      @cache = options[:cache] || JsonClient.cache
+      @cache = JsonClient.cache
       @options = options
     end
 

data/lib/gds_api/test_helpers/contactotron.rb

@@ -1,3 +1,5 @@
+require 'gds_api/test_helpers/json_client_helper'
+
 module GdsApi
   module TestHelpers
     module Contactotron

data/lib/gds_api/test_helpers/imminence.rb

@@ -1,3 +1,5 @@
+require 'gds_api/test_helpers/json_client_helper'
+
 module GdsApi
   module TestHelpers
     module Imminence

data/lib/gds_api/test_helpers/json_client_helper.rb

@@ -0,0 +1,16 @@
+require 'gds_api/json_client'
+
+module GdsApi
+  module TestHelpers
+    class NullCache
+      def [](k)
+        nil
+      end
+
+      def []=(k, v)
+      end
+    end
+  end
+end
+
+GdsApi::JsonClient.cache = GdsApi::TestHelpers::NullCache.new

data/lib/gds_api/test_helpers/panopticon.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'gds_api/test_helpers/json_client_helper'
 
 module GdsApi
   module TestHelpers

data/lib/gds_api/test_helpers/publisher.rb

@@ -1,4 +1,4 @@
-require 'gds_api/json_client'
+require 'gds_api/test_helpers/json_client_helper'
 
 module GdsApi
   module TestHelpers

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '0.0.39'
+  VERSION = '0.0.40'
 end

data/test/json_client_test.rb

@@ -5,7 +5,13 @@ require 'base64'
 
 class JsonClientTest < MiniTest::Spec
   def setup
-    @client = GdsApi::JsonClient.new(cache: {})
+    @json_client_cache = GdsApi::JsonClient.cache
+    GdsApi::JsonClient.cache = {}
+    @client = GdsApi::JsonClient.new
+  end
+
+  def teardown
+    GdsApi::JsonClient.cache = @json_client_cache
   end
 
   def options;

data/test/panopticon_api_test.rb

@@ -27,15 +27,6 @@ class PanopticonApiTest < MiniTest::Unit::TestCase
     GdsApi::Panopticon.new('test')
   end
 
-  def setup
-    @json_client_cache = GdsApi::JsonClient.cache
-    GdsApi::JsonClient.cache = {}
-  end
-
-  def teardown
-    GdsApi::JsonClient.cache = @json_client_cache
-  end
-
   def test_given_a_slug__should_fetch_artefact_from_panopticon
     panopticon_has_metadata(basic_artefact)
 

data/test/publisher_api_test.rb

@@ -54,15 +54,6 @@ class GdsApi::PublisherTest < MiniTest::Unit::TestCase
     GdsApi::Publisher.new("test")
   end
 
-  def setup
-    @json_client_cache = GdsApi::JsonClient.cache
-    GdsApi::JsonClient.cache = {}
-  end
-
-  def teardown
-    GdsApi::JsonClient.cache = @json_client_cache
-  end
-
   def test_given_a_slug_should_go_get_resource_from_publisher_app
     publication_exists(basic_answer)
     pub = api.publication_for_slug(basic_answer['slug'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
-  requirement: &10757900 !ruby/object:Gem::Requirement
+  requirement: &27792140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10757900
+  version_requirements: *27792140
 - !ruby/object:Gem::Dependency
   name: null_logger
-  requirement: &10757120 !ruby/object:Gem::Requirement
+  requirement: &27791720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10757120
+  version_requirements: *27791720
 - !ruby/object:Gem::Dependency
   name: lrucache
-  requirement: &10756400 !ruby/object:Gem::Requirement
+  requirement: &27791220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *10756400
+  version_requirements: *27791220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10801680 !ruby/object:Gem::Requirement
+  requirement: &27790720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *10801680
+  version_requirements: *27790720
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &10800240 !ruby/object:Gem::Requirement
+  requirement: &27790260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.7'
   type: :development
   prerelease: false
-  version_requirements: *10800240
+  version_requirements: *27790260
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &10799400 !ruby/object:Gem::Requirement
+  requirement: &27789800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *10799400
+  version_requirements: *27789800
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &10798140 !ruby/object:Gem::Requirement
+  requirement: &27789340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *10798140
+  version_requirements: *27789340
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &10797020 !ruby/object:Gem::Requirement
+  requirement: &27788960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10797020
+  version_requirements: *27788960
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &10794900 !ruby/object:Gem::Requirement
+  requirement: &27788420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *10794900
+  version_requirements: *27788420
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &10899680 !ruby/object:Gem::Requirement
+  requirement: &27788000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10899680
+  version_requirements: *27788000
 description: A set of adapters providing easy access to the GDS gov.uk APIs
 email:
 - jystewart@gmail.com
@@ -136,6 +136,7 @@ files:
 - lib/gds_api/test_helpers/imminence.rb
 - lib/gds_api/test_helpers/contactotron.rb
 - lib/gds_api/test_helpers/panopticon.rb
+- lib/gds_api/test_helpers/json_client_helper.rb
 - lib/gds_api/test_helpers/publisher.rb
 - lib/gds_api/imminence.rb
 - lib/gds_api/needotron.rb