activerecord-bixformer 0.4.18 → 0.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae6888312a21e7d9354ae7c46e4b8fc9e87aa4c2
-  data.tar.gz: bb36394798a5fa42d748f1c2a50ca8ea8fe19fa0
+  metadata.gz: 440c53f937e017a28463e594ffc9057a3f2b1b03
+  data.tar.gz: 112e9462e462dacadd0661cba1cda7166df41029
 SHA512:
-  metadata.gz: 1995b2cb22b6f1569df73e0b284af26926e2425170a7be0e6db97b6efab7d20f21129960f2165ca09376c2853a5fd13878e8a320b1e9bf07e7b85abb37bb3044
-  data.tar.gz: a7d635b60db5b21c39640f455a380e07401ba241c078548793be9b7a780a0d5f5b82d76f1761269e68814cdf0662c87d5a1416f839ed50e5cde0cde85557b214
+  metadata.gz: 59a354bdf15342906e8154b0f744b29fbab11c97da83dd0e5ba204f805f814174c69f2c84a662beea39c4a81f465a30631f5e284a7a4aa25065e1cf67073e44c
+  data.tar.gz: 16beecf99c514c544cba9307e6c7f1a735a6faaff159323b9e9670e4faf2becf985de8b247dff407de8d06694a16fa0f782c49679d67c3cbc043e792ff0a5074

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

@@ -151,6 +151,8 @@ module ActiveRecord
 
           run_bixformer_callback :import, type: :attribute do
             @attributes.each do |attr|
+              next if attr.options[:skip_import]
+
               attribute_value = begin
                                   run_bixformer_callback :import, on: attr.name do
                                     block.call(attr)

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

@@ -20,10 +20,14 @@ module ActiveRecord
           end
 
           def verify_csv_titles(csv_title_row)
-            attribute_names = activerecord_constant.attribute_names
+            verified_attribute_names = if options[:verified_csv_titles]
+                                         options[:verified_csv_titles].map(&:to_s)
+                                       else
+                                         activerecord_constant.attribute_names
+                                       end
 
             @attributes
-              .select { |attr| attribute_names.include?(attr.name) }
+              .select { |attr| verified_attribute_names.include?(attr.name) }
               .map { |attr| csv_title(attr.name) }
               .all? { |title| csv_title_row.include?(title) } &&
               @associations.all? { |ass| ass.verify_csv_titles(csv_title_row) }
@@ -45,7 +49,7 @@ module ActiveRecord
             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
+                attribute_value = if record_or_relation && ! attr.options[:skip_export]
                                     run_bixformer_callback :export, on: attr.name do
                                       attr.export(record_or_relation)
                                     end

data/lib/activerecord-bixformer/version.rb

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

metadata

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