redpear 0.9.1 → 1.0.0

data/lib/redpear.rb

@@ -4,9 +4,8 @@ require "set"
 require "securerandom"
 
 module Redpear
-  autoload :Concern,    "redpear/concern"
-  autoload :Connection, "redpear/connection"
-  autoload :Model,      "redpear/model"
-  autoload :Schema,     "redpear/schema"
-  autoload :Store,      "redpear/store"
 end
+
+%w|concern store|.each do |name|
+  require "redpear/#{name}"
+end

data/lib/redpear/model.rb

@@ -1,4 +1,5 @@
 require 'redpear'
+require 'redpear/schema'
 
 =begin
 Redis is a simple key/value store, hence storing structured data can be a
@@ -21,8 +22,8 @@ Redpear::Model is VERY lightweight. It is optimised for raw speed at the
 expense of convenience.
 =end
 class Redpear::Model < Hash
-  autoload :Finders, 'redpear/model/finders'
-  autoload :Expiration, 'redpear/model/expiration'
+  require 'redpear/model/finders'
+  require 'redpear/model/expiration'
 
   include Redpear::Schema
   include Finders

data/lib/redpear/schema.rb

@@ -1,8 +1,4 @@
 module Redpear::Schema
-  autoload :Collection, 'redpear/schema/collection'
-  autoload :Column, 'redpear/schema/column'
-  autoload :Index, 'redpear/schema/index'
-  autoload :Score, 'redpear/schema/score'
   extend Redpear::Concern
 
   module ClassMethods
@@ -42,3 +38,7 @@ module Redpear::Schema
 
   end
 end
+
+%w|collection column index score|.each do |name|
+  require "redpear/schema/#{name}"
+end

data/lib/redpear/store.rb

@@ -1,11 +1,6 @@
 module Redpear::Store
-  autoload :Base, 'redpear/store/base'
-  autoload :Counter, 'redpear/store/counter'
-  autoload :Enumerable, 'redpear/store/enumerable'
-  autoload :Hash, 'redpear/store/hash'
-  autoload :List,  'redpear/store/list'
-  autoload :Lock,  'redpear/store/lock'
-  autoload :Set,  'redpear/store/set'
-  autoload :SortedSet,  'redpear/store/sorted_set'
-  autoload :Value,  'redpear/store/value'
-end
+end
+
+%w|base value counter enumerable hash list lock set sorted_set|.each do |name|
+  require "redpear/store/#{name}"
+end

data/lib/redpear/store/base.rb

@@ -60,7 +60,8 @@ class Redpear::Store::Base
   # Watch this key
   # @return [Boolean] true if successful
   def watch(&block)
-    conn.watch(key, &block).nil?
+    conn.watch(key, &block)
+    true
   end
 
   # @return [Integer] remaining time-to-live in seconds (if set)

data/lib/redpear/version.rb

@@ -1,8 +1,8 @@
 module Redpear
   module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 9
-    TINY  = 1
+    MAJOR = 1
+    MINOR = 0
+    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.9.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -130,29 +130,28 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/redpear.rb
-- lib/redpear/connection.rb
-- lib/redpear/schema/column.rb
-- lib/redpear/schema/index.rb
-- lib/redpear/schema/collection.rb
-- lib/redpear/schema/score.rb
+- lib/redpear/schema.rb
 - lib/redpear/concern.rb
+- lib/redpear/model.rb
+- lib/redpear/version.rb
 - lib/redpear/store.rb
+- lib/redpear/model/machinist.rb
 - lib/redpear/model/factory_girl.rb
 - lib/redpear/model/finders.rb
 - lib/redpear/model/expiration.rb
-- lib/redpear/model/machinist.rb
-- lib/redpear/version.rb
+- lib/redpear/store/list.rb
+- lib/redpear/store/set.rb
+- lib/redpear/store/sorted_set.rb
 - lib/redpear/store/lock.rb
+- lib/redpear/store/value.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/store/counter.rb
+- lib/redpear/schema/collection.rb
+- lib/redpear/schema/column.rb
+- lib/redpear/schema/index.rb
+- lib/redpear/schema/score.rb
 homepage: https://github.com/bsm/redpear
 licenses: []
 post_install_message: 
@@ -173,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Redpear, a Redis ORM

data/lib/redpear/connection.rb

@@ -1,99 +0,0 @@
-# == Redpear::Connection
-#
-# Abstract connection class, with support for master/slave sharding.
-# @see Redpear::Connection#initialize for examples
-#
-class Redpear::Connection
-
-  MASTER_METHODS = [
-    :append, :blpop, :brpop, :brpoplpush, :decr, :decrby, :del, :discard,
-    :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,
-    :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, :[]=
-  ].freeze
-
-  SLAVE_METHODS = [
-    :auth, :bgrewriteaof, :bgsave, :config, :dbsize, :debug, :get, :getbit,
-    :getrange, :echo, :exists, :flushall, :flushdb, :hget, :hmget, :hexists,
-    :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, :slowlog, :smembers,
-    :sort, :srandmember, :strlen, :subscribe, :subscribed?, :sunion, :sync, :synchronize,
-    :time, :ttl, :type, :unsubscribe, :zcard, :zcount, :zrange,
-    :zrangebyscore, :zrank, :zrevrange, :zrevrangebyscore, :zrevrank, :zscore,
-    :[]
-  ].freeze
-
-  # @return [Symbol] ther current connection, either :master or :slave
-  attr_reader   :current
-  attr_accessor :master, :slave
-
-  # Constructor, accepts a master connection and an optional slave connection.
-  # Connections can be instances of Redis::Client, URL strings, or e.g.
-  # ConnectionPool objects. Examples:
-  #
-  #   # Use current redis client as master and slave
-  #   Redpear::Connection.new Redis.current
-  #
-  #   # Use current redis client as slave and a remote URL as master
-  #   Redpear::Connection.new "redis://master.host:6379", Redis.current
-  #
-  #   # Use a connection pool - https://github.com/mperham/connection_pool
-  #   slave_pool = ConnectionPool.new(:size => 5, :timeout => 5) { Redis.connect("redis://slave.host:6379") }
-  #   Redpear::Connection.new "redis://master.host:6379", slave_pool
-  #
-  # @param [Redis::Client|String|ConnectionPool] master
-  #   The master connection, defaults to `Redis.current`
-  # @param [Redis::Client|String|ConnectionPool] slave
-  #   The (optional) slave connection, defaults to master
-  def initialize(master = Redis.current, slave = nil)
-    @master = _connect(master)
-    @slave  = slave ? _connect(slave) : @master
-  end
-
-  # @param [Symbol] name
-  #   Either :master or :slave
-  # @yield
-  #   Perform a block with the given connection
-  # @yieldparam [Redpear::Connection]
-  #   The chosen connection, master or slave
-  def on(name)
-    @current = send(name)
-    yield(@current)
-  ensure
-    @current = nil
-  end
-
-  MASTER_METHODS.each do |meth|
-    define_method(meth) do |*a, &b|
-      (current || master).send(meth, *a, &b)
-    end
-  end
-
-  SLAVE_METHODS.each do |meth|
-    define_method(meth) do |*a, &b|
-      (current || slave).send(meth, *a, &b)
-    end
-  end
-
-  private
-
-    def _connect(conn)
-      case conn
-      when String
-        Redis.connect(:url => conn)
-      else
-        conn
-      end
-    end
-
-end