redis-store 1.0.0.beta2 → 1.0.0.beta3

data/spec/action_controller/session/redis_session_store_spec.rb

@@ -0,0 +1,121 @@
+require 'spec_helper'
+RAILS_SESSION_STORE_CLASS = ::Redis::Store.rails3? ? ActionDispatch::Session::RedisSessionStore : ActionController::Session::RedisSessionStore
+
+describe RAILS_SESSION_STORE_CLASS do
+  attr_reader :app
+
+  before :each do
+    @app = Object.new
+    @store  = RAILS_SESSION_STORE_CLASS.new(app)
+    @dstore = RAILS_SESSION_STORE_CLASS.new app, :servers => ["redis://127.0.0.1:6380/1", "redis://127.0.0.1:6381/1"]
+    @rabbit = OpenStruct.new :name => "bunny"
+    @white_rabbit = OpenStruct.new :color => "white"
+    @sid = "rabbit"
+    @env = {'rack.session.options' => {:id => @sid}}
+    with_store_management do |store|
+      class << store
+        attr_reader :pool
+        public :get_session, :set_session, :destroy
+      end
+      store.set_session(@env, @sid, @rabbit)
+      store.pool.del "counter"
+      store.pool.del "rub-a-dub"
+    end
+  end
+
+  it "should accept string 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 => "redis://localhost"
+    redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
+
+    redis = instantiate_store :servers => "redis://localhost:6380"
+    redis.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
+
+    redis = instantiate_store :servers => "redis://localhost:6380/13"
+    redis.to_s.should == "Redis Client connected to localhost:6380 against DB 13"
+
+    redis = instantiate_store :servers => "redis://localhost:6380/13/theplaylist"
+    redis.to_s.should == "Redis Client connected to localhost:6380 against DB 13 with namespace theplaylist"
+  end
+
+  it "should accept hash connection params" do
+    redis = instantiate_store :servers => [{ :host => "192.168.0.1" }]
+    redis.to_s.should == "Redis Client connected to 192.168.0.1:6379 against DB 0"
+
+    redis = instantiate_store :servers => [{ :port => "6380" }]
+    redis.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
+
+    redis = instantiate_store :servers => [{ :db => 13 }]
+    redis.to_s.should == "Redis Client connected to localhost:6379 against DB 13"
+
+    redis = instantiate_store :servers => [{ :key_prefix => "theplaylist" }]
+    redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0 with namespace theplaylist"
+  end
+
+  it "should instantiate a ring" do
+    store = instantiate_store
+    store.should be_kind_of(Redis::Store)
+    store = instantiate_store :servers => ["redis://127.0.0.1:6379/0", "redis://127.0.0.1:6379/1"]
+    store.should be_kind_of(Redis::DistributedStore)
+  end
+
+  it "should read the data" do
+    with_store_management do |store|
+      store.get_session(@env, @sid).should === [@sid, @rabbit]
+    end
+  end
+
+  it "should write the data" do
+    with_store_management do |store|
+      store.set_session(@env, @sid, @white_rabbit)
+      store.get_session(@env, @sid).should === [@sid, @white_rabbit]
+    end
+  end
+
+  it "should delete the data" do
+    with_store_management do |store|
+      store.destroy(@env)
+      store.get_session(@env, @sid).should === [@sid, {}]
+    end
+  end
+
+  it "should write the data with expiration time" do
+    with_store_management do |store|
+      @env['rack.session.options'].merge!(:expires_in => 1.second)
+      store.set_session(@env, @sid, @white_rabbit)
+      store.get_session(@env, @sid).should === [@sid, @white_rabbit]; sleep 2
+      store.get_session(@env, @sid).should === [@sid, {}]
+    end
+  end
+
+  describe "namespace" do
+    before :each do
+      @namespace = "theplaylist"
+      @store  = RAILS_SESSION_STORE_CLASS.new(lambda {|| }, :servers => [{ :namespace => @namespace }])
+      @pool   = @store.instance_variable_get(:@pool)
+      @client = @pool.instance_variable_get(:@client)
+    end
+
+    it "should read the data" do
+      @client.should_receive(:call).with(:get, "#{@namespace}:#{@sid}")
+      @store.send :get_session, @env, @sid
+    end
+
+    it "should write the data" do
+      @client.should_receive(:call).with(:set, "#{@namespace}:#{@sid}", Marshal.dump(@white_rabbit))
+      @store.send :set_session, @env, @sid, @white_rabbit
+    end
+  end
+
+  private
+    def instantiate_store(params = { })
+      RAILS_SESSION_STORE_CLASS.new(app, params).instance_variable_get(:@pool)
+    end
+
+    def with_store_management
+      yield @store
+      yield @dstore
+    end
+end

data/spec/{cache/rails → active_support/cache}/redis_store_spec.rb

@@ -1,11 +1,11 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper")
+require 'spec_helper'
 
 module ActiveSupport
   module Cache
     describe RedisStore do
       before :each do
         @store  = ActiveSupport::Cache::RedisStore.new
-        @dstore = ActiveSupport::Cache::RedisStore.new "localhost:6380/1", "localhost:6381/1"
+        @dstore = ActiveSupport::Cache::RedisStore.new "redis://127.0.0.1:6380/1", "redis://127.0.0.1:6381/1"
         @rabbit = OpenStruct.new :name => "bunny"
         @white_rabbit = OpenStruct.new :color => "white"
         with_store_management do |store|
@@ -19,21 +19,24 @@ module ActiveSupport
         redis = instantiate_store
         redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
 
-        redis = instantiate_store "localhost"
-        redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
+        redis = instantiate_store "redis://127.0.0.1"
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
+
+        redis = instantiate_store "redis://127.0.0.1:6380"
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6380 against DB 0"
 
-        redis = instantiate_store "localhost:6380"
-        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
+        redis = instantiate_store "redis://127.0.0.1:6380/13"
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6380 against DB 13"
 
-        redis = instantiate_store "localhost:6380/13"
-        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 13"
+        redis = instantiate_store "redis://127.0.0.1:6380/13/theplaylist"
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6380 against DB 13 with namespace theplaylist"
       end
 
       it "should instantiate a ring" do
         store = instantiate_store
-        store.should be_kind_of(Redis::MarshaledClient)
-        store = instantiate_store ["localhost:6379/0", "localhost:6379/1"]
-        store.should be_kind_of(Redis::DistributedMarshaled)
+        store.should be_kind_of(Redis::Store)
+        store = instantiate_store ["redis://127.0.0.1:6379/0", "redis://127.0.0.1:6379/1"]
+        store.should be_kind_of(Redis::DistributedStore)
       end
 
       it "should read the data" do
@@ -64,13 +67,13 @@ module ActiveSupport
         end
       end
 
-      if ::RedisStore.rails3?
+      if ::Redis::Store.rails3?
         if RUBY_VERSION.match /1\.9/
           it "should read raw data" do
             with_store_management do |store|
               result = store.read("rabbit", :raw => true)
               result.should include("ActiveSupport::Cache::Entry")
-              result.should include("\x0FOpenStruct{\x06:\tnameI\"\nbunny\x06:\rencoding\"\rUS-ASCII")
+              result.should include("\x0FOpenStruct{\x06:\tnameI\"\nbunny\x06:\x06EF")
             end
           end
         else
@@ -174,7 +177,7 @@ module ActiveSupport
           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).should be_nil # force cache miss
+          store.fetch("rabbit", :force => true) # force cache miss
           store.fetch("rabbit", :force => true, :expires_in => 1.second) { @white_rabbit }
           store.fetch("rabbit").should == @white_rabbit
           sleep 2
@@ -182,7 +185,7 @@ module ActiveSupport
         end
       end
 
-      if ::RedisStore.rails3?
+      if ::Redis::Store.rails3?
         it "should read multiple keys" do
           @store.write "irish whisky", "Jameson"
           rabbit, whisky = @store.read_multi "rabbit", "irish whisky"
@@ -198,7 +201,78 @@ module ActiveSupport
         end
       end
 
-      if ::RedisStore.rails3?
+      describe "namespace" do
+        before :each do
+          @namespace = "theplaylist"
+          @store = ActiveSupport::Cache::RedisStore.new :namespace => @namespace
+          @data = @store.instance_variable_get(:@data)
+          @client = @data.instance_variable_get(:@client)
+        end
+
+        it "should read the data" do
+          @client.should_receive(:call).with(:get, "#{@namespace}:rabbit")
+          @store.read("rabbit")
+        end
+
+        if ::Redis::Store.rails3?
+          # it "should write the data"
+          # it "should write the data" do
+          #   @data.should_receive(:set).with("#{@namespace}:rabbit"), Marshal.dump(ActiveSupport::Cache::Entry.new(@white_rabbit)))
+          #   @store.write "rabbit", @white_rabbit
+          # end
+        else
+          it "should write the data" do
+            @client.should_receive(:call).with(:set, "#{@namespace}:rabbit", Marshal.dump(@white_rabbit))
+            @store.write "rabbit", @white_rabbit
+          end
+        end
+
+        it "should delete the data" do
+          @client.should_receive(:call).with(:del, "#{@namespace}:rabbit")
+          @store.delete "rabbit"
+        end
+
+        it "should delete matched data" do
+          @client.should_receive(:call).with(:del, "#{@namespace}:rabbit")
+          @client.should_receive(:call).with(:keys, "theplaylist:rabb*").and_return [ "#{@namespace}:rabbit" ]
+          @store.delete_matched "rabb*"
+        end
+
+        if ::Redis::Store.rails3?
+          it "should verify existence of an object in the store" do
+            @client.should_receive(:call).with(:get, "#{@namespace}:rabbit")
+            @store.exist?("rabbit")
+          end
+        else
+          it "should verify existence of an object in the store" do
+            @client.should_receive(:call).with(:exists, "#{@namespace}:rabbit")
+            @store.exist?("rabbit")
+          end
+        end
+
+        it "should increment a key" do
+          @client.should_receive(:call).with(:incrby, "#{@namespace}:counter", 1)
+          @store.increment "counter"
+        end
+
+        it "should decrement a key" do
+          @client.should_receive(:call).with(:decrby, "#{@namespace}:counter", 1)
+          @store.decrement "counter"
+        end
+
+        it "should fetch data" do
+          @client.should_receive(:call).with(:get, "#{@namespace}:rabbit")
+          @store.fetch "rabbit"
+        end
+
+        it "should read multiple keys" do
+          rabbits = [ Marshal.dump(@rabbit), Marshal.dump(@white_rabbit) ]
+          @client.should_receive(:call).with(:mget, "#{@namespace}:rabbit", "#{@namespace}:white_rabbit").and_return rabbits
+          @store.read_multi "rabbit", "white_rabbit"
+        end
+      end
+
+      if ::Redis::Store.rails3?
         describe "notifications" do
           it "should notify on #fetch" do
             with_notifications do
@@ -207,7 +281,7 @@ module ActiveSupport
 
             read, generate, write = @events
             read.name.should        == "cache_read.active_support"
-            read.payload.should     == { :key => "radiohead" }
+            read.payload.should     == { :key => "radiohead", :super_operation => :fetch }
             generate.name.should    == "cache_generate.active_support"
             generate.payload.should == { :key => "radiohead" }
             write.name.should       == "cache_write.active_support"
@@ -221,7 +295,7 @@ module ActiveSupport
 
             read = @events.first
             read.name.should    == "cache_read.active_support"
-            read.payload.should == { :key => "metallica" }
+            read.payload.should == { :key => "metallica", :hit => false }
           end
 
           # it "should notify on #read_multi" # Not supported in Rails 3
@@ -263,7 +337,7 @@ module ActiveSupport
 
             delete_matched = @events.first
             delete_matched.name.should    == "cache_delete_matched.active_support"
-            delete_matched.payload.should == { :key => "afterhours*" }
+            delete_matched.payload.should == { :key => %("afterhours*") }
           end
 
           it "should notify on #increment" do

data/spec/cache/merb/redis_store_spec.rb

@@ -1,11 +1,11 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper")
+require 'spec_helper'
 
 module Merb
   module Cache
     describe "Merb::Cache::RedisStore" do
       before(:each) do
         @store  = Merb::Cache::RedisStore.new
-        @dstore = Merb::Cache::RedisStore.new :servers => ["localhost:6380/1", "localhost:6381/1"]
+        @dstore = Merb::Cache::RedisStore.new :servers => ["redis://127.0.0.1:6380/1", "redis://127.0.0.1:6381/1"]
         @rabbit = OpenStruct.new :name => "bunny"
         @white_rabbit = OpenStruct.new :color => "white"
         with_store_management do |store|
@@ -18,21 +18,24 @@ module Merb
         redis = instantiate_store
         redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
 
-        redis = instantiate_store "localhost"
-        redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
+        redis = instantiate_store "redis://127.0.0.1"
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
+
+        redis = instantiate_store "redis://127.0.0.1:6380"
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6380 against DB 0"
 
-        redis = instantiate_store "localhost:6380"
-        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
+        redis = instantiate_store "redis://127.0.0.1:6380/13"
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6380 against DB 13"
 
-        redis = instantiate_store "localhost:6380/13"
-        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 13"
+        redis = instantiate_store "redis://127.0.0.1:6380/13/theplaylist"
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6380 against DB 13 with namespace theplaylist"
       end
 
       it "should instantiate a ring" do
         store = instantiate_store
-        store.should be_kind_of(Redis::MarshaledClient)
-        store = instantiate_store ["localhost:6379/0", "localhost:6379/1"]
-        store.should be_kind_of(Redis::DistributedMarshaled)
+        store.should be_kind_of(Redis::Store)
+        store = instantiate_store ["redis://127.0.0.1:6379/0", "redis://127.0.0.1:6379/1"]
+        store.should be_kind_of(Redis::DistributedStore)
       end
 
       it "should verify if writable" do

data/spec/cache/sinatra/redis_store_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper")
+require 'spec_helper'
 
 class App
   def initialize
@@ -19,7 +19,7 @@ module Sinatra
     describe "Sinatra::Cache::RedisStore" do
       before(:each) do
         @store  = Sinatra::Cache::RedisStore.new
-        @dstore = Sinatra::Cache::RedisStore.new "localhost:6380/1", "localhost:6381/1"
+        @dstore = Sinatra::Cache::RedisStore.new "redis://127.0.0.1:6380/1", "redis://127.0.0.1:6381/1"
         @rabbit = OpenStruct.new :name => "bunny"
         @white_rabbit = OpenStruct.new :color => "white"
         with_store_management do |store|
@@ -40,21 +40,24 @@ module Sinatra
         redis = instantiate_store
         redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
 
-        redis = instantiate_store "localhost"
-        redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
+        redis = instantiate_store "redis://127.0.0.1"
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
+
+        redis = instantiate_store "redis://127.0.0.1:6380"
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6380 against DB 0"
 
-        redis = instantiate_store "localhost:6380"
-        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
+        redis = instantiate_store "redis://127.0.0.1:6380/13"
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6380 against DB 13"
 
-        redis = instantiate_store "localhost:6380/13"
-        redis.to_s.should == "Redis Client connected to localhost:6380 against DB 13"
+        redis = instantiate_store "redis://127.0.0.1:6380/13/theplaylist"
+        redis.to_s.should == "Redis Client connected to 127.0.0.1:6380 against DB 13 with namespace theplaylist"
       end
 
       it "should instantiate a ring" do
         store = instantiate_store
-        store.should be_kind_of(Redis::MarshaledClient)
-        store = instantiate_store ["localhost:6379/0", "localhost:6379/1"]
-        store.should be_kind_of(Redis::DistributedMarshaled)
+        store.should be_kind_of(Redis::Store)
+        store = instantiate_store ["redis://127.0.0.1:6379/0", "redis://127.0.0.1:6379/1"]
+        store.should be_kind_of(Redis::DistributedStore)
       end
 
       it "should read the data" do

data/spec/config/master.conf

@@ -76,7 +76,7 @@ save 60 10000
 rdbcompression yes
 
 # The filename where to dump the DB
-dbfilename master-dump.rdb
+dbfilename tmp/master-dump.rdb
 
 # The working directory.
 #

data/spec/config/single.conf

@@ -76,7 +76,7 @@ save 60 10000
 rdbcompression yes
 
 # The filename where to dump the DB
-dbfilename dump.rdb
+dbfilename tmp/dump.rdb
 
 # The working directory.
 #

data/spec/config/slave.conf

@@ -76,7 +76,7 @@ save 60 10000
 rdbcompression yes
 
 # The filename where to dump the DB
-dbfilename slave-dump.rdb
+dbfilename tmp/slave-dump.rdb
 
 # The working directory.
 #

data/spec/i18n/backend/redis_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe "I18n::Backend::Redis" do
+  before :each do
+    @backend     = I18n::Backend::Redis.new
+    @store       = @backend.store
+    I18n.backend = @backend
+  end
+
+  it "should instantiate a store" do
+    @store.should be_kind_of(Redis::Store)
+  end
+
+  it "should instantiate a distributed store" do
+    store = I18n::Backend::Redis.new([ "redis://127.0.0.1:6379", "redis://127.0.0.1:6380" ]).store
+    store.should be_kind_of(Redis::DistributedStore)
+  end
+
+  it "should accept string uri" do
+    store = I18n::Backend::Redis.new("redis://127.0.0.1:6380/13/theplaylist").store
+    store.to_s.should == "Redis Client connected to 127.0.0.1:6380 against DB 13 with namespace theplaylist"
+  end
+
+  it "should accept hash params" do
+    store = I18n::Backend::Redis.new(:host => "127.0.0.1", :port => "6380", :db =>"13", :namespace => "theplaylist").store
+    store.to_s.should == "Redis Client connected to 127.0.0.1:6380 against DB 13 with namespace theplaylist"
+  end
+
+  it "should store translations" do
+    I18n.backend.store_translations :en, :foo => { :bar => :baz }
+    I18n.t(:"foo.bar").should == :baz
+
+    I18n.backend.store_translations :en, "foo" => { "bar" => "baz" }
+    I18n.t(:"foo.bar").should == "baz"
+  end
+
+  it "should get translations" do
+    I18n.backend.store_translations :en, :foo => { :bar => { :baz => :bang } }
+    I18n.t(:"foo.bar.baz").should == :bang
+    I18n.t(:"baz", :scope => :"foo.bar").should == :bang
+  end
+
+  it "should not store proc translations" do
+    lambda { I18n.backend.store_translations :en, :foo => lambda {|| } }.should raise_error("Key-value stores cannot handle procs")
+  end
+
+  it "should list available locales" do
+    locales = [ :en, :it, :es, :fr, :de ]
+    locales.each { |locale| I18n.backend.store_translations locale, :foo => "bar" }
+    available_locales = I18n.backend.available_locales
+
+    locales.each do |locale|
+      available_locales.should include(locale)
+    end
+  end
+end