jodosha-redis-store 0.2.0 → 0.3.0

data/README.textile

@@ -21,12 +21,12 @@ Provides a cache store for your Ruby web framework of choice.
 h3. How to use with Rails
 
   config.gem "jodosha-redis-store", :source => "http://gems.github.com", :lib => "redis-store"
-  require "redis-store" # HACK Rails tries to instantiate cache first, then load configured gems
+  require "redis-store"
   config.cache_store = :redis_store
 
 h3. How to use with Merb
-  
-  dependency "jodosha-redis-store", "0.2.0"
+
+  dependency "jodosha-redis-store", "0.3.0"
   dependency("merb-cache", merb_gems_version) do
     Merb::Cache.setup do
       register(:redis, Merb::Cache::RedisStore, :servers => ["127.0.0.1:6379"])
@@ -45,6 +45,38 @@ h3. How to use with Sinatra
     end
   end
 
+h2. Rack::Session
+
+Provides a Redis store for Rack::Session. See "http://rack.rubyforge.org/doc/Rack/Session.html":http://rack.rubyforge.org/doc/Rack/Session.html
+
+h3. How to use with a generic Rack application
+
+  require "rubygems"
+  require "rack"
+  require "jodosha-redis-store"
+  require "application"
+  use Rack::Session::Redis
+  run Application.new
+
+h3. How to use with Rails
+
+  config.gem "jodosha-redis-store", :source => "http://gems.github.com", :lib => "redis-store"
+  ActionController::Base.session_store = Rack::Session::Redis
+
+h3. How to use with Merb
+
+  dependency "jodosha-redis-store", "0.3.0"
+  Merb::Config.use do |c|
+    c[:session_store] = 'redis'
+  end
+  Merb::BootLoader.before_app_loads do
+    Merb::SessionContainer.subclasses << "Merb::RedisSession"
+  end
+
+h3. How to use with Sinatra
+
+Sorry, but Sinatra application boot system "hardcode":http://github.com/sinatra/sinatra/blob/0f02bafe86f8dd9bba9ab425468cb1067caa83ff/lib/sinatra/base.rb#L785 Rack::Session::Cookie
+
 h2. Rack::Cache
 
 Provides a Redis store for HTTP caching. See "http://github.com/rtomayko/rack-cache":http://github.com/rtomayko/rack-cache

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'spec/rake/spectask'
 
-REDIS_STORE_VERSION = "0.2.0"
+REDIS_STORE_VERSION = "0.3.0"
 
 task :default => :spec
 

data/lib/cache/merb/redis_store.rb

@@ -10,12 +10,7 @@ module Merb
       #   RedisStore.new :servers => ["example.com:23682/1"] # => host: example.com, port: 23682, db: 1
       #   RedisStore.new :servers => ["localhost:6379/0", "localhost:6380/0"] # => instantiate a cluster
       def initialize(config = {})
-        addresses = extract_addresses(config[:servers])
-        @data = if addresses.size > 1
-          DistributedMarshaledRedis.new addresses
-        else
-          MarshaledRedis.new addresses.first || {}
-        end
+        @data = RedisFactory.create config[:servers]
       end
 
       def writable?(key, parameters = {}, conditions = {})
@@ -58,21 +53,6 @@ module Merb
       end
 
       private
-        def extract_addresses(addresses) # TODO extract in a module or a class
-          return [] unless addresses
-          addresses = addresses.flatten.compact
-          addresses.inject([]) do |result, address|
-            host, port = address.split /\:/
-            port, db   = port.split /\// if port
-            address = {}
-            address[:host] = host if host
-            address[:port] = port if port
-            address[:db]  = db.to_i if db
-            result << address
-            result
-          end
-        end
-
         # Returns cache key calculated from base key
         # and SHA2 hex from parameters.
         def normalize(key, parameters = {})

data/lib/cache/rails/redis_store.rb

@@ -10,12 +10,7 @@ module ActiveSupport
       #   RedisStore.new "example.com:23682/1" # => host: example.com, port: 23682, db: 1
       #   RedisStore.new "localhost:6379/0", "localhost:6380/0" # => instantiate a cluster
       def initialize(*addresses)
-        addresses = extract_addresses(addresses)
-        @data = if addresses.size > 1
-          DistributedMarshaledRedis.new addresses
-        else
-          MarshaledRedis.new addresses.first || {}
-        end
+        @data = RedisFactory.create(addresses)
       end
 
       def write(key, value, options = nil)
@@ -109,21 +104,6 @@ module ActiveSupport
       def stats
         @data.info
       end
-      
-      private
-        def extract_addresses(addresses)
-          addresses = addresses.flatten.compact
-          addresses.inject([]) do |result, address|
-            host, port = address.split /\:/
-            port, db   = port.split /\// if port
-            address = {}
-            address[:host] = host if host
-            address[:port] = port if port
-            address[:db]  = db.to_i if db
-            result << address
-            result
-          end
-        end
     end
   end
 end

data/lib/cache/sinatra/redis_store.rb

@@ -16,12 +16,7 @@ module Sinatra
       #   RedisStore.new "example.com:23682/1" # => host: example.com, port: 23682, db: 1
       #   RedisStore.new "localhost:6379/0", "localhost:6380/0" # => instantiate a cluster
       def initialize(*addresses)
-        addresses = extract_addresses(addresses)
-        @data = if addresses.size > 1
-          DistributedMarshaledRedis.new addresses
-        else
-          MarshaledRedis.new addresses.first || {}
-        end
+        @data = RedisFactory.create addresses
       end
 
       def write(key, value, options = nil)
@@ -111,21 +106,6 @@ module Sinatra
       def stats
         @data.info
       end
-
-      private
-        def extract_addresses(addresses) # TODO extract in a module or a class
-          addresses = addresses.flatten.compact
-          addresses.inject([]) do |result, address|
-            host, port = address.split /\:/
-            port, db   = port.split /\// if port
-            address = {}
-            address[:host] = host if host
-            address[:port] = port if port
-            address[:db]  = db.to_i if db
-            result << address
-            result
-          end
-        end
     end
   end
 end

data/lib/rack/session/merb.rb

@@ -0,0 +1,32 @@
+module Merb
+  # HACK for cyclic dependency: redis-store is required before Merb session stores
+  class Mash < Hash; end
+  class SessionContainer < Mash; class_inheritable_accessor :session_store_type end
+  class SessionStoreContainer < SessionContainer; end
+
+  class RedisSession < SessionStoreContainer
+    self.session_store_type = :redis
+  end
+
+  module RedisStore
+    def retrieve_session(session_id)
+      get("session:#{session_id}")
+    end
+
+    def store_session(session_id, data)
+      set("session:#{session_id}", data)
+    end
+
+    def delete_session(session_id)
+      delete("session:#{session_id}")
+    end    
+  end
+end
+
+module Rack
+  module Session
+    class Redis
+      include Merb::RedisStore
+    end
+  end
+end

data/lib/rack/session/redis.rb

@@ -0,0 +1,81 @@
+module Rack
+  module Session
+    class Redis < Abstract::ID
+      attr_reader :mutex, :pool
+      DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge :redis_server => "localhost:6379"
+
+      def initialize(app, options = {})
+        super
+        @mutex = Mutex.new
+        @pool = RedisFactory.create options[:redis_server] || @default_options[:redis_server]
+      end
+
+      def generate_sid
+        loop do
+          sid = super
+          break sid unless @pool.get(sid)
+        end
+      end
+
+      def get_session(env, sid)
+        session = @pool.get(sid) if sid
+        @mutex.lock if env['rack.multithread']
+        unless sid and session
+          env['rack.errors'].puts("Session '#{sid.inspect}' not found, initializing...") if $VERBOSE and not sid.nil?
+          session = {}
+          sid = generate_sid
+          ret = @pool.set sid, session
+          raise "Session collision on '#{sid.inspect}'" unless ret
+        end
+        session.instance_variable_set('@old', {}.merge(session))
+        return [sid, session]
+      rescue RedisError, Errno::ECONNREFUSED
+        warn "#{self} is unable to find server."
+        warn $!.inspect
+        return [ nil, {} ]
+      ensure
+        @mutex.unlock if env['rack.multithread']
+      end
+
+      def set_session(env, session_id, new_session, options)
+        @mutex.lock if env['rack.multithread']
+        session = @pool.get(session_id) rescue {}
+        if options[:renew] or options[:drop]
+          @pool.delete session_id
+          return false if options[:drop]
+          session_id = generate_sid
+          @pool.set session_id, 0
+        end
+        old_session = new_session.instance_variable_get('@old') || {}
+        session = merge_sessions session_id, old_session, new_session, session
+        @pool.set session_id, session, options
+        return session_id
+      rescue RedisError, Errno::ECONNREFUSED
+        warn "#{self} is unable to find server."
+        warn $!.inspect
+        return false
+      ensure
+        @mutex.unlock if env['rack.multithread']
+      end
+      
+      private
+        def merge_sessions(sid, old, new, cur=nil)
+          cur ||= {}
+          unless Hash === old and Hash === new
+            warn 'Bad old or new sessions provided.'
+            return cur
+          end
+
+          delete = old.keys - new.keys
+          warn "//@#{sid}: dropping #{delete*','}" if $DEBUG and not delete.empty?
+          delete.each{|k| cur.delete k }
+
+          update = new.keys.select{|k| new[k] != old[k] }
+          warn "//@#{sid}: updating #{update*','}" if $DEBUG and not update.empty?
+          update.each{|k| cur[k] = new[k] }
+
+          cur
+        end
+    end
+  end
+end

data/lib/redis-store.rb

@@ -1,5 +1,7 @@
 require "redis"
 require "dist_redis"
+require "redis/redis"
+require "redis/redis_factory"
 require "redis/marshaled_redis"
 require "redis/distributed_marshaled_redis"
 
@@ -14,6 +16,15 @@ elsif defined?(Rails)
   require "cache/rails/redis_store"
 end
 
+# Rack::Session
+if defined?(Rack::Session)
+  require "rack/session/abstract/id"
+  require "rack/session/redis"
+  if defined?(Merb)
+    require "rack/session/merb"
+  end
+end
+
 # Rack::Cache
 if defined?(Rack::Cache)
   require "rack/cache/redis_metastore"

data/lib/redis/marshaled_redis.rb

@@ -22,7 +22,8 @@ class MarshaledRedis < Redis
 
     def expires_in(options)
       if options
-        options[:expires_in] || options[:expire_in]
+        # Rack::Session           Merb                    Rails/Sinatra
+        options[:expire_after] || options[:expires_in] || options[:expire_in]
       end
     end
 end

data/lib/redis/redis.rb

@@ -0,0 +1,14 @@
+# Foreword compatibility with Redis > 0.0.3
+class Redis
+  def set(key, val, expiry=nil)
+    write("SET #{key} #{val.to_s.size}\r\n#{val}\r\n")
+    s = get_response == OK
+    return expire(key, expiry) if s && expiry
+    s
+  end
+
+  def expire(key, expiry=nil)
+    write("EXPIRE #{key} #{expiry}\r\n")
+    get_response == 1
+  end
+end

data/lib/redis/redis_factory.rb

@@ -0,0 +1,27 @@
+class RedisFactory
+  class << self
+    def create(*addresses)
+      addresses = extract_addresses(addresses)
+      if addresses.size > 1
+        DistributedMarshaledRedis.new addresses
+      else
+        MarshaledRedis.new addresses.first || {}
+      end
+    end
+    
+    private
+      def extract_addresses(addresses)
+        addresses = addresses.flatten.compact
+        addresses.inject([]) do |result, address|
+          host, port = address.split /\:/
+          port, db   = port.split /\// if port
+          address = {}
+          address[:host] = host if host
+          address[:port] = port if port
+          address[:db]  = db.to_i if db
+          result << address
+          result
+        end
+      end
+  end
+end

data/redis-store.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name               = "redis-store"
-  s.version            = "0.2.0"
-  s.date               = "2009-04-30"
-  s.summary            = "Redis cache and session stores for Ruby web frameworks"
+  s.version            = "0.3.0"
+  s.date               = "2009-05-03"
+  s.summary            = "Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks."
   s.author             = "Luca Guidi"
   s.email              = "guidi.luca@gmail.com"
   s.homepage           = "http://lucaguidi.com"
-  s.description        = "Redis cache and session stores for Ruby web frameworks"
+  s.description        = "Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks."
   s.has_rdoc           = true
-  s.files              = ["MIT-LICENSE", "README.textile", "Rakefile", "lib/cache/merb/redis_store.rb", "lib/cache/rails/redis_store.rb", "lib/cache/sinatra/redis_store.rb", "lib/rack/cache/redis_entitystore.rb", "lib/rack/cache/redis_metastore.rb", "lib/redis-store.rb", "lib/redis/distributed_marshaled_redis.rb", "lib/redis/marshaled_redis.rb", "redis-store.gemspec", "spec/cache/merb/redis_store_spec.rb", "spec/cache/rails/redis_store_spec.rb", "spec/cache/sinatra/redis_store_spec.rb", "spec/config/master.conf", "spec/config/single.conf", "spec/config/slave.conf", "spec/rack/cache/entitystore/pony.jpg", "spec/rack/cache/entitystore/redis_spec.rb", "spec/rack/cache/metastore/redis_spec.rb", "spec/redis/distributed_marshaled_redis_spec.rb", "spec/redis/marshaled_redis_spec.rb", "spec/spec_helper.rb"]
-  s.test_files         = ["spec/cache/merb/redis_store_spec.rb", "spec/cache/rails/redis_store_spec.rb", "spec/cache/sinatra/redis_store_spec.rb", "spec/rack/cache/entitystore/redis_spec.rb", "spec/rack/cache/metastore/redis_spec.rb", "spec/redis/distributed_marshaled_redis_spec.rb", "spec/redis/marshaled_redis_spec.rb"]
+  s.files              = ["MIT-LICENSE", "README.textile", "Rakefile", "lib/cache/merb/redis_store.rb", "lib/cache/rails/redis_store.rb", "lib/cache/sinatra/redis_store.rb", "lib/rack/cache/redis_entitystore.rb", "lib/rack/cache/redis_metastore.rb", "lib/rack/session/merb.rb", "lib/rack/session/redis.rb", "lib/redis-store.rb", "lib/redis/distributed_marshaled_redis.rb", "lib/redis/marshaled_redis.rb", "lib/redis/redis.rb", "lib/redis/redis_factory.rb", "redis-store.gemspec", "spec/cache/merb/redis_store_spec.rb", "spec/cache/rails/redis_store_spec.rb", "spec/cache/sinatra/redis_store_spec.rb", "spec/config/master.conf", "spec/config/single.conf", "spec/config/slave.conf", "spec/rack/cache/entitystore/pony.jpg", "spec/rack/cache/entitystore/redis_spec.rb", "spec/rack/cache/metastore/redis_spec.rb", "spec/rack/session/redis_spec.rb", "spec/redis/distributed_marshaled_redis_spec.rb", "spec/redis/marshaled_redis_spec.rb", "spec/redis/redis_factory_spec.rb", "spec/spec_helper.rb"]
+  s.test_files         = ["spec/cache/merb/redis_store_spec.rb", "spec/cache/rails/redis_store_spec.rb", "spec/cache/sinatra/redis_store_spec.rb", "spec/rack/cache/entitystore/redis_spec.rb", "spec/rack/cache/metastore/redis_spec.rb", "spec/rack/session/redis_spec.rb", "spec/redis/distributed_marshaled_redis_spec.rb", "spec/redis/marshaled_redis_spec.rb", "spec/redis/redis_factory_spec.rb"]
   s.extra_rdoc_files   = ["README.textile"]
 end

data/spec/cache/merb/redis_store_spec.rb

@@ -2,10 +2,10 @@ require File.join(File.dirname(__FILE__), "/../../spec_helper")
 
 module Merb
   module Cache
-    describe "RedisStore" do
+    describe "Merb::Cache::RedisStore" do
       before(:each) do
-        @store  = RedisStore.new
-        @dstore = RedisStore.new :servers => ["localhost:6380/1", "localhost:6381/1"]
+        @store  = Merb::Cache::RedisStore.new
+        @dstore = Merb::Cache::RedisStore.new :servers => ["localhost:6380/1", "localhost:6381/1"]
         @rabbit = OpenStruct.new :name => "bunny"
         @white_rabbit = OpenStruct.new :color => "white"
         with_store_management do |store|
@@ -16,9 +16,9 @@ module Merb
 
       it "should accept connection params" do
         redis = instantiate_store
-        redis.instance_variable_get(:@db).should == 0
         redis.host.should == "localhost"
         redis.port.should == "6379"
+        redis.db.should == 0
 
         redis = instantiate_store "redis.com"
         redis.host.should == "redis.com"
@@ -28,9 +28,9 @@ module Merb
         redis.port.should == "6380"
 
         redis = instantiate_store "redis.com:6380/23"
-        redis.instance_variable_get(:@db).should == 23
         redis.host.should == "redis.com"
         redis.port.should == "6380"
+        redis.db.should == 23
       end
       
       it "should instantiate a ring" do
@@ -72,11 +72,13 @@ module Merb
         end
       end
 
-      # it "should write the data with expiration time" do
-      #   @store.write "rabbit", @white_rabbit, :expires_in => 1.second
-      #   @store.read("rabbit").should === @white_rabbit ; sleep 2
-      #   @store.read("rabbit").should be_nil
-      # end
+      it "should write the data with expiration time" do
+        with_store_management do |store|
+          store.write "rabbit", @white_rabbit, {}, :expires_in => 1.second
+          store.read("rabbit").should === @white_rabbit ; sleep 2
+          store.read("rabbit").should be_nil
+        end
+      end
 
       it "should not write data if :unless_exist option is true" do
         with_store_management do |store|
@@ -91,9 +93,6 @@ module Merb
           store.fetch("rub-a-dub").should be_nil
           store.fetch("rub-a-dub") { "Flora de Cana" }
           store.fetch("rub-a-dub").should === "Flora de Cana"
-          # store.fetch("rabbit", {}, :force => true, :expires_in => 1.second) { @white_rabbit }
-          # store.fetch("rabbit").should === @white_rabbit ; sleep 2
-          # store.fetch("rabbit").should be_nil
         end
       end
 
@@ -120,7 +119,7 @@ module Merb
 
       private
         def instantiate_store(addresses = nil)
-          RedisStore.new(:servers => [addresses].flatten).instance_variable_get(:@data)
+          Merb::Cache::RedisStore.new(:servers => [addresses].flatten).instance_variable_get(:@data)
         end
 
         def with_store_management

data/spec/cache/rails/redis_store_spec.rb

@@ -2,10 +2,10 @@ require File.join(File.dirname(__FILE__), "/../../spec_helper")
 
 module ActiveSupport
   module Cache
-    describe "RedisStore" do
+    describe "ActiveSupport::Cache::RedisStore" do
       before(:each) do
-        @store  = RedisStore.new
-        @dstore = RedisStore.new "localhost:6380/1", "localhost:6381/1"
+        @store  = ActiveSupport::Cache::RedisStore.new
+        @dstore = ActiveSupport::Cache::RedisStore.new "localhost:6380/1", "localhost:6381/1"
         @rabbit = OpenStruct.new :name => "bunny"
         @white_rabbit = OpenStruct.new :color => "white"
         with_store_management do |store|
@@ -17,9 +17,9 @@ module ActiveSupport
 
       it "should accept connection params" do
         redis = instantiate_store
-        redis.instance_variable_get(:@db).should == 0
         redis.host.should == "localhost"
         redis.port.should == "6379"
+        redis.db.should == 0
 
         redis = instantiate_store "redis.com"
         redis.host.should == "redis.com"
@@ -29,9 +29,9 @@ module ActiveSupport
         redis.port.should == "6380"
 
         redis = instantiate_store "redis.com:6380/23"
-        redis.instance_variable_get(:@db).should == 23
         redis.host.should == "redis.com"
         redis.port.should == "6380"
+        redis.db.should == 23
       end
 
       it "should instantiate a ring" do
@@ -54,11 +54,13 @@ module ActiveSupport
         end
       end
 
-      # it "should write the data with expiration time" do
-      #   @store.write "rabbit", @white_rabbit, :expires_in => 1.second
-      #   @store.read("rabbit").should === @white_rabbit ; sleep 2
-      #   @store.read("rabbit").should be_nil
-      # end
+      it "should write the data with expiration time" do
+        with_store_management do |store|
+          store.write "rabbit", @white_rabbit, :expires_in => 1.second
+          store.read("rabbit").should === @white_rabbit ; sleep 2
+          store.read("rabbit").should be_nil
+        end
+      end
 
       it "should not write data if :unless_exist option is true" do
         with_store_management do |store|
@@ -151,15 +153,15 @@ module ActiveSupport
           store.fetch("rub-a-dub") { "Flora de Cana" }
           store.fetch("rub-a-dub").should === "Flora de Cana"
           store.fetch("rabbit", :force => true).should be_nil # force cache miss
-          # store.fetch("rabbit", :force => true, :expires_in => 1.second) { @white_rabbit }
-          # store.fetch("rabbit").should === @white_rabbit ; sleep 2
-          # store.fetch("rabbit").should be_nil
+          store.fetch("rabbit", :force => true, :expires_in => 1.second) { @white_rabbit }
+          store.fetch("rabbit").should === @white_rabbit ; sleep 2
+          store.fetch("rabbit").should be_nil
         end
       end
       
       private
         def instantiate_store(addresses = nil)
-          RedisStore.new(addresses).instance_variable_get(:@data)
+          ActiveSupport::Cache::RedisStore.new(addresses).instance_variable_get(:@data)
         end
 
         def with_store_management

data/spec/cache/sinatra/redis_store_spec.rb

@@ -16,10 +16,10 @@ end
 
 module Sinatra
   module Cache
-    describe "RedisStore" do
+    describe "Sinatra::Cache::RedisStore" do
       before(:each) do
-        @store  = RedisStore.new
-        @dstore = RedisStore.new "localhost:6380/1", "localhost:6381/1"
+        @store  = Sinatra::Cache::RedisStore.new
+        @dstore = Sinatra::Cache::RedisStore.new "localhost:6380/1", "localhost:6381/1"
         @rabbit = OpenStruct.new :name => "bunny"
         @white_rabbit = OpenStruct.new :color => "white"
         with_store_management do |store|
@@ -38,9 +38,9 @@ module Sinatra
 
       it "should accept connection params" do
         redis = instantiate_store
-        redis.instance_variable_get(:@db).should == 0
         redis.host.should == "localhost"
         redis.port.should == "6379"
+        redis.db.should == 0
 
         redis = instantiate_store "redis.com"
         redis.host.should == "redis.com"
@@ -50,9 +50,9 @@ module Sinatra
         redis.port.should == "6380"
 
         redis = instantiate_store "redis.com:6380/23"
-        redis.instance_variable_get(:@db).should == 23
         redis.host.should == "redis.com"
         redis.port.should == "6380"
+        redis.db.should == 23
       end
 
       it "should instantiate a ring" do
@@ -75,11 +75,13 @@ module Sinatra
         end
       end
 
-      # it "should write the data with expiration time" do
-      #   @store.write "rabbit", @white_rabbit, :expires_in => 1.second
-      #   @store.read("rabbit").should === @white_rabbit ; sleep 2
-      #   @store.read("rabbit").should be_nil
-      # end
+      it "should write the data with expiration time" do
+        with_store_management do |store|
+          store.write "rabbit", @white_rabbit, :expires_in => 1.second
+          store.read("rabbit").should === @white_rabbit ; sleep 2
+          store.read("rabbit").should be_nil
+        end
+      end
 
       it "should not write data if :unless_exist option is true" do
         with_store_management do |store|
@@ -172,15 +174,15 @@ module Sinatra
           store.fetch("rub-a-dub") { "Flora de Cana" }
           store.fetch("rub-a-dub").should === "Flora de Cana"
           store.fetch("rabbit", :force => true).should be_nil # force cache miss
-          # store.fetch("rabbit", :force => true, :expires_in => 1.second) { @white_rabbit }
-          # store.fetch("rabbit").should === @white_rabbit ; sleep 2
-          # store.fetch("rabbit").should be_nil
+          store.fetch("rabbit", :force => true, :expires_in => 1.second) { @white_rabbit }
+          store.fetch("rabbit").should === @white_rabbit ; sleep 2
+          store.fetch("rabbit").should be_nil
         end
       end
 
       private
         def instantiate_store(addresses = nil)
-          RedisStore.new(addresses).instance_variable_get(:@data)
+          Sinatra::Cache::RedisStore.new(addresses).instance_variable_get(:@data)
         end
 
         def with_store_management

data/spec/rack/cache/entitystore/redis_spec.rb

@@ -2,8 +2,8 @@ require File.join(File.dirname(__FILE__), "/../../../spec_helper")
 
 module Rack
   module Cache
-    class MetaStore
-      describe "Redis" do
+    class EntityStore
+      describe "Rack::Cache::EntityStore::Redis" do
         before(:each) do
           @store = Rack::Cache::EntityStore::Redis.new :host => "localhost"
         end
@@ -13,17 +13,17 @@ module Rack
         end
 
         it "should resolve the connection uri" do
-          cache = Redis.resolve(uri("redis://127.0.0.1")).cache
-          cache.should be_kind_of(::MarshaledRedis)
+          cache = Rack::Cache::EntityStore::Redis.resolve(uri("redis://127.0.0.1")).cache
+          cache.should be_kind_of(::Redis)
           cache.host.should == "127.0.0.1"
           cache.port.should == "6379"
-          cache.instance_variable_get(:@db).should == "0"
+          cache.db.should == "0"
 
-          cache = Redis.resolve(uri("redis://127.0.0.1:6380")).cache
+          cache = Rack::Cache::EntityStore::Redis.resolve(uri("redis://127.0.0.1:6380")).cache
           cache.port.should == 6380
 
-          cache = Redis.resolve(uri("redis://127.0.0.1/11")).cache
-          cache.instance_variable_get(:@db).should == "11"
+          cache = Rack::Cache::EntityStore::Redis.resolve(uri("redis://127.0.0.1/11")).cache
+          cache.db.should == "11"
         end
 
         it 'responds to all required messages' do

data/spec/rack/cache/metastore/redis_spec.rb

@@ -3,9 +3,9 @@ require File.join(File.dirname(__FILE__), "/../../../spec_helper")
 module Rack
   module Cache
     class MetaStore
-      describe "Redis" do
+      describe "Rack::Cache::MetaStore::Redis" do
         before(:each) do
-          @store = Redis.resolve uri("redis://127.0.0.1")
+          @store = Rack::Cache::MetaStore::Redis.resolve uri("redis://127.0.0.1")
         end
 
         it "should have the class referenced by homonym constant" do
@@ -13,17 +13,17 @@ module Rack
         end
 
         it "should resolve the connection uri" do
-          cache = Redis.resolve(uri("redis://127.0.0.1")).cache
+          cache = Rack::Cache::MetaStore::Redis.resolve(uri("redis://127.0.0.1")).cache
           cache.should be_kind_of(::MarshaledRedis)
           cache.host.should == "127.0.0.1"
           cache.port.should == "6379"
-          cache.instance_variable_get(:@db).should == "0"
+          cache.db.should == "0"
 
-          cache = Redis.resolve(uri("redis://127.0.0.1:6380")).cache
+          cache = Rack::Cache::MetaStore::Redis.resolve(uri("redis://127.0.0.1:6380")).cache
           cache.port.should == 6380
 
-          cache = Redis.resolve(uri("redis://127.0.0.1/11")).cache
-          cache.instance_variable_get(:@db).should == "11"
+          cache = Rack::Cache::MetaStore::Redis.resolve(uri("redis://127.0.0.1/11")).cache
+          cache.db.should == "11"
         end
 
         it 'writes a list of negotation tuples with #write' do

data/spec/rack/session/redis_spec.rb

@@ -0,0 +1,238 @@
+require File.join(File.dirname(__FILE__), "/../../spec_helper")
+
+module Rack
+  module Session
+    describe "Rack::Session::Redis" do
+      before(:each) do
+        @session_key = Rack::Session::Redis::DEFAULT_OPTIONS[:key]
+        @session_match = /#{@session_key}=[0-9a-fA-F]+;/
+        @incrementor = lambda do |env|
+          env["rack.session"]["counter"] ||= 0
+          env["rack.session"]["counter"] += 1
+          Rack::Response.new(env["rack.session"].inspect).to_a
+        end
+        @drop_session = proc do |env|
+          env['rack.session.options'][:drop] = true
+          @incrementor.call(env)
+        end
+        @renew_session = proc do |env|
+          env['rack.session.options'][:renew] = true
+          @incrementor.call(env)
+        end
+        @defer_session = proc do |env|
+          env['rack.session.options'][:defer] = true
+          @incrementor.call(env)
+        end
+      end
+
+      it "should specify connection params" do
+        pool = Rack::Session::Redis.new(@incrementor, :redis_server => "localhost:6380/1").pool
+        pool.should be_kind_of(MarshaledRedis)
+        pool.host.should == "localhost"
+        pool.port.should == "6380"
+        pool.db.should == 1
+
+        pool = Rack::Session::Redis.new(@incrementor, :redis_server => ["localhost:6379", "localhost:6380"]).pool
+        pool.should be_kind_of(DistributedMarshaledRedis)
+      end
+
+      it "creates a new cookie" do
+        pool = Rack::Session::Redis.new(@incrementor)
+        res = Rack::MockRequest.new(pool).get("/")
+        res["Set-Cookie"].should match(/#{@session_key}=/)
+        res.body.should == '{"counter"=>1}'
+      end
+
+      it "determines session from a cookie" do
+        pool = Rack::Session::Redis.new(@incrementor)
+        req = Rack::MockRequest.new(pool)
+        res = req.get("/")
+        cookie = res["Set-Cookie"]
+        req.get("/", "HTTP_COOKIE" => cookie).
+          body.should == '{"counter"=>2}'
+        req.get("/", "HTTP_COOKIE" => cookie).
+          body.should == '{"counter"=>3}'
+      end
+      
+      it "survives nonexistant cookies" do
+        bad_cookie = "rack.session=blarghfasel"
+        pool = Rack::Session::Redis.new(@incrementor)
+        res = Rack::MockRequest.new(pool).
+          get("/", "HTTP_COOKIE" => bad_cookie)
+        res.body.should == '{"counter"=>1}'
+        cookie = res["Set-Cookie"][@session_match]
+        cookie.should_not match(/#{bad_cookie}/)
+      end
+
+      it "should maintain freshness" do
+        pool = Rack::Session::Redis.new(@incrementor, :expire_after => 3)
+        res = Rack::MockRequest.new(pool).get('/')
+        res.body.should include('"counter"=>1')
+        cookie = res["Set-Cookie"]
+        res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
+        res["Set-Cookie"].should == cookie
+        res.body.should include('"counter"=>2')
+        puts 'Sleeping to expire session' if $DEBUG
+        sleep 4
+        res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
+        res["Set-Cookie"].should_not == cookie
+        res.body.should include('"counter"=>1')
+      end
+
+      it "deletes cookies with :drop option" do
+        pool = Rack::Session::Redis.new(@incrementor)
+        req = Rack::MockRequest.new(pool)
+        drop = Rack::Utils::Context.new(pool, @drop_session)
+        dreq = Rack::MockRequest.new(drop)
+
+        res0 = req.get("/")
+        session = (cookie = res0["Set-Cookie"])[@session_match]
+        res0.body.should == '{"counter"=>1}'
+
+        res1 = req.get("/", "HTTP_COOKIE" => cookie)
+        res1["Set-Cookie"][@session_match].should == session
+        res1.body.should == '{"counter"=>2}'
+
+        res2 = dreq.get("/", "HTTP_COOKIE" => cookie)
+        res2["Set-Cookie"].should be_nil
+        res2.body.should == '{"counter"=>3}'
+
+        res3 = req.get("/", "HTTP_COOKIE" => cookie)
+        res3["Set-Cookie"][@session_match].should_not == session
+        res3.body.should == '{"counter"=>1}'
+      end
+
+      it "provides new session id with :renew option" do
+        pool = Rack::Session::Redis.new(@incrementor)
+        req = Rack::MockRequest.new(pool)
+        renew = Rack::Utils::Context.new(pool, @renew_session)
+        rreq = Rack::MockRequest.new(renew)
+
+        res0 = req.get("/")
+        session = (cookie = res0["Set-Cookie"])[@session_match]
+        res0.body.should == '{"counter"=>1}'
+
+        res1 = req.get("/", "HTTP_COOKIE" => cookie)
+        res1["Set-Cookie"][@session_match].should == session
+        res1.body.should == '{"counter"=>2}'
+
+        res2 = rreq.get("/", "HTTP_COOKIE" => cookie)
+        new_cookie = res2["Set-Cookie"]
+        new_session = new_cookie[@session_match]
+        new_session.should_not == session
+        res2.body.should == '{"counter"=>3}'
+
+        res3 = req.get("/", "HTTP_COOKIE" => new_cookie)
+        res3["Set-Cookie"][@session_match].should == new_session
+        res3.body.should == '{"counter"=>4}'
+      end
+
+      specify "omits cookie with :defer option" do
+        pool = Rack::Session::Redis.new(@incrementor)
+        req = Rack::MockRequest.new(pool)
+        defer = Rack::Utils::Context.new(pool, @defer_session)
+        dreq = Rack::MockRequest.new(defer)
+
+        res0 = req.get("/")
+        session = (cookie = res0["Set-Cookie"])[@session_match]
+        res0.body.should == '{"counter"=>1}'
+
+        res1 = req.get("/", "HTTP_COOKIE" => cookie)
+        res1["Set-Cookie"][@session_match].should == session
+        res1.body.should == '{"counter"=>2}'
+
+        res2 = dreq.get("/", "HTTP_COOKIE" => cookie)
+        res2["Set-Cookie"].should be_nil
+        res2.body.should == '{"counter"=>3}'
+
+        res3 = req.get("/", "HTTP_COOKIE" => cookie)
+        res3["Set-Cookie"][@session_match].should == session
+        res3.body.should == '{"counter"=>4}'
+      end
+
+      # anyone know how to do this better?
+      specify "multithread: should cleanly merge sessions" do
+        next unless $DEBUG
+        warn 'Running multithread test for Session::Memcache'
+        pool = Rack::Session::Redis.new(@incrementor)
+        req = Rack::MockRequest.new(pool)
+
+        res = req.get('/')
+        res.body.should == '{"counter"=>1}'
+        cookie = res["Set-Cookie"]
+        sess_id = cookie[/#{pool.key}=([^,;]+)/,1]
+
+        delta_incrementor = lambda do |env|
+          # emulate disconjoinment of threading
+          env['rack.session'] = env['rack.session'].dup
+          Thread.stop
+          env['rack.session'][(Time.now.usec*rand).to_i] = true
+          @incrementor.call(env)
+        end
+        tses = Rack::Utils::Context.new pool, delta_incrementor
+        treq = Rack::MockRequest.new(tses)
+        tnum = rand(7).to_i+5
+        r = Array.new(tnum) do
+          Thread.new(treq) do |run|
+            run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true)
+          end
+        end.reverse.map{|t| t.run.join.value }
+        r.each do |res|
+          res['Set-Cookie'].should == cookie
+          res.body.should include('"counter"=>2')
+        end
+
+        session = pool.pool.get(sess_id)
+        session.size.should == tnum+1 # counter
+        session['counter'].should == 2 # meeeh
+
+        tnum = rand(7).to_i+5
+        r = Array.new(tnum) do |i|
+          delta_time = proc do |env|
+            env['rack.session'][i]  = Time.now
+            Thread.stop
+            env['rack.session']     = env['rack.session'].dup
+            env['rack.session'][i] -= Time.now
+            @incrementor.call(env)
+          end
+          app = Rack::Utils::Context.new pool, time_delta
+          req = Rack::MockRequest.new app
+          Thread.new(req) do |run|
+            run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true)
+          end
+        end.reverse.map{|t| t.run.join.value }
+        r.each do |res|
+          res['Set-Cookie'].should == cookie
+          res.body.should include('"counter"=>3')
+        end
+
+        session = pool.pool.get(sess_id)
+        session.size.should == tnum+1
+        session['counter'].should == 3
+
+        drop_counter = proc do |env|
+          env['rack.session'].delete 'counter'
+          env['rack.session']['foo'] = 'bar'
+          [200, {'Content-Type'=>'text/plain'}, env['rack.session'].inspect]
+        end
+        tses = Rack::Utils::Context.new pool, drop_counter
+        treq = Rack::MockRequest.new(tses)
+        tnum = rand(7).to_i+5
+        r = Array.new(tnum) do
+          Thread.new(treq) do |run|
+            run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true)
+          end
+        end.reverse.map{|t| t.run.join.value }
+        r.each do |res|
+          res['Set-Cookie'].should == cookie
+          res.body.should include('"foo"=>"bar"')
+        end
+
+        session = pool.pool.get(sess_id)
+        session.size.should == r.size+1
+        session['counter'].should be_nil
+        session['foo'].should == 'bar'
+      end
+    end
+  end
+end

data/spec/redis/distributed_marshaled_redis_spec.rb

@@ -21,7 +21,7 @@ describe "DistributedMarshaledRedis" do
     mr = dmr.ring.nodes.first
     mr.host.should == "redis.com"
     mr.port.should == "6380"
-    mr.instance_variable_get(:@db).should == 1
+    mr.db.should == 1
   end
 
   it "should set an object" do

data/spec/redis/redis_factory_spec.rb

@@ -0,0 +1,34 @@
+require File.join(File.dirname(__FILE__), "/../spec_helper")
+
+describe "RedisFactory" do
+  it "should instantiate a MarshaledRedis store" do
+    store = RedisFactory.create
+    store.should be_kind_of(MarshaledRedis)
+    store.host.should == "localhost"
+    store.port.should == "6379"
+    store.db.should == 0
+  end
+
+  it "should allow to specify host" do
+    store = RedisFactory.create "redis.com"
+    store.host.should == "redis.com"
+  end
+
+  it "should allow to specify port" do
+    store = RedisFactory.create "redis.com:6380"
+    store.host.should == "redis.com"
+    store.port.should == "6380"
+  end
+
+  it "should allow to specify db" do
+    store = RedisFactory.create "redis.com:6380/23"
+    store.host.should == "redis.com"
+    store.port.should == "6380"
+    store.db.should == 23
+  end
+
+  it "should instantiate a DistributedMarshaledRedis store" do
+    store = RedisFactory.create "localhost:6379", "localhost:6380"
+    store.should be_kind_of(DistributedMarshaledRedis)
+  end
+end

data/spec/spec_helper.rb

@@ -11,3 +11,5 @@ require "redis-store"
 require "activesupport"
 require "cache/rails/redis_store"
 require "cache/sinatra/redis_store"
+
+class Redis; attr_reader :db end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jodosha-redis-store
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Luca Guidi
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-30 00:00:00 -07:00
+date: 2009-05-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: Redis cache and session stores for Ruby web frameworks
+description: Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks.
 email: guidi.luca@gmail.com
 executables: []
 
@@ -30,9 +30,13 @@ files:
 - lib/cache/sinatra/redis_store.rb
 - lib/rack/cache/redis_entitystore.rb
 - lib/rack/cache/redis_metastore.rb
+- lib/rack/session/merb.rb
+- lib/rack/session/redis.rb
 - lib/redis-store.rb
 - lib/redis/distributed_marshaled_redis.rb
 - lib/redis/marshaled_redis.rb
+- lib/redis/redis.rb
+- lib/redis/redis_factory.rb
 - redis-store.gemspec
 - spec/cache/merb/redis_store_spec.rb
 - spec/cache/rails/redis_store_spec.rb
@@ -43,8 +47,10 @@ files:
 - spec/rack/cache/entitystore/pony.jpg
 - spec/rack/cache/entitystore/redis_spec.rb
 - spec/rack/cache/metastore/redis_spec.rb
+- spec/rack/session/redis_spec.rb
 - spec/redis/distributed_marshaled_redis_spec.rb
 - spec/redis/marshaled_redis_spec.rb
+- spec/redis/redis_factory_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://lucaguidi.com
@@ -71,12 +77,14 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Redis cache and session stores for Ruby web frameworks
+summary: Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks.
 test_files: 
 - spec/cache/merb/redis_store_spec.rb
 - spec/cache/rails/redis_store_spec.rb
 - spec/cache/sinatra/redis_store_spec.rb
 - spec/rack/cache/entitystore/redis_spec.rb
 - spec/rack/cache/metastore/redis_spec.rb
+- spec/rack/session/redis_spec.rb
 - spec/redis/distributed_marshaled_redis_spec.rb
 - spec/redis/marshaled_redis_spec.rb
+- spec/redis/redis_factory_spec.rb