redis_support 0.0.4 → 0.0.5

data/lib/redis_support.rb

@@ -7,31 +7,8 @@ require 'redis_support/class_extensions'
 require 'redis_support/locks'
 
 module RedisSupport
-  # Inspired/take from the redis= in Resque
-  #
-  # Accepts:
-  #   1. A 'hostname:port' string
-  #   2. A 'hostname:port:db' string (to select the Redis db)
-  #   3. An instance of `Redis`, `Redis::Client`
-  def self.redis=(connection)
-    if connection.respond_to? :split
-      host, port, db = connection.split(':')
-      @redis = Redis.new(:host => host,:port => port,:thread_safe => true,:db => db)
-    else
-      @redis = connection
-    end
-  end
-
-  def self.redis
-    @redis
-  end
-
-  def redis=(redis)
-    @redis = redis
-  end
-
   def redis
-    @redis || RedisSupport.redis
+    self.class.redis
   end
 
   def keys
@@ -42,6 +19,22 @@ module RedisSupport
 
   def self.included(model)
     model.extend ClassMethods
-    model.extend RedisSupport
   end
+
+  # Inspired/take from the redis= in Resque
+  #
+  # Accepts:
+  #   1. A 'hostname:port' string
+  #   2. A 'hostname:port:db' string (to select the Redis db)
+  #   3. An instance of `Redis`, `Redis::Client`
+  def self.redis_connect(connection)
+    if connection.respond_to? :split
+      host, port, db = connection.split(':')
+      Redis.new(:host => host,:port => port,:thread_safe => true,:db => db)
+    else
+      connection
+    end
+  end
+
+  extend ClassMethods
 end

data/lib/redis_support/class_extensions.rb

@@ -6,6 +6,14 @@ module RedisSupport
   VAR_PATTERN = /^[A-Z]+(_[A-Z]+)*$/
   STR_PATTERN = /^[a-z_]+$/
   module ClassMethods
+    def redis=(connection)
+      @redis = RedisSupport.redis_connect(connection)
+    end
+
+    def redis
+      @redis || RedisSupport.redis
+    end
+    
     # Goal is to allow a class to declare a redis key/property 
     # The key is a colon delimited string where variables
     # are listed are upper case (underscores inbetween) and

data/test/test_redis_support.rb

@@ -1,8 +1,10 @@
 require File.dirname(__FILE__) + '/helper'
 
-context "Redis Support setup" do
+context "Redis Support Setup" do
   setup do
     RedisSupport.redis = "localhost:9736"
+    TestClass.redis = nil
+    SecondTest.redis = nil
   end
 
   test "redis is loaded correctly" do
@@ -20,6 +22,7 @@ end
 context "Redis Support" do
   setup do
     RedisSupport.redis = "localhost:9736"
+    TestClass.redis = nil
     TestClass.redis.flushall
     @test_class = TestClass.new
   end
@@ -31,10 +34,9 @@ context "Redis Support" do
   end
 
   test "redis connections changes as expected" do
-    TestClass.redis = "localhost:6379"
-    assert_equal @test_class.redis, TestClass.redis
-    @test_class.redis = "localhost:9736"
-    assert_equal @test_class.redis, TestClass.redis
+    TestClass.redis = "localhost:2345"
+    assert_equal @test_class.redis.client.port, RedisSupport.redis_connect("localhost:2345").client.port
+    assert_equal TestClass.redis.client.port, RedisSupport.redis_connect("localhost:2345").client.port
   end
 
   test "redis keys are created correctly in normal conditions" do
@@ -70,3 +72,44 @@ context "Redis Support" do
     end
   end
 end
+
+context "Including Redis Support" do
+  setup do
+    class Foo
+      include RedisSupport
+    end
+    
+    class Bar
+      include RedisSupport
+    end
+
+    Foo.redis = "localhost:2345"
+    Bar.redis = "localhost:3456"
+
+    @foo = Foo.new
+  end
+
+  test "return different server definitions when set" do
+    RedisSupport.redis = Redis.new(:port => 1234, :host => "localhost")
+    assert_equal Foo.redis, Foo.redis # I'm sane, really.
+    assert_not_equal Foo.redis, Bar.redis
+    assert_not_equal Foo.redis, RedisSupport.redis
+    assert_equal @foo.redis, Foo.redis
+
+    assert_raise(NoMethodError) do
+      @foo.redis = "localhost:3456" 
+    end
+  end
+
+  test "same test runs twice in a row (return different server definitions when set)" do
+    RedisSupport.redis = Redis.new(:port => 1234, :host => "localhost")
+    assert_equal Foo.redis, Foo.redis # I'm sane, really.
+    assert_not_equal Foo.redis, Bar.redis
+    assert_not_equal Foo.redis, RedisSupport.redis
+    assert_equal @foo.redis, Foo.redis
+
+    assert_raise(NoMethodError) do
+      @foo.redis = "localhost:3456" 
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis_support
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Brian P O'Rourke
@@ -22,9 +23,11 @@ dependencies:
   name: redis
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 0
@@ -45,6 +48,8 @@ files:
 - lib/redis_support/class_extensions.rb
 - lib/redis_support/locks.rb
 - README.md
+- test/helper.rb
+- test/test_redis_support.rb
 has_rdoc: true
 homepage: http://github.com/dolores/redis_support
 licenses: []
@@ -55,23 +60,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Redis Support module