redis-store 1.1.4 → 1.1.5

data/README.md

@@ -1,20 +1,42 @@
 # Redis stores for Ruby frameworks
 
-__Redis Store__ provides a full set of stores (*Cache*, *I18n*, *Session*, *HTTP Cache*) for all the modern Ruby frameworks like: __Ruby on Rails__, __Sinatra__, __Rack__, __Rack::Cache__ and __I18n__. It natively supports object marshalling, timeouts, single or multiple nodes and namespaces.
+__Redis Store__ provides a full set of stores (*Cache*, *I18n*, *Session*, *HTTP Cache*) for modern Ruby frameworks like: __Ruby on Rails__, __Sinatra__, __Rack__, __Rack::Cache__ and __I18n__. It supports object marshalling, timeouts, single or multiple nodes, and namespaces.
 
-See the main [redis-store readme](https://github.com/jodosha/redis-store) for general guidelines.
+Please check the *README* file of each gem for usage and installation guidelines.
 
-If you are using redis-store with Rails, consider using the [redis-rails gem](https://github.com/jodosha/redis-store/tree/master/redis-rails) instead.
+## Redis Installation
+
+### Option 1: Homebrew
+
+MacOS X users should use [Homebrew](https://github.com/mxcl/homebrew) to install Redis:
+
+```shell
+brew install redis
+```
+
+### Option 2: From Source
+
+Download and install Redis from [the download page](http://redis.io//download) and follow the instructions.
 
 ## Running tests
 
-    gem install bundler
-    git clone git://github.com/jodosha/redis-store.git
-    cd redis-store/redis-store
-    ruby ci/run.rb
+```ruby
+git clone git://github.com/jodosha/redis-store.git
+cd redis-store
+gem install bundler
+bundle exec rake
+```
 
 If you are on **Snow Leopard** you have to run `env ARCHFLAGS="-arch x86_64" ruby ci/run.rb`
 
+## Contributors
+
+  * Matt Horan ([@mhoran](https://github.com/mhoran))
+
+## Status
+
+[![Gem Version](https://badge.fury.io/rb/redis-store.png)](http://badge.fury.io/rb/redis-store) [![Build Status](https://secure.travis-ci.org/redis-store/redis-store.png?branch=master)](http://travis-ci.org/jodosha/redis-store?branch=master) [![Code Climate](https://codeclimate.com/github/jodosha/redis-store.png)](https://codeclimate.com/github/redis-store/redis-store)
+
 ## Copyright
 
-(c) 2009 - 2011 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license
+2009 - 2013 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license

data/Rakefile

@@ -1,7 +1,4 @@
-require 'bundler'
-Bundler.setup
+require 'bundler/setup'
 require 'rake'
 require 'bundler/gem_tasks'
-
-load 'tasks/redis.tasks.rb'
-task :default => 'redis:test:suite'
+require 'redis-store/testing/tasks'

data/lib/redis/store/factory.rb

@@ -47,7 +47,9 @@ class Redis
 
       def self.normalize_key_names(options)
         options = options.dup
-        options[:namespace] ||= options.delete(:key_prefix) # RailsSessionStore
+        if options.key?(:key_prefix) && !options.key?(:namespace)
+          options[:namespace] = options.delete(:key_prefix) # RailsSessionStore
+        end
         options
       end
 

data/lib/redis/store/marshalling.rb

@@ -18,7 +18,7 @@ class Redis
       end
 
       def mget(*keys)
-        options = keys.flatten.pop if keys.flatten.last.is_a?(Hash)
+        options = keys.pop if keys.last.is_a?(Hash)
         super(*keys).map do |result|
           _unmarshal result, options
         end

data/lib/redis/store/namespace.rb

@@ -5,10 +5,18 @@ class Redis
         namespace(key) { |key| super(key, val, options) }
       end
 
+      def setex(key, ttl, val, options = nil)
+        namespace(key) { |key| super(key, ttl, val, options) }
+      end
+
       def setnx(key, val, options = nil)
         namespace(key) { |key| super(key, val, options) }
       end
 
+      def ttl(key, options = nil)
+        namespace(key) { |key| super(key) }
+      end
+
       def get(key, options = nil)
         namespace(key) { |key| super(key, options) }
       end
@@ -34,11 +42,27 @@ class Redis
       end
 
       def mget(*keys)
-        super *keys.map {|key| interpolate(key) } if keys.any?
+        options = keys.pop if keys.last.is_a? Hash
+        if keys.any?
+          # Marshalling gets extended before Namespace does, so we need to pass options further
+          if singleton_class.ancestors.include? Marshalling
+            super *keys.map {|key| interpolate(key) }, options
+          else
+            super *keys.map {|key| interpolate(key) }
+          end
+        end
+      end
+      
+      def expire(key, ttl)
+         namespace(key) { |key| super(key, ttl) }
+      end
+      
+      def ttl(key)
+         namespace(key) { |key| super(key) }
       end
 
       def to_s
-        "#{super} with namespace #{@namespace}"
+        "#{super} with namespace #{namespace_str}"
       end
 
       def flushdb
@@ -50,8 +74,12 @@ class Redis
           yield interpolate(key)
         end
 
+        def namespace_str
+          @namespace.is_a?(Proc) ? @namespace.call : @namespace
+        end
+
         def interpolate(key)
-          key.match(namespace_regexp) ? key : "#{@namespace}:#{key}"
+          key.match(namespace_regexp) ? key : "#{namespace_str}:#{key}"
         end
 
         def strip_namespace(key)
@@ -59,7 +87,8 @@ class Redis
         end
 
         def namespace_regexp
-          @namespace_regexp ||= %r{^#{@namespace}\:}
+          @namespace_regexps ||= {}
+          @namespace_regexps[namespace_str] ||= %r{^#{namespace_str}\:}
         end
     end
   end

data/lib/redis/store/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class Store < self
-    VERSION = '1.1.4'
+    VERSION = '1.1.5'
   end
 end

data/redis-store.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.license       = 'MIT'
 
   s.add_dependency 'redis', '>= 2.2'
 
@@ -25,5 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mocha',    '~> 0.14.0'
   s.add_development_dependency 'minitest', '~> 5'
   s.add_development_dependency 'git',      '~> 1.2'
+  s.add_development_dependency 'redis-store-testing'
 end
 

data/test/redis/store/factory_test.rb

@@ -129,6 +129,11 @@ describe "Redis::Store::Factory" do
           "Redis Client connected to 127.0.0.1:6380 against DB 0 with namespace theplaylist",
         ])
       end
+
+      it 'instantiates Redis::Store and sets namespace from String' do
+        store = Redis::Store::Factory.create "redis://127.0.0.1:6379/0/theplaylist", { :expire_after => 5 }
+        store.to_s.must_equal("Redis Client connected to 127.0.0.1:6379 against DB 0 with namespace theplaylist")
+      end
     end
   end
 end

data/test/redis/store/marshalling_test.rb

@@ -10,6 +10,7 @@ describe "Redis::Marshalling" do
   end
 
   def teardown
+    @store.flushdb
     @store.quit
   end
 
@@ -124,4 +125,4 @@ describe "Redis::Marshalling" do
       @store.get(utf8_key, :raw => true).bytes.to_a.must_equal(ascii_string.bytes.to_a)
     end
   end if defined?(Encoding)
-end
+end

data/test/redis/store/namespace_test.rb

@@ -6,10 +6,19 @@ describe "Redis::Store::Namespace" do
     @store  = Redis::Store.new :namespace => @namespace, :marshalling => false # TODO remove mashalling option
     @client = @store.instance_variable_get(:@client)
     @rabbit = "bunny"
+    @default_store = Redis::Store.new
+    @other_store = Redis::Store.new :namespace => 'other'
   end
 
   def teardown
+    @store.flushdb
     @store.quit
+
+    @default_store.flushdb
+    @default_store.quit
+
+    @other_store.flushdb
+    @other_store.quit
   end
 
   it "only decorates instances that need to be namespaced" do
@@ -24,14 +33,12 @@ describe "Redis::Store::Namespace" do
   end
 
   it "should only delete namespaced keys" do
-    other_store = Redis::Store.new
-
-    other_store.set 'abc', 'cba'
+    @default_store.set 'abc', 'cba'
     @store.set 'def', 'fed'
 
     @store.flushdb
     @store.get('def').must_equal(nil)
-    other_store.get('abc').must_equal('cba')
+    @default_store.get('abc').must_equal('cba')
   end
 
   it "should not try to delete missing namespaced keys" do
@@ -40,64 +47,97 @@ describe "Redis::Store::Namespace" do
     empty_store.keys.must_be_empty
   end
 
-  it "namespaces get"
-  it "namespaces set"
-  it "namespaces setnx"
-  it "namespaces del with single key"
-  it "namespaces del with multiple keys"
-  it "namespaces keys"
-  it "namespaces exists"
-  it "namespaces incrby"
-  it "namespaces decrby"
-  it "namespaces mget"
-
-  # it "should namespace get" do
-  #   @client.expects(:call).with([:get, "#{@namespace}:rabbit"]).once
-  #   @store.get("rabbit")
-  # end
-  #
-  # it "should namespace set" do
-  #   @client.should_receive(:call).with([:set, "#{@namespace}:rabbit", @rabbit])
-  #   @store.set "rabbit", @rabbit
-  # end
-  #
-  # it "should namespace setnx" do
-  #   @client.should_receive(:call).with([:setnx, "#{@namespace}:rabbit", @rabbit])
-  #   @store.setnx "rabbit", @rabbit
-  # end
-  #
-  # it "should namespace del with single key" do
-  #   @client.should_receive(:call).with([:del, "#{@namespace}:rabbit"])
-  #   @store.del "rabbit"
-  # end
-  #
-  # it "should namespace del with multiple keys" do
-  #   @client.should_receive(:call).with([:del, "#{@namespace}:rabbit", "#{@namespace}:white_rabbit"])
-  #   @store.del "rabbit", "white_rabbit"
-  # end
-  #
-  # it "should namespace keys" do
-  #   @store.set "rabbit", @rabbit
-  #   @store.keys("rabb*").should == [ "rabbit" ]
-  # end
-  #
-  # it "should namespace exists" do
-  #   @client.should_receive(:call).with([:exists, "#{@namespace}:rabbit"])
-  #   @store.exists "rabbit"
-  # end
-  #
-  # it "should namespace incrby" do
-  #   @client.should_receive(:call).with([:incrby, "#{@namespace}:counter", 1])
-  #   @store.incrby "counter", 1
-  # end
-  #
-  # it "should namespace decrby" do
-  #   @client.should_receive(:call).with([:decrby, "#{@namespace}:counter", 1])
-  #   @store.decrby "counter", 1
-  # end
-  #
-  # it "should namespace mget" do
-  #   @client.should_receive(:call).with([:mget, "#{@namespace}:rabbit", "#{@namespace}:white_rabbit"])
-  #   @store.mget "rabbit", "white_rabbit"
-  # end
+  it "should work with dynamic namespace" do
+    $ns = "ns1"
+    dyn_store = Redis::Store.new :namespace => -> { $ns }
+    dyn_store.set 'key', 'x'
+    $ns = "ns2"
+    dyn_store.set 'key', 'y'
+    $ns = "ns3"
+    dyn_store.set 'key', 'z'
+    dyn_store.flushdb
+    r3 = dyn_store.get 'key'
+    $ns = "ns2"
+    r2 = dyn_store.get 'key'
+    $ns = "ns1"
+    r1 = dyn_store.get 'key'
+    r1.must_equal('x') && r2.must_equal('y') && r3.must_equal(nil)
+  end
+
+  it "namespaces setex and ttl" do
+    @store.flushdb
+    @other_store.flushdb
+
+    @store.setex('foo', 30, 'bar')
+    @store.ttl('foo').must_be_close_to(30)
+    @store.get('foo').must_equal('bar')
+
+    @other_store.ttl('foo').must_equal(-2)
+    @other_store.get('foo').must_be_nil
+  end
+
+  describe 'method calls' do
+    let(:store){Redis::Store.new :namespace => @namespace, :marshalling => false}
+    let(:client){store.instance_variable_get(:@client)}
+
+    it "should namespace get" do
+       client.expects(:call).with([:get, "#{@namespace}:rabbit"]).once
+       store.get("rabbit")
+    end
+
+    it "should namespace set" do
+       client.expects(:call).with([:set, "#{@namespace}:rabbit", @rabbit])
+       store.set "rabbit", @rabbit
+    end
+
+    it "should namespace setnx" do
+       client.expects(:call).with([:setnx, "#{@namespace}:rabbit", @rabbit])
+       store.setnx "rabbit", @rabbit
+    end
+
+    it "should namespace del with single key" do
+       client.expects(:call).with([:del, "#{@namespace}:rabbit"])
+       store.del "rabbit"
+    end
+
+    it "should namespace del with multiple keys" do
+       client.expects(:call).with([:del, "#{@namespace}:rabbit", "#{@namespace}:white_rabbit"])
+       store.del "rabbit", "white_rabbit"
+    end
+
+    it "should namespace keys" do
+       store.set "rabbit", @rabbit
+       store.keys("rabb*").must_equal [ "rabbit" ]
+    end
+
+    it "should namespace exists" do
+       client.expects(:call).with([:exists, "#{@namespace}:rabbit"])
+       store.exists "rabbit"
+    end
+
+    it "should namespace incrby" do
+       client.expects(:call).with([:incrby, "#{@namespace}:counter", 1])
+       store.incrby "counter", 1
+    end
+
+    it "should namespace decrby" do
+       client.expects(:call).with([:decrby, "#{@namespace}:counter", 1])
+       store.decrby "counter", 1
+    end
+
+    it "should namespace mget" do
+       client.expects(:call).with([:mget, "#{@namespace}:rabbit", "#{@namespace}:white_rabbit"])
+       store.mget "rabbit", "white_rabbit"
+    end
+
+    it "should namespace expire" do
+       client.expects(:call).with([:expire, "#{@namespace}:rabbit", 60]).once
+       store.expire("rabbit",60)
+    end
+
+    it "should namespace ttl" do
+       client.expects(:call).with([:ttl, "#{@namespace}:rabbit"]).once
+       store.ttl("rabbit")
+    end
+  end
 end

data/test/redis/store_test.rb

@@ -1,11 +1,16 @@
 require 'test_helper'
 
 describe Redis::Store do
-  before do
+  def setup
     @store  = Redis::Store.new
     @client = @store.instance_variable_get(:@client)
   end
 
+  def teardown
+    @store.flushdb
+    @store.quit
+  end
+
   it "returns useful informations about the server" do
     @store.to_s.must_equal("Redis Client connected to #{@client.host}:#{@client.port} against DB #{@client.db}")
   end

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: redis-store
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: redis-store-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for
   Ruby web frameworks.
 email:
@@ -102,6 +116,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
+- CHANGELOG
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -115,11 +132,7 @@ files:
 - lib/redis/store/namespace.rb
 - lib/redis/store/ttl.rb
 - lib/redis/store/version.rb
-- lib/tasks/redis.tasks.rb
 - redis-store.gemspec
-- test/config/node-one.conf
-- test/config/node-two.conf
-- test/config/redis.conf
 - test/redis/distributed_store_test.rb
 - test/redis/store/factory_test.rb
 - test/redis/store/interface_test.rb
@@ -130,7 +143,8 @@ files:
 - test/redis/store_test.rb
 - test/test_helper.rb
 homepage: http://redis-store.org/redis-store
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -138,24 +152,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: redis-store
-rubygems_version: 2.0.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Redis stores for Ruby frameworks
 test_files:
-- test/config/node-one.conf
-- test/config/node-two.conf
-- test/config/redis.conf
 - test/redis/distributed_store_test.rb
 - test/redis/store/factory_test.rb
 - test/redis/store/interface_test.rb