activerecord_lax_includes 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a077f03322432709f78b6200f74607a86143307c
+  data.tar.gz: 26932f8326062d19e6c0799d95d745c5d921905a
+SHA512:
+  metadata.gz: 5e05c126fa6f00dd993d553dbf318dda6f7610c8cd3a301a4677d970f164603f8c840546aa68fac1a4299c3ecde59eed671af88f4f692eefd5ac2fa3490b573d
+  data.tar.gz: 87f7adde3b79f6aeb1a622bfb81b5fe7e6a14a3d1620aef04d410e8d1be968c914776563f7f92290750a2c76ff9b974b7270ea8d1094cbbc4d361a416f4a3127

data/lib/activerecord_lax_includes.rb

@@ -4,12 +4,29 @@ module ActiveRecordLaxIncludes
       base.class_eval do
         alias_method :records_by_reflection_default, :records_by_reflection
         alias_method :records_by_reflection, :records_by_reflection_with_lax_include
+
+        alias_method :preload_hash_default, :preload_hash
+        alias_method :preload_hash, :preload_hash_with_lax_include
+      end
+    end
+
+    def preload_hash_with_lax_include(association)
+      if lax_includes_enabled?
+        association.each do |parent, child|
+          ActiveRecord::Associations::Preloader.new(records, parent, options).run
+          associated_records = filtered_records_by_reflection(parent).map { |record| record.send(parent) }.flatten
+          ActiveRecord::Associations::Preloader.new(associated_records, child).run
+        end
+      else
+        preload_hash_default(association)
       end
     end
 
     def records_by_reflection_with_lax_include(association)
       if lax_includes_enabled?
-        filtered_records_by_reflection(association)
+        filtered_records_by_reflection(association).group_by do |record|
+          record.class.reflections[association]
+        end
       else
         records_by_reflection_default(association)
       end
@@ -18,13 +35,16 @@ module ActiveRecordLaxIncludes
     def filtered_records_by_reflection(association)
       records.select do |record|
         record.class.reflections[association].present?
-      end.group_by do |record|
-        record.class.reflections[association]
       end
     end
 
     def lax_includes_enabled?
-      !!Thread.current[:active_record_lax_includes_enabled]
+      result = Thread.current[:active_record_lax_includes_enabled]
+      if result.nil?
+        result = Rails.configuration.respond_to?(:active_record_lax_includes_enabled) &&
+                    Rails.configuration.active_record_lax_includes_enabled
+      end
+      result
     end
   end
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_lax_includes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Charles Barbier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: unixcharles@gmail.com
@@ -17,31 +16,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE
+- README.md
 - lib/activerecord_lax_includes.rb
 homepage: http://github.com/unixcharles/active-record-lax-includes
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Hotfix nested eager loading for polymorphic and STI relation in ActiveRecord
 test_files: []