redis-store 1.1.7 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c34d0f4a72ee0603e5b2ef2b95808baac398b667
-  data.tar.gz: e4805c9cd1bfd2cffc6504e36bddf00c80b0ce45
+  metadata.gz: fcf8af10e3ba000726fa40f3633c0bd725f3c1f1
+  data.tar.gz: c51a300a95250fb34af534d1d3f427122baf919a
 SHA512:
-  metadata.gz: 85aa71788df20715c5878ee1b13c047c5904a2b57fb30f4d69e9235dd61692b8f01671ac112f789f9ea6730a8db3cc188226c036188691a563df0e48964a6f90
-  data.tar.gz: 9bebac3bac2a0ee4dc94db6f08325ce707a65ca289f36ad049769ed0cbc0ea6c6eba0f8ce8c0786560242f7b6ba683567743738c1d7897669b3909fffe854368
+  metadata.gz: f7f5e7c2b314d06103bc76a14cb203bf23815d9b98c2d828d9dad75b7fcaf59761f171daca30ca5e6d780d8bf83107fbd78a8796cdd5215fba0e5f88b8c30133
+  data.tar.gz: e849f9d018d464eb359d0bb17c10e1adbecae028e64eb7e99b81d995373d58f25a35980513eaf9c5177e9a47fa1b426e131b59f546e5acb2e421854cee6f440c

data/.gitignore

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

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+sudo: false
+cache: bundler
 before_install: gem install bundler
 script: 'bundle exec rake'
 rvm:
@@ -6,8 +8,8 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.0
   - ruby-head
-  - rbx-19mode
   - jruby-19mode
   - jruby-head
 bundler_args: '--path vendor/bundle'

data/CHANGELOG

@@ -1,3 +1,56 @@
+# Changelog
+
+## 1.3.0
+
+Breaking Changes
+
+* None
+
+Added
+
+* Add support for marshalling mset
+
+Fixed
+
+* Set :raw => true if marshalling
+* Forward new Hash, not nil, when options are unset
+
+## 1.2.0
+
+Breaking Changes
+
+* None
+
+Added
+
+* Allow changing namespaces on the fly
+* Begin testing against ruby 2.3.0
+
+Fixed
+
+* Use batched deletes for flushdb with a namespace
+* pass set command options to redis
+* bump rbx 2
+* fix setex marshalling for distributed store
+* changes to new url
+* :warning: shadowing outer local variable - key, pattern, value
+* :warning: `*' interpreted as argument prefix
+* Removed duplicated method ttl
+
+## 1.1.7
+
+Breaking Changes
+
+* None
+
+Added
+
+* Added redis_version and supports_redis_version? methods to Store and DistributedStore
+
+Fixed
+
+* Handle minor and patch version correctly as they may be multiple digits
+
 *1.1.6 (July 16, 2015)*
 
 https://github.com/redis-store/redis-store/compare/v1.1.5...v1.1.6
@@ -95,7 +148,7 @@ https://github.com/redis-store/redis-store/compare/v1.1.4...v1.1.5
     - redis-i18n 0.6.0.rc2
     - redis-rack-cache 1.1.rc3
     - redis-rails 3.1.3.rc4
-    - redis-sinatra 1.3.1.rc2 
+    - redis-sinatra 1.3.1.rc2
   * Remove redis-actionpack dependency on redis-rack-cache [Matt Horan]
 
 *1.1.0 [rc2] (February 3, 2012)*
@@ -144,7 +197,7 @@ https://github.com/redis-store/redis-store/compare/v1.1.4...v1.1.5
   * Use strict dependencies.
   * READMEs and Licenses
   * redis-actionpack now depends on redis-rack-cache
-  * Redis::Factory.convert_to_redis_client_options => Redis::Factory.resolve. 
+  * Redis::Factory.convert_to_redis_client_options => Redis::Factory.resolve.
   * Don't use autoload
   * Make redis-rack-cache tests to pass again
   * Target Rack::Cache 1.1 for redis-rack-cache
@@ -172,7 +225,7 @@ https://github.com/redis-store/redis-store/compare/v1.1.4...v1.1.5
   * Moved Rake test tasks into lib/tasks/redis.tasks.rb, in order to DRY Rake
   * Testing: Use relative paths when referring to pid files
   * Autoload modules
-  * Moved Rake test tasks under lib/ in order to make them accessible to all 
+  * Moved Rake test tasks under lib/ in order to make them accessible to all
   * Let the Redis::DistributedStore test to pass
   * Let Redis Rake tasks to work again
   * Run tests without dtach

data/README.md

@@ -21,7 +21,7 @@ Download and install Redis from [the download page](http://redis.io//download) a
 ## Running tests
 
 ```ruby
-git clone git://github.com/jodosha/redis-store.git
+git clone git://github.com/redis-store/redis-store.git
 cd redis-store
 gem install bundler
 bundle exec rake
@@ -31,12 +31,24 @@ If you are on **Snow Leopard** you have to run `env ARCHFLAGS="-arch x86_64" rub
 
 ## Contributors
 
-  * Matt Horan ([@mhoran](https://github.com/mhoran))
+https://github.com/redis-store/redis-store/graphs/contributors
+
+## Versioning
+
+The **redis-store** family of gems uses [Semantic Versioning](http://semver.org), meaning gems depending on **redis-store**
+can be reliably inclusive of any version between the current and the next major. We recommend the following dependency
+in your library's gemspec:
+
+```ruby
+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/jodosha/redis-store?branch=master) [![Code Climate](https://codeclimate.com/github/jodosha/redis-store.png)](https://codeclimate.com/github/redis-store/redis-store)
+[![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)
 
 ## Copyright
 
-2009 - 2013 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license
+2009 - 2013 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license.

data/lib/redis/distributed_store.rb

@@ -46,6 +46,10 @@ class Redis
       end
     end
 
+    def setex(key, expiry, value, options = nil)
+      node_for(key).setex(key, expiry, value, options)
+    end
+
     private
       def _extend_namespace(options)
         @namespace = options[:namespace]

data/lib/redis/store/factory.rb

@@ -50,6 +50,14 @@ class Redis
         if options.key?(:key_prefix) && !options.key?(:namespace)
           options[:namespace] = options.delete(:key_prefix) # RailsSessionStore
         end
+        options[:raw] = case
+                        when options.key?(:serializer)
+                          options[:serializer].nil?
+                        when options.key?(:marshalling)
+                          !options[:marshalling]
+                        else
+                          false
+                        end
         options
       end
 
@@ -70,7 +78,7 @@ class Redis
         options = {
           :host     => uri.hostname,
           :port     => uri.port || DEFAULT_PORT, 
-          :password => uri.password
+          :password => uri.password.nil? ? nil : CGI::unescape(uri.password.to_s)
         }
 
         options[:db]        = db.to_i   if db

data/lib/redis/store/interface.rb

@@ -6,7 +6,7 @@ class Redis
       end
 
       def set(key, value, options = nil)
-        super(key, value)
+        super(key, value, options || {})
       end
 
       def setnx(key, value, options = nil)

data/lib/redis/store/namespace.rb

@@ -1,72 +1,82 @@
 class Redis
   class Store < self
     module Namespace
+      FLUSHDB_BATCH_SIZE = 1000
+
       def set(key, val, options = nil)
-        namespace(key) { |key| super(key, val, options) }
+        namespace(key) { |k| super(k, val, options) }
       end
 
       def setex(key, ttl, val, options = nil)
-        namespace(key) { |key| super(key, ttl, val, options) }
+        namespace(key) { |k| super(k, ttl, val, options) }
       end
 
       def setnx(key, val, options = nil)
-        namespace(key) { |key| super(key, val, options) }
+        namespace(key) { |k| super(k, val, options) }
       end
 
       def ttl(key, options = nil)
-        namespace(key) { |key| super(key) }
+        namespace(key) { |k| super(k) }
       end
 
       def get(key, options = nil)
-        namespace(key) { |key| super(key, options) }
+        namespace(key) { |k| super(k, options) }
       end
 
       def exists(key)
-        namespace(key) { |key| super(key) }
+        namespace(key) { |k| super(k) }
       end
 
       def incrby(key, increment)
-        namespace(key) { |key| super(key, increment) }
+        namespace(key) { |k| super(k, increment) }
       end
 
       def decrby(key, increment)
-        namespace(key) { |key| super(key, increment) }
+        namespace(key) { |k| super(k, increment) }
       end
 
       def keys(pattern = "*")
-        namespace(pattern) { |pattern| super(pattern).map{|key| strip_namespace(key) } }
+        namespace(pattern) { |p| super(p).map{|key| strip_namespace(key) } }
       end
 
       def del(*keys)
-        super *keys.map {|key| interpolate(key) } if keys.any?
+        super(*keys.map {|key| interpolate(key) }) if keys.any?
       end
 
       def mget(*keys)
-        options = keys.pop if keys.last.is_a? Hash
+        options = (keys.pop if keys.last.is_a? Hash) || {}
         if keys.any?
-          # Marshalling gets extended before Namespace does, so we need to pass options further
-          if singleton_class.ancestors.include? Marshalling
-            super *keys.map {|key| interpolate(key) }, options
+          # Serialization gets extended before Namespace does, so we need to pass options further
+          if singleton_class.ancestors.include? Serialization
+            super(*keys.map {|key| interpolate(key) }, options)
           else
-            super *keys.map {|key| interpolate(key) }
+            super(*keys.map {|key| interpolate(key) })
           end
         end
       end
-      
+
       def expire(key, ttl)
-         namespace(key) { |key| super(key, ttl) }
-      end
-      
-      def ttl(key)
-         namespace(key) { |key| super(key) }
+         namespace(key) { |k| super(k, ttl) }
       end
 
       def to_s
-        "#{super} with namespace #{namespace_str}"
+        if namespace_str
+          "#{super} with namespace #{namespace_str}"
+        else
+          super
+        end
       end
 
       def flushdb
-        del *keys
+        keys.each_slice(FLUSHDB_BATCH_SIZE) { |key_slice| del(*key_slice) }
+      end
+
+      def with_namespace(ns)
+        old_ns = @namespace
+        @namespace = ns
+        yield self
+      ensure
+        @namespace = old_ns
       end
 
       private
@@ -79,10 +89,12 @@ class Redis
         end
 
         def interpolate(key)
+          return key unless namespace_str
           key.match(namespace_regexp) ? key : "#{namespace_str}:#{key}"
         end
 
         def strip_namespace(key)
+          return key unless namespace_str
           key.gsub namespace_regexp, ""
         end
 

data/lib/redis/store/{marshalling.rb → serialization.rb}

@@ -1,16 +1,16 @@
 class Redis
   class Store < self
-    module Marshalling
+    module Serialization
       def set(key, value, options = nil)
-        _marshal(value, options) { |value| super encode(key), encode(value), options }
+        _marshal(value, options) { |v| super encode(key), encode(v), options }
       end
 
       def setnx(key, value, options = nil)
-        _marshal(value, options) { |value| super encode(key), encode(value), options }
+        _marshal(value, options) { |v| super encode(key), encode(v), options }
       end
 
       def setex(key, expiry, value, options = nil)
-        _marshal(value, options) { |value| super encode(key), expiry, encode(value), options }
+        _marshal(value, options) { |v| super encode(key), expiry, encode(v), options }
       end
 
       def get(key, options = nil)
@@ -24,13 +24,23 @@ class Redis
         end
       end
 
+      def mset(*args)
+        options = args.pop if args.length.odd?
+        updates = []
+        args.each_slice(2) do |(key, value)|
+          updates << encode(key)
+          _marshal(value, options) { |v| updates << encode(v) }
+        end
+        super(*updates)
+      end
+
       private
         def _marshal(val, options)
-          yield marshal?(options) ? Marshal.dump(val) : val
+          yield marshal?(options) ? @serializer.dump(val) : val
         end
 
         def _unmarshal(val, options)
-          unmarshal?(val, options) ? Marshal.load(val) : val
+          unmarshal?(val, options) ? @serializer.load(val) : val
         end
 
         def marshal?(options)

data/lib/redis/store/ttl.rb

@@ -5,7 +5,7 @@ class Redis
         if ttl = expires_in(options)
           setex(key, ttl.to_i, value, :raw => true)
         else
-          super(key, value)
+          super(key, value, options)
         end
       end
 

data/lib/redis/store/version.rb

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

data/lib/redis/store.rb

@@ -1,3 +1,10 @@
+require 'redis'
+require 'redis/store/factory'
+require 'redis/distributed_store'
+require 'redis/store/namespace'
+require 'redis/store/serialization'
+require 'redis/store/version'
+require 'redis/store/redis_version'
 require 'redis/store/ttl'
 require 'redis/store/interface'
 require 'redis/store/redis_version'
@@ -8,6 +15,24 @@ class Redis
 
     def initialize(options = { })
       super
+
+      unless options[:marshalling].nil?
+        puts %(
+          DEPRECATED: You are passing the :marshalling option, which has been
+          replaced with `serializer: Marshal` to support pluggable serialization
+          backends. To disable serialization (much like disabling marshalling),
+          pass `serializer: nil` in your configuration.
+
+          The :marshalling option will be removed for redis-store 2.0.
+        )
+      end
+
+      @serializer = options.key?(:serializer) ? options[:serializer] : Marshal
+
+      unless options[:marshalling].nil?
+        @serializer = options[:marshalling] ? Marshal : nil
+      end
+
       _extend_marshalling options
       _extend_namespace   options
     end
@@ -23,13 +48,12 @@ class Redis
 
     private
       def _extend_marshalling(options)
-        @marshalling = !(options[:marshalling] === false) # HACK - TODO delegate to Factory
-        extend Marshalling if @marshalling
+        extend Serialization unless @serializer.nil?
       end
 
       def _extend_namespace(options)
         @namespace = options[:namespace]
-        extend Namespace if @namespace
+        extend Namespace
       end
   end
 end

data/lib/redis-store.rb

@@ -1,13 +1 @@
-require 'redis'
 require 'redis/store'
-require 'redis/store/factory'
-require 'redis/distributed_store'
-require 'redis/store/namespace'
-require 'redis/store/marshalling'
-require 'redis/store/version'
-require 'redis/store/redis_version'
-
-class Redis
-  class Store < self
-  end
-end

data/redis-store.gemspec

@@ -19,13 +19,14 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.license       = 'MIT'
 
-  s.add_dependency 'redis', '>= 2.2'
+  s.add_dependency 'redis', '>= 2.2', '< 4'
 
   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', '~> 5'
   s.add_development_dependency 'git',      '~> 1.2'
+  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

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'json'
 
 describe "Redis::Store::Factory" do
   describe ".create" do
@@ -41,9 +42,53 @@ describe "Redis::Store::Factory" do
         store.instance_variable_get(:@client).password.must_equal("secret")
       end
 
-      it "allows/disable marshalling" do
-        store = Redis::Store::Factory.create :marshalling => false
-        store.instance_variable_get(:@marshalling).must_equal(false)
+      it 'uses empty password' do
+        store = Redis::Store::Factory.create :password => ''
+        store.instance_variable_get(:@client).password.must_equal('')
+      end
+
+      it 'uses nil password' do
+        store = Redis::Store::Factory.create :password => nil
+        assert_nil(store.instance_variable_get(:@client).password)
+      end
+
+      it "disables serialization" do
+        store = Redis::Store::Factory.create :serializer => nil
+        store.instance_variable_get(:@serializer).must_be_nil
+        store.instance_variable_get(:@options)[:raw].must_equal(true)
+      end
+
+      it "configures pluggable serialization backend" do
+        store = Redis::Store::Factory.create :serializer => JSON
+        store.instance_variable_get(:@serializer).must_equal(JSON)
+        store.instance_variable_get(:@options)[:raw].must_equal(false)
+      end
+
+      describe 'with stdout disabled' do
+        before do
+          @original_stderr = $stderr
+          @original_stdout = $stdout
+
+          $stderr = Tempfile.new('stderr')
+          $stdout = Tempfile.new('stdout')
+        end
+
+        it "disables marshalling and provides deprecation warning" do
+          store = Redis::Store::Factory.create :marshalling => false
+          store.instance_variable_get(:@serializer).must_be_nil
+          store.instance_variable_get(:@options)[:raw].must_equal(true)
+        end
+
+        it "enables marshalling but provides warning to use :serializer instead" do
+          store = Redis::Store::Factory.create :marshalling => true
+          store.instance_variable_get(:@serializer).must_equal(Marshal)
+          store.instance_variable_get(:@options)[:raw].must_equal(false)
+        end
+
+        after do
+          $stderr = @original_stderr
+          $stdout = @original_stdout
+        end
       end
 
       it "should instantiate a Redis::DistributedStore store" do
@@ -85,6 +130,21 @@ describe "Redis::Store::Factory" do
         store.instance_variable_get(:@client).password.must_equal("secret")
       end
 
+      it 'uses specified password with special characters' do
+        store = Redis::Store::Factory.create 'redis://:pwd%40123@127.0.0.1:6379/0/theplaylist'
+        store.instance_variable_get(:@client).password.must_equal('pwd@123')
+      end
+
+      it 'uses empty password' do
+        store = Redis::Store::Factory.create 'redis://:@127.0.0.1:6379/0/theplaylist'
+        store.instance_variable_get(:@client).password.must_equal('')
+      end
+
+      it 'uses nil password' do
+        store = Redis::Store::Factory.create 'redis://127.0.0.1:6379/0/theplaylist'
+        assert_nil(store.instance_variable_get(:@client).password)
+      end
+
       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")

data/test/redis/store/namespace_test.rb

@@ -3,11 +3,12 @@ require 'test_helper'
 describe "Redis::Store::Namespace" do
   def setup
     @namespace = "theplaylist"
-    @store  = Redis::Store.new :namespace => @namespace, :marshalling => false # TODO remove mashalling option
+    @store  = Redis::Store.new :namespace => @namespace, :serializer => nil
     @client = @store.instance_variable_get(:@client)
     @rabbit = "bunny"
     @default_store = Redis::Store.new
-    @other_store = Redis::Store.new :namespace => 'other'
+    @other_namespace = 'other'
+    @other_store = Redis::Store.new :namespace => @other_namespace
   end
 
   def teardown
@@ -37,10 +38,22 @@ describe "Redis::Store::Namespace" do
     @store.set 'def', 'fed'
 
     @store.flushdb
-    @store.get('def').must_equal(nil)
+    @store.get('def').must_be_nil
     @default_store.get('abc').must_equal('cba')
   end
 
+  it 'should allow to change namespace on the fly' do
+    @default_store.set 'abc', 'cba'
+    @other_store.set 'foo', 'bar'
+
+    @default_store.keys.sort.must_equal ['abc', 'other:foo']
+
+    @default_store.with_namespace(@other_namespace) do
+      @default_store.keys.must_equal ['foo']
+      @default_store.get('foo').must_equal('bar')
+    end
+  end
+
   it "should not try to delete missing namespaced keys" do
     empty_store = Redis::Store.new :namespace => 'empty'
     empty_store.flushdb
@@ -61,7 +74,7 @@ describe "Redis::Store::Namespace" do
     r2 = dyn_store.get 'key'
     $ns = "ns1"
     r1 = dyn_store.get 'key'
-    r1.must_equal('x') && r2.must_equal('y') && r3.must_equal(nil)
+    r1.must_equal('x') && r2.must_equal('y') && r3.must_be_nil
   end
 
   it "namespaces setex and ttl" do
@@ -77,7 +90,7 @@ describe "Redis::Store::Namespace" do
   end
 
   describe 'method calls' do
-    let(:store){Redis::Store.new :namespace => @namespace, :marshalling => false}
+    let(:store){Redis::Store.new :namespace => @namespace, :serializer => nil}
     let(:client){store.instance_variable_get(:@client)}
 
     it "should namespace get" do

data/test/redis/store/{marshalling_test.rb → serialization_test.rb}

@@ -1,8 +1,8 @@
 require 'test_helper'
 
-describe "Redis::Marshalling" do
+describe "Redis::Serialization" do
   def setup
-    @store = Redis::Store.new :marshalling => true
+    @store = Redis::Store.new serializer: Marshal
     @rabbit = OpenStruct.new :name => "bunny"
     @white_rabbit = OpenStruct.new :color => "white"
     @store.set "rabbit", @rabbit
@@ -23,6 +23,12 @@ describe "Redis::Marshalling" do
     @store.get("rabbit").must_equal(@white_rabbit)
   end
 
+  it "marshals on multi set" do
+    @store.mset("rabbit", @white_rabbit, "rabbit2", @rabbit)
+    @store.get("rabbit").must_equal(@white_rabbit)
+    @store.get("rabbit2").must_equal(@rabbit)
+  end
+
   if RUBY_VERSION.match /1\.9/
     it "doesn't unmarshal on get if raw option is true" do
       @store.get("rabbit", :raw => true).must_equal("\x04\bU:\x0FOpenStruct{\x06:\tnameI\"\nbunny\x06:\x06EF")
@@ -38,6 +44,12 @@ describe "Redis::Marshalling" do
     @store.get("rabbit", :raw => true).must_equal(%(#<OpenStruct color="white">))
   end
 
+  it "doesn't marshal multi set if raw option is true" do
+    @store.mset("rabbit", @white_rabbit, "rabbit2", @rabbit, :raw => true)
+    @store.get("rabbit", :raw => true).must_equal(%(#<OpenStruct color="white">))
+    @store.get("rabbit2", :raw => true).must_equal(%(#<OpenStruct name="bunny">))
+  end
+
   it "doesn't unmarshal if get returns an empty string" do
     @store.set "empty_string", ""
     @store.get("empty_string").must_equal("")
@@ -67,9 +79,29 @@ describe "Redis::Marshalling" do
     @store.get("rabbit2").must_be_nil
   end
 
+  it "marshals setex (over a distributed store)" do
+    @store = Redis::DistributedStore.new [
+      {:host => "localhost", :port => "6380", :db => 0},
+      {:host => "localhost", :port => "6381", :db => 0}
+    ]
+    @store.setex "rabbit", 50, @white_rabbit
+    @store.get("rabbit").must_equal(@white_rabbit)
+  end
+
+  it "doesn't marshal setex if raw option is true (over a distributed store)" do
+    @store = Redis::DistributedStore.new [
+      {:host => "localhost", :port => "6380", :db => 0},
+      {:host => "localhost", :port => "6381", :db => 0}
+    ]
+    @store.setex "rabbit", 50, @white_rabbit, :raw => true
+    @store.get("rabbit", :raw => true).must_equal(%(#<OpenStruct color="white">))
+  end
+
   it "doesn't unmarshal on multi get" do
     @store.set "rabbit2", @white_rabbit
-    rabbit, rabbit2 = @store.mget "rabbit", "rabbit2"
+    rabbits = @store.mget "rabbit", "rabbit2"
+    rabbit, rabbit2 = rabbits
+    rabbits.length.must_equal(2)
     rabbit.must_equal(@rabbit)
     rabbit2.must_equal(@white_rabbit)
   end

data/test/redis/store/ttl_test.rb

@@ -66,7 +66,7 @@ describe MockTtlStore do
     describe 'without options' do
       it 'must call super with key and value' do
         redis.set(key, mock_value)
-        redis.has_set?(key, mock_value).must_equal true
+        redis.has_set?(key, mock_value, nil).must_equal true
       end
     end
 
@@ -76,6 +76,14 @@ describe MockTtlStore do
         redis.has_setex?(key, options[:expire_after], mock_value, :raw => true).must_equal true
       end
     end
+
+    describe 'with nx and ex option' do
+      it 'must call super with key and value and options' do
+        set_options = {nx: true, ex: 3600}
+        redis.set(key, mock_value, set_options)
+        redis.has_set?(key, mock_value, set_options).must_equal true
+      end
+    end
   end
 
   describe '#setnx' do

data/test/redis/store/version_test.rb

@@ -2,6 +2,6 @@ require 'test_helper'
 
 describe Redis::Store::VERSION do
   it 'returns current version' do
-    Redis::Store::VERSION.must_equal '1.1.6'
+    Redis::Store::VERSION.wont_equal nil
   end
 end

data/test/redis/store_test.rb

@@ -30,6 +30,28 @@ describe Redis::Store do
         @store.set('key', 'value', options)
       end
     end
+
+    describe 'with ex and nx' do
+      let(:key) { 'key' }
+      let(:mock_value) { 'value' }
+      let(:options) { { nx: true, ex: 3600 } }
+
+      it 'must pass on options' do
+        Marshal.expects(:dump).times(4)
+
+        # without options no ex or nx will be set
+        @store.del(key)
+        @store.set(key, mock_value, {}).must_equal 'OK'
+        @store.set(key, mock_value, {}).must_equal 'OK'
+        @store.ttl(key).must_equal -1
+
+        # with ex and nx options, the key can only be set once and a ttl will be set
+        @store.del(key)
+        @store.set(key, mock_value, options).must_equal true
+        @store.set(key, mock_value, options).must_equal false
+        @store.ttl(key).must_equal 3600
+      end
+    end
   end
 
   describe '#setnx' do

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require 'minitest/autorun'
 require 'mocha/setup'
 require 'redis'
 require 'redis-store'
+require 'pry'
 
 $DEBUG = ENV["DEBUG"] === "true"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-store
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.4.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +100,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: redis-store-testing
   requirement: !ruby/object:Gem::Requirement
@@ -128,18 +162,18 @@ files:
 - lib/redis/store.rb
 - lib/redis/store/factory.rb
 - lib/redis/store/interface.rb
-- lib/redis/store/marshalling.rb
 - lib/redis/store/namespace.rb
 - lib/redis/store/redis_version.rb
+- lib/redis/store/serialization.rb
 - lib/redis/store/ttl.rb
 - lib/redis/store/version.rb
 - redis-store.gemspec
 - test/redis/distributed_store_test.rb
 - test/redis/store/factory_test.rb
 - test/redis/store/interface_test.rb
-- test/redis/store/marshalling_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
@@ -164,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: redis-store
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Redis stores for Ruby frameworks
@@ -172,9 +206,9 @@ test_files:
 - test/redis/distributed_store_test.rb
 - test/redis/store/factory_test.rb
 - test/redis/store/interface_test.rb
-- test/redis/store/marshalling_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