redis-activesupport 4.1.3 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6cc8e30d7100675cdc3a7e084d38a411eb8f16c
-  data.tar.gz: bf7596fdbaa0a273b765caa79ac9a12cc8932abd
+  metadata.gz: 4712e8a2e37c5628d8387a0dcc60f948a49810df
+  data.tar.gz: dd9ddcabcbb8777d99b317987323e947189705e1
 SHA512:
-  metadata.gz: 379772520d26e90dd4f885eee71278fcf5722c5de18046311ba1bd32620275c2fe6950dcf24723a07271b91aac71039a3aa95ea9abbd3ee11be6b89e1df2f83a
-  data.tar.gz: 0eb4ff83f2aa7a296807e51735eb12bf2c7e5b027b60c29b9ed06b48fc752837bd2d896e81cf885fca2aee009f8afbc741ba88ccae406476f6b2838fb0cb95e9
+  metadata.gz: 5d92c91e4ab4dab196da67b72a1e98c6c4d69b230a95532c8eb5ec69722becacf2554fcdbb9a02ec05fe747088c8ed40eede4c1f83fa8b98b97bf166c362134f
+  data.tar.gz: 5c66ec9184dc8afdd8a82773cc53536f966aa322d6df3cf17fe3cb1664b5bc1b119d87857b54bee8f96d54a2caa41bd39859e9ddee8170dd0c478c9c42d4e88d

data/lib/active_support/cache/redis_store.rb

@@ -78,7 +78,8 @@ module ActiveSupport
             with do |store|
               !(keys = store.keys(matcher)).empty? && store.del(*keys)
             end
-          rescue Errno::ECONNREFUSED, Redis::CannotConnectError
+          rescue Errno::ECONNREFUSED, Redis::CannotConnectError => e
+            raise if raise_errors?
             false
           end
         end
@@ -220,7 +221,8 @@ 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, Redis::CannotConnectError
+        rescue Errno::ECONNREFUSED, Redis::CannotConnectError => e
+          raise if raise_errors?
           false
         end
 
@@ -229,7 +231,8 @@ module ActiveSupport
           if entry
             entry.is_a?(ActiveSupport::Cache::Entry) ? entry : ActiveSupport::Cache::Entry.new(entry)
           end
-        rescue Errno::ECONNREFUSED, Redis::CannotConnectError
+        rescue Errno::ECONNREFUSED, Redis::CannotConnectError => e
+          raise if raise_errors?
           nil
         end
 
@@ -240,10 +243,15 @@ module ActiveSupport
         #
         def delete_entry(key, options)
           entry = with { |c| c.del key }
-        rescue Errno::ECONNREFUSED, Redis::CannotConnectError
+        rescue Errno::ECONNREFUSED, Redis::CannotConnectError => e
+          raise if raise_errors?
           false
         end
 
+        def raise_errors?
+          !!@options[:raise_errors]
+        end
+
 
         # Add the namespace defined in the options to a pattern designed to match keys.
         #

data/redis-activesupport.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'redis-activesupport'
-  s.version     = '4.1.3'
+  s.version     = '4.1.4'
   s.authors     = ['Luca Guidi', 'Ryan Bigg']
   s.email       = ['me@lucaguidi.com', 'me@ryanbigg.com']
   s.homepage    = 'http://redis-store.org/redis-activesupport'
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'redis-store',   '~> 1.1.0'
-  s.add_runtime_dependency 'activesupport', '~> 3'
+  s.add_runtime_dependency 'activesupport', '>= 3', '< 5'
 
   s.add_development_dependency 'rake',     '~> 10'
   s.add_development_dependency 'bundler',  '~> 1.3'

data/test/active_support/cache/redis_store_test.rb

@@ -440,6 +440,60 @@ describe ActiveSupport::Cache::RedisStore do
     end
   end
 
+  describe "raise_errors => true" do
+    def setup
+      @raise_error_store = ActiveSupport::Cache::RedisStore.new("redis://127.0.0.1:6380/1", :raise_errors => true)
+      @raise_error_store.stubs(:with).raises(Redis::CannotConnectError)
+    end
+
+    it "raises on read when redis is unavailable" do
+      assert_raises(Redis::CannotConnectError) do
+        @raise_error_store.read("rabbit")
+      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
+      end
+    end
+
+    it "raises on delete when redis is unavailable" do
+      assert_raises(Redis::CannotConnectError) do
+        @raise_error_store.delete "rabbit"
+      end
+    end
+
+    it "raises on delete_matched when redis is unavailable" do
+      assert_raises(Redis::CannotConnectError) do
+        @raise_error_store.delete_matched "rabb*"
+      end
+    end
+  end
+
+  describe "raise_errors => false" do
+    def setup
+      @raise_error_store = ActiveSupport::Cache::RedisStore.new("redis://127.0.0.1:6380/1")
+      @raise_error_store.stubs(:with).raises(Redis::CannotConnectError)
+    end
+
+    it "is nil when redis is unavailable" do
+      @raise_error_store.read("rabbit").must_be_nil
+    end
+
+    it "returns false when redis is unavailable" do
+      @raise_error_store.write("rabbit", @white_rabbit, :expires_in => 1.second).must_equal(false)
+    end
+
+    it "returns false when redis is unavailable" do
+      @raise_error_store.delete("rabbit").must_equal(false)
+    end
+
+    it "raises on delete_matched when redis is unavailable" do
+      @raise_error_store.delete_matched("rabb*").must_equal(false)
+    end
+  end
+
   private
     def instantiate_store(*addresses)
       ActiveSupport::Cache::RedisStore.new(*addresses).instance_variable_get(:@data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-activesupport
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.4
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-store
@@ -29,16 +29,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement