occams-record 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d09d84ccc4713f32959380098b74112e45fa6a84a47698f1cec2d6fc4c4886a9
-  data.tar.gz: b94244c91ed19b02cfb36ff02c72b6510ab38da73f7d76e13e8104713fa2ed03
+  metadata.gz: a367407e2af3e4110327d26438fcb2a590b7fbd34e6b60dd4bd9396665c495fe
+  data.tar.gz: 8cf6fb913ac787126a80fe38baff3a56940cea8afc80e1b05e3c864ae8368e11
 SHA512:
-  metadata.gz: 950a0baa705302727a9ab9d20bb286e2fdc44cdd8b6aee3edb1b02c0a640786beca3492e799bcf4efe87c3a01289c6f4edb2daa07dc24650a5c29d6276733737
-  data.tar.gz: dc07af2830bf268dac941834d36bc1cca3ffe64f5e1e3eadfe901b11fe1fcf545ba9804da4fd683697ee26201faf0936b06aaa203ac661aa14eed69b036e2109
+  metadata.gz: 2bc45d11bc974e5a5ec6b2b9ffab8e3f069048ee8335122ad81a8b49cc852fa4bdb27116865000e4b70e4f6d617b3f870861288e00a43b273e3ec14d0dfdb6b6
+  data.tar.gz: af1dac7260e93ed3778ff022c3d6113819528e37d77c275b9cada6cd5e731593bbe9e4f24ae283ed572a4876672126df4cb002ab8f9c863e3de4943f95acdbc2

data/README.md

@@ -20,8 +20,8 @@ Continue using ActiveRecord's query builder, but let Occams take over running th
 ```ruby
 OccamsRecord
   .query(User.active)
-  .eager_load(:orders) {
-    scope { |q| q.where("created_at >= ?", date).order("created_at DESC") }
+  .eager_load(:orders) { |l|
+    l.scope { |q| q.where("created_at >= ?", date).order("created_at DESC") }
   }
 ```
 
@@ -137,9 +137,9 @@ Eager loading is similiar to ActiveRecord's `preload`: each association is loade
 OccamsRecord
   .query(q)
   .eager_load(:customer)
-  .eager_load(:line_items) {
-    eager_load(:product)
-    eager_load(:something_else)
+  .eager_load(:line_items) { |l|
+    l.eager_load(:product)
+    l.eager_load(:something_else)
   }
   .find_each { |order|
     puts order.customer.name
@@ -163,11 +163,11 @@ orders = OccamsRecord
 
   # Or use 'scope' to access the full power of ActiveRecord's query builder.
   # Here, only 'active' line items will be returned, and in a specific order.
-  .eager_load(:line_items) {
-    scope { |q| q.active.order("created_at") }
+  .eager_load(:line_items) { |l|
+    l.scope { |q| q.active.order("created_at") }
 
-    eager_load(:product)
-    eager_load(:something_else)
+    l.eager_load(:product)
+    l.eager_load(:something_else)
   }
   .run
 ```
@@ -267,9 +267,9 @@ Let's say we want to load each product with an array of all customers who've ord
 ```ruby
 products_with_orders = OccamsRecord
   .query(Product.all)
-  .eager_load(:line_items) {
-    eager_load(:order) {
-      eager_load(:customer)
+  .eager_load(:line_items) { |l|
+    l.eager_load(:order) { |l|
+      l.eager_load(:customer)
     }
   }
   .map { |product|

data/lib/occams-record/eager_loaders/ad_hoc_base.rb

@@ -26,7 +26,13 @@ module OccamsRecord
         @name, @mapping = name.to_s, mapping
         @sql, @binds, @use, @model = sql, binds, use, model
         @eager_loaders = EagerLoaders::Context.new(@model)
-        instance_exec(&builder) if builder
+        if builder
+          if builder.arity > 0
+            builder.call(self)
+          else
+            instance_exec(&builder)
+          end
+        end
       end
 
       #

data/lib/occams-record/eager_loaders/base.rb

@@ -24,7 +24,13 @@ module OccamsRecord
         @name = (as || ref.name).to_s
         @eager_loaders = EagerLoaders::Context.new(@model)
         @optimizer = optimizer
-        instance_exec(&builder) if builder
+        if builder
+          if builder.arity > 0
+            builder.call(self)
+          else
+            instance_exec(&builder)
+          end
+        end
       end
 
       #

data/lib/occams-record/eager_loaders/builder.rb

@@ -10,6 +10,12 @@ module OccamsRecord
       # Specify an association to be eager-loaded. For maximum memory savings, only SELECT the
       # colums you actually need.
       #
+      # If you pass a block to nest more eager loads, you may call it with one of two forms: with an argument and without:
+      #
+      # If you ommit the block argument, the "self" inside the block will be the eager loader. You can call "eager_load" and "scope" directly.
+      #
+      # If you include the block argument, the "self" inside the block is the same as the self outside the block. The argument will be the eager loader, which you can use to make additional "eager_load" or "scope" calls.
+      #
       # @param assoc [Symbol] name of association
       # @param scope [Proc] a scope to apply to the query (optional). It will be passed an
       # ActiveRecord::Relation on which you may call all the normal query hethods (select, where, etc) as well as any scopes you've defined on the model.

data/lib/occams-record/eager_loaders/polymorphic_belongs_to.rb

@@ -22,7 +22,13 @@ module OccamsRecord
         @foreign_type = @ref.foreign_type.to_sym
         @foreign_key = @ref.foreign_key.to_sym
         @eager_loaders = EagerLoaders::Context.new(nil, polymorphic: true)
-        instance_exec(&builder) if builder
+        if builder
+          if builder.arity > 0
+            builder.call(self)
+          else
+            instance_exec(&builder)
+          end
+        end
       end
 
       #

data/lib/occams-record/version.rb

@@ -3,5 +3,5 @@
 #
 module OccamsRecord
   # @private
-  VERSION = "1.5.0".freeze
+  VERSION = "1.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord