jodosha-redis-rails 0.0.1 → 0.0.2

data/README.textile

@@ -18,7 +18,8 @@ h2. How to use with Rails
 
 In your configuration files:
 
-  config.gem "jodosha-redis-rails", :source => "http://gems.github.com"
+  config.gem "jodosha-redis-rails", :source => "http://gems.github.com", :lib => "redis-rails"
+  require "redis-rails" # HACK Rails tries to instantiate cache first, then load configured gems
   config.cache_store = :redis_store
 
 Start Redis server, then your application.

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'spec/rake/spectask'
 
-REDIS_RAILS_VERSION = "0.0.1"
+REDIS_RAILS_VERSION = "0.0.2"
 
 task :default => :spec
 
@@ -26,4 +26,27 @@ desc 'Show the file list for the gemspec file'
 task :files do
   puts "Files:\n #{Dir['**/*'].reject {|f| File.directory?(f)}.sort.inspect}"
   puts "Test files:\n #{Dir['spec/**/*_spec.rb'].reject {|f| File.directory?(f)}.sort.inspect}"
-end
+end
+
+namespace :redis do
+  desc 'Start the Redis cluster'
+  task :start => :clean do
+    system "redis-server spec/config/single.conf"
+    system "redis-server spec/config/master.conf"
+    system "redis-server spec/config/slave.conf"
+  end
+
+  desc 'Stop the Redis cluster'
+  task :stop do
+    # TODO replace with:
+    # system "kill -9 `tmp/redis-single.pid`"
+    # system "kill -9 `tmp/redis-master.pid`"
+    # system "kill -9 `tmp/redis-slave.pid`"
+    system "ps -eo pid,comm | grep redis | xargs kill -9"
+  end
+
+  desc 'Clean the tmp/ directory'
+  task :clean do
+    system "rm tmp/*"
+  end
+end

data/lib/active_support/cache/redis_store.rb

@@ -8,6 +8,7 @@ module ActiveSupport
       #   RedisStore.new "example.com"         # => host: example.com, port: 6379,  db: 0
       #   RedisStore.new "example.com:23682"   # => host: example.com, port: 23682, db: 0
       #   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

data/lib/redis/distributed_marshaled_redis.rb

@@ -5,4 +5,6 @@ class DistributedMarshaledRedis < DistRedis
     end
     @ring = HashRing.new nodes
   end
+  
+  alias_method :flush_db, :delete_cloud!
 end

data/redis-rails.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name               = "redis-rails"
-  s.version            = "0.0.1"
-  s.date               = "2009-04-11"
+  s.version            = "0.0.2"
+  s.date               = "2009-04-16"
   s.summary            = "Redis store for Rails"
   s.author             = "Luca Guidi"
   s.email              = "guidi.luca@gmail.com"
   s.homepage           = "http://lucaguidi.com"
   s.description        = "Redis store for Rails"
   s.has_rdoc           = true
-  s.files              = ["MIT-LICENSE", "README.textile", "Rakefile", "lib/active_support/cache/redis_store.rb", "lib/redis-rails.rb", "lib/redis/distributed_marshaled_redis.rb", "lib/redis/marshaled_redis.rb", "redis-rails.gemspec", "spec/active_support/cache/redis_store_spec.rb", "spec/redis/distributed_marshaled_redis_spec.rb", "spec/redis/marshaled_redis_spec.rb", "spec/spec_helper.rb"]
+  s.files              = ["MIT-LICENSE", "README.textile", "Rakefile", "lib/active_support/cache/redis_store.rb", "lib/redis-rails.rb", "lib/redis/distributed_marshaled_redis.rb", "lib/redis/marshaled_redis.rb", "redis-rails.gemspec", "spec/active_support/cache/redis_store_spec.rb", "spec/config/master.conf", "spec/config/single.conf", "spec/config/slave.conf", "spec/redis/distributed_marshaled_redis_spec.rb", "spec/redis/marshaled_redis_spec.rb", "spec/spec_helper.rb"]
   s.test_files         = ["spec/active_support/cache/redis_store_spec.rb", "spec/redis/distributed_marshaled_redis_spec.rb", "spec/redis/marshaled_redis_spec.rb"]
   s.extra_rdoc_files   = ["README.textile"]
 end

data/spec/active_support/cache/redis_store_spec.rb

@@ -5,10 +5,13 @@ module ActiveSupport
     describe "RedisStore" do
       before(:each) do
         @store  = RedisStore.new
+        @dstore = RedisStore.new "localhost:6380/1", "localhost:6381/1"
         @rabbit = OpenStruct.new :name => "bunny"
         @white_rabbit = OpenStruct.new :color => "white"
-        @store.write  "rabbit", @rabbit
-        @store.delete "counter"
+        with_store_management do |store|
+          store.write  "rabbit", @rabbit
+          store.delete "counter"
+        end
       end
 
       it "should accept connection params" do
@@ -38,12 +41,16 @@ module ActiveSupport
       end
 
       it "should read the data" do
-        @store.read("rabbit").should === @rabbit
+        with_store_management do |store|
+          store.read("rabbit").should === @rabbit
+        end
       end
 
       it "should write the data" do
-        @store.write "rabbit", @white_rabbit
-        @store.read("rabbit").should === @white_rabbit
+        with_store_management do |store|
+          store.write "rabbit", @white_rabbit
+          store.read("rabbit").should === @white_rabbit
+        end
       end
 
       # it "should write the data with expiration time" do
@@ -53,80 +60,111 @@ module ActiveSupport
       # end
 
       it "should not write data if :unless_exist option is true" do
-        @store.write "rabbit", @white_rabbit, :unless_exist => true
-        @store.read("rabbit").should === @rabbit
+        with_store_management do |store|
+          store.write "rabbit", @white_rabbit, :unless_exist => true
+          store.read("rabbit").should === @rabbit
+        end
       end
 
       it "should read raw data" do
-        @store.read("rabbit", :raw => true).should == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
+        with_store_management do |store|
+          store.read("rabbit", :raw => true).should == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
+        end
       end
 
       it "should write raw data" do
-        @store.write "rabbit", @white_rabbit, :raw => true
-        @store.read("rabbit", :raw => true).should == %(#<OpenStruct color="white">)
+        with_store_management do |store|
+          store.write "rabbit", @white_rabbit, :raw => true
+          store.read("rabbit", :raw => true).should == %(#<OpenStruct color="white">)
+        end
       end
 
       it "should delete data" do
-        @store.delete "rabbit"
-        @store.read("rabbit").should be_nil
+        with_store_management do |store|
+          store.delete "rabbit"
+          store.read("rabbit").should be_nil
+        end
       end
 
       it "should delete matched data" do
-        @store.delete_matched "rabb*"
-        @store.read("rabbit").should be_nil
+        with_store_management do |store|
+          store.delete_matched "rabb*"
+          store.read("rabbit").should be_nil
+        end
       end
 
       it "should verify existence of an object in the store" do
-        @store.exist?("rabbit").should be_true
-        @store.exist?("rab-a-dub").should be_false
+        with_store_management do |store|
+          store.exist?("rabbit").should be_true
+          store.exist?("rab-a-dub").should be_false
+        end
       end
 
       it "should increment a key" do
-        3.times { @store.increment "counter" }
-        @store.read("counter", :raw => true).to_i.should == 3
+        with_store_management do |store|
+          3.times { store.increment "counter" }
+          store.read("counter", :raw => true).to_i.should == 3
+        end
       end
 
       it "should decrement a key" do
-        3.times { @store.increment "counter" }
-        2.times { @store.decrement "counter" }
-        @store.read("counter", :raw => true).to_i.should == 1
+        with_store_management do |store|
+          3.times { store.increment "counter" }
+          2.times { store.decrement "counter" }
+          store.read("counter", :raw => true).to_i.should == 1
+        end
       end
 
       it "should increment a key by given value" do
-        @store.increment "counter", 3
-        @store.read("counter", :raw => true).to_i.should == 3
+        with_store_management do |store|
+          store.increment "counter", 3
+          store.read("counter", :raw => true).to_i.should == 3
+        end
       end
 
       it "should decrement a key by given value" do
-        3.times { @store.increment "counter" }
-        @store.decrement "counter", 2
-        @store.read("counter", :raw => true).to_i.should == 1
+        with_store_management do |store|
+          3.times { store.increment "counter" }
+          store.decrement "counter", 2
+          store.read("counter", :raw => true).to_i.should == 1
+        end
       end
 
       it "should clear the store" do
-        @store.clear
-        @store.instance_variable_get(:@data).keys("*").should be_empty
+        with_store_management do |store|
+          store.clear
+          store.instance_variable_get(:@data).keys("*").should be_empty
+        end
       end
 
       it "should return store stats" do
-        @store.stats.should_not be_empty
-      end
-
-      # it "should fetch data" do
-      #   @store.fetch("rabbit").should == @rabbit
-      #   @store.fetch("rab-a-dab").should be_nil
-      #   @store.fetch("rab-a-dab") { "Flora de Cana" }
-      #   @store.fetch("rab-a-dab").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
-      # end
+        with_store_management do |store|
+          store.stats.should_not be_empty
+        end
+      end
+
+      it "should fetch data" do
+        with_store_management do |store|
+          store.fetch("rabbit").should == @rabbit
+          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, :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(address = nil)
           RedisStore.new(address).instance_variable_get(:@data)
         end
+
+        def with_store_management
+          yield @store
+          yield @dstore
+        end
     end
   end
 end

data/spec/config/master.conf

@@ -0,0 +1,87 @@
+# Redis configuration file example
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize yes
+
+# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
+# You can specify a custom pid file location here.
+pidfile ./tmp/redis-master.pid
+
+# Accept connections on the specified port, default is 6379
+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
+
+# Close the connection after a client is idle for N seconds
+timeout 300
+
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+save 900 1
+save 300 10
+save 60 10000
+
+# For default save/load DB in/from the working directory
+# Note that you must specify a directory not a file name.
+dir ./tmp
+
+# Set server verbosity to 'debug'
+# it can be one of:
+# debug (a lot of information, useful for development/testing)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel debug
+
+# Specify the log file name. Also 'stdout' can be used to force
+# the demon to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile stdout
+
+# Set the number of databases.
+databases 16
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. Note that the configuration is local to the slave
+# 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 <masterip> <masterport>
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+
+# requirepass foobared
+
+############################### ADVANCED CONFIG ###############################
+
+# Glue small output buffers together in order to send small replies in a
+# single TCP packet. Uses a bit more CPU but most of the times it is a win
+# in terms of number of queries per second. Use 'yes' if unsure.
+glueoutputbuf yes
+
+# Use object sharing. Can save a lot of memory if you have many common
+# 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.
+shareobjects no

data/spec/config/single.conf

@@ -0,0 +1,87 @@
+# Redis configuration file example
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize yes
+
+# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
+# You can specify a custom pid file location here.
+pidfile ./tmp/redis-single.pid
+
+# Accept connections on the specified port, default is 6379
+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
+
+# Close the connection after a client is idle for N seconds
+timeout 300
+
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+save 900 1
+save 300 10
+save 60 10000
+
+# For default save/load DB in/from the working directory
+# Note that you must specify a directory not a file name.
+dir ./tmp
+
+# Set server verbosity to 'debug'
+# it can be one of:
+# debug (a lot of information, useful for development/testing)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel debug
+
+# Specify the log file name. Also 'stdout' can be used to force
+# the demon to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile stdout
+
+# Set the number of databases.
+databases 16
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. Note that the configuration is local to the slave
+# 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 <masterip> <masterport>
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+
+# requirepass foobared
+
+############################### ADVANCED CONFIG ###############################
+
+# Glue small output buffers together in order to send small replies in a
+# single TCP packet. Uses a bit more CPU but most of the times it is a win
+# in terms of number of queries per second. Use 'yes' if unsure.
+glueoutputbuf yes
+
+# Use object sharing. Can save a lot of memory if you have many common
+# 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.
+shareobjects no

data/spec/config/slave.conf

@@ -0,0 +1,87 @@
+# Redis configuration file example
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize yes
+
+# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
+# You can specify a custom pid file location here.
+pidfile ./tmp/redis-slave.pid
+
+# Accept connections on the specified port, default is 6379
+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
+
+# Close the connection after a client is idle for N seconds
+timeout 300
+
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+save 900 1
+save 300 10
+save 60 10000
+
+# For default save/load DB in/from the working directory
+# Note that you must specify a directory not a file name.
+dir ./tmp
+
+# Set server verbosity to 'debug'
+# it can be one of:
+# debug (a lot of information, useful for development/testing)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel debug
+
+# Specify the log file name. Also 'stdout' can be used to force
+# the demon to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile stdout
+
+# Set the number of databases.
+databases 16
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. Note that the configuration is local to the slave
+# 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
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+
+# requirepass foobared
+
+############################### ADVANCED CONFIG ###############################
+
+# Glue small output buffers together in order to send small replies in a
+# single TCP packet. Uses a bit more CPU but most of the times it is a win
+# in terms of number of queries per second. Use 'yes' if unsure.
+glueoutputbuf yes
+
+# Use object sharing. Can save a lot of memory if you have many common
+# 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.
+shareobjects no

data/spec/redis/distributed_marshaled_redis_spec.rb

@@ -2,7 +2,10 @@ require File.join(File.dirname(__FILE__), "/../spec_helper")
 
 describe "DistributedMarshaledRedis" do
   before(:each) do
-    @dmr = DistributedMarshaledRedis.new [{:db => 0}, {:db => 1}]
+    @dmr = DistributedMarshaledRedis.new [
+      {:host => "localhost", :port => "6380", :db => 0},
+      {:host => "localhost", :port => "6381", :db => 0}
+    ]
     @rabbit = OpenStruct.new :name => "bunny"
     @white_rabbit = OpenStruct.new :color => "white"
     @dmr.set "rabbit", @rabbit
@@ -13,11 +16,11 @@ describe "DistributedMarshaledRedis" do
   end
 
   it "should accept connection params" do
-    dmr = DistributedMarshaledRedis.new [ :host => "redis.com", :port => "3680", :db => 1 ]
+    dmr = DistributedMarshaledRedis.new [ :host => "redis.com", :port => "6380", :db => 1 ]
     dmr.ring.should have(1).node
     mr = dmr.ring.nodes.first
     mr.host.should == "redis.com"
-    mr.port.should == "3680"
+    mr.port.should == "6380"
     mr.instance_variable_get(:@db).should == 1
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jodosha-redis-rails
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Luca Guidi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-11 00:00:00 -07:00
+date: 2009-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -31,6 +31,9 @@ files:
 - lib/redis/marshaled_redis.rb
 - redis-rails.gemspec
 - spec/active_support/cache/redis_store_spec.rb
+- spec/config/master.conf
+- spec/config/single.conf
+- spec/config/slave.conf
 - spec/redis/distributed_marshaled_redis_spec.rb
 - spec/redis/marshaled_redis_spec.rb
 - spec/spec_helper.rb