ar_lazy_preload 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88bbf9af048997996a06aa5292f648fc9a5583a3335a4c088451bc7cb883f33f
-  data.tar.gz: 784ef74c3ab97149fb237c52ce663be4d0c7f5254e2181e1967b3f8b50e37949
+  metadata.gz: 44023d59df2053b73589d7b0baadad0933047105fb38986462347ce9c03414b6
+  data.tar.gz: fc4f589d5fec1c1731f82f5b43a3fe379f795445456721db5c6140190d3669a8
 SHA512:
-  metadata.gz: 4bda01ddd3c35f9b1e4f03966566a8c14fcffe9c64b69a9b49227b6ff481bf73d348d0576aed8919e9363ab2914fa001a1ba3fd7da5569767ea714d38704d4cc
-  data.tar.gz: 15769ecfdd7a41f1860483aab2418c1c2f3167bcb2f67c491f120ac3d4cb00d5bb53b3540f0a3574a575f9062181f7a8c2b16fa50a4265f3e45bc032f9f63e47
+  metadata.gz: 1b434e21ffab60c6008dfb85c9825d0534d635ae464052bcce0544cd6d2fee81b02ec9a9e4a26d542a46f18209efcb03c971f68ca0964b807d3a6e64ec2ca1f7
+  data.tar.gz: e12171b02fd58053e8e189e95a2178cdddb163ac225b134b298f9a2f872117e8edcd7c0119d84e60e7d99f355e3f58bb7f9976d76a9e515edc435aaf1c95da98

data/lib/ar_lazy_preload.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 require "ar_lazy_preload/configuration"
-require "ar_lazy_preload/ext/base"
-require "ar_lazy_preload/ext/relation"
-require "ar_lazy_preload/ext/association"
-require "ar_lazy_preload/ext/merger"
-require "ar_lazy_preload/ext/association_relation"
+require "ar_lazy_preload/railtie"
 
 module ArLazyPreload
   class << self
@@ -13,15 +9,4 @@ module ArLazyPreload
       @config ||= Configuration.new
     end
   end
-
-  ActiveRecord::Base.include(ArLazyPreload::Base)
-
-  ActiveRecord::Relation.prepend(ArLazyPreload::Relation)
-  ActiveRecord::AssociationRelation.prepend(ArLazyPreload::AssociationRelation)
-  ActiveRecord::Relation::Merger.prepend(ArLazyPreload::Merger)
-
-  [
-    ActiveRecord::Associations::CollectionAssociation,
-    ActiveRecord::Associations::Association
-  ].each { |klass| klass.prepend(ArLazyPreload::Association) }
 end

data/lib/ar_lazy_preload/{ext → active_record}/relation.rb

@@ -36,7 +36,6 @@ module ArLazyPreload
     end
 
     def lazy_preload!(*args)
-      args.reject!(&:blank?)
       args.flatten!
       self.lazy_preload_values += args
       self

data/lib/ar_lazy_preload/railtie.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "ar_lazy_preload/active_record/base"
+require "ar_lazy_preload/active_record/relation"
+require "ar_lazy_preload/active_record/association"
+require "ar_lazy_preload/active_record/merger"
+require "ar_lazy_preload/active_record/association_relation"
+
+module ArLazyPreload
+  class Railtie < Rails::Railtie
+    config.to_prepare do |_app|
+      ActiveSupport.on_load(:active_record) do
+        ActiveRecord::Base.include(Base)
+
+        ActiveRecord::Relation.prepend(Relation)
+        ActiveRecord::AssociationRelation.prepend(AssociationRelation)
+        ActiveRecord::Relation::Merger.prepend(Merger)
+
+        [
+          ActiveRecord::Associations::CollectionAssociation,
+          ActiveRecord::Associations::Association
+        ].each { |klass| klass.prepend(Association) }
+      end
+    end
+  end
+end

data/lib/ar_lazy_preload/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArLazyPreload
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_lazy_preload
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -119,15 +119,16 @@ files:
 - README.md
 - Rakefile
 - lib/ar_lazy_preload.rb
+- lib/ar_lazy_preload/active_record/association.rb
+- lib/ar_lazy_preload/active_record/association_relation.rb
+- lib/ar_lazy_preload/active_record/base.rb
+- lib/ar_lazy_preload/active_record/merger.rb
+- lib/ar_lazy_preload/active_record/relation.rb
 - lib/ar_lazy_preload/associated_context_builder.rb
 - lib/ar_lazy_preload/association_tree_builder.rb
 - lib/ar_lazy_preload/configuration.rb
 - lib/ar_lazy_preload/context.rb
-- lib/ar_lazy_preload/ext/association.rb
-- lib/ar_lazy_preload/ext/association_relation.rb
-- lib/ar_lazy_preload/ext/base.rb
-- lib/ar_lazy_preload/ext/merger.rb
-- lib/ar_lazy_preload/ext/relation.rb
+- lib/ar_lazy_preload/railtie.rb
 - lib/ar_lazy_preload/version.rb
 homepage: https://github.com/DmitryTsepelev/ar_lazy_preload
 licenses: