redis-store 0.3.7 → 0.3.8

data/spec/redis/factory_spec.rb

@@ -0,0 +1,68 @@
+require File.join(File.dirname(__FILE__), "/../spec_helper")
+
+describe "Redis::Factory" do
+  describe ".create" do
+    context "when not given any arguments" do
+      it "should instantiate a Redis::MarshaledClient store" do
+        store = Redis::Factory.create
+        store.should be_kind_of(Redis::MarshaledClient)
+        store.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
+      end
+    end
+
+    context "when given a Hash" do
+      it "should allow to specify host" do
+        store = Redis::Factory.create :host => "localhost"
+        store.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
+      end
+
+      it "should allow to specify port" do
+        store = Redis::Factory.create :host => "localhost", :port => 6380
+        store.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
+      end
+
+      it "should allow to specify db" do
+        store = Redis::Factory.create :host => "localhost", :port => 6380, :db => 13
+        store.to_s.should == "Redis Client connected to localhost:6380 against DB 13"
+      end
+
+      it "should instantiate a Redis::DistributedMarshaled store" do
+        store = Redis::Factory.create(
+          {:host => "localhost", :port => 6379},
+          {:host => "localhost", :port => 6380}
+        )
+        store.should be_kind_of(Redis::DistributedMarshaled)
+        store.nodes.map {|node| node.to_s}.should == [
+          "Redis Client connected to localhost:6379 against DB 0",
+          "Redis Client connected to localhost:6380 against DB 0",
+        ]
+      end
+    end
+
+    context "when given a String" do
+      it "should allow to specify host" do
+        store = Redis::Factory.create "localhost"
+        store.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
+      end
+
+      it "should allow to specify port" do
+        store = Redis::Factory.create "localhost:6380"
+        store.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
+      end
+
+      it "should allow to specify db" do
+        store = Redis::Factory.create "localhost:6380/13"
+        store.to_s.should == "Redis Client connected to localhost:6380 against DB 13"
+      end
+
+      it "should instantiate a Redis::DistributedMarshaled store" do
+        store = Redis::Factory.create "localhost:6379", "localhost:6380"
+        store.should be_kind_of(Redis::DistributedMarshaled)
+        store.nodes.map {|node| node.to_s}.should == [
+          "Redis Client connected to localhost:6379 against DB 0",
+          "Redis Client connected to localhost:6380 against DB 0",
+        ]
+      end
+    end
+  end
+end

data/spec/redis/marshaled_client_spec.rb

@@ -0,0 +1,54 @@
+require File.join(File.dirname(__FILE__), "/../spec_helper")
+
+describe "Redis::MarshaledClient" do
+  before(:each) do
+    @store = Redis::MarshaledClient.new
+    @rabbit = OpenStruct.new :name => "bunny"
+    @white_rabbit = OpenStruct.new :color => "white"
+    @store.marshalled_set "rabbit", @rabbit
+    @store.del "rabbit2"
+  end
+
+  after :each do
+    @store.quit
+  end
+
+  it "should unmarshal an object on get" do
+    @store.marshalled_get("rabbit").should === @rabbit
+  end
+
+  it "should marshal object on set" do
+    @store.marshalled_set "rabbit", @white_rabbit
+    @store.marshalled_get("rabbit").should === @white_rabbit
+  end
+
+  it "should not unmarshal object on get if raw option is true" do
+    @store.marshalled_get("rabbit", :raw => true).should == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
+  end
+
+  it "should not marshal object on set if raw option is true" do
+    @store.marshalled_set "rabbit", @white_rabbit, :raw => true
+    @store.marshalled_get("rabbit", :raw => true).should == %(#<OpenStruct color="white">)
+  end
+
+  it "should not unmarshal object if getting an empty string" do
+    @store.marshalled_set "empty_string", ""
+    lambda { @store.marshalled_get("empty_string").should == "" }.should_not raise_error
+  end
+
+  it "should not set an object if already exist" do
+    @store.marshalled_setnx "rabbit", @white_rabbit
+    @store.marshalled_get("rabbit").should === @rabbit
+  end
+
+  it "should marshal object on set_unless_exists" do
+    @store.marshalled_setnx "rabbit2", @white_rabbit
+    @store.marshalled_get("rabbit2").should === @white_rabbit
+  end
+
+  it "should not marshal object on set_unless_exists if raw option is true" do
+    @store.marshalled_setnx "rabbit2", @white_rabbit, :raw => true
+    @store.marshalled_get("rabbit2", :raw => true).should == %(#<OpenStruct color="white">)
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,17 +1,23 @@
-$: << File.join(File.dirname(__FILE__), "/../lib")
-require "vendor/gems/environment"
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "/../lib")))
+ARGV << "-b"
+require "rubygems"
+require "bundler"
+Bundler.setup
+
+#require "vendor/gems/environment"
 require "ostruct"
 require "spec"
+require "spec/autorun"
 require "redis"
 require "merb"
 require "rack/cache"
 require "rack/cache/metastore"
 require "rack/cache/entitystore"
 require "redis-store"
-require "activesupport"
+require "active_support"
+require "action_controller/session/abstract_store"
 require "cache/rails/redis_store"
+require "rack/session/rails"
 require "cache/sinatra/redis_store"
 
-class Redis; attr_reader :host, :port, :db end
 $DEBUG = ENV["DEBUG"] === "true"
-

data/tasks/redis.tasks.rb

@@ -1,8 +1,19 @@
 # steal the cool tasks from redis-rb
-begin
-  load File.join(File.dirname(__FILE__), "/../vendor/gems/gems/redis-rb-0.1/tasks/redis.tasks.rb")
-rescue LoadError
-end
+require 'rbconfig'
+require "rubygems"
+require "bundler"
+Bundler.setup
+redis_path = $:.
+  find {|path| path =~ /redis-/ }.
+  split("/").
+  tap do |array|
+    array.replace(
+      array[0..array.index(array.find {|segment| segment =~ /redis-/})]
+    )
+  end.
+  join("/")
+
+load "#{redis_path}/tasks/redis.tasks.rb"
 
 class RedisRunner
   def self.port
@@ -43,7 +54,7 @@ class SlaveRedisRunner < RedisRunner
     "/tmp/redis_slave.dtach"
   end
 
-  def self.port 
+  def self.port
     6381
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis-store
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  hash: 3
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Luca Guidi
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-15 00:00:00 +01:00
+date: 2010-05-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -34,13 +40,16 @@ files:
 - 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
@@ -51,8 +60,8 @@ files:
 - 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
 has_rdoc: true
@@ -65,32 +74,39 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 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_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

data/lib/redis/distributed_marshaled_redis.rb

@@ -1,10 +0,0 @@
-class DistributedMarshaledRedis < DistRedis
-  def initialize(addresses)
-    nodes = addresses.map do |address|
-      MarshaledRedis.new address
-    end
-    @ring = HashRing.new nodes
-  end
-  
-  alias_method :flush_db, :delete_cloud!
-end

data/lib/redis/marshaled_redis.rb

@@ -1,33 +0,0 @@
-class MarshaledRedis < Redis
-  def set(key, val, options = nil)
-    val = Marshal.dump val unless raw?(options)
-    super key, val, expires_in(options)
-  end
-
-  def set_unless_exists(key, val, options = nil)
-    val = Marshal.dump val unless raw?(options)
-    super key, val    
-  end
-
-  def get(key, options = nil)
-    result = call_command([:get, key])
-    result = Marshal.load result if unmarshal?(result, options)
-    result
-  end
-
-  private
-    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

data/lib/redis/redis_factory.rb

@@ -1,27 +0,0 @@
-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/spec/redis/marshaled_redis_spec.rb

@@ -1,54 +0,0 @@
-require File.join(File.dirname(__FILE__), "/../spec_helper")
-
-describe "MarshaledRedis" do
-  before(:each) do
-    @store = MarshaledRedis.new
-    @rabbit = OpenStruct.new :name => "bunny"
-    @white_rabbit = OpenStruct.new :color => "white"
-    @store.set    "rabbit", @rabbit
-    @store.delete "rabbit2"
-  end
-
-  after :each do
-    @store.quit
-  end
-
-  it "should unmarshal an object on get" do
-    @store.get("rabbit").should === @rabbit
-  end
-
-  it "should marshal object on set" do
-    @store.set "rabbit", @white_rabbit
-    @store.get("rabbit").should === @white_rabbit
-  end
-
-  it "should not unmarshal object on get if raw option is true" do
-    @store.get("rabbit", :raw => true).should == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
-  end
-
-  it "should not marshal object on set if raw option is true" do
-    @store.set "rabbit", @white_rabbit, :raw => true
-    @store.get("rabbit", :raw => true).should == %(#<OpenStruct color="white">)
-  end
-
-  it "should not unmarshal object if getting an empty string" do
-    @store.set "empty_string", ""
-    lambda { @store.get("empty_string").should == "" }.should_not raise_error
-  end
-
-  it "should not set an object if already exist" do
-    @store.set_unless_exists "rabbit", @white_rabbit
-    @store.get("rabbit").should === @rabbit
-  end
-
-  it "should marshal object on set_unless_exists" do
-    @store.set_unless_exists "rabbit2", @white_rabbit
-    @store.get("rabbit2").should === @white_rabbit
-  end
-
-  it "should not marshal object on set_unless_exists if raw option is true" do
-    @store.set_unless_exists "rabbit2", @white_rabbit, :raw => true
-    @store.get("rabbit2", :raw => true).should == %(#<OpenStruct color="white">)
-  end
-end
-

data/spec/redis/redis_factory_spec.rb

@@ -1,34 +0,0 @@
-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 == "127.0.0.1"
-    store.port.should == 6379
-    store.db.should == 0
-  end
-
-  it "should allow to specify host" do
-    store = RedisFactory.create "localhost"
-    store.host.should == "localhost"
-  end
-
-  it "should allow to specify port" do
-    store = RedisFactory.create "localhost:6380"
-    store.host.should == "localhost"
-    store.port.should == 6380
-  end
-
-  it "should allow to specify db" do
-    store = RedisFactory.create "localhost:6380/13"
-    store.host.should == "localhost"
-    store.port.should == 6380
-    store.db.should == 13
-  end
-
-  it "should instantiate a DistributedMarshaledRedis store" do
-    store = RedisFactory.create "localhost:6379", "localhost:6380"
-    store.should be_kind_of(DistributedMarshaledRedis)
-  end
-end