activerecord-bixformer 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3667d87da3e07b91f9b2503f6a50a68f2df1ce8
-  data.tar.gz: 2843f952ab85cc1c703453abd410474cb5a1cbbe
+  metadata.gz: 564f32bc689495aaa583d76e3b886d169836fbc6
+  data.tar.gz: 788af0b283a54778d15f9b08b0bf998144262740
 SHA512:
-  metadata.gz: dbd484c941c19e05e1468b523d8dc1fb840140bb2bbc4a1e024a911c558de59c496a889f97054be043f6381da00c0407d8696fb0f282984bc5dd7084c6620f85
-  data.tar.gz: 336495e16118c229f7188e8b92c8117a3e4b1d09d448e925c2efa84be468289c175f307917589a4cf2a412811f64480d7677bf446dff2950238d9ca794de3152
+  metadata.gz: 61dea4b45228be03b65657407baa3a5e8850c9d33138dd055983a059ffdf80f5b565e6edae0c2dff3bd72c33b1838a144e8527302b9139ab4889fb6b823ae075
+  data.tar.gz: 6283c88b7103966dc1142dc69e915ca81a3e6089a6d2edea672f8e19aef3d754bed8283a8e883637bd864f2f7402bfd4e604a88bc24d4ca98d6cbe2035db6172

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

@@ -8,6 +8,8 @@ module ActiveRecord
           @model   = model
           @name    = attribute_name.to_s
           @options = (options.is_a?(::Hash) ? options : {}).with_indifferent_access
+
+          @options[:raise] = true unless @options.key?(:raise)
         end
 
         def export(record)

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

@@ -10,6 +10,8 @@ module ActiveRecord
         end
 
         def import(value)
+          return nil if value.blank?
+
           true_value = (@options.is_a?(::Hash) && @options[:true]) || 'true'
           false_value = (@options.is_a?(::Hash) && @options[:false]) || 'false'
 
@@ -18,6 +20,8 @@ module ActiveRecord
             true
           when false_value
             false
+          else
+            raise ::ActiveRecord::Bixformer::DataInvalid.new(self, value) if @options[:raise]
           end
         end
       end

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

@@ -11,9 +11,14 @@ module ActiveRecord
         end
 
         def import(value)
-          return nil unless value
+          return nil if value.blank?
 
-          @model.activerecord_constant.__send__("#{@name}_options").to_h[value.strip]
+          value      = value.strip
+          boolean_of = @model.activerecord_constant.__send__("#{@name}_options").to_h
+
+          return boolean_of[value] if boolean_of.key?(value)
+
+          raise ::ActiveRecord::Bixformer::DataInvalid.new(self, value) if @options[:raise]
         end
       end
     end

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

@@ -13,17 +13,17 @@ module ActiveRecord
         def import(value)
           return nil if value.blank?
 
-          begin
-            ::Date.parse(value)
-          rescue => e
-            format_string = ::Date::DATE_FORMATS[option_format]
-
-            if format_string
-              ::Date.strptime(value, format_string)
-            else
-              raise e
-            end
-          end
+          result = begin
+                     ::Date.parse(value)
+                   rescue
+                     format_string = ::Date::DATE_FORMATS[option_format]
+
+                     ::Date.strptime(value, format_string) rescue nil if format_string
+                   end
+
+          return result if result
+
+          raise ::ActiveRecord::Bixformer::DataInvalid.new(self, value) if @options[:raise]
         end
 
         private

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

@@ -14,7 +14,7 @@ module ActiveRecord
           return nil if value.blank?
 
           @model.activerecord_constant.__send__(@name).options.to_h[value.strip] or
-            raise ArgumentError.new "Not acceptable enumerize value : #{value}"
+            raise ::ActiveRecord::Bixformer::DataInvalid.new(self, value) if @options[:raise]
         end
       end
     end

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

@@ -13,17 +13,17 @@ module ActiveRecord
         def import(value)
           return nil if value.blank?
 
-          begin
-            ::Time.parse(value)
-          rescue => e
-            format_string = ::Time::DATE_FORMATS[option_format]
-
-            if format_string
-              ::Time.strptime(value, format_string)
-            else
-              raise e
-            end
-          end
+          result = begin
+                     ::Time.parse(value)
+                   rescue
+                     format_string = ::Time::DATE_FORMATS[option_format]
+
+                     ::Time.strptime(value, format_string) rescue nil if format_string
+                   end
+
+          return result if result
+
+          raise ::ActiveRecord::Bixformer::DataInvalid.new(self, value) if @options[:raise]
         end
 
         private

data/lib/activerecord-bixformer/autoload.rb

@@ -6,6 +6,8 @@ module ActiveRecord
     autoload :Plan,                           'activerecord-bixformer/plan'
     autoload :PlanAccessor,                   'activerecord-bixformer/plan_accessor'
     autoload :ModelCallback,                  'activerecord-bixformer/model_callback'
+    autoload :ImportError,                    'activerecord-bixformer/error'
+    autoload :DataInvalid,                    'activerecord-bixformer/error'
 
     module Attribute
       autoload :Base,                'activerecord-bixformer/attribute/base'

data/lib/activerecord-bixformer/error.rb

@@ -0,0 +1,58 @@
+module ActiveRecord
+  module Bixformer
+    class ImportError < ::StandardError
+      def initialize(attribute, value, type)
+        options = {
+          default: "%{attribute} %{message}",
+          attribute: attribute.model.translate(attribute.name),
+          message: generate_message(attribute, type, value)
+        }
+
+        super(I18n.t(:"errors.format", options))
+      end
+
+      private
+
+      # implemented with referencing to https://github.com/rails/rails/blob/517cf249c369d4bca40b1f590ca641d8b717985e/activemodel/lib/active_model/errors.rb#L462
+      def generate_message(attribute, type, value)
+        model_klass = attribute.model.activerecord_constant
+        model_scope = model_klass.i18n_scope
+
+        defaults = if model_scope
+                     model_klass.lookup_ancestors.map do |klass|
+                       [
+                         :"#{model_scope}.errors.models.#{klass.model_name.i18n_key}.attributes.#{attribute.name}.#{type}",
+                         :"#{model_scope}.errors.models.#{klass.model_name.i18n_key}.#{type}"
+                       ]
+                     end
+                   else
+                     []
+                   end
+
+        defaults << :"#{model_scope}.errors.messages.#{type}" if model_scope
+        defaults << :"errors.attributes.#{attribute.name}.#{type}"
+        defaults << :"errors.messages.#{type}"
+
+        defaults.compact!
+        defaults.flatten!
+
+        key = defaults.shift
+
+        options = {
+          default: defaults,
+          model: model_klass.model_name.human,
+          attribute: model_klass.human_attribute_name(attribute.name),
+          value: value
+        }
+
+        I18n.translate(key, options)
+      end
+    end
+
+    class DataInvalid < ImportError
+      def initialize(attribute, value)
+        super(attribute, value, :invalid)
+      end
+    end
+  end
+end

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

@@ -110,6 +110,10 @@ module ActiveRecord
           activerecord_constant.find_by!(condition)
         end
 
+        def translate(attribute_name)
+          @translator.translate_attribute(attribute_name)
+        end
+
         private
 
         def make_each_attribute_import_value(parent_record_id = nil, &block)

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

@@ -61,6 +61,8 @@ module ActiveRecord
           def csv_title(attribute_name)
             @translator.translate_attribute(attribute_name)
           end
+
+          alias_method :translate, :csv_title
         end
       end
     end

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

@@ -45,6 +45,7 @@ module ActiveRecord
           end
 
           def csv_title(attribute_name)
+            # TODO: indexed 以外の複数を扱うクラスがあった時の対処が必要
             if parents.find { |parent| parent.is_a?(::ActiveRecord::Bixformer::Model::Csv::Indexed) }
               parents.map { |parent| parent.translator.translate_model }.join + super
             else

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

@@ -46,7 +46,8 @@ module ActiveRecord
             end
           end
 
-          def csv_title(attribute_name)
+          def translate(attribute_name)
+            # TODO: mapped 以外の複数を扱うクラスがあった時の対処が必要
             if parents.find { |parent| parent.is_a?(::ActiveRecord::Bixformer::Model::Csv::Mapped) }
               parents.map { |parent| parent.translator.translate_model }.join + super
             else

data/lib/activerecord-bixformer/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bixformer
-    VERSION = "0.3.12"
+    VERSION = "0.3.13"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bixformer
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Hiroaki Otsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -234,6 +234,7 @@ files:
 - lib/activerecord-bixformer/attribute/time.rb
 - lib/activerecord-bixformer/autoload.rb
 - lib/activerecord-bixformer/compiler.rb
+- lib/activerecord-bixformer/error.rb
 - lib/activerecord-bixformer/format/csv.rb
 - lib/activerecord-bixformer/from/csv.rb
 - lib/activerecord-bixformer/import_value_validatable.rb