ohm 0.0.36 → 0.0.37

data/lib/ohm.rb

@@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__), "ohm", "key")
 require File.join(File.dirname(__FILE__), "ohm", "collection")
 
 module Ohm
-  VERSION = "0.0.36"
+  VERSION = "0.0.37"
 
   # Provides access to the Redis database. This is shared accross all models and instances.
   def redis
@@ -290,7 +290,7 @@ module Ohm
       # @overload assert_unique [:street, :city]
       #   Validates that the :street and :city pair is unique.
       def assert_unique(attrs)
-        result = db.sinter(*Array(attrs).map { |att| index_key_for(att, send(att)) })
+        result = db.sinter(*Array(attrs).map { |att| index_key_for(att, send(att)) }) || []
         assert result.empty? || !new? && result.include?(id.to_s), [attrs, :not_unique]
       end
     end
@@ -786,10 +786,11 @@ module Ohm
     end
 
     def delete_from_indices
-      db.smembers(key(:_indices)).each do |index|
+      (db.smembers(key(:_indices)) || []).each do |index|
         db.srem(index, id)
-        db.srem(key(:_indices), index)
       end
+
+      db.del(key(:_indices))
     end
 
     def read_local(att)

data/lib/ohm/collection.rb

@@ -124,7 +124,7 @@ module Ohm
 
     # @return [Array] Elements of the list.
     def all
-      db.lrange(key, 0, -1)
+      db.lrange(key, 0, -1) || []
     end
 
     # @return [Integer] Returns the number of elements in the list.
@@ -171,7 +171,7 @@ module Ohm
     end
 
     def all
-      db.smembers(key)
+      db.smembers(key) || []
     end
 
     # @return [Integer] Returns the number of elements in the set.

data/test/model_test.rb

@@ -277,8 +277,8 @@ class TestRedis < Test::Unit::TestCase
 
       assert_nil Ohm.redis.get(ModelToBeDeleted.key(id))
       assert_nil Ohm.redis.get(ModelToBeDeleted.key(id, :name))
-      assert_equal Array.new, Ohm.redis.smembers(ModelToBeDeleted.key(id, :foos))
-      assert_equal Array.new, Ohm.redis.lrange(ModelToBeDeleted.key(id, :bars), 0, -1)
+      assert !Ohm.redis.exists(ModelToBeDeleted.key(id, :foos))
+      assert !Ohm.redis.exists(ModelToBeDeleted.key(id, :bars))
 
       assert ModelToBeDeleted.all.empty?
     end
@@ -297,7 +297,12 @@ class TestRedis < Test::Unit::TestCase
 
       Foo[1].delete
 
-      assert_equal ["Foo:id"], Ohm.redis.keys("*")
+      keys = Ohm.redis.keys("*")
+
+      assert !keys.include?("Foo:1:_indices")
+      assert !keys.include?("Foo:1:name")
+
+      assert_equal "1", Ohm.redis.get("Foo:id")
     end
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
+  hash: 85
   prerelease: false
   segments: 
   - 0
   - 0
-  - 36
-  version: 0.0.36
+  - 37
+  version: 0.0.37
 platform: ruby
 authors: 
 - Michel Martens
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -03:00
+date: 2010-07-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +27,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 0
@@ -41,6 +43,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 1
@@ -92,6 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -100,6 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"