occams-record 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: '0338de44620fd361fbf185253f3c28dbf3cd6fe6e12b58724da27ec7cbcca78a'
-  data.tar.gz: 36689a595b7272d2f9fceb647a4e303ffd776ea323f378f7b2a0c3b006f139d0
+SHA1:
+  metadata.gz: 2d1c4320c6ac238acbb8329b672c5bc487fa14e5
+  data.tar.gz: 38f86e3f7467fa1134b62e6500c25278a7d1be80
 SHA512:
-  metadata.gz: 8b261d5db1d3c75f3a6ed7018d2c82efc85353908db883a35deb47cb0ff6f457d610b295a5e6c09533d6b5fc41e815ae0ce51fc43c5f5d3bbf40e90798236631
-  data.tar.gz: e7b18444881fc1fba960082caa64f256e762977010afe679e30698dba9876d69f3779f0fd0e4b9ed3f5c5819830e70de4f908cdeed6a67a0fa4c2b4b4b53f47b
+  metadata.gz: 3be346b9c94d373cec5955b8c0577edbc62b80b74d958b95e3ff4dcf5a768a59192a4fd9938933b50c06185d568a3467428c92fbf5921838ed6ce17a0c183918
+  data.tar.gz: f56c580afb05217f7ce219d53de678dbb8f7e098cdd62ba01557e4ebd42adc8c4dd45817a8d437f9610e840834988becd69f1071add021a727fd67ef8e79752e

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

@@ -1,7 +1,7 @@
 module OccamsRecord
   module EagerLoaders
     #
-    # Base class for eagoer loading an association.
+    # Base class for eagoer loading an association. IMPORTANT eager loaders MUST remain stateless after initialization!
     #
     class Base
       # @return [String] association name
@@ -28,9 +28,10 @@ module OccamsRecord
       # @param query_logger [Array<String>]
       #
       def run(rows, query_logger: nil)
-        query(rows) { |scope|
+        query(rows) { |*args|
+          scope = args[0]
           assoc_rows = Query.new(scope, use: @use, query_logger: query_logger, &@eval_block).run
-          merge! assoc_rows, rows
+          merge! assoc_rows, rows, *args[1..-1]
         }
       end
 

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

@@ -11,8 +11,9 @@ module OccamsRecord
       # @yield
       #
       def query(rows)
-        assoc_ids = join_rows(rows).map { |row| row[1] }.compact.uniq
-        yield base_scope.where(@ref.association_primary_key => assoc_ids) if assoc_ids.any?
+        join_rows = fetch_join_rows(rows)
+        assoc_ids = join_rows.map { |row| row[1] }.compact.uniq
+        yield base_scope.where(@ref.association_primary_key => assoc_ids), join_rows if assoc_ids.any?
       end
 
       #
@@ -20,9 +21,10 @@ module OccamsRecord
       #
       # @param assoc_rows [Array<OccamsRecord::Results::Row>] rows loaded from the association
       # @param rows [Array<OccamsRecord::Results::Row>] rows loaded from the main model
+      # @param join_rows [Array<Array<String>>] raw join'd ids from the db
       #
-      def merge!(assoc_rows, rows)
-        joins_by_id = join_rows(rows).reduce({}) { |a, join|
+      def merge!(assoc_rows, rows, join_rows)
+        joins_by_id = join_rows.reduce({}) { |a, join|
           id = join[0].to_s
           a[id] ||= []
           a[id] << join[1].to_s
@@ -64,9 +66,7 @@ module OccamsRecord
       # @param rows [Array<OccamsRecord::Results::Row>]
       # @return [Array<Array<String>>]
       #
-      def join_rows(rows)
-        return @join_rows if defined? @join_rows
-
+      def fetch_join_rows(rows)
         conn = @model.connection
         join_table = conn.quote_table_name @ref.join_table
         assoc_fkey = conn.quote_column_name @ref.association_foreign_key
@@ -80,7 +80,7 @@ module OccamsRecord
           conn.quote id
         }
 
-        @join_rows = quoted_ids.any? ? conn.
+        quoted_ids.any? ? conn.
           exec_query("SELECT #{fkey}, #{assoc_fkey} FROM #{join_table} WHERE #{fkey} IN (#{quoted_ids.join ','})").
           rows : []
       end

data/lib/occams-record/version.rb

@@ -3,5 +3,5 @@
 #
 module OccamsRecord
   # Library version
-  VERSION = '0.25.0'.freeze
+  VERSION = '0.26.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: The missing high-efficiency query API for ActiveRecord