errorio 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8116084f9ceec078a68f59395c02c9aa189c59c76f1fc352b95e58101017fea
-  data.tar.gz: 826674e752fc0e05368490bde9c5111ea4f3530c64478ac0f017ab000cfae360
+  metadata.gz: 4600030389e73944613c2aaaddf63e373c7b630406843fce1faed4b75e072be1
+  data.tar.gz: 2bba836bff4250850fd87d203a32b57bd7db08c6796884647de050aa6499fe67
 SHA512:
-  metadata.gz: 5158836c975f2a117aa507cec2d20cbae54f693162c80c833dfe52203ab79251dc14491dffeeb78ec55c26a5fde2cb4c9f30d3163ca459cd93dab88a2583d27f
-  data.tar.gz: d65d9b1abd8cfd6173562fa706573c569abaa952360898e63ab382aa7ba682e0bb59ba65a1a638a087b10c9783f1e5eca395ee4a07850d95ec8b2b88ea35cc9b
+  metadata.gz: a441bf819e19ed12c7e3a64b1b024b778e7a7695a7dcb77d41e5d5544cc6181b3e2deacf34f63398e9e294e92a544d9e7c9cd9fcea1e970510eec184af894cd8
+  data.tar.gz: e6ad7899eac16b820d7b414bc3c58b1e4c04b68751002349b6723944e9299df4fdaeeab168ba7ddcf0ed2cf539205f841efa99c5608234fe490905657ab75346

data/.gitignore

@@ -6,4 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-/.idea
+/.idea
+
+/notes.txt

data/lib/errorio/details.rb

@@ -1,6 +1,17 @@
 module Errorio
   # Some helpers
   class Details
+    # Interpolate error message from i18n
+    #
+    # @param [Symbol] code
+    # @param [Hash] args
+    #
+    # @return [String]
+    #
+    def self.t_msg(code, args = {})
+      I18n.t("errorio.messages.#{code}", **args)
+    end
+
     # Error details by code:
     #
     # errors.add :base, :invalid, Errorio.by_code(:E0001, user_id: 129)
@@ -9,8 +20,13 @@ module Errorio
     #      message: "Invitation from user with ID 1823 was expired"
     #      invited_by: 1823
     #    }
+    #
+    # @param [Symbol] code
+    # @param [Hash] args
+    #
+    # @return [Hash]
     def self.by_code(code, args = {})
-      msg = I18n.t("errorio.messages.#{code}", args)
+      msg = t_msg(code, args)
       {
         code: code,
         message: msg

data/lib/errorio/errors.rb

@@ -26,15 +26,18 @@ module Errorio
     end
 
     # Copy errors from another errors object
-    # 
-    # @param [Errorio::Errors,ActiveModel::Errors] other
+    #
+    # @param [Errorio::Errors, ActiveModel::Errors] other
     def copy(other)
       other.each do |err|
         options = err.options
 
         # ActiveModel::Error object has own way to generate message attribute,
-        options[:message] = err.message if err.is_a?(ActiveModel::Error)
+        # try to copy message as the property of `options`
 
+        if err.is_a?(ActiveModel::Error) || err.is_a?(ActiveModel::NestedError) && options[:message].blank?
+          options[:message] = err.message
+        end
         add err.attribute, err.type, options
       end
     end

data/lib/errorio/version.rb

@@ -1,3 +1,3 @@
 module Errorio
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.8'.freeze
 end

data/lib/errorio.rb

@@ -105,9 +105,21 @@ module Errorio
     # Error details with code
     #
     # errors.add :base, :invalid, Errorio.by_code(:E0001, user_id: 129)
+    #
     def by_code(*args)
       Details.by_code(*args)
     end
+
+    # Interpolate error message from i18n
+    #
+    # @param [Symbol] code
+    # @param [Hash{Symbol->Object}] args
+    #
+    # @return [String]
+    #
+    def message(code, args = {})
+      Details.t_msg(code, args)
+    end
   end
 
   def self.included(base)
@@ -123,8 +135,14 @@ module Errorio
   # Class-level methods
   module ClassMethods
     def errorionize(*collection_types)
-      raise unless collection_types.is_a?(Array)
-      @errorio_collection_types = collection_types.map(&:to_sym)
+      raise 'InapproriateArguments' unless collection_types.is_a?(Array)
+
+      @errorio_collection_types ||= []
+      collection_types.map(&:to_sym).each do |a|
+        next if @errorio_collection_types.include?(a)
+
+        @errorio_collection_types << a
+      end
     end
 
     def errorio_collection_types
@@ -140,7 +158,7 @@ module Errorio
     end
 
     def errorio_initializer
-      @errorio_repo = {}
+      @errorio_repo ||= {}
       self.class.errorio_collection_types.each do |e|
         init_errors_variable(e)
         if send(e).nil?
@@ -179,7 +197,8 @@ module Errorio
       result = []
 
       @errors.each do |err|
-        err_obj = err.options.merge(key: err.attribute, type: err.type, message: err.message)
+        msg = err.options.key?(:message) ? err.options[:message] : err.message
+        err_obj = err.options.merge(key: err.attribute, type: err.type, message: msg)
         result << err_obj
       end
       result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: errorio
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.8
 platform: ruby
 authors:
 - Vadym Lukavyi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler