mongoid_identity_map 0.2.0 → 0.3.0

data/lib/mongoid_identity_map/identity_map.rb

@@ -2,16 +2,30 @@ module MongoidIdentityMap
   class IdentityMap
 
     class << self
-      def fetch(selector)
-        ThreadLocalHash.get(selector) || ThreadLocalHash.set(selector, yield)
+      def set(key, model)
+        thread_local_hash[key] = thread_local_hash.values.detect {|value| value == model} || model
       end
 
-      def remove(document)
-        ThreadLocalHash.remove(document)
+      def get(key)
+        thread_local_hash[key]
+      end
+
+      def fetch(key)
+        get(key) || set(key, yield)
+      end
+
+      def remove(model)
+        thread_local_hash.delete_if {|key, value| value == model}
       end
 
       def clear
-        ThreadLocalHash.clear
+        Thread.current[:mongoid_identity_map_current_thread_hash] = nil
+      end
+      
+      private
+
+      def thread_local_hash
+        Thread.current[:mongoid_identity_map_current_thread_hash] ||= Hash.new
       end
     end
     

data/lib/mongoid_identity_map/version.rb

@@ -1,3 +1,3 @@
 module MongoidIdentityMap
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/mongoid_identity_map.rb

@@ -1,7 +1,6 @@
 require "mongoid"
 
 require "mongoid_identity_map/clear_middleware"
-require "mongoid_identity_map/thread_local_hash"
 require "mongoid_identity_map/identity_map"
 require "mongoid_identity_map/railtie" if defined?(Rails)
 require "mongoid_identity_map/contexts/identity_mappable"

data/spec/mongoid_identity_map/contexts/identity_mappable_spec.rb

@@ -8,42 +8,38 @@ describe MongoidIdentityMap::Contexts::IdentityMappable do
   let(:model_attributes) do
     model.attributes
   end
+
+  let(:selector) do
+    {:selector => :value}
+  end
   
   describe "#one" do
-    let(:selector) do
-      {:selector => :value}
-    end
-    
     before do
       Model.collection.stub!(:find_one).with(selector, {}).and_return(model_attributes)
     end
-    
-    it "should return model" do
-      Model.where(selector).one.should == model
-    end
-    
-    it "should fetch model from identity map" do
+
+    it "should fetch model from identity map under key comprised of find selector merged with model class" do
       MongoidIdentityMap::IdentityMap.should_receive(:fetch).with(selector.merge(:_klass => Model))
       Model.where(selector).one
     end
+
+    it "should return model" do
+      Model.where(selector).one.should == model
+    end
   end
   
   describe "#first" do
-    let(:selector) do
-      {:selector => :value}
-    end
-    
     before do
       Model.collection.stub!(:find_one).with(selector, {}).and_return(model_attributes)
     end
-    
-    it "should return model" do
-      Model.where(selector).first.should == model
-    end
-    
-    it "should fetch model from identity map" do
+
+    it "should fetch model from identity map under key comprised of find selector merged with model class" do
       MongoidIdentityMap::IdentityMap.should_receive(:fetch).with(selector.merge(:_klass => Model))
       Model.where(selector).first
     end
+
+    it "should return model" do
+      Model.where(selector).first.should == model
+    end
   end
 end

data/spec/mongoid_identity_map/identity_map_spec.rb

@@ -1,62 +1,98 @@
 require "spec_helper"
 
 describe MongoidIdentityMap::IdentityMap do
-  before do
-    @model = Model.new
-    @selector = {:_id => BSON::ObjectId("4da13240312f916cd2000002")}
-  end
-  
-  describe ".fetch" do
-    let (:fetch) do
-      MongoidIdentityMap::IdentityMap.fetch(@selector) do
-        Model.collection.find_one_without_identity_map(@selector)
+  let(:model) {Model.new}
+  let(:other_model) {Model.new}
+  let(:key) {:key}
+  let(:other_key) {:key2}
+
+  describe "storage" do
+    describe "in multiple threads" do
+      let(:other_model) {Model.new}
+
+      it "should keep each thread's storage separate" do
+        MongoidIdentityMap::IdentityMap.set(:key, model)
+
+        Thread.new do
+          MongoidIdentityMap::IdentityMap.set(:key, other_model)
+          MongoidIdentityMap::IdentityMap.get(:key).should == other_model
+        end.join
+
+        MongoidIdentityMap::IdentityMap.get(:key).should == model
       end
     end
 
-    context "when document doesn't exist in identity map" do
-      before do
-        MongoidIdentityMap::ThreadLocalHash.stub!(:get).with(@selector).and_return(nil)
-        Model.collection.stub!(:find_one_without_identity_map).with(@selector).and_return(@model)
+    describe "when the same model is stored under different keys" do
+      let(:same_model_different_instance) {Model.new(model.attributes)}
+
+      it "should store the same instance of the model under the different keys" do
+        MongoidIdentityMap::IdentityMap.set(:key, model)
+        MongoidIdentityMap::IdentityMap.set(:key2, same_model_different_instance)
+        MongoidIdentityMap::IdentityMap.get(:key).should be(model)
+        MongoidIdentityMap::IdentityMap.get(:key2).should be(model)
       end
+    end
+  end
 
-      it "should return document from database" do
-        Model.collection.should_receive(:find_one_without_identity_map).with(@selector).and_return(@model)
-        fetch.should be(@model)
+  describe ".fetch" do
+    let(:fetch) do
+      MongoidIdentityMap::IdentityMap.fetch(key) do
+        Model.first
       end
+    end
+
+    before do
+      Model.stub!(:first).and_return(model)
+    end
 
-      it "should set document in identity map" do
-        MongoidIdentityMap::ThreadLocalHash.should_receive(:set).with(@selector, @model)
+    context "when model doesn't exist in identity map" do
+      it "should store model in identity map" do
         fetch
+        MongoidIdentityMap::IdentityMap.get(key).should be(model)
+      end
+
+      it "should return model" do
+        fetch.should be(model)
       end
     end
 
-    context "when document exists in identity map" do
+    context "when model exists in identity map" do
       before do
-        MongoidIdentityMap::ThreadLocalHash.stub!(:get).with(@selector).and_return(@model)
+        MongoidIdentityMap::IdentityMap.set(key, model)
       end
 
-      it "should return document from identity map" do
-        fetch.should be(@model)
+      it "should not yield block" do
+        Model.should_not_receive(:first)
+        fetch
       end
 
-      it "should not call block" do
-        Model.collection.should_not_receive(:find_one_without_identity_map)
-        fetch
+      it "should return model" do
+        fetch.should be(model)
       end
     end
   end
 
   describe ".remove" do
-    it "should remove document from identity map" do
-      MongoidIdentityMap::ThreadLocalHash.should_receive(:remove).with(@model)
-      MongoidIdentityMap::IdentityMap.remove(@model)
+    before do
+      MongoidIdentityMap::IdentityMap.set(key, model)
+    end
+
+    it "should remove model from identity map" do
+      MongoidIdentityMap::IdentityMap.remove(model)
+      MongoidIdentityMap::IdentityMap.get(key).should be_nil
     end
   end
 
   describe ".clear" do
+    before do
+      MongoidIdentityMap::IdentityMap.set(key, model)
+      MongoidIdentityMap::IdentityMap.set(other_key, other_model)
+    end
+
     it "should clear identity map" do
-      MongoidIdentityMap::ThreadLocalHash.should_receive(:clear)
       MongoidIdentityMap::IdentityMap.clear
+      MongoidIdentityMap::IdentityMap.get(key).should be_nil
+      MongoidIdentityMap::IdentityMap.get(other_key).should be_nil
     end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Guilherme Cirne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 -03:00
+date: 2011-05-08 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,14 +112,12 @@ files:
 - lib/mongoid_identity_map/identity_map.rb
 - lib/mongoid_identity_map/persistence/identity_mappable.rb
 - lib/mongoid_identity_map/railtie.rb
-- lib/mongoid_identity_map/thread_local_hash.rb
 - lib/mongoid_identity_map/version.rb
 - mongoid_identity_map.gemspec
 - spec/mongoid_identity_map/clear_middleware_spec.rb
 - spec/mongoid_identity_map/contexts/identity_mappable_spec.rb
 - spec/mongoid_identity_map/identity_map_spec.rb
 - spec/mongoid_identity_map/persistence/identity_mappable_spec.rb
-- spec/mongoid_identity_map/thread_local_hash_spec.rb
 - spec/spec_helper.rb
 - spec/support/model.rb
 has_rdoc: true

data/lib/mongoid_identity_map/thread_local_hash.rb

@@ -1,27 +0,0 @@
-module MongoidIdentityMap
-  class ThreadLocalHash
-    class << self
-      def get(key)
-        thread_local_hash[key]
-      end
-      
-      def set(key, value)
-        thread_local_hash[key] = value
-      end
-
-      def remove(value)
-        thread_local_hash.delete_if {|k, v| v == value}
-      end
-
-      def clear
-        Thread.current[:mongoid_identity_map_current_thread_hash] = nil
-      end
-      
-      private
-      
-      def thread_local_hash
-        Thread.current[:mongoid_identity_map_current_thread_hash] ||= Hash.new
-      end
-    end
-  end
-end

data/spec/mongoid_identity_map/thread_local_hash_spec.rb

@@ -1,44 +0,0 @@
-require "spec_helper"
-
-describe MongoidIdentityMap::ThreadLocalHash do
-  describe "storing key value pairs" do
-    it "should store key value pairs" do
-      MongoidIdentityMap::ThreadLocalHash.set(:key, "value")
-      
-      Thread.new do
-        MongoidIdentityMap::ThreadLocalHash.set(:key, "value2")
-        MongoidIdentityMap::ThreadLocalHash.get(:key).should == "value2"
-      end.join
-      
-      MongoidIdentityMap::ThreadLocalHash.get(:key).should == "value"
-    end
-  end
-
-  describe ".remove" do
-    it "should remove value" do
-      MongoidIdentityMap::ThreadLocalHash.set(:key, "value")
-
-      Thread.new do
-        MongoidIdentityMap::ThreadLocalHash.set(:key, "value")
-        MongoidIdentityMap::ThreadLocalHash.remove("value")
-        MongoidIdentityMap::ThreadLocalHash.get(:key).should be_nil
-      end.join
-
-      MongoidIdentityMap::ThreadLocalHash.get(:key).should == "value"
-    end
-  end
-  
-  describe ".clear" do
-    it "should clear" do
-      MongoidIdentityMap::ThreadLocalHash.set(:key, "value")
-      
-      Thread.new do
-        MongoidIdentityMap::ThreadLocalHash.set(:key, "value")
-        MongoidIdentityMap::ThreadLocalHash.clear
-        MongoidIdentityMap::ThreadLocalHash.get(:key).should be_nil
-      end.join
-      
-      MongoidIdentityMap::ThreadLocalHash.get(:key).should == "value"
-    end
-  end
-end