mongoid_identity_map 0.1.3 → 0.2.0

data/lib/mongoid_identity_map/contexts/identity_mappable.rb

@@ -0,0 +1,24 @@
+require "active_support/core_ext"
+
+module MongoidIdentityMap
+  module Contexts
+    module IdentityMappable
+      extend ActiveSupport::Concern
+      
+      included do
+        alias_method_chain :one, :identity_map
+        alias_method_chain :first, :identity_map
+      end
+      
+      def one_with_identity_map
+        IdentityMap.fetch(selector.merge(:_klass => klass)) do
+          one_without_identity_map
+        end
+      end
+      alias :first_with_identity_map :one_with_identity_map
+      
+    end
+  end
+end
+
+Mongoid::Contexts::Mongo.send(:include, MongoidIdentityMap::Contexts::IdentityMappable)

data/lib/mongoid_identity_map/identity_map.rb

@@ -6,6 +6,10 @@ module MongoidIdentityMap
         ThreadLocalHash.get(selector) || ThreadLocalHash.set(selector, yield)
       end
 
+      def remove(document)
+        ThreadLocalHash.remove(document)
+      end
+
       def clear
         ThreadLocalHash.clear
       end

data/lib/mongoid_identity_map/persistence/identity_mappable.rb

@@ -0,0 +1,24 @@
+require "active_support/core_ext"
+
+module MongoidIdentityMap
+  module Persistence
+    module IdentityMappable
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method_chain :remove, :identity_map
+      end
+
+      def remove_with_identity_map(options = {})
+        IdentityMap.remove(self)
+        self.remove_without_identity_map(options)
+      end
+    end
+  end
+end
+
+module Mongoid::Persistence
+  included do
+    include MongoidIdentityMap::Persistence::IdentityMappable
+  end
+end

data/lib/mongoid_identity_map/thread_local_hash.rb

@@ -8,7 +8,11 @@ module MongoidIdentityMap
       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

data/lib/mongoid_identity_map/version.rb

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

data/lib/mongoid_identity_map.rb

@@ -1,5 +1,8 @@
+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/identity_mappable"
 require "mongoid_identity_map/railtie" if defined?(Rails)
+require "mongoid_identity_map/contexts/identity_mappable"
+require "mongoid_identity_map/persistence/identity_mappable"

data/spec/mongoid_identity_map/contexts/identity_mappable_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe MongoidIdentityMap::Contexts::IdentityMappable do
+  let(:model) do
+    Model.new
+  end
+  
+  let(:model_attributes) do
+    model.attributes
+  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
+      MongoidIdentityMap::IdentityMap.should_receive(:fetch).with(selector.merge(:_klass => Model))
+      Model.where(selector).one
+    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
+      MongoidIdentityMap::IdentityMap.should_receive(:fetch).with(selector.merge(:_klass => Model))
+      Model.where(selector).first
+    end
+  end
+end

data/spec/mongoid_identity_map/identity_map_spec.rb

@@ -39,13 +39,20 @@ describe MongoidIdentityMap::IdentityMap do
         fetch.should be(@model)
       end
 
-      it "should not hit database" do
+      it "should not call block" do
         Model.collection.should_not_receive(:find_one_without_identity_map)
         fetch
       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)
+    end
+  end
+
   describe ".clear" do
     it "should clear identity map" do
       MongoidIdentityMap::ThreadLocalHash.should_receive(:clear)

data/spec/mongoid_identity_map/persistence/identity_mappable_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe MongoidIdentityMap::Persistence::IdentityMappable do
+  describe "#remove" do
+    before do
+      @model = Model.new
+      @model.stub!(:remove_without_identity_map)
+      MongoidIdentityMap::IdentityMap.stub!(:remove)
+    end
+
+    it "should remove document from identity map" do
+      MongoidIdentityMap::IdentityMap.should_receive(:remove).with(@model)
+      @model.remove
+    end
+
+    it "should remove document from database" do
+      options = {:opt1 => :val1}
+      @model.should_receive(:remove_without_identity_map).with(options)
+      @model.remove(options)
+    end
+  end
+end

data/spec/mongoid_identity_map/thread_local_hash_spec.rb

@@ -1,8 +1,8 @@
 require "spec_helper"
 
 describe MongoidIdentityMap::ThreadLocalHash do
-  describe ".set and .get" do
-    it "should set and get key based value" do
+  describe "storing key value pairs" do
+    it "should store key value pairs" do
       MongoidIdentityMap::ThreadLocalHash.set(:key, "value")
       
       Thread.new do
@@ -13,6 +13,20 @@ describe MongoidIdentityMap::ThreadLocalHash do
       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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Guilherme Cirne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 -03:00
+date: 2011-05-06 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,15 +108,17 @@ files:
 - Rakefile
 - lib/mongoid_identity_map.rb
 - lib/mongoid_identity_map/clear_middleware.rb
+- lib/mongoid_identity_map/contexts/identity_mappable.rb
 - lib/mongoid_identity_map/identity_map.rb
-- lib/mongoid_identity_map/identity_mappable.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/identity_mappable_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

data/lib/mongoid_identity_map/identity_mappable.rb

@@ -1,20 +0,0 @@
-require 'active_support/core_ext'
-require 'mongoid/collection'
-
-module MongoidIdentityMap
-  module IdentityMappable
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :find_one, :identity_map
-    end
-
-    def find_one_with_identity_map(selector = {}, options = {})
-      IdentityMap.fetch(selector.merge(:_collection_name => self.name)) do
-        find_one_without_identity_map(selector, options)
-      end
-    end
-  end
-end
-
-Mongoid::Collection.send(:include, MongoidIdentityMap::IdentityMappable)

data/spec/mongoid_identity_map/identity_mappable_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe MongoidIdentityMap::IdentityMappable do
-  describe "#find_one" do
-    before do
-      @model = Model.new
-      Model.collection.stub!(:find_one_without_identity_map).with({:_id => BSON::ObjectId("4da13240312f916cd2000002")}, {}).and_return(@model)
-    end
-
-    it "should return model" do
-      Model.collection.find_one({:_id => BSON::ObjectId("4da13240312f916cd2000002")}, {}).should be(@model)
-    end
-    
-    it "should include collection name in identity map fetch selector" do
-      MongoidIdentityMap::IdentityMap.should_receive(:fetch).with(hash_including(:_collection_name => "models"))
-      Model.collection.find_one({:_id => BSON::ObjectId("4da13240312f916cd2000002")}, {})
-    end
-  end
-end