jodosha-redis-store 0.3.5 → 0.3.6

data/README.textile

@@ -4,14 +4,20 @@ h2. Installation
 
 Download and install Redis from "http://code.google.com/p/redis/":http://code.google.com/p/redis/
 
-  wget "http://redis.googlecode.com/files/redis-0.094.tar.gz":http://redis.googlecode.com/files/redis-0.094.tar.gz
-  tar -zxvf redis-0.094.tar.gz
-  cd redis-0.094
+  curl -OL "http://redis.googlecode.com/files/redis-0.900_2.tar.gz":http://redis.googlecode.com/files/redis-0.900_2.tar.gz
+  tar -zxvf redis-0.900_2.tar.gz
+  mv redis-0.900_2 redis
+  cd redis
   make
 
 Install the gems
 
-  sudo gem install ezmobius-redis-rb -s http://gems.github.com
+  -sudo gem install ezmobius-redis-rb -s http://gems.github.com-
+  
+  git clone git://github.com/ezmobius/redis-rb.git
+  cd redis-rb
+  sudo rake install
+
   sudo gem install jodosha-redis-store -s http://gems.github.com
 
 h2. Cache store
@@ -26,7 +32,7 @@ h3. How to use with Rails
 
 h3. How to use with Merb
 
-  dependency "jodosha-redis-store", "0.3.5"
+  dependency "jodosha-redis-store", "0.3.6"
   dependency("merb-cache", merb_gems_version) do
     Merb::Cache.setup do
       register(:redis, Merb::Cache::RedisStore, :servers => ["127.0.0.1:6379"])
@@ -65,7 +71,7 @@ h3. How to use with Rails
 
 h3. How to use with Merb
 
-  dependency "jodosha-redis-store", "0.3.5"
+  dependency "jodosha-redis-store", "0.3.6"
   Merb::Config.use do |c|
     c[:session_store] = 'redis'
   end

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'spec/rake/spectask'
 
-REDIS_STORE_VERSION = "0.3.5"
+REDIS_STORE_VERSION = "0.3.6"
 
 task :default => :spec
 
@@ -28,6 +28,12 @@ task :files do
   puts "Test files:\n #{Dir['spec/**/*_spec.rb'].reject {|f| File.directory?(f)}.sort.inspect}"
 end
 
+desc "Run all examples with RCov"
+Spec::Rake::SpecTask.new(:rcov) do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.rcov = true
+end
+
 namespace :redis do
   desc 'Start the Redis cluster'
   task :start => :clean do

data/lib/rack/session/redis.rb

@@ -29,7 +29,7 @@ module Rack
         end
         session.instance_variable_set('@old', {}.merge(session))
         return [sid, session]
-      rescue RedisError, Errno::ECONNREFUSED
+      rescue Errno::ECONNREFUSED
         warn "#{self} is unable to find server."
         warn $!.inspect
         return [ nil, {} ]
@@ -50,7 +50,7 @@ module Rack
         session = merge_sessions session_id, old_session, new_session, session
         @pool.set session_id, session, options
         return session_id
-      rescue RedisError, Errno::ECONNREFUSED
+      rescue Errno::ECONNREFUSED
         warn "#{self} is unable to find server."
         warn $!.inspect
         return false

data/lib/redis-store.rb

@@ -1,7 +1,5 @@
 require "redis"
 require "dist_redis"
-require "redis/redis"
-require "redis/server"
 require "redis/redis_factory"
 require "redis/marshaled_redis"
 require "redis/distributed_marshaled_redis"

data/lib/redis/marshaled_redis.rb

@@ -11,11 +11,15 @@ class MarshaledRedis < Redis
 
   def get(key, options = nil)
     result = super key
-    result = Marshal.load result if result && !raw?(options)
+    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

data/redis-store.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name               = "redis-store"
-  s.version            = "0.3.5"
-  s.date               = "2009-05-07"
+  s.version            = "0.3.6"
+  s.date               = "2009-06-18"
   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        = "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/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", "lib/redis/server.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/redis/server_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", "spec/redis/server_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_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

@@ -16,21 +16,21 @@ module Merb
 
       it "should accept connection params" do
         redis = instantiate_store
-        redis.host.should == "localhost"
-        redis.port.should == "6379"
+        redis.host.should == "127.0.0.1"
+        redis.port.should == 6379
         redis.db.should == 0
 
-        redis = instantiate_store "redis.com"
-        redis.host.should == "redis.com"
-        
-        redis = instantiate_store "redis.com:6380"
-        redis.host.should == "redis.com"
-        redis.port.should == "6380"
+        redis = instantiate_store "localhost"
+        redis.host.should == "localhost"
+
+        redis = instantiate_store "localhost:6380"
+        redis.host.should == "localhost"
+        redis.port.should == 6380
 
-        redis = instantiate_store "redis.com:6380/23"
-        redis.host.should == "redis.com"
-        redis.port.should == "6380"
-        redis.db.should == 23
+        redis = instantiate_store "localhost:6380/13"
+        redis.host.should == "localhost"
+        redis.port.should == 6380
+        redis.db.should == 13
       end
       
       it "should instantiate a ring" do
@@ -87,6 +87,13 @@ module Merb
         end
       end
 
+      it "should write all the data" do
+        with_store_management do |store|
+          store.write_all "rabbit", @white_rabbit
+          store.read("rabbit").should === @white_rabbit
+        end
+      end
+
       it "should fetch data" do
         with_store_management do |store|
           store.fetch("rabbit").should == @rabbit
@@ -117,6 +124,13 @@ module Merb
         end
       end
 
+      it "should delete all the data with bang method" do
+        with_store_management do |store|
+          store.delete_all!
+          store.instance_variable_get(:@data).keys("*").should be_empty
+        end
+      end
+
       private
         def instantiate_store(addresses = nil)
           Merb::Cache::RedisStore.new(:servers => [addresses].flatten).instance_variable_get(:@data)

data/spec/cache/rails/redis_store_spec.rb

@@ -17,21 +17,21 @@ module ActiveSupport
 
       it "should accept connection params" do
         redis = instantiate_store
-        redis.host.should == "localhost"
-        redis.port.should == "6379"
+        redis.host.should == "127.0.0.1"
+        redis.port.should == 6379
         redis.db.should == 0
 
-        redis = instantiate_store "redis.com"
-        redis.host.should == "redis.com"
+        redis = instantiate_store "localhost"
+        redis.host.should == "localhost"
         
-        redis = instantiate_store "redis.com:6380"
-        redis.host.should == "redis.com"
-        redis.port.should == "6380"
-
-        redis = instantiate_store "redis.com:6380/23"
-        redis.host.should == "redis.com"
-        redis.port.should == "6380"
-        redis.db.should == 23
+        redis = instantiate_store "localhost:6380"
+        redis.host.should == "localhost"
+        redis.port.should == 6380
+
+        redis = instantiate_store "localhost:6380/13"
+        redis.host.should == "localhost"
+        redis.port.should == 6380
+        redis.db.should == 13
       end
 
       it "should instantiate a ring" do

data/spec/cache/sinatra/redis_store_spec.rb

@@ -38,21 +38,21 @@ module Sinatra
 
       it "should accept connection params" do
         redis = instantiate_store
-        redis.host.should == "localhost"
-        redis.port.should == "6379"
+        redis.host.should == "127.0.0.1"
+        redis.port.should == 6379
         redis.db.should == 0
 
-        redis = instantiate_store "redis.com"
-        redis.host.should == "redis.com"
+        redis = instantiate_store "localhost"
+        redis.host.should == "localhost"
         
-        redis = instantiate_store "redis.com:6380"
-        redis.host.should == "redis.com"
-        redis.port.should == "6380"
-
-        redis = instantiate_store "redis.com:6380/23"
-        redis.host.should == "redis.com"
-        redis.port.should == "6380"
-        redis.db.should == 23
+        redis = instantiate_store "localhost:6380"
+        redis.host.should == "localhost"
+        redis.port.should == 6380
+
+        redis = instantiate_store "localhost:6380/13"
+        redis.host.should == "localhost"
+        redis.port.should == 6380
+        redis.db.should == 13
       end
 
       it "should instantiate a ring" do

data/spec/config/master.conf

@@ -14,9 +14,9 @@ port 6380
 # If you want you can bind a single interface, if the bind option is not
 # specified all the interfaces will listen for connections.
 #
-# bind 127.0.0.1
+bind 127.0.0.1
 
-# Close the connection after a client is idle for N seconds
+# Close the connection after a client is idle for N seconds (0 to disable)
 timeout 300
 
 # Save the DB on disk:
@@ -34,6 +34,9 @@ save 900 1
 save 300 10
 save 60 10000
 
+# The filename where to dump the DB
+dbfilename master.rdb
+
 # For default save/load DB in/from the working directory
 # Note that you must specify a directory not a file name.
 dir ./tmp
@@ -50,7 +53,9 @@ loglevel debug
 # output for logging but daemonize, logs will be sent to /dev/null
 logfile stdout
 
-# Set the number of databases.
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
 databases 16
 
 ################################# REPLICATION #################################
@@ -73,6 +78,35 @@ databases 16
 
 # requirepass foobared
 
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default there
+# is no limit, and it's up to the number of file descriptors the Redis process
+# is able to open. The special value '0' means no limts.
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+
+# maxclients 128
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys with an
+# EXPIRE set. It will try to start freeing keys that are going to expire
+# in little time and preserve keys with a longer time to live.
+# Redis will also try to remove objects from free lists if possible.
+#
+# If all this fails, Redis will start to reply with errors to commands
+# that will use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to most read-only commands like GET.
+#
+# WARNING: maxmemory can be a good idea mainly if you want to use Redis as a
+# 'state' server or cache, not as a real DB. When Redis is used as a real
+# database the memory usage will grow over the weeks, it will be obvious if
+# it is going to use too much memory in the long run, and you'll have the time
+# to upgrade. With maxmemory after the limit is reached you'll start to get
+# errors for write operations, and this may even lead to DB inconsistency.
+
+# maxmemory <bytes>
+
 ############################### ADVANCED CONFIG ###############################
 
 # Glue small output buffers together in order to send small replies in a
@@ -84,4 +118,15 @@ glueoutputbuf yes
 # string in your dataset, but performs lookups against the shared objects
 # pool so it uses more CPU and can be a bit slower. Usually it's a good
 # idea.
+#
+# When object sharing is enabled (shareobjects yes) you can use
+# shareobjectspoolsize to control the size of the pool used in order to try
+# object sharing. A bigger pool size will lead to better sharing capabilities.
+# In general you want this value to be at least the double of the number of
+# very common strings you have in your dataset.
+#
+# WARNING: object sharing is experimental, don't enable this feature
+# in production before of Redis 1.0-stable. Still please try this feature in
+# your development environment so that we can test it better.
 shareobjects no
+shareobjectspoolsize 1024

data/spec/config/single.conf

@@ -14,9 +14,9 @@ port 6379
 # If you want you can bind a single interface, if the bind option is not
 # specified all the interfaces will listen for connections.
 #
-# bind 127.0.0.1
+bind 127.0.0.1
 
-# Close the connection after a client is idle for N seconds
+# Close the connection after a client is idle for N seconds (0 to disable)
 timeout 5
 
 # Save the DB on disk:
@@ -34,6 +34,9 @@ save 900 1
 save 300 10
 save 60 10000
 
+# The filename where to dump the DB
+dbfilename single.rdb
+
 # For default save/load DB in/from the working directory
 # Note that you must specify a directory not a file name.
 dir ./tmp
@@ -50,7 +53,9 @@ loglevel debug
 # output for logging but daemonize, logs will be sent to /dev/null
 logfile stdout
 
-# Set the number of databases.
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
 databases 16
 
 ################################# REPLICATION #################################
@@ -73,6 +78,35 @@ databases 16
 
 # requirepass foobared
 
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default there
+# is no limit, and it's up to the number of file descriptors the Redis process
+# is able to open. The special value '0' means no limts.
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+
+# maxclients 128
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys with an
+# EXPIRE set. It will try to start freeing keys that are going to expire
+# in little time and preserve keys with a longer time to live.
+# Redis will also try to remove objects from free lists if possible.
+#
+# If all this fails, Redis will start to reply with errors to commands
+# that will use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to most read-only commands like GET.
+#
+# WARNING: maxmemory can be a good idea mainly if you want to use Redis as a
+# 'state' server or cache, not as a real DB. When Redis is used as a real
+# database the memory usage will grow over the weeks, it will be obvious if
+# it is going to use too much memory in the long run, and you'll have the time
+# to upgrade. With maxmemory after the limit is reached you'll start to get
+# errors for write operations, and this may even lead to DB inconsistency.
+
+# maxmemory <bytes>
+
 ############################### ADVANCED CONFIG ###############################
 
 # Glue small output buffers together in order to send small replies in a
@@ -84,4 +118,15 @@ glueoutputbuf yes
 # string in your dataset, but performs lookups against the shared objects
 # pool so it uses more CPU and can be a bit slower. Usually it's a good
 # idea.
+#
+# When object sharing is enabled (shareobjects yes) you can use
+# shareobjectspoolsize to control the size of the pool used in order to try
+# object sharing. A bigger pool size will lead to better sharing capabilities.
+# In general you want this value to be at least the double of the number of
+# very common strings you have in your dataset.
+#
+# WARNING: object sharing is experimental, don't enable this feature
+# in production before of Redis 1.0-stable. Still please try this feature in
+# your development environment so that we can test it better.
 shareobjects no
+shareobjectspoolsize 1024

data/spec/config/slave.conf

@@ -14,9 +14,9 @@ port 6381
 # If you want you can bind a single interface, if the bind option is not
 # specified all the interfaces will listen for connections.
 #
-# bind 127.0.0.1
+bind 127.0.0.1
 
-# Close the connection after a client is idle for N seconds
+# Close the connection after a client is idle for N seconds (0 to disable)
 timeout 300
 
 # Save the DB on disk:
@@ -34,6 +34,9 @@ save 900 1
 save 300 10
 save 60 10000
 
+# The filename where to dump the DB
+dbfilename slave.rdb
+
 # For default save/load DB in/from the working directory
 # Note that you must specify a directory not a file name.
 dir ./tmp
@@ -50,7 +53,9 @@ loglevel debug
 # output for logging but daemonize, logs will be sent to /dev/null
 logfile stdout
 
-# Set the number of databases.
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
 databases 16
 
 ################################# REPLICATION #################################
@@ -60,7 +65,7 @@ databases 16
 # so for example it is possible to configure the slave to save the DB with a
 # different interval, or to listen to another port, and so on.
 
-# slaveof 127.0.0.1 6380
+slaveof 127.0.0.1 6380
 
 ################################## SECURITY ###################################
 
@@ -73,6 +78,35 @@ databases 16
 
 # requirepass foobared
 
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default there
+# is no limit, and it's up to the number of file descriptors the Redis process
+# is able to open. The special value '0' means no limts.
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+
+# maxclients 128
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys with an
+# EXPIRE set. It will try to start freeing keys that are going to expire
+# in little time and preserve keys with a longer time to live.
+# Redis will also try to remove objects from free lists if possible.
+#
+# If all this fails, Redis will start to reply with errors to commands
+# that will use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to most read-only commands like GET.
+#
+# WARNING: maxmemory can be a good idea mainly if you want to use Redis as a
+# 'state' server or cache, not as a real DB. When Redis is used as a real
+# database the memory usage will grow over the weeks, it will be obvious if
+# it is going to use too much memory in the long run, and you'll have the time
+# to upgrade. With maxmemory after the limit is reached you'll start to get
+# errors for write operations, and this may even lead to DB inconsistency.
+
+# maxmemory <bytes>
+
 ############################### ADVANCED CONFIG ###############################
 
 # Glue small output buffers together in order to send small replies in a
@@ -84,4 +118,15 @@ glueoutputbuf yes
 # string in your dataset, but performs lookups against the shared objects
 # pool so it uses more CPU and can be a bit slower. Usually it's a good
 # idea.
+#
+# When object sharing is enabled (shareobjects yes) you can use
+# shareobjectspoolsize to control the size of the pool used in order to try
+# object sharing. A bigger pool size will lead to better sharing capabilities.
+# In general you want this value to be at least the double of the number of
+# very common strings you have in your dataset.
+#
+# WARNING: object sharing is experimental, don't enable this feature
+# in production before of Redis 1.0-stable. Still please try this feature in
+# your development environment so that we can test it better.
 shareobjects no
+shareobjectspoolsize 1024

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

@@ -16,14 +16,14 @@ module Rack
           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.db.should == "0"
+          cache.port.should == 6379
+          cache.db.should == 0
 
           cache = Rack::Cache::EntityStore::Redis.resolve(uri("redis://127.0.0.1:6380")).cache
           cache.port.should == 6380
 
-          cache = Rack::Cache::EntityStore::Redis.resolve(uri("redis://127.0.0.1/11")).cache
-          cache.db.should == "11"
+          cache = Rack::Cache::EntityStore::Redis.resolve(uri("redis://127.0.0.1/13")).cache
+          cache.db.should == 13
         end
 
         it 'responds to all required messages' do

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

@@ -16,14 +16,14 @@ module Rack
           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.db.should == "0"
+          cache.port.should == 6379
+          cache.db.should == 0
 
           cache = Rack::Cache::MetaStore::Redis.resolve(uri("redis://127.0.0.1:6380")).cache
           cache.port.should == 6380
 
-          cache = Rack::Cache::MetaStore::Redis.resolve(uri("redis://127.0.0.1/11")).cache
-          cache.db.should == "11"
+          cache = Rack::Cache::MetaStore::Redis.resolve(uri("redis://127.0.0.1/13")).cache
+          cache.db.should == 13
         end
 
         it 'writes a list of negotation tuples with #write' do

data/spec/rack/session/redis_spec.rb

@@ -29,7 +29,7 @@ module Rack
         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.port.should == 6380
         pool.db.should == 1
 
         pool = Rack::Session::Redis.new(@incrementor, :redis_server => ["localhost:6379", "localhost:6380"]).pool
@@ -153,7 +153,7 @@ module Rack
       # anyone know how to do this better?
       specify "multithread: should cleanly merge sessions" do
         next unless $DEBUG
-        warn 'Running multithread test for Session::Memcache'
+        warn 'Running multithread test for Session::Redis'
         pool = Rack::Session::Redis.new(@incrementor)
         req = Rack::MockRequest.new(pool)
 

data/spec/redis/distributed_marshaled_redis_spec.rb

@@ -16,11 +16,11 @@ describe "DistributedMarshaledRedis" do
   end
 
   it "should accept connection params" do
-    dmr = DistributedMarshaledRedis.new [ :host => "redis.com", :port => "6380", :db => 1 ]
+    dmr = DistributedMarshaledRedis.new [ :host => "localhost", :port => "6380", :db => "1" ]
     dmr.ring.should have(1).node
     mr = dmr.ring.nodes.first
-    mr.host.should == "redis.com"
-    mr.port.should == "6380"
+    mr.host.should == "localhost"
+    mr.port.should == 6380
     mr.db.should == 1
   end
 

data/spec/redis/marshaled_redis_spec.rb

@@ -27,6 +27,11 @@ describe "MarshaledRedis" do
     @mr.get("rabbit", :raw => true).should == %(#<OpenStruct color="white">)
   end
 
+  it "should not unmarshal object if getting an empty string" do
+    @mr.set "empty_string", ""
+    lambda { @mr.get("empty_string").should == "" }.should_not raise_error
+  end
+
   it "should not set an object if already exist" do
     @mr.set_unless_exists "rabbit", @white_rabbit
     @mr.get("rabbit").should === @rabbit

data/spec/redis/redis_factory_spec.rb

@@ -4,27 +4,27 @@ 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.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 "redis.com"
-    store.host.should == "redis.com"
+    store = RedisFactory.create "localhost"
+    store.host.should == "localhost"
   end
 
   it "should allow to specify port" do
-    store = RedisFactory.create "redis.com:6380"
-    store.host.should == "redis.com"
-    store.port.should == "6380"
+    store = RedisFactory.create "localhost:6380"
+    store.host.should == "localhost"
+    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
+    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

data/spec/spec_helper.rb

@@ -12,4 +12,5 @@ require "activesupport"
 require "cache/rails/redis_store"
 require "cache/sinatra/redis_store"
 
-class Redis; attr_reader :db end
+class Redis; attr_reader :host, :port, :db end
+$DEBUG = ENV["DEBUG"] === "true"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jodosha-redis-store
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Luca Guidi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 -07:00
+date: 2009-06-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -35,9 +35,7 @@ files:
 - lib/redis-store.rb
 - lib/redis/distributed_marshaled_redis.rb
 - lib/redis/marshaled_redis.rb
-- lib/redis/redis.rb
 - lib/redis/redis_factory.rb
-- lib/redis/server.rb
 - redis-store.gemspec
 - spec/cache/merb/redis_store_spec.rb
 - spec/cache/rails/redis_store_spec.rb
@@ -52,7 +50,6 @@ files:
 - spec/redis/distributed_marshaled_redis_spec.rb
 - spec/redis/marshaled_redis_spec.rb
 - spec/redis/redis_factory_spec.rb
-- spec/redis/server_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://lucaguidi.com
@@ -90,4 +87,3 @@ test_files:
 - spec/redis/distributed_marshaled_redis_spec.rb
 - spec/redis/marshaled_redis_spec.rb
 - spec/redis/redis_factory_spec.rb
-- spec/redis/server_spec.rb

data/lib/redis/redis.rb

@@ -1,14 +0,0 @@
-# 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/server.rb

@@ -1,225 +0,0 @@
-require 'monitor'
-##
-# This class represents a redis server instance.
-
-class Server
-
-  ##
-  # The host the redis server is running on.
-
-  attr_reader :host
-
-  ##
-  # The port the redis server is listening on.
-
-  attr_reader :port
-  
-  ##
-  #
-  
-  attr_reader :replica
-
-  ##
-  # The time of next retry if the connection is dead.
-
-  attr_reader :retry
-
-  ##
-  # A text status string describing the state of the server.
-
-  attr_reader :status
-
-  ##
-  # Create a new Redis::Server object for the redis instance
-  # listening on the given host and port.
-
-  def initialize(host, port = DEFAULT_PORT, timeout = 10, size = 5)
-    raise ArgumentError, "No host specified" if host.nil? or host.empty?
-    raise ArgumentError, "No port specified" if port.nil? or port.to_i.zero?
-
-    @host   = host
-    @port   = port.to_i
-
-    @retry  = nil
-    @status = 'NOT CONNECTED'
-    @timeout = timeout
-    @size = size
-    
-    @reserved_sockets = {}
-
-    @mutex = Monitor.new
-    @queue = @mutex.new_cond
-
-    @sockets = []
-    @checked_out = []
-  end
-
-  ##
-  # Return a string representation of the server object.
-  def inspect
-    "<Redis::Server: %s:%d (%s)>" % [@host, @port, @status]
-  end
-
-  ##
-  # Try to connect to the redis server targeted by this object.
-  # Returns the connected socket object on success or nil on failure.
-
-  def socket
-    if socket = @reserved_sockets[current_connection_id]
-      socket
-    else
-      @reserved_sockets[current_connection_id] = checkout
-    end
-  end
-
-  def connect_to(host, port, timeout=nil)
-    addrs = Socket.getaddrinfo(host, nil)
-    addr = addrs.detect { |ad| ad[0] == 'AF_INET' }
-    sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-    if timeout
-      secs = Integer(timeout)
-      usecs = Integer((timeout - secs) * 1_000_000)
-      optval = [secs, usecs].pack("l_2")
-      sock.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
-      sock.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
-    end
-    sock.connect(Socket.pack_sockaddr_in(port, addr[3]))
-    sock
-  end
-
-  ##
-  # Close the connection to the redis server targeted by this
-  # object.  The server is not considered dead.
-
-  def close
-    @reserved_sockets.each do |name,sock|
-      checkin sock
-    end
-    @reserved_sockets = {}
-    @sockets.each do |sock|
-      sock.close
-    end
-    @sockets = []
-    @status = "NOT CONNECTED"
-  end
-
-  ##
-  # Mark the server as dead and close its socket.
-  def mark_dead(sock, error)
-    sock.close if sock && !sock.closed?
-    sock   = nil
-
-    reason = "#{error.class.name}: #{error.message}"
-    @status = sprintf "%s:%s DEAD (%s)", @host, @port, reason
-    puts @status
-  end
-
-  protected
-    def new_socket
-      sock = nil
-      begin
-        sock = connect_to(@host, @port, @timeout)
-        sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
-        @status = 'CONNECTED'
-      rescue Errno::EPIPE, Errno::ECONNREFUSED => e
-        if sock
-          puts "Socket died... socket: #{sock.inspect}\n" if $debug
-          sock.close
-        end
-      rescue SocketError, SystemCallError, IOError => err
-        puts "Unable to open socket: #{err.class.name}, #{err.message}" if $debug
-        mark_dead sock, err
-      end
-
-      return sock
-    end
-
-    def checkout
-      @mutex.synchronize do
-        loop do
-          socket = if @checked_out.size < @sockets.size
-                   checkout_existing_socket
-                 elsif @sockets.size < @size
-                   checkout_new_socket
-                 end
-          return socket if socket
-          # No sockets available; wait for one
-          if @queue.wait(@timeout)
-            next
-          else
-            # try looting dead threads
-            clear_stale_cached_sockets!
-            if @size == @checked_out.size
-              raise RedisError, "could not obtain a socket connection#{" within #{@timeout} seconds" if @timeout}.  The max pool size is currently #{@size}; consider increasing it."
-            end
-          end
-        end
-      end
-    end
-
-    def checkin(socket)
-      @mutex.synchronize do
-        @checked_out.delete socket
-        @queue.signal
-      end
-    end
-
-    def checkout_new_socket
-      s = new_socket
-      @sockets << s
-      checkout_and_verify(s)
-    end
-
-    def checkout_existing_socket
-      s = (@sockets - @checked_out).first
-      checkout_and_verify(s)
-    end
-
-    def clear_stale_cached_sockets!
-      remove_stale_cached_threads!(@reserved_sockets) do |name, socket|
-        checkin socket
-      end
-    end
-
-    def remove_stale_cached_threads!(cache, &block)
-      keys = Set.new(cache.keys)
-
-      Thread.list.each do |thread|
-        keys.delete(thread.object_id) if thread.alive?
-      end
-      keys.each do |key|
-        next unless cache.has_key?(key)
-        block.call(key, cache[key])
-        cache.delete(key)
-      end
-    end
-
-  private
-    def current_connection_id #:nodoc:
-      Thread.current.object_id
-    end
-
-    def checkout_and_verify(s)
-      s = verify!(s)
-      @checked_out << s
-      s
-    end
-
-    def verify!(s)
-      reconnect!(s) unless active?(s)
-    end
-
-    def reconnect!(s)
-      s.close
-      connect_to(@host, @port, @timeout)
-    end
-
-    def active?(s)
-      begin
-        s.write("\0")
-        Timeout.timeout(0.1){ s.read }
-      rescue Exception
-        false
-      end
-    end
-end

data/spec/redis/server_spec.rb

@@ -1,25 +0,0 @@
-require File.join(File.dirname(__FILE__), "/../spec_helper")
-
-describe "Redis::Server" do
-  before(:each) do
-    @server = Server.new 'localhost', '6379'
-  end
-
-  it "should have a connection pool" do
-    @server.instance_variable_get(:@sockets).should_not be_nil
-  end
-
-  it "should checkout active connections" do
-    threads = []
-    100.times do
-      threads << Thread.new do
-        lambda {
-          sleep 6 # redis will close idle connections in the meanwhile
-          socket = @server.socket
-          socket.write("INFO\r\n")
-          socket.read(1)
-        }.should_not raise_error(Exception)
-      end
-    end
-  end
-end