api-blocks 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 710664013c6c921b9bdfe46c1598143edd489eddcdfc1519f13fb2625462640a
-  data.tar.gz: 245c76d099c43ffa562ed68bbc387deb49d7fd96814ed294eee1eccbf1b3adad
+  metadata.gz: bb1ad9391f72b911e88c22cd1a4e499ce0e66a3c2adddd538fe4efd8a644823d
+  data.tar.gz: 1476196c825f6096d90d60844145f92eb6efbeca56edf786805f90fea7c61609
 SHA512:
-  metadata.gz: 471441ab9dab08080f516f2a8427938f739154b91f24dd0378f48634f9b4bf444e9103af4c6d49905002d847d9b03a2dab1f0f87edafa7661ad2163f00e12272
-  data.tar.gz: 3273523f2ecc5997e7cc0ea04eb8bfc7e88b75723293cd1268b7cf21fd6c07ff45daf969402c0245ddde8eb33753fc25546ca851163f946bd233fddbdbb63c1d
+  metadata.gz: d7ecf6130b74a07bf7e0be3d2d0d02122f8a33d04c8391b519706b3b5ed90e850acaa541961e9c97662a3170761cf1f62799e36a656bade77e32508f634f8c18
+  data.tar.gz: af9740a29417e248b15b4804982ce7932ee8f43c05d95baa12e1b1bb9a05c2457c4837c1c23c16a50ff954961b926e54942122597b45a7f14d1e38c27dc18f25

data/lib/api_blocks/blueprinter/association_extractor.rb

@@ -24,29 +24,35 @@ class Blueprinter::AssociationExtractor < Blueprinter::Extractor
                     end
 
     view = options[:view] || :default
+    scope = if options[:block].present?
+      options[:block].call(object, local_options)
+    else
+      {}
+    end
 
     BatchLoader.for(association_id).batch(
       default_value: default_value,
-      key: [association_name, association_klass, view, options[:blueprint]],
-    ) do |ids, loader, _args|
+      key: [association_name, association_klass, view, options[:blueprint], scope],
+    ) do |ids, loader, args|
       model = association_klass.safe_constantize
+      scope = args[:key].last
 
       case association
       when ActiveRecord::Associations::HasManyAssociation
-        model.where(join_key.key => ids).each do |record|
+        model.where(join_key.key => ids).merge(scope).each do |record|
           loader.call(record.send(join_key.key)) do |memo|
             memo << render_blueprint(record, local_options, options)
           end
         end
       when ActiveRecord::Associations::HasOneAssociation
-        model.where(join_key.key => ids).each do |record|
+        model.where(join_key.key => ids).merge(scope).each do |record|
           loader.call(
             record.send(join_key.key),
             render_blueprint(record, local_options, options)
           )
         end
       when ActiveRecord::Associations::BelongsToAssociation
-        model.where(join_key.key => ids).each do |record|
+        model.where(join_key.key => ids).merge(scope).each do |record|
           loader.call(
             record.id,
             render_blueprint(record, local_options, options)

data/lib/api_blocks/version.rb

@@ -2,5 +2,5 @@
 
 module ApiBlocks
   # Current version of ApiBlocks
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-blocks
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Paul d'Hubert