redis-activesupport 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f76cc8e43f05938df0720d314014293a6f1fca07
-  data.tar.gz: 9e1058563ccda4f656c8f124c615997c52d05291
+  metadata.gz: eebc0d644eba5c56ef06413a98ac47d8cf73539f
+  data.tar.gz: 33b363c215491c97282d37f596068868ba484313
 SHA512:
-  metadata.gz: ff1a913f4f8cdbba56665589c487f9def5e02f527b9fa20f06786aaabd0bd97abd4f3d2833639e55b892862fee72671e9aa6e967f9147de0fa380cf5b7e6cdad
-  data.tar.gz: 9edd85a05fd26962dae0a831f6ad1f74d165e6f3399f0e8d42135bb4394da96f7559faef00fa2bd6b9fbb12087fe04be57a08e892f3c8f99cbd6fe67bfebc3ef
+  metadata.gz: a357ae2389638487bc51e9b976f3d76df74765096f91b0d9fbd9cda5eda6720afb3014a3867c77a5633f0cc6993901ffe739738774a7e085942c432f1f134239
+  data.tar.gz: a986a0f70541447333c59c0ad1c034c59ab9aaa71d6b2ddc634330973193572bbfa7d95c6bb77d0aa2828f0f5949a4c74b5989820e322fa0861ec308bfd7e9d7

data/.gitignore

@@ -1,4 +1,5 @@
 Gemfile.lock
 *.gem
 tmp/
-gemfiles/*.lock
+gemfiles/*.lock
+stdout

data/lib/active_support/cache/redis_store.rb

@@ -67,13 +67,10 @@ module ActiveSupport
 
       # 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 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.
+      # 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.
       #
       # Example:
       #   cache.delete_matched "rab*"
@@ -83,17 +80,7 @@ module ActiveSupport
           matcher = key_matcher(matcher, options)
           begin
             with do |store|
-              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)
+              !(keys = store.keys(matcher)).empty? && store.del(*keys)
             end
           rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Redis::CannotConnectError
             raise if raise_errors?
@@ -109,10 +96,14 @@ module ActiveSupport
       #   cache.read_multi "rabbit", "white-rabbit"
       #   cache.read_multi "rabbit", "white-rabbit", :raw => true
       def read_multi(*names)
-        return {} if names == []
         options = names.extract_options!
+        return {} if names == []
+
         keys = names.map{|name| normalize_key(name, options)}
-        values = with { |c| c.mget(*keys) }
+        args = [keys, options]
+        args.flatten!
+
+        values = with { |c| c.mget(*args) }
         values.map! { |v| v.is_a?(ActiveSupport::Cache::Entry) ? v.value : v }
 
         result = Hash[names.zip(values)]
@@ -121,9 +112,10 @@ module ActiveSupport
       end
 
       def fetch_multi(*names)
-        return {} if names == []
-        results = read_multi(*names)
         options = names.extract_options!
+        return {} if names == []
+
+        results = read_multi(*names, options)
         need_writes = {}
 
         fetched = names.inject({}) do |memo, name|
@@ -273,7 +265,6 @@ module ActiveSupport
           !!@options[:raise_errors]
         end
 
-
         # Add the namespace defined in the options to a pattern designed to match keys.
         #
         # This implementation is __different__ than ActiveSupport:
@@ -281,8 +272,10 @@ module ActiveSupport
         # only for strings with wildcards.
         def key_matcher(pattern, options)
           prefix = options[:namespace].is_a?(Proc) ? options[:namespace].call : options[:namespace]
+
+          pattern = pattern.inspect[1..-2] if pattern.is_a? Regexp
+
           if prefix
-            raise "Regexps aren't supported, please use string with wildcards." if pattern.is_a?(Regexp)
             "#{prefix}:#{pattern}"
           else
             pattern

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.2'
+  s.version     = '5.0.3'
   s.authors     = ['Luca Guidi', 'Ryan Bigg']
   s.email       = ['me@lucaguidi.com', 'me@ryanbigg.com']
   s.homepage    = 'http://redis-store.org/redis-activesupport'

data/test/active_support/cache/redis_store_test.rb

@@ -176,7 +176,7 @@ describe ActiveSupport::Cache::RedisStore do
     end
   end
 
-  if RUBY_VERSION.match /1\.9/
+  if RUBY_VERSION.match(/1\.9/)
     it "reads raw data" do
       with_store_management do |store|
         result = store.read("rabbit", :raw => true)
@@ -227,6 +227,18 @@ describe ActiveSupport::Cache::RedisStore do
     end
   end
 
+  it 'deletes matched data with a regexp' 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
+
   it "verifies existence of an object in the store" do
     with_store_management do |store|
       store.exist?("rabbit").must_equal(true)
@@ -415,6 +427,19 @@ describe ActiveSupport::Cache::RedisStore do
     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({})
+  end
+
+  it "read_multi returns values with raw option" do
+    @store.write "raw-value-a", "A", raw: true
+    @store.write "raw-value-b", "B", raw: true
+
+    result = @store.read_multi("raw-value-a", "raw-value-b", :raw => true)
+    result.must_equal({ "raw-value-a" => "A", "raw-value-b" => "B" })
+  end
+
   describe "fetch_multi" do
     it "reads existing keys and fills in anything missing" do
       @store.write "bourbon", "makers"
@@ -446,6 +471,11 @@ describe ActiveSupport::Cache::RedisStore do
       result = @store.fetch_multi(*[]) { 1 }
       result.must_equal({})
     end
+
+    it "return an empty {} when given an empty array with option" do
+      result = @store.read_multi(*[], option: true)
+      result.must_equal({})
+    end
   end
 
   describe "fetch_multi namespaced keys" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-activesupport
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,130 +9,130 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-07-10 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.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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
@@ -155,7 +155,6 @@ files:
 - 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
@@ -168,17 +167,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.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Redis store for ActiveSupport