redis-activesupport 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbde1fe9e22083ceba3ff74535d88465a7097434
-  data.tar.gz: e807712d514c1f5361ef005cd04a028fa802d19f
+  metadata.gz: 64b2b49c1f7d423deec69ac3a844110f7324e6e5
+  data.tar.gz: d76eeb83e1ffbacc5d2527ae41a9ff3d56b0bac3
 SHA512:
-  metadata.gz: de702e1868ba3090390e4c52cc82e9d7ad89e9252cdf45aebf85dd5c5d46a20c917ce8385cd7bcd424e6e4efa1fdeb7b7b106145597bd57dc9a944808264a457
-  data.tar.gz: f0cbe5961a33c63a1b4985ea0415f4391de07dc4e7137fbe898100a2eec96d38d1846c89a80ad31587c3814b705c664f0e5f64d303638dfdf0b0c632cbe80711
+  metadata.gz: a3d10878da4ffb180e48d1b520aac5c03189be75c803e40907d8ae616a917430263f40e2cde3e449f38aedfdfab1603e25a1e9626f78eaa2d2601820373a20e3
+  data.tar.gz: 0399f77052e5660accfa3349a68571f11bcab77d1fc92e9652f3669df08cdf2caebf6f08a38107c3dc6ae7861183edb086a0fc54ebfb78c1f04044721910efbd

data/lib/active_support/cache/redis_store.rb

@@ -34,7 +34,7 @@ module ActiveSupport
       #     pool: ::ConnectionPool.new(size: 1, timeout: 1) { ::Redis::Store::Factory.create("localhost:6379/0") })
       #     # => supply an existing connection pool (e.g. for use with redis-sentinel or redis-failover)
       def initialize(*addresses)
-        @options = addresses.extract_options!
+        @options = addresses.dup.extract_options!
 
         @data = if @options[:pool]
                   raise "pool must be an instance of ConnectionPool" unless @options[:pool].is_a?(ConnectionPool)
@@ -45,9 +45,9 @@ module ActiveSupport
                   pool_options[:size]    = options[:pool_size] if options[:pool_size]
                   pool_options[:timeout] = options[:pool_timeout] if options[:pool_timeout]
                   @pooled = true
-                  ::ConnectionPool.new(pool_options) { ::Redis::Store::Factory.create(addresses) }
+                  ::ConnectionPool.new(pool_options) { ::Redis::Store::Factory.create(*addresses) }
                 else
-                  ::Redis::Store::Factory.create(addresses)
+                  ::Redis::Store::Factory.create(*addresses)
                 end
 
         super(@options)

data/lib/redis/activesupport/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module ActiveSupport
-    VERSION = '4.1.0'
+    VERSION = '4.1.1'
   end
 end

data/test/active_support/cache/redis_store_test.rb

@@ -25,6 +25,36 @@ describe ActiveSupport::Cache::RedisStore do
     end
   end
 
+  it "connects using an hash of options" do
+    address = { host: '127.0.0.1', port: '6380', db: '1' }
+    store = ActiveSupport::Cache::RedisStore.new(address.merge(pool_size: 5, pool_timeout: 10))
+    redis = Redis.new(url: "redis://127.0.0.1:6380/1")
+    redis.flushall
+
+    store.data.class.must_equal(::ConnectionPool)
+    store.data.instance_variable_get(:@size).must_equal(5)
+    store.data.instance_variable_get(:@timeout).must_equal(10)
+
+    store.write("rabbit", 0)
+
+    redis.exists("rabbit").must_equal(true)
+  end
+
+  it "connects using an string of options" do
+    address = "redis://127.0.0.1:6380/1"
+    store = ActiveSupport::Cache::RedisStore.new(address, pool_size: 5, pool_timeout: 10)
+    redis = Redis.new(url: address)
+    redis.flushall
+
+    store.data.class.must_equal(::ConnectionPool)
+    store.data.instance_variable_get(:@size).must_equal(5)
+    store.data.instance_variable_get(:@timeout).must_equal(10)
+
+    store.write("rabbit", 0)
+
+    redis.exists("rabbit").must_equal(true)
+  end
+
   it "raises an error if :pool isn't a pool" do
     assert_raises(RuntimeError, 'pool must be an instance of ConnectionPool') do
       ActiveSupport::Cache::RedisStore.new(pool: 'poolio')
@@ -63,7 +93,7 @@ describe ActiveSupport::Cache::RedisStore do
   end
 
   it "creates a distributed store when given multiple addresses" do
-    underlying_store = instantiate_store("redis://127.0.0.1:6380/1", 
+    underlying_store = instantiate_store("redis://127.0.0.1:6380/1",
                                          "redis://127.0.0.1:6381/1")
     underlying_store.must_be_instance_of(::Redis::DistributedStore)
   end

data/test/redis/activesupport/version_test.rb

@@ -2,6 +2,6 @@ require 'test_helper'
 
 describe Redis::ActiveSupport::VERSION do
   it 'returns current version' do
-    Redis::ActiveSupport::VERSION.must_equal '4.0.0'
+    Redis::ActiveSupport::VERSION.must_equal '4.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-activesupport
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-store