redpear 0.5.0 → 0.6.0

data/lib/redpear/model.rb

@@ -58,16 +58,23 @@ class Redpear::Model < Hash
     self["id"] = value.to_s
   end
 
-  # Custom comparator
-  # @return [Boolean]
+  # Custom comparator, inspired by ActiveRecord::Base#==
+  # @param [Object] other the comparison object
+  # @return [Boolean] true, if +other+ is persisted and ID 
   def ==(other)
     case other
     when Redpear::Model
-      other.instance_of?(self.class) && to_hash(true) == other.to_hash(true)
+      other.instance_of?(self.class) && persisted? && other.id == id
     else
       super
     end
   end
+  alias :eql? :==
+
+  # Use ID as base for hash
+  def hash
+    id.hash
+  end
 
   # Attribute reader with type-casting
   # @return [Object]

data/lib/redpear/namespace.rb

@@ -9,8 +9,8 @@
 #   # => ['comments:1', 'comments:+', 'comments:*', 'comments:post_id:2']
 #
 #   # Instance nesting
-#   instance.nest                  # => 'comments:1'
-#   instance.nest.mapped_hmget_all # => { "post_id" => "2" }
+#   instance.nest                 # => 'comments:1'
+#   instance.nest.hgetall         # => { "post_id" => "2" }
 #
 #   # Member nesting
 #   Comment.mb_nest               # "comments:[~]"

data/lib/redpear/nest.rb

@@ -1,13 +1,90 @@
-class Redpear::Nest < ::Nest
+# Nested redis key-value store, with master slave support
+# Heavily "inspired" by the nest library
+# Original copyright: Michel Martens & Damian Janowski
+class Redpear::Nest < ::String
 
-  [:mapped_hmget, :mapped_hmset].each do |meth|
+  MASTER_METHODS = %w|
+    append auth
+    bgrewriteaof bgsave blpop brpop brpoplpush
+    config
+    decr decrby del discard
+    exec expire expireat
+    flushall flushdb getset
+    hset hsetnx hincrby hmset hdel
+    incr incrby
+    linsert lpop lpush lpushx lrem lset ltrim
+    mapped_hmset mapped_mset mapped_msetnx
+    move mset msetnx multi
+    persist pipelined psubscribe punsubscribe quit
+    rename renamenx rpop rpoplpush rpush rpushx
+    sadd save sdiffstore set setbit
+    setex setnx setrange sinterstore
+    shutdown smove spop srem subscribe
+    sunionstore sync synchronize
+    unsubscribe unwatch watch
+    zadd zincrby zinterstore zrem
+    zremrangebyrank zremrangebyscore zunionstore
+  |.freeze
+
+  SLAVE_METHODS = %w|
+    dbsize debug get getbit getrange
+    echo exists
+    hget hmget hexists hlen hkeys hvals hgetall
+    info keys lastsave lindex llen lrange
+    mapped_hmget mapped_mget mget monitor
+    object ping publish randomkey
+    scard sdiff select sinter sismember slaveof
+    smembers sort srandmember strlen substr sunion
+    ttl type
+    zcard zcount zrange zrangebyscore zrank
+    zrevrange zrevrangebyscore zrevrank zscore
+  |.freeze
+
+  attr_reader :master, :slave, :current
+
+  # Constructor
+  # @param [String] key
+  #   The redis key
+  # @param [Redis::Client|Redis::Namespace|ConnectionPool] master
+  #   The master connection, optional, defaults to the current connection
+  # @param [Redis::Client|Redis::Namespace|ConnectionPool] slave
+  #   The slave connection, optional, defaults to master
+  def initialize(key, master = Redis.current, slave = nil)
+    super(key)
+    @master = master
+    @slave  = slave || master
+  end
+
+  # @param [multiple] keys
+  #   Nest within these keys
+  # @return [Redpear::Nest]
+  #   The nested key
+  def [](*keys)
+    self.class.new [self, *keys].join(':'), master, slave
+  end
+
+  # @param [Symbol] name
+  #   Either :master or :slave
+  # @yield
+  #   Perform a block with the given connection
+  def with_connection(name)
+    @current = send(name)
+    yield
+  ensure
+    @current = nil
+  end
+  alias_method :with, :with_connection
+
+  MASTER_METHODS.each do |meth|
     define_method(meth) do |*args, &block|
-      redis.send(meth, self, *args, &block)
+      (current || master).send(meth, self, *args, &block)
     end
   end
 
-  def mapped_hmget_all
-    mapped_hmget *hkeys
+  SLAVE_METHODS.each do |meth|
+    define_method(meth) do |*args, &block|
+      (current || slave).send(meth, self, *args, &block)
+    end
   end
 
 end

data/lib/redpear/persistence.rb

@@ -52,7 +52,7 @@ module Redpear::Persistence
 
   # Load attributes from DB (destructive)
   def refresh_attributes
-    update nest.mapped_hmget(*__loadable_attributes__) if persisted?
+    update nest.hgetall if persisted?
     @__loaded__ = true
     self
   end
@@ -130,11 +130,6 @@ module Redpear::Persistence
       result
     end
 
-    # Attributes that can be loaded
-    def __loadable_attributes__
-      self.class.columns.names
-    end
-
     def __persistable_value__(value)
       case value
       when Time

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redpear
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000Z
+date: 2011-12-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &19999180 !ruby/object:Gem::Requirement
+  requirement: &19913160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *19999180
+  version_requirements: *19913160
 - !ruby/object:Gem::Dependency
   name: nest
-  requirement: &19998660 !ruby/object:Gem::Requirement
+  requirement: &19933600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *19998660
+  version_requirements: *19933600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19998180 !ruby/object:Gem::Requirement
+  requirement: &19933220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19998180
+  version_requirements: *19933220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19997620 !ruby/object:Gem::Requirement
+  requirement: &19932760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19997620
+  version_requirements: *19932760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19997060 !ruby/object:Gem::Requirement
+  requirement: &19932340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19997060
+  version_requirements: *19932340
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &19996200 !ruby/object:Gem::Requirement
+  requirement: &19931920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19996200
+  version_requirements: *19931920
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &19995740 !ruby/object:Gem::Requirement
+  requirement: &19931500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,32 +87,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19995740
+  version_requirements: *19931500
 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/collection.rb
-- lib/redpear/core_ext/stringify_keys.rb
-- lib/redpear/concern.rb
 - lib/redpear/zmembers.rb
+- lib/redpear/column.rb
 - lib/redpear/namespace.rb
+- lib/redpear/connection.rb
+- lib/redpear/persistence.rb
+- lib/redpear/schema.rb
+- lib/redpear/index.rb
+- lib/redpear/concern.rb
 - lib/redpear/nest.rb
 - lib/redpear/finders.rb
+- lib/redpear/model.rb
 - lib/redpear/zindex.rb
-- lib/redpear/persistence.rb
+- lib/redpear/schema/collection.rb
+- lib/redpear/core_ext/stringify_keys.rb
+- lib/redpear/machinist.rb
+- lib/redpear/counters.rb
 - lib/redpear/expiration.rb
-- lib/redpear/column.rb
-- lib/redpear/model.rb
-- lib/redpear/index.rb
 - lib/redpear/members.rb
-- lib/redpear/schema.rb
-- lib/redpear/counters.rb
-- lib/redpear/machinist.rb
+- lib/redpear.rb
 homepage: https://github.com/bsm/redpear
 licenses: []
 post_install_message: