redis-objects 0.2.1 → 0.3.0

data/spec/redis_objects_model_spec.rb

@@ -9,11 +9,16 @@ class Roster
   counter :available_slots, :start => 10
   counter :pitchers, :limit => :max_pitchers
   counter :basic
-  counter :all_players_online, :global => true
   lock :resort, :timeout => 2
-  value :starting_pitcher
-  list :player_stats
-  set :outfielders
+  value :starting_pitcher, :marshal => true
+  list :player_stats, :marshal => true
+  set :outfielders, :marshal => true
+
+  # global class counters
+  counter :total_players_online, :global => true
+  list :all_player_stats, :global => true
+  set :all_players_online, :global => true
+  value :last_player, :global => true
 
   def initialize(id=1) @id = id end
   def id; @id; end
@@ -43,11 +48,17 @@ describe Redis::Objects do
     @roster_3.outfielders.clear
     @roster.redis.del(UNIONSTORE_KEY)
     @roster.redis.del(INTERSTORE_KEY)
+    @roster.redis.del(DIFFSTORE_KEY)
+    
+    Roster.total_players_online.reset
+    Roster.all_player_stats.clear
+    Roster.all_players_online.clear
+    Roster.last_player.delete
   end
 
   it "should provide a connection method" do
     Roster.redis.should == Redis::Objects.redis
-    Roster.redis.should be_kind_of(Redis)
+    # Roster.redis.should be_kind_of(Redis)
   end
 
   it "should create counter accessors" do
@@ -97,6 +108,24 @@ describe Redis::Objects do
     Roster.get_counter(:available_slots, @roster.id).should == 10
   end
 
+  it "should support class-level increment/decrement of global counters" do
+    Roster.total_players_online.should == 0
+    Roster.total_players_online.increment.should == 1
+    Roster.total_players_online.decrement.should == 0
+    Roster.total_players_online.increment(3).should == 3
+    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
+    Roster.decrement_counter(:total_players_online, nil, 2).should == 2
+    Roster.decrement_counter(:total_players_online).should == 1
+    Roster.reset_counter(:total_players_online).should == true
+    Roster.get_counter(:total_players_online).should == 0
+  end
+
   it "should take an atomic block for increment/decrement" do
     a = false
     @roster.available_slots.should == 10
@@ -253,12 +282,27 @@ describe Redis::Objects do
     end
     error.should be_kind_of(NoMethodError)
   end
+
+  it "should support obtain_lock as a class method" do
+    error = nil
+    begin
+      Roster.obtain_lock(:resort, 2) do
+        Roster.redis.get("roster:2:resort_lock").should_not be_nil
+      end
+    rescue => error
+    end
+
+    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'
     @roster.starting_pitcher.should == 'Trevor Hoffman'
     @roster.starting_pitcher.get.should == 'Trevor Hoffman'
+    @roster.starting_pitcher = 'Tom Selleck'
+    @roster.starting_pitcher.should == 'Tom Selleck'
     @roster.starting_pitcher.del.should be_true
     @roster.starting_pitcher.should be_nil
   end
@@ -409,6 +453,162 @@ describe Redis::Objects do
     @roster_1.redis.smembers(UNIONSTORE_KEY).sort.should == ['a','b','c','d','e','f','g','l','m']
   end
 
+  it "should handle class-level global lists of simple values" do
+    Roster.all_player_stats.should be_empty
+    Roster.all_player_stats << 'a'
+    Roster.all_player_stats.should == ['a']
+    Roster.all_player_stats.get.should == ['a']
+    Roster.all_player_stats.unshift 'b'
+    Roster.all_player_stats.to_s.should == 'b, a'
+    Roster.all_player_stats.should == ['b','a']
+    Roster.all_player_stats.get.should == ['b','a']
+    Roster.all_player_stats.push 'c'
+    Roster.all_player_stats.should == ['b','a','c']
+    Roster.all_player_stats.get.should == ['b','a','c']
+    Roster.all_player_stats.first.should == 'b'
+    Roster.all_player_stats.last.should == 'c'
+    Roster.all_player_stats << 'd'
+    Roster.all_player_stats.should == ['b','a','c','d']
+    Roster.all_player_stats[1].should == 'a'
+    Roster.all_player_stats[0].should == 'b'
+    Roster.all_player_stats[2].should == 'c'
+    Roster.all_player_stats[3].should == 'd'
+    Roster.all_player_stats.include?('c').should be_true
+    Roster.all_player_stats.include?('no').should be_false
+    Roster.all_player_stats.pop.should == 'd'
+    Roster.all_player_stats[0].should == Roster.all_player_stats.at(0)
+    Roster.all_player_stats[1].should == Roster.all_player_stats.at(1)
+    Roster.all_player_stats[2].should == Roster.all_player_stats.at(2)
+    Roster.all_player_stats.should == ['b','a','c']
+    Roster.all_player_stats.get.should == ['b','a','c']
+    Roster.all_player_stats.shift.should == 'b'
+    Roster.all_player_stats.should == ['a','c']
+    Roster.all_player_stats.get.should == ['a','c']
+    Roster.all_player_stats << 'e' << 'f' << 'e'
+    Roster.all_player_stats.should == ['a','c','e','f','e']
+    Roster.all_player_stats.get.should == ['a','c','e','f','e']
+    Roster.all_player_stats.delete('e').should == 2
+    Roster.all_player_stats.should == ['a','c','f']
+    Roster.all_player_stats.get.should == ['a','c','f']
+    Roster.all_player_stats << 'j'
+    Roster.all_player_stats.should == ['a','c','f','j']
+    Roster.all_player_stats[0..2].should == ['a','c','f']
+    Roster.all_player_stats[1, 3].should == ['c','f','j']
+    Roster.all_player_stats.length.should == 4
+    Roster.all_player_stats.size.should == 4
+    Roster.all_player_stats.should == ['a','c','f','j']
+    Roster.all_player_stats.get.should == ['a','c','f','j']
+
+    i = -1
+    Roster.all_player_stats.each do |st|
+      st.should == Roster.all_player_stats[i += 1]
+    end
+    Roster.all_player_stats.should == ['a','c','f','j']
+    Roster.all_player_stats.get.should == ['a','c','f','j']
+
+    Roster.all_player_stats.each_with_index do |st,i|
+      st.should == Roster.all_player_stats[i]
+    end
+    Roster.all_player_stats.should == ['a','c','f','j']
+    Roster.all_player_stats.get.should == ['a','c','f','j']
+
+    coll = Roster.all_player_stats.collect{|st| st}
+    coll.should == ['a','c','f','j']
+    Roster.all_player_stats.should == ['a','c','f','j']
+    Roster.all_player_stats.get.should == ['a','c','f','j']
+
+    Roster.all_player_stats << 'a'
+    coll = Roster.all_player_stats.select{|st| st == 'a'}
+    coll.should == ['a','a']
+    Roster.all_player_stats.should == ['a','c','f','j','a']
+    Roster.all_player_stats.get.should == ['a','c','f','j','a']
+  end
+
+  it "should handle class-level global sets of simple values" do
+    Roster.all_players_online.should be_empty
+    Roster.all_players_online << 'a' << 'a' << 'a'
+    Roster.all_players_online.should == ['a']
+    Roster.all_players_online.get.should == ['a']
+    Roster.all_players_online << 'b' << 'b'
+    Roster.all_players_online.to_s.should == 'a, b'
+    Roster.all_players_online.should == ['a','b']
+    Roster.all_players_online.members.should == ['a','b']
+    Roster.all_players_online.get.should == ['a','b']
+    Roster.all_players_online << 'c'
+    Roster.all_players_online.sort.should == ['a','b','c']
+    Roster.all_players_online.get.sort.should == ['a','b','c']
+    Roster.all_players_online.delete('c')
+    Roster.all_players_online.should == ['a','b']
+    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
+    end
+    i.should == Roster.all_players_online.length
+
+    coll = Roster.all_players_online.collect{|st| st}
+    coll.should == ['a','b']
+    Roster.all_players_online.should == ['a','b']
+    Roster.all_players_online.get.should == ['a','b']
+
+    Roster.all_players_online << 'c'
+    Roster.all_players_online.member?('c').should be_true
+    Roster.all_players_online.include?('c').should be_true
+    Roster.all_players_online.member?('no').should be_false
+    coll = Roster.all_players_online.select{|st| st == 'c'}
+    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'
+    Roster.last_player.should == 'Trevor Hoffman'
+    Roster.last_player.get.should == 'Trevor Hoffman'
+    Roster.last_player = 'Tom Selleck'
+    Roster.last_player.should == 'Tom Selleck'
+    Roster.last_player.del.should be_true
+    Roster.last_player.should be_nil
+  end
+
+  it "should easily enable @object.class.global_objects" do
+    @roster.class.all_players_online.should be_empty
+    @roster.class.all_players_online << 'a' << 'a' << 'a'
+    @roster.class.all_players_online.should == ['a']
+    @roster2.class.all_players_online.should == ['a']
+
+    @roster.all_players_online.should == ['a']
+    @roster2.all_players_online.should == ['a']
+
+    @roster.class.all_player_stats.should be_empty
+    @roster.class.all_player_stats << 'a'
+    @roster.class.all_player_stats.should == ['a']
+    @roster.class.all_player_stats.get.should == ['a']
+    @roster.class.all_player_stats.unshift 'b'
+    @roster.class.all_player_stats.to_s.should == 'b, a'
+    @roster.class.all_player_stats.should == ['b','a']
+    @roster2.class.all_player_stats.should == ['b','a']
+
+    @roster.all_player_stats.should == ['b','a']
+    @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'
+    @roster.last_player.get.should == 'Trevor Hoffman'
+    @roster2.last_player.get.should == 'Trevor Hoffman'
+    @roster2.last_player = 'Tom Selleck'
+    @roster.last_player.should == 'Tom Selleck'
+    @roster.last_player.del.should be_true
+    @roster.last_player.should be_nil
+    @roster2.last_player.should be_nil
+  end
+
   it "should handle lists of complex data types" do
     @roster.player_stats << {:json => 'data'}
     @roster.player_stats << {:json2 => 'data2'}
@@ -448,4 +648,5 @@ describe Redis::Objects do
     error.should_not be_nil
     error.should be_kind_of(Redis::Lock::LockTimeout)
   end
+
 end

data/spec/spec_helper.rb

@@ -5,3 +5,4 @@ $redis = Redis.new(:host => ENV['REDIS_HOST'], :port => ENV['REDIS_PORT'])
 
 UNIONSTORE_KEY = 'test:unionstore'
 INTERSTORE_KEY = 'test:interstore'
+DIFFSTORE_KEY  = 'test:diffstore'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: redis-objects
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Nate Wiger
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 -08:00
+date: 2010-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.1"
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 3
+        version: 1.0.3
+  type: :runtime
+  version_requirements: *id001
 description: Map Redis types directly to Ruby objects. Works with any class or ORM.
 email: nate@wiger.org
 executables: []
@@ -30,25 +39,29 @@ extensions: []
 
 extra_rdoc_files: 
 - ATOMICITY.rdoc
+- CHANGELOG.rdoc
 - README.rdoc
 files: 
 - lib/redis/counter.rb
+- lib/redis/helpers/core_commands.rb
+- lib/redis/helpers/serialize.rb
 - lib/redis/list.rb
 - lib/redis/lock.rb
-- lib/redis/objects/core.rb
 - lib/redis/objects/counters.rb
 - lib/redis/objects/lists.rb
 - lib/redis/objects/locks.rb
 - lib/redis/objects/sets.rb
+- lib/redis/objects/sorted_sets.rb
 - lib/redis/objects/values.rb
 - lib/redis/objects.rb
-- lib/redis/serialize.rb
 - lib/redis/set.rb
+- lib/redis/sorted_set.rb
 - lib/redis/value.rb
 - spec/redis_objects_instance_spec.rb
 - spec/redis_objects_model_spec.rb
 - spec/spec_helper.rb
 - ATOMICITY.rdoc
+- CHANGELOG.rdoc
 - README.rdoc
 has_rdoc: true
 homepage: http://github.com/nateware/redis-objects
@@ -64,18 +77,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
-- redis, v0.1 or greater
+- redis, v1.0.3 or greater
 rubyforge_project: redis-objects
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Maps Redis types to Ruby objects

data/lib/redis/serialize.rb

@@ -1,23 +0,0 @@
-class Redis
-  module Serialize
-    include Marshal
-
-    def to_redis(value)
-      case value
-      when String, Fixnum, Bignum, Float
-        value
-      else
-        dump(value)
-      end
-    end
-    
-    def from_redis(value)
-      case value
-      when Array
-        value.collect{|v| from_redis(v)}
-      else
-        restore(value) rescue value
-      end
-    end
-  end
-end