ar-simple-idmap 0.2.0 → 0.2.1

data/README

@@ -42,18 +42,36 @@ Then you should enable identity map for each model class individually:
       use_id_map
       belongs_to :tarif_plan
     end
+
+You can use identity map for all models by writing in initializer:
+
+    class ActiveRecord::Base
+      use_id_map
+    end
     
 To enable in rake task or script:
 
-    ActiveRecord.with_id_map do
+    ActiveRecord::Base.with_id_map do
       # all things here goes with identity map
     end
 
+or equivalently
+
+    Client.with_id_map do
+      # all things here goes with identity map
+      # not only for Client
+    end
+
 If you found that identity logic does wrong thing in some particular place,
 you could temporary disable it:
 
-    ActiveRecord.without_id_map do
+    ActiveRecord::Base.without_id_map do
+      # all things here goes without identity map
+    end
+
+    Client.without_id_map do
       # all things here goes without identity map
+      # not only for Client
     end
 
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/identity_map/active_record/base.rb

@@ -1,9 +1,9 @@
 module ActiveRecord
   class Base
-	module IdentityMap
-	  module ClassMethods
-		private
-		  def use_id_map
+    module IdentityMap
+      module ClassMethods
+        private
+          def use_id_map
             unless is_a? IdMapClassMethods
                 extend IdMapClassMethods
                 include IdMapInstanceMethods
@@ -14,21 +14,21 @@ module ActiveRecord
                 alias_method_chain :create, :identity_map
                 alias_method_chain :destroy, :identity_map
             end
-		  end
-	  end
-	  
-	  module IdMapClassMethods
+          end
+      end
+      
+      module IdMapClassMethods
 
-		def id_map
-		  thread_id_map.try(:for_class, self)
-		end
-		
-		def if_id_map
-		  map = id_map
-		  yield map if map
-		end
-		
-		private
+        def id_map
+          thread_id_map.try(:for_class, self)
+        end
+        
+        def if_id_map
+          map = id_map
+          yield map if map
+        end
+        
+        private
           def fetch_from_map(map, ids)
             result, not_cached = [], []
             ids.each do |id|
@@ -44,9 +44,9 @@ module ActiveRecord
             end
             result
           end
-	  
-		  def find_with_identity_map( *args )
-			if_id_map do |map|
+      
+          def find_with_identity_map( *args )
+            if_id_map do |map|
               from_arg0 = args.size == 1 ||
                     args[1].is_a?(Hash) && !args[1].values.any?
               from_condition_ids = !from_arg0 &&
@@ -55,11 +55,11 @@ module ActiveRecord
                     args[1].all?{|key, value| key == :conditions || value.blank?} &&
                     args[1][:conditions].is_a?(Hash) &&
                     args[1][:conditions].keys == [:id]
-			  if from_arg0 || from_condition_ids
-				ids = from_arg0 ? args[0] : args[1][:conditions][:id]
-				if ids.is_a?(Array)
+              if from_arg0 || from_condition_ids
+                ids = from_arg0 ? args[0] : args[1][:conditions][:id]
+                if ids.is_a?(Array)
                   if from_arg0
-				    fetch_from_map( map, ids, &method(:find_without_identity_map) )
+                    fetch_from_map( map, ids, &method(:find_without_identity_map) )
                   elsif args[0] == :all
                     fetch_from_map( map, ids ){|not_cached| 
                         find_without_identity_map(:all, {:conditions=>{:id=>not_cached}})
@@ -73,60 +73,60 @@ module ActiveRecord
                       find_without_identity_map(:first, {:conditions=>{:id=>to_find}})
                     end
                   end
-				else
-				  map[ids]
-				end
-			  end
-			end || find_without_identity_map(*args)
-		  end
-		  
-		  def instantiate_with_identity_map( record )
-			if_id_map do |map|
-			  id = record[primary_key]
-			  if (object = map[id])
-				attrs = object.instance_variable_get( :@attributes )
-				unless (changed = object.instance_variable_get( :@changed_attributes )).blank?
-				  for key, value in record
-				  	if changed.has_key? key
-				  	  changed[key] = value
-				  	else
-				  	  attrs[key] = value
-				  	end
-				  end
-				else
-				  attrs.merge!( record ) unless attrs == record
-				end
-				object
-			  else
-			  	map[id] = instantiate_without_identity_map( record )
-			  end
-			end || instantiate_without_identity_map( record )
-		  end
-		  
-		  def delete_with_identity_map( ids )
-		    res = delete_without_identity_map( ids )
-		    if_id_map{|map| [ *ids ].each{|id| map.delete(id) } }
-		    res
-		  end
-	  end
-	  
-	  module IdMapInstanceMethods
-		private
-		  def create_with_identity_map
-			id = create_without_identity_map
-			self.class.if_id_map{|map| map[id] = self }
-			id
-		  end
-		  
-		  def destroy_with_identity_map
-		  	res = destroy_without_identity_map
-		    self.class.if_id_map{|map| map.delete(id) }
-		    res
-		  end
-	  end
-	end
-	
-	extend IdentityMap::ClassMethods
+                else
+                  map[ids]
+                end
+              end
+            end || find_without_identity_map(*args)
+          end
+          
+          def instantiate_with_identity_map( record )
+            if_id_map do |map|
+              id = record[primary_key]
+              if (object = map[id])
+                attrs = object.instance_variable_get( :@attributes )
+                unless (changed = object.instance_variable_get( :@changed_attributes )).blank?
+                  for key, value in record
+                    if changed.has_key? key
+                      changed[key] = value
+                    else
+                      attrs[key] = value
+                    end
+                  end
+                else
+                  attrs.merge!( record ) unless attrs == record
+                end
+                object
+              else
+                map[id] = instantiate_without_identity_map( record )
+              end
+            end || instantiate_without_identity_map( record )
+          end
+          
+          def delete_with_identity_map( ids )
+            res = delete_without_identity_map( ids )
+            if_id_map{|map| [ *ids ].each{|id| map.delete(id) } }
+            res
+          end
+      end
+      
+      module IdMapInstanceMethods
+        private
+          def create_with_identity_map
+            id = create_without_identity_map
+            self.class.if_id_map{|map| map[id] = self }
+            id
+          end
+          
+          def destroy_with_identity_map
+            res = destroy_without_identity_map
+            self.class.if_id_map{|map| map.delete(id) }
+            res
+          end
+      end
+    end
+    
+    extend IdentityMap::ClassMethods
   end
 end
 

data/spec/identity_map_spec.rb

@@ -52,6 +52,23 @@ describe "Customers" do
             c2.should be_nil
         end
         
+        it "should reload adequatly" do
+            Customer.connection.update_sql('update customers set value=2;')
+            @billy.reload
+            @billy.value.should == 2
+        end
+        
+        it "should leave changed columns" do
+            @billy.value = 3
+            b = Customer.find_by_name("billy")
+            b.value.should == 3
+            b.value_changed?.should be_true
+            b.changes.should == {'value'=>[1,3]}
+            Customer.connection.update_sql('update customers set value=2;')
+            b = Customer.find_by_name("billy")
+            b.changes.should == {'value'=>[2,3]}
+        end
+        
         after(:each) do
             @billy.destroy unless @billy.destroyed?
         end

data/spec/spec_helper.rb

@@ -3,6 +3,10 @@ require 'spec'
 require 'active_support'
 require 'active_support/test_case'
 require 'active_record'
+begin
+    require 'active_record/railtie'
+rescue MissingSourceFile
+end
 require 'active_record/test_case'
 require 'action_controller'
 require 'action_view'
@@ -19,6 +23,7 @@ ActiveRecord::Schema.define(:version => 0) do
   puts "Creating Schema"
   create_table :customers, :force => true do |t|
     t.string :name
+    t.integer :value, :default=>1
   end
   create_table :phone_numbers, :force => true do |t|
     t.string :number

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-simple-idmap
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Sokolov Yura aka funny_falcon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 +04:00
+date: 2010-08-05 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,6 @@ files:
 - lib/autotest/discover.rb
 - lib/identity_map.rb
 - lib/identity_map/action_controller/dispatcher.rb
-- lib/identity_map/active_record/associations.rb
 - lib/identity_map/active_record/base.rb
 - lib/identity_map/cache.rb
 - spec/identity_map_spec.rb
@@ -92,5 +91,5 @@ signing_key:
 specification_version: 3
 summary: Simple identity map for ActiveRecord
 test_files: 
-- spec/identity_map_spec.rb
 - spec/spec_helper.rb
+- spec/identity_map_spec.rb

data/lib/identity_map/active_record/associations.rb

@@ -1,31 +0,0 @@
-module IdentityMap
-
-  def self.included(base)
-    base.extend(ClassMethods)
-    class << base
-      alias_method_chain :association_instance_set, :identity_map
-    end
-  end
-
-  module ClassMethods
-
-  private
-
-  # Set the specified association instance.
-  def association_instance_set_with_identity_map(name, association)
-    identity_map = Thread.current['identity_map']
-    unless identity_map
-      association_instance_set_without_identity_map("@#{name}", association)
-    else
-      association_instance_set_without_identity_map("@#{name}", identity_map.put(association))
-    end
-  end
-
-
-  end
-
-end
-
-if Object.const_defined?("ActiveRecord")
-  ActiveRecord::Associations.send :include, IdentityMap
-end