Fix #delete!

* Rename #delete! to #redis_delete_objects
* Make behaviour actually as expected (eg. not delete global keys!)
* Add #redis_instance_keys which returns interpolated keys 
* Make deletion simpler with just 1 call to Redis

Author: pfeiffer

lib/redis/objects.rb

@@ -173,8 +173,15 @@ module InstanceMethods
       def redis()         self.class.redis end
       def redis_objects() self.class.redis_objects end
 
-      def delete!
-        redis.del(redis_objects.keys.map { |k| send(k) }.reject(&:nil?).map { |obj| obj.key })
+      def redis_delete_objects
+        redis.del(redis_instance_keys)
+      end
+
+      def redis_instance_keys
+        redis_objects
+          .reject { |_, value| value[:global] }
+          .keys
+          .collect { |name| redis_field_key(name) }
       end
 
       def redis_options(name) #:nodoc:

spec/redis_objects_model_spec.rb

@@ -1009,8 +1009,15 @@ class CustomIdFieldRoster < UidRoster
   end
 
   it "should allow deleting the entire object" do
-    @roster.redis.keys.select { |key| key.match(/^roster:/)}.count.should > 0
-    @roster.delete!.should > 0
-    @roster.redis.keys.select { |key| key.match(/^roster:/)}.count.should == 0
+    (@roster.redis.keys & @roster.redis_instance_keys).count.should > 0
+    @roster.redis_delete_objects.should > 0
+    (@roster.redis.keys & @roster.redis_instance_keys).count.should == 0
+  end
+
+  it "should be able to return all instance keys" do
+    @roster.redis_instance_keys.include?('roster:1:player_stats').should == true
+    @roster.redis_instance_keys.include?('players:my_rank:user1').should == true
+    @roster.redis_instance_keys.include?('roster:1:player_stats').should == true
+    @roster.redis_instance_keys.include?('players:all_stats').should == false
   end
 end