redis-store 1.0.0.beta1 → 1.0.0.beta2

data/CHANGELOG

@@ -0,0 +1,211 @@
+*1.0.0 [beta2] (June 12, 2010)*
+
+  * Bump version v1.0.0.beta2
+  * Added committers names to CHANGELOG
+  * Added CHANGELOG
+  * Rake namespace: redis_cluster => redis:cluster
+  * Fixed Rails 3 failing spec
+  * Added ActiveSupport
+  * Enabled notifications for ActiveSupport
+  * Moved spec
+  * Use consinstent Rails 3 check in session store
+  * Make sure of use top-level module
+  * Updated Rails 2.x development dependencies
+
+*1.0.0 [beta1] (June 10, 2010)*
+
+  * Bump version v1.0.0.beta1
+  * Made specs pass for Ruby 1.9.1
+  * Updated instructions to test against Rails 3.x
+  * Updated copyright year
+  * Prepare for v1.0.0.beta1
+  * Use Rails v3.0.0.beta4
+  * Require redis >= 2.0.0 gem in Gemfile
+  * Updated instructions for Rails 2 session store
+  * Added instructions for Rails 3 configuration
+  * Check against Rails#version instead of Rails
+  * Added redis gem as dependency
+  * Changed spec_helper.rb according to the new Rails 3 check
+  * Fix the rails3 check [Bruno Michel]
+  * Added bundler cleanup Rake task
+  * Fixed ActiveSupport
+  * Re-enabled redis:console Rake task
+  * Don't use Rspec#have with ActiveSupport 3
+  * Fixed Rails 2 regression for ActiveSupport
+  * Fixed issues for ActiveSupport
+  * Rails 3 namespace
+  * Use Rails edge instead of 3.0.0.beta3
+  * Made the specs run again
+  * Updated Gemfile development/test dependecies for rails3.
+  * Updated README instructions
+  * Updated test configuration files, according to redis-2.0.0-rc1 defaults
+  * Made specs pass with redis-2.0.0 gem
+  * Don't support the old redis-rb namespace
+  * Import the whole redis-rb old Rake tasks
+  * Updated redis-rb dependency
+
+*0.3.8 [Final] (May 21, 2010)*
+
+  * Fixed gemspec executable issue
+  * Updated .gemspec
+  * Version bump to 0.3.8
+  * Started namespace migration for redis-2.0.0
+  * Merge branch 'master' of http://github.com/akahn/redis-store
+  * Fixed dependency issues. [Brian Takita]
+  * Removed methodpara because it require ruby 1.9.1. [Brian Takita]
+  * Merge branch 'master' of http://github.com/dsander/redis-store [Brian Takita]
+  * Moved RedisSessionStore to rack session directory. [Brian Takita]
+  * Got RedisSessionStore working with passing specs. [Brian Takita]
+  * Using modified version of RedisSessionStore (http://github.com/mattmatt/redis-session-store). Still needs testing. [Brian Takita]
+  * Using redis 1.0.5. [Brian Takita]
+  * Ignoring gem files and gemspecs with a prefix. [Brian Takita]
+  * Added git and jeweler to dependencies. [Brian Takita]
+  * Ignoring .bundle and rubymine files. [Brian Takita]
+  * Added ability to add a prefix to the gem name via the GEM_PREFIX environment variable. [Brian Takita]
+  * Fixed marshalling issues with the new Redis api. Fixed redis-server configurations for the latest version of redis-server. Added redis_cluster:start and redis_cluster:stop rake tasks. Spec suite passes. [Brian Takita]
+  * Fixed redis deprecation warnings. [Brian Takita]
+  * Using redis 1.0.4. Loading redis.tasks.rb from redis gem using Bundler. Fixed redis test configurations. [Brian Takita]
+  * Supports redis 1.0.5 [Dominik Sander]
+  * Add Rack [Alexander Kahn]
+  * Updated development and testing dependencies
+  * Made compatible with rack-cache-0.5.2
+
+*0.3.7 [Final] (November 15, 2009)*
+
+  * Version bump to 0.3.7
+  * Version bump to 0.3.7
+  * Updated spec instructions in README
+  * Jeweler generated redis-store.gemspec
+  * Removed no longer used Rake tasks. Added Gemcutter support via Jeweler.
+  * Typo
+  * Let Rcov task run with the Redis cluster started
+  * Make spec suite pass again
+  * README.textile -> README.md
+  * Re-enabled Merb specs
+  * Added *.rdb in .gitignore
+  * Run detached Redis instances for spec suite
+  * Start detached Redis server for specs
+  * Added Gemfile, removed rubygems dependecy for testing.
+  * Added *.swp to .gitignore
+  * Added jeweler rake tasks
+  * Make it work in classic Sinatra apps. [Dmitriy Timokhin]
+  * Updated README with new instructions about redis-rb
+
+*0.3.6 [Final] (June 18, 2009)*
+
+  * Prepare for v0.3.6
+  * Updated README with new version
+  * Changed Redis config files for specs
+  * Updated README instructions
+  * New filelist in gemspec
+  * Fixed typo in spec
+  * Don't try to unmarshal empty strings
+  * Running specs according to the DEBUG env var
+  * Added specs for uncovered Merb Cache API
+  * Added rcov Rake task
+  * Fix README
+  * Fix typo in README
+  * Updated README instructions
+  * Removed RedisError catching
+  * Declaring for now RedisError in spec_helper.rb
+  * Removed unnecessary classes
+  * Fix specs for DistributedMarshaledRedis
+  * Fix some specs
+  * Made Server#notify_observers private
+  * Ensure to select the correct database after the socket connection
+  * Reverted socket pooling. Ensure to always return an active socket.
+  * Lowering default timeout from 10 to 0.1
+
+*0.3.5 [Final] (May 7, 2009)*
+
+  * Prepare for v0.3.5
+  * Totally replace ezmobius-redis-rb Server implementation
+  * Fixed default Server timeout to 1 second
+  * Little refactoring
+  * Ensure Server#active? always returns a boolean and never raise an exception
+  * Made configurable connection pool timeout and size
+  * Socket connection pooling
+  * Updated README
+
+*0.3.0 [Final] (May 3, 2009)*
+
+  * Prepare for v0.3.0
+  * README formatting issues
+  * README formatting (again)
+  * README formatting
+  * Updated Rack
+  * Make Rack
+  * Added instructions for Rack
+  * Expiration support for Rack
+  * Ensure to test Rails and Sinatra expiration implementations with both MarshaledRedis and DistrbutedMarshaledRedis
+  * Expiration support for Merb
+  * Use full qualified class names in specs. Minor spec fix.
+  * Ported for foreword compatibility the expiration implementation from ezmobius/redis-rb
+  * Little spec cleanup
+  * Full support for Rack
+  * Extracted some logic into RedisFactory
+  * Initial support for Rack
+
+*0.2.0 [Final] (April 30, 2009)*
+
+  * Prepare for v0.2.0
+  * Links in README
+  * Maybe someday I will use the right formating rules at first attempt
+  * Still formatting README
+  * Formatting for README
+  * Updated instructions for Rack
+  * Don't require any cache store if no Ruby framework is detected
+  * Implemented EntityStore for Rack
+  * Added REDIS constant for Rack
+  * MetaStore implementation for Rack
+
+*0.1.0 [Final] (April 30, 2009)*
+
+  * Prepare for v0.1.0
+  * Sinatra cache support
+
+*0.0.3 [Final] (April 30, 2009)*
+
+  * Prepare for v0.0.3
+  * Updated instructions for Merb
+  * Hack for Merb cyclic dependency
+  * Renaming main lib
+  * Merb store #writable always returns true. Added pending test.
+  * Merb store #fetch refactoring
+  * Updated Redis installation instructions
+  * Implemented #fetch for Merb store
+  * Implemented #exists?, #delete and #delete_all for Merb cache store
+  * Renamed project name in Rakefile
+  * Updated project name in README
+  * Updated README with Merb instructions
+  * Changed name in gemspec
+  * New gemspec
+  * Initial cache store support for Merb
+  * Moving files around
+  * Don't complain about missing db in tmp/
+
+*0.0.2 [Final] (April 16, 2009)*
+
+  * Prepare for v0.0.2
+  * Updated file list in gemspec
+  * Updated README instructions
+  * Re-enabled spec for RedisStore#fetch
+  * Update rdoc
+  * Fix RedisStore#clear when use a cluster
+  * Test RedisStore both with single server and with a cluster
+  * Fix port in DistributedMarshaledRedis spec
+  * Don't slave Redis cluster node
+  * Changed Redis cluster configuration
+  * Added configuration for Redis cluster
+  * Use a distributed system if the store uses more than one server
+  * Accept params for client connection
+
+*0.0.1 [Final] (April 11, 2009)*
+
+  * Added :unless_exist option to #write
+  * Added failing specs for :expires_in option
+  * Made optional args compatible with the Cache interface
+  * Implemented #delete_matched, #clear, #stats
+  * Implemented #delete, #exist?, #increment, #decrement
+  * Introduced RedisStore
+  * Initial import

data/Gemfile

@@ -7,6 +7,7 @@ group :development do
 end
 
 group :development, :test, :rails3 do
+  gem "rack"
   gem "ruby-debug"
   gem "rspec"
   gem "rack-cache"
@@ -16,14 +17,12 @@ end
 
 if ENV["REDIS_STORE_ENV"] == "rails3"
   group :rails3 do
-    gem "rack", "1.1.0"
     gem "activesupport", "3.0.0.beta4"
     gem "actionpack", "3.0.0.beta4"
   end
 else
   group :test do
-    gem "rack", "1.0.0"
-    gem "activesupport", "2.3.5"
-    gem "actionpack", "2.3.5"
+    gem "activesupport", "2.3.8"
+    gem "actionpack", "2.3.8"
   end
 end

data/README.md

@@ -28,14 +28,14 @@ Provides a cache store for your Ruby web framework of choice.
     # Gemfile
     gem 'rails', '3.0.0.beta4'
     gem 'redis'
-    gem 'redis-store', '1.0.0.beta1'
+    gem 'redis-store', '1.0.0.beta2'
 
     # config/environments/production.rb
     config.cache_store = :redis_store
 
 ### Merb
 
-    dependency "redis-store", "1.0.0.beta1"
+    dependency "redis-store", "1.0.0.beta2"
     dependency("merb-cache", merb_gems_version) do
       Merb::Cache.setup do
         register(:redis, Merb::Cache::RedisStore, :servers => ["127.0.0.1:6379"])
@@ -75,14 +75,14 @@ Provides a Redis store for Rack::Session. See [http://rack.rubyforge.org/doc/Rac
     # Gemfile
     gem 'rails', '3.0.0.beta4'
     gem 'redis'
-    gem 'redis-store', '1.0.0.beta1'
+    gem 'redis-store', '1.0.0.beta2'
 
     # config/initializers/session_store.rb
     Rails.application.config.session_store :redis_session_store
 
 ### Merb
 
-    dependency "redis-store", "1.0.0.beta1"
+    dependency "redis-store", "1.0.0.beta2"
     Merb::Config.use do |c|
       c[:session_store] = "redis"
     end

data/Rakefile

@@ -47,32 +47,10 @@ Spec::Rake::SpecTask.new(:rcov_run) do |t|
   t.rcov = true
 end
 
-namespace :redis_cluster do
-  desc "Starts the redis_cluster"
-  task :start do
-    result = RedisClusterRunner.start_detached
-    raise("Could not start redis-server, aborting.") unless result
-  end
-
-  desc "Stops the redis_cluster"
-  task :stop do
-    RedisClusterRunner.stop
-  end
-end
-
 namespace :bundle do
   task :clean do
     system "rm -rf ~/.bundle/ ~/.gem/ .bundle/ Gemfile.lock"
   end
 end
 
-# courtesy of http://github.com/ezmobius/redis-rb team
 load "tasks/redis.tasks.rb"
-def invoke_with_redis_cluster(task_name)
-  begin
-    Rake::Task["redis_cluster:start"].invoke
-    Rake::Task[task_name].invoke
-  ensure
-    Rake::Task["redis_cluster:stop"].invoke
-  end
-end

data/VERSION

@@ -1 +1 @@
-1.0.0.beta1
+1.0.0.beta2

data/lib/cache/rails/redis_store.rb

@@ -1,4 +1,4 @@
-module RedisStore
+module ::RedisStore
   module Cache
     module Rails2
       def write(key, value, options = nil)
@@ -16,6 +16,17 @@ module RedisStore
         super
         @data.del key
       end
+
+      def exist?(key, options = nil)
+        super
+        @data.exists key
+      end
+
+      private
+        def instrument(operation, key, options = nil)
+          log(operation.to_s, key, options)
+          yield
+        end
     end
 
     module Rails3
@@ -38,7 +49,7 @@ module RedisStore
     end
 
     module Store
-      include RedisStore.rails3? ? Rails3 : Rails2
+      include ::RedisStore.rails3? ? Rails3 : Rails2
     end
   end
 end
@@ -60,9 +71,24 @@ module ActiveSupport
         @data = Redis::Factory.create(addresses)
       end
 
-      def exist?(key, options = nil)
-        super
-        @data.exists key
+      # Delete objects for matched keys.
+      #
+      # Example:
+      #   cache.del_matched "rab*"
+      def delete_matched(matcher, options = nil)
+        instrument(:delete_matched, matcher, options) do
+          @data.keys(matcher).each { |key| @data.del key }
+        end
+      end
+
+      # Reads multiple keys from the cache using a single call to the
+      # servers for all keys. Options can be passed in the last argument.
+      #
+      # Example:
+      #   cache.read_multi "rabbit", "white-rabbit"
+      #   cache.read_multi "rabbit", "white-rabbit", :raw => true
+      def read_multi(*names)
+        @data.marshalled_mget *names
       end
 
       # Increment a key in the store.
@@ -87,8 +113,9 @@ module ActiveSupport
       #   cache.increment "rabbit"
       #   cache.read "rabbit", :raw => true       # => "1"
       def increment(key, amount = 1)
-        log "increment", key, amount
-        @data.incrby key, amount
+        instrument(:increment, key, :amount => amount) do
+          @data.incrby key, amount
+        end
       end
 
       # Decrement a key in the store
@@ -113,23 +140,16 @@ module ActiveSupport
       #   cache.decrement "rabbit"
       #   cache.read "rabbit", :raw => true       # => "-1"
       def decrement(key, amount = 1)
-        log "decrement", key, amount
-        @data.decrby key, amount
-      end
-
-      # Delete objects for matched keys.
-      #
-      # Example:
-      #   cache.del_matched "rab*"
-      def delete_matched(matcher, options = nil)
-        log "delete_matched", matcher, options
-        @data.keys(matcher).each { |key| @data.del key }
+        instrument(:decrement, key, :amount => amount) do
+          @data.decrby key, amount
+        end
       end
 
       # Clear all the data from the store.
       def clear
-        log "clear", nil, nil
-        @data.flushdb
+        instrument(:clear, nil, nil) do
+          @data.flushdb
+        end
       end
 
       def stats

data/lib/rack/session/rails.rb

@@ -59,12 +59,12 @@ module RedisStore
   end
 end
 
-unless defined?(ActionDispatch) # rails 2.3.x
-  class ActionController::Session::RedisSessionStore < ActionController::Session::AbstractStore
+if ::RedisStore.rails3?
+  class ActionDispatch::Session::RedisSessionStore < ActionDispatch::Session::AbstractStore
     include RedisStore::Rack::Session::Rails
   end
-else # rails 3.x
-  class ActionDispatch::Session::RedisSessionStore < ActionDispatch::Session::AbstractStore
+else
+  class ActionController::Session::RedisSessionStore < ActionController::Session::AbstractStore
     include RedisStore::Rack::Session::Rails
   end
 end

data/lib/redis-store.rb

@@ -5,7 +5,7 @@ require "redis/marshaled_client"
 require "redis/distributed_marshaled"
 require "redis_store/version"
 
-module RedisStore
+module ::RedisStore
   def self.rails3? #:nodoc:
     defined?(::Rails) && ::Rails.version =~ /3\.0\.0/
   end

data/lib/redis/marshaled_client.rb

@@ -31,6 +31,13 @@ class Redis
       result
     end
 
+    def marshalled_mget(*keys)
+      options = keys.flatten.pop if keys.flatten.last.is_a?(Hash)
+      mget(*keys).map do |result|
+        unmarshal?(result, options) ? Marshal.load(result) : result
+      end
+    end
+
     def to_s
       "Redis Client connected to #{@client.host}:#{@client.port} against DB #{@client.db}"
     end

data/lib/redis_store/version.rb

@@ -1,9 +1,9 @@
-module RedisStore
+module ::RedisStore
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
     TINY  = 0
-    BUILD = "beta1"
+    BUILD = "beta2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end

data/redis-store.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redis-store}
-  s.version = "1.0.0.beta1"
+  s.version = "1.0.0.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luca Guidi"]
-  s.date = %q{2010-06-09}
+  s.date = %q{2010-06-12}
   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 = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "CHANGELOG",
      "Gemfile",
      "MIT-LICENSE",
      "README.md",
@@ -37,7 +38,6 @@ Gem::Specification.new do |s|
      "lib/redis_store/version.rb",
      "redis-store.gemspec",
      "spec/cache/merb/redis_store_spec.rb",
-     "spec/cache/rails/redis_session_store_spec.rb",
      "spec/cache/rails/redis_store_spec.rb",
      "spec/cache/sinatra/redis_store_spec.rb",
      "spec/config/master.conf",
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
      "spec/rack/cache/entitystore/pony.jpg",
      "spec/rack/cache/entitystore/redis_spec.rb",
      "spec/rack/cache/metastore/redis_spec.rb",
+     "spec/rack/session/redis_session_store_spec.rb",
      "spec/rack/session/redis_spec.rb",
      "spec/redis/distributed_marshaled_redis_spec.rb",
      "spec/redis/factory_spec.rb",
@@ -61,11 +62,11 @@ Gem::Specification.new do |s|
   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_session_store_spec.rb",
      "spec/cache/rails/redis_store_spec.rb",
      "spec/cache/sinatra/redis_store_spec.rb",
      "spec/rack/cache/entitystore/redis_spec.rb",
      "spec/rack/cache/metastore/redis_spec.rb",
+     "spec/rack/session/redis_session_store_spec.rb",
      "spec/rack/session/redis_spec.rb",
      "spec/redis/distributed_marshaled_redis_spec.rb",
      "spec/redis/factory_spec.rb",

data/spec/cache/rails/redis_store_spec.rb

@@ -78,7 +78,7 @@ module ActiveSupport
             with_store_management do |store|
               result = store.read("rabbit", :raw => true)
               result.should include("ActiveSupport::Cache::Entry")
-              result.should include("\017OpenStruct{\006:\tname\"\nbunny:")
+              result.should include("\017OpenStruct{\006:\tname\"\nbunny")
             end
           end
         end
@@ -182,6 +182,124 @@ module ActiveSupport
         end
       end
 
+      if ::RedisStore.rails3?
+        it "should read multiple keys" do
+          @store.write "irish whisky", "Jameson"
+          rabbit, whisky = @store.read_multi "rabbit", "irish whisky"
+          rabbit.raw_value.should === @rabbit
+          whisky.raw_value.should == "Jameson"
+        end
+      else
+        it "should read multiple keys" do
+          @store.write "irish whisky", "Jameson"
+          rabbit, whisky  = @store.read_multi "rabbit", "irish whisky"
+          rabbit.should === @rabbit
+          whisky.should  == "Jameson"
+        end
+      end
+
+      if ::RedisStore.rails3?
+        describe "notifications" do
+          it "should notify on #fetch" do
+            with_notifications do
+              @store.fetch("radiohead") { "House Of Cards" }
+            end
+
+            read, generate, write = @events
+            read.name.should        == "cache_read.active_support"
+            read.payload.should     == { :key => "radiohead" }
+            generate.name.should    == "cache_generate.active_support"
+            generate.payload.should == { :key => "radiohead" }
+            write.name.should       == "cache_write.active_support"
+            write.payload.should    == { :key => "radiohead" }
+          end
+
+          it "should notify on #read" do
+            with_notifications do
+              @store.read "metallica"
+            end
+
+            read = @events.first
+            read.name.should    == "cache_read.active_support"
+            read.payload.should == { :key => "metallica" }
+          end
+
+          # it "should notify on #read_multi" # Not supported in Rails 3
+
+          it "should notify on #write" do
+            with_notifications do
+              @store.write "depeche mode", "Enjoy The Silence"
+            end
+
+            write = @events.first
+            write.name.should    == "cache_write.active_support"
+            write.payload.should == { :key => "depeche mode" }
+          end
+
+          it "should notify on #delete" do
+            with_notifications do
+              @store.delete "the new cardigans"
+            end
+
+            delete = @events.first
+            delete.name.should    == "cache_delete.active_support"
+            delete.payload.should == { :key => "the new cardigans" }
+          end
+
+          it "should notify on #exist?" do
+            with_notifications do
+              @store.exist? "the smiths"
+            end
+
+            exist = @events.first
+            exist.name.should    == "cache_exist?.active_support"
+            exist.payload.should == { :key => "the smiths" }
+          end
+
+          it "should notify on #delete_matched" do
+            with_notifications do
+              @store.delete_matched "afterhours*"
+            end
+
+            delete_matched = @events.first
+            delete_matched.name.should    == "cache_delete_matched.active_support"
+            delete_matched.payload.should == { :key => "afterhours*" }
+          end
+
+          it "should notify on #increment" do
+            with_notifications do
+              @store.increment "pearl jam"
+            end
+
+            increment = @events.first
+            increment.name.should    == "cache_increment.active_support"
+            increment.payload.should == { :key => "pearl jam", :amount => 1 }
+          end
+
+          it "should notify on #decrement" do
+            with_notifications do
+              @store.decrement "placebo"
+            end
+
+            decrement = @events.first
+            decrement.name.should    == "cache_decrement.active_support"
+            decrement.payload.should == { :key => "placebo", :amount => 1 }
+          end
+
+          # it "should notify on cleanup" # TODO implement in ActiveSupport::Cache::RedisStore
+
+          it "should notify on clear" do
+            with_notifications do
+              @store.clear
+            end
+
+            clear = @events.first
+            clear.name.should    == "cache_clear.active_support"
+            clear.payload.should == { :key => nil }
+          end
+        end
+      end
+
       private
         def instantiate_store(addresses = nil)
           ActiveSupport::Cache::RedisStore.new(addresses).instance_variable_get(:@data)
@@ -191,6 +309,16 @@ module ActiveSupport
           yield @store
           yield @dstore
         end
+
+        def with_notifications
+          @events = [ ]
+          ActiveSupport::Cache::RedisStore.instrument = true
+          ActiveSupport::Notifications.subscribe(/^cache_(.*)\.active_support$/) do |*args|
+            @events << ActiveSupport::Notifications::Event.new(*args)
+          end
+          yield
+          ActiveSupport::Cache::RedisStore.instrument = false
+        end
     end
   end
 end

data/spec/{cache/rails → rack/session}/redis_session_store_spec.rb

@@ -1,5 +1,5 @@
 require File.join(File.dirname(__FILE__), "/../../spec_helper")
-RAILS_SESSION_STORE_CLASS = RedisStore.rails3? ? ActionDispatch::Session::RedisSessionStore : ActionController::Session::RedisSessionStore
+RAILS_SESSION_STORE_CLASS = ::RedisStore.rails3? ? ActionDispatch::Session::RedisSessionStore : ActionController::Session::RedisSessionStore
 
 describe RAILS_SESSION_STORE_CLASS do
   attr_reader :app

data/spec/redis/marshaled_client_spec.rb

@@ -56,5 +56,28 @@ describe "Redis::MarshaledClient" do
     @store.marshalled_setnx "rabbit2", @white_rabbit, :raw => true
     @store.marshalled_get("rabbit2", :raw => true).should == %(#<OpenStruct color="white">)
   end
+
+  it "should unmarshal object(s) on multi get" do
+    @store.marshalled_set "rabbit2", @white_rabbit
+    rabbit, rabbit2 = @store.marshalled_mget "rabbit", "rabbit2"
+    rabbit.should  == @rabbit
+    rabbit2.should == @white_rabbit
+  end
+
+  if RUBY_VERSION.match /1\.9/
+    it "should not unmarshal object(s) on multi get if raw option is true" do
+      @store.marshalled_set "rabbit2", @white_rabbit
+      rabbit, rabbit2 = @store.marshalled_mget "rabbit", "rabbit2", :raw => true
+      rabbit.should  == "\x04\bU:\x0FOpenStruct{\x06:\tnameI\"\nbunny\x06:\rencoding\"\rUS-ASCII"
+      rabbit2.should == "\x04\bU:\x0FOpenStruct{\x06:\ncolorI\"\nwhite\x06:\rencoding\"\rUS-ASCII"
+    end
+  else
+    it "should not unmarshal object(s) on multi get if raw option is true" do
+      @store.marshalled_set "rabbit2", @white_rabbit
+      rabbit, rabbit2 = @store.marshalled_mget "rabbit", "rabbit2", :raw => true
+      rabbit.should  == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
+      rabbit2.should == "\004\bU:\017OpenStruct{\006:\ncolor\"\nwhite"
+    end
+  end
 end
 

data/spec/redis_store/version_spec.rb

@@ -2,6 +2,6 @@ require File.join(File.dirname(__FILE__), "/../spec_helper")
 
 describe RedisStore::VERSION do
   it "should describe RedisStore version" do
-    RedisStore::VERSION::STRING.should == "1.0.0.beta1"
+    RedisStore::VERSION::STRING.should == "1.0.0.beta2"
   end
 end

data/tasks/redis.tasks.rb

@@ -159,6 +159,19 @@ namespace :redis do
     system "bundle exec irb -I lib -I extra -r redis-store.rb"
     RedisRunner.stop
   end
+
+  namespace :cluster do
+    desc "Starts the redis_cluster"
+    task :start do
+      result = RedisClusterRunner.start_detached
+      raise("Could not start redis-server, aborting.") unless result
+    end
+
+    desc "Stops the redis_cluster"
+    task :stop do
+      RedisClusterRunner.stop
+    end
+  end  
 end
 
 namespace :dtach do
@@ -189,3 +202,12 @@ namespace :dtach do
     puts 'Dtach successfully installed to /usr/bin.'
   end
 end
+
+def invoke_with_redis_cluster(task_name)
+  begin
+    Rake::Task["redis:cluster:start"].invoke
+    Rake::Task[task_name].invoke
+  ensure
+    Rake::Task["redis:cluster:stop"].invoke
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: redis-store
 version: !ruby/object:Gem::Version 
-  hash: -1848230051
+  hash: -1848230054
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta1
-  version: 1.0.0.beta1
+  - beta2
+  version: 1.0.0.beta2
 platform: ruby
 authors: 
 - Luca Guidi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +02:00
+date: 2010-06-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- CHANGELOG
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -65,7 +66,6 @@ files:
 - lib/redis_store/version.rb
 - redis-store.gemspec
 - spec/cache/merb/redis_store_spec.rb
-- spec/cache/rails/redis_session_store_spec.rb
 - spec/cache/rails/redis_store_spec.rb
 - spec/cache/sinatra/redis_store_spec.rb
 - spec/config/master.conf
@@ -74,6 +74,7 @@ files:
 - spec/rack/cache/entitystore/pony.jpg
 - spec/rack/cache/entitystore/redis_spec.rb
 - spec/rack/cache/metastore/redis_spec.rb
+- spec/rack/session/redis_session_store_spec.rb
 - spec/rack/session/redis_spec.rb
 - spec/redis/distributed_marshaled_redis_spec.rb
 - spec/redis/factory_spec.rb
@@ -119,11 +120,11 @@ specification_version: 3
 summary: Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks.
 test_files: 
 - spec/cache/merb/redis_store_spec.rb
-- spec/cache/rails/redis_session_store_spec.rb
 - spec/cache/rails/redis_store_spec.rb
 - spec/cache/sinatra/redis_store_spec.rb
 - spec/rack/cache/entitystore/redis_spec.rb
 - spec/rack/cache/metastore/redis_spec.rb
+- spec/rack/session/redis_session_store_spec.rb
 - spec/rack/session/redis_spec.rb
 - spec/redis/distributed_marshaled_redis_spec.rb
 - spec/redis/factory_spec.rb