redis-store 1.1.3 → 1.1.4

data/test/redis/{factory_test.rb → store/factory_test.rb}

@@ -1,10 +1,10 @@
 require 'test_helper'
 
-describe "Redis::Factory" do
+describe "Redis::Store::Factory" do
   describe ".create" do
     describe "when not given any arguments" do
       it "instantiates Redis::Store" do
-        store = Redis::Factory.create
+        store = Redis::Store::Factory.create
         store.must_be_kind_of(Redis::Store)
         store.to_s.must_equal("Redis Client connected to 127.0.0.1:6379 against DB 0")
       end
@@ -12,42 +12,42 @@ describe "Redis::Factory" do
 
     describe "when given a Hash" do
       it "uses specified host" do
-        store = Redis::Factory.create :host => "localhost"
+        store = Redis::Store::Factory.create :host => "localhost"
         store.to_s.must_equal("Redis Client connected to localhost:6379 against DB 0")
       end
 
       it "uses specified port" do
-        store = Redis::Factory.create :host => "localhost", :port => 6380
+        store = Redis::Store::Factory.create :host => "localhost", :port => 6380
         store.to_s.must_equal("Redis Client connected to localhost:6380 against DB 0")
       end
 
       it "uses specified db" do
-        store = Redis::Factory.create :host => "localhost", :port => 6380, :db => 13
+        store = Redis::Store::Factory.create :host => "localhost", :port => 6380, :db => 13
         store.to_s.must_equal("Redis Client connected to localhost:6380 against DB 13")
       end
 
       it "uses specified namespace" do
-        store = Redis::Factory.create :namespace => "theplaylist"
+        store = Redis::Store::Factory.create :namespace => "theplaylist"
         store.to_s.must_equal("Redis Client connected to 127.0.0.1:6379 against DB 0 with namespace theplaylist")
       end
 
       it "uses specified key_prefix as namespace" do
-        store = Redis::Factory.create :key_prefix => "theplaylist"
+        store = Redis::Store::Factory.create :key_prefix => "theplaylist"
         store.to_s.must_equal("Redis Client connected to 127.0.0.1:6379 against DB 0 with namespace theplaylist")
       end
 
       it "uses specified password" do
-        store = Redis::Factory.create :password => "secret"
+        store = Redis::Store::Factory.create :password => "secret"
         store.instance_variable_get(:@client).password.must_equal("secret")
       end
 
       it "allows/disable marshalling" do
-        store = Redis::Factory.create :marshalling => false
+        store = Redis::Store::Factory.create :marshalling => false
         store.instance_variable_get(:@marshalling).must_equal(false)
       end
 
       it "should instantiate a Redis::DistributedStore store" do
-        store = Redis::Factory.create(
+        store = Redis::Store::Factory.create(
           {:host => "localhost", :port => 6379},
           {:host => "localhost", :port => 6380}
         )
@@ -61,32 +61,32 @@ describe "Redis::Factory" do
 
     describe "when given a String" do
       it "uses specified host" do
-        store = Redis::Factory.create "redis://127.0.0.1"
+        store = Redis::Store::Factory.create "redis://127.0.0.1"
         store.to_s.must_equal("Redis Client connected to 127.0.0.1:6379 against DB 0")
       end
 
       it "uses specified port" do
-        store = Redis::Factory.create "redis://127.0.0.1:6380"
+        store = Redis::Store::Factory.create "redis://127.0.0.1:6380"
         store.to_s.must_equal("Redis Client connected to 127.0.0.1:6380 against DB 0")
       end
 
       it "uses specified db" do
-        store = Redis::Factory.create "redis://127.0.0.1:6380/13"
+        store = Redis::Store::Factory.create "redis://127.0.0.1:6380/13"
         store.to_s.must_equal("Redis Client connected to 127.0.0.1:6380 against DB 13")
       end
 
       it "uses specified namespace" do
-        store = Redis::Factory.create "redis://127.0.0.1:6379/0/theplaylist"
+        store = Redis::Store::Factory.create "redis://127.0.0.1:6379/0/theplaylist"
         store.to_s.must_equal("Redis Client connected to 127.0.0.1:6379 against DB 0 with namespace theplaylist")
       end
 
       it "uses specified password" do
-        store = Redis::Factory.create "redis://:secret@127.0.0.1:6379/0/theplaylist"
+        store = Redis::Store::Factory.create "redis://:secret@127.0.0.1:6379/0/theplaylist"
         store.instance_variable_get(:@client).password.must_equal("secret")
       end
 
       it "instantiates Redis::DistributedStore" do
-        store = Redis::Factory.create "redis://127.0.0.1:6379", "redis://127.0.0.1:6380"
+        store = Redis::Store::Factory.create "redis://127.0.0.1:6379", "redis://127.0.0.1:6380"
         store.must_be_kind_of(Redis::DistributedStore)
         store.nodes.map {|node| node.to_s }.must_equal([
           "Redis Client connected to 127.0.0.1:6379 against DB 0",
@@ -94,5 +94,41 @@ describe "Redis::Factory" do
         ])
       end
     end
+
+    describe 'when given host Hash and options Hash' do 
+      it 'instantiates Redis::Store and merges options' do
+        store = Redis::Store::Factory.create(
+          { :host => '127.0.0.1', :port => '6379' }, 
+          { :namespace => 'theplaylist' }
+        )
+      end
+
+      it 'instantiates Redis::DistributedStore and merges options' do 
+        store = Redis::Store::Factory.create(
+          { :host => '127.0.0.1', :port => '6379' }, 
+          { :host => '127.0.0.1', :port => '6380' }, 
+          { :namespace => 'theplaylist' }
+        )
+        store.nodes.map {|node| node.to_s }.must_equal([
+          "Redis Client connected to 127.0.0.1:6379 against DB 0 with namespace theplaylist",
+          "Redis Client connected to 127.0.0.1:6380 against DB 0 with namespace theplaylist"
+        ])
+      end
+    end
+
+    describe 'when given host String and options Hash' do 
+      it 'instantiates Redis::Store and merges options' do 
+        store = Redis::Store::Factory.create "redis://127.0.0.1", { :namespace => 'theplaylist' }
+        store.to_s.must_equal("Redis Client connected to 127.0.0.1:6379 against DB 0 with namespace theplaylist")
+      end
+
+      it 'instantiates Redis::DistributedStore and merges options' do 
+        store = Redis::Store::Factory.create "redis://127.0.0.1:6379", "redis://127.0.0.1:6380", { :namespace => 'theplaylist' }
+        store.nodes.map {|node| node.to_s }.must_equal([
+          "Redis Client connected to 127.0.0.1:6379 against DB 0 with namespace theplaylist",
+          "Redis Client connected to 127.0.0.1:6380 against DB 0 with namespace theplaylist",
+        ])
+      end
+    end
   end
 end

data/test/redis/store/marshalling_test.rb

@@ -28,7 +28,7 @@ describe "Redis::Marshalling" do
     end
   else
     it "doesn't unmarshal on get if raw option is true" do
-      @store.get("rabbit", :raw => true).must_equal("\004\bU:\017OpenStruct{\006:\tname\"\nbunny")
+      @store.get("rabbit", :raw => true).must_include("\x04\bU:\x0FOpenStruct{\x06:\tname")
     end
   end
 
@@ -84,8 +84,8 @@ describe "Redis::Marshalling" do
     it "doesn't unmarshal on multi get if raw option is true" do
       @store.set "rabbit2", @white_rabbit
       rabbit, rabbit2 = @store.mget "rabbit", "rabbit2", :raw => true
-      rabbit.must_equal("\004\bU:\017OpenStruct{\006:\tname\"\nbunny")
-      rabbit2.must_equal("\004\bU:\017OpenStruct{\006:\ncolor\"\nwhite")
+      rabbit.must_include("\x04\bU:\x0FOpenStruct{\x06:\tname")
+      rabbit2.must_include("\x04\bU:\x0FOpenStruct{\x06:\ncolor")
     end
   end
 

data/test/redis/store/version_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 describe Redis::Store::VERSION do
-  it "must be equal to 1.1.3" do
-    Redis::Store::VERSION.must_equal '1.1.3'
+  it 'returns current version' do
+    Redis::Store::VERSION.must_equal '1.1.4'
   end
 end

data/test/test_helper.rb

@@ -1,8 +1,6 @@
-Bundler.setup
-gem 'minitest'
-require 'minitest/spec'
+require 'bundler/setup'
 require 'minitest/autorun'
-require 'mocha'
+require 'mocha/setup'
 require 'redis'
 require 'redis-store'
 

metadata

@@ -1,129 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: redis-store
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.1.4
 platform: ruby
 authors:
 - Luca Guidi
-- Matt Horan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
-- !ruby/object:Gem::Dependency
-  name: purdytest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.2'
 description: Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for
   Ruby web frameworks.
 email:
@@ -138,8 +108,8 @@ files:
 - Rakefile
 - lib/redis-store.rb
 - lib/redis/distributed_store.rb
-- lib/redis/factory.rb
 - lib/redis/store.rb
+- lib/redis/store/factory.rb
 - lib/redis/store/interface.rb
 - lib/redis/store/marshalling.rb
 - lib/redis/store/namespace.rb
@@ -151,7 +121,7 @@ files:
 - test/config/node-two.conf
 - test/config/redis.conf
 - test/redis/distributed_store_test.rb
-- test/redis/factory_test.rb
+- test/redis/store/factory_test.rb
 - test/redis/store/interface_test.rb
 - test/redis/store/marshalling_test.rb
 - test/redis/store/namespace_test.rb
@@ -159,36 +129,35 @@ files:
 - test/redis/store/version_test.rb
 - test/redis/store_test.rb
 - test/test_helper.rb
-homepage: http://jodosha.github.com/redis-store
+homepage: http://redis-store.org/redis-store
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: redis-store
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+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/factory_test.rb
+- test/redis/store/factory_test.rb
 - test/redis/store/interface_test.rb
 - test/redis/store/marshalling_test.rb
 - test/redis/store/namespace_test.rb
@@ -196,4 +165,3 @@ test_files:
 - test/redis/store/version_test.rb
 - test/redis/store_test.rb
 - test/test_helper.rb
-has_rdoc: 

data/lib/redis/factory.rb

@@ -1,41 +0,0 @@
-require 'uri'
-
-class Redis
-  class Factory
-    def self.create(*redis_client_options)
-      redis_client_options = redis_client_options.flatten.compact.inject([]) do |result, address|
-        result << resolve(address)
-        result
-      end
-      if redis_client_options.size > 1
-        ::Redis::DistributedStore.new redis_client_options
-      else
-        ::Redis::Store.new redis_client_options.first || {}
-      end
-    end
-
-    def self.resolve(uri) #:api: private
-      if uri.is_a?(Hash)
-        options = uri.dup
-        options[:namespace] ||= options.delete(:key_prefix) # RailsSessionStore
-        options
-      else
-        uri = URI.parse(uri)
-        _, db, namespace = if uri.path
-          uri.path.split /\//
-        end
-
-        options = {
-          :host     => uri.host,
-          :port     => uri.port || 6379,
-          :password => uri.password
-        }
-
-        options[:db]        = db.to_i   if db
-        options[:namespace] = namespace if namespace
-
-        options
-      end
-    end
-  end
-end