redis-store 0.3.6 → 0.3.7

data/.gitignore

@@ -0,0 +1,7 @@
+*.rdb
+*.swp
+bin/
+coverage/
+pkg/
+vendor/
+tmp/

data/Gemfile

@@ -0,0 +1,9 @@
+# use ezmobius/redis-rb HEAD
+gem "redis-rb", "0.1", :git => "git://github.com/ezmobius/redis-rb.git"
+
+# testing gems
+gem "rspec",                :only => :testing
+gem "rack-cache",           :only => :testing
+gem "activesupport",        :only => :testing
+gem "merb",                 :only => :testing
+

data/README.md

@@ -0,0 +1,105 @@
+# Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks
+
+## Installation
+
+Download and install Redis from [http://code.google.com/p/redis/](http://code.google.com/p/redis/)
+
+    curl -OL http://redis.googlecode.com/files/redis-1.02.tar.gz
+    tar -zxvf redis-1.02.tar.gz
+    mv redis-1.02 redis
+    cd redis
+    make
+
+Install the gems
+
+    sudo gem install redis-rb redis-store
+
+## Cache store
+
+Provides a cache store for your Ruby web framework of choice.
+
+### Rails
+
+    config.gem "redis-store", :source => "http://gemcutter.org", :lib => "redis-store"
+    require "redis-store"
+    config.cache_store = :redis_store
+
+### Merb
+
+    dependency "redis-store", "0.3.7"
+    dependency("merb-cache", merb_gems_version) do
+      Merb::Cache.setup do
+        register(:redis, Merb::Cache::RedisStore, :servers => ["127.0.0.1:6379"])
+      end
+    end
+
+### Sinatra
+
+    require "sinatra"
+    require "redis-store"
+    class MyApp < Sinatra::Base
+      register Sinatra::Cache
+      get "/hi" do
+        cache.fetch("greet") { "Hello, World!" }
+      end
+    end
+
+## Rack::Session
+
+Provides a Redis store for Rack::Session. See [http://rack.rubyforge.org/doc/Rack/Session.html](http://rack.rubyforge.org/doc/Rack/Session.html)
+
+### Rack application
+
+    require "rack"
+    require "redis-store"
+    require "application"
+    use Rack::Session::Redis
+    run Application.new
+
+### Rails
+
+    config.gem "redis-store", :source => "http://gemcutter.org", :lib => "redis-store"
+    ActionController::Base.session_store = Rack::Session::Redis
+
+### Merb
+
+    dependency "redis-store", "0.3.7"
+    Merb::Config.use do |c|
+      c[:session_store] = "redis"
+    end
+    Merb::BootLoader.before_app_loads do
+      Merb::SessionContainer.subclasses << "Merb::RedisSession"
+    end
+
+### Sinatra
+
+Sorry, but Sinatra application boot system [hardcode](http://github.com/sinatra/sinatra/blob/0f02bafe86f8dd9bba9ab425468cb1067caa83ff/lib/sinatra/base.rb#L785) `Rack::Session::Cookie`
+
+## Rack::Cache
+
+Provides a Redis store for HTTP caching. See [http://github.com/rtomayko/rack-cache](http://github.com/rtomayko/rack-cache)
+
+    require "rack"
+    require "rack/cache"
+    require "redis-store"
+    require "application"
+    use Rack::Cache,
+      :metastore   => 'redis://localhost:6379/0',
+      :entitystore => 'redis://localhost:6380/1'
+    run Application.new
+
+## Running specs
+
+    gem install jeweler bundler
+    git clone git://github.com/jodosha/redis-store.git
+    cd redis-store
+    gem bundle
+    rake dtach:install
+    rake redis:install
+    rake
+
+If you are on **Snow Leopard** you have to run `env ARCHFLAGS="-arch x86_64" gem bundle`
+
+## Copyright
+
+(c) 2009 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license

data/Rakefile

@@ -1,58 +1,57 @@
 $:.unshift 'lib'
-require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'spec/rake/spectask'
 
-REDIS_STORE_VERSION = "0.3.6"
-
-task :default => :spec
+task :default => "spec:suite"
+
+begin
+  require "jeweler"
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name        = "redis-store"
+    gemspec.summary     = "Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks."
+    gemspec.description = "Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks."
+    gemspec.email       = "guidi.luca@gmail.com"
+    gemspec.homepage    = "http://github.com/jodosha/redis-store"
+    gemspec.authors     = [ "Luca Guidi" ]
+  end
 
-desc 'Build and install the gem (useful for development purposes).'
-task :install do
-  system "gem build redis-store.gemspec"
-  system "sudo gem uninstall redis-store"
-  system "sudo gem install --local --no-rdoc --no-ri redis-store-#{REDIS_STORE_VERSION}.gem"
-  system "rm redis-store-*.gem"
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install jeweler" 
 end
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = %w(-fs --color)
-end
+namespace :spec do
+  desc "Run all the examples by starting a detached Redis instance"
+  task :suite do
+    invoke_with_redis_cluster "spec:run"
+  end
 
-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}"
+  Spec::Rake::SpecTask.new(:run) do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = %w(-fs --color)
+  end
 end
 
 desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new(:rcov) do |t|
+task :rcov do
+  invoke_with_redis_cluster "rcov_run"
+end
+
+Spec::Rake::SpecTask.new(:rcov_run) 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
-    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/*" rescue nil
+# courtesy of http://github.com/ezmobius/redis-rb team
+load "tasks/redis.tasks.rb"
+def invoke_with_redis_cluster(task_name)
+  begin
+    result = RedisClusterRunner.start_detached
+    raise("Could not start redis-server, aborting.") unless result
+    Rake::Task[task_name].invoke
+  ensure
+    RedisClusterRunner.stop
   end
 end

data/VERSION

@@ -0,0 +1 @@
+0.3.7

data/lib/redis/marshaled_redis.rb

@@ -10,7 +10,7 @@ class MarshaledRedis < Redis
   end
 
   def get(key, options = nil)
-    result = super key
+    result = call_command([:get, key])
     result = Marshal.load result if unmarshal?(result, options)
     result
   end

data/redis-store.gemspec

@@ -1,14 +1,80 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
-  s.name               = "redis-store"
-  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_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"]
+  s.name = %q{redis-store}
+  s.version = "0.3.7"
+
+  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.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 = [
+    "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     "Gemfile",
+     "MIT-LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "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",
+     "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.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_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/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
 end

data/spec/cache/merb/redis_store_spec.rb

@@ -120,14 +120,14 @@ module Merb
       it "should delete all the data" do
         with_store_management do |store|
           store.delete_all
-          store.instance_variable_get(:@data).keys("*").should be_empty
+          store.instance_variable_get(:@data).keys("*").flatten.should be_empty
         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
+          store.instance_variable_get(:@data).keys("*").flatten.should be_empty
         end
       end
 

data/spec/cache/rails/redis_store_spec.rb

@@ -136,7 +136,7 @@ module ActiveSupport
       it "should clear the store" do
         with_store_management do |store|
           store.clear
-          store.instance_variable_get(:@data).keys("*").should be_empty
+          store.instance_variable_get(:@data).keys("*").flatten.should be_empty
         end
       end
 

data/spec/cache/sinatra/redis_store_spec.rb

@@ -157,7 +157,7 @@ module Sinatra
       it "should clear the store" do
         with_store_management do |store|
           store.clear
-          store.instance_variable_get(:@data).keys("*").should be_empty
+          store.instance_variable_get(:@data).keys("*").flatten.should be_empty
         end
       end
 

data/spec/config/master.conf

@@ -2,11 +2,11 @@
 
 # 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
+daemonize no
 
 # 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
+pidfile /var/run/redis.pid
 
 # Accept connections on the specified port, default is 6379
 port 6380
@@ -14,7 +14,7 @@ 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 (0 to disable)
 timeout 300
@@ -35,11 +35,11 @@ save 300 10
 save 60 10000
 
 # The filename where to dump the DB
-dbfilename master.rdb
+dbfilename master-dump.rdb
 
 # For default save/load DB in/from the working directory
 # Note that you must specify a directory not a file name.
-dir ./tmp
+dir ./
 
 # Set server verbosity to 'debug'
 # it can be one of:
@@ -107,6 +107,45 @@ databases 16
 
 # maxmemory <bytes>
 
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. If you can live
+# with the idea that the latest records will be lost if something like a crash
+# happens this is the preferred way to run Redis. If instead you care a lot
+# about your data and don't want to that a single record can get lost you should
+# enable the append only mode: when this mode is enabled Redis will append
+# every write operation received in the file appendonly.log. This file will
+# be read on startup in order to rebuild the full dataset in memory.
+#
+# Note that you can have both the async dumps and the append only file if you
+# like (you have to comment the "save" statements above to disable the dumps).
+# Still if append only mode is enabled Redis will load the data from the
+# log file at startup ignoring the dump.rdb file.
+#
+# The name of the append only file is "appendonly.log"
+
+appendonly no
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead to wait for more data in the output buffer. Some OS will really flush 
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log . Slow, Safest.
+# everysec: fsync only if one second passed since the last fsync. Compromise.
+#
+# The default is "always" that's the safer of the options. It's up to you to
+# understand if you can relax this to "everysec" that will fsync every second
+# or to "no" that will let the operating system flush the output buffer when
+# it want, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting).
+
+appendfsync always
+# appendfsync everysec
+# appendfsync no
+
 ############################### ADVANCED CONFIG ###############################
 
 # Glue small output buffers together in order to send small replies in a

data/spec/config/single.conf

@@ -2,11 +2,11 @@
 
 # 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
+daemonize no
 
 # 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
+pidfile /var/run/redis.pid
 
 # Accept connections on the specified port, default is 6379
 port 6379
@@ -14,10 +14,10 @@ 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 (0 to disable)
-timeout 5
+timeout 300
 
 # Save the DB on disk:
 #
@@ -35,11 +35,11 @@ save 300 10
 save 60 10000
 
 # The filename where to dump the DB
-dbfilename single.rdb
+dbfilename dump.rdb
 
 # For default save/load DB in/from the working directory
 # Note that you must specify a directory not a file name.
-dir ./tmp
+dir ./
 
 # Set server verbosity to 'debug'
 # it can be one of:
@@ -107,6 +107,45 @@ databases 16
 
 # maxmemory <bytes>
 
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. If you can live
+# with the idea that the latest records will be lost if something like a crash
+# happens this is the preferred way to run Redis. If instead you care a lot
+# about your data and don't want to that a single record can get lost you should
+# enable the append only mode: when this mode is enabled Redis will append
+# every write operation received in the file appendonly.log. This file will
+# be read on startup in order to rebuild the full dataset in memory.
+#
+# Note that you can have both the async dumps and the append only file if you
+# like (you have to comment the "save" statements above to disable the dumps).
+# Still if append only mode is enabled Redis will load the data from the
+# log file at startup ignoring the dump.rdb file.
+#
+# The name of the append only file is "appendonly.log"
+
+appendonly no
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead to wait for more data in the output buffer. Some OS will really flush 
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log . Slow, Safest.
+# everysec: fsync only if one second passed since the last fsync. Compromise.
+#
+# The default is "always" that's the safer of the options. It's up to you to
+# understand if you can relax this to "everysec" that will fsync every second
+# or to "no" that will let the operating system flush the output buffer when
+# it want, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting).
+
+appendfsync always
+# appendfsync everysec
+# appendfsync no
+
 ############################### ADVANCED CONFIG ###############################
 
 # Glue small output buffers together in order to send small replies in a

data/spec/config/slave.conf

@@ -2,11 +2,11 @@
 
 # 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
+daemonize no
 
 # 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
+pidfile /var/run/redis.pid
 
 # Accept connections on the specified port, default is 6379
 port 6381
@@ -14,7 +14,7 @@ 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 (0 to disable)
 timeout 300
@@ -35,11 +35,11 @@ save 300 10
 save 60 10000
 
 # The filename where to dump the DB
-dbfilename slave.rdb
+dbfilename slave-dump.rdb
 
 # For default save/load DB in/from the working directory
 # Note that you must specify a directory not a file name.
-dir ./tmp
+dir ./
 
 # Set server verbosity to 'debug'
 # it can be one of:
@@ -65,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 localhost 6380 
 
 ################################## SECURITY ###################################
 
@@ -107,6 +107,45 @@ slaveof 127.0.0.1 6380
 
 # maxmemory <bytes>
 
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. If you can live
+# with the idea that the latest records will be lost if something like a crash
+# happens this is the preferred way to run Redis. If instead you care a lot
+# about your data and don't want to that a single record can get lost you should
+# enable the append only mode: when this mode is enabled Redis will append
+# every write operation received in the file appendonly.log. This file will
+# be read on startup in order to rebuild the full dataset in memory.
+#
+# Note that you can have both the async dumps and the append only file if you
+# like (you have to comment the "save" statements above to disable the dumps).
+# Still if append only mode is enabled Redis will load the data from the
+# log file at startup ignoring the dump.rdb file.
+#
+# The name of the append only file is "appendonly.log"
+
+appendonly no
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead to wait for more data in the output buffer. Some OS will really flush 
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log . Slow, Safest.
+# everysec: fsync only if one second passed since the last fsync. Compromise.
+#
+# The default is "always" that's the safer of the options. It's up to you to
+# understand if you can relax this to "everysec" that will fsync every second
+# or to "no" that will let the operating system flush the output buffer when
+# it want, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting).
+
+appendfsync always
+# appendfsync everysec
+# appendfsync no
+
 ############################### ADVANCED CONFIG ###############################
 
 # Glue small output buffers together in order to send small replies in a

data/spec/redis/marshaled_redis_spec.rb

@@ -2,48 +2,53 @@ require File.join(File.dirname(__FILE__), "/../spec_helper")
 
 describe "MarshaledRedis" do
   before(:each) do
-    @mr = MarshaledRedis.new
+    @store = MarshaledRedis.new
     @rabbit = OpenStruct.new :name => "bunny"
     @white_rabbit = OpenStruct.new :color => "white"
-    @mr.set    "rabbit", @rabbit
-    @mr.delete "rabbit2"
+    @store.set    "rabbit", @rabbit
+    @store.delete "rabbit2"
+  end
+
+  after :each do
+    @store.quit
   end
 
   it "should unmarshal an object on get" do
-    @mr.get("rabbit").should === @rabbit
+    @store.get("rabbit").should === @rabbit
   end
 
   it "should marshal object on set" do
-    @mr.set "rabbit", @white_rabbit
-    @mr.get("rabbit").should === @white_rabbit
+    @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
-    @mr.get("rabbit", :raw => true).should == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
+    @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
-    @mr.set "rabbit", @white_rabbit, :raw => true
-    @mr.get("rabbit", :raw => true).should == %(#<OpenStruct color="white">)
+    @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
-    @mr.set "empty_string", ""
-    lambda { @mr.get("empty_string").should == "" }.should_not raise_error
+    @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
-    @mr.set_unless_exists "rabbit", @white_rabbit
-    @mr.get("rabbit").should === @rabbit
+    @store.set_unless_exists "rabbit", @white_rabbit
+    @store.get("rabbit").should === @rabbit
   end
 
   it "should marshal object on set_unless_exists" do
-    @mr.set_unless_exists "rabbit2", @white_rabbit
-    @mr.get("rabbit2").should === @white_rabbit
+    @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
-    @mr.set_unless_exists "rabbit2", @white_rabbit, :raw => true
-    @mr.get("rabbit2", :raw => true).should == %(#<OpenStruct color="white">)
+    @store.set_unless_exists "rabbit2", @white_rabbit, :raw => true
+    @store.get("rabbit2", :raw => true).should == %(#<OpenStruct color="white">)
   end
 end
+

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 $: << File.join(File.dirname(__FILE__), "/../lib")
-require "rubygems"
+require "vendor/gems/environment"
 require "ostruct"
 require "spec"
 require "redis"
@@ -14,3 +14,4 @@ require "cache/sinatra/redis_store"
 
 class Redis; attr_reader :host, :port, :db end
 $DEBUG = ENV["DEBUG"] === "true"
+

data/tasks/redis.tasks.rb

@@ -0,0 +1,67 @@
+# 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
+
+class RedisRunner
+  def self.port
+    6379
+  end
+
+  def self.stop
+    system %(echo "SHUTDOWN" | nc localhost #{port})
+  end
+end
+
+class SingleRedisRunner < RedisRunner
+  def self.redisconfdir
+    File.expand_path(File.dirname(__FILE__) + "/../spec/config/single.conf")
+  end
+end
+
+class MasterRedisRunner < RedisRunner
+  def self.redisconfdir
+    File.expand_path(File.dirname(__FILE__) + "/../spec/config/master.conf")
+  end
+
+  def self.dtach_socket
+    "/tmp/redis_master.dtach"
+  end
+
+  def self.port
+    6380
+  end
+end
+
+class SlaveRedisRunner < RedisRunner
+  def self.redisconfdir
+    File.expand_path(File.dirname(__FILE__) + "/../spec/config/slave.conf")
+  end
+
+  def self.dtach_socket
+    "/tmp/redis_slave.dtach"
+  end
+
+  def self.port 
+    6381
+  end
+end
+
+class RedisClusterRunner
+  def self.runners
+    [ SingleRedisRunner, MasterRedisRunner, SlaveRedisRunner ]
+  end
+
+  def self.start_detached
+    runners.each do |runner|
+      runner.start_detached
+    end
+  end
+
+  def self.stop
+    runners.each do |runner|
+      runner.stop
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: redis-store
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Luca Guidi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 +02:00
+date: 2009-11-15 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -20,11 +20,14 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
+- README.md
 files: 
+- .gitignore
+- Gemfile
 - MIT-LICENSE
-- README.textile
+- README.md
 - Rakefile
+- VERSION
 - lib/cache/merb/redis_store.rb
 - lib/cache/rails/redis_store.rb
 - lib/cache/sinatra/redis_store.rb
@@ -51,13 +54,14 @@ files:
 - spec/redis/marshaled_redis_spec.rb
 - spec/redis/redis_factory_spec.rb
 - spec/spec_helper.rb
+- tasks/redis.tasks.rb
 has_rdoc: true
-homepage: http://lucaguidi.com
+homepage: http://github.com/jodosha/redis-store
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -89,3 +93,4 @@ test_files:
 - spec/redis/distributed_marshaled_redis_spec.rb
 - spec/redis/marshaled_redis_spec.rb
 - spec/redis/redis_factory_spec.rb
+- spec/spec_helper.rb

data/README.textile

@@ -1,102 +0,0 @@
-h1. Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks
-
-h2. Installation
-
-Download and install Redis from "http://code.google.com/p/redis/":http://code.google.com/p/redis/
-
-  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-
-  
-  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
-
-Provides a cache store for your Ruby web framework of choice.
-
-h3. How to use with Rails
-
-  config.gem "jodosha-redis-store", :source => "http://gems.github.com", :lib => "redis-store"
-  require "redis-store"
-  config.cache_store = :redis_store
-
-h3. How to use with Merb
-
-  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"])
-    end
-  end
-
-h3. How to use with Sinatra
-
-  require 'rubygems'
-  require 'sinatra'
-  require 'jodosha-redis-store'
-  class MyApp < Sinatra::Base
-    register Sinatra::Cache
-    get '/hi' do
-      cache.fetch("greet") { "Hello, World!" }
-    end
-  end
-
-h2. Rack::Session
-
-Provides a Redis store for Rack::Session. See "http://rack.rubyforge.org/doc/Rack/Session.html":http://rack.rubyforge.org/doc/Rack/Session.html
-
-h3. How to use with a generic Rack application
-
-  require "rubygems"
-  require "rack"
-  require "jodosha-redis-store"
-  require "application"
-  use Rack::Session::Redis
-  run Application.new
-
-h3. How to use with Rails
-
-  config.gem "jodosha-redis-store", :source => "http://gems.github.com", :lib => "redis-store"
-  ActionController::Base.session_store = Rack::Session::Redis
-
-h3. How to use with Merb
-
-  dependency "jodosha-redis-store", "0.3.6"
-  Merb::Config.use do |c|
-    c[:session_store] = 'redis'
-  end
-  Merb::BootLoader.before_app_loads do
-    Merb::SessionContainer.subclasses << "Merb::RedisSession"
-  end
-
-h3. How to use with Sinatra
-
-Sorry, but Sinatra application boot system "hardcode":http://github.com/sinatra/sinatra/blob/0f02bafe86f8dd9bba9ab425468cb1067caa83ff/lib/sinatra/base.rb#L785 Rack::Session::Cookie
-
-h2. Rack::Cache
-
-Provides a Redis store for HTTP caching. See "http://github.com/rtomayko/rack-cache":http://github.com/rtomayko/rack-cache
-
-  require "rubygems"
-  require "rack"
-  require "rack/cache"
-  require "jodosha-redis-store"
-  require "application"
-  use Rack::Cache,
-    :metastore   => 'redis://localhost:6379/0',
-    :entitystore => 'redis://localhost:6380/1'
-  run Application.new
-
-h2. Copyright
-
-(c) 2009 Luca Guidi - "http://lucaguidi.com":http://lucaguidi.com, released under the MIT license