redis-rack 1.4.0.rc → 1.4.0.rc2

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
 gemspec
 
-gem 'redis-store', '1.1.0.rc', :path => File.expand_path('../../redis-store', __FILE__)
+gem 'redis-store', '1.1.0', :path => File.expand_path('../../redis-store', __FILE__)
+gem 'SystemTimer', :platform => :mri_18

data/Rakefile

@@ -3,12 +3,6 @@ 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/rack/session/redis.rb

@@ -1,5 +1,6 @@
 require 'rack/session/abstract/id'
 require 'redis-store'
+require 'thread'
 
 module Rack
   module Session
@@ -7,15 +8,13 @@ module Rack
       attr_reader :mutex, :pool
 
       DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge \
-        :namespace    => 'rack:session',
-        :redis_server => 'redis://127.0.0.1:6379/0'
+        :redis_server => 'redis://127.0.0.1:6379/0/rack:session'
 
       def initialize(app, options = {})
         super
 
         @mutex = Mutex.new
-        options[:redis_server] ||= @default_options[:redis_server]
-        @pool = ::Redis::Factory.create options[:redis_server]
+        @pool = ::Redis::Factory.create @default_options[:redis_server]
       end
 
       def generate_sid
@@ -38,14 +37,8 @@ module Rack
       end
 
       def set_session(env, session_id, new_session, options)
-        expiry = options[:expire_after].to_i
         with_lock(env, false) do
-          if expiry.zero?
-            @pool.set session_id, new_session
-          else
-            @pool.setex session_id, (expiry + 1), new_session
-          end
-
+          @pool.set session_id, new_session, options
           session_id
         end
       end

data/lib/redis-rack.rb

@@ -1,3 +1,3 @@
 require 'redis-store'
-require 'redis-rack/version'
-require 'rack/session/redis'
+require 'redis/rack/version'
+require 'rack/session/redis'

data/lib/redis/rack/version.rb

@@ -1,6 +1,6 @@
 class Redis
   module Rack
-    VERSION = '1.4.0.rc'
+    VERSION = '1.4.0.rc2'
   end
 end
 

data/redis-rack.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'redis-store',   '1.1.0.rc'
+  s.add_runtime_dependency 'redis-store',   '1.1.0'
   s.add_runtime_dependency 'rack',          '1.4.0'
 
   s.add_development_dependency 'rake',      '~> 0.9.2.2'

data/test/rack/session/redis_test.rb

@@ -32,9 +32,19 @@ describe Rack::Session::Redis do
   #   }.must_raise(Exception)
   # end
 
-  it "passes options to Redis" do
+  it "uses the default Redis server and namespace when not provided" do
+    pool = Rack::Session::Redis.new(incrementor)
+    pool.pool.to_s.must_match(/127\.0\.0\.1:6379 against DB 0 with namespace rack:session$/)
+  end
+
+  it "uses the specified namespace when provided" do
     pool = Rack::Session::Redis.new(incrementor, :redis_server => {:namespace => 'test:rack:session'})
-    pool.pool.to_s.must_match('namespace test:rack:session')
+    pool.pool.to_s.must_match(/namespace test:rack:session$/)
+  end
+
+  it "uses the specified Redis server when provided" do
+    pool = Rack::Session::Redis.new(incrementor, :redis_server => 'redis://127.0.0.1:6380/1')
+    pool.pool.to_s.must_match(/127\.0\.0\.1:6380 against DB 1$/)
   end
 
   it "creates a new cookie" do
@@ -92,14 +102,15 @@ describe Rack::Session::Redis do
     res = Rack::MockRequest.new(pool).get('/')
     res.body.must_include('"counter"=>1')
     cookie = res["Set-Cookie"]
+    sid = cookie[session_match, 1]
     res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
-    res["Set-Cookie"].must_equal(cookie)
+    res["Set-Cookie"][session_match, 1].must_equal(sid)
     res.body.must_include('"counter"=>2')
     puts 'Sleeping to expire session' if $DEBUG
     sleep 4
     res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
-    res["Set-Cookie"].wont_equal(cookie)
-    res.body.must_include('"counter"=>3')
+    res["Set-Cookie"][session_match, 1].wont_equal(sid)
+    res.body.must_include('"counter"=>1')
   end
 
   it "does not send the same session id if it did not change" do
@@ -107,7 +118,7 @@ describe Rack::Session::Redis do
     req = Rack::MockRequest.new(pool)
 
     res0 = req.get("/")
-    cookie = res0["Set-Cookie"][session_match]
+    cookie = res0["Set-Cookie"]
     res0.body.must_equal('{"counter"=>1}')
 
     res1 = req.get("/", "HTTP_COOKIE" => cookie)
@@ -275,4 +286,4 @@ describe Rack::Session::Redis do
     session['counter'].must_be_nil
     session['foo'].must_equal('bar')
   end
-end
+end

data/test/redis/rack/version_test.rb

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

metadata

@@ -1,147 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: redis-rack
-version: !ruby/object:Gem::Version 
-  hash: 7712042
+version: !ruby/object:Gem::Version
+  version: 1.4.0.rc2
   prerelease: 6
-  segments: 
-  - 1
-  - 4
-  - 0
-  - rc
-  version: 1.4.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-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: redis-store
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70259388512620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7712002
-        segments: 
-        - 1
-        - 1
-        - 0
-        - rc
-        version: 1.1.0.rc
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70259388512620
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70259388512120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70259388512120
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70259388511660 !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: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70259388511660
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70259388511200 !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: *id004
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70259388511200
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70259388510740 !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: *id005
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70259388510740
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70259388510280 !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: *id006
-- !ruby/object:Gem::Dependency 
-  name: purdytest
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70259388510280
+- !ruby/object:Gem::Dependency
+  name: purdytest
+  requirement: &70259388509820 !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: *id007
+  prerelease: false
+  version_requirements: *70259388509820
 description: Redis Store for Rack
-email: 
+email:
 - guidi.luca@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -156,41 +109,29 @@ files:
 - test/test_helper.rb
 homepage: http://jodosha.github.com/redis-store
 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-rack
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Redis Store for Rack
-test_files: 
+test_files:
 - test/rack/session/redis_test.rb
 - test/redis/rack/version_test.rb
 - test/test_helper.rb
-has_rdoc: