redis-store 1.0.0.beta3 → 1.0.0.beta4

data/CHANGELOG

@@ -1,3 +1,17 @@
+*1.0.0 [beta4] (December 15, 2010)*
+
+  * Bump version v1.0.0.beta4
+  * Force Rails cache store when ActiveSupport is detected
+  * Make sure to accept options when :servers isn't passed
+  * Always force session store loading when using Rails
+  * Make it compatible with Rails 3 sessions store [Andre Medeiros]
+  * Better Rails 3 detection [Andre Medeiros]
+  * Added support for password in Redis URI resolution [Jacob Gyllenstierna]
+  * fix deleting values from session hash [Calvin Yu]
+  * Use defensive design when build options for a store
+  * ActiveSupport cache store doesn't accept any argument in Rails 2
+  * Updated dependencies
+
 *1.0.0 [beta3] (September 10, 2010)*
 
   * Bump version v1.0.0.beta3

data/Gemfile

@@ -8,9 +8,9 @@ end
 
 group :development, :test, :rails3 do
   gem "rack"
-  gem "rspec"
   gem "rack-cache"
   gem "merb", "1.1.0"
+  gem "rspec", "1.3.0"
   gem "i18n"
 
   if RUBY_VERSION > '1.9'
@@ -22,12 +22,12 @@ end
 
 if ENV["REDIS_STORE_ENV"] == "rails3"
   group :rails3 do
-    gem "activesupport", "3.0.0"
-    gem "actionpack", "3.0.0"
+    gem "activesupport", "3.0.3"
+    gem "actionpack", "3.0.3"
   end
 else
   group :test do
-    gem "activesupport", "2.3.9"
-    gem "actionpack", "2.3.9"
+    gem "activesupport", "2.3.10"
+    gem "actionpack", "2.3.10"
   end
 end

data/Gemfile.lock

@@ -6,15 +6,15 @@ GEM
       sexp_processor (>= 3.0.0)
     RubyInline (3.8.6)
       ZenTest (~> 4.3)
-    ZenTest (4.4.0)
+    ZenTest (4.4.2)
     abstract (1.0.0)
-    actionpack (2.3.9)
-      activesupport (= 2.3.9)
+    actionpack (2.3.10)
+      activesupport (= 2.3.10)
       rack (~> 1.1.0)
-    activesupport (2.3.9)
-    addressable (2.2.0)
+    activesupport (2.3.10)
+    addressable (2.2.2)
     bcrypt-ruby (2.1.2)
-    columnize (0.3.1)
+    columnize (0.3.2)
     data_objects (0.10.2)
       addressable (~> 2.1)
     diff-lcs (1.1.2)
@@ -51,15 +51,14 @@ GEM
       abstract (>= 1.0.0)
     extlib (0.9.15)
     fastercsv (1.5.3)
-    gemcutter (0.6.1)
     git (1.2.5)
-    haml (3.0.18)
+    haml (3.0.24)
     highline (1.6.1)
-    i18n (0.4.1)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    i18n (0.5.0)
+    jeweler (1.5.1)
+      bundler (~> 1.0.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
+      rake
     json_pure (1.2.4)
     linecache (0.43)
     mailfactory (1.4.0)
@@ -139,25 +138,23 @@ GEM
       merb-core (~> 1.1.0)
     mime-types (1.16)
     rack (1.1.0)
-    rack-cache (0.5.2)
+    rack-cache (0.5.3)
       rack (>= 0.4)
     rake (0.8.7)
     randexp (0.1.5)
       ParseTree
-    redis (2.0.6)
+    redis (2.1.1)
     rspec (1.3.0)
-    ruby-debug (0.10.3)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
     ruby_parser (2.0.5)
       sexp_processor (~> 3.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
     sexp_processor (3.0.5)
     stringex (1.1.0)
     templater (1.0.0)
@@ -170,8 +167,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (= 2.3.9)
-  activesupport (= 2.3.9)
+  actionpack (= 2.3.10)
+  activesupport (= 2.3.10)
   git
   i18n
   jeweler
@@ -179,5 +176,5 @@ DEPENDENCIES
   rack
   rack-cache
   redis (>= 2.0.0)
-  rspec
+  rspec (= 1.3.0)
   ruby-debug

data/README.md

@@ -29,13 +29,13 @@ By default each store try to connect on `localhost` with the port `6379` and the
     password: secret
 
 If you want to specify the `namespace` optional, you have to pass the `db` param too.
-#### __Important__: for now (beta3) `namespace` is only supported for single, non-distributed stores.
+#### __Important__: for now (beta4) `namespace` is only supported for single, non-distributed stores.
 
 ### Hash
 
     { :host => 192.168.1.100, :port => 23682, :db => 13, :namespace => "theplaylist", :password => "secret" }
 
-#### __Important__: for now (beta3) `namespace` is only supported for single, non-distributed stores.
+#### __Important__: for now (beta4) `namespace` is only supported for single, non-distributed stores.
 
 ## Cache store
 
@@ -46,21 +46,30 @@ Provides a cache store for your Ruby web framework of choice.
     config.gem "redis-store"
     config.cache_store = :redis_store
 
+### Rails 2.x (with Bundler)
+
+    # Gemfile
+    gem "redis-store"
+
+    # in your configuration
+    config.gem "redis-store"
+    config.cache_store = :redis_store, { ... optional configuration ... }
+
 ### Rails 3.x
 
     # Gemfile
-    gem 'rails', '3.0.0'
+    gem 'rails', '3.0.3'
     gem 'redis'
-    gem 'redis-store', '1.0.0.beta3'
+    gem 'redis-store', '1.0.0.beta4'
 
     # config/environments/production.rb
-    config.cache_store = :redis_store
+    config.cache_store = :redis_store, { ... optional configuration ... }
 
 For advanced configurations scenarios please visit [the wiki](http://wiki.github.com/jodosha/redis-store/rails).
 
 ### Merb
 
-    dependency "redis-store", "1.0.0.beta3"
+    dependency "redis-store", "1.0.0.beta4"
     dependency("merb-cache", merb_gems_version) do
       Merb::Cache.setup do
         register(:redis, Merb::Cache::RedisStore, :servers => ["127.0.0.1:6379"])
@@ -92,15 +101,52 @@ Provides a Redis store for Rack::Session. See [http://rack.rubyforge.org/doc/Rac
 
 ### Rails 2.x
 
+    # config/environment.rb
     config.gem "redis-store"
+
+    # then configure as following:
+
+    # config/environments/*.rb
+    config.cache_store = :redis_store
+
+    # or
+
+    # config/initializers/session_store.rb
+    ActionController::Base.session = {
+      :key         => APPLICATION['session_key'],
+      :secret      => APPLICATION['session_secret'],
+      :key_prefix  => Rails.env
+    }
+
+    ActionController::Base.session_store = :redis_session_store
+
+### Rails 2.x (with Bundler)
+
+    # Gemfile
+    gem "redis-store"
+
+    # then configure as following:
+
+    # config/environments/*.rb
+    config.cache_store = :redis_store
+
+    # or
+
+    # config/initializers/session_store.rb
+    ActionController::Base.session = {
+      :key         => APPLICATION['session_key'],
+      :secret      => APPLICATION['session_secret'],
+      :key_prefix  => Rails.env
+    }
+
     ActionController::Base.session_store = :redis_session_store
 
 ### Rails 3.x
 
     # Gemfile
-    gem 'rails', '3.0.0'
+    gem 'rails', '3.0.3'
     gem 'redis'
-    gem 'redis-store', '1.0.0.beta3'
+    gem 'redis-store', '1.0.0.beta4'
 
     # config/initializers/session_store.rb
     MyApp::Application.config.session_store :redis_session_store
@@ -109,7 +155,7 @@ For advanced configurations scenarios please visit [the wiki](http://wiki.github
 
 ### Merb
 
-    dependency "redis-store", "1.0.0.beta3"
+    dependency "redis-store", "1.0.0.beta4"
     Merb::Config.use do |c|
       c[:session_store] = "redis"
     end

data/VERSION

@@ -1 +1 @@
-1.0.0.beta3
+1.0.0.beta4

data/lib/action_controller/session/redis_session_store.rb

@@ -7,12 +7,12 @@ module RedisStore
       # the MemCacheStore code, simply dropping in Redis instead.
       #
       # Options:
-      #  :key     => Same as with the other cookie stores, key name
-      #  :secret  => Encryption secret for the key
-      #  :host    => Redis host name, default is localhost
-      #  :port    => Redis port, default is 6379
-      #  :db      => Database number, defaults to 0. Useful to separate your session storage from other data
-      #  :key_prefix  => Prefix for keys used in Redis, e.g. myapp-. Useful to separate session storage keys visibly from others
+      #  :key          => Same as with the other cookie stores, key name
+      #  :secret       => Encryption secret for the key
+      #  :host         => Redis host name, default is localhost
+      #  :port         => Redis port, default is 6379
+      #  :db           => Database number, defaults to 0. Useful to separate your session storage from other data
+      #  :key_prefix   => Prefix for keys used in Redis, e.g. myapp-. Useful to separate session storage keys visibly from others
       #  :expire_after => A number in seconds to set the timeout interval for the session. Will map directly to expiry in Redis
       module Rails
         def initialize(app, options = {})
@@ -21,12 +21,12 @@ module RedisStore
 
           super
 
-          servers = [options[:servers]].flatten.compact.map do |server_options|
-            {
-              :host => 'localhost',
-              :port => '6379',
-              :db => 0
-            }.update(Redis::Factory.convert_to_redis_client_options(server_options))
+          options = options.dup
+          servers = [ options.delete(:servers) ].flatten.compact
+          servers = [ "redis://localhost:6379/0" ] if servers.empty?
+          servers.map! do |server|
+            server = Redis::Factory.convert_to_redis_client_options(server)
+            server.merge(options)
           end
 
           @pool = Redis::Factory.create(*servers)
@@ -46,7 +46,7 @@ module RedisStore
           def set_session(env, sid, session_data)
             options = env['rack.session.options']
             @pool.set(sid, session_data, options)
-            return true
+            return(::Redis::Store.rails3? ? sid : true)
           rescue Errno::ECONNREFUSED
             return false
           end

data/lib/active_support/cache/redis_store.rb

@@ -3,6 +3,30 @@ require "redis-store"
 module ::RedisStore
   module Cache
     module Rails2
+      # Instantiate the store.
+      #
+      # Example:
+      #   RedisStore.new
+      #     # => host: localhost,   port: 6379,  db: 0
+      #
+      #   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 "example.com:23682/1/theplaylist"
+      #     # => host: example.com, port: 23682, db: 1, namespace: theplaylist
+      #
+      #   RedisStore.new "localhost:6379/0", "localhost:6380/0"
+      #     # => instantiate a cluster
+      def initialize(*addresses)
+        @data = ::Redis::Factory.create(addresses)
+      end
+
       def write(key, value, options = nil)
         super
         method = options && options[:unless_exist] ? :setnx : :set
@@ -42,6 +66,31 @@ module ::RedisStore
     end
 
     module Rails3
+      # Instantiate the store.
+      #
+      # Example:
+      #   RedisStore.new
+      #     # => host: localhost,   port: 6379,  db: 0
+      #
+      #   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 "example.com:23682/1/theplaylist"
+      #     # => host: example.com, port: 23682, db: 1, namespace: theplaylist
+      #
+      #   RedisStore.new "localhost:6379/0", "localhost:6380/0"
+      #     # => instantiate a cluster
+      def initialize(*addresses)
+        @data = ::Redis::Factory.create(addresses)
+        super(addresses.extract_options!)
+      end
+
       # Delete objects for matched keys.
       #
       # Example:
@@ -98,31 +147,6 @@ module ActiveSupport
     class RedisStore < Store
       include ::RedisStore::Cache::Store
 
-      # Instantiate the store.
-      #
-      # Example:
-      #   RedisStore.new
-      #     # => host: localhost,   port: 6379,  db: 0
-      #
-      #   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 "example.com:23682/1/theplaylist"
-      #     # => host: example.com, port: 23682, db: 1, namespace: theplaylist
-      #
-      #   RedisStore.new "localhost:6379/0", "localhost:6380/0"
-      #     # => instantiate a cluster
-      def initialize(*addresses)
-        @data = ::Redis::Factory.create(addresses)
-        super(addresses.extract_options!)
-      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.
       #

data/lib/rack/cache/redis_entitystore.rb

@@ -15,7 +15,7 @@ module Rack
         def self.resolve(uri)
           db = uri.path.sub(/^\//, '')
           db = "0" if db.empty?
-          server = { :host => uri.host, :port => uri.port || "6379", :db => db }
+          server = { :host => uri.host, :port => uri.port || "6379", :db => db, :password => uri.password }
           new server
         end
       end

data/lib/rack/cache/redis_metastore.rb

@@ -10,7 +10,7 @@ module Rack
         def self.resolve(uri)
           db = uri.path.sub(/^\//, '')
           db = "0" if db.empty?
-          server = { :host => uri.host, :port => uri.port || "6379", :db => db }
+          server = { :host => uri.host, :port => uri.port || "6379", :db => db, :password => uri.password }
           new server
         end
       end

data/lib/rack/session/redis.rb

@@ -68,7 +68,7 @@ module Rack
 
           delete = old.keys - new.keys
           warn "//@#{sid}: dropping #{delete*','}" if $DEBUG and not delete.empty?
-          delete.each{|k| cur.del k }
+          delete.each{|k| cur.delete k }
 
           update = new.keys.select{|k| new[k] != old[k] }
           warn "//@#{sid}: updating #{update*','}" if $DEBUG and not update.empty?

data/lib/redis-store.rb

@@ -16,6 +16,8 @@ elsif defined?(Merb)
   # HACK for cyclic dependency: redis-store is required before merb-cache
   module Merb; module Cache; class AbstractStore; end end end
   require "cache/merb/redis_store"
+elsif defined?(ActiveSupport)
+  require "active_support/cache/redis_store"
 end
 
 # Rack::Session
@@ -27,8 +29,7 @@ if defined?(Rack::Session)
   end
 end
 
-# ActionDispatch::Session
-if ::Redis::Store.rails3?
+if defined?(Rails)
   require "action_controller/session/redis_session_store"
 end
 

data/lib/redis/factory.rb

@@ -33,11 +33,11 @@ class Redis
         end
 
         options = {}
-        options[:host] = host || uri.host
-        options[:port] = port || uri.port
+        options[:host] = host || uri && uri.host
+        options[:port] = port || uri && uri.port
         options[:db]  = db.to_i if db
         options[:namespace] = namespace if namespace
-        options[:password]  = password || uri.password
+        options[:password]  = password || uri && uri.password
         options
       end
     end

data/lib/redis/store.rb

@@ -9,7 +9,7 @@ class Redis
     end
 
     def self.rails3? #:nodoc:
-      defined?(::Rails) && ::Rails.version =~ /3\.0\.0/
+      defined?(::Rails) && ::Rails::VERSION::MAJOR == 3
     end
 
     def to_s

data/lib/redis/store/version.rb

@@ -4,7 +4,7 @@ class Redis
       MAJOR = 1
       MINOR = 0
       TINY  = 0
-      BUILD = "beta3"
+      BUILD = "beta4"
 
       STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
     end

data/redis-store.gemspec

@@ -1,90 +1,88 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{redis-store}
-  s.version = "1.0.0.beta3"
+  s.version = "1.0.0.beta4"
 
   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-09-10}
+  s.date = %q{2010-12-15}
   s.description = %q{Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.}
   s.email = %q{guidi.luca@gmail.com}
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "Gemfile",
-     "Gemfile.lock",
-     "MIT-LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/action_controller/session/redis_session_store.rb",
-     "lib/active_support/cache/redis_store.rb",
-     "lib/cache/merb/redis_store.rb",
-     "lib/cache/sinatra/redis_store.rb",
-     "lib/i18n/backend/redis.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_store.rb",
-     "lib/redis/factory.rb",
-     "lib/redis/store.rb",
-     "lib/redis/store/interface.rb",
-     "lib/redis/store/marshalling.rb",
-     "lib/redis/store/namespace.rb",
-     "lib/redis/store/ttl.rb",
-     "lib/redis/store/version.rb",
-     "redis-store.gemspec",
-     "spec/action_controller/session/redis_session_store_spec.rb",
-     "spec/active_support/cache/redis_store_spec.rb",
-     "spec/cache/merb/redis_store_spec.rb",
-     "spec/cache/sinatra/redis_store_spec.rb",
-     "spec/config/master.conf",
-     "spec/config/single.conf",
-     "spec/config/slave.conf",
-     "spec/i18n/backend/redis_spec.rb",
-     "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_store_spec.rb",
-     "spec/redis/factory_spec.rb",
-     "spec/redis/store/interface_spec.rb",
-     "spec/redis/store/marshalling_spec.rb",
-     "spec/redis/store/namespace_spec.rb",
-     "spec/redis/store/version_spec.rb",
-     "spec/spec_helper.rb",
-     "tasks/redis.tasks.rb"
+    "CHANGELOG",
+    "Gemfile",
+    "Gemfile.lock",
+    "MIT-LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/action_controller/session/redis_session_store.rb",
+    "lib/active_support/cache/redis_store.rb",
+    "lib/cache/merb/redis_store.rb",
+    "lib/cache/sinatra/redis_store.rb",
+    "lib/i18n/backend/redis.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_store.rb",
+    "lib/redis/factory.rb",
+    "lib/redis/store.rb",
+    "lib/redis/store/interface.rb",
+    "lib/redis/store/marshalling.rb",
+    "lib/redis/store/namespace.rb",
+    "lib/redis/store/ttl.rb",
+    "lib/redis/store/version.rb",
+    "redis-store.gemspec",
+    "spec/action_controller/session/redis_session_store_spec.rb",
+    "spec/active_support/cache/redis_store_spec.rb",
+    "spec/cache/merb/redis_store_spec.rb",
+    "spec/cache/sinatra/redis_store_spec.rb",
+    "spec/config/master.conf",
+    "spec/config/single.conf",
+    "spec/config/slave.conf",
+    "spec/i18n/backend/redis_spec.rb",
+    "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_store_spec.rb",
+    "spec/redis/factory_spec.rb",
+    "spec/redis/store/interface_spec.rb",
+    "spec/redis/store/marshalling_spec.rb",
+    "spec/redis/store/namespace_spec.rb",
+    "spec/redis/store/version_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.7}
   s.summary = %q{Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.}
   s.test_files = [
     "spec/action_controller/session/redis_session_store_spec.rb",
-     "spec/active_support/cache/redis_store_spec.rb",
-     "spec/cache/merb/redis_store_spec.rb",
-     "spec/cache/sinatra/redis_store_spec.rb",
-     "spec/i18n/backend/redis_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_store_spec.rb",
-     "spec/redis/factory_spec.rb",
-     "spec/redis/store/interface_spec.rb",
-     "spec/redis/store/marshalling_spec.rb",
-     "spec/redis/store/namespace_spec.rb",
-     "spec/redis/store/version_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/active_support/cache/redis_store_spec.rb",
+    "spec/cache/merb/redis_store_spec.rb",
+    "spec/cache/sinatra/redis_store_spec.rb",
+    "spec/i18n/backend/redis_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_store_spec.rb",
+    "spec/redis/factory_spec.rb",
+    "spec/redis/store/interface_spec.rb",
+    "spec/redis/store/marshalling_spec.rb",
+    "spec/redis/store/namespace_spec.rb",
+    "spec/redis/store/version_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -93,11 +91,38 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<redis>, [">= 2.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<git>, [">= 0"])
+      s.add_development_dependency(%q<rack>, [">= 0"])
+      s.add_development_dependency(%q<rack-cache>, [">= 0"])
+      s.add_development_dependency(%q<merb>, ["= 1.1.0"])
+      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_development_dependency(%q<i18n>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_runtime_dependency(%q<redis>, [">= 2.0.0"])
     else
       s.add_dependency(%q<redis>, [">= 2.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<git>, [">= 0"])
+      s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<rack-cache>, [">= 0"])
+      s.add_dependency(%q<merb>, ["= 1.1.0"])
+      s.add_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<redis>, [">= 2.0.0"])
     end
   else
     s.add_dependency(%q<redis>, [">= 2.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<git>, [">= 0"])
+    s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<rack-cache>, [">= 0"])
+    s.add_dependency(%q<merb>, ["= 1.1.0"])
+    s.add_dependency(%q<rspec>, ["= 1.3.0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<redis>, [">= 2.0.0"])
   end
 end
 

data/spec/action_controller/session/redis_session_store_spec.rb

@@ -25,7 +25,7 @@ describe RAILS_SESSION_STORE_CLASS do
 
   it "should accept string connection params" do
     redis = instantiate_store
-    redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
+    redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
 
     redis = instantiate_store :servers => "redis://localhost"
     redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
@@ -45,12 +45,17 @@ describe RAILS_SESSION_STORE_CLASS do
     redis.to_s.should == "Redis Client connected to 192.168.0.1:6379 against DB 0"
 
     redis = instantiate_store :servers => [{ :port => "6380" }]
-    redis.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
+    redis.to_s.should == "Redis Client connected to 127.0.0.1:6380 against DB 0"
 
     redis = instantiate_store :servers => [{ :db => 13 }]
-    redis.to_s.should == "Redis Client connected to localhost:6379 against DB 13"
+    redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 13"
 
     redis = instantiate_store :servers => [{ :key_prefix => "theplaylist" }]
+    redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0 with namespace theplaylist"
+  end
+
+  it "should accept options when :servers key isn't passed" do
+    redis = RAILS_SESSION_STORE_CLASS.new(app, :key_prefix => "theplaylist").instance_variable_get(:@pool)
     redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0 with namespace theplaylist"
   end
 

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

@@ -31,6 +31,10 @@ module Rack
 
           cache = Rack::Cache::EntityStore::Redis.resolve(uri("redis://127.0.0.1/13")).cache
           cache.id.should == "redis://127.0.0.1:6379/13"
+
+          cache = Rack::Cache::EntityStore::Redis.resolve(uri("redis://:secret@127.0.0.1")).cache
+          cache.id.should == "redis://127.0.0.1:6379/0"
+          cache.client.password.should == 'secret'
         end
 
         # Entity store shared examples ===========================================

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

@@ -31,6 +31,10 @@ module Rack
 
           cache = Rack::Cache::MetaStore::Redis.resolve(uri("redis://127.0.0.1/13")).cache
           cache.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 13"
+
+          cache = Rack::Cache::MetaStore::Redis.resolve(uri("redis://:secret@127.0.0.1")).cache
+          cache.id.should == "redis://127.0.0.1:6379/0"
+          cache.client.password.should == 'secret'
         end
 
         # Low-level implementation methods ===========================================

data/spec/redis/store/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe Redis::Store::VERSION do
   it "should describe Redis::Store version" do
-    Redis::Store::VERSION::STRING.should == "1.0.0.beta3"
+    Redis::Store::VERSION::STRING.should == "1.0.0.beta4"
   end
 end

data/spec/spec_helper.rb

@@ -19,7 +19,11 @@ begin
   require "action_controller/session/abstract_store" # Rails 2.3.x
 rescue LoadError
   require "action_dispatch/middleware/session/abstract_store" # Rails 3.x
-  module Rails; def self.version; "3.0.0" end end unless defined?(Rails)
+  module ::Rails
+    module VERSION
+      MAJOR = 3
+    end
+  end
 end
 require "active_support/cache/redis_store"
 require "action_controller/session/redis_session_store"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: redis-store
 version: !ruby/object:Gem::Version 
-  hash: -1848230053
+  hash: -1848230056
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta3
-  version: 1.0.0.beta3
+  - beta4
+  version: 1.0.0.beta4
 platform: ruby
 authors: 
 - Luca Guidi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +02:00
+date: 2010-12-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,138 @@ dependencies:
         version: 2.0.0
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: git
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rack-cache
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: merb
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: redis
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :runtime
+  version_requirements: *id010
 description: Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.
 email: guidi.luca@gmail.com
 executables: []
@@ -44,7 +176,6 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .gitignore
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -96,8 +227,8 @@ homepage: http://github.com/jodosha/redis-store
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,11 +0,0 @@
-*.rdb
-*.swp
-*.gem
-*-redis-store.gemspec
-bin/
-coverage/
-pkg/
-vendor/
-tmp/
-.idea
-.bundle/