store_model 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4da91e0f6f9e27a71947f5a31b7bb0d936680bd263ad46f69916d995380af27
-  data.tar.gz: 463730c176403dd845382cd078d90e58faae6d2ee1a7c9670c7f7c48d68032d3
+  metadata.gz: 81df7c27571266926547a2a5aad309128741860b15fe94876476744efa4932d9
+  data.tar.gz: 33a62eb4baa468872e3b409e34755a8d057841f4b764e0ecac6f50cef4481286
 SHA512:
-  metadata.gz: 1cb34bbaf868eea40c26d33b2c15a8fbd8c79f3e5429714172f0f38ea9e11a396241831744be82c280b8ace4de60237a5226d8a9cf77bedf2b200b8bb3e58485
-  data.tar.gz: 8dbf31fb3f4ece28979fa49d799b1f633e7e9f5007ceb38d0cf883ea214c50dc621c8f5b8c5367cb979910c74af039de675acbf7d69e7720d2f6d61b25a240e4
+  metadata.gz: '019a485b12c9216f493198d6e02d03284e9f912c3eea96ee4c0fb1d2a4be3284c1febfc92e7045c28b6a5266bc8a7cd5eca663536fe4d928d27cf5dfdb31b688'
+  data.tar.gz: b7aaea3584e1f59caea549b9f98e7ee310677746d1d7e58c8b741c01d899592697a6b831fe6a28615fcb6253d38fea9ce57bcb046bb97e6587601dc94ceea224

data/lib/active_model/validations/store_model_validator.rb

@@ -22,16 +22,28 @@ module ActiveModel
 
         case record.type_for_attribute(attribute).type
         when :json
-          strategy.call(attribute, record.errors, value.errors) if value.invalid?
+          call_json_strategy(attribute, record.errors, value)
         when :array
-          record.errors.add(attribute, :invalid) if value.select(&:invalid?).present?
+          call_array_strategy(attribute, record.errors, value)
         end
       end
 
       private
 
+      def call_json_strategy(attribute, record_errors, value)
+        strategy.call(attribute, record_errors, value.errors) if value.invalid?
+      end
+
+      def call_array_strategy(attribute, record_errors, value)
+        array_strategy.call(attribute, record_errors, value) if value.select(&:invalid?).present?
+      end
+
       def strategy
-        StoreModel::CombineErrorsStrategies.configure(options)
+        @strategy ||= StoreModel::CombineErrorsStrategies.configure(options)
+      end
+
+      def array_strategy
+        @array_strategy ||= StoreModel::CombineErrorsStrategies.configure_array(options)
       end
     end
   end

data/lib/store_model/combine_errors_strategies.rb

@@ -2,6 +2,7 @@
 
 require "store_model/combine_errors_strategies/mark_invalid_error_strategy"
 require "store_model/combine_errors_strategies/merge_error_strategy"
+require "store_model/combine_errors_strategies/merge_array_error_strategy"
 
 module StoreModel
   # Module with built-in strategies for combining errors.
@@ -16,10 +17,31 @@ module StoreModel
     def configure(options)
       configured_strategy = options[:merge_errors] || StoreModel.config.merge_errors
 
+      get_configured_strategy(
+        configured_strategy,
+        StoreModel::CombineErrorsStrategies::MergeErrorStrategy
+      )
+    end
+
+    # Finds a array strategy based on +options+ and global config.
+    #
+    # @param options [Hash]
+    #
+    # @return [Object] strategy
+    def configure_array(options)
+      configured_strategy = options[:merge_array_errors] || StoreModel.config.merge_array_errors
+
+      get_configured_strategy(
+        configured_strategy,
+        StoreModel::CombineErrorsStrategies::MergeArrayErrorStrategy
+      )
+    end
+
+    def get_configured_strategy(configured_strategy, true_strategy_class)
       if configured_strategy.respond_to?(:call)
         configured_strategy
       elsif configured_strategy == true
-        StoreModel::CombineErrorsStrategies::MergeErrorStrategy.new
+        true_strategy_class.new
       elsif configured_strategy.nil?
         StoreModel::CombineErrorsStrategies::MarkInvalidErrorStrategy.new
       else

data/lib/store_model/combine_errors_strategies/merge_array_error_strategy.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module StoreModel
+  module CombineErrorsStrategies
+    # +MergeArrayErrorStrategy+ copies errors from the StoreModel::Model to the parent
+    # record attribute errors.
+    class MergeArrayErrorStrategy
+      # Merges errors on +attribute+ from the child model with parent errors.
+      #
+      # @param attribute [String] name of the validated attribute
+      # @param base_errors [ActiveModel::Errors] errors object of the parent record
+      # @param store_models [Array] an array or store_models that have been validated
+      def call(attribute, base_errors, store_models)
+        store_models.each_with_index do |store_model, index|
+          store_model.errors.full_messages.each do |full_message|
+            base_errors.add(attribute, :invalid, message: "[#{index}] #{full_message}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/store_model/combine_errors_strategies/merge_error_strategy.rb

@@ -7,16 +7,16 @@ module StoreModel
     class MergeErrorStrategy
       # Merges errors on +attribute+ from the child model with parent errors.
       #
-      # @param _attribute [String] name of the validated attribute
+      # @param attribute [String] name of the validated attribute
       # @param base_errors [ActiveModel::Errors] errors object of the parent record
       # @param store_model_errors [ActiveModel::Errors] errors object of the StoreModel::Model
       # attribute
-      def call(_attribute, base_errors, store_model_errors)
+      def call(attribute, base_errors, store_model_errors)
         if Rails::VERSION::MAJOR < 6 || Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR.zero?
           base_errors.copy!(store_model_errors)
         else
           store_model_errors.errors.each do |error|
-            base_errors.add(:configuration, :invalid, message: error.full_message)
+            base_errors.add(attribute, :invalid, message: error.full_message)
           end
         end
       end

data/lib/store_model/configuration.rb

@@ -6,5 +6,9 @@ module StoreModel
     # Controls usage of MergeErrorStrategy
     # @return [Boolean]
     attr_accessor :merge_errors
+
+    # Controls usage of MergeArrayErrorStrategy
+    # @return [Boolean]
+    attr_accessor :merge_array_errors
   end
 end

data/lib/store_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoreModel # :nodoc:
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,7 @@ files:
 - lib/store_model.rb
 - lib/store_model/combine_errors_strategies.rb
 - lib/store_model/combine_errors_strategies/mark_invalid_error_strategy.rb
+- lib/store_model/combine_errors_strategies/merge_array_error_strategy.rb
 - lib/store_model/combine_errors_strategies/merge_error_strategy.rb
 - lib/store_model/configuration.rb
 - lib/store_model/enum.rb