activerecord-bixformer 0.4.17 → 0.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 078c30908de9e4bc0604a1d62bfff820a57644d9
-  data.tar.gz: 4122a19b05d79688b8862576f516b82ebf3667b4
+  metadata.gz: ae6888312a21e7d9354ae7c46e4b8fc9e87aa4c2
+  data.tar.gz: bb36394798a5fa42d748f1c2a50ca8ea8fe19fa0
 SHA512:
-  metadata.gz: 3a95d90a738354a0824b3194af7791c2fb2b51cd906cb245dec548239079a3869fa213a6500141113752888c1ee104b98f1d75341c722a39f1ce3e57174867a2
-  data.tar.gz: 13ec0040a6f143908150e80ae9b5a92124a5c6ec66a2919da9f4b52a9e67a47c7e9deda0d3f0751e49b7b737de1006e8c24b3f596143a0819d2e089f0cdb2b49
+  metadata.gz: 1995b2cb22b6f1569df73e0b284af26926e2425170a7be0e6db97b6efab7d20f21129960f2165ca09376c2853a5fd13878e8a320b1e9bf07e7b85abb37bb3044
+  data.tar.gz: a7d635b60db5b21c39640f455a380e07401ba241c078548793be9b7a780a0d5f5b82d76f1761269e68814cdf0662c87d5a1416f839ed50e5cde0cde85557b214

data/lib/activerecord-bixformer/model/csv/base.rb

@@ -42,10 +42,6 @@ module ActiveRecord
           private
 
           def do_export(record_or_relation)
-            if record_or_relation.is_a?(::ActiveRecord::Relation)
-              record_or_relation = record_or_relation.where(@plan.pickup_value_for(self, :required_condition, {}))
-            end
-
             values = run_bixformer_callback :export, type: :attribute do
               # has_one でしか使わない想定なので record_or_relation は ActiveRecord::Base のはず
               @attributes.map do |attr|
@@ -61,13 +57,21 @@ module ActiveRecord
 
             run_bixformer_callback :export, type: :association do
               @associations.inject(values) do |each_values, association|
-                association_value = if record_or_relation
-                                      run_bixformer_callback :export, on: association.name do
-                                        record_or_relation.__send__(association.name)
-                                      end
-                                    end
+                association_value =
+                  if record_or_relation
+                    run_bixformer_callback :export, on: association.name do
+                      association_record_or_relation = record_or_relation.__send__(association.name)
+
+                      if association_record_or_relation.is_a?(::ActiveRecord::Relation)
+                        association_record_or_relation =
+                          association_record_or_relation.where(@plan.pickup_value_for(association, :required_condition, {}))
+                      end
+
+                      association.export(association_record_or_relation)
+                    end
+                  end
 
-                each_values.merge(association.export(association_value))
+                each_values.merge(association_value || {})
               end
             end
           end

data/lib/activerecord-bixformer/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bixformer
-    VERSION = "0.4.17"
+    VERSION = "0.4.18"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bixformer
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.4.18
 platform: ruby
 authors:
 - Hiroaki Otsu