gds-api-adapters 7.2.0 → 7.3.0

data/lib/gds_api/json_client.rb

@@ -10,6 +10,11 @@ module GdsApi
 
     include GdsApi::ExceptionHandling
 
+    # Cache TTL will be overridden for a given request/response by the Expires
+    # header if it is included in the response.
+    #
+    # LRUCache doesn't respect a cache size of 0, and instead effectively
+    # creates a cache with a size of 1.
     def self.cache(size=DEFAULT_CACHE_SIZE, ttl=DEFAULT_CACHE_TTL)
       @cache ||= LRUCache.new(max_size: size, ttl: ttl)
     end
@@ -27,7 +32,7 @@ module GdsApi
 
       @logger = options[:logger] || GdsApi::Base.logger
 
-      if options[:disable_cache]
+      if options[:disable_cache] || (options[:cache_size] == 0)
         @cache = NullCache.new
       else
         cache_size = options[:cache_size] || DEFAULT_CACHE_SIZE

data/lib/gds_api/support.rb

@@ -0,0 +1,12 @@
+require_relative 'base'
+
+class GdsApi::Support < GdsApi::Base
+  def create_foi_request(request_details)
+    post_json("#{base_url}/foi_requests", { :foi_request => request_details })
+  end
+
+  private
+  def base_url
+    endpoint
+  end
+end

data/lib/gds_api/test_helpers/support.rb

@@ -0,0 +1,19 @@
+module GdsApi
+  module TestHelpers
+    module Support
+      SUPPORT_ENDPOINT = Plek.current.find('support')
+
+      def stub_support_foi_request_creation(request_details = nil)
+        body_expectation = {"foi_request" => request_details}.to_json
+
+        post_stub = stub_request(:post, "#{SUPPORT_ENDPOINT}/foi_requests")
+        post_stub.with(:body => {"foi_request" => request_details}.to_json) unless request_details.nil?
+        post_stub.to_return(:status => 201)
+      end
+
+      def support_isnt_available
+        stub_request(:post, /#{SUPPORT_ENDPOINT}\/.*/).to_return(:status => 503)
+      end
+    end
+  end
+end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '7.2.0'
+  VERSION = '7.3.0'
 end

data/test/gds_api_base_test.rb

@@ -57,10 +57,19 @@ class GdsApiBaseTest < MiniTest::Unit::TestCase
   end
 
   def test_disabling_cache
+    # Ensure that there is a non-null cache by default
+    GdsApi::JsonClient.cache = true
     api = ConcreteApi.new("http://bar", disable_cache: true)
     assert api.client.cache.is_a? GdsApi::NullCache
   end
 
+  def test_disabling_cache_old_style
+    # Ensure that there is a non-null cache by default
+    GdsApi::JsonClient.cache = true
+    api = ConcreteApi.new("http://bar", cache_size: 0)
+    assert api.client.cache.is_a? GdsApi::NullCache
+  end
+
   def test_should_barf_if_not_given_valid_URL
     proc do
       ConcreteApi.new('invalid-url')

data/test/support_api_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+require 'gds_api/support'
+
+describe GdsApi::Support do
+  before do
+    @base_api_url = Plek.current.find("support")
+    @api = GdsApi::Support.new(@base_api_url)
+  end
+
+  it "can create an asset with a file" do
+    request_details = {"foi_request"=>{"requester"=>{"name"=>"A", "email"=>"a@b.com"}, "details"=>"abc"}}
+
+    stub_post = stub_request(:post, "#{@base_api_url}/foi_requests").
+      with(:body => {"foi_request" => request_details}.to_json).
+      to_return(:status => 201)
+
+    @api.create_foi_request(request_details)
+
+    assert_requested(stub_post)
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: gds-api-adapters
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 7.2.0
+  version: 7.3.0
 platform: ruby
 authors: 
 - James Stewart
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-12 00:00:00 Z
+date: 2013-08-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plek
@@ -205,6 +205,7 @@ files:
 - lib/gds_api/core-ext/openstruct.rb
 - lib/gds_api/response.rb
 - lib/gds_api/publisher.rb
+- lib/gds_api/support.rb
 - lib/gds_api/test_helpers/gov_uk_delivery.rb
 - lib/gds_api/test_helpers/licence_application.rb
 - lib/gds_api/test_helpers/common_responses.rb
@@ -214,6 +215,7 @@ files:
 - lib/gds_api/test_helpers/fact_cave.rb
 - lib/gds_api/test_helpers/content_api/artefact_stub.rb
 - lib/gds_api/test_helpers/publisher.rb
+- lib/gds_api/test_helpers/support.rb
 - lib/gds_api/test_helpers/asset_manager.rb
 - lib/gds_api/test_helpers/panopticon.rb
 - lib/gds_api/test_helpers/json_client_helper.rb
@@ -237,6 +239,7 @@ files:
 - test/list_response_test.rb
 - test/worldwide_api_test.rb
 - test/fact_cave_test.rb
+- test/support_api_test.rb
 - test/fixtures/world_organisations_australia.json
 - test/fixtures/hello.txt
 - test/response_test.rb
@@ -257,7 +260,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2886790745514714453
+      hash: -933955563815808271
       segments: 
       - 0
       version: "0"
@@ -266,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2886790745514714453
+      hash: -933955563815808271
       segments: 
       - 0
       version: "0"
@@ -290,6 +293,7 @@ test_files:
 - test/list_response_test.rb
 - test/worldwide_api_test.rb
 - test/fact_cave_test.rb
+- test/support_api_test.rb
 - test/fixtures/world_organisations_australia.json
 - test/fixtures/hello.txt
 - test/response_test.rb