redpear 0.8.0 → 0.9.0

data/lib/redpear/connection.rb

@@ -57,8 +57,7 @@ class Redpear::Connection
   #   The (optional) slave connection, defaults to master
   def initialize(master = Redis.current, slave = nil)
     @master = _connect(master)
-    @slave  = _connect(slave || master)
-    @transaction = nil
+    @slave  = slave ? _connect(slave) : @master
   end
 
   # @param [Symbol] name
@@ -74,20 +73,6 @@ class Redpear::Connection
     @current = nil
   end
 
-  # Run a transaction, prevents accidental transaction nesting
-  def transaction(&block)
-    if @transaction
-      yield
-    else
-      begin
-        @transaction = true
-        multi(&block)
-      ensure
-        @transaction = nil
-      end
-    end
-  end
-
   MASTER_METHODS.each do |meth|
     define_method(meth) do |*a, &b|
       (current || master).send(meth, *a, &b)

data/lib/redpear/model.rb

@@ -32,15 +32,15 @@ class Redpear::Model < Hash
 
     alias_method :create, :new
 
-    # @param [Redpear::Connection] define a custom connection
+    # @param [Redis] define a custom connection
     attr_writer :connection
 
     # @param [String] define a custom scope
     attr_writer :scope
 
-    # @return [Redpear::Connection] the connection
+    # @return [Redis] the connection
     def connection
-      @connection ||= (superclass.respond_to?(:connection) ? superclass.connection : Redpear::Connection.new)
+      @connection ||= (superclass.respond_to?(:connection) ? superclass.connection : Redis.current)
     end
 
     # @return [String] the scope of this model. Example:
@@ -69,10 +69,16 @@ class Redpear::Model < Hash
       @_pk_counter ||= Redpear::Store::Counter.new nested_key(:+), connection
     end
 
-    # Runs a bulk-operation.
+    # Runs a transactional bulk-operation.
     # @yield operations that should be run in the transaction
     def transaction(&block)
-      connection.transaction(&block)
+      connection.multi(&block)
+    end
+
+    # Runs a bulk-operation.
+    # @yield operations that should be run as bulk
+    def pipelined(&block)
+      connection.pipelined(&block)
     end
 
     # Destroys a record. Example:

data/lib/redpear/store/base.rb

@@ -2,12 +2,20 @@ require 'securerandom'
 
 class Redpear::Store::Base
 
+  # Transforamtions
+  IS_NIL     = lambda {|v| v.nil? }.freeze
+  IS_ZERO    = lambda {|v| v.zero? }.freeze
+  IS_TRUE    = lambda {|v| !!v }.freeze
+  TO_INT     = lambda {|v| v.to_i }.freeze
+  TO_SET     = lambda {|v| v.to_set }.freeze
+  PICK_FIRST = lambda {|v| v.first }.freeze
+
   attr_reader :key, :conn
 
   # Creates and yields over a temporary key.
   # Useful in combination with e.g. `interstore`, `unionstore`, etc.
   #
-  # @param [Redpear::Connection] conn
+  # @param [Redis] conn
   #   The connection
   # @param [Hash] options
   #   The options hash
@@ -32,7 +40,7 @@ class Redpear::Store::Base
   # Constructor
   # @param [String] key
   #   The storage key
-  # @param [Redpear::Connection] conn
+  # @param [Redis] conn
   #   The connection
   def initialize(key, conn)
     @key, @conn = key, conn
@@ -126,4 +134,4 @@ class Redpear::Store::Base
       end
     end
 
-end
+end

data/lib/redpear/store/counter.rb

@@ -1,8 +1,13 @@
 class Redpear::Store::Counter < Redpear::Store::Value
-
+  
   # @return [Integer] the value
   def get
-    super.to_i
+    case value = super
+    when Redis::Future
+      value.instance_eval { @transformation = TO_INT }
+    else
+      value.to_i
+    end
   end
 
   # Sets the value
@@ -41,4 +46,4 @@ class Redpear::Store::Counter < Redpear::Store::Value
   alias_method :previous, :decrement
   alias_method :prev, :decrement
 
-end
+end

data/lib/redpear/store/enumerable.rb

@@ -5,4 +5,16 @@ class Redpear::Store::Enumerable < Redpear::Store::Base
   # @see Redpear::Store::Base#value
   alias_method :value, :to_a
 
-end
+  # Alias for #length
+  # @return [Integer] the length
+  def size
+    length
+  end  
+
+  # Alias for #length
+  # @return [Integer] the length
+  def count
+    length
+  end  
+  
+end

data/lib/redpear/store/hash.rb

@@ -30,7 +30,12 @@ class Redpear::Store::Hash < Redpear::Store::Enumerable
 
   # @return [Boolean] true, if empty
   def empty?
-    length.zero?
+    case value = length
+    when Redis::Future
+      value.instance_eval { @transformation = IS_ZERO }
+    else
+      value.zero?
+    end
   end
 
   # @param [String] field
@@ -70,7 +75,6 @@ class Redpear::Store::Hash < Redpear::Store::Enumerable
   def length
     conn.hlen key
   end
-  alias_method :size, :length
 
   # @param [String] field
   #   The field to increment
@@ -97,9 +101,13 @@ class Redpear::Store::Hash < Redpear::Store::Enumerable
 
   # @param [Hash] hash
   #   The pairs to update
-  def update(hash)
-    merge!(hash)
-    to_hash
+  def update(hash)   
+    case result = merge!(hash) 
+    when Redis::Future
+      result
+    else
+      to_hash
+    end
   end
 
   # @param [Hash] hash
@@ -117,4 +125,4 @@ class Redpear::Store::Hash < Redpear::Store::Enumerable
     other.respond_to?(:to_hash) && other.to_hash == to_hash
   end
 
-end
+end

data/lib/redpear/store/list.rb

@@ -45,13 +45,18 @@ class Redpear::Store::List < Redpear::Store::Enumerable
   # Destructive slice. Returns specified range and removes other items.
   # @overload slice(start, length)
   def slice!(start, length = nil)
-    case start
+    result = case start
     when Range, Array
       trim *range_pair(start)
     else
       trim(start, start + length - 1)
     end
-    to_a
+    case result
+    when Redis::Future
+      result
+    else
+      to_a
+    end
   end
 
   # @param [Integer] start
@@ -71,7 +76,6 @@ class Redpear::Store::List < Redpear::Store::Enumerable
   def length
     conn.llen key
   end
-  alias_method :size, :length
 
   # Appends a single item. Chainable example:
   #   list << 'a' << 'b'
@@ -141,4 +145,4 @@ class Redpear::Store::List < Redpear::Store::Enumerable
     conn.linsert key, :after, pivot, item
   end
 
-end
+end

data/lib/redpear/store/set.rb

@@ -10,14 +10,19 @@ class Redpear::Store::Set < Redpear::Store::Enumerable
 
   # @return [Set] all members
   def all
-    members.to_set
+    case value = members
+    when Redis::Future
+      value.instance_eval { @transformation = TO_SET }
+    else
+      value.to_set
+    end    
   end
   alias_method :to_set, :all
   alias_method :value, :all
 
   # @return [Array] the array of members
   def members
-    conn.smembers(key) || []
+    conn.smembers(key)
   end
   alias_method :to_a, :members
 
@@ -25,7 +30,6 @@ class Redpear::Store::Set < Redpear::Store::Enumerable
   def length
     conn.scard key
   end
-  alias_method :size, :length
 
   # Adds a single value. Chainable example:
   #   set << 'a' << 'b'
@@ -52,7 +56,12 @@ class Redpear::Store::Set < Redpear::Store::Enumerable
 
   # @return [Boolean] true, if empty
   def empty?
-    length.zero?
+    case value = length
+    when Redis::Future
+      value.instance_eval { @transformation = IS_ZERO }
+    else
+      value.zero?
+    end
   end
 
   # Removes a random value
@@ -144,4 +153,4 @@ class Redpear::Store::Set < Redpear::Store::Enumerable
     conn.smove key, target.to_s, value
   end
 
-end
+end

data/lib/redpear/store/sorted_set.rb

@@ -21,7 +21,6 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
   def length
     conn.zcard key
   end
-  alias_method :size, :length
 
   # Returns items from range
   # @param [Range] range
@@ -45,8 +44,7 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
   # @param [String] member
   # @return [Integer] the score for the given `member`
   def score(member)
-    number = conn.zscore(key, member)
-    number.to_f if number
+    conn.zscore(key, member)
   end
   alias_method :[], :score
 
@@ -54,8 +52,7 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
   # @param [String] member
   # @return [Integer] the index for the given `member`
   def index(member)
-    number = conn.zrank(key, member)
-    number.to_i if number
+    conn.zrank(key, member)
   end
   alias_method :rank, :index
 
@@ -63,8 +60,7 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
   # @param [String] member
   # @return [Integer] the index for the given `member`
   def rindex(member)
-    number = conn.zrevrank(key, member)
-    number.to_i if number
+    conn.zrevrank(key, member)
   end
   alias_method :rrank, :rindex
 
@@ -76,13 +72,23 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
 
   # @return [Boolean] true, if member is included
   def include?(member)
-    !!conn.zscore(key, member)
+    case value = conn.zscore(key, member)
+    when Redis::Future
+      value.instance_eval { @transformation = IS_TRUE }
+    else
+      !!value
+    end
   end
   alias_method :member?, :include?
 
   # @return [Boolean] true, if empty
   def empty?
-    length.zero?
+    case value = length
+    when Redis::Future
+      value.instance_eval { @transformation = IS_ZERO }
+    else
+      value.zero?
+    end
   end
 
   # Returns a slice of members between index +range+, with the lower index returned first
@@ -153,7 +159,12 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
   #   Return with scores, defaults to true
   # @return [Array] member + score for given `index`.
   def at(index, options = {})
-    slice(index..index, options).first
+    case value = slice(index..index, options)
+    when Redis::Future
+      value.instance_eval { @transformation = PICK_FIRST }
+    else
+      value.first
+    end
   end
 
   # @return [String] member with the lowest index
@@ -218,14 +229,16 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
   #   The member to increment
   # @param [Integer] by
   #   The increment, defaults to 1
+  # @return [Float] the new value
   def increment(member, by = 1)
-    conn.zincrby(key, by, member).to_f
+    conn.zincrby(key, by, member)
   end
 
   # @param [String] member
   #   The member to decrement
   # @param [Integer] by
   #   The decrement, defaults to 1
+  # @return [Float] the new value
   def decrement(member, by = 1)
     increment member, -by
   end
@@ -238,4 +251,4 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
       conn.send method, key, start, finish, options
     end
 
-end
+end

data/lib/redpear/store/value.rb

@@ -43,12 +43,22 @@ class Redpear::Store::Value < Redpear::Store::Base
   # @param [String] other
   # @return [Boolean] true, if equals `other`
   def ==(other)
-    value == other
+    case value = self.value
+    when Redis::Future
+      value.instance_eval { @transformation = Kernel.lambda {|v| v == other } }
+    else      
+      value == other
+    end
   end
 
   # @return [Boolean] true, if value is nil
   def nil?
-    value.nil?
+    case value = self.value
+    when Redis::Future
+      value.instance_eval { @transformation = IS_NIL }
+    else      
+      value.nil?
+    end
   end
 
   # @return [Boolean] true, if responds to `method`
@@ -63,4 +73,4 @@ class Redpear::Store::Value < Redpear::Store::Base
       base.respond_to?(method) ? base.send(method, *a, &b) : super
     end
 
-end
+end

data/lib/redpear/version.rb

@@ -1,7 +1,7 @@
 module Redpear
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 8
+    MINOR = 9
     TINY  = 0
     PRE   = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redpear
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -123,52 +123,36 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hiredis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Simple, elegant & efficient ORM for Redis
 email: dimitrij@blacksquaremedia.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/redpear.rb
 - lib/redpear/connection.rb
+- lib/redpear/schema.rb
+- lib/redpear/store/lock.rb
+- lib/redpear/store/set.rb
+- lib/redpear/store/base.rb
+- lib/redpear/store/value.rb
+- lib/redpear/store/sorted_set.rb
+- lib/redpear/store/enumerable.rb
+- lib/redpear/store/hash.rb
+- lib/redpear/store/counter.rb
+- lib/redpear/store/list.rb
+- lib/redpear/concern.rb
+- lib/redpear/store.rb
+- lib/redpear/model.rb
 - lib/redpear/schema/column.rb
+- lib/redpear/schema/score.rb
 - lib/redpear/schema/index.rb
 - lib/redpear/schema/collection.rb
-- lib/redpear/schema/score.rb
-- lib/redpear/concern.rb
-- lib/redpear/store.rb
 - lib/redpear/model/factory_girl.rb
 - lib/redpear/model/finders.rb
-- lib/redpear/model/expiration.rb
 - lib/redpear/model/machinist.rb
+- lib/redpear/model/expiration.rb
 - lib/redpear/version.rb
-- lib/redpear/store/lock.rb
-- lib/redpear/store/enumerable.rb
-- lib/redpear/store/counter.rb
-- lib/redpear/store/hash.rb
-- lib/redpear/store/base.rb
-- lib/redpear/store/value.rb
-- lib/redpear/store/list.rb
-- lib/redpear/store/set.rb
-- lib/redpear/store/sorted_set.rb
-- lib/redpear/model.rb
-- lib/redpear/schema.rb
+- lib/redpear.rb
 homepage: https://github.com/bsm/redpear
 licenses: []
 post_install_message: 
@@ -194,3 +178,4 @@ signing_key:
 specification_version: 3
 summary: Redpear, a Redis ORM
 test_files: []
+has_rdoc: