redis-store 1.0.0.beta5 → 1.0.0.rc1

data/CHANGELOG

@@ -1,3 +1,14 @@
+*1.0.0 [rc1] (June 5, 2011)*
+
+  * Bump version v1.0.0.rc1
+  * Re-implement the delete_entry because it s needed by the ActiveSupport::Cache [Cyril Mougel]
+  * Change readme documentation for rack-cache to use single redis database with namespace support per Redis maintainers recommendation [Travis D. Warlick, Jr.]
+  * Rack-Cache entity and meta store base classes should use the Redis::Factory.convert_to_redis_client_options method for DRYness and for namespace support [Travis D. Warlick, Jr.]
+  * Modify #fetch for cache stores to return the yielded value instead of OK [Rune Botten]
+  * Minor revisions to Readme language and organization [Jeff Casimir]
+  * Re-implement the delete_entry because it s needed by the ActiveSupport::Cache implementation in Rails 3 [Cyril Mougel]
+  * Refactor delete_matched [Andrei Kulakov]
+
 *1.0.0 [beta5] (April 2, 2011)*
 
   * Bump version v1.0.0.beta5

data/README.md

@@ -2,6 +2,14 @@
 
 ## Installation
 
+### Redis, Option 1: Homebrew
+
+MacOS X users should use [Homebrew](https://github.com/mxcl/homebrew) to install Redis:
+
+    brew install redis
+
+### Redis, Option 2: From Source
+
 Download and install Redis from [http://code.google.com/p/redis/](http://code.google.com/p/redis/)
 
     wget http://redis.googlecode.com/files/redis-2.0.0.tar.gz
@@ -10,32 +18,37 @@ Download and install Redis from [http://code.google.com/p/redis/](http://code.go
     cd redis
     make
 
-Install the gem
+### Install the Gem
 
-    sudo gem install redis-store
+Assuming you're using RVM or on Windows, install the gem with:
+
+    gem install redis-store
 
 ## Options
-There are two ways to configure the Redis server options: by an URI string and by an hash.
-By default each store try to connect on `localhost` with the port `6379` and the db `0`.
+You can specify the Redis configuration details using a URI or a hash.  By default the gem will attempt to connect to `localhost` port `6379` and the db `0`.
+
+### Set by URI
 
-### String
+For example
 
     "redis://:secret@192.168.1.100:23682/13/theplaylist"
 
+Made up of the following:
+
     host: 192.168.1.100
     port: 23682
     db: 13
     namespace: theplaylist
     password: secret
 
-If you want to specify the `namespace` optional, you have to pass the `db` param too.
-#### __Important__: for now (beta5) `namespace` is only supported for single, non-distributed stores.
+If you want to specify the `namespace` option, you have to pass the `db` param too.
+#### __Important__: for now (rc1) `namespace` is only supported for single, non-distributed stores.
 
-### Hash
+### Set by Hash
 
     { :host => 192.168.1.100, :port => 23682, :db => 13, :namespace => "theplaylist", :password => "secret" }
 
-#### __Important__: for now (beta5) `namespace` is only supported for single, non-distributed stores.
+#### __Important__: for now (rc1) `namespace` is only supported for single, non-distributed stores.
 
 ## Cache store
 
@@ -58,9 +71,8 @@ Provides a cache store for your Ruby web framework of choice.
 ### Rails 3.x
 
     # Gemfile
-    gem 'rails', '3.0.3'
     gem 'redis'
-    gem 'redis-store', '1.0.0.beta5'
+    gem 'redis-store', '1.0.0.rc1'
 
     # config/environments/production.rb
     config.cache_store = :redis_store, { ... optional configuration ... }
@@ -69,7 +81,7 @@ For advanced configurations scenarios please visit [the wiki](https://github.com
 
 ### Merb
 
-    dependency "redis-store", "1.0.0.beta5"
+    dependency "redis-store", "1.0.0.rc1"
     dependency("merb-cache", merb_gems_version) do
       Merb::Cache.setup do
         register(:redis, Merb::Cache::RedisStore, :servers => ["127.0.0.1:6379"])
@@ -150,7 +162,7 @@ Provides a Redis store for Rack::Session. See [http://rack.rubyforge.org/doc/Rac
     # Gemfile
     gem 'rails', '3.0.3'
     gem 'redis'
-    gem 'redis-store', '1.0.0.beta5'
+    gem 'redis-store', '1.0.0.rc1'
 
     # config/initializers/session_store.rb
     MyApp::Application.config.session_store :redis_session_store
@@ -159,7 +171,7 @@ For advanced configurations scenarios please visit [the wiki](https://github.com
 
 ### Merb
 
-    dependency "redis-store", "1.0.0.beta5"
+    dependency "redis-store", "1.0.0.rc1"
     Merb::Config.use do |c|
       c[:session_store] = "redis"
     end
@@ -192,8 +204,8 @@ Provides a Redis store for HTTP caching. See [http://github.com/rtomayko/rack-ca
     require "redis-store"
     require "application"
     use Rack::Cache,
-      :metastore   => 'redis://localhost:6379/0',
-      :entitystore => 'redis://localhost:6380/1'
+      :metastore   => 'redis://localhost:6379/0/metastore',
+      :entitystore => 'redis://localhost:6380/0/entitystore'
     run Application.new
 
 ## I18n

data/VERSION

@@ -1 +1 @@
-1.0.0.beta5
+1.0.0.rc1

data/lib/active_support/cache/redis_store.rb

@@ -54,7 +54,7 @@ module ::RedisStore
       #   cache.del_matched "rab*"
       def delete_matched(matcher, options = nil)
         instrument(:delete_matched, matcher, options) do
-          @data.keys(matcher).each { |key| @data.del key }
+          !(keys = @data.keys(matcher)).empty? && @data.del(*keys)
         end
       end
 
@@ -99,7 +99,11 @@ module ::RedisStore
         options = merged_options(options)
         instrument(:delete_matched, matcher.inspect) do
           matcher = key_matcher(matcher, options)
-          @data.keys(matcher).each { |key| delete_entry(key, options) }
+          begin
+            !(keys = @data.keys(matcher)).empty? && @data.del(*keys)
+          rescue Errno::ECONNREFUSED => e
+            false
+          end
         end
       end
 
@@ -120,12 +124,18 @@ module ::RedisStore
           nil
         end
 
+        ##
+        # Implement the ActiveSupport::Cache#delete_entry
+        #
+        # It's really needed and use
+        #
         def delete_entry(key, options)
           @data.del key
         rescue Errno::ECONNREFUSED => e
           false
         end
 
+
         # Add the namespace defined in the options to a pattern designed to match keys.
         #
         # This implementation is __different__ than ActiveSupport:

data/lib/cache/merb/redis_store.rb

@@ -45,9 +45,13 @@ module Merb
       end
 
       def fetch(key, parameters = {}, conditions = {}, &blk)
-        read(key, parameters) || (write key, yield, parameters, conditions if block_given?)
+        (data = read(key, parameters)) || block_given? && begin
+          data = yield
+          write(key, data, parameters, conditions)
+        end
+        data || nil
       end
-
+      
       def exists?(key, parameters = {})
         @data.exists normalize(key, parameters)
       end

data/lib/cache/sinatra/redis_store.rb

@@ -111,7 +111,11 @@ module Sinatra
       end
 
       def fetch(key, options = {})
-        (!options[:force] && data = read(key, options)) || (write key, yield, options if block_given?)
+        (!options[:force] && data = read(key, options)) || block_given? && begin
+          data = yield
+          write(key, data, options)
+        end
+        data || nil
       end
 
       # Clear all the data from the store.

data/lib/rack/cache/redis_entitystore.rb

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

data/lib/rack/cache/redis_metastore.rb

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

data/lib/redis/store/version.rb

@@ -4,7 +4,7 @@ class Redis
       MAJOR = 1
       MINOR = 0
       TINY  = 0
-      BUILD = "beta5"
+      BUILD = "rc1"
 
       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.beta5"
+  s.version = "1.0.0.rc1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Luca Guidi"]
-  s.date = %q{2011-04-02}
+  s.authors = [%q{Luca Guidi}]
+  s.date = %q{2011-06-05}
   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 = [
@@ -65,8 +65,8 @@ Gem::Specification.new do |s|
     "tasks/redis.tasks.rb"
   ]
   s.homepage = %q{http://github.com/jodosha/redis-store}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
   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",
@@ -88,7 +88,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -100,7 +99,6 @@ Gem::Specification.new do |s|
       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.2.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -110,7 +108,6 @@ Gem::Specification.new do |s|
       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.2.0"])
@@ -121,7 +118,6 @@ Gem::Specification.new do |s|
     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/cache/merb/redis_store_spec.rb

@@ -96,7 +96,7 @@ module Merb
         with_store_management do |store|
           store.fetch("rabbit").should == @rabbit
           store.fetch("rub-a-dub").should be_nil
-          store.fetch("rub-a-dub") { "Flora de Cana" }
+          store.fetch("rub-a-dub") { "Flora de Cana" }.should == "Flora de Cana"
           store.fetch("rub-a-dub").should === "Flora de Cana"
         end
       end

data/spec/cache/sinatra/redis_store_spec.rb

@@ -169,7 +169,7 @@ module Sinatra
         with_store_management do |store|
           store.fetch("rabbit").should == @rabbit
           store.fetch("rub-a-dub").should be_nil
-          store.fetch("rub-a-dub") { "Flora de Cana" }
+          store.fetch("rub-a-dub") { "Flora de Cana" }.should == "Flora de Cana"
           store.fetch("rub-a-dub").should === "Flora de Cana"
           store.fetch("rabbit", :force => true).should be_nil # force cache miss
           store.fetch("rabbit", :force => true, :expires_in => 1.second) { @white_rabbit }

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.beta5"
+    Redis::Store::VERSION::STRING.should == "1.0.0.rc1"
   end
 end

data/tasks/redis.tasks.rb

@@ -154,7 +154,7 @@ namespace :redis do
 
     commit = case ENV['VERSION']
       when "1.2.6" then "570e43c8285a4e5e3f31"
-      when "2.2.2" then "048c0f0f37a67f3f33bd"
+      when "2.2.4" then "2b886275e9756bb8619a"
     end
 
     arguments = commit.nil? ? "pull origin master" : "reset --hard #{commit}"

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: redis-store
 version: !ruby/object:Gem::Version 
-  hash: -1848230055
-  prerelease: true
+  hash: 15424055
+  prerelease: 6
   segments: 
   - 1
   - 0
   - 0
-  - beta5
-  version: 1.0.0.beta5
+  - rc
+  - 1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
 - Luca Guidi
@@ -16,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-02 00:00:00 +02:00
-default_executable: 
+date: 2011-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
@@ -137,22 +137,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: redis
-  prerelease: false
-  requirement: &id009 !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: *id009
 description: Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.
 email: guidi.luca@gmail.com
 executables: []
@@ -209,7 +193,6 @@ files:
 - spec/redis/store_spec.rb
 - spec/spec_helper.rb
 - tasks/redis.tasks.rb
-has_rdoc: true
 homepage: http://github.com/jodosha/redis-store
 licenses: []
 
@@ -241,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.