redis-rack 1.3.6 → 1.4.0.rc

data/Gemfile

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

data/Rakefile

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

data/redis-rack.gemspec

@@ -1,25 +1,25 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
-require 'redis/rack/version'
+$:.push File.expand_path("../lib", __FILE__)
+require "redis/rack/version"
 
 Gem::Specification.new do |s|
-  s.name        = 'redis-rack'
+  s.name        = "redis-rack"
   s.version     = Redis::Rack::VERSION
-  s.authors     = ['Luca Guidi', 'Matthew Horan']
-  s.email       = ['guidi.luca@gmail.com', 'matt@matthoran.com']
-  s.homepage    = 'http://jodosha.github.com/redis-store'
+  s.authors     = ["Luca Guidi"]
+  s.email       = ["guidi.luca@gmail.com"]
+  s.homepage    = "http://jodosha.github.com/redis-store"
   s.summary     = %q{Redis Store for Rack}
   s.description = %q{Redis Store for Rack}
 
-  s.rubyforge_project = 'redis-rack'
+  s.rubyforge_project = "redis-rack"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ['lib']
+  s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'redis-store', '~> 1.1.0'
-  s.add_runtime_dependency 'rack',           '1.3.6'
+  s.add_runtime_dependency 'redis-store',   '1.1.0.rc'
+  s.add_runtime_dependency 'rack',          '1.4.0'
 
   s.add_development_dependency 'rake',      '~> 0.9.2.2'
   s.add_development_dependency 'bundler',   '~> 1.1.rc'

data/test/rack/session/redis_test.rb

@@ -32,19 +32,9 @@ describe Rack::Session::Redis do
   #   }.must_raise(Exception)
   # end
 
-  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
+  it "passes options to Redis" do
     pool = Rack::Session::Redis.new(incrementor, :redis_server => {: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$/)
+    pool.pool.to_s.must_match('namespace test:rack:session')
   end
 
   it "creates a new cookie" do
@@ -102,15 +92,14 @@ 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"][session_match, 1].must_equal(sid)
+    res["Set-Cookie"].must_equal(cookie)
     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"][session_match, 1].wont_equal(sid)
-    res.body.must_include('"counter"=>1')
+    res["Set-Cookie"].wont_equal(cookie)
+    res.body.must_include('"counter"=>3')
   end
 
   it "does not send the same session id if it did not change" do
@@ -118,7 +107,7 @@ describe Rack::Session::Redis do
     req = Rack::MockRequest.new(pool)
 
     res0 = req.get("/")
-    cookie = res0["Set-Cookie"]
+    cookie = res0["Set-Cookie"][session_match]
     res0.body.must_equal('{"counter"=>1}')
 
     res1 = req.get("/", "HTTP_COOKIE" => cookie)
@@ -286,4 +275,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.3.6" do
-    Redis::Rack::VERSION.must_equal '1.3.6'
+  it "must be equal to 1.4.0.rc" do
+    Redis::Rack::VERSION.must_equal '1.4.0.rc'
   end
 end

metadata

@@ -1,102 +1,147 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: redis-rack
-version: !ruby/object:Gem::Version
-  version: 1.3.6
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 7712042
+  prerelease: 6
+  segments: 
+  - 1
+  - 4
+  - 0
+  - rc
+  version: 1.4.0.rc
 platform: ruby
-authors:
+authors: 
 - Luca Guidi
-- Matthew Horan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-30 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: redis-store
-  requirement: &70242081366740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7712002
+        segments: 
+        - 1
+        - 1
+        - 0
+        - rc
+        version: 1.1.0.rc
   type: :runtime
-  prerelease: false
-  version_requirements: *70242081366740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &70242081366180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 1.3.6
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70242081366180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70242081365680 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 9
+        - 2
+        - 2
         version: 0.9.2.2
   type: :development
-  prerelease: false
-  version_requirements: *70242081365680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &70242081365180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7712070
+        segments: 
+        - 1
+        - 1
+        - rc
         version: 1.1.rc
   type: :development
-  prerelease: false
-  version_requirements: *70242081365180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &70242081364720 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
         version: 0.10.0
   type: :development
-  prerelease: false
-  version_requirements: *70242081364720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &70242081364200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
   type: :development
-  prerelease: false
-  version_requirements: *70242081364200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: purdytest
-  requirement: &70242081363280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
-  prerelease: false
-  version_requirements: *70242081363280
+  version_requirements: *id007
 description: Redis Store for Rack
-email:
+email: 
 - guidi.luca@gmail.com
-- matt@matthoran.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -111,29 +156,41 @@ 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: redis-rack
-rubygems_version: 1.8.15
+rubygems_version: 1.8.6
 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: