honkster-redis-store 0.3.10 → 0.3.11

data/.gitignore

@@ -8,4 +8,4 @@ pkg/
 vendor/
 tmp/
 .idea
-.bundle
+.bundle/

data/Gemfile

@@ -1,13 +1,14 @@
+source :gemcutter
 gem "redis", "1.0.5"
 
 # testing gems
 group :testing do
   gem "ruby-debug"
   gem "rspec"
-  gem "rack", "1.1.0"
+  gem "rack", "1.0.0"
   gem "rack-cache"
-  gem "activesupport"
-  gem "actionpack"
+  gem "activesupport", "2.3.5"
+  gem "actionpack", "2.3.5"
   gem "merb"
   gem "jeweler"
   gem "git"

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/lib/cache/sinatra/redis_store.rb

@@ -20,14 +20,10 @@ module Sinatra
       end
 
       def write(key, value, options = nil)
-        if options
-          if options[:unless_exist]
-            @data.marshalled_setnx key, value, options
-          else
-            @data.marshalled_set key, value, options
-          end
+        if options && options[:unless_exist]
+          @data.marshalled_setnx key, value, options
         else
-          @data.marshalled_set key, value
+          @data.marshalled_set key, value, options
         end
       end
 

data/lib/redis-store.rb

@@ -13,7 +13,6 @@ elsif defined?(Merb)
   require "cache/merb/redis_store"
 elsif defined?(Rails)
   require "cache/rails/redis_store"
-  require "cache/rails/redis_session_store"
 end
 
 # Rack::Session
@@ -23,6 +22,9 @@ if defined?(Rack::Session)
   if defined?(Merb)
     require "rack/session/merb"
   end
+  if defined?(Rails)
+    require "rack/session/rails"
+  end
 end
 
 # Rack::Cache

data/spec/cache/merb/redis_store_spec.rb

@@ -49,7 +49,7 @@ module Merb
 
       it "should read raw data" do
         with_store_management do |store|
-          store.read("rabbit", {}, :raw => true).should == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
+          store.read("rabbit", {}, :raw => true).should == Marshal.dump(@rabbit)
         end
       end
 

data/spec/cache/rails/redis_store_spec.rb

@@ -52,7 +52,7 @@ module ActiveSupport
       it "should write the data with expiration time" do
         with_store_management do |store|
           store.write "rabbit", @white_rabbit, :expires_in => 1.second
-          store.read("rabbit").should === @white_rabbit ; sleep 2
+          store.read("rabbit").should == @white_rabbit ; sleep 2
           store.read("rabbit").should be_nil
         end
       end
@@ -60,13 +60,13 @@ module ActiveSupport
       it "should not write data if :unless_exist option is true" do
         with_store_management do |store|
           store.write "rabbit", @white_rabbit, :unless_exist => true
-          store.read("rabbit").should === @rabbit
+          store.read("rabbit").should == @rabbit
         end
       end
 
       it "should read raw data" do
         with_store_management do |store|
-          store.read("rabbit", :raw => true).should == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
+          store.read("rabbit", :raw => true).should == Marshal.dump(@rabbit)
         end
       end
 
@@ -149,7 +149,8 @@ module ActiveSupport
           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 == @white_rabbit 
+          sleep 2
           store.fetch("rabbit").should be_nil
         end
       end

data/spec/cache/sinatra/redis_store_spec.rb

@@ -87,7 +87,7 @@ module Sinatra
 
       it "should read raw data" do
         with_store_management do |store|
-          store.read("rabbit", :raw => true).should == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
+          store.read("rabbit", :raw => true).should == Marshal.dump(@rabbit)
         end
       end
 

data/spec/redis/marshaled_redis_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "/../spec_helper")
 
 describe "MarshaledRedis" do
   before(:each) do
-    @store = MarshaledRedis.new
+    @store = ::MarshaledRedis.new
     @rabbit = OpenStruct.new :name => "bunny"
     @white_rabbit = OpenStruct.new :color => "white"
     @store.marshalled_set "rabbit", @rabbit

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-$:.unshift(File.join(File.dirname(__FILE__), "/../lib"))
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "/../lib")))
 ARGV << "-b"
 require "rubygems"
 require "bundler"
@@ -17,8 +17,7 @@ require "redis-store"
 require "active_support"
 require "action_controller/session/abstract_store"
 require "cache/rails/redis_store"
-require "cache/rails/redis_session_store"
+require "rack/session/rails"
 require "cache/sinatra/redis_store"
 
-class Redis; attr_reader :host, :port, :db end
 $DEBUG = ENV["DEBUG"] === "true"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 10
-  version: 0.3.10
+  - 11
+  version: 0.3.11
 platform: ruby
 authors: 
 - Luca Guidi
@@ -34,12 +34,12 @@ files:
 - Rakefile
 - VERSION
 - lib/cache/merb/redis_store.rb
-- lib/cache/rails/redis_session_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/rails.rb
 - lib/rack/session/redis.rb
 - lib/redis-store.rb
 - lib/redis/distributed_marshaled_redis.rb