activerecord-bixformer 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f547ae90489b5f2aef0914a5730dffce3354399
-  data.tar.gz: 797acc403c81992e1f5f3b5a886ec3dbabf25e10
+  metadata.gz: 7a553dd137e4cb28794ed4ee3dc0d23021c6a6a5
+  data.tar.gz: 4e95330e0d2e63fd593f0edff3f2308675b5a877
 SHA512:
-  metadata.gz: 7b899f99643b000fa4c6c70eee259706db52cf1884f0c799a4b9c4cf790711ff71c533db1e6b1818f6e5a3cc2a0afc9c3fe3ac80c0bfcf9982a6f8bcda84ed22
-  data.tar.gz: 929768ac1b7fc4795b3c27755d75ab5892594ff5e6b929db64bdb396b19a8f79568c85832caa168829ad1beda774e796486e36b55dfe15410696a96a1d7e9a3f
+  metadata.gz: 5267c6cb19fdc3033fa5b1c237cccfa8f54690ae3747cb21552b69b549c1db2b1d4d924f5ae4e1c80ecf7b4aa0363f8fef15a7b6cc682444a796a4a405fa7ba8
+  data.tar.gz: d03a119e6beac47d8dd0bc54216280bde2820ef8676e2e80edfe040e5bb8b090a5782206e0f880919a695c0549840acd27795388ee9623f864224a3498126815

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

@@ -4,45 +4,18 @@ module ActiveRecord
       module Csv
         class Base < ::ActiveRecord::Bixformer::Model::Base
           def export(record_or_relation)
-            run_bixformer_callback :export do
-              values = run_bixformer_callback :export, type: :attribute do
-                # has_one でしか使わない想定なので record_or_relation は ActiveRecord::Base のはず
-                @attributes.map do |attr|
-                  attribute_value = if record_or_relation
-                                      run_bixformer_callback :export, on: attr.name do
-                                        attr.export(record_or_relation)
-                                      end
-                                    end
-
-                  [csv_title(attr.name), attribute_value]
-                end.to_h.with_indifferent_access
-              end
-
-              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
+            errors.clear
 
-                  each_values.merge(association.export(association_value))
-                end
-              end
+            run_bixformer_callback :export do
+              do_export(record_or_relation)
             end
           end
 
           def import(csv_body_row, parent_record_id = nil)
-            run_bixformer_callback :import do
-              values = make_each_attribute_import_value(parent_record_id) do |attr|
-                csv_value = csv_body_row[csv_title(attr.name)]
-
-                attr.import(csv_value)
-              end
+            errors.clear
 
-              make_each_association_import_value(values) do |association, self_record_id|
-                association.import(csv_body_row, self_record_id)
-              end
+            run_bixformer_callback :import do
+              do_import(csv_body_row, parent_record_id)
             end
           end
 
@@ -63,6 +36,45 @@ module ActiveRecord
           end
 
           alias_method :translate, :csv_title
+
+          private
+
+          def do_export(record_or_relation)
+            values = run_bixformer_callback :export, type: :attribute do
+              # has_one でしか使わない想定なので record_or_relation は ActiveRecord::Base のはず
+              @attributes.map do |attr|
+                attribute_value = if record_or_relation
+                                    run_bixformer_callback :export, on: attr.name do
+                                      attr.export(record_or_relation)
+                                    end
+                                  end
+
+                [csv_title(attr.name), attribute_value]
+              end.to_h.with_indifferent_access
+            end
+
+            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
+
+                each_values.merge(association.export(association_value))
+              end
+            end
+          end
+
+          def do_import(csv_body_row, parent_record_id = nil)
+            values = make_each_attribute_import_value(parent_record_id) do |attr|
+              attr.import(csv_body_row[csv_title(attr.name)])
+            end
+
+            make_each_association_import_value(values) do |association, self_record_id|
+              association.import(csv_body_row, self_record_id)
+            end
+          end
         end
       end
     end

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

@@ -12,20 +12,28 @@ module ActiveRecord
           def export(record_or_relation)
             record_or_relation ||= []
 
-            # has_many でしか使わない想定なので record_or_relation は ActiveRecord::Relation のはず
-            (1..options[:size]).inject({}) do |values, index|
-              update_translator(index)
+            errors.clear
+
+            run_bixformer_callback :export do
+              # has_many でしか使わない想定なので record_or_relation は ActiveRecord::Relation のはず
+              (1..options[:size]).inject({}) do |values, index|
+                update_translator(index)
 
-              values.merge(super(record_or_relation[index-1]))
+                values.merge(do_export(record_or_relation[index-1]))
+              end
             end
           end
 
           def import(csv_body_row, parent_record_id = nil)
-            # has_many でしか使わない想定なので ActiveRecord::Relation を返却
-            (1..options[:size]).map do |index|
-              update_translator(index)
+            errors.clear
 
-              super
+            run_bixformer_callback :import do
+              # has_many でしか使わない想定なので ActiveRecord::Relation を返却
+              (1..options[:size]).map do |index|
+                update_translator(index)
+
+                do_import(csv_body_row, parent_record_id)
+              end
             end
           end
 

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

@@ -15,18 +15,26 @@ module ActiveRecord
             # has_many でしか使わない想定なので record_or_relation は ActiveRecord::Relation のはず
             record_of = record_or_relation&.where(@options[:key] => @options[:in])&.index_by(@options[:key]) || {}
 
-            @options[:in].inject({}) do |values, key|
-              update_translator(key)
+            errors.clear
+
+            run_bixformer_callback :export do
+              @options[:in].inject({}) do |values, key|
+                update_translator(key)
 
-              values.merge(super(record_of[key]))
+                values.merge(do_export(record_of[key]))
+              end
             end
           end
 
           def import(csv_body_row, parent_record_id = nil)
-            @options[:in].map do |key|
-              update_translator(key)
+            errors.clear
 
-              super
+            run_bixformer_callback :import do
+              @options[:in].map do |key|
+                update_translator(key)
+
+                do_import(csv_body_row, parent_record_id)
+              end
             end
           end
 

data/lib/activerecord-bixformer/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bixformer
-    VERSION = "0.3.16"
+    VERSION = "0.3.17"
   end
 end

metadata

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