redis-store 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d09e598db500a23547cfabf8b0ee023aa473aa5
-  data.tar.gz: 34fea83415585fe81210982d30f1f8891e4f90c5
+  metadata.gz: 48f4ede21caf667a2743c9827827292d2aa83be7
+  data.tar.gz: 33ba8ec50c9e700474a71b7a8d00be54d35dc093
 SHA512:
-  metadata.gz: a50a647e8edc5a25a1a2d9c2038bac4bec7d77cdc4b68734004c9f5cf4aec105a6d737172cf2a4759239309484aaf9470f73a0db14f0b08bec76718d8a5bd242
-  data.tar.gz: 24c45f122e99129e14c8dc352875ed7be76c3461623f4b101f955fa2322a4eb16ed0c53c62e1da936480c6e0d096284c77fed18c816f95c64957a9e8776396ad
+  metadata.gz: 14df20e6fb35c1d6af7958b9fd2879087d98a578e8fb0c576f4884b69615c4af68b987a446ef8de7fb52ed51de76717b90cb2e2a290341f8dc7e29b3381a8ea7
+  data.tar.gz: cbc94b8900774f3723b6cf03b6bd4e0be1931d1620ea9d97f04b52e2d8c92f813a1c7a40fd66dda808358f68db6eaf8b735950c9f1512aed0cbd0593031ef252

data/.github/auto-assign-issues.yml

@@ -0,0 +1,2 @@
+assignees:
+  - tubbo

data/.travis.yml

@@ -4,38 +4,40 @@ cache: bundler
 notifications:
   webhooks: https://www.travisbuddy.com
   on_success: never
-
 before_install:
-  # Install Code Climate test reporter
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  # 1.9.3 has Bundler 1.7.6 with the "undefined method `spec' for nil" bug
-  - gem install bundler
-
+- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
+  > ./cc-test-reporter
+- chmod +x ./cc-test-reporter
 rvm:
   - 2.1
   - 2.2
   - 2.3
   - 2.4
+  - 2.5
+  - 2.6
   - ruby-head
   - jruby-head
-
 gemfile:
-  - gemfiles/redis_3_x.gemfile
-  - gemfiles/redis_4_x.gemfile
-
-before_script: ./cc-test-reporter before-build
-
-# Pipe the coverage data to Code Climate if tests pass
+- gemfiles/redis_4_x.gemfile
+before_script: "./cc-test-reporter before-build"
 after_script:
-  - ./cc-test-reporter after-build --exit-code $EXIT_CODE
-  - ./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.json
-  - if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter upload-coverage; fi  # Upload coverage/codeclimate.json
-
+- "./cc-test-reporter after-build --exit-code $EXIT_CODE"
+- "./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.json"
+- if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter upload-coverage; fi
 matrix:
   allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head
+  - rvm: jruby-head
+  - rvm: ruby-head
   exclude:
-    - rvm: 2.1
-      gemfile: gemfiles/redis_4_x.gemfile
+  - rvm: 2.1
+    gemfile: gemfiles/redis_4_x.gemfile
+  - rvm: 2.2
+    gemfile: gemfiles/redis_4_x.gemfile
+deploy:
+  provider: rubygems
+  api_key:
+    secure: vhwP2VNfVYgppPNis7asqMnWuIcURr2e99uhYeHS4Sc+hIozu2QzAAekDrVpEDpeaEubtmTi19UcV4dZbDrQ0M+buE8LJEpItz73yK++J75Rzyh/bsGnWTy2FIvedLrH+jBNf28I9p8XNWkQxVaTc/r/v6BX3mmyV/jVoTBz9es=
+  gem: redis-store
+  on:
+    tags: true
+    repo: redis-store/redis-store

data/CODEOWNERS

@@ -0,0 +1 @@
+* @tubbo

data/lib/redis/store/namespace.rb

@@ -39,10 +39,25 @@ 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) } ]
+          end
+        else
+          super(cursor, options)
+        end
+      end
+
       def del(*keys)
         super(*keys.map { |key| interpolate(key) }) if keys.any?
       end
 
+      def unlink(*keys)
+        super(*keys.map { |key| interpolate(key) }) if keys.any?
+      end
+
       def watch(*keys)
         super(*keys.map { |key| interpolate(key) }) if keys.any?
       end
@@ -59,6 +74,18 @@ class Redis
         end
       end
 
+      def hgetall(key)
+        namespace(key) { |k| super(k) }
+      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) }
+      end
+
       def expire(key, ttl)
         namespace(key) { |k| super(k, ttl) }
       end

data/lib/redis/store/ttl.rb

@@ -34,7 +34,7 @@ class Redis
         end
 
         def with_multi_or_pipelined(options, &block)
-          return pipelined(&block) if options[:avoid_multi_commands]
+          return pipelined(&block) if options.key?(:cluster) || options[:avoid_multi_commands]
           multi(&block)
         end
     end

data/lib/redis/store/version.rb

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

data/redis-store.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.license       = 'MIT'
 
-  s.add_dependency 'redis', '>= 2.2', '< 5'
+  s.add_dependency 'redis', '>= 4', '< 5'
 
   s.add_development_dependency 'rake',     '~> 10'
-  s.add_development_dependency 'bundler',  '~> 1.3'
+  s.add_development_dependency 'bundler'
   s.add_development_dependency 'mocha',    '~> 0.14.0'
   s.add_development_dependency 'minitest', '~> 5'
   s.add_development_dependency 'git',      '~> 1.2'

data/test/redis/store/namespace_test.rb

@@ -123,6 +123,17 @@ describe "Redis::Store::Namespace" do
       store.keys("rabb*").must_equal [ "rabbit" ]
     end
 
+    it "should namespace scan when a pattern is given" do
+      store.set "rabbit", @rabbit
+      cursor = "0"
+      keys = []
+      begin
+        cursor, matched_keys = store.scan(cursor, match: "rabb*")
+        keys = keys.concat(matched_keys) unless matched_keys.empty?
+      end until cursor == "0"
+      keys.must_equal [ "rabbit" ]
+    end
+
     it "should namespace exists" do
       client.expects(:call).with([:exists, "#{@namespace}:rabbit"])
       store.exists "rabbit"
@@ -182,5 +193,20 @@ describe "Redis::Store::Namespace" do
         store.flushdb
       end
     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)
+    end
+
+    it "should namespace hset" do
+      client.expects(:call).with([:hset, "#{@namespace}:rabbit", "key", @rabbit])
+      store.hset("rabbit", "key", @rabbit)
+    end
   end
 end

data/test/redis/store/ttl_test.rb

@@ -133,6 +133,25 @@ describe MockTtlStore do
           redis.has_expire?(key, options[:expire_after]).must_equal true
         end
       end
+
+      describe 'using a redis cluster' do
+        let(:options) { { :expire_after => 3600, :cluster => %w[redis://127.0.0.1:6379/0] } }
+
+        it 'uses the redis pipelined feature to chain commands' do
+          redis.expects(:pipelined)
+          redis.setnx(key, mock_value, options)
+        end
+
+        it 'must call setnx with key and value and set raw to true' do
+          redis.setnx(key, mock_value, options)
+          redis.has_setnx?(key, mock_value, :raw => true).must_equal true
+        end
+
+        it 'must call expire' do
+          redis.setnx(key, mock_value, options)
+          redis.has_expire?(key, options[:expire_after]).must_equal true
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-store
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2019-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -48,16 +48,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -179,11 +179,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/auto-assign-issues.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md
+- CODEOWNERS
 - Gemfile
 - MIT-LICENSE
 - README.md