gds-api-adapters 0.0.42 → 0.0.43

data/lib/gds_api/json_client.rb

@@ -5,19 +5,21 @@ require 'lrucache'
 
 module GdsApi
   class JsonClient
-    def self.cache
-      @cache ||= LRUCache.new(max_size: 10)
+
+    def self.cache(size=DEFAULT_CACHE_SIZE)
+      @cache ||= LRUCache.new(max_size: size)
     end
 
     def self.cache=(c)
       @cache = c
     end
 
-    attr_accessor :logger, :options
+    attr_accessor :logger, :options, :cache
 
     def initialize(options = {})
       @logger = options[:logger] || GdsApi::Base.logger
-      @cache = JsonClient.cache
+      cache_size = options[:cache_size] || DEFAULT_CACHE_SIZE
+      @cache = JsonClient.cache(cache_size)
       @options = options
     end
 
@@ -27,6 +29,7 @@ module GdsApi
         'User-Agent' => "GDS Api Client v. #{GdsApi::VERSION}"
     }
     DEFAULT_TIMEOUT_IN_SECONDS = 2
+    DEFAULT_CACHE_SIZE = 10
 
     def get_raw(url)
       do_raw_request(Net::HTTP::Get, url)

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '0.0.42'
+  VERSION = '0.0.43'
 end

data/test/gds_api_base_test.rb

@@ -65,4 +65,19 @@ class GdsApiBaseTest < MiniTest::Unit::TestCase
     assert_equal "endpoint", api.options[:endpoint_url]
     assert_equal "bar", api.options[:foo]
   end
+
+  def test_setting_cache_size_from_options
+    GdsApi::JsonClient.cache = false
+    api = ConcreteApi.new("test", {endpoint_url: "endpoint", cache_size: 2})
+    assert_equal 2, api.client.cache.max_size
+  end
+
+  def test_setting_cache_size_from_default_options
+    GdsApi::JsonClient.cache = false
+    GdsApi::Base.default_options = {cache_size: 4}
+    api = ConcreteApi.new("test", {endpoint_url: "endpoint"})
+    assert_equal 4, api.client.cache.max_size
+  end
+
+
 end

metadata

@@ -2,7 +2,7 @@
 name: gds-api-adapters
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors: 
 - James Stewart
@@ -10,10 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-30 00:00:00 Z
+date: 2012-02-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plek
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -21,10 +22,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: null_logger
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,10 +33,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: lrucache
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,10 +44,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.1.1
   type: :runtime
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rake
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -54,10 +55,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.2.2
   type: :development
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: webmock
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -65,10 +66,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.7"
   type: :development
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mocha
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,10 +77,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.10.0
   type: :development
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: minitest
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -87,10 +88,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.10.0
   type: :development
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rack
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -98,10 +99,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: simplecov
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -109,10 +110,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.4
   type: :development
-  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: simplecov-rcov
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -120,7 +121,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id010
 description: A set of adapters providing easy access to the GDS gov.uk APIs
 email: 
@@ -132,35 +132,35 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/gds_api/base.rb
 - lib/gds_api/contactotron.rb
-- lib/gds_api/core-ext/openstruct.rb
+- lib/gds_api/version.rb
+- lib/gds_api/panopticon.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/needotron.rb
-- lib/gds_api/oauth2_client.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/test_helpers/contactotron.rb
-- lib/gds_api/test_helpers/imminence.rb
-- lib/gds_api/test_helpers/json_client_helper.rb
 - lib/gds_api/test_helpers/panopticon.rb
 - lib/gds_api/test_helpers/publisher.rb
+- lib/gds_api/test_helpers/imminence.rb
+- lib/gds_api/test_helpers/json_client_helper.rb
 - lib/gds_api/typhoeus_client.rb
-- lib/gds_api/version.rb
+- lib/gds_api/response.rb
+- lib/gds_api/json_client.rb
+- lib/gds_api/publisher.rb
+- lib/gds_api/base.rb
+- lib/gds_api/imminence.rb
+- lib/gds_api/oauth2_client.rb
+- lib/gds_api/core-ext/openstruct.rb
+- lib/gds_api/part_methods.rb
+- lib/gds_api/helpers.rb
+- lib/gds_api/needotron.rb
 - README.md
 - Rakefile
-- test/contactotron_api_test.rb
 - test/gds_api_base_test.rb
-- test/json_client_test.rb
 - test/panopticon_api_test.rb
-- test/publisher_api_test.rb
+- test/contactotron_api_test.rb
 - test/test_helper.rb
+- test/publisher_api_test.rb
+- test/json_client_test.rb
 homepage: http://github.com/alphagov/gds-api-adapters
 licenses: []
 
@@ -174,30 +174,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 940462170843670145
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 940462170843670145
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Adapters to work with GDS APIs
 test_files: 
-- test/contactotron_api_test.rb
 - test/gds_api_base_test.rb
-- test/json_client_test.rb
 - test/panopticon_api_test.rb
-- test/publisher_api_test.rb
+- test/contactotron_api_test.rb
 - test/test_helper.rb
+- test/publisher_api_test.rb
+- test/json_client_test.rb