redpear 0.6.1 → 0.6.2

data/lib/redpear/connection.rb

@@ -3,15 +3,26 @@ module Redpear::Connection
 
   module ClassMethods
 
-    # @return [Redis] the current connection
-    def connection
-      @connection ||= (superclass.respond_to?(:connection) ? superclass.connection : Redis.current)
+    # @return [Redis] the current master connection
+    def master_connection
+      @master_connection ||= (superclass.respond_to?(:master_connection) ? superclass.master_connection : Redis.current)
     end
+    alias_method :connection, :master_connection
 
-    # @param [Redis] the connection to assign
-    def connection=(value)
-      @connection = value
+    # @param [Redis] the master connection to assign
+    def master_connection=(value)
+      @master_connection = value
+    end
+
+    # @return [Redis] the current slave connection
+    def slave_connection
+      @slave_connection
+    end
+
+    # @param [Redis] the slave connection to assign
+    def slave_connection=(value)
+      @slave_connection = value
     end
 
   end
-end
+end

data/lib/redpear/namespace.rb

@@ -5,7 +5,7 @@
 #   end
 #   instance = Comment.save(:post_id => 2)
 #
-#   Comment.connection.keys
+#   Comment.namespace.keys
 #   # => ['comments:1', 'comments:+', 'comments:*', 'comments:post_id:2']
 #
 #   # Instance nesting
@@ -31,10 +31,10 @@ module Redpear::Namespace
 
     # @return [Redpear::Nest] the namespace of this model, Example:
     #
-    #   Comment.namespace # => "comments":Nest
+    #   Comment.namespace # => "comments":Redpear::Nest
     #
     def namespace
-      @namespace ||= Redpear::Nest.new(scope, connection)
+      @namespace ||= Redpear::Nest.new(scope, master_connection, slave_connection)
     end
 
     # @return [String] the scope of this model. Example:

data/lib/redpear/nest.rb

@@ -77,13 +77,23 @@ class Redpear::Nest < ::String
 
   MASTER_METHODS.each do |meth|
     define_method(meth) do |*args, &block|
-      (current || master).send(meth, self, *args, &block)
+      client = current || master
+      if Redis.instance_method(meth).arity.zero?
+        client.send(meth, &block)
+      else
+        client.send(meth, self, *args, &block)
+      end
     end
   end
 
   SLAVE_METHODS.each do |meth|
     define_method(meth) do |*args, &block|
-      (current || slave).send(meth, self, *args, &block)
+      client = current || slave
+      if Redis.instance_method(meth).arity.zero?
+        client.send(meth, &block)
+      else
+        client.send(meth, self, *args, &block)
+      end
     end
   end
 

data/lib/redpear/persistence.rb

@@ -7,7 +7,7 @@ module Redpear::Persistence
     # Runs a bulk-operation.
     # @yield [] operations that should be run in the transaction
     def transaction(&block)
-      connection.multi(&block)
+      namespace.multi(&block)
     end
 
     # Create or update a record. Example:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redpear
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &16530760 !ruby/object:Gem::Requirement
+  requirement: &25862360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *16530760
+  version_requirements: *25862360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16530380 !ruby/object:Gem::Requirement
+  requirement: &25894420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16530380
+  version_requirements: *25894420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16529920 !ruby/object:Gem::Requirement
+  requirement: &25893960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16529920
+  version_requirements: *25893960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16529500 !ruby/object:Gem::Requirement
+  requirement: &25893540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16529500
+  version_requirements: *25893540
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &16529080 !ruby/object:Gem::Requirement
+  requirement: &25893120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16529080
+  version_requirements: *25893120
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &16528660 !ruby/object:Gem::Requirement
+  requirement: &25892700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16528660
+  version_requirements: *25892700
 description: Simple, elegant & efficient ORM for Redis
 email: dimitrij@blacksquaremedia.com
 executables: []