activerecord-bixformer 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 564f32bc689495aaa583d76e3b886d169836fbc6
-  data.tar.gz: 788af0b283a54778d15f9b08b0bf998144262740
+  metadata.gz: a7898f4b6bcb4f7f67dee3086bc210a9b5d9d0ae
+  data.tar.gz: 6b1bb29aa4259ceadc55a3f28ec5b1516cfbab01
 SHA512:
-  metadata.gz: 61dea4b45228be03b65657407baa3a5e8850c9d33138dd055983a059ffdf80f5b565e6edae0c2dff3bd72c33b1838a144e8527302b9139ab4889fb6b823ae075
-  data.tar.gz: 6283c88b7103966dc1142dc69e915ca81a3e6089a6d2edea672f8e19aef3d754bed8283a8e883637bd864f2f7402bfd4e604a88bc24d4ca98d6cbe2035db6172
+  metadata.gz: edd9cb8ef73e6376605114a14d8af10b09dd1360f7cfe10341ae7e892e88a95d62a222b1f794952973dfa71fd45ef283d77a1a42f8bdd33f7e89a34d9f2c7d32
+  data.tar.gz: d370ebca7f66c3d58781e5d5a735822b4f0a311bbe6897e7ae558e444bd9bf386422bbf7984f0c596ae09731b25fc2810533bdfcf033ccbc9ce15b2c39478617

data/lib/activerecord-bixformer/autoload.rb

@@ -6,7 +6,9 @@ module ActiveRecord
     autoload :Plan,                           'activerecord-bixformer/plan'
     autoload :PlanAccessor,                   'activerecord-bixformer/plan_accessor'
     autoload :ModelCallback,                  'activerecord-bixformer/model_callback'
+    autoload :Errors,                         'activerecord-bixformer/error'
     autoload :ImportError,                    'activerecord-bixformer/error'
+    autoload :AttributeError,                 'activerecord-bixformer/error'
     autoload :DataInvalid,                    'activerecord-bixformer/error'
 
     module Attribute

data/lib/activerecord-bixformer/error.rb

@@ -1,14 +1,40 @@
 module ActiveRecord
   module Bixformer
+    class Errors < Array
+      def messages
+        map(&:message)
+      end
+
+      def full_messages
+        map(&:full_message)
+      end
+    end
+
     class ImportError < ::StandardError
+      attr_reader :model
+
+      def initialize(model)
+        @model = model
+
+        super("failed to import #{model.name}")
+      end
+    end
+
+    class AttributeError < ::StandardError
       def initialize(attribute, value, type)
+        @attribute = attribute
+
+        super(generate_message(attribute, type, value))
+      end
+
+      def full_message
         options = {
           default: "%{attribute} %{message}",
-          attribute: attribute.model.translate(attribute.name),
-          message: generate_message(attribute, type, value)
+          attribute: @attribute.model.translate(@attribute.name),
+          message: message
         }
 
-        super(I18n.t(:"errors.format", options))
+        I18n.t(:"errors.format", options)
       end
 
       private
@@ -49,7 +75,7 @@ module ActiveRecord
       end
     end
 
-    class DataInvalid < ImportError
+    class DataInvalid < AttributeError
       def initialize(attribute, value)
         super(attribute, value, :invalid)
       end

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

@@ -11,7 +11,13 @@ module ActiveRecord
         end
 
         def assignable_attributes(csv_body_row)
-          compile.import(csv_body_row)
+          model = compile
+
+          result = model.import(csv_body_row)
+
+          raise ::ActiveRecord::Bixformer::ImportError.new(model) if model.errors.present?
+
+          result
         end
       end
     end

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

@@ -17,12 +17,13 @@ module ActiveRecord
         include ::ActiveRecord::Bixformer::ModelCallback
 
         attr_reader :name, :options, :parent, :attributes, :associations,
-                    :preferred_skip_attributes, :translator
+                    :preferred_skip_attributes, :translator, :errors
 
         def initialize(model_or_association_name, options)
           @name         = model_or_association_name.to_s
           @options      = (options.is_a?(::Hash) ? options : {}).with_indifferent_access
           @associations = []
+          @errors       = ::ActiveRecord::Bixformer::Errors.new
         end
 
         def setup(plan)
@@ -122,9 +123,15 @@ module ActiveRecord
 
           run_bixformer_callback :import, type: :attribute do
             @attributes.each do |attr|
-              attribute_value = run_bixformer_callback :import, on: attr.name do
-                block.call(attr)
-              end
+              attribute_value = begin
+                                  run_bixformer_callback :import, on: attr.name do
+                                    block.call(attr)
+                                  end
+                                rescue ::ActiveRecord::Bixformer::AttributeError => e
+                                  @errors << e
+
+                                  next
+                                end
 
               # 取り込み時は、 preferred_skip な属性では、有効でない値は取り込まない
               next if ! presence_value?(attribute_value) &&
@@ -165,6 +172,12 @@ module ActiveRecord
                 block.call(association, self_record_id)
               end
 
+              if association.errors.present?
+                @errors += association.errors
+
+                next
+              end
+
               if association_value.is_a?(::Array)
                 # has_many な場合は、配列が返ってくるが、空と思われる要素は結果に含めない
                 association_value = association_value.reject { |v| ! presence_value?(v) }

data/lib/activerecord-bixformer/version.rb

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

metadata

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