redis-activesupport 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eebc0d644eba5c56ef06413a98ac47d8cf73539f
-  data.tar.gz: 33b363c215491c97282d37f596068868ba484313
+  metadata.gz: 33df3ef09a75d9ce2b545efe032cd801d2437eea
+  data.tar.gz: 807b5a494112c947faaacd3c47090004e47ffc5a
 SHA512:
-  metadata.gz: a357ae2389638487bc51e9b976f3d76df74765096f91b0d9fbd9cda5eda6720afb3014a3867c77a5633f0cc6993901ffe739738774a7e085942c432f1f134239
-  data.tar.gz: a986a0f70541447333c59c0ad1c034c59ab9aaa71d6b2ddc634330973193572bbfa7d95c6bb77d0aa2828f0f5949a4c74b5989820e322fa0861ec308bfd7e9d7
+  metadata.gz: 3bdafb650c1a86020859524d0d9f66c3d9d6f2e1b6772525d05a9f6574fbfca702bdc9fbc404c1581ea94b06e9c2c7b309faf0c73f7d6a674197d1688ae2df3e
+  data.tar.gz: 1bd8ea70bc58ebfc4f89c2152590139bc516fea97e796fcdfd6657cacc78c53bc1e74ac522399bc1ebdca3ca783ee991ed9da8d5895285ce252635f06b950a66

data/.travis.yml

@@ -5,11 +5,11 @@ gemfile:
   - gemfiles/Gemfile.activesupport-4.x
   - gemfiles/Gemfile.activesupport-5.x
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
-  - 2.2.4
-  - 2.3.0
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
   - ruby-head
   - jruby-head
 services:
@@ -18,13 +18,7 @@ matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
-    - rvm: 1.9.3
+    - rvm: 2.0
       gemfile: gemfiles/Gemfile.activesupport-5.x
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile.activesupport-5.x
-    - rvm: 2.1.5
-      gemfile: gemfiles/Gemfile.activesupport-5.x
-    - rvm: rbx-19mode
-      gemfile: gemfiles/Gemfile.activesupport-5.x
-    - rvm: jruby-19mode
+    - rvm: 2.1
       gemfile: gemfiles/Gemfile.activesupport-5.x

data/lib/active_support/cache/redis_store.rb

@@ -4,6 +4,14 @@ require 'redis-store'
 module ActiveSupport
   module Cache
     class RedisStore < Store
+
+      ERRORS_TO_RESCUE = [
+        Errno::ECONNREFUSED,
+        Errno::EHOSTUNREACH,
+        Redis::CannotConnectError,
+        Redis::ConnectionError
+      ].freeze
+
       attr_reader :data
 
       # Instantiate the store.
@@ -82,7 +90,7 @@ module ActiveSupport
             with do |store|
               !(keys = store.keys(matcher)).empty? && store.del(*keys)
             end
-          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Redis::CannotConnectError
+          rescue *ERRORS_TO_RESCUE
             raise if raise_errors?
             false
           end
@@ -103,12 +111,17 @@ module ActiveSupport
         args = [keys, options]
         args.flatten!
 
-        values = with { |c| c.mget(*args) }
-        values.map! { |v| v.is_a?(ActiveSupport::Cache::Entry) ? v.value : v }
+        instrument(:read_multi, names) do |payload|
+          values = with { |c| c.mget(*args) }
+          values.map! { |v| v.is_a?(ActiveSupport::Cache::Entry) ? v.value : v }
 
-        result = Hash[names.zip(values)]
-        result.reject!{ |k,v| v.nil? }
-        result
+          Hash[names.zip(values)].reject{|k,v| v.nil?}.tap do |result|
+            payload[:hits] = result.keys if payload
+          end
+        end
+      rescue *ERRORS_TO_RESCUE
+        raise if raise_errors?
+        {}
       end
 
       def fetch_multi(*names)
@@ -128,12 +141,16 @@ module ActiveSupport
           memo
         end
 
-        with do |c|
-          c.multi do
-            need_writes.each do |name, value|
-              write(name, value, options)
+        begin
+          with do |c|
+            c.multi do
+              need_writes.each do |name, value|
+                write(name, value, options)
+              end
             end
           end
+        rescue *ERRORS_TO_RESCUE
+          raise if raise_errors?
         end
 
         fetched
@@ -234,7 +251,7 @@ module ActiveSupport
         def write_entry(key, entry, options)
           method = options && options[:unless_exist] ? :setnx : :set
           with { |client| client.send method, key, entry, options }
-        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Redis::CannotConnectError
+        rescue *ERRORS_TO_RESCUE
           raise if raise_errors?
           false
         end
@@ -244,7 +261,7 @@ module ActiveSupport
           if entry
             entry.is_a?(ActiveSupport::Cache::Entry) ? entry : ActiveSupport::Cache::Entry.new(entry)
           end
-        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Redis::CannotConnectError
+        rescue *ERRORS_TO_RESCUE
           raise if raise_errors?
           nil
         end
@@ -256,7 +273,7 @@ module ActiveSupport
         #
         def delete_entry(key, options)
           with { |c| c.del key }
-        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Redis::CannotConnectError
+        rescue *ERRORS_TO_RESCUE
           raise if raise_errors?
           false
         end

data/lib/redis/active_support/version.rb

@@ -0,0 +1,5 @@
+class Redis
+  module ActiveSupport
+    VERSION = '5.0.4'
+  end
+end

data/redis-activesupport.gemspec

@@ -1,9 +1,11 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path('../lib', __FILE__)
 
+require 'redis/active_support/version'
+
 Gem::Specification.new do |s|
   s.name        = 'redis-activesupport'
-  s.version     = '5.0.3'
+  s.version     = Redis::ActiveSupport::VERSION
   s.authors     = ['Luca Guidi', 'Ryan Bigg']
   s.email       = ['me@lucaguidi.com', 'me@ryanbigg.com']
   s.homepage    = 'http://redis-store.org/redis-activesupport'
@@ -18,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'redis-store',   '~> 1.3.0'
+  s.add_runtime_dependency "redis-store",   '>= 1.3', '< 2'
   s.add_runtime_dependency 'activesupport', '>= 3', '< 6'
 
   s.add_development_dependency 'rake',     '~> 10'

data/test/active_support/cache/redis_store_test.rb

@@ -585,6 +585,18 @@ describe ActiveSupport::Cache::RedisStore do
       exist.payload.must_equal({ :key => 'the smiths' })
     end
 
+    it "notifies on #read_multi" do
+      @store.write "depeche mode", "Enjoy The Silence"
+
+      with_notifications do
+        @store.read_multi "metallica", "depeche mode"
+      end
+
+      read = @events.first
+      read.name.must_equal('cache_read_multi.active_support')
+      read.payload.must_equal({ :key => ["metallica", "depeche mode"], :hits => ["depeche mode"] })
+    end
+
     it "notifies on #delete_matched" do
       with_notifications do
         @store.delete_matched "afterhours*"
@@ -640,6 +652,20 @@ describe ActiveSupport::Cache::RedisStore do
       end
     end
 
+    it "raises on read_multi when redis is unavailable" do
+      assert_raises(Redis::CannotConnectError) do
+        @raise_error_store.read_multi("rabbit", "white-rabbit")
+      end
+    end
+
+    it "raises on fetch_multi when redis is unavailable" do
+      assert_raises(Redis::CannotConnectError) do
+        @raise_error_store.fetch_multi("rabbit", "white-rabbit") do |key|
+          key.upcase
+        end
+      end
+    end
+
     it "raises on writes when redis is unavailable" do
       assert_raises(Redis::CannotConnectError) do
         @raise_error_store.write "rabbit", @white_rabbit, :expires_in => 1.second
@@ -665,10 +691,23 @@ describe ActiveSupport::Cache::RedisStore do
       @raise_error_store.stubs(:with).raises(Redis::CannotConnectError)
     end
 
-    it "is nil when redis is unavailable" do
+    it "returns nil from read when redis is unavailable" do
       @raise_error_store.read("rabbit").must_be_nil
     end
 
+    it "returns empty hash from read_multi when redis is unavailable" do
+      @raise_error_store.read_multi("rabbit", "white-rabbit").must_equal({})
+    end
+
+    it "returns result hash from fetch_multi when redis is unavailable" do
+      @raise_error_store.fetch_multi("rabbit", "white-rabbit") do |key|
+        key.upcase
+      end.must_equal({
+        "rabbit" => "RABBIT",
+        "white-rabbit" => "WHITE-RABBIT",
+      })
+    end
+
     it "returns false when redis is unavailable" do
       @raise_error_store.write("rabbit", @white_rabbit, :expires_in => 1.second).must_equal(false)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-activesupport
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +160,7 @@ files:
 - gemfiles/Gemfile.activesupport-5.x
 - lib/active_support/cache/redis_store.rb
 - lib/redis-activesupport.rb
+- lib/redis/active_support/version.rb
 - redis-activesupport.gemspec
 - test/active_support/cache/redis_store_test.rb
 - test/test_helper.rb