From e42dd1518cdcae7fa79c239504158a6b311de7d8 Mon Sep 17 00:00:00 2001
From: Nate Wiger <nate@wiger.org>
Date: Mon, 23 May 2011 16:40:46 -0700
Subject: [PATCH] fixed failing tests which were caused by bad couter defn in
 spec

---
 lib/redis/objects.rb                     | 6 +++---
 lib/redis/objects/counters.rb            | 2 +-
 spec/redis_objects_active_record_spec.rb | 5 +++--
 spec/redis_objects_model_spec.rb         | 5 ++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/redis/objects.rb b/lib/redis/objects.rb
index ccaf79c..52a042d 100644
--- a/lib/redis/objects.rb
+++ b/lib/redis/objects.rb
@@ -91,15 +91,15 @@ def redis_prefix(klass = self) #:nodoc:
 
       def redis_field_key(name, id=nil) #:nodoc:
         klass = first_ancestor_with(name)
-        # This can never ever ever ever change or upgrades will corrupt all data
-        # to comment above: I don't think people where using Proc as keys before (that would create a weird key). Should be ok
+        # READ THIS: This can never ever ever ever change or upgrades will corrupt all data
+        # I don't think people were using Proc as keys before (that would create a weird key). Should be ok
         key = klass.redis_objects[name.to_sym][:key]
         if key && key.respond_to?(:call)
           key = key.call self
         end
         if id.nil? and !klass.redis_objects[name.to_sym][:global]
           raise NilObjectId,
-            "Attempt to address redis-object :#{name} on class #{klass.name} with nil id (unsaved record?) [object_id=#{object_id}]"
+            "[#{klass.redis_objects[name.to_sym]}] Attempt to address redis-object :#{name} on class #{klass.name} with nil id (unsaved record?) [object_id=#{object_id}]"
         end
         key || "#{redis_prefix(klass)}:#{id}:#{name}"
       end
diff --git a/lib/redis/objects/counters.rb b/lib/redis/objects/counters.rb
index df02abf..85fceec 100644
--- a/lib/redis/objects/counters.rb
+++ b/lib/redis/objects/counters.rb
@@ -83,7 +83,7 @@ def reset_counter(name, id=nil, to=nil)
         private
         
         def verify_counter_defined!(name, id) #:nodoc:
-          raise Redis::Objects::UndefinedCounter, "Undefined counter :#{name} for class #{self.name}" unless counter_defined?(name)
+          raise NoMethodError, "Undefined counter :#{name} for class #{self.name}" unless counter_defined?(name)
           if id.nil? and !@redis_objects[name][:global]
             raise Redis::Objects::MissingID, "Missing ID for non-global counter #{self.name}##{name}"
           end
diff --git a/spec/redis_objects_active_record_spec.rb b/spec/redis_objects_active_record_spec.rb
index ad834e6..ac00970 100644
--- a/spec/redis_objects_active_record_spec.rb
+++ b/spec/redis_objects_active_record_spec.rb
@@ -29,8 +29,8 @@ class Blog < ActiveRecord::Base
     include Redis::Objects
     has_many :posts
     def before_create
-      #self.posts_count ||= 0 
-      #self.posts_count += 1
+      self.posts_count ||= 0 
+      self.posts_count += 1
     end
   end
 
@@ -98,6 +98,7 @@ class Post < ActiveRecord::Base
       Post.create :blog => blog2
       blog.reload.posts_count.should == 1
       blog2.reload.posts_count.should == 2
+      blog.posts_count.should == 1
     end
   end
 
diff --git a/spec/redis_objects_model_spec.rb b/spec/redis_objects_model_spec.rb
index 5fa8f62..fc72ae3 100644
--- a/spec/redis_objects_model_spec.rb
+++ b/spec/redis_objects_model_spec.rb
@@ -18,13 +18,12 @@ class Roster
 
   # 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
   
   # custom keys
   counter :player_totals, :key => 'players/#{username}/total'
-  list :all_player_stats, :key => 'players:all_stats'
+  list :all_player_stats, :key => 'players:all_stats', :global => true
   set :total_wins, :key => 'players:#{id}:all_stats'
   value :my_rank, :key => 'players:my_rank:#{username}'
   value :weird_key, :key => 'players:weird_key:#{raise}', :global => true
@@ -340,7 +339,7 @@ class CustomMethodRoster < MethodRoster
       Roster.increment_counter(:badness, 2)
     rescue => error
     end
-    error.should.be.kind_of(Redis::Objects::UndefinedCounter)
+    error.should.be.kind_of(NoMethodError)
 
     error = nil
     begin