ohm 2.0.0.alpha2 → 2.0.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8294935327780b3b34f3e4ab6f84b59332d0037b
-  data.tar.gz: 9159ad5202c945da06f36b3e8e0cdc49472d928b
+  metadata.gz: b3734bd99776bff0786c42047b43dbeed799d907
+  data.tar.gz: f3883cf4aa7fea58b716b5e5dd0796458bfda388
 SHA512:
-  metadata.gz: 84a62af64f0e7ab94f443a7b47df0172154938d9c5c203a2921dbfa120950d69f81e43738853215069c7ef73c1f433a52327a971986290686b1e309fcac91d99
-  data.tar.gz: f69591ef5c027b9585570c03d831b5d839e6990d310bae4c469e8ed70de6124620e7b7d280bc689a180bb3b74af1d260138172f11d51c5fcd5a7443cae6ff6a4
+  metadata.gz: fa9b8566cf79aa0470f1236c056bcd60f6968f2e3d50f39512431860758a3335363e32a1876610fde9d5a5ca4a72c7602a96779b83e8357c10088cdcb11fab93
+  data.tar.gz: cbe87bc0b7eb78ec264ab0e28dd48a36387b2f8325a8ec4d5d26666bda6f9755aeaefc1208687fabf56523865be9b9d96c70308137feda6260d21ab13223dab9

data/lib/ohm.rb

@@ -838,7 +838,7 @@ module Ohm
     # to do it, you'll receive an Ohm::MissingID error.
     #
     def self.set(name, model)
-      collections << name unless collections.include?(name)
+      track(name)
 
       define_method name do
         model = Utils.const(self.class, model)
@@ -868,7 +868,7 @@ module Ohm
     # to do it, you'll receive an Ohm::MissingID error.
     #
     def self.list(name, model)
-      collections << name unless collections.include?(name)
+      track(name)
 
       define_method name do
         model = Utils.const(self.class, model)
@@ -1033,6 +1033,11 @@ module Ohm
       end
     end
 
+    # Keep track of `key[name]` and remove when deleting the object.
+    def self.track(name)
+      tracked << name unless tracked.include?(name)
+    end
+
     # An Ohm::Set wrapper for Model.key[:all].
     def self.all
       Set.new(key[:all], key, self)
@@ -1279,7 +1284,7 @@ module Ohm
           "key" => key
         }.to_msgpack,
         uniques.to_msgpack,
-        model.collections.to_msgpack
+        model.tracked.to_msgpack
       )
 
       return self
@@ -1344,8 +1349,8 @@ module Ohm
       @counters ||= []
     end
 
-    def self.collections
-      @collections ||= []
+    def self.tracked
+      @tracked ||= []
     end
 
     def self.attributes

data/lib/ohm/lua/delete.lua

@@ -1,6 +1,6 @@
 local model       = cmsgpack.unpack(ARGV[1])
 local uniques     = cmsgpack.unpack(ARGV[2])
-local collections = cmsgpack.unpack(ARGV[3])
+local tracked     = cmsgpack.unpack(ARGV[3])
 
 local function remove_indices(model)
   local memo = model.key .. ":_indices"
@@ -23,9 +23,9 @@ local function remove_uniques(model, uniques)
   end
 end
 
-local function remove_collections(model, collections)
-  for _, collection in ipairs(collections) do
-    local key = model.key .. ":" .. collection
+local function remove_tracked(model, tracked)
+  for _, tracked_key in ipairs(tracked) do
+    local key = model.key .. ":" .. tracked_key
 
     redis.call("DEL", key)
   end
@@ -45,7 +45,7 @@ end
 
 remove_indices(model)
 remove_uniques(model, uniques)
-remove_collections(model, collections)
+remove_tracked(model, tracked)
 delete(model)
 
 return model.id

data/ohm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ohm"
-  s.version = "2.0.0.alpha2"
+  s.version = "2.0.0.alpha3"
   s.summary = %{Object-hash mapping library for Redis.}
   s.description = %Q{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.}
   s.authors = ["Michel Martens", "Damian Janowski", "Cyril David"]

data/test/model.rb

@@ -350,6 +350,7 @@ test "no leftover keys" do
   class ::Foo < Ohm::Model
     attribute :name
     index :name
+    track :notes
   end
 
   assert_equal [], Ohm.redis.call("KEYS", "*")
@@ -361,6 +362,18 @@ test "no leftover keys" do
 
   Foo[1].delete
   assert ["Foo:id"] == Ohm.redis.call("KEYS", "*")
+
+  Foo.create(:name => "Baz")
+
+  Ohm.redis.call("SET", Foo[2].key[:notes], "something")
+
+  expected = %w[Foo:2:_indices Foo:2 Foo:all Foo:id
+    Foo:indices:name:Baz Foo:2:notes]
+
+  assert_equal expected.sort, Ohm.redis.call("KEYS", "*").sort
+
+  Foo[2].delete
+  assert ["Foo:id"] == Ohm.redis.call("KEYS", "*")
 end
 
 # Listing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha2
+  version: 2.0.0.alpha3
 platform: ruby
 authors:
 - Michel Martens
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: ohm
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Object-hash mapping library for Redis.