gds-api-adapters 52.8.0 → 53.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59d74e1655c62452778dc3ac251578719cef33edf2fbe8ae00e2879807ea762b
-  data.tar.gz: ff1a65569b144dc72dfa9653a7b2bac38d3b7c27b8825dab52e1a5f364c5f115
+  metadata.gz: fe7a50e0626b484068f1cf7cf7f43495cb2a47a264f3b82fb081cf37bb091b19
+  data.tar.gz: 0ae38cb74f6563bd85c50f7991c2a6a83cc11d091842d4c326d98f3b07125c94
 SHA512:
-  metadata.gz: b514212d519183c9a6bc7f1f18cd9e86249262b69f9336872c015b88302b5dca52de406e5261a9ee3514d0bbbed7bfb321c8ef0b8de882be0959e20d069a2e89
-  data.tar.gz: c3d785f2cd20a9801f0b58d5ecf0c0e5c68f770845833e73ccc4c07787a16be32ad45ef213a141bd0f7d32b411b651fec962100e32aad74ee7cd500afc607eda
+  metadata.gz: 3d2240ddfa6bbbd7cbd7995a7c8f9a53d8545a5822ae8951dc0ec0190620db31cf0f1d78b2743dab9a3c10d4015e4a81f0b4f05f0fb6ce64f18d069839493854
+  data.tar.gz: e2be4f4b1788a402ac7f916c2997b9c8f920e7e60c8081da9ba4c2ca9b47f92d760e2511f6f072bbc4d0387a92756347726169c9843aade37a736cf230b9189d

data/lib/gds_api/json_client.rb

@@ -1,9 +1,7 @@
 require_relative 'response'
 require_relative 'exceptions'
 require_relative 'version'
-require_relative 'null_cache'
 require_relative 'govuk_headers'
-require 'lrucache'
 require 'rest-client'
 require 'null_logger'
 
@@ -11,27 +9,7 @@ module GdsApi
   class JsonClient
     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
-
-    # Set the caching implementation. Default is LRUCache. Can be Anything
-    # which responds to:
-    #
-    #   [](key)
-    #   []=(key, value)
-    #   store(key, value, expiry_time=nil) - or a Ruby Time object
-    #
-    class << self
-      attr_writer :cache
-    end
-
-    attr_accessor :logger, :options, :cache
+    attr_accessor :logger, :options
 
     def initialize(options = {})
       if options[:disable_timeout] || options[:timeout].to_i < 0
@@ -39,15 +17,6 @@ module GdsApi
       end
 
       @logger = options[:logger] || NullLogger.instance
-      disable_cache = options[:disable_cache] || ENV.fetch("GDS_API_DISABLE_CACHE", false)
-
-      if disable_cache || options[:cache_size]&.zero?
-        @cache = NullCache.new
-      else
-        cache_size = options[:cache_size] || DEFAULT_CACHE_SIZE
-        cache_ttl = options[:cache_ttl] || DEFAULT_CACHE_TTL
-        @cache = JsonClient.cache(cache_size, cache_ttl)
-      end
       @options = options
     end
 
@@ -70,8 +39,6 @@ module GdsApi
     end
 
     DEFAULT_TIMEOUT_IN_SECONDS = 4
-    DEFAULT_CACHE_SIZE = 100
-    DEFAULT_CACHE_TTL = 15 * 60 # 15 minutes
 
     def get_raw!(url)
       do_raw_request(:get, url)
@@ -142,7 +109,7 @@ module GdsApi
         if params
           additional_headers.merge!(self.class.json_body_headers)
         end
-        response = do_request_with_cache(method, url, (params.to_json if params), additional_headers)
+        response = do_request(method, url, (params.to_json if params), additional_headers)
       rescue RestClient::Exception => e
         # Attempt to parse the body as JSON if possible
         error_details = begin
@@ -201,45 +168,6 @@ module GdsApi
       )
     end
 
-    def do_request_with_cache(method, url, params = nil, additional_headers = {})
-      # Only read GET requests from the cache: any other request methods should
-      # always be passed through. Note that this means HEAD requests won't get
-      # cached, but that would involve separating the cache by method and URL.
-      # Also, we don't generally make HEAD requests.
-      use_cache = (method == :get)
-
-      if use_cache
-        cached_response = @cache[url]
-        return cached_response if cached_response
-      end
-
-      response = do_request(method, url, params, additional_headers)
-
-      if use_cache
-        cache_time = response_cache_time(response)
-        # If cache_time is nil, this will fall back on @cache's default
-        @cache.store(url, response, cache_time)
-      end
-
-      response
-    end
-
-    # Return either a Time object representing the expiry time of the response
-    # or nil if no cache information is provided
-    def response_cache_time(response)
-      if response.headers[:cache_control]
-        cache_control = Rack::Cache::CacheControl.new(response.headers[:cache_control])
-
-        if cache_control.private? || cache_control.no_cache? || cache_control.no_store?
-          Time.now.utc
-        elsif cache_control.max_age
-          Time.now.utc + cache_control.max_age
-        end
-      elsif response.headers[:expires]
-        Time.httpdate response.headers[:expires]
-      end
-    end
-
     def do_request(method, url, params = nil, additional_headers = {})
       loggable = { request_uri: url, start_time: Time.now.to_f }
       start_logging = loggable.merge(action: 'start')

data/lib/gds_api/test_helpers/json_client_helper.rb

@@ -1,4 +1 @@
 require 'gds_api/json_client'
-require 'gds_api/null_cache'
-
-GdsApi::JsonClient.cache = GdsApi::NullCache.new

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '52.8.0'.freeze
+  VERSION = '53.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 52.8.0
+  version: 53.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: lrucache
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: null_logger
   requirement: !ruby/object:Gem::Requirement
@@ -387,7 +373,6 @@ files:
 - lib/gds_api/mapit.rb
 - lib/gds_api/maslow.rb
 - lib/gds_api/middleware/govuk_header_sniffer.rb
-- lib/gds_api/null_cache.rb
 - lib/gds_api/organisations.rb
 - lib/gds_api/performance_platform/data_in.rb
 - lib/gds_api/performance_platform/data_out.rb

data/lib/gds_api/null_cache.rb

@@ -1,11 +0,0 @@
-module GdsApi
-  class NullCache
-    def [](_k)
-      nil
-    end
-
-    def []=(k, v); end
-
-    def store(k, v, expiry_time = nil); end
-  end
-end