redis-activesupport 4.1.6.pre → 5.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6919fcaa1c61e64d94d7cbcd20e320956c385247
-  data.tar.gz: 2528731435eb7102d7dd9ca9ec62253cad7ec2c3
+  metadata.gz: a98062292b59f80d8d89a7b1db3a732720642669
+  data.tar.gz: 703f6b6011f45dd87da2fedcc96c42205a152a29
 SHA512:
-  metadata.gz: c6684dfa22128db951fe854d82634b1c512c03605fc2f5b70f943293bb2228d8c051d33430c1e3a0d27670643a00847a4bdf0138f9525fb93393e90a70d48be7
-  data.tar.gz: 73d58c822be26ffb4cbe56137c26be9f3d28e4d1d7d859611e8c1664cb53abb5830361e8f60bb87c5e6b4faaeee147a2927fec530d51aad73e6dc723c16d78f8
+  metadata.gz: 83fd09a12f8edaef3add9470dc6e3dec67cf873c3f4abcb96329dd3ca0b3cffc25f7d3e4b38d25c8732a32e77c98c97f2fd44cbd6024741a1c423a4882b73af2
+  data.tar.gz: e155abf7e66411075c8cbec8840cb59d6262ea8079cdaeb9ca21b8db43d56605f5ef8bc306202c0fdb0aeb0b52b154b6985ab2f91181908154698da9fa4a834b

data/.travis.yml

@@ -3,11 +3,13 @@ script: 'bundle exec rake'
 gemfile:
   - gemfiles/Gemfile.activesupport-3.x
   - gemfiles/Gemfile.activesupport-4.x
+  - gemfiles/Gemfile.activesupport-5.x
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.5
-  - 2.2.3
+  - 2.2.4
+  - 2.3.0
   - ruby-head
   - rbx-19mode
   - jruby-19mode
@@ -16,6 +18,15 @@ services:
   - redis-server
 matrix:
   allow_failures:
-    - rvm: rbx-19mode
     - rvm: jruby-head
     - rvm: ruby-head
+    - rvm: 1.9.3
+      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
+      gemfile: gemfiles/Gemfile.activesupport-5.x

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 gemspec
 
 if ::File.directory?(gem_path = '../redis-store')
-  gem 'redis-store', '~> 1.1.0', path: gem_path
+  gem 'redis-store', '~> 1.2.0.pre', path: gem_path
 end
 
 gem 'i18n'

data/README.md

@@ -17,40 +17,6 @@ If you are using redis-store with Rails, consider using the [redis-rails gem](ht
 ActiveSupport::Cache.lookup_store :redis_store # { ... optional configuration ... }
 ```
 
-### Usage with Redis Sentinel
-
-```ruby
-sentinel_config = {
-  url: "redis://mymaster/0",
-  role: "master",
-  sentinels: [{
-    host: "127.0.0.1",
-    port: 26379
-  },{
-    host: "127.0.0.1",
-    port: 26380
-  },{
-    host: "127.0.0.1",
-    port: 26381
-  }]
-}
-
-# configure cache, merging opts with sentinel conf
-config.cache_store = :redis_store, sentinel_config.merge(
-  :namespace => "cache",
-  :expires_in => 1.days
-)
-
-# configure sessions, setting the sentinel config as the
-# servers value, merging opts with the sentinel conf.
-config.session_store :redis_store, {
-  :servers => sentinel_config.merge(
-    :namespace => "sessions"
-  ),
-  :expires_in => 2.days
-}
-```
-
 ## Running tests
 
 ```shell

data/gemfiles/Gemfile.activesupport-5.x

@@ -0,0 +1,13 @@
+source "http://rubygems.org"
+
+gem 'redis-store', '~> 1.1.0'
+gem 'activesupport', '>= 5.0.0.beta1', '< 5.1'
+
+group :development do
+  gem 'rake', '~> 10'
+  gem 'bundler', '~> 1.3'
+  gem 'mocha', '~> 0.14.0'
+  gem 'minitest', '~> 5.1'
+  gem 'connection_pool', '~> 1.2.0'
+  gem 'redis-store-testing'
+end

data/lib/active_support/cache/redis_store.rb

@@ -57,7 +57,7 @@ module ActiveSupport
         options = merged_options(options)
         instrument(:write, name, options) do |payload|
           entry = options[:raw].present? ? value : Entry.new(value, options)
-          write_entry(namespaced_key(name, options), entry, options)
+          write_entry(normalize_key(name, options), entry, options)
         end
       end
 
@@ -78,7 +78,7 @@ module ActiveSupport
             with do |store|
               !(keys = store.keys(matcher)).empty? && store.del(*keys)
             end
-          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Redis::CannotConnectError => e
+          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Redis::CannotConnectError
             raise if raise_errors?
             false
           end
@@ -92,31 +92,27 @@ module ActiveSupport
       #   cache.read_multi "rabbit", "white-rabbit"
       #   cache.read_multi "rabbit", "white-rabbit", :raw => true
       def read_multi(*names)
-        # Remove the options hash before mapping keys to values
         options = names.extract_options!
-        return {} if names == []
-
-        keys = names.map{|name| namespaced_key(name, options)}
+        keys = names.map{|name| normalize_key(name, options)}
         values = with { |c| c.mget(*keys) }
         values.map! { |v| v.is_a?(ActiveSupport::Cache::Entry) ? v.value : v }
 
-        result = Hash[keys.zip(values)]
+        # Remove the options hash before mapping keys to values
+        names.extract_options!
+
+        result = Hash[names.zip(values)]
         result.reject!{ |k,v| v.nil? }
         result
       end
 
       def fetch_multi(*names)
+        results = read_multi(*names)
         options = names.extract_options!
-        return {} if names == []
-
-        results = read_multi(*names, options)
         fetched = {}
-
         need_writes = {}
 
-        fetched = names.inject({}) do |memo, name|
-          key = namespaced_key(name, options)
-          memo[key] = results.fetch(key) do
+        fetched = names.inject({}) do |memo, (name, _)|
+          memo[name] = results.fetch(name) do
             value = yield name
             need_writes[name] = value
             value
@@ -157,9 +153,10 @@ module ActiveSupport
       #
       #   cache.increment "rabbit"
       #   cache.read "rabbit", :raw => true       # => "1"
-      def increment(key, amount = 1)
+      def increment(key, amount = 1, options = {})
+        options = merged_options(options)
         instrument(:increment, key, :amount => amount) do
-          with{|c| c.incrby key, amount}
+          with{|c| c.incrby namespaced_key(key, options), amount}
         end
       end
 
@@ -184,15 +181,16 @@ module ActiveSupport
       #
       #   cache.decrement "rabbit"
       #   cache.read "rabbit", :raw => true       # => "-1"
-      def decrement(key, amount = 1)
+      def decrement(key, amount = 1, options = {})
+        options = merged_options(options)
         instrument(:decrement, key, :amount => amount) do
-          with{|c| c.decrby key, amount}
-
+          with{|c| c.decrby namespaced_key(key, options), amount}
         end
       end
 
       def expire(key, ttl)
-        with { |c| c.expire key, ttl }
+        options = merged_options(nil)
+        with { |c| c.expire namespaced_key(key, options), ttl }
       end
 
       # Clear all the data from the store.
@@ -214,7 +212,7 @@ module ActiveSupport
       end
 
       def with(&block)
-        if @pooled
+        if defined?(@pooled) && @pooled
           @data.with(&block)
         else
           block.call(@data)
@@ -229,7 +227,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 => e
+        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Redis::CannotConnectError
           raise if raise_errors?
           false
         end
@@ -239,7 +237,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 => e
+        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Redis::CannotConnectError
           raise if raise_errors?
           nil
         end
@@ -250,8 +248,8 @@ module ActiveSupport
         # It's really needed and use
         #
         def delete_entry(key, options)
-          entry = with { |c| c.del key }
-        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Redis::CannotConnectError => e
+          with { |c| c.del key }
+        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Redis::CannotConnectError
           raise if raise_errors?
           false
         end
@@ -275,6 +273,14 @@ module ActiveSupport
             pattern
           end
         end
+
+      private
+
+        if ActiveSupport::VERSION::MAJOR < 5
+          def normalize_key(*args)
+            namespaced_key(*args)
+          end
+        end
     end
   end
 end

data/lib/redis-activesupport.rb

@@ -1,3 +1,3 @@
 require 'redis-store'
 require 'active_support'
-require 'active_support/cache/redis_store'
+require 'active_support/cache/redis_store'

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.6.pre'
+  s.version     = '5.0.0.pre'
   s.authors     = ['Luca Guidi', 'Ryan Bigg']
   s.email       = ['me@lucaguidi.com', 'me@ryanbigg.com']
   s.homepage    = 'http://redis-store.org/redis-activesupport'
@@ -18,13 +18,13 @@ 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.1.0'
-  s.add_runtime_dependency 'activesupport', '>= 3', '< 5'
+  s.add_runtime_dependency 'redis-store',   '~> 1.2.0.pre'
+  s.add_runtime_dependency 'activesupport', '>= 3', '< 6'
 
   s.add_development_dependency 'rake',     '~> 10'
   s.add_development_dependency 'bundler',  '~> 1.3'
   s.add_development_dependency 'mocha',    '~> 0.14.0'
-  s.add_development_dependency 'minitest', '~> 4.2'
+  s.add_development_dependency 'minitest', '>= 4.2', '< 6'
   s.add_development_dependency 'connection_pool',     '~> 1.2.0'
   s.add_development_dependency 'redis-store-testing'
 end

data/test/active_support/cache/redis_store_test.rb

@@ -22,6 +22,7 @@ describe ActiveSupport::Cache::RedisStore do
       store.write "rabbit", @rabbit
       store.delete "counter"
       store.delete "rub-a-dub"
+      store.delete({hkey: 'test'})
     end
   end
 
@@ -144,6 +145,16 @@ describe ActiveSupport::Cache::RedisStore do
     end
   end
 
+  it "respects expiration time in seconds for object key" do
+    with_store_management do |store|
+      store.write({ hkey: 'test' }, @white_rabbit)
+      store.read({ hkey: 'test' }).must_equal(@white_rabbit)
+      store.expire({ hkey: 'test' }, 1.second)
+      sleep 2
+      store.read({ hkey: 'test' }).must_be_nil
+    end
+  end
+
   it "does't write data if :unless_exist option is true" do
     with_store_management do |store|
       store.write "rabbit", @white_rabbit, :unless_exist => true
@@ -220,6 +231,21 @@ describe ActiveSupport::Cache::RedisStore do
     end
   end
 
+  it "increments an object key" do
+    with_store_management do |store|
+      3.times { store.increment({ hkey: 'test' }) }
+      store.read({ hkey: 'test' }, :raw => true).to_i.must_equal(3)
+    end
+  end
+
+  it "decrements an object key" do
+    with_store_management do |store|
+      3.times { store.increment({ hkey: 'test' }) }
+      2.times { store.decrement({ hkey: 'test' }) }
+      store.read({hkey: 'test'}, :raw => true).to_i.must_equal(1)
+    end
+  end
+
   it "increments a raw key" do
     with_store_management do |store|
       assert store.write("raw-counter", 1, :raw => true)
@@ -228,6 +254,14 @@ describe ActiveSupport::Cache::RedisStore do
     end
   end
 
+  it "increments a key with options argument" do
+    with_store_management do |store|
+      assert store.write("raw-counter", 1, :raw => true)
+      store.increment("raw-counter", 2, nil)
+      store.read("raw-counter", :raw => true).to_i.must_equal(3)
+    end
+  end
+  
   it "decrements a raw key" do
     with_store_management do |store|
       assert store.write("raw-counter", 3, :raw => true)
@@ -251,6 +285,14 @@ describe ActiveSupport::Cache::RedisStore do
     end
   end
 
+  it "decrements a key with an options argument" do
+    with_store_management do |store|
+      3.times { store.increment "counter" }
+      store.decrement "counter", 2, nil
+      store.read("counter", :raw => true).to_i.must_equal(1)
+    end
+  end
+
   it "clears the store" do
     with_store_management do |store|
       store.clear
@@ -309,18 +351,8 @@ describe ActiveSupport::Cache::RedisStore do
     @store.write "rub-a-dub", "Flora de Cana", namespace:'namespaced'
     @store.write "irish whisky", "Jameson", namespace:'namespaced'
     result = @store.read_multi "rub-a-dub", "irish whisky", namespace:'namespaced'
-    result['namespaced:rub-a-dub'].must_equal("Flora de Cana")
-    result['namespaced:irish whisky'].must_equal("Jameson")
-  end
-
-  it "read_multi return an empty {} when given an empty array" do
-    result = @store.read_multi(*[])
-    result.must_equal({})
-  end
-
-  it "read_multi return an empty {} when given an empty array with option" do
-    result = @store.read_multi(*[], option: true)
-    result.must_equal({})
+    result['rub-a-dub'].must_equal("Flora de Cana")
+    result['irish whisky'].must_equal("Jameson")
   end
 
   describe "fetch_multi" do
@@ -349,16 +381,6 @@ describe ActiveSupport::Cache::RedisStore do
       @store.read("rye").must_equal("rye-was-missing")
       @store.read("inner-rye").must_equal("rye-was-missing")
     end
-
-    it "return an empty {} when given an empty array" do
-      result = @store.fetch_multi(*[]) { 1 }
-      result.must_equal({})
-    end
-
-    it "return an empty {} when given an empty array with option" do
-      result = @store.fetch_multi(*[], option: true)
-      result.must_equal({})
-    end
   end
 
   describe "fetch_multi namespaced keys" do
@@ -369,7 +391,7 @@ describe ActiveSupport::Cache::RedisStore do
         "#{key}-was-missing"
       end
 
-      result.must_equal({ "namespaced:bourbon" => "makers", "namespaced:rye" => "rye-was-missing" })
+      result.must_equal({ "bourbon" => "makers", "rye" => "rye-was-missing" })
       @store.read("namespaced:rye").must_equal("rye-was-missing")
     end
 
@@ -383,28 +405,12 @@ describe ActiveSupport::Cache::RedisStore do
         end
       end
 
-      result.must_equal({ "namespaced:bourbon" => "makers", "namespaced:rye" => "rye-was-missing" })
+      result.must_equal({ "bourbon" => "makers", "rye" => "rye-was-missing" })
       @store.read("namespaced:rye").must_equal("rye-was-missing")
       @store.read("namespaced:inner-rye").must_equal("rye-was-missing")
     end
   end
 
-  describe "fetch_multi nested keys" do
-    it "reads existing keys and fills in anything missing" do
-      @store.write ["bourbon", "bourbon-extended"], "makers"
-
-      bourbon_key = ["bourbon", "bourbon-extended"]
-      rye_key = ["rye", "rye-extended"]
-
-      result = @store.fetch_multi(bourbon_key, rye_key) do |key|
-        "#{key}-was-missing"
-      end
-
-      result.must_equal({ "bourbon/bourbon-extended" => "makers", "rye/rye-extended" => "#{rye_key}-was-missing" })
-      @store.read(rye_key).must_equal("#{rye_key}-was-missing")
-    end
-  end
-
   describe "notifications" do
     it "notifies on #fetch" do
       with_notifications do
@@ -412,9 +418,14 @@ describe ActiveSupport::Cache::RedisStore do
       end
 
       read, generate, write = @events
+      if ActiveSupport::VERSION::MAJOR < 5
+        read_payload = { :key => 'radiohead', :super_operation => :fetch }
+      else
+        read_payload = { :key => 'radiohead', :super_operation => :fetch, hit: false }
+      end
 
       read.name.must_equal('cache_read.active_support')
-      read.payload.must_equal({ :key => 'radiohead', :super_operation => :fetch })
+      read.payload.must_equal(read_payload)
 
       generate.name.must_equal('cache_generate.active_support')
       generate.payload.must_equal({ :key => 'radiohead' })
@@ -574,12 +585,19 @@ describe ActiveSupport::Cache::RedisStore do
 
     def with_notifications
       @events = [ ]
-      ActiveSupport::Cache::RedisStore.instrument = true
+      ActiveSupport::Cache::RedisStore.instrument = true if instrument?
       ActiveSupport::Notifications.subscribe(/^cache_(.*)\.active_support$/) do |*args|
         @events << ActiveSupport::Notifications::Event.new(*args)
       end
       yield
-      ActiveSupport::Cache::RedisStore.instrument = false
+    ensure
+      ActiveSupport::Cache::RedisStore.instrument = false if instrument?
+    end
+
+    # ActiveSupport::Cache.instrument is always +true+ since Rails 4.2.0
+    def instrument?
+      ActiveSupport::VERSION::MAJOR < 4 ||
+       ActiveSupport::VERSION::MAJOR == 4 && ActiveSupport::VERSION::MINOR < 2
     end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-activesupport
 version: !ruby/object:Gem::Version
-  version: 4.1.6.pre
+  version: 5.0.0.pre
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-store
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0.pre
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
         version: '3'
     - - <
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '3'
     - - <
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,16 +91,22 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -145,9 +151,11 @@ files:
 - Rakefile
 - gemfiles/Gemfile.activesupport-3.x
 - gemfiles/Gemfile.activesupport-4.x
+- gemfiles/Gemfile.activesupport-5.x
 - lib/active_support/cache/redis_store.rb
 - lib/redis-activesupport.rb
 - redis-activesupport.gemspec
+- stdout
 - test/active_support/cache/redis_store_test.rb
 - test/test_helper.rb
 homepage: http://redis-store.org/redis-activesupport