ohm-identity_map 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZThmYTc5ODlhMDVkOTVjNGUwOWE0NTJmNDhjZGVjZWI1ZjM5ZDBiZQ==
+    N2Q4MTQ0MGRiMTJlYTU5OWQ3MzdiMzc2ZTEzY2NiMDFhYjhmODJkOQ==
   data.tar.gz: !binary |-
-    MDMxZjc2YjAyOTE0YzE3YzhiNjA3NTA0ODE5ODc4OWI5NTE5NzJhMA==
+    OGRhYjhhZTU5Mzg0ZjBjZjhhZjc1NmJjYTkwMmJkYzdkOTlhMWU5ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDFmNDA4ZWM1N2I4ODM1NTlkY2U5MTNlMjQ3MDEyYzFlZDVjYzYwZmZjNTkx
-    YWQ2NjA3NGIyNDc2MWY1MjhiNjRkNWZmYmJmYzE0NGUwMzAwZDhiZTRmM2Zj
-    OTYzYmNjNmM5NjYxMDczMTBjOWZiNzFhNzA5NjNhYTU4ZWJiMzQ=
+    YjdhYWFhNGJmZGFlZTZmODBiZWI2MTYwMDFmYjBlM2QzZTU0ODM1ZjljODg3
+    NTA2ZjE0ZTk5OGJiZTQ1NzZlYjUzMjMwZTljYTIwMDAyMmEzY2UwN2M0NWVh
+    ZGU2NTJhZjBhZWM3MTVlYWYxMzQ5ZTIzZmQ2OTAzYmI0YjQ5Y2U=
   data.tar.gz: !binary |-
-    YjMxMWFiMjRjZWMwNzRhNGUzOGJmNWNiZGQxMWY2MzlmNzYwMzdhNTFmNTMy
-    NzYyZjJhMzNiYTNmMzVhN2I5ZGFmNDhlY2QzNDdhNzBlZWRlZWEzN2M5ZWRj
-    MmYzMmNhZGQxYjgxZTc5Yjk2ZTM5YWU2YTU0Y2MyZDU0Zjc4NTU=
+    YWRjNGQwY2I2NmRmNDQ0NTgzODFiNjE1NWQ5MDQ4Mzc5ZDU1YTZjNzhlZDA2
+    NjkwM2I5ZDdjMmM3YTk1NTVhN2NkNTBiNmFjYWFhYWI5Y2E1NDk1MTVhYzk0
+    MTNlMTk2YWUyYjg0NGQ5MzI3OWFlNDRjMmQ0NzczMGU2MjUzZTQ=

data/CHANGELOG

@@ -0,0 +1,7 @@
+0.1.1 - 2013-04-19
+
+* Fix confusing model classes.
+
+0.1.0 - 2013-04-19
+
+* Initial release.

data/lib/ohm/identity_map.rb

@@ -1,7 +1,7 @@
 require "ohm"
 
 module Ohm::IdentityMap
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
   def self.included(model)
     model.extend(Macros)
@@ -11,7 +11,9 @@ module Ohm::IdentityMap
 
       def [](id)
         if map = Thread.current[:_ohm_identity_map]
-          map.fetch(id) { map[id] = original_loader(id) }
+          key = self.key[id]
+
+          map.fetch(key) { map.store(key, original_loader(id)) }
         else
           original_loader(id)
         end
@@ -24,7 +26,7 @@ module Ohm::IdentityMap
           missing_ids, missing_indices = [], []
 
           mapped = ids.map.with_index do |id, index|
-            map.fetch(id) do
+            map.fetch(self.key[id]) do
               missing_ids << id
               missing_indices << index
               nil
@@ -33,7 +35,7 @@ module Ohm::IdentityMap
 
           original_fetch(missing_ids).each.with_index do |instance, index|
             mapped[missing_indices[index]] = instance
-            map.store(missing_ids[index], instance)
+            map.store(self.key[missing_ids[index]], instance)
           end
 
           mapped

data/test/identity_map_test.rb

@@ -51,4 +51,28 @@ scope do
 
     assert_equal 2, comments.map(&:object_id).uniq.size
   end
+
+  test "Model#reference - identity map disabled" do
+    assert Comment[1].post.object_id != Comment[2].post.object_id
+  end
+
+  test "Model#reference - identity map enabled" do
+    posts = Ohm::Model.identity_map { [Comment[1].post, Comment[2].post] }
+
+    assert_equal 1, posts.map(&:object_id).uniq.size
+
+    orphan = Comment.create(body: "No post.")
+
+    assert_equal nil, orphan.post
+  end
+
+  test "does not confuse models" do
+    models = Ohm::Model.identity_map { [Comment[1], Post[1]] }
+
+    assert_equal 2, models.map(&:object_id).uniq.size
+
+    models = Ohm::Model.identity_map { Comment.fetch([1]) + Post.fetch([1]) }
+
+    assert_equal 2, models.map(&:object_id).uniq.size
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm-identity_map
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Educabilia
@@ -48,6 +48,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG
 - README.md
 - UNLICENSE
 - lib/ohm/identity_map.rb