ohm 1.0.1 → 1.0.2

data/lib/ohm.rb

@@ -1286,27 +1286,34 @@ module Ohm
     def __save__
       Transaction.new do |t|
         t.watch(*_unique_keys)
-        t.watch(key) if not new?
+
+        if not new?
+          t.watch(key)
+          t.watch(key[:_indices]) if model.indices.any?
+          t.watch(key[:_uniques]) if model.uniques.any?
+        end
 
         t.before do
           _initialize_id if new?
         end
 
-        existing = nil
+        _uniques = nil
         uniques  = nil
+        _indices = nil
         indices  = nil
 
         t.read do
           _verify_uniques
-          existing = db.hgetall(key)
+          _uniques = db.hgetall(key[:_uniques])
+          _indices = db.smembers(key[:_indices])
           uniques  = _read_index_type(:uniques)
           indices  = _read_index_type(:indices)
         end
 
         t.write do
           db.sadd(model.key[:all], id)
-          _delete_uniques(existing)
-          _delete_indices(existing)
+          _delete_uniques(_uniques)
+          _delete_indices(_indices)
           _save
           _save_indices(indices)
           _save_uniques(uniques)
@@ -1324,13 +1331,23 @@ module Ohm
     #
     def delete
       transaction do |t|
-        t.read do |store|
-          store[:existing] = db.hgetall(key)
+        _uniques = nil
+        _indices = nil
+
+        t.watch(*_unique_keys)
+
+        t.watch(key)
+        t.watch(key[:_indices]) if model.indices.any?
+        t.watch(key[:_uniques]) if model.uniques.any?
+
+        t.read do
+          _uniques = db.hgetall(key[:_uniques])
+          _indices = db.smembers(key[:_indices])
         end
 
-        t.write do |store|
-          _delete_uniques(store[:existing])
-          _delete_indices(store[:existing])
+        t.write do
+          _delete_uniques(_uniques)
+          _delete_indices(_indices)
           model.collections.each { |e| db.del(key[e]) }
           db.srem(model.key[:all], id)
           db.del(key[:counters])
@@ -1470,28 +1487,37 @@ module Ohm
 
     def _save_uniques(uniques)
       uniques.each do |att, val|
-        db.hset(model.key[:uniques][att], val, id)
+        unique = model.key[:uniques][att]
+
+        db.hset(unique, val, id)
+        db.hset(key[:_uniques], unique, val)
       end
     end
 
-    def _delete_uniques(atts)
-      model.uniques.each do |att|
-        db.hdel(model.key[:uniques][att], atts[att.to_s])
+    def _delete_uniques(_uniques)
+      _uniques.each do |unique, val|
+        db.hdel(unique, val)
+        db.hdel(key[:_uniques], unique)
       end
     end
 
-    def _delete_indices(atts)
-      model.indices.each do |att|
-        val = atts[att.to_s]
-
-        db.srem(model.key[:indices][att][val], id)
+    def _delete_indices(_indices)
+      _indices.each do |index|
+        db.srem(index, id)
+        db.srem(key[:_indices], index)
       end
+      # model.indices.each do |att|
+      #   val = atts[att.to_s]
+
+      #   db.srem(model.key[:indices][att][val], id)
+      # end
     end
 
     def _save_indices(indices)
       indices.each do |att, val|
         model.toindices(att, val).each do |index|
           db.sadd(index, id)
+          db.sadd(key[:_indices], index)
         end
       end
     end

data/test/indices.rb

@@ -95,3 +95,35 @@ test "allow indexing by an arbitrary attribute" do
   assert [@user1, @user2] == gmail.sort_by { |u| u.id }
   assert [@user3] == User.find(:email_provider => "yahoo.com").to_a
 end
+
+scope do
+  # Just to give more context around this bug, basically it happens
+  # when you define a virtual unique or index.
+  #
+  # Previously it was unable to cleanup the indices mainly because
+  # it relied on the attributes being set.
+  class Node < Ohm::Model
+    index :available
+    attribute :capacity
+
+    unique :available
+
+    def available
+      capacity.to_i <= 90
+    end
+  end
+
+  test "index bug" do
+    n = Node.create
+    n.update(capacity: 91)
+
+    assert_equal 0, Node.find(available: true).size
+  end
+
+  test "uniques bug" do
+    n = Node.create
+    n.update(capacity: 91)
+
+    assert_equal nil, Node.with(:available, true)
+  end
+end

data/test/model.rb

@@ -347,7 +347,8 @@ test "be no leftover keys" do
   assert_equal [], Ohm.redis.keys("*")
 
   Foo.create(:name => "Bar")
-  expected = %w[Foo:1 Foo:all Foo:id Foo:indices:name:Bar]
+  expected = %w[Foo:1 Foo:1:_indices Foo:all Foo:id Foo:indices:name:Bar]
+
   assert expected.sort == Ohm.redis.keys("*").sort
 
   Foo[1].delete

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2155998060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,15 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2155998060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: nest
-  requirement: &2155997480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +39,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155997480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: scrivener
-  requirement: &2155996820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +55,15 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2155996820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2155996160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,7 +71,12 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *2155996160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: Ohm is a library that allows to store an object in Redis, a persistent
   key-value database. It includes an extensible list of validations and has very good
   performance.
@@ -115,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ohm
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Object-hash mapping library for Redis.