activerecord-bixformer 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00e9b24b92407ae36d6e54ec0baea46b42b8d6dd
-  data.tar.gz: 78ab0a18aa7407a29ec2e367d325cacf38ccb7e2
+  metadata.gz: f38f07d98e1c2f686db88cf14e8f0aa440df98d8
+  data.tar.gz: a81dfe5886c71ead977d3d66cdde5119cb1cb97b
 SHA512:
-  metadata.gz: 9711f06d78d4f34e51f6aa606dcd354ec35ecbf19788cf901510c64c45cfb7de06816bf293cb3ecdfa0cdc17b46f40a1e6c7311a372a6fe9e7d77142345a39d3
-  data.tar.gz: b60e586431292a13c98ae4c74579552e86eb6d6d6b900cfaebedcaa2f04808aeac7ceba0d25a15f41310b5805eef44f25179183b9797d3f4c2154409e53a4c9d
+  metadata.gz: 9642616d5126bd1a85366204e489ee197a1dc3bd9fb505fa7f97130d223524ba97fceb0b0ed7e4ca8ef0702a8d15120297d93f2e300d784869e84dcb09782e34
+  data.tar.gz: 8cbfd3443e100e47fc7407d594fb8b47ac876eeb95c1f3a6314bfa331352768d7a1a0c02ac8a0fed09dab5f571d0b4f2d32dadf65e3b9c85edabdb33b14f5402

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

@@ -7,15 +7,15 @@ module ActiveRecord
         def initialize(model, attribute_name, options)
           @model   = model
           @name    = attribute_name
-          @options = options
+          @options = (options.is_a?(::Hash) ? options : {}).with_indifferent_access
         end
 
-        def make_export_value(active_record_value)
-          active_record_value.to_s
+        def export(activerecord_value)
+          activerecord_value
         end
 
-        def make_import_value(value)
-          value.presence
+        def import(value)
+          value
         end
       end
     end

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

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

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

@@ -2,13 +2,13 @@ module ActiveRecord
   module Bixformer
     module Attribute
       class Booletania < ::ActiveRecord::Bixformer::Attribute::Base
-        def make_export_value(active_record_value)
+        def export(activerecord_value)
           @model.activerecord_constant.__send__("#{@name}_options").find do |text, bool|
-            bool == active_record_value
+            bool == activerecord_value
           end&.first
         end
 
-        def make_import_value(value)
+        def import(value)
           return nil unless value
 
           @model.activerecord_constant.__send__("#{@name}_options").to_h[value.strip]

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

@@ -2,13 +2,13 @@ module ActiveRecord
   module Bixformer
     module Attribute
       class Date < ::ActiveRecord::Bixformer::Attribute::Base
-        def make_export_value(active_record_value)
-          return nil unless active_record_value
+        def export(activerecord_value)
+          return nil unless activerecord_value
 
-          active_record_value.to_s(option_format)
+          activerecord_value.to_s(option_format)
         end
 
-        def make_import_value(value)
+        def import(value)
           return nil if value.blank?
 
           begin

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

@@ -2,15 +2,15 @@ module ActiveRecord
   module Bixformer
     module Attribute
       class Enumerize < ::ActiveRecord::Bixformer::Attribute::Base
-        def make_export_value(active_record_value)
-          active_record_value = active_record_value.to_s
+        def export(activerecord_value)
+          activerecord_value = activerecord_value.to_s
 
           @model.activerecord_constant.__send__(@name).options.find do |text, key|
-            key == active_record_value
+            key == activerecord_value
           end&.first
         end
 
-        def make_import_value(value)
+        def import(value)
           return nil if value.blank?
 
           @model.activerecord_constant.__send__(@name).options.to_h[value.strip] or

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

@@ -2,11 +2,11 @@ module ActiveRecord
   module Bixformer
     module Attribute
       class Override < ::ActiveRecord::Bixformer::Attribute::Base
-        def make_export_value(active_record_value)
-          @model.__send__("override_export_#{@name}", active_record_value)
+        def export(activerecord_value)
+          @model.__send__("override_export_#{@name}", activerecord_value)
         end
 
-        def make_import_value(value)
+        def import(value)
           @model.__send__("override_import_#{@name}", value)
         end
       end

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

@@ -0,0 +1,15 @@
+module ActiveRecord
+  module Bixformer
+    module Attribute
+      class String < ::ActiveRecord::Bixformer::Attribute::Base
+        def export(activerecord_value)
+          activerecord_value.to_s
+        end
+
+        def import(value)
+          value.to_s.strip.presence
+        end
+      end
+    end
+  end
+end

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

@@ -2,13 +2,13 @@ module ActiveRecord
   module Bixformer
     module Attribute
       class Time < ::ActiveRecord::Bixformer::Attribute::Base
-        def make_export_value(active_record_value)
-          return nil unless active_record_value
+        def export(activerecord_value)
+          return nil unless activerecord_value
 
-          active_record_value.to_s(option_format)
+          activerecord_value.to_s(option_format)
         end
 
-        def make_import_value(value)
+        def import(value)
           return nil if value.blank?
 
           begin

data/lib/activerecord-bixformer/autoload.rb

@@ -13,6 +13,7 @@ module ActiveRecord
       autoload :Date,       'activerecord-bixformer/attribute/date'
       autoload :Enumerize,  'activerecord-bixformer/attribute/enumerize'
       autoload :Override,   'activerecord-bixformer/attribute/override'
+      autoload :String,     'activerecord-bixformer/attribute/string'
       autoload :Time,       'activerecord-bixformer/attribute/time'
     end
 

data/lib/activerecord-bixformer/from/csv.rb

@@ -7,7 +7,7 @@ module ActiveRecord
         end
 
         def assignable_attributes(csv_row)
-          compile.make_import_value(csv_row)
+          compile.import(csv_row)
         end
       end
     end

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

@@ -17,15 +17,12 @@ module ActiveRecord
       class Base
         include ::ActiveRecord::Bixformer::ImportValueValidatable
 
-        attr_reader :name, :parent,
-                    :attributes, :associations,
-                    :optional_attributes,
-                    :translator,
-                    :options
+        attr_reader :name, :options, :parent, :attributes, :associations,
+                    :optional_attributes, :translator
 
         def initialize(model_or_association_name, options)
           @name         = model_or_association_name.to_s
-          @options      = options
+          @options      = (options.is_a?(::Hash) ? options : {}).with_indifferent_access
           @associations = []
         end
 
@@ -89,6 +86,24 @@ module ActiveRecord
           activerecord_constant.find_by!(condition)
         end
 
+        def export(activerecord_or_activerecords)
+          # has_one でしか使わない想定なので activerecord_or_activerecords は ActiveRecord::Base のはず
+          values = @attributes.map do |attr|
+            value_reader    = attr.options[:reader] || attr.name
+            attribute_value = activerecord_or_activerecords && activerecord_or_activerecords.__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 = activerecord_or_activerecords && activerecord_or_activerecords.__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_activerecord_id = nil, &block)

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

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

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

@@ -6,12 +6,10 @@ module ActiveRecord
           def initialize(model_or_association_name, options)
             super
 
-            @options = options.is_a?(::Hash) ? options : {}
-
             @options[:size] ||= 1
           end
 
-          def make_export_value(activerecord_or_activerecords)
+          def export(activerecord_or_activerecords)
             activerecord_or_activerecords ||= []
 
             # has_many でしか使わない想定なので activerecord_or_activerecords は Array のはず
@@ -22,7 +20,7 @@ module ActiveRecord
             end
           end
 
-          def make_import_value(csv_row, parent_activerecord_id = nil)
+          def import(csv_row, parent_activerecord_id = nil)
             # has_many でしか使わない想定なので Array を返却
             (1..options[:size]).map do |index|
               update_translator(index)

data/lib/activerecord-bixformer/plan.rb

@@ -7,8 +7,22 @@ module ActiveRecord
         attr_accessor :__bixformer_format
 
         class_attribute :__bixformer_model
-
         class_attribute :__bixformer_namespace
+        class_attribute :__bixformer_entry
+        class_attribute :__bixformer_optional_attributes
+        class_attribute :__bixformer_required_attributes
+        class_attribute :__bixformer_unique_indexes
+        class_attribute :__bixformer_required_condition
+        class_attribute :__bixformer_default_values
+        class_attribute :__bixformer_translation_config
+
+        self.__bixformer_entry               = {}
+        self.__bixformer_optional_attributes = []
+        self.__bixformer_required_attributes = []
+        self.__bixformer_unique_indexes      = []
+        self.__bixformer_required_condition  = {}
+        self.__bixformer_default_values      = {}
+        self.__bixformer_translation_config  = { scope: :bixformer, extend_scopes: [] }
       end
 
       module ClassMethods
@@ -19,37 +33,15 @@ module ActiveRecord
         def bixformer_load_namespace(namespace)
           self.__bixformer_namespace = namespace
         end
-      end
-
-      def entry
-        {}
-      end
-
-      def optional_attributes
-        []
-      end
-
-      def required_attributes
-        []
-      end
 
-      def unique_indexes
-        []
-      end
-
-      def required_condition
-        {}
-      end
-
-      def default_values
-        {}
-      end
-
-      def translation_config
-        {
-          scope: :bixformer,
-          extend_scopes: []
-        }
+        [
+          :entry, :optional_attributes, :required_attributes, :unique_indexes,
+          :required_condition, :default_values, :translation_config
+        ].each do |config_name|
+          define_method "bixformer_#{config_name}" do |v|
+            self.__send__("__bixformer_#{config_name}=", v)
+          end
+        end
       end
     end
   end

data/lib/activerecord-bixformer/plan_accessor.rb

@@ -12,14 +12,14 @@ module ActiveRecord
       end
 
       def value_of(config_name)
-        @plan.__send__(config_name).dup
+        compile_config_value(config_name).dup
       end
 
       def pickup_value_for(model, config_name, default_value = nil)
         model_names_without_root = (model.parents.map(&:name) + [model.name]).drop(1)
 
         # 指定された設定の全設定値を取得
-        entire_config_value = @plan.__send__(config_name)
+        entire_config_value = compile_config_value(config_name)
 
         if entire_config_value.is_a?(::Hash)
           # Hashなら、with_indifferent_accessしておく
@@ -40,7 +40,7 @@ module ActiveRecord
 
         if config_value.is_a?(::Array)
           # Arrayで最後の要素がHashの場合、それは子要素の設定値なので、結果に含めない
-          config_value.pop if config_value.last.is_a?(::Hash)
+          config_value.extract_options!
 
           # Arrayなら、要素は文字列化しておく
           config_value = config_value.map { |v| v.to_s }
@@ -98,6 +98,18 @@ module ActiveRecord
 
       private
 
+      def compile_config_value(config_name)
+        v = @plan.class.__send__("__bixformer_#{config_name}")
+
+        if v.is_a?(::Proc)
+          v.call
+        elsif v.is_a?(::Symbol) || v.is_a?(::String)
+          @plan.__send__(v)
+        else
+          v
+        end
+      end
+
       def find_nested_config_value(config, keys)
         return config ? config.dup : nil if keys.empty?
 

data/lib/activerecord-bixformer/to/csv.rb

@@ -12,7 +12,7 @@ module ActiveRecord
 
         def csv_body_row(activerecord)
           model    = compile
-          body_map = model.make_export_value(activerecord)
+          body_map = model.export(activerecord)
 
           model.csv_titles.map { |title| body_map[title] }
         end

data/lib/activerecord-bixformer/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bixformer
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bixformer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Hiroaki Otsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -229,6 +229,7 @@ files:
 - lib/activerecord-bixformer/attribute/date.rb
 - lib/activerecord-bixformer/attribute/enumerize.rb
 - lib/activerecord-bixformer/attribute/override.rb
+- lib/activerecord-bixformer/attribute/string.rb
 - lib/activerecord-bixformer/attribute/time.rb
 - lib/activerecord-bixformer/autoload.rb
 - lib/activerecord-bixformer/compiler.rb