redis-store 1.8.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 48f4ede21caf667a2743c9827827292d2aa83be7
-  data.tar.gz: 33ba8ec50c9e700474a71b7a8d00be54d35dc093
+SHA256:
+  metadata.gz: f1313af60d82044041ee37781a16eb734332476e45ce6bc59d6c2ffa4e90c1d5
+  data.tar.gz: b17aa7cf4cc0439c2e1ee460dd15c4f16a43963370a742c9a3c9180dc970d5dc
 SHA512:
-  metadata.gz: 14df20e6fb35c1d6af7958b9fd2879087d98a578e8fb0c576f4884b69615c4af68b987a446ef8de7fb52ed51de76717b90cb2e2a290341f8dc7e29b3381a8ea7
-  data.tar.gz: cbc94b8900774f3723b6cf03b6bd4e0be1931d1620ea9d97f04b52e2d8c92f813a1c7a40fd66dda808358f68db6eaf8b735950c9f1512aed0cbd0593031ef252
+  metadata.gz: ff9ea84a0b8daf75b59883ab6d2040a3726caaf43249d52661d1d9aa335ac2c25c7e53c351d45c81f2009b50a34d07bbe6a3d408d2701bdc7c7301959c2cb4dc
+  data.tar.gz: bccc369d3d57af1dcec02e1797b1e8527b3993c051c6ff3db60556638529630adbc3ba5a7b4d53b08ebe991f145abb7eaac37873fac734ca6c4bd6ec0ea31074

data/.travis.yml

@@ -9,15 +9,16 @@ before_install:
   > ./cc-test-reporter
 - chmod +x ./cc-test-reporter
 rvm:
-  - 2.1
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
   - jruby-head
 gemfile:
+- gemfiles/redis_4_0_x.gemfile
+- gemfiles/redis_4_1_x.gemfile
 - gemfiles/redis_4_x.gemfile
 before_script: "./cc-test-reporter before-build"
 after_script:
@@ -28,11 +29,6 @@ matrix:
   allow_failures:
   - rvm: jruby-head
   - rvm: ruby-head
-  exclude:
-  - rvm: 2.1
-    gemfile: gemfiles/redis_4_x.gemfile
-  - rvm: 2.2
-    gemfile: gemfiles/redis_4_x.gemfile
 deploy:
   provider: rubygems
   api_key:

data/Appraisals

@@ -1,6 +1,10 @@
 
-appraise "redis_3_x" do
-  gem "redis", "~> 3.0"
+appraise "redis_4_0_x" do
+  gem "redis", "~> 4.0.0"
+end
+
+appraise "redis_4_1_x" do
+  gem "redis", "~> 4.1.0"
 end
 
 appraise "redis_4_x" do

data/CHANGELOG.md

@@ -1,5 +1,63 @@
 # Changelog
 
+## 1.9.0
+
+Breaking Changes
+
+* As a factor of updates for Redis v4.2.x, support for Ruby 2.1 and 2.2
+  has been dropped. These Ruby versions are end-of-life anyway.
+
+Fixed
+
+* [Compatibility with Redis client v4.2.x](https://github.com/redis-store/redis-store/pull/333)
+
+Added
+
+* [Support for edge Ruby's keyword arguments](https://github.com/redis-store/redis-store/pull/334)
+
+## 1.8.2
+
+Breaking Changes
+
+* None
+
+Added
+
+* [Add namespace to zincrby and zscore](https://github.com/redis-store/redis-store/pull/323)
+* [Add namespace to zadd and zrem](https://github.com/redis-store/redis-store/pull/326)
+
+Fixed
+
+* None
+
+## 1.8.1
+
+Breaking Changes
+
+* None
+
+Added
+
+* None
+
+Fixed
+
+* [Add namespace to remaining hash methods](https://github.com/redis-store/redis-store/pull/321)
+
+## 1.8.0
+
+Breaking Changes
+
+* None
+
+Added
+
+* [Redis Cluster Support](https://github.com/redis-store/redis-store/pull/318)
+
+Fixed
+
+* None
+
 ## 1.6.0
 
 Breaking Changes
@@ -59,7 +117,7 @@ Added
 
 Fixed
 
-* Conventional `Marshal.dump` usage allowing potential security vulnerability (CVE-2017-1000248) 
+* Conventional `Marshal.dump` usage allowing potential security vulnerability (CVE-2017-1000248)
 
 ## 1.3.0
 

data/README.md

@@ -45,9 +45,9 @@ s.add_dependency 'redis-store', '>= 1.4', '< 2'
 
 ## Status
 
-[![Gem Version](https://badge.fury.io/rb/redis-store.png)](http://badge.fury.io/rb/redis-store)
-[![Build Status](https://secure.travis-ci.org/redis-store/redis-store.png?branch=master)](http://travis-ci.org/redis-store/redis-store?branch=master)
-[![Code Climate](https://codeclimate.com/github/redis-store/redis-store.png)](https://codeclimate.com/github/redis-store/redis-store)
+[![Gem Version](https://badge.fury.io/rb/redis-store.svg)](http://badge.fury.io/rb/redis-store)
+[![Build Status](https://secure.travis-ci.org/redis-store/redis-store.svg?branch=master)](http://travis-ci.org/redis-store/redis-store?branch=master)
+[![Code Climate](https://codeclimate.com/github/redis-store/redis-store.svg)](https://codeclimate.com/github/redis-store/redis-store)
 
 ## Copyright
 

data/gemfiles/{redis_3_x.gemfile → redis_4_0_x.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "redis", "~> 3.0"
+gem "redis", "~> 4.0.0"
 
 gemspec path: "../"

data/gemfiles/redis_4_1_x.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "redis", "~> 4.1.0"
+
+gemspec path: "../"

data/lib/redis/store/interface.rb

@@ -5,8 +5,16 @@ class Redis
         super(key)
       end
 
+      REDIS_SET_OPTIONS = %i(ex px nx xx keepttl).freeze
+      private_constant :REDIS_SET_OPTIONS
+
       def set(key, value, options = nil)
-        super(key, value, options || {})
+        if options && REDIS_SET_OPTIONS.any? { |k| options.key?(k) }
+          kwargs = REDIS_SET_OPTIONS.each_with_object({}) { |key, h| h[key] = options[key] if options.key?(key) }
+          super(key, value, **kwargs)
+        else
+          super(key, value)
+        end
       end
 
       def setnx(key, value, options = nil)

data/lib/redis/store/namespace.rb

@@ -3,28 +3,32 @@ class Redis
     module Namespace
       FLUSHDB_BATCH_SIZE = 1000
 
-      def set(key, val, options = nil)
-        namespace(key) { |k| super(k, val, options) }
+      def set(key, *args)
+        namespace(key) { |k| super(k, *args) }
       end
 
-      def setex(key, ttl, val, options = nil)
-        namespace(key) { |k| super(k, ttl, val, options) }
+      def setex(key, *args)
+        namespace(key) { |k| super(k, *args) }
       end
 
-      def setnx(key, val, options = nil)
-        namespace(key) { |k| super(k, val, options) }
+      def setnx(key, *args)
+        namespace(key) { |k| super(k, *args) }
       end
 
       def ttl(key, options = nil)
         namespace(key) { |k| super(k) }
       end
 
-      def get(key, options = nil)
-        namespace(key) { |k| super(k, options) }
+      def get(key, *args)
+        namespace(key) { |k| super(k, *args) }
       end
 
-      def exists(key)
-        namespace(key) { |k| super(k) }
+      def exists(*keys)
+        super(*keys.map { |key| interpolate(key) })
+      end
+
+      def exists?(*keys)
+        super(*keys.map { |key| interpolate(key) })
       end
 
       def incrby(key, increment)
@@ -39,14 +43,14 @@ class Redis
         namespace(pattern) { |p| super(p).map { |key| strip_namespace(key) } }
       end
 
-      def scan(cursor, options = {})
-        if options[:match]
-          namespace(options[:match]) do |pattern|
-            cursor, keys = super(cursor, options.merge(match: pattern))
-            [ cursor, keys.map{|key| strip_namespace(key) } ]
+      def scan(cursor, match: nil, **kwargs)
+        if match
+          namespace(match) do |pattern|
+            cursor, keys = super(cursor, match: pattern, **kwargs)
+            [ cursor, keys.map{ |key| strip_namespace(key) } ]
           end
         else
-          super(cursor, options)
+          super(cursor, **kwargs)
         end
       end
 
@@ -74,20 +78,88 @@ class Redis
         end
       end
 
+      def expire(key, ttl)
+        namespace(key) { |k| super(k, ttl) }
+      end
+
+      def hdel(key, *fields)
+        namespace(key) { |k| super(k, *fields) }
+      end
+
+      def hget(key, field)
+        namespace(key) { |k| super(k, field) }
+      end
+
       def hgetall(key)
         namespace(key) { |k| super(k) }
       end
 
+      def hexists(key, field)
+        namespace(key) { |k| super(k, field) }
+      end
+
+      def hincrby(key, field, increment)
+        namespace(key) { |k| super(k, field, increment) }
+      end
+
+      def hincrbyfloat(key, field, increment)
+        namespace(key) { |k| super(k, field, increment) }
+      end
+
+      def hkeys(key)
+        namespace(key) { |k| super(k) }
+      end
+
+      def hlen(key)
+        namespace(key) { |k| super(k) }
+      end
+
+      def hmget(key, *fields, &blk)
+        namespace(key) { |k| super(k, *fields, &blk) }
+      end
+
+      def hmset(key, *attrs)
+        namespace(key) { |k| super(k, *attrs) }
+      end
+
+      def hset(key, *args)
+        namespace(key) { |k| super(k, *args) }
+      end
+
       def hsetnx(key, field, val)
         namespace(key) { |k| super(k, field, val) }
       end
 
-      def hset(key, field, val)
-        namespace(key) { |k| super(k, field, val) }
+      def hvals(key)
+        namespace(key) { |k| super(k) }
       end
 
-      def expire(key, ttl)
-        namespace(key) { |k| super(k, ttl) }
+      def hscan(key, *args)
+        namespace(key) { |k| super(k, *args) }
+      end
+
+      def hscan_each(key, *args)
+        namespace(key) { |k| super(k, *args) }
+      end
+
+      def zincrby(key, increment, member)
+        namespace(key) { |k| super(k, increment, member) }
+      end
+
+      def zscore(key, member)
+        namespace(key) { |k| super(k, member) }
+      end
+
+      def zadd(key, *args)
+        namespace(key) { |k| super(k, *args) }
+      end
+
+      def zrem(key, member)
+        namespace(key) { |k| super(k, member) }
+      end
+
+      if respond_to?(:ruby2_keywords, true)
+        ruby2_keywords :set, :setex, :setnx, :hscan, :hscan_each
       end
 
       def to_s

data/lib/redis/store/ttl.rb

@@ -19,9 +19,9 @@ class Redis
 
       protected
         def setnx_with_expire(key, value, ttl, options = {})
-          with_multi_or_pipelined(options) do
-            setnx(key, value, :raw => true)
-            expire(key, ttl)
+          with_multi_or_pipelined(options) do |transaction|
+            transaction.setnx(key, value, :raw => true)
+            transaction.expire(key, ttl)
           end
         end
 

data/lib/redis/store/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class Store < self
-    VERSION = '1.8.0'
+    VERSION = '1.9.1'
   end
 end

data/redis-store.gemspec

@@ -12,17 +12,13 @@ Gem::Specification.new do |s|
   s.summary     = 'Redis stores for Ruby frameworks'
   s.description = 'Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.'
 
-  s.rubyforge_project = 'redis-store'
-
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.license       = 'MIT'
 
   s.add_dependency 'redis', '>= 4', '< 5'
 
-  s.add_development_dependency 'rake',     '~> 10'
+  s.add_development_dependency 'rake',     '>= 12.3.3'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'mocha',    '~> 0.14.0'
   s.add_development_dependency 'minitest', '~> 5'

data/test/redis/store/namespace_test.rb

@@ -194,19 +194,111 @@ describe "Redis::Store::Namespace" do
       end
     end
 
+    it "should namespace hdel" do
+      client.expects(:call).with([:hdel, "#{@namespace}:rabbit", "key1", "key2"]).once
+      store.hdel("rabbit", "key1", "key2")
+    end
+
+    it "should namespace hget" do
+      client.expects(:call).with([:hget, "#{@namespace}:rabbit", "key"]).once
+      store.hget("rabbit", "key")
+    end
+
     it "should namespace hgetall" do
       client.expects(:call).with([:hgetall, "#{@namespace}:rabbit"]).once
       store.hgetall("rabbit")
     end
 
-    it "should namespace hsetnx" do
-      client.expects(:call).with([:hsetnx, "#{@namespace}:rabbit", "key", @rabbit])
-      store.hsetnx("rabbit", "key", @rabbit)
+    it "should namespace hexists" do
+      client.expects(:call).with([:hexists, "#{@namespace}:rabbit", "key"]).once
+      results = store.hexists("rabbit", "key")
+    end
+
+    it "should namespace hincrby" do
+      client.expects(:call).with([:hincrby, "#{@namespace}:rabbit", "key", 1]).once
+      store.hincrby("rabbit", "key", 1)
+    end
+
+    it "should namespace hincrbyfloat" do
+      client.expects(:call).with([:hincrby, "#{@namespace}:rabbit", "key", 1.5]).once
+      store.hincrby("rabbit", "key", 1.5)
+    end
+
+    it "should namespace hkeys" do
+      client.expects(:call).with([:hkeys, "#{@namespace}:rabbit"])
+      store.hkeys("rabbit")
+    end
+
+    it "should namespace hlen" do
+      client.expects(:call).with([:hlen, "#{@namespace}:rabbit"])
+      store.hlen("rabbit")
+    end
+
+    it "should namespace hmget" do
+      client.expects(:call).with([:hmget, "#{@namespace}:rabbit", "key1", "key2"])
+      store.hmget("rabbit", "key1", "key2")
+    end
+
+    it "should namespace hmset" do
+      client.expects(:call).with([:hmset, "#{@namespace}:rabbit", "key", @rabbit])
+      store.hmset("rabbit", "key", @rabbit)
     end
 
     it "should namespace hset" do
       client.expects(:call).with([:hset, "#{@namespace}:rabbit", "key", @rabbit])
       store.hset("rabbit", "key", @rabbit)
     end
+
+    it "should namespace hsetnx" do
+      client.expects(:call).with([:hsetnx, "#{@namespace}:rabbit", "key", @rabbit])
+      store.hsetnx("rabbit", "key", @rabbit)
+    end
+
+    it "should namespace hvals" do
+      client.expects(:call).with([:hvals, "#{@namespace}:rabbit"])
+      store.hvals("rabbit")
+    end
+
+    it "should namespace hscan" do
+      client.expects(:call).with([:hscan, "#{@namespace}:rabbit", 0])
+      store.hscan("rabbit", 0)
+    end
+
+    it "should namespace hscan_each with block" do
+      client.call([:hset, "#{@namespace}:rabbit", "key1", @rabbit])
+      client.expects(:call).with([:hscan, "#{@namespace}:rabbit", 0]).returns(["0", ["key1"]])
+      results = []
+      store.hscan_each("rabbit") do |key|
+        results << key
+      end
+      results.must_equal(["key1"])
+    end
+
+    it "should namespace hscan_each without block" do
+      client.call([:hset, "#{@namespace}:rabbit", "key1", @rabbit])
+      client.expects(:call).with([:hscan, "#{@namespace}:rabbit", 0]).returns(["0", ["key1"]])
+      results = store.hscan_each("rabbit").to_a
+      results.must_equal(["key1"])
+    end
+
+    it "should namespace zincrby" do
+      client.expects(:call).with([:zincrby, "#{@namespace}:rabbit", 1.0, "member"])
+      store.zincrby("rabbit", 1.0, "member")
+    end
+
+    it "should namespace zscore" do
+      client.expects(:call).with([:zscore, "#{@namespace}:rabbit", "member"])
+      store.zscore("rabbit", "member")
+    end
+
+    it "should namespace zadd" do
+      client.expects(:call).with([:zadd, "#{@namespace}:rabbit", 1.0, "member"])
+      store.zadd("rabbit", 1.0, "member")
+    end
+
+    it "should namespace zrem" do
+      client.expects(:call).with([:zrem, "#{@namespace}:rabbit", "member"])
+      store.zrem("rabbit", "member")
+    end
   end
 end

data/test/redis/store/ttl_test.rb

@@ -38,7 +38,7 @@ class MockRedis
         @setnxes << a
       end
 
-      block.call
+      block.call(self)
     end
   end
   alias_method :pipelined, :multi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-store
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Luca Guidi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -34,16 +34,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,8 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- gemfiles/redis_3_x.gemfile
+- gemfiles/redis_4_0_x.gemfile
+- gemfiles/redis_4_1_x.gemfile
 - gemfiles/redis_4_x.gemfile
 - lib/redis-store.rb
 - lib/redis/distributed_store.rb
@@ -217,7 +218,7 @@ homepage: http://redis-store.org/redis-store
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -232,19 +233,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: redis-store
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Redis stores for Ruby frameworks
-test_files:
-- test/redis/distributed_store_test.rb
-- test/redis/store/factory_test.rb
-- test/redis/store/interface_test.rb
-- test/redis/store/namespace_test.rb
-- test/redis/store/redis_version_test.rb
-- test/redis/store/serialization_test.rb
-- test/redis/store/ttl_test.rb
-- test/redis/store/version_test.rb
-- test/redis/store_test.rb
-- test/test_helper.rb
+test_files: []