redis-store 1.1.0.rc → 1.1.0.rc2

data/Gemfile

@@ -1,2 +1,4 @@
 source 'http://rubygems.org'
-gemspec
+gemspec
+
+gem 'SystemTimer', :platform => :mri_18

data/Rakefile

@@ -3,11 +3,5 @@ Bundler.setup
 require 'rake'
 require 'bundler/gem_tasks'
 
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rake/rdoctask'
-end
-
 load 'tasks/redis.tasks.rb'
 task :default => 'redis:test:suite'

data/lib/redis/store/ttl.rb

@@ -3,7 +3,7 @@ class Redis
     module Ttl
       def set(key, value, options = nil)
         if ttl = expires_in(options)
-          setex(key, ttl, value)
+          setex(key, ttl.to_i, value, :raw => true)
         else
           super(key, value)
         end
@@ -11,7 +11,7 @@ class Redis
 
       def setnx(key, value, options = nil)
         if ttl = expires_in(options)
-          setnx_with_expire(key, value, ttl)
+          setnx_with_expire(key, value, ttl.to_i)
         else
           super(key, value)
         end
@@ -20,8 +20,8 @@ class Redis
       protected
         def setnx_with_expire(key, value, ttl)
           multi do
-            setnx(key, value)
-            expire(key, expires_in)
+            setnx(key, value, :raw => true)
+            expire(key, ttl)
           end
         end
 

data/lib/redis/store/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class Store < self
-    VERSION = '1.1.0.rc'
+    VERSION = '1.1.0.rc2'
   end
 end

data/test/redis/store/interface_test.rb

@@ -24,4 +24,4 @@ describe Redis::Store::Interface do
   it "should setex an element" do
     lambda { @r.setex("key", 1, "value", :option => true) } #.wont_raise ArgumentError
   end
-end
+end

data/test/redis/store/ttl_test.rb

@@ -0,0 +1,107 @@
+require 'test_helper'
+
+class MockRedis
+  def initialize
+    @sets = []
+    @setexes = []
+    @setnxes = []
+    @expires = []
+  end
+
+  def set(*a)
+    @sets << a
+  end
+
+  def has_set?(*a)
+    @sets.include?(a)
+  end
+
+  def setex(*a)
+    @setexes << a
+  end
+
+  def has_setex?(*a)
+    @setexes.include?(a)
+  end
+
+  def setnx(*a)
+    @setnxes << a
+  end
+
+  def has_setnx?(*a)
+    @setnxes.include?(a)
+  end
+
+  def multi(&block)
+    instance_eval do
+      def setnx(*a)
+        @setnxes << a
+      end
+
+      block.call
+    end
+  end
+
+  def expire(*a)
+    @expires << a
+  end
+
+  def has_expire?(*a)
+    @expires.include?(a)
+  end
+
+end
+
+class MockTtlStore < MockRedis
+  include Redis::Store::Ttl
+end
+
+describe MockTtlStore do
+  let(:key) { 'hello' }
+  let(:value) { 'value' }
+  let(:options) { { :expire_after => 3600 } }
+  let(:redis) { MockTtlStore.new }
+
+  describe '#set' do
+    describe 'without options' do
+      it 'must call super with key and value' do
+        redis.set(key, value)
+        redis.has_set?(key, value).must_equal true
+      end
+    end
+
+    describe 'with options' do
+      it 'must call setex with proper expiry and set raw to true' do
+        redis.set(key, value, options)
+        redis.has_setex?(key, options[:expire_after], value, :raw => true).must_equal true
+      end
+    end
+  end
+
+  describe '#setnx' do
+    describe 'without expiry' do
+      it 'must call super with key and value' do
+        redis.setnx(key, value)
+        redis.has_setnx?(key, value)
+      end
+
+      it 'must not call expire' do
+        MockTtlStore.any_instance.expects(:expire).never
+
+        redis.setnx(key, value)
+      end
+    end
+
+    describe 'with expiry' do
+      it 'must call setnx with key and value and set raw to true' do
+        redis.setnx(key, value, options)
+        redis.has_setnx?(key, value, :raw => true).must_equal true
+      end
+
+      it 'must call expire' do
+        redis.setnx(key, value, options)
+        redis.has_expire?(key, options[:expire_after]).must_equal true
+      end
+    end
+  end
+end

data/test/redis/store/version_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 describe Redis::Store::VERSION do
-  it "must be equal to 1.1.0.rc" do
-    Redis::Store::VERSION.must_equal '1.1.0.rc'
+  it "must be equal to 1.1.0.rc2" do
+    Redis::Store::VERSION.must_equal '1.1.0.rc2'
   end
-end
+end

data/test/redis/store_test.rb

@@ -14,4 +14,32 @@ describe Redis::Store do
     @client.expects(:reconnect)
     @store.reconnect
   end
-end
+
+  describe '#set' do
+    describe 'with expiry' do
+      let(:key) { 'key' }
+      let(:value) { 'value' }
+      let(:options) { { :expire_after => 3600 } }
+
+      it 'must not double marshall' do
+        Marshal.expects(:dump).once
+
+        @store.set(key, value, options)
+      end
+    end
+  end
+
+  describe '#setnx' do
+    describe 'with expiry' do
+      let(:key) { 'key' }
+      let(:value) { 'value' }
+      let(:options) { { :expire_after => 3600 } }
+
+      it 'must not double marshall' do
+        Marshal.expects(:dump).once
+
+        @store.setnx(key, value, options)
+      end
+    end
+  end
+end

metadata

@@ -1,146 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: redis-store
-version: !ruby/object:Gem::Version 
-  hash: 7712002
+version: !ruby/object:Gem::Version
+  version: 1.1.0.rc2
   prerelease: 6
-  segments: 
-  - 1
-  - 1
-  - 0
-  - rc
-  version: 1.1.0.rc
 platform: ruby
-authors: 
+authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: redis
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70182807299300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70182807299300
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70182807298160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70182807298160
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70182807297380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7712070
-        segments: 
-        - 1
-        - 1
-        - rc
+      - !ruby/object:Gem::Version
         version: 1.1.rc
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70182807297380
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70182807296420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70182807296420
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70182807295000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: purdytest
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70182807295000
+- !ruby/object:Gem::Dependency
+  name: purdytest
+  requirement: &70182807294440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: git
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70182807294440
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: &70182807293680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
+      - !ruby/object:Gem::Version
         version: 1.2.5
   type: :development
-  version_requirements: *id007
-description: Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.
-email: 
+  prerelease: false
+  version_requirements: *70182807293680
+description: Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for
+  Ruby web frameworks.
+email:
 - guidi.luca@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -164,45 +119,35 @@ files:
 - test/redis/store/interface_test.rb
 - test/redis/store/marshalling_test.rb
 - test/redis/store/namespace_test.rb
+- test/redis/store/ttl_test.rb
 - test/redis/store/version_test.rb
 - test/redis/store_test.rb
 - test/test_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: redis-store
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Redis stores for Ruby frameworks
-test_files: 
+test_files:
 - test/config/node-one.conf
 - test/config/node-two.conf
 - test/config/redis.conf
@@ -211,7 +156,7 @@ test_files:
 - test/redis/store/interface_test.rb
 - test/redis/store/marshalling_test.rb
 - test/redis/store/namespace_test.rb
+- test/redis/store/ttl_test.rb
 - test/redis/store/version_test.rb
 - test/redis/store_test.rb
 - test/test_helper.rb
-has_rdoc: