cater 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcda3c234fae821d3b7498e1e65eb963472e4f318fc1ffcfe89e02e5191f9a07
-  data.tar.gz: 6e2ed165b6cd8a63a89c0ea6f0f9d2735c867da83f829d7c944c018772280ff6
+  metadata.gz: efbb433c4977fe5dec6caf4ca41206665b8a9f2e25aeaac9a1ea196a599efd88
+  data.tar.gz: 8727d65a54a3555dd2e3f17d559e12cfb77c1472cf3d938647c2094b69e9f716
 SHA512:
-  metadata.gz: 49ee7bbc7b23c70689b7f64e8bc0da90582971839a60573b083f8ec01653344eabc9e4518bbca42ca7f39728539a426aa564c874ddbccf20c487faf4b00ec483
-  data.tar.gz: d14de3ac8cdb416fe9a304093c3bfeecc413fa924fda3bf78de3de01bcdd6e61359dff570e124e5678f30cfe6993f35968f10b5cb828b7386be58525b78b9cc0
+  metadata.gz: 485f2b46d46970bded6f082ff7ab468d63220fba6fa3664d4c7f4776fcf2a172d55eb62038e69b2f82d8d9ab4ba9a3e877774c5f648665d9fdb4c560f7fdee46
+  data.tar.gz: 25486b56125fb3f589e65958c4960ce3fafce9c7b6880f2d813e28bb15263daa3af15d056e763bb45bffb40486202c7d6a46bd6583303c90bede4d1ce856a2ee

data/lib/cater/service.rb

@@ -21,13 +21,35 @@ module Cater
         @_service_success
       end
 
+      # raise error
+      #
+      # error! "Something is required"
+      # errors.messages
+      # # => {:base=> ["Something is required"]}
+      #
+      # error! name: "is required", email: "invalid"
+      # errors.messages
+      # # => {:name=> ["is required"], :email=> ["invalid"]}
+      #
+      # error! other_service.errors,
+      #
       def error!(message=nil)
-        if message.kind_of? Hash
-          message.each {|attr, msg| self.errors.add(attr, msg)}
+        if message.kind_of?  ActiveModel::Errors
+          self.errors.copy! message
+          self.message = message.values.join ', '
+        elsif message.kind_of? Hash
+          message.each do |attr, msg|
+            if msg.kind_of? Array
+              msg.each{|m| self.errors.add(attr, m)}
+            else
+              self.errors.add(attr, msg)
+            end
+          end
+          self.message = message.values.join ', '
         else
           self.errors.add(:base, message)
+          self.message = message
         end
-        self.message = message
         raise ServiceError
       end
 

data/lib/cater/version.rb

@@ -1,3 +1,3 @@
 module Cater
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cater
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Andriy Tyurnikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel