redis-store 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcf8af10e3ba000726fa40f3633c0bd725f3c1f1
-  data.tar.gz: c51a300a95250fb34af534d1d3f427122baf919a
+  metadata.gz: 343594d8b51298be4a1d5c015a64d04fe1939c12
+  data.tar.gz: 3ee360fae5b291f77f56175cc34e18e635af655d
 SHA512:
-  metadata.gz: f7f5e7c2b314d06103bc76a14cb203bf23815d9b98c2d828d9dad75b7fcaf59761f171daca30ca5e6d780d8bf83107fbd78a8796cdd5215fba0e5f88b8c30133
-  data.tar.gz: e849f9d018d464eb359d0bb17c10e1adbecae028e64eb7e99b81d995373d58f25a35980513eaf9c5177e9a47fa1b426e131b59f546e5acb2e421854cee6f440c
+  metadata.gz: '0906711b266addefc485ddad054c70eb1d25ccfdc8162c9c9225229d1e26be1c66361ef1704a86e8e7e17419ef961c6aec3c85156275794f956921964b599c2e'
+  data.tar.gz: 4aa88e8de4f00b29e20dd4f93bbaf4f21a18850e6cedebfb93fcbb3b98190b2cc2fd327f4aceb8dc24c66896f66095a24706b94fec31eff078ecd6440e2a9a7c

data/.travis.yml

@@ -10,7 +10,6 @@ rvm:
   - 2.2
   - 2.3.0
   - ruby-head
-  - jruby-19mode
   - jruby-head
 bundler_args: '--path vendor/bundle'
 

data/{CHANGELOG → CHANGELOG.md}

@@ -1,5 +1,33 @@
 # Changelog
 
+## 1.4.1
+
+Breaking Changes
+
+* None
+
+Added
+
+* [Support for Redis client library v4](https://github.com/redis-store/redis-store/issues/277)
+
+Fixed
+
+* None
+
+## 1.4.0
+
+Breaking Changes
+
+* None
+
+Added
+
+* Pluggable backend for serializing data in/out of Redis, eventually replacing `:marshalling` in v2.
+
+Fixed
+
+* Conventional `Marshal.dump` usage allowing potential security vulnerability (CVE-2017-1000248) 
+
 ## 1.3.0
 
 Breaking Changes

data/lib/redis/store/factory.rb

@@ -20,7 +20,7 @@ class Redis
         if @addresses.empty?
           @addresses << {}
         end
-        
+
         if @addresses.size > 1
           ::Redis::DistributedStore.new @addresses, @options
         else
@@ -99,7 +99,6 @@ class Redis
           end
         end
       end
-
     end
   end
 end

data/lib/redis/store/namespace.rb

@@ -43,6 +43,10 @@ class Redis
         super(*keys.map {|key| interpolate(key) }) if keys.any?
       end
 
+      def watch(*keys)
+        super(*keys.map {|key| interpolate(key) }) if keys.any?
+      end
+
       def mget(*keys)
         options = (keys.pop if keys.last.is_a? Hash) || {}
         if keys.any?

data/lib/redis/store/ttl.rb

@@ -11,15 +11,15 @@ class Redis
 
       def setnx(key, value, options = nil)
         if ttl = expires_in(options)
-          setnx_with_expire(key, value, ttl.to_i)
+          setnx_with_expire(key, value, ttl.to_i, options)
         else
           super(key, value)
         end
       end
 
       protected
-        def setnx_with_expire(key, value, ttl)
-          multi do
+        def setnx_with_expire(key, value, ttl, options = {})
+          with_multi_or_pipelined(options) do
             setnx(key, value, :raw => true)
             expire(key, ttl)
           end
@@ -32,6 +32,11 @@ class Redis
             options[:expire_after] || options[:expires_in] || options[:expire_in]
           end
         end
+
+        def with_multi_or_pipelined(options, &block)
+          return pipelined(&block) if options[:avoid_multi_commands]
+          multi(&block)
+        end
     end
   end
 end

data/lib/redis/store/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class Store < self
-    VERSION = '1.4.0'
+    VERSION = '1.4.1'
   end
 end

data/redis-store.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.license       = 'MIT'
 
-  s.add_dependency 'redis', '>= 2.2', '< 4'
+  s.add_dependency 'redis', '>= 2.2', '< 5'
 
   s.add_development_dependency 'rake',     '~> 10'
   s.add_development_dependency 'bundler',  '~> 1.3'
@@ -29,4 +29,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry-nav',  '~> 0.2.4'
   s.add_development_dependency 'pry',      '~> 0.10.4'
   s.add_development_dependency 'redis-store-testing'
-end
+end

data/test/redis/store/factory_test.rb

@@ -148,7 +148,7 @@ describe "Redis::Store::Factory" do
       it "correctly uses specified ipv6 host" do
         store = Redis::Store::Factory.create "redis://[::1]:6380"
         store.to_s.must_equal("Redis Client connected to [::1]:6380 against DB 0")
-        store.client.host.must_equal("::1")
+        store.instance_variable_get('@options')[:host].must_equal("::1")
       end
 
       it "instantiates Redis::DistributedStore" do

data/test/redis/store/namespace_test.rb

@@ -152,5 +152,10 @@ describe "Redis::Store::Namespace" do
        client.expects(:call).with([:ttl, "#{@namespace}:rabbit"]).once
        store.ttl("rabbit")
     end
+
+    it "should namespace watch" do
+      client.expects(:call).with([:watch,"#{@namespace}:rabbit"]).once
+      store.watch("rabbit")
+    end
   end
 end

data/test/redis/store/ttl_test.rb

@@ -41,6 +41,7 @@ class MockRedis
       block.call
     end
   end
+  alias_method :pipelined, :multi
 
   def expire(*a)
     @expires << a
@@ -94,13 +95,17 @@ describe MockTtlStore do
       end
 
       it 'must not call expire' do
-        MockTtlStore.any_instance.expects(:expire).never
-
+        redis.expects(:expire).never
         redis.setnx(key, mock_value)
       end
     end
 
     describe 'with expiry' do
+      it 'uses the mutli command to chain commands' do
+        redis.expects(:multi)
+        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
@@ -110,6 +115,25 @@ describe MockTtlStore do
         redis.setnx(key, mock_value, options)
         redis.has_expire?(key, options[:expire_after]).must_equal true
       end
+
+      describe 'avoiding multi commands' do
+        let(:options) { { :expire_after => 3600, :avoid_multi_commands => true } }
+
+        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.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -19,7 +19,7 @@ dependencies:
         version: '2.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '2.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md