redis-activesupport 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 436164d1ef3ef82be09f9eb7b3987ad2cbbb4ed8
-  data.tar.gz: 02c68a30e474b0908ac13b6c4360bffe95b24bcb
+  metadata.gz: f76cc8e43f05938df0720d314014293a6f1fca07
+  data.tar.gz: 9e1058563ccda4f656c8f124c615997c52d05291
 SHA512:
-  metadata.gz: 2ba686e12401b4e55d3f481fa2364d5c83e6321226264e8be2896304e4128dc533037ca33a34e4254d19cac3403a58b446477d5862500c27e8d1e240f8c99381
-  data.tar.gz: 9ecba7650fabe45b2fe0d353525e15ab6f3ac2e272c496799a420eb063657137eb17a19a7ae11520cd91c001ff5a5b148a3b126ef274e76e1f33518477c978e5
+  metadata.gz: ff1a913f4f8cdbba56665589c487f9def5e02f527b9fa20f06786aaabd0bd97abd4f3d2833639e55b892862fee72671e9aa6e967f9147de0fa380cf5b7e6cdad
+  data.tar.gz: 9edd85a05fd26962dae0a831f6ad1f74d165e6f3399f0e8d42135bb4394da96f7559faef00fa2bd6b9fbb12087fe04be57a08e892f3c8f99cbd6fe67bfebc3ef

data/.travis.yml

@@ -11,8 +11,6 @@ rvm:
   - 2.2.4
   - 2.3.0
   - ruby-head
-  - rbx-19mode
-  - jruby-19mode
   - jruby-head
 services:
   - redis-server

data/Gemfile

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

data/README.md

@@ -31,7 +31,9 @@ If you are on **Snow Leopard** you have to run `env ARCHFLAGS="-arch x86_64" bun
 
 ## Status
 
-[![Gem Version](https://badge.fury.io/rb/redis-activesupport.png)](http://badge.fury.io/rb/redis-activesupport) [![Build Status](https://secure.travis-ci.org/redis-store/redis-activesupport.png?branch=master)](http://travis-ci.org/jodosha/redis-activesupport?branch=master) [![Code Climate](https://codeclimate.com/github/jodosha/redis-store.png)](https://codeclimate.com/github/redis-store/redis-activesupport)
+[![Gem Version](https://badge.fury.io/rb/redis-activesupport.png)](http://badge.fury.io/rb/redis-activesupport) 
+[![Build Status](https://secure.travis-ci.org/redis-store/redis-activesupport.png?branch=master)](http://travis-ci.org/redis-store/redis-activesupport?branch=master) 
+[![Code Climate](https://codeclimate.com/github/redis-store/redis-activesupport.png)](https://codeclimate.com/github/redis-store/redis-activesupport)
 
 ## Copyright
 

data/lib/active_support/cache/redis_store.rb

@@ -35,6 +35,7 @@ module ActiveSupport
       #     # => supply an existing connection pool (e.g. for use with redis-sentinel or redis-failover)
       def initialize(*addresses)
         @options = addresses.dup.extract_options!
+        addresses = addresses.map(&:dup)
 
         @data = if @options[:pool]
                   raise "pool must be an instance of ConnectionPool" unless @options[:pool].is_a?(ConnectionPool)
@@ -57,16 +58,22 @@ module ActiveSupport
         options = merged_options(options)
         instrument(:write, name, options) do |payload|
           entry = options[:raw].present? ? value : Entry.new(value, options)
+          if options[:expires_in].present? && options[:race_condition_ttl].present? && options[:raw].blank?
+            options[:expires_in] = options[:expires_in].to_f + options[:race_condition_ttl].to_f
+          end
           write_entry(normalize_key(name, options), entry, options)
         end
       end
 
       # Delete objects for matched keys.
       #
+      # Uses SCAN to iterate and collect matched keys only when both client and
+      # server supports it (Redis server >= 2.8.0, client >= 3.0.6)
+      #
       # Performance note: this operation can be dangerous for large production
-      # databases, as it uses the Redis "KEYS" command, which is O(N) over the
-      # total number of keys in the database. Users of large Redis caches should
-      # avoid this method.
+      # databases on Redis < 2.8.0, as it uses the Redis "KEYS" command, which
+      # is O(N) over the total number of keys in the database. Users of large
+      # Redis caches should avoid this method.
       #
       # Example:
       #   cache.delete_matched "rab*"
@@ -76,7 +83,17 @@ module ActiveSupport
           matcher = key_matcher(matcher, options)
           begin
             with do |store|
-              !(keys = store.keys(matcher)).empty? && store.del(*keys)
+              supports_scan_each = store.respond_to?(:supports_redis_version?) &&
+                store.supports_redis_version?("2.8.0") &&
+                store.respond_to?(:scan_each)
+
+              if supports_scan_each
+                keys = store.scan_each(match: matcher).to_a
+              else
+                keys = store.keys(matcher)
+              end
+
+              !keys.empty? && store.del(*keys)
             end
           rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Redis::CannotConnectError
             raise if raise_errors?
@@ -98,9 +115,6 @@ module ActiveSupport
         values = with { |c| c.mget(*keys) }
         values.map! { |v| v.is_a?(ActiveSupport::Cache::Entry) ? v.value : v }
 
-        # Remove the options hash before mapping keys to values
-        names.extract_options!
-
         result = Hash[names.zip(values)]
         result.reject!{ |k,v| v.nil? }
         result
@@ -110,10 +124,9 @@ module ActiveSupport
         return {} if names == []
         results = read_multi(*names)
         options = names.extract_options!
-        fetched = {}
         need_writes = {}
 
-        fetched = names.inject({}) do |memo, (name, _)|
+        fetched = names.inject({}) do |memo, name|
           memo[name] = results.fetch(name) do
             value = yield name
             need_writes[name] = value
@@ -158,7 +171,7 @@ module ActiveSupport
       def increment(key, amount = 1, options = {})
         options = merged_options(options)
         instrument(:increment, key, :amount => amount) do
-          with{|c| c.incrby namespaced_key(key, options), amount}
+          with{|c| c.incrby normalize_key(key, options), amount}
         end
       end
 
@@ -186,13 +199,13 @@ module ActiveSupport
       def decrement(key, amount = 1, options = {})
         options = merged_options(options)
         instrument(:decrement, key, :amount => amount) do
-          with{|c| c.decrby namespaced_key(key, options), amount}
+          with{|c| c.decrby normalize_key(key, options), amount}
         end
       end
 
       def expire(key, ttl)
         options = merged_options(nil)
-        with { |c| c.expire namespaced_key(key, options), ttl }
+        with { |c| c.expire normalize_key(key, options), ttl }
       end
 
       # Clear all the data from the store.
@@ -286,4 +299,3 @@ module ActiveSupport
     end
   end
 end
-

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     = '5.0.1'
+  s.version     = '5.0.2'
   s.authors     = ['Luca Guidi', 'Ryan Bigg']
   s.email       = ['me@lucaguidi.com', 'me@ryanbigg.com']
   s.homepage    = 'http://redis-store.org/redis-activesupport'
@@ -18,14 +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.2.0'
+  s.add_runtime_dependency 'redis-store',   '~> 1.3.0'
   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', '< 6'
-  s.add_development_dependency 'connection_pool',     '~> 1.2.0'
+  s.add_development_dependency 'connection_pool', '~> 2.2.0'
   s.add_development_dependency 'redis-store-testing'
 end
-

data/test/active_support/cache/redis_store_test.rb

@@ -56,6 +56,20 @@ describe ActiveSupport::Cache::RedisStore do
     redis.exists("rabbit").must_equal(true)
   end
 
+  it "connects using the passed hash of options" do
+    address = { host: '127.0.0.1', port: '6380', db: '1' }.merge(pool_size: 5, pool_timeout: 10)
+    store = ActiveSupport::Cache::RedisStore.new(address)
+    redis = Redis.new(url: "redis://127.0.0.1:6380/1")
+    redis.flushall
+    address[:db] = '0' # Should not use this db
+
+    store.data.class.must_equal(::ConnectionPool)
+
+    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')
@@ -204,8 +218,12 @@ describe ActiveSupport::Cache::RedisStore do
 
   it "deletes matched data" do
     with_store_management do |store|
+      store.write "rabbit2", @white_rabbit
+      store.write "rub-a-dub", "Flora de Cana"
       store.delete_matched "rabb*"
       store.read("rabbit").must_be_nil
+      store.read("rabbit2").must_be_nil
+      store.exist?("rub-a-dub").must_equal(true)
     end
   end
 
@@ -261,7 +279,7 @@ describe ActiveSupport::Cache::RedisStore do
       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)
@@ -333,6 +351,43 @@ describe ActiveSupport::Cache::RedisStore do
     end
   end
 
+  describe "race_condition_ttl on fetch" do
+    it "persist entry for longer than given ttl" do
+      options = { force: true, expires_in: 1.second, race_condition_ttl: 2.seconds }
+      @store.fetch("rabbit", options) { @rabbit }
+      sleep 1.1
+      @store.delete("rabbit").must_equal(1)
+    end
+
+    it "limits stampede time to read-write duration" do
+      first_rabbit = second_rabbit = nil
+      options = { force: true, expires_in: 1.second, race_condition_ttl: 2.seconds }
+      @store.fetch("rabbit", options) { @rabbit }
+      sleep 1
+
+      th1 = Thread.new do
+        first_rabbit = @store.fetch("rabbit", race_condition_ttl: 2) do
+          sleep 1
+          @white_rabbit
+        end
+      end
+
+      sleep 0.1
+
+      th2 = Thread.new do
+        second_rabbit = @store.fetch("rabbit") { @white_rabbit }
+      end
+
+      th1.join
+      th2.join
+
+      first_rabbit.must_equal(@white_rabbit)
+      second_rabbit.must_equal(@rabbit)
+
+      @store.fetch("rabbit").must_equal(@white_rabbit)
+    end
+  end
+
   it "reads multiple keys" do
     @store.write "irish whisky", "Jameson"
     result = @store.read_multi "rabbit", "irish whisky"
@@ -421,6 +476,22 @@ describe ActiveSupport::Cache::RedisStore do
     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_key => "makers", rye_key => "#{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
@@ -610,4 +681,3 @@ describe ActiveSupport::Cache::RedisStore do
        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: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,130 +9,130 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2017-02-28 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.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
   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
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: redis-store-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Redis store for ActiveSupport
@@ -143,8 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -168,17 +168,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: redis-activesupport
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Redis store for ActiveSupport