activerecord-bixformer 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18bbd017fde0b78cc6edbcbea84f68cf62088a48
-  data.tar.gz: 7560282ebbd8bc2474a2b91534a76ec453ff4a53
+  metadata.gz: 1372a26753e6dc7dc2d178f00a9d3e54aed1973a
+  data.tar.gz: 9089e7d6d4b0344409a6f59a8d5a28e97fa4708d
 SHA512:
-  metadata.gz: 546d0e273f0e30697b54b5b30cb200f21ab7d36834db166fb4faa777f2eb3b175bf595fe6a4e997669e3233fef5aad4ac60cecfa980412bbfe6126783ddc47c5
-  data.tar.gz: fa1063540a8d61e068c74f4af2a7e8b6be2ead2034f02686266fd187339302257d1fc06e241251d850dd2fbb85e7f30f72fa6e6c9f9be6fb8a67044ad4844529
+  metadata.gz: 0935d90425fe726f56de126f08671a1807959b6a62f1aa0572aef5ff1356e4b33526c1b903c9f6065ac9f89718053111f77f8df26a5eb50be1efc5a4c4bfcd26
+  data.tar.gz: 850006053e33be9a96a827b0c16b88aecafffeea36e126ebe0589612ee93a47cae24c436fbbe3fed7ddf25f0a0ec381c015b6d28b1857091d1416e197c208599

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

@@ -10,13 +10,19 @@ module ActiveRecord
           @options = (options.is_a?(::Hash) ? options : {}).with_indifferent_access
         end
 
-        def export(record_attribute_value)
-          record_attribute_value
+        def export(record)
+          record_attribute_value(record)
         end
 
         def import(value)
           value
         end
+
+        private
+
+        def record_attribute_value(record)
+          record.__send__(@name)
+        end
       end
     end
   end

data/lib/activerecord-bixformer/attribute/boolean.rb

@@ -2,11 +2,11 @@ module ActiveRecord
   module Bixformer
     module Attribute
       class Boolean < ::ActiveRecord::Bixformer::Attribute::Base
-        def export(record_attribute_value)
+        def export(record)
           true_value = (@options.is_a?(::Hash) && @options[:true]) || 'true'
           false_value = (@options.is_a?(::Hash) && @options[:false]) || 'false'
 
-          record_attribute_value.present? ? true_value : false_value
+          record_attribute_value(record).present? ? true_value : false_value
         end
 
         def import(value)

data/lib/activerecord-bixformer/attribute/booletania.rb

@@ -2,7 +2,9 @@ module ActiveRecord
   module Bixformer
     module Attribute
       class Booletania < ::ActiveRecord::Bixformer::Attribute::Base
-        def export(record_attribute_value)
+        def export(record)
+          record_attribute_value = record_attribute_value(record)
+
           @model.activerecord_constant.__send__("#{@name}_options").find do |text, bool|
             bool == record_attribute_value
           end&.first

data/lib/activerecord-bixformer/attribute/date.rb

@@ -2,7 +2,9 @@ module ActiveRecord
   module Bixformer
     module Attribute
       class Date < ::ActiveRecord::Bixformer::Attribute::Base
-        def export(record_attribute_value)
+        def export(record)
+          record_attribute_value = record_attribute_value(record)
+
           return nil unless record_attribute_value
 
           record_attribute_value.to_s(option_format)

data/lib/activerecord-bixformer/attribute/enumerize.rb

@@ -2,8 +2,8 @@ module ActiveRecord
   module Bixformer
     module Attribute
       class Enumerize < ::ActiveRecord::Bixformer::Attribute::Base
-        def export(record_attribute_value)
-          record_attribute_value = record_attribute_value.to_s
+        def export(record)
+          record_attribute_value = record_attribute_value(record).to_s
 
           @model.activerecord_constant.__send__(@name).options.find do |text, key|
             key == record_attribute_value

data/lib/activerecord-bixformer/attribute/override.rb

@@ -2,8 +2,8 @@ module ActiveRecord
   module Bixformer
     module Attribute
       class Override < ::ActiveRecord::Bixformer::Attribute::Base
-        def export(record_attribute_value)
-          @model.__send__("override_export_#{@name}", record_attribute_value)
+        def export(record)
+          @model.__send__("override_export_#{@name}", record_attribute_value(record))
         end
 
         def import(value)

data/lib/activerecord-bixformer/attribute/string.rb

@@ -2,8 +2,8 @@ module ActiveRecord
   module Bixformer
     module Attribute
       class String < ::ActiveRecord::Bixformer::Attribute::Base
-        def export(record_attribute_value)
-          record_attribute_value.to_s
+        def export(record)
+          record_attribute_value(record).to_s
         end
 
         def import(value)

data/lib/activerecord-bixformer/attribute/time.rb

@@ -2,7 +2,9 @@ module ActiveRecord
   module Bixformer
     module Attribute
       class Time < ::ActiveRecord::Bixformer::Attribute::Base
-        def export(record_attribute_value)
+        def export(record)
+          record_attribute_value = record_attribute_value(record)
+
           return nil unless record_attribute_value
 
           record_attribute_value.to_s(option_format)

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

@@ -86,24 +86,6 @@ module ActiveRecord
           activerecord_constant.find_by!(condition)
         end
 
-        def export(record_or_records)
-          # has_one でしか使わない想定なので record_or_records は ActiveRecord::Base のはず
-          values = @attributes.map do |attr|
-            value_reader    = attr.options[:reader] || attr.name
-            attribute_value = record_or_records && record_or_records.__send__(value_reader)
-
-            [csv_title(attr.name), attr.export(attribute_value)]
-          end.to_h.with_indifferent_access
-
-          @associations.inject(values) do |each_values, association|
-            association_value = record_or_records && record_or_records.__send__(association.name)
-
-            association_value = association_value.to_a if association_value.is_a?(::ActiveRecord::Relation)
-
-            each_values.merge(association.export(association_value))
-          end
-        end
-
         private
 
         def make_each_attribute_import_value(parent_record_id = nil, &block)

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

@@ -3,6 +3,23 @@ module ActiveRecord
     module Model
       module Csv
         class Base < ::ActiveRecord::Bixformer::Model::Base
+          def export(record_or_records)
+            # has_one でしか使わない想定なので record_or_records は ActiveRecord::Base のはず
+            values = @attributes.map do |attr|
+              attribute_value = record_or_records && attr.export(record_or_records)
+
+              [csv_title(attr.name), attribute_value]
+            end.to_h.with_indifferent_access
+
+            @associations.inject(values) do |each_values, association|
+              association_value = record_or_records && record_or_records.__send__(association.name)
+
+              association_value = association_value.to_a if association_value.is_a?(::ActiveRecord::Relation)
+
+              each_values.merge(association.export(association_value))
+            end
+          end
+
           def import(csv_body_row, parent_record_id = nil)
             values = make_each_attribute_import_value(parent_record_id) do |attr|
               csv_value = csv_body_row[csv_title(attr.name)]

data/lib/activerecord-bixformer/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bixformer
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

metadata

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