gourami 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98ec9c2d757ec710e65dd5aa0662530f0f92363b72d56edce9fecebe85d0d800
-  data.tar.gz: 80842660cd5e2ed28a244414ef8a8f8f091d111d8fd2ba614bcec52dc0efe807
+  metadata.gz: 6ed05ee6d0864e3a51c4c29719f7cc6d6b6ca8ba3f360fc8ad950f026db5b69f
+  data.tar.gz: 665904a584c35c5ad55f710a49bed160f039706772f1f8ccd485ccd2351a8ebc
 SHA512:
-  metadata.gz: 94897c3b427a7528020c6df8b657c193e88488b52610bf853d2e3fffda962ba1e0ba642ba7c72e2c9bb6ecf234518372910f733bca453d72a2b72c4ee469cb55
-  data.tar.gz: 12d3a6215c2fc337aa03af6d0818b916879aebe77cb96a21aed65d47ca7385a68eb096cc81dc22ff39ca3e187260ffd0a0f55060a4fb38db948eeb5a673a0e87
+  metadata.gz: f830e299356968c7248b5d4bc02294299e91929a5e7fb4db7e06e25ec12a581393ce3bbcfcaafe889e65bd67e51406f3a3ed1d4b2b26e375af9c304d8befc205
+  data.tar.gz: 6c55ad5a92607e4387c4221ee2597ab091ab436b70196afbc0acf9de3ad9e2482bc19419ee384e49420478d440c3b45e2d1e4e68e56a220e0653ee8fce98d9fb

data/README.md

@@ -252,7 +252,9 @@ end
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org). 
+
+To add another gem owner to gourami gem `gem owner --add john.smith@example.com gourami`
 
 ## Contributing
 

data/lib/gourami/extensions/resources.rb

@@ -91,6 +91,28 @@ module Gourami
         resource_errors.values.flat_map(&:values).map(&:values).flatten.any?
       end
 
+      # Replace the existing resource errors with the provided errors Hash.
+      #
+      # @param new_resource_errors [Hash<Symbol, Hash<Symbol, Hash<Symbol, Array>>>]
+      #
+      # @return [Hash<Symbol, Hash<Symbol, Hash<Symbol, Array>>>]
+      def clear_and_set_resource_errors(new_resource_errors)
+        new_resource_errors = new_resource_errors.dup
+        resource_errors.clear
+        resource_errors.merge!(new_resource_errors)
+
+        resource_errors
+      end
+
+      def handle_validation_error(error)
+        super(error)
+        clear_and_set_resource_errors(error.resource_errors) unless error.resource_errors.nil?
+      end
+
+      def raise_validate_errors
+        raise ValidationError.new(errors, resource_errors)
+      end
+
     end
   end
 end

data/lib/gourami/validation_error.rb

@@ -9,20 +9,39 @@ module Gourami
       end
     end
 
+    def self.stringify_resource_errors(resource_errors)
+      [].tap do |array|
+        resource_errors.each do |resource_namespace, resource_namespace_errors|
+          resource_namespace_errors.each do |resource_uid, resource_uid_errors|
+            resource_uid_errors.each do |attribute_name, error|
+               array.push("#{resource_namespace}:#{resource_uid}:#{attribute_name}: #{error}")
+            end
+          end
+        end
+      end
+    end
+
     # !@attribute [r] errors
     #   @return [Hash<Symbol, Array>]
     attr_reader :errors
 
+    # !@attribute [r] resource_errors
+    #   @return [Hash<Symbol, Hash<Symbol, Hash<Symbol, Array>>>]
+    attr_reader :resource_errors
+
     # Initialize the Gourami::ValidationError.
     #
     # @param errors [Hash<Symbol, Array>]
-    def initialize(errors)
+    # @param resource_errors [Hash<Symbol, Hash<Symbol, Hash<Symbol, Array>>>]
+    def initialize(errors, resource_errors = {})
+      @resource_errors = resource_errors
       @errors = errors
+
       super(message)
     end
 
     def message
-      @message ||= "Validation failed with errors: #{stringify_errors.join("\n")}"
+      @message ||= stringify_all_errors
     end
 
     private
@@ -31,5 +50,16 @@ module Gourami
       ValidationError.stringify_errors(errors)
     end
 
+    def stringify_resource_errors
+      ValidationError.stringify_resource_errors(resource_errors)
+    end
+
+    def stringify_all_errors
+      messages = []
+      messages << "Validation failed with errors: #{stringify_errors.join("\n")}" unless errors.nil? || errors.empty?
+      messages << "Validation failed with resource errors: #{stringify_resource_errors.join("\n")}" unless resource_errors.nil? || resource_errors.empty?
+      messages.join("\n")
+    end
+
   end
 end

data/lib/gourami/validations.rb

@@ -15,11 +15,16 @@ module Gourami
     # @raise [Gourami::ValidationError]
     def perform!
       if valid?
-        returned = perform
+        begin
+          returned = perform
+        rescue Gourami::ValidationError => error
+          handle_validation_error(error)
+          raise
+        end
       end
 
       if any_errors?
-        raise ValidationError.new(errors)
+        raise_validate_errors
       end
 
       returned
@@ -46,9 +51,9 @@ module Gourami
 
     # Replace the existing errors with the provided errors Hash.
     #
-    # @param new_errors [Hash<Symbol, nil>, Array<Symbol, String>]
+    # @param new_errors Hash<Symbol, Array>
     #
-    # @return [Hash<Symbol, nil>, Array<Symbol, String>]
+    # @return Hash<Symbol, Array>
     def clear_and_set_errors(new_errors)
       new_errors = new_errors.dup
       errors.clear
@@ -57,6 +62,14 @@ module Gourami
       errors
     end
 
+    def raise_validate_errors
+      raise ValidationError.new(errors)
+    end
+
+    def handle_validation_error(error)
+      clear_and_set_errors(error.errors) unless error.errors.nil?
+    end
+
     # Return true if there given attribute has any errors.
     def attribute_has_errors?(attribute_name)
       errors[attribute_name.to_sym].any?

data/lib/gourami/version.rb

@@ -1,3 +1,3 @@
 module Gourami
-  VERSION = "0.5.0".freeze
+  VERSION = "1.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gourami
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - TSMMark
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -118,8 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Keep your Routes, Controllers and Models thin.