redis-objects 0.6.0 → 0.7.0

data/spec/redis_objects_instance_spec.rb

@@ -1,13 +1,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-require 'redis/counter'
-require 'redis/list'
-require 'redis/value'
-require 'redis/lock'
-require 'redis/set'
-require 'redis/sorted_set'
-require 'redis/hash_key'
+require 'redis/objects'
 
 describe Redis::Value do
   before do
@@ -27,6 +21,8 @@ describe Redis::Value do
     @value.get.should == 'Trevor Hoffman'
     @value.del.should == 1
     @value.should.be.nil
+    @value.value = 42
+    @value.value.should == '42'
   end
 
   it "should handle complex marshaled values" do
@@ -100,7 +96,6 @@ describe Redis::List do
   describe "as a bounded list" do
     before do
       @list = Redis::List.new('spec/bounded_list',
-                              $redis,
                               :maxlength => 10)
       1.upto(10) do |i|
         @list << i
@@ -330,7 +325,7 @@ end
 
 describe Redis::Lock do
   before do
-    $redis.flushall
+    REDIS_HANDLE.flushall
   end
 
   it "should set the value to the expiration" do
@@ -338,7 +333,7 @@ describe Redis::Lock do
     expiry = 15
     lock = Redis::Lock.new(:test_lock, :expiration => expiry)
     lock.lock do
-      expiration = $redis.get("test_lock").to_f
+      expiration = REDIS_HANDLE.get("test_lock").to_f
 
       # The expiration stored in redis should be 15 seconds from when we started
       # or a little more
@@ -346,17 +341,17 @@ describe Redis::Lock do
     end
 
     # key should have been cleaned up
-    $redis.get("test_lock").should.be.nil
+    REDIS_HANDLE.get("test_lock").should.be.nil
   end
 
   it "should set value to 1 when no expiration is set" do
     lock = Redis::Lock.new(:test_lock)
     lock.lock do
-      $redis.get('test_lock').should == '1'
+      REDIS_HANDLE.get('test_lock').should == '1'
     end
 
     # key should have been cleaned up
-    $redis.get("test_lock").should.be.nil
+    REDIS_HANDLE.get("test_lock").should.be.nil
   end
 
   it "should let lock be gettable when lock is expired" do
@@ -364,7 +359,7 @@ describe Redis::Lock do
     lock = Redis::Lock.new(:test_lock, :expiration => expiry, :timeout => 0.1)
 
     # create a fake lock in the past
-    $redis.set("test_lock", Time.now-(expiry + 60))
+    REDIS_HANDLE.set("test_lock", Time.now-(expiry + 60))
 
     gotit = false
     lock.lock do
@@ -373,7 +368,7 @@ describe Redis::Lock do
 
     # should get the lock because it has expired
     gotit.should.be.true
-    $redis.get("test_lock").should.be.nil
+    REDIS_HANDLE.get("test_lock").should.be.nil
   end
 
   it "should not let non-expired locks be gettable" do
@@ -381,7 +376,7 @@ describe Redis::Lock do
     lock = Redis::Lock.new(:test_lock, :expiration => expiry, :timeout => 0.1)
 
     # create a fake lock
-    $redis.set("test_lock", (Time.now + expiry).to_f)
+    REDIS_HANDLE.set("test_lock", (Time.now + expiry).to_f)
 
     gotit = false
     error = nil
@@ -398,7 +393,7 @@ describe Redis::Lock do
     gotit.should.not.be.true
 
     # lock value should still be set
-    $redis.get("test_lock").should.not.be.nil
+    REDIS_HANDLE.get("test_lock").should.not.be.nil
   end
 
   it "should not remove the key if lock is held past expiration" do
@@ -409,7 +404,7 @@ describe Redis::Lock do
     end
 
     # lock value should still be set since the lock was held for more than the expiry
-    $redis.get("test_lock").should.not.be.nil
+    REDIS_HANDLE.get("test_lock").should.not.be.nil
   end
 end
 
@@ -417,8 +412,7 @@ end
 describe Redis::HashKey do
   describe "With Marshal" do
     before do
-      @hash = Redis::HashKey.new('test_hash', $redis,
-                                {:marshal_keys=>{'created_at'=>true}})
+      @hash = Redis::HashKey.new('test_hash', {:marshal_keys=>{'created_at'=>true}})
       @hash.clear
     end
 
@@ -449,7 +443,7 @@ describe Redis::HashKey do
   end
 
   before do
-    @hash  = Redis::HashKey.new('test_hash')
+    @hash = Redis::HashKey.new('test_hash')
     @hash.clear
   end
   

data/spec/redis_objects_model_spec.rb

@@ -2,7 +2,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 require 'redis/objects'
-Redis::Objects.redis = $redis
 
 class Roster
   include Redis::Objects
@@ -20,7 +19,7 @@ class Roster
   counter :total_players_online, :global => true
   set :all_players_online, :global => true
   value :last_player, :global => true
-  
+
   # custom keys
   counter :player_totals, :key => 'players/#{username}/total'
   list :all_player_stats, :key => 'players:all_stats', :global => true
@@ -52,14 +51,14 @@ class MethodRoster
   def increment(attribute, by=1)
     42
   end
-  
+
   def initialize(id=1) @id = id end
   def id; @id; end
 end
 
 class CustomMethodRoster < MethodRoster
   include Redis::Objects
-  
+
   attr_accessor :counter
   counter :basic
 end
@@ -68,7 +67,7 @@ describe Redis::Objects do
   before do
     @roster  = Roster.new
     @roster2 = Roster.new
-    
+
     @roster_1 = Roster.new(1)
     @roster_2 = Roster.new(2)
     @roster_3 = Roster.new(3)
@@ -96,7 +95,7 @@ describe Redis::Objects do
     Roster.all_players_online.clear
     Roster.last_player.delete
     Roster.weird_key.clear
-    
+
     @roster.player_totals.clear
     @roster.all_player_stats.clear
     @roster.total_wins.clear
@@ -173,11 +172,11 @@ describe Redis::Objects do
        @roster.respond_to?(m).should == true
      end
   end
-  
+
   it "should support increment/decrement of counters" do
     @roster.available_slots.key.should == 'roster:1:available_slots'
     @roster.available_slots.should == 10
-    
+
     # math proxy ops
     (@roster.available_slots == 10).should.be.true
     (@roster.available_slots <= 10).should.be.true
@@ -204,7 +203,7 @@ describe Redis::Objects do
     @roster2.basic.decrement.should == 0
     @roster.basic.get.should == 0
   end
-  
+
   it "should support class-level increment/decrement of counters" do
     Roster.get_counter(:available_slots, @roster.id).should == 10
     Roster.increment_counter(:available_slots, @roster.id).should == 11
@@ -225,7 +224,7 @@ describe Redis::Objects do
     Roster.total_players_online.decrement(2).should == 1
     Roster.total_players_online.reset.should.be.true
     Roster.total_players_online.should == 0
-    
+
     Roster.get_counter(:total_players_online).should == 0
     Roster.increment_counter(:total_players_online).should == 1
     Roster.increment_counter(:total_players_online, nil, 3).should == 4
@@ -247,21 +246,28 @@ describe Redis::Objects do
     end
     @roster.available_slots.should == 9
     a.should.be.true
-    
+
     @roster.available_slots.should == 9
     @roster.available_slots.decr do |cnt|
       @roster.available_slots.should == 8
       false
     end
     @roster.available_slots.should == 8
-    
+
     @roster.available_slots.should == 8
     @roster.available_slots.decr do |cnt|
       @roster.available_slots.should == 7
       nil  # should rewind
     end
     @roster.available_slots.should == 8
-    
+
+    @roster.available_slots.should == 8
+    @roster.available_slots.decr(4) do |cnt|
+      @roster.available_slots.should == 4
+      nil  # should rewind
+    end
+    @roster.available_slots.should == 8
+
     @roster.available_slots.should == 8
     @roster.available_slots.incr do |cnt|
       if 1 == 2  # should rewind
@@ -270,6 +276,14 @@ describe Redis::Objects do
     end
     @roster.available_slots.should == 8
 
+    @roster.available_slots.should == 8
+    @roster.available_slots.incr(5) do |cnt|
+      if 1 == 2  # should rewind
+        true
+      end
+    end
+    @roster.available_slots.should == 8
+
     @roster.available_slots.should == 8
     @roster.available_slots.incr do |cnt|
       @roster.available_slots.should == 9
@@ -286,7 +300,7 @@ describe Redis::Objects do
     rescue
     end
     @roster.available_slots.should == 9
-    
+
     # check return value from the block
     value =
       @roster.available_slots.decr do |cnt|
@@ -322,6 +336,13 @@ describe Redis::Objects do
     end
     Roster.get_counter(:available_slots, @roster.id).should == 8
 
+    Roster.get_counter(:available_slots, @roster.id).should == 8
+    Roster.decrement_counter(:available_slots, @roster.id, 4) do |cnt|
+      Roster.get_counter(:available_slots, @roster.id).should == 4
+      nil  # should rewind
+    end
+    Roster.get_counter(:available_slots, @roster.id).should == 8
+
     Roster.get_counter(:available_slots, @roster.id).should == 8
     Roster.increment_counter(:available_slots, @roster.id) do |cnt|
       if 1 == 2  # should rewind
@@ -330,6 +351,14 @@ describe Redis::Objects do
     end
     Roster.get_counter(:available_slots, @roster.id).should == 8
 
+    Roster.get_counter(:available_slots, @roster.id).should == 8
+    Roster.increment_counter(:available_slots, @roster.id, 4) do |cnt|
+      if 1 == 2  # should rewind
+        true
+      end
+    end
+    Roster.get_counter(:available_slots, @roster.id).should == 8
+
     Roster.get_counter(:available_slots, @roster.id).should == 8
     Roster.increment_counter(:available_slots, @roster.id) do |cnt|
       Roster.get_counter(:available_slots, @roster.id).should == 9
@@ -406,7 +435,7 @@ describe Redis::Objects do
     error.should.be.nil
     Roster.redis.get("roster:2:resort_lock").should.be.nil
   end
-  
+
   it "should handle simple values" do
     @roster.starting_pitcher.should == nil
     @roster.starting_pitcher = 'Trevor Hoffman'
@@ -515,7 +544,7 @@ describe Redis::Objects do
     @roster.outfielders.get.sort.should == ['a','b']
     @roster.outfielders.length.should == 2
     @roster.outfielders.size.should == 2
-    
+
     i = 0
     @roster.outfielders.each do |st|
       i += 1
@@ -535,7 +564,7 @@ describe Redis::Objects do
     coll.should == ['c']
     @roster.outfielders.sort.should == ['a','b','c']
   end
-  
+
   it "should handle set intersections and unions" do
     @roster_1.outfielders << 'a' << 'b' << 'c' << 'd' << 'e'
     @roster_2.outfielders << 'c' << 'd' << 'e' << 'f' << 'g'
@@ -651,7 +680,7 @@ describe Redis::Objects do
     Roster.all_players_online.get.sort.should == ['a','b']
     Roster.all_players_online.length.should == 2
     Roster.all_players_online.size.should == 2
-    
+
     i = 0
     Roster.all_players_online.each do |st|
       i += 1
@@ -671,7 +700,7 @@ describe Redis::Objects do
     coll.should == ['c']
     Roster.all_players_online.sort.should == ['a','b','c']
   end
-  
+
   it "should handle class-level global values" do
     Roster.last_player.should == nil
     Roster.last_player = 'Trevor Hoffman'
@@ -705,7 +734,7 @@ describe Redis::Objects do
     @roster2.all_player_stats.should == ['b','a']
     @roster2.all_player_stats << 'b'
     @roster.all_player_stats.should == ['b','a','b']
-    
+
     @roster.last_player.should == nil
     @roster.class.last_player = 'Trevor Hoffman'
     @roster.last_player.should == 'Trevor Hoffman'
@@ -727,7 +756,7 @@ describe Redis::Objects do
     @roster.player_stats.last.should == [1,2,3,[4,5]]
     @roster.player_stats.shift.should == {:json => 'data'}
   end
-  
+
   it "should handle sets of complex data types" do
     @roster.outfielders << {:a => 1}
     @roster.outfielders.members.should == [{:a => 1}]
@@ -747,7 +776,7 @@ describe Redis::Objects do
     end
     a.should.be.true
   end
-  
+
   it "should raise an exception if the timeout is exceeded" do
     @roster.redis.set(@roster.resort_lock.key, 1)
     error = nil
@@ -799,7 +828,7 @@ describe Redis::Objects do
   it "should handle new subclass objects" do
     @custom_roster.special.increment.should == 1
   end
-  
+
   it "should allow passing of increment/decrement to super class" do
     @custom_method_roster = CustomMethodRoster.new
     @custom_method_roster.counter.should.be.nil
@@ -814,4 +843,55 @@ describe Redis::Objects do
     @custom_method_roster.basic.should == 0
     @custom_method_roster.basic.should.be.kind_of(Redis::Counter)
   end
+
+  it "should pick up class methods from superclass automatically" do
+    CounterRoster = Class.new(Roster)
+    CounterRoster.counter :extended_counter
+    extended_roster = CounterRoster.new
+    extended_roster.basic.should.be.kind_of(Redis::Counter)
+    extended_roster.extended_counter.should.be.kind_of(Redis::Counter)
+    @roster.respond_to?(:extended_counter).should == false
+
+    HashKeyRoster = Class.new(Roster)
+    HashKeyRoster.hash_key :extended_hash_key
+    extended_roster = HashKeyRoster.new
+    extended_roster.contact_information.should.be.kind_of(Redis::HashKey)
+    extended_roster.extended_hash_key.should.be.kind_of(Redis::HashKey)
+    @roster.respond_to?(:extended_hash_key).should == false
+
+    LockRoster = Class.new(Roster)
+    LockRoster.lock :extended
+    extended_roster = LockRoster.new
+    extended_roster.resort_lock.should.be.kind_of(Redis::Lock)
+    extended_roster.extended_lock.should.be.kind_of(Redis::Lock)
+    @roster.respond_to?(:extended_lock).should == false
+
+    ValueRoster = Class.new(Roster)
+    ValueRoster.value :extended_value
+    extended_roster = ValueRoster.new
+    extended_roster.starting_pitcher.should.be.kind_of(Redis::Value)
+    extended_roster.extended_value.should.be.kind_of(Redis::Value)
+    @roster.respond_to?(:extended_value).should == false
+
+    ListRoster = Class.new(Roster)
+    ListRoster.list :extended_list
+    extended_roster = ListRoster.new
+    extended_roster.player_stats.should.be.kind_of(Redis::List)
+    extended_roster.extended_list.should.be.kind_of(Redis::List)
+    @roster.respond_to?(:extended_list).should == false
+
+    SetRoster = Class.new(Roster)
+    SetRoster.set :extended_set
+    extended_roster = SetRoster.new
+    extended_roster.outfielders.should.be.kind_of(Redis::Set)
+    extended_roster.extended_set.should.be.kind_of(Redis::Set)
+    @roster.respond_to?(:extended_set).should == false
+
+    SortedSetRoster = Class.new(Roster)
+    SortedSetRoster.sorted_set :extended_sorted_set
+    extended_roster = SortedSetRoster.new
+    extended_roster.rank.should.be.kind_of(Redis::SortedSet)
+    extended_roster.extended_sorted_set.should.be.kind_of(Redis::SortedSet)
+    @roster.respond_to?(:extended_sorted_set).should == false
+  end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,8 @@ if $0 =~ /\brspec$/
   raise "\n===\nThese tests are in bacon, not rspec.  Try: bacon #{ARGV * ' '}\n===\n"
 end
 
+REDIS_CLASS_NAMES = [:Counter, :HashKey, :List, :Lock, :Set, :SortedSet, :Value]
+
 UNIONSTORE_KEY = 'test:unionstore'
 INTERSTORE_KEY = 'test:interstore'
 DIFFSTORE_KEY  = 'test:diffstore'
@@ -19,10 +21,17 @@ REDIS_PORT = ENV['REDIS_PORT'] || 9212
 REDIS_HOST = ENV['REDIS_HOST'] || 'localhost'
 REDIS_PID  = File.expand_path 'redis.pid', File.dirname(__FILE__)
 REDIS_DUMP = File.expand_path 'redis.rdb', File.dirname(__FILE__)
-puts "=> Starting redis-server on #{REDIS_HOST}:#{REDIS_PORT}"
-fork_pid = fork do
-  system "(echo port #{REDIS_PORT}; echo logfile /dev/null; echo daemonize yes; echo pidfile #{REDIS_PID}; echo dbfilename #{REDIS_DUMP}) | #{REDIS_BIN} -"
+
+describe 'redis-server' do
+  it "starting redis-server on #{REDIS_HOST}:#{REDIS_PORT}" do
+    fork_pid = fork do
+      system "(echo port #{REDIS_PORT}; echo logfile /dev/null; echo daemonize yes; echo pidfile #{REDIS_PID}; echo dbfilename #{REDIS_DUMP}) | #{REDIS_BIN} -"
+    end
+    fork_pid.should > 0
+    sleep 2 
+  end
 end
+
 at_exit do
   pid = File.read(REDIS_PID).to_i
   puts "=> Killing #{REDIS_BIN} with pid #{pid}"
@@ -32,11 +41,22 @@ at_exit do
   File.unlink REDIS_DUMP if File.exists? REDIS_DUMP
 end
 
+def raises_exception(&block)
+  e = nil
+  begin
+    block.call
+  rescue => e
+  end
+  e.should.be.is_a?(StandardError)
+end
+
 # Grab a global handle
-$redis = Redis.new(:host => REDIS_HOST, :port => REDIS_PORT)
+REDIS_HANDLE = Redis.new(:host => REDIS_HOST, :port => REDIS_PORT)
+#$redis = REDIS_HANDLE
+Redis.current = REDIS_HANDLE
 
 SORT_ORDER = {:order => 'desc alpha'}
 SORT_LIMIT = {:limit => [2, 2]}
-SORT_BY = {:by => 'm_*'}
-SORT_GET = {:get => 'spec/*/sorted'}.merge!(SORT_LIMIT)
+SORT_BY    = {:by => 'm_*'}
+SORT_GET   = {:get => 'spec/*/sorted'}.merge!(SORT_LIMIT)
 SORT_STORE = {:store => "spec/aftersort"}.merge!(SORT_GET)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -27,70 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.2
-- !ruby/object:Gem::Dependency
-  name: redis-namespace
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bacon
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -123,36 +59,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.2
 description: Map Redis types directly to Ruby objects. Works with any class or ORM.
-email: nate@wiger.org
+email: nwiger@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 files:
 - ATOMICITY.rdoc
 - CHANGELOG.rdoc
 - Gemfile
-- Gemfile.lock
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
+- lib/redis-objects.rb
 - lib/redis/base_object.rb
 - lib/redis/counter.rb
 - lib/redis/hash_key.rb
@@ -172,8 +92,10 @@ files:
 - lib/redis/sorted_set.rb
 - lib/redis/value.rb
 - redis-objects.gemspec
+- spec/redis_autoload_objects_spec.rb
 - spec/redis_namespace_compat_spec.rb
 - spec/redis_objects_active_record_spec.rb
+- spec/redis_objects_conn_spec.rb
 - spec/redis_objects_instance_spec.rb
 - spec/redis_objects_model_spec.rb
 - spec/spec_helper.rb
@@ -189,17 +111,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4220055926051714921
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- redis, v3.0.2 or greater
+requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 

data/Gemfile.lock

@@ -1,43 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    bacon (1.1.0)
-    builder (3.0.4)
-    git (1.2.5)
-    i18n (0.6.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.5)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    redis (3.0.2)
-    redis-namespace (1.2.1)
-      redis (~> 3.0.0)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  bacon
-  jeweler
-  redis (>= 3.0.2)
-  redis-namespace