ar-preloader 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 584f98e3ee0d6805aeeb6ad6b93403c0385c6ee5
-  data.tar.gz: 864b63c2631cd805b72c4f513a095b312aad4177
+  metadata.gz: 2d895597b76cd8b4d0264a01a1edbd02dae18d12
+  data.tar.gz: aef0a1676a11b7a1d6d9c802415d52c976913342
 SHA512:
-  metadata.gz: f261c86808b820ad41ace486d0bec69379bdbad03529c42451eece0888039e034e3af3778b5b946bd9dc6797f4049087b3099618bd71b5e61b30b93d9f54466f
-  data.tar.gz: a480f9e5ea51d9ac98922194b9cfecf124b410c2a5226851bf1fdb7ad9b592830f24345de591d4951b4f3a3327afe86596f5fb0095418932f5ef28814a322541
+  metadata.gz: baf8de3beb914d202cb72431db24a71ccb0844d97353ce06211450aa2bebcc2d522ef43b83ea0dc52314378d0626966b1e720de409b8b8c796bc1381ca05ecd4
+  data.tar.gz: a7407f60a72dfacb079ac3426f0d97a39bc2b84050a8a211a12cf41899c202d4085edb600c6302770f93b2842c4de99773483223c7b1a88e760b7b54bf473bcb

data/lib/ar/preloader.rb

@@ -9,6 +9,10 @@ module Ar
       case association
       when String, Symbol
         return klass.reflections.keys.include?(association.to_s)
+      when Array
+        association.each do |v|
+          return false unless Ar::Preloader.check_association_exists(klass, v)
+        end
       when Hash
         association.each_pair do |k,v|
           return false unless klass.reflections.keys.include?(k.to_s)
@@ -38,6 +42,8 @@ module Ar
       case association
       when String, Symbol
         klass = list.first.class
+        klass.send :attr_reader, "_#{association}".to_sym
+
         association_details = klass.reflections[association.to_s]
         association_klass = association_details.class_name.constantize
 
@@ -46,6 +52,11 @@ module Ar
           foreign_key = association_details.foreign_key
           association_pk = association_klass.primary_key
 
+          list.each do |obj|
+            instance_variable_name = "@_#{association}".to_sym
+            obj.instance_variable_set(instance_variable_name, [])
+          end
+
           query = <<-EOS
 SELECT
   distinct #{association_klass.table_name}.*
@@ -56,15 +67,14 @@ EOS
 
           association_list = association_klass.find_by_sql(query).to_a
 
-          association_list.preload(*inner_associations)
+          if inner_associations.is_a?(Array)
+            association_list.preload(*inner_associations)
+          else
+            association_list.preload(inner_associations)
+          end
 
           list.each do |obj|
-            klass.send :attr_reader, "_#{association}".to_sym
-
             instance_variable_name = "@_#{association}".to_sym
-            if obj.instance_variable_get(instance_variable_name).nil?
-              obj.instance_variable_set(instance_variable_name, [])
-            end
 
             association_list.select{ |e| e[foreign_key.to_sym] == obj[klass.primary_key.to_sym] }.each do |association_obj|
               each_list = obj.instance_variable_get(instance_variable_name)
@@ -76,6 +86,10 @@ EOS
           foreign_key = association_details.foreign_key
           association_pk = association_klass.primary_key
 
+          if list.map{ |e| e[foreign_key.to_sym] }.compact.length == 0
+            return true
+          end
+
           query = <<-EOS
 SELECT
   distinct #{association_klass.table_name}.*
@@ -86,22 +100,73 @@ EOS
 
           association_list = association_klass.find_by_sql(query).to_a
 
-          association_list.preload(*inner_associations)
+          if inner_associations.is_a?(Array)
+            association_list.preload(*inner_associations)
+          else
+            association_list.preload(inner_associations)
+          end
 
           association_map = association_list.map{ |e| [e[e.class.primary_key.to_sym], e] }.to_h
 
           list.each do |obj|
             if obj[foreign_key.to_sym].present? && association_map[obj[foreign_key.to_sym]].present?
-              klass.send :attr_reader, "_#{association}".to_sym
               obj.instance_variable_set( "@_#{association}".to_sym, association_map[obj[foreign_key.to_sym]] )
             end
           end
+        when ActiveRecord::Reflection::HasAndBelongsToManyReflection
+          foreign_key = association_details.foreign_key
+          association_foreign_key = association_details.association_foreign_key
+          join_table = association_details.join_table
+
+          list.each do |obj|
+            instance_variable_name = "@_#{association}".to_sym
+            obj.instance_variable_set(instance_variable_name, [])
+          end
+
+          join_query = <<-EOS
+SELECT
+  #{join_table}.#{foreign_key},
+  #{join_table}.#{association_foreign_key}
+FROM #{join_table}
+WHERE #{join_table}.#{foreign_key} IN (#{ list.map{ |e| e[klass.primary_key.to_sym].try(:to_s) }.compact.join(",") })
+
+EOS
+          join_entries = ActiveRecord::Base.connection.execute(join_query).to_a
+
+          query = <<-EOS
+SELECT
+  distinct #{association_klass.table_name}.*
+FROM #{association_klass.table_name}
+INNER JOIN #{join_table} ON #{join_table}.#{association_foreign_key} = #{association_klass.table_name}.#{association_klass.primary_key}
+WHERE #{join_table}.#{foreign_key} IN (#{ list.map{ |e| e[klass.primary_key.to_sym].try(:to_s) }.compact.join(",") })
+
+EOS
+
+          association_list = association_klass.find_by_sql(query).to_a
+
+          if inner_associations.is_a?(Array)
+            association_list.preload(*inner_associations)
+          else
+            association_list.preload(inner_associations)
+          end
+
+          list.each do |obj|
+            instance_variable_name = "@_#{association}".to_sym
+
+            association_key_list = join_entries.select{ |e| e[0] == obj[klass.primary_key.to_s] }.map(&:last)
+
+            association_list.select{ |e| association_key_list.include?( e[association_klass.primary_key.to_s] ) }.each do |association_obj|
+              each_list = obj.instance_variable_get(instance_variable_name)
+              each_list << association_obj
+              obj.instance_variable_set(instance_variable_name, each_list)
+            end
+          end
         else
-          raise Ar::Preloader::Error.new("Unsupported assocation type: '#{assocation}'")
+          raise Ar::Preloader::Error.new("Unsupported association type: '#{association}'")
         end
       when Hash
         association.each_pair do |k,v|
-          Ar::Preloader.preload_association(list, k, [v])
+          Ar::Preloader.preload_association(list, k, v)
         end
       end
     end
@@ -115,6 +180,7 @@ class Array
     raise Ar::Preloader::Error.new("Cannot preload. Mixed type lists are not supported.") if (self.map(&:class).uniq.count > 1)
     raise Ar::Preloader::Error.new("Cannot preload. At least one element in array is not an ActiveRecord object.") if (self.reject{|e| e.is_a?(ActiveRecord::Base) }.count > 0)
 
+
     args.each do |arg|
       raise Ar::Preloader::Error.new("Cannot find association '#{arg}' on one or more of the ActiveRecord objects.") if (self.reject{|e| Ar::Preloader.check_association_exists(e.class, arg) }.count > 0)
     end

data/lib/ar/preloader/version.rb

@@ -1,5 +1,5 @@
 module Ar
   module Preloader
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-preloader
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ajith Hussain