Improve cache system

Author: brunto

Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-ruby '2.3.0'
+ruby '2.3.1'
 # Specify your gem's dependencies in ievkit.gemspec
 gemspec

Gemfile.lock

@@ -4,6 +4,7 @@ PATH
     ievkit (0.1.1)
       faraday_middleware (~> 0.10.0)
       figaro (~> 1.1.1)
+      redis (~> 3.2)
       rest-client (~> 1.8.0)
 
 GEM
@@ -24,6 +25,7 @@ GEM
     multipart-post (2.0.0)
     netrc (0.11.0)
     rake (11.1.2)
+    redis (3.2.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)

ievkit.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'figaro', '~> 1.1.1'
   spec.add_dependency 'faraday_middleware', '~> 0.10.0'
   spec.add_dependency 'rest-client', '~> 1.8.0'
+  spec.add_dependency  'redis', '~>3.2'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 11.1'

lib/ievkit.rb

@@ -1,7 +1,9 @@
 require 'figaro'
 require 'faraday_middleware'
+require 'redis'
 require 'logger'
 require 'ievkit/version'
+require 'ievkit/cache'
 require 'ievkit/job'
 require 'ievkit/client'
 require 'ievkit/railtie' if defined?(Rails)

lib/ievkit/cache.rb

@@ -0,0 +1,11 @@
+class Redis
+  def cache(key, expire = nil)
+    value = get(key)
+    return JSON.parse(value) if value
+    return nil unless block_given?
+    value = yield(self)
+    set(key, value.to_json)
+    expire(key, expire) if expire.to_i > 0
+    value
+  end
+end

lib/ievkit/client.rb

@@ -1,12 +1,13 @@
 module Ievkit
   class Client
-    attr_reader :iev_url_prefix, :iev_url_suffix, :iev_url_jobs, :referential
+    attr_reader :iev_url_prefix, :iev_url_suffix, :iev_url_jobs, :referential, :redis
 
     def initialize(referential)
       @payload = {}
       @referential = referential
       @iev_url_prefix = init_iev_url_prefix
       @iev_url_jobs = init_iev_url_jobs
+      @redis = Redis.new
     end
 
     def prepare_post_request(type, options)
@@ -23,10 +24,26 @@ def prepare_post_request(type, options)
     end
 
     def prepare_request(url, http_method)
+      begin
+        response_cached = @redis.cache(url)
+        return response_cached if response_cached
+      rescue => e
+        Ievkit::Log.logger.fatal("Unable to contact Redis server: #{e.message}")
+      end
       init_connection(url)
       begin
         response = @connection.send(http_method)
-        parse_response(response)
+        cache_control = response.headers['cache-control']
+        max_age = 0
+        no_cache = true
+        if cache_control
+          max_age = cache_control[/max-age=(.*)/, 1]
+          no_cache = false if max_age && cache_control[/no-transform/]
+        end
+        return parse_response(response) if no_cache
+        @redis.cache(url, max_age) {
+          parse_response(response)
+        }
       rescue => e
         Ievkit::Log.logger.fatal("Unable to contact IEV server: #{e.message}")
         return false

spec/ievkit_import_spec.rb

@@ -4,6 +4,13 @@
   before(:all) { @referential = ENV['REFERENTIAL_TEST'] }
   before(:all) { @job = Ievkit::Job.new(@referential) }
 
+  context '#import_errors' do
+    before(:all) { @import_forwarding_url = @job.post_job(:importer, :neptune, iev_file: ENV['IEV_IMPORT_FILE_TEST'], iev_params: ENV['IEV_IMPORT_NEPTUNE_PARAMS_TEST']) }
+    it 'return invalid format in forwarding_url' do
+      expect(@import_forwarding_url['error_code']).to eq('INVALID_FORMAT')
+    end
+  end
+
   context '#import' do
     before(:all) { @import_forwarding_url = @job.post_job(:importer, :gtfs, iev_file: ENV['IEV_IMPORT_FILE_TEST'], iev_params: ENV['IEV_IMPORT_PARAMS_TEST']) }
     it 'return correct url suffix' do