redis-store 0.3.7 → 0.3.8

data/lib/redis-store.rb

@@ -1,8 +1,8 @@
 require "redis"
-require "dist_redis"
-require "redis/redis_factory"
-require "redis/marshaled_redis"
-require "redis/distributed_marshaled_redis"
+require "redis/namespace"
+require "redis/factory"
+require "redis/marshaled_client"
+require "redis/distributed_marshaled"
 
 # Cache store
 if defined?(Sinatra)
@@ -22,10 +22,14 @@ if defined?(Rack::Session)
   if defined?(Merb)
     require "rack/session/merb"
   end
+  if defined?(Rails)
+    require "rack/session/rails"
+  end
 end
 
 # Rack::Cache
 if defined?(Rack::Cache)
+  require "rack/cache/key"
   require "rack/cache/redis_metastore"
   require "rack/cache/redis_entitystore"
 end

data/lib/redis/distributed_marshaled.rb

@@ -0,0 +1,18 @@
+class Redis
+  class DistributedMarshaled < Distributed
+    attr_reader :ring
+
+    def initialize(addresses)
+      nodes = addresses.map do |address|
+        MarshaledClient.new address
+      end
+      @ring = Redis::HashRing.new nodes
+    end
+
+    def nodes
+      ring.nodes
+    end
+
+    alias_method :flushdb, :delete_cloud!
+  end
+end

data/lib/redis/factory.rb

@@ -0,0 +1,26 @@
+class Redis
+  class Factory
+    def self.create(*redis_client_options)
+      redis_client_options = redis_client_options.flatten.compact.inject([]) do |result, address|
+        result << convert_to_redis_client_options(address)
+        result
+      end
+      if redis_client_options.size > 1
+        DistributedMarshaled.new redis_client_options
+      else
+        MarshaledClient.new redis_client_options.first || {}
+      end
+    end
+
+    def self.convert_to_redis_client_options(address_or_options)
+      return address_or_options if address_or_options.is_a?(Hash)
+      host, port = address_or_options.split /\:/
+      port, db   = port.split /\// if port
+      options = {}
+      options[:host] = host if host
+      options[:port] = port if port
+      options[:db]  = db.to_i if db
+      options
+    end
+  end
+end

data/lib/redis/marshaled_client.rb

@@ -0,0 +1,54 @@
+class Redis
+  class MarshaledClient < Client
+    def marshalled_set(key, val, options = nil)
+      val = marshal_value(val, options)
+      if expires_in = expires_in(options)
+        set_with_expire key, val, expires_in
+      else
+        set key, val
+      end
+    end
+
+    def marshalled_setnx(key, val, options = nil)
+      val = marshal_value(val, options)
+      if expires_in = expires_in(options)
+        setnx_with_expire key, val, expires_in
+      else
+        setnx key, val
+      end
+    end
+
+    def setnx_with_expire(key, value, ttl)
+      multi do
+        setnx(key, val)
+        expire(key, expires_in)
+      end
+    end
+
+    def marshalled_get(key, options = nil)
+      result = call_command([:get, key])
+      result = Marshal.load result if unmarshal?(result, options)
+      result
+    end
+
+    private
+      def marshal_value(val, options)
+        raw?(options) ? val : Marshal.dump(val)
+      end
+
+      def unmarshal?(result, options)
+        result && result.size > 0 && !raw?(options)
+      end
+
+      def raw?(options)
+        options && options[:raw]
+      end
+
+      def expires_in(options)
+        if options
+          # Rack::Session           Merb                    Rails/Sinatra
+          options[:expire_after] || options[:expires_in] || options[:expire_in]
+        end
+      end
+  end
+end

data/lib/redis/namespace.rb

@@ -0,0 +1,9 @@
+begin
+  require "redis/dist_redis"
+rescue LoadError
+  require "redis/distributed"
+end
+
+unless defined?(Redis::Distributed)
+  class Redis::Distributed < Redis::DistRedis; end
+end

data/redis-store.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{redis-store}
-  s.version = "0.3.7"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luca Guidi"]
-  s.date = %q{2009-11-15}
+  s.date = %q{2010-05-21}
   s.description = %q{Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks.}
   s.email = %q{guidi.luca@gmail.com}
   s.extra_rdoc_files = [
@@ -28,13 +28,16 @@ Gem::Specification.new do |s|
      "lib/rack/cache/redis_entitystore.rb",
      "lib/rack/cache/redis_metastore.rb",
      "lib/rack/session/merb.rb",
+     "lib/rack/session/rails.rb",
      "lib/rack/session/redis.rb",
      "lib/redis-store.rb",
-     "lib/redis/distributed_marshaled_redis.rb",
-     "lib/redis/marshaled_redis.rb",
-     "lib/redis/redis_factory.rb",
+     "lib/redis/distributed_marshaled.rb",
+     "lib/redis/factory.rb",
+     "lib/redis/marshaled_client.rb",
+     "lib/redis/namespace.rb",
      "redis-store.gemspec",
      "spec/cache/merb/redis_store_spec.rb",
+     "spec/cache/rails/redis_session_store_spec.rb",
      "spec/cache/rails/redis_store_spec.rb",
      "spec/cache/sinatra/redis_store_spec.rb",
      "spec/config/master.conf",
@@ -45,26 +48,27 @@ Gem::Specification.new do |s|
      "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/redis/factory_spec.rb",
+     "spec/redis/marshaled_client_spec.rb",
      "spec/spec_helper.rb",
      "tasks/redis.tasks.rb"
   ]
   s.homepage = %q{http://github.com/jodosha/redis-store}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks.}
   s.test_files = [
     "spec/cache/merb/redis_store_spec.rb",
+     "spec/cache/rails/redis_session_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",
+     "spec/redis/factory_spec.rb",
+     "spec/redis/marshaled_client_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -72,9 +76,10 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else
   end
 end
+

data/spec/cache/merb/redis_store_spec.rb

@@ -9,35 +9,30 @@ module Merb
         @rabbit = OpenStruct.new :name => "bunny"
         @white_rabbit = OpenStruct.new :color => "white"
         with_store_management do |store|
-          store.write  "rabbit", @rabbit
+          store.write "rabbit", @rabbit
           store.delete "rub-a-dub"
         end
       end
 
       it "should accept connection params" do
         redis = instantiate_store
-        redis.host.should == "127.0.0.1"
-        redis.port.should == 6379
-        redis.db.should == 0
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
 
         redis = instantiate_store "localhost"
-        redis.host.should == "localhost"
+        redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
 
         redis = instantiate_store "localhost:6380"
-        redis.host.should == "localhost"
-        redis.port.should == 6380
+        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
 
         redis = instantiate_store "localhost:6380/13"
-        redis.host.should == "localhost"
-        redis.port.should == 6380
-        redis.db.should == 13
+        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 13"
       end
-      
+
       it "should instantiate a ring" do
         store = instantiate_store
-        store.should be_kind_of(MarshaledRedis)
+        store.should be_kind_of(Redis::MarshaledClient)
         store = instantiate_store ["localhost:6379/0", "localhost:6379/1"]
-        store.should be_kind_of(DistributedMarshaledRedis)
+        store.should be_kind_of(Redis::DistributedMarshaled)
       end
 
       it "should verify if writable" do
@@ -54,7 +49,7 @@ module Merb
 
       it "should read raw data" do
         with_store_management do |store|
-          store.read("rabbit", {}, :raw => true).should == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
+          store.read("rabbit", {}, :raw => true).should == Marshal.dump(@rabbit)
         end
       end
 

data/spec/cache/rails/redis_session_store_spec.rb

@@ -0,0 +1,77 @@
+require File.join(File.dirname(__FILE__), "/../../spec_helper")
+
+module ActionController
+  module Session
+    describe "ActionController::Session::RedisSessionStore" do
+      attr_reader :app
+      before(:each) do
+        @app = Object.new
+        @store  = ActionController::Session::RedisSessionStore.new(app)
+        @dstore = ActionController::Session::RedisSessionStore.new app, :servers => ["localhost:6380/1", "localhost:6381/1"]
+        @rabbit = OpenStruct.new :name => "bunny"
+        @white_rabbit = OpenStruct.new :color => "white"
+        with_store_management do |store|
+          class << store
+            attr_reader :pool
+            public :get_session, :set_session
+          end
+          store.set_session({'rack.session.options' => {}}, "rabbit", @rabbit)
+          store.pool.del "counter"
+          store.pool.del "rub-a-dub"
+        end
+      end
+
+      it "should accept connection params" do
+        redis = instantiate_store
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
+
+        redis = instantiate_store :servers => "localhost"
+        redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
+
+        redis = instantiate_store :servers => "localhost:6380"
+        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
+
+        redis = instantiate_store :servers => "localhost:6380/13"
+        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 13"
+      end
+
+      it "should instantiate a ring" do
+        store = instantiate_store
+        store.should be_kind_of(Redis::MarshaledClient)
+        store = instantiate_store :servers => ["localhost:6379/0", "localhost:6379/1"]
+        store.should be_kind_of(Redis::DistributedMarshaled)
+      end
+
+      it "should read the data" do
+        with_store_management do |store|
+          store.get_session({}, "rabbit").should === ["rabbit", @rabbit]
+        end
+      end
+
+      it "should write the data" do
+        with_store_management do |store|
+          store.set_session({"rack.session.options" => {}}, "rabbit", @white_rabbit)
+          store.get_session({}, "rabbit").should === ["rabbit", @white_rabbit]
+        end
+      end
+
+      it "should write the data with expiration time" do
+        with_store_management do |store|
+          store.set_session({"rack.session.options" => {:expires_in => 1.second}}, "rabbit", @white_rabbit)
+          store.get_session({}, "rabbit").should === ["rabbit", @white_rabbit]; sleep 2
+          store.get_session({}, "rabbit").should === ["rabbit", {}]
+        end
+      end
+
+      private
+        def instantiate_store(params={})
+          ActionController::Session::RedisSessionStore.new(app, params).instance_variable_get(:@pool)
+        end
+
+        def with_store_management
+          yield @store
+          yield @dstore
+        end
+    end
+  end
+end

data/spec/cache/rails/redis_store_spec.rb

@@ -17,28 +17,23 @@ module ActiveSupport
 
       it "should accept connection params" do
         redis = instantiate_store
-        redis.host.should == "127.0.0.1"
-        redis.port.should == 6379
-        redis.db.should == 0
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
 
         redis = instantiate_store "localhost"
-        redis.host.should == "localhost"
-        
+        redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
+
         redis = instantiate_store "localhost:6380"
-        redis.host.should == "localhost"
-        redis.port.should == 6380
+        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
 
         redis = instantiate_store "localhost:6380/13"
-        redis.host.should == "localhost"
-        redis.port.should == 6380
-        redis.db.should == 13
+        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 13"
       end
 
       it "should instantiate a ring" do
         store = instantiate_store
-        store.should be_kind_of(MarshaledRedis)
+        store.should be_kind_of(Redis::MarshaledClient)
         store = instantiate_store ["localhost:6379/0", "localhost:6379/1"]
-        store.should be_kind_of(DistributedMarshaledRedis)
+        store.should be_kind_of(Redis::DistributedMarshaled)
       end
 
       it "should read the data" do
@@ -57,7 +52,7 @@ module ActiveSupport
       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 == @white_rabbit ; sleep 2
           store.read("rabbit").should be_nil
         end
       end
@@ -65,13 +60,13 @@ module ActiveSupport
       it "should not write data if :unless_exist option is true" do
         with_store_management do |store|
           store.write "rabbit", @white_rabbit, :unless_exist => true
-          store.read("rabbit").should === @rabbit
+          store.read("rabbit").should == @rabbit
         end
       end
 
       it "should read raw data" do
         with_store_management do |store|
-          store.read("rabbit", :raw => true).should == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
+          store.read("rabbit", :raw => true).should == Marshal.dump(@rabbit)
         end
       end
 
@@ -154,11 +149,12 @@ module ActiveSupport
           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 == @white_rabbit 
+          sleep 2
           store.fetch("rabbit").should be_nil
         end
       end
-      
+
       private
         def instantiate_store(addresses = nil)
           ActiveSupport::Cache::RedisStore.new(addresses).instance_variable_get(:@data)

data/spec/cache/sinatra/redis_store_spec.rb

@@ -8,7 +8,7 @@ class App
   def set(key, value)
     @values[key] = value
   end
-  
+
   def get(key)
     @values[key]
   end
@@ -38,28 +38,23 @@ module Sinatra
 
       it "should accept connection params" do
         redis = instantiate_store
-        redis.host.should == "127.0.0.1"
-        redis.port.should == 6379
-        redis.db.should == 0
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
 
         redis = instantiate_store "localhost"
-        redis.host.should == "localhost"
-        
+        redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
+
         redis = instantiate_store "localhost:6380"
-        redis.host.should == "localhost"
-        redis.port.should == 6380
+        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
 
         redis = instantiate_store "localhost:6380/13"
-        redis.host.should == "localhost"
-        redis.port.should == 6380
-        redis.db.should == 13
+        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 13"
       end
 
       it "should instantiate a ring" do
         store = instantiate_store
-        store.should be_kind_of(MarshaledRedis)
+        store.should be_kind_of(Redis::MarshaledClient)
         store = instantiate_store ["localhost:6379/0", "localhost:6379/1"]
-        store.should be_kind_of(DistributedMarshaledRedis)
+        store.should be_kind_of(Redis::DistributedMarshaled)
       end
 
       it "should read the data" do
@@ -92,7 +87,7 @@ module Sinatra
 
       it "should read raw data" do
         with_store_management do |store|
-          store.read("rabbit", :raw => true).should == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
+          store.read("rabbit", :raw => true).should == Marshal.dump(@rabbit)
         end
       end