ar-simple-idmap 0.2.4 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/lib/identity_map.rb

@@ -3,3 +3,4 @@ if defined?(ActionController)
   require "identity_map/action_controller/dispatcher"
 end
 require "identity_map/active_record/base"
+require "identity_map/active_record/association_preload"

data/lib/identity_map/active_record/association_preload.rb

@@ -0,0 +1,62 @@
+module ActiveRecord
+  module AssociationPreload #:nodoc:
+    module ClassMethods
+      def preload_has_and_belongs_to_many_association_with_identity_map(records, reflection, preload_options={})
+        unless reflection.klass.respond_to?(:id_map)
+          return preload_has_and_belongs_to_many_association_without_identity_map(records, reflection, preload_options)
+        end
+        table_name = reflection.klass.quoted_table_name
+        records = records.find_all{|record| !record.send(reflection.name).loaded?}
+        return if records.empty?
+        id_to_record_map, ids = construct_id_map(records)
+        records.each {|record| record.send(reflection.name).loaded}
+        options = reflection.options
+
+        conditions = "t0.#{reflection.primary_key_name} #{in_or_equals_for_ids(ids)}"
+        conditions << append_conditions(reflection, preload_options)
+        
+        joins = connection.select_all(sanitize_sql([
+            "select t0.#{reflection.primary_key_name} as prnt_id, t0.#{reflection.association_foreign_key} as chld_id
+             from #{connection.quote_table_name options[:join_table]} t0
+             where #{conditions}
+             ", ids]))
+        child_record_ids = joins.map{|j| j['chld_id']}.uniq
+
+        associated_records = reflection.klass.with_exclusive_scope do
+          reflection.klass.find(:all, :conditions => {reflection.klass.primary_key => child_record_ids},
+            :include => options[:include],
+            :select => options[:select].presence,
+            :order => options[:order])
+        end
+        associated_record_map = associated_records.inject({}){|h, r| h[r.id.to_s] = r; h}
+        joins.each do |j|
+          mapped_records = id_to_record_map[j['prnt_id'].to_s]
+          add_preloaded_records_to_collection(mapped_records, reflection.name, associated_record_map[j['chld_id'].to_s])
+        end
+      end
+      alias_method_chain :preload_has_and_belongs_to_many_association, :identity_map
+      
+      if Array.respond_to?(:wrap)
+        def add_preloaded_records_to_collection(parent_records, reflection_name, associated_record)
+          parent_records.each do |parent_record|
+            association_proxy = parent_record.send(reflection_name)
+            association_proxy.loaded
+            associated_records = Array.wrap(associated_record) - association_proxy.target
+            association_proxy.target.push(*associated_records)
+            association_proxy.__send__(:set_inverse_instance, associated_record, parent_record)
+          end
+        end
+      else
+        def add_preloaded_records_to_collection(parent_records, reflection_name, associated_record)
+          parent_records.each do |parent_record|
+            association_proxy = parent_record.send(reflection_name)
+            association_proxy.loaded
+            associated_records = [associated_record].flatten - association_proxy.target
+            association_proxy.target.push(*associated_records)
+            association_proxy.__send__(:set_inverse_instance, associated_record, parent_record)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/identity_map/active_record/base.rb

@@ -27,6 +27,7 @@ module ActiveRecord # :nodoc:
               end
               alias_method_chain :create, :identity_map
               alias_method_chain :destroy, :identity_map
+              alias_method_chain :reload, :identity_map
             end
           end
       end
@@ -46,7 +47,7 @@ module ActiveRecord # :nodoc:
         private
         
           def fetch_single(map, id)
-            if (obj = map[id]) && obj.attribute_names == column_names
+            if (obj = map[id]) && !(column_names - obj.attribute_names).present?
               obj
             end
           end
@@ -69,21 +70,25 @@ module ActiveRecord # :nodoc:
       
           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?
+              if args.size > 1 && args.all?{|a| a.is_a?(Integer) || a.is_a?(String)}
+                args = [ args ]
+              end
+              args1 = args[1]
+              from_arg0 = args1.nil? || 
+                    args1.is_a?(Hash) && !args1.values.any?
               from_condition_ids = !from_arg0 &&
                     (args[0] == :all || args[0] == :first) &&
                     args.size == 2 && args[1].is_a?(Hash) &&
-                    args[1].all?{|key, value| key == :conditions || value.blank?} &&
-                    args[1][:conditions].is_a?(Hash) &&
-                    args[1][:conditions].keys == [:id]
+                    args1.all?{|key, value| key == :conditions || key == :include || !value.present?} &&
+                    args1[:conditions].is_a?(Hash) &&
+                    (args1[:conditions].keys == [:id] || args1[:conditions].keys == ['id'])
               if from_arg0 || from_condition_ids
-                ids = from_arg0 ? args[0] : args[1][:conditions][:id]
-                if ids.is_a?(Array)
+                ids = from_arg0 ? args[0] : (args1[:conditions][:id] || args1[:conditions]['id'])
+                records = if ids.is_a?(Array)
                   if from_arg0
                     fetch_from_map( map, ids, &method(:find_without_identity_map) )
                   elsif args[0] == :all
-                    fetch_from_map( map, ids ){|not_cached| 
+                    fetch_from_map( map, ids ){|not_cached|
                         find_without_identity_map(:all, {:conditions=>{:id=>not_cached}})
                     }
                   elsif args[0] == :first
@@ -98,6 +103,13 @@ module ActiveRecord # :nodoc:
                 else
                   fetch_single(map, ids)
                 end
+                if method_defined?(:merge_includes) && 
+                   (include_associations = merge_includes(scope(:find, :include), args1.try(:[],:include))).any?
+                  preload_associations(records, include_associations)
+                elsif args1.try(:[], :include)
+                  preload_associations(records, args1[:include])
+                end
+                records
               end
             end || find_without_identity_map(*args)
           end
@@ -145,6 +157,12 @@ module ActiveRecord # :nodoc:
             self.class.if_id_map{|map| map.delete(id) }
             res
           end
+          
+          def reload_with_identity_map
+            self.class.without_id_map do
+              reload_without_identity_map
+            end
+          end
       end
     end
     

data/spec/identity_map_spec.rb

@@ -138,6 +138,23 @@ describe "Customers" do
       c3.__id__.should == c2.__id__
     end
   end
+  
+  context "has and belongs to many" do
+    before(:each) do
+      gotwo = Building.create(:name=>'GoTwo')
+      Address.find(:all).each do |address|
+        gotwo.addresses << address
+      end
+    end
+    
+    it "should load habtm adequatly" do
+      buildings = Building.find(:all, :include=>:addresses)
+      buildings[0].addresses.loaded?.should be_true
+      buildings[0].addresses.to_a.size.should == 2
+      buildings[1].addresses.loaded?.should be_true
+      buildings[1].addresses.to_a.size.should == 2
+    end
+  end
     
 	after(:each) do
 		ActiveRecord::Base.drop_identity_map

data/spec/spec_helper.rb

@@ -31,7 +31,17 @@ ActiveRecord::Schema.define(:version => 0) do
   end
   create_table :phone_numbers, :force => true do |t|
     t.string :number
-    t.integer :customer_id
+    t.references :customer
+  end
+  create_table :buildings, :force => true do |t|
+    t.string :name
+  end
+  create_table :addresses, :force => true do |t|
+    t.string :name
+  end
+  create_table :addresses_buildings, :force => true, :id => false do |t|
+    t.references :building
+    t.references :address
   end
 end
 
@@ -49,3 +59,19 @@ end
 
 phone_number = customer.phone_numbers.create(:number => "8675309")
 
+class Building < ActiveRecord::Base
+  use_id_map
+  has_and_belongs_to_many :addresses
+end
+
+building = Building.create(:name => 'GoOne')
+
+class Address < ActiveRecord::Base
+  use_id_map
+  has_and_belongs_to_many :customers
+end
+
+address1 = Address.create(:name=>'volga')
+address2 = Address.create(:name=>'don')
+building.addresses << address1
+building.addresses << address2

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-simple-idmap
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Sokolov Yura aka funny_falcon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +04:00
+date: 2010-11-05 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,7 @@ files:
 - install.rb
 - lib/identity_map.rb
 - lib/identity_map/action_controller/dispatcher.rb
+- lib/identity_map/active_record/association_preload.rb
 - lib/identity_map/active_record/base.rb
 - lib/identity_map/cache.rb
 - spec/identity_map_spec.rb