batch-loader-active-record 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c24c7d661f0d2449d676892c1d328f8c5147e3
-  data.tar.gz: 83d9fa13f7dcab069ed2b1d1f11fc4e1f36834f9
+  metadata.gz: 21895ec7eb240edbb662157510b7c1f2e0e09ece
+  data.tar.gz: 73a9d404f37d37432b74dc34156614f591cfd4c5
 SHA512:
-  metadata.gz: 0677e7a74dfe10a238bd431d171d44bbff07b3c8a6f775bfbe9bf595f345ea0fce7c35a494eceb7702e5abb56ffcada2ea426c23097286a77bfb200a0022ebb3
-  data.tar.gz: 0e0e3edd2866a7c578567f5171e23fae3356b8469ada0123781d5d7b0276c655af33149baa1da985e8c4d198b8ddf3ad48f961b38609b03ed959ea7dfaeff58b
+  metadata.gz: 5917a41861fd8b5bced3f6b22f5d981028615fb7e6a4a0f674fde403261d6d29da4dbb8d2327a873cae3eb750f5ffee034d819507ca004e67b44d3d4f2b9ebeb
+  data.tar.gz: d03ff1d186f23a10d3f65766ab8ac57555e91b0bd2e7647751e3d3f0ece000c221a5313050abc2a9633f79a460056e4b2564e023053bd5fb9ce824a3fc85404b

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+# Changelog
+
+Unreleased
+
+* nothing yet
+
+v0.3.0
+
+* allow to specify an association scope with `belongs_to_lazy`, `has_one_lazy` and `has_many_lazy`
+
+v0.2.0
+
+* allow to use `has_many_lazy` with `through: ...` option
+
+v0.1.0
+
+* initial release
+* doens't support `has_and_belongs_to_lazy`
+* doesn't support `has_many_lazy ... through: ...`
+* doesn't support association scope
+* doesn't support polymorphic associations

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    batch-loader-active-record (0.2.0)
+    batch-loader-active-record (0.3.0)
       activerecord (>= 4.2.0, < 5.2.0)
       activesupport (>= 4.2.0, < 5.2.0)
       batch-loader (~> 1.2.0)

data/README.md

@@ -12,7 +12,7 @@ It is not intended to be used for all associations though, but only where necess
 
 ## Description
 
-This is a very simple gem which is basically a mixin containg replacement macros for the 3 active record association macros (note that **polymorphic associations and association scopes are not yet supported**):
+This is a very simple gem which is basically a mixin containg replacement macros for the 3 active record association macros (refer to the [CHANGELOG](https://github.com/mathieul/batch-loader-active-record/blob/master/CHANGELOG.md) to know what is supported and what is not):
 
 * `belongs_to_lazy`
 * `has_one_lazy`

data/lib/batch_loader_active_record.rb

@@ -12,11 +12,17 @@ module BatchLoaderActiveRecord
     def belongs_to_lazy(*args)
       belongs_to(*args).tap do |reflections|
         reflect = reflections.values.last
+        assert_not_polymorphic(reflect)
         batch_key = [table_name, reflect.name]
         define_method(:"#{reflect.name}_lazy") do
+          assoc_scope = if reflect.scope.nil?
+            reflect.klass
+          else
+            reflect.klass.instance_eval(&reflect.scope)
+          end
           foreign_key_value = send(reflect.foreign_key) or return nil
           BatchLoader.for(foreign_key_value).batch(key: batch_key) do |foreign_key_values, loader|
-            reflect.klass.where(id: foreign_key_values).each { |instance| loader.call(instance.id, instance) }
+            assoc_scope.where(id: foreign_key_values).each { |instance| loader.call(instance.id, instance) }
           end
         end
       end
@@ -25,10 +31,16 @@ module BatchLoaderActiveRecord
     def has_one_lazy(*args)
       has_one(*args).tap do |reflections|
         reflect = reflections.values.last
+        assert_not_polymorphic(reflect)
         batch_key = [table_name, reflect.name]
         define_method(:"#{reflect.name}_lazy") do
+          assoc_scope = if reflect.scope.nil?
+            reflect.klass
+          else
+            reflect.klass.instance_eval(&reflect.scope)
+          end
           BatchLoader.for(id).batch(key: batch_key) do |model_ids, loader|
-            reflect.klass.where(reflect.foreign_key => model_ids).each do |instance|
+            assoc_scope.where(reflect.foreign_key => model_ids).each do |instance|
               loader.call(instance.public_send(reflect.foreign_key), instance)
             end
           end
@@ -39,12 +51,22 @@ module BatchLoaderActiveRecord
     def has_many_lazy(*args)
       has_many(*args).tap do |reflections|
         reflect = reflections.values.last
+        assert_not_polymorphic(reflect)
         base_key = [table_name, reflect.name]
         define_method(:"#{reflect.name}_lazy") do |instance_scope = nil|
           batch_key = base_key
           batch_key += [instance_scope.to_sql.hash] unless instance_scope.nil?
+          assoc_scope = if reflect.scope.nil?
+            reflect.klass
+          else
+            reflect.klass.instance_eval(&reflect.scope)
+          end
           BatchLoader.for(id).batch(default_value: [], key: batch_key) do |model_ids, loader|
-            relation = instance_scope || reflect.klass
+            relation = if instance_scope.nil?
+              assoc_scope
+            else
+              assoc_scope.instance_eval { instance_scope }
+            end
             if reflect.through_reflection?
               instances = self.class.fetch_for_model_ids(model_ids, relation: relation, reflection: reflect)
               instances.each do |instance|
@@ -76,6 +98,14 @@ module BatchLoaderActiveRecord
         .select("#{relation.table_name}.*, #{instance_id_path} AS _instance_id")
     end
 
+    private
+
+    def assert_not_polymorphic(reflection)
+      if reflection.polymorphic? || reflection.options.has_key?(:as) || reflection.options.has_key?(:source_type)
+        raise NotImplementedError, "polymorphic associations are not yet supported (#{reflection.name})"
+      end
+    end
+
     def reflection_chain(reflection)
       reflections = [reflection]
       begin

data/lib/batch_loader_active_record/version.rb

@@ -1,3 +1,3 @@
 module BatchLoaderActiveRecord
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch-loader-active-record
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - mathieul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: batch-loader
@@ -145,6 +145,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock