redpear 0.7.7 → 0.8.0

data/lib/redpear/connection.rb

@@ -7,11 +7,14 @@ class Redpear::Connection
 
   MASTER_METHODS = [
     :append, :blpop, :brpop, :brpoplpush, :decr, :decrby, :del, :discard,
-    :exec, :expire, :expireat, :getset, :hset, :hsetnx, :hincrby, :hmset,
-    :hdel, :incr, :incrby, :linsert, :lpop, :lpush, :lpushx, :lrem, :lset,
-    :ltrim, :mapped_hmset, :mapped_mset, :mapped_msetnx, :move, :mset, :msetnx,
+    :eval, :evalsha, :exec, :expire, :expireat, :getset,
+    :hset, :hsetnx, :hincrby, :hmset, :hdel, :hincrbyfloat,
+    :incr, :incrby, :incrbyfloat,
+    :linsert, :lpop, :lpush, :lpushx, :lrem, :lset, :ltrim,
+    :mapped_hmset, :mapped_mset, :mapped_msetnx, :move, :mset, :msetnx,
     :multi, :persist, :pipelined, :rename, :renamenx, :rpop, :rpoplpush,
-    :rpush, :rpushx, :sadd, :sdiffstore, :set, :setbit, :setex, :setnx,
+    :pexpire, :pexpireat, :psetex, :pttl, :rpush, :rpushx,
+    :sadd, :script, :sdiffstore, :set, :setbit, :setex, :setnx,
     :setrange, :sinterstore, :smove, :spop, :srem, :sunionstore, :unwatch,
     :watch, :zadd, :zincrby, :zinterstore, :zrem, :zremrangebyrank,
     :zremrangebyscore, :zunionstore, :[]=
@@ -23,9 +26,9 @@ class Redpear::Connection
     :hlen, :hkeys, :hvals, :hgetall, :info, :keys, :lastsave, :lindex, :llen,
     :lrange, :mapped_hmget, :mapped_mget, :mget, :monitor, :object, :ping,
     :publish, :psubscribe, :punsubscribe, :quit, :randomkey, :save, :scard,
-    :sdiff, :select, :shutdown, :sinter, :sismember, :slaveof, :smembers,
-    :sort, :srandmember, :strlen, :subscribe, :subscribed?, :substr, :sunion,
-    :sync, :synchronize, :ttl, :type, :unsubscribe, :zcard, :zcount, :zrange,
+    :sdiff, :select, :shutdown, :sinter, :sismember, :slaveof, :slowlog, :smembers,
+    :sort, :srandmember, :strlen, :subscribe, :subscribed?, :sunion, :sync, :synchronize,
+    :time, :ttl, :type, :unsubscribe, :zcard, :zcount, :zrange,
     :zrangebyscore, :zrank, :zrevrange, :zrevrangebyscore, :zrevrank, :zscore,
     :[]
   ].freeze

data/lib/redpear/model.rb

@@ -214,11 +214,9 @@ class Redpear::Model < Hash
   # @return [Boolean] true if successful
   def destroy
     before_destroy
-    self.class.transaction do
-      lookups.each {|l| l.delete(id) }
-      attributes.purge!
-      after_destroy
-    end
+    lookups.each {|l| l.delete(id) }
+    attributes.purge!
+    after_destroy
     freeze
   end
 

data/lib/redpear/store/base.rb

@@ -51,8 +51,8 @@ class Redpear::Store::Base
 
   # Watch this key
   # @return [Boolean] true if successful
-  def watch
-    conn.watch(key) == "OK"
+  def watch(&block)
+    conn.watch(key, &block).nil?
   end
 
   # @return [Integer] remaining time-to-live in seconds (if set)
@@ -115,11 +115,15 @@ class Redpear::Store::Base
 
   private
 
-    def range_pair(range)
-      first = range.first.to_i
-      last  = range.last.to_i
-      last -= 1 if range.exclude_end?
-      [first, last]
+    def range_pair(value, reversed = false)
+      case value
+      when Range
+        first, last = value.first.to_i, value.last.to_i
+        last -= 1 if value.exclude_end?
+        reversed ? [last, first] : [first, last]
+      when Array
+        [value.first, value.last]
+      end
     end
 
 end

data/lib/redpear/store/list.rb

@@ -34,7 +34,7 @@ class Redpear::Store::List < Redpear::Store::Enumerable
       else
         conn.lindex(key, start) rescue nil
       end
-    when Range
+    when Range, Array
       range *range_pair(start)
     else
       []
@@ -46,7 +46,7 @@ class Redpear::Store::List < Redpear::Store::Enumerable
   # @overload slice(start, length)
   def slice!(start, length = nil)
     case start
-    when Range
+    when Range, Array
       trim *range_pair(start)
     else
       trim(start, start + length - 1)

data/lib/redpear/store/sorted_set.rb

@@ -23,6 +23,7 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
   end
   alias_method :size, :length
 
+  # Returns items from range
   # @param [Range] range
   # @return [Integer] the number of items within given score `range`
   def count(range)
@@ -86,7 +87,6 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
 
   # Returns a slice of members between index +range+, with the lower index returned first
   # @param [Range] range
-  #   The index range of the elements
   # @param [Hash] options
   # @option [Boolean] with_scores
   #   Return with scores, defaults to true
@@ -98,8 +98,7 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
   alias_method :top, :slice
 
   # Returns a slice of members between rindex +range+, with the higher index returned first
-  # @param [Range] range
-  #   The rindex range of the elements
+  # @param [Range] range The rindex range of the elements
   # @param [Hash] options
   # @option [Boolean] with_scores
   #   Return with scores, defaults to true
@@ -111,8 +110,10 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
   alias_method :bottom, :rslice
 
   # Selects members between a score +range+. Lower scores returned first
-  # @param [Range] range
-  #   The score range of the elements
+  # @overload select(range)
+  #   @param [Range] range The score range of the elements
+  # @overload select(range)
+  #   @param [Array] range as Array, e.g. ["-inf", "+inf"]
   # @param [Hash] options
   # @option [Boolean] with_scores
   #   Return with scores, defaults to true
@@ -125,8 +126,10 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
   end
 
   # Selects members between a score +range+. Higher scores returned first
-  # @param [Range] range
-  #   The score range of the elements
+  # @overload rselect(range)
+  #   @param [Range] range The score range of the elements
+  # @overload rselect(range)
+  #   @param [Array] range as Array, e.g. ["-inf", "+inf"]
   # @param [Hash] options
   # @option [Boolean] with_scores
   #   Return with scores, defaults to true
@@ -134,7 +137,7 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
   #   Limit the results
   # @return [Array] the members
   def rselect(range, options = {})
-    start, finish = range_pair(range)
+    finish, start = range_pair(range, true)
     fetch_range :zrevrangebyscore, finish, start, options
   end
 
@@ -232,8 +235,7 @@ class Redpear::Store::SortedSet < Redpear::Store::Enumerable
     def fetch_range(method, start, finish, options = {})
       options[:limit]       = [options[:offset] || 0, options[:limit]] if options[:offset] || options[:limit]
       options[:with_scores] = true unless options.key?(:with_scores)
-      result = conn.send method, key, start, finish, options
-      options[:with_scores] ? result.each_slice(2).map {|m,s| [m, s.to_f] } : result
+      conn.send method, key, start, finish, options
     end
 
 end

data/lib/redpear/version.rb

@@ -1,8 +1,8 @@
 module Redpear
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 7
-    TINY  = 7
+    MINOR = 8
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redpear
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &7458360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *7458360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7457740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7457740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &7457080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7457080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7456440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7456440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &7455900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7455900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &7455480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7455480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &7455060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7455060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &7454620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7454620
+  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: []
@@ -149,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Redpear, a Redis ORM