definition 0.5.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db6d3a697d9641388ce9045cd7b9504d485e165480339e864dca6fe096289c6f
-  data.tar.gz: ef5adc969fde0a0ca0a3e3b9a365cbce588379d2e0bd47be36567b2f4568e7e9
+  metadata.gz: 9de3bc4f221f0a67beb7c82f3d7bacfa86ab332cfc3ab7efe3f35bd6efeeeaca
+  data.tar.gz: a11b488ecb7fc5e3b2956dbb14c533631936b78d613f6f4a68c58e584cc25faa
 SHA512:
-  metadata.gz: 800d13aa9d79318e639eaa969ab6d5d5e8737160f0852df873e38e18685ac58b6133f81e8327de2a937e6a9432e8e68ef26bf0b3758fad4a6c757db5b134572d
-  data.tar.gz: 52082265fba3abe62846ccf4236888c9d5f6f2e04a9e265282da1526572b3e39b5c3bed3e6490fb5e98525165f74caed5064bdbc479053471e913175313ab353
+  metadata.gz: cc464d58c56ef306fdc83868be3f67a7151c64e17f9f28d652584c94f73d2ce083308c1fd1c152bc667d57989f0e7fcbaea0e4a89a9aa30e9fb6093bfab18787
+  data.tar.gz: cad0aa2a4165e5ea329751dc8ded8a61f943e110a30d930afbcfec3b2ba2ea7686dccbe41ef322906fb56c8ab23df65f83913d794933d29a3f7907ec0d3e23db

data/.circleci/config.yml

@@ -0,0 +1,53 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+# Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
+# See: https://circleci.com/docs/2.0/orb-intro/
+orbs:
+  ruby: circleci/ruby@1.4.0
+
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  test:
+    parameters:
+      ruby_version:
+        type: string
+    docker:
+      - image: cimg/base:stable
+    steps:
+      - ruby/install:
+          version: << parameters.ruby_version >>
+      - checkout
+      - run: rm Gemfile.lock
+      - run: gem install bundler
+      - run: bundle install
+      - ruby/rspec-test
+  linting:
+    docker:
+      - image: 'cimg/base:stable'
+    steps:
+      - checkout
+      - ruby/install:
+          version: "3.0"
+      - ruby/install-deps
+      - ruby/rubocop-check:
+          format: progress
+          label: Inspecting with Rubocop
+
+# Invoke jobs via workflows
+# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
+workflows:
+  test: # This is the name of the workflow, feel free to change it to better match your workflow.
+    # Inside the workflow, you define the jobs you want to run.
+    jobs:
+      - test: 
+          matrix:
+            parameters:
+              ruby_version:
+                - "2.6"
+                - "2.7"
+                - "3.0"
+                - "jruby-9.3.3.0"
+      - linting

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop.yml

@@ -2,7 +2,7 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
     
 Metrics/LineLength:
   Max: 119

data/Changelog.md

@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+## [0.7.0] - 2022-02-25
+### Added
+- Lambda definitions can now be failed with custom error messages
+- Compatibility with Ruby 3.0
+### Fixed
+- In some cases errors from nested `Keys` definitions inside `Or` definitions got lost when listing the validation errors via the `error_hash` method on the conform result object.
+### Changed
+- When no sub-definition of an `Or` conforms, then only the errors of the last definition of the `Or` are collected. Previously the errors of all sub-definitions were collected.
+- Translated error messages have been improved to be more suitable to be used as end user error messages
+
+## [0.6.1] - 2021-12-14
+### Fixed
+- The `Keys` definition crashed with an error if the input was not a Hash
+
+## [0.6.0] - 2020-03-21
+### Added
+- Added include method to Keys Definition that allows to inline other `Keys` Definitions into each other
+
 ## [0.5.2] - 2019-06-03
 ### Fixed
 - added missing require for "pathname"

data/Gemfile.lock

@@ -0,0 +1,134 @@
+PATH
+  remote: .
+  specs:
+    definition (0.7.0)
+      activesupport
+      i18n
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    approvals (0.0.25)
+      nokogiri (~> 1.8)
+      thor (~> 1.0)
+    ast (2.4.2)
+    awesome_print (1.9.2)
+    benchmark-ips (2.10.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.5.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    fuubar (2.5.1)
+      rspec-core (~> 3.0)
+      ruby-progressbar (~> 1.4)
+    guard (2.18.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.13.0)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    minitest (5.15.0)
+    nenv (0.3.0)
+    nokogiri (1.13.1-x86_64-linux)
+      racc (~> 1.4)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parallel (1.21.0)
+    parser (3.1.0.0)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    psych (4.0.3)
+      stringio
+    racc (1.6.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rspec_junit_formatter (0.5.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (0.66.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      psych (>= 3.1.0)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    rubocop-rspec (1.32.0)
+      rubocop (>= 0.60.0)
+    rubocop_runner (2.2.0)
+    ruby-progressbar (1.11.0)
+    shellany (0.0.1)
+    stringio (3.0.1)
+    thor (1.2.1)
+    timecop (0.9.4)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.5.0)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  approvals (~> 0.0)
+  awesome_print
+  benchmark-ips
+  definition!
+  fuubar
+  guard
+  guard-rspec
+  pry
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  rspec-its (~> 1.2)
+  rspec_junit_formatter
+  rubocop (= 0.66.0)
+  rubocop-rspec (= 1.32.0)
+  rubocop_runner
+  timecop
+
+BUNDLED WITH
+   2.3.7

data/README.md

@@ -1,6 +1,6 @@
 # Definition
 
-[![Build Status](https://travis-ci.org/Goltergaul/definition.svg?branch=master)][travis]
+[![Build Status](https://circleci.com/gh/Goltergaul/definition.svg?style=svg)][circleci]
 [![Gem Version](https://badge.fury.io/rb/definition.svg)][rubygems]
 
 Simple and composable validation and coercion of data structures. It also includes a ValueObject for convenience.
@@ -255,6 +255,24 @@ either be the original value or any transformed version of it. By not calling
 The first argument of `Definition.Lambda` is a name you can give this definition.
 It will only be used in the error message to make it more readable.
 
+If you want to provide detailed custom error messages you can use `fail_with`:
+
+```ruby
+Definition.Lambda(:password) do |value|
+  if !value.match(/[a-z]+/)
+    fail_with("must contain at least one lower case letter")
+  elsif !value.match(/[A-Z]+/)
+    fail_with("must contain at least one upper case letter") 
+  elsif !value.match(/\d+/)
+    fail_with("must contain at least one digit") 
+  elsif value.size < 6 || value.size > 50
+    fail_with("must be between 6 and 50 characters long") 
+  else
+    conform_with(value)
+  end
+end
+```
+
 ### Composing Definitions
 
 Definitions are reusable and can be easily composed:
@@ -279,6 +297,35 @@ order = Definition.Keys do
 end
 ```
 
+### Extending Key definitions with include
+
+Besides composing Definitions, you can also include `Keys` Definitions in each 
+other. This will basically copy all required and optional keys as well as defaults into the other definition.
+
+```ruby
+address_definition = Definition.Keys do
+  required :street, Definition.Type(String)
+  required :postal_code, Definition.Type(String)
+  required :country_code, Definition.Type(String)
+end
+
+user_definition = Definition.Keys do
+  required :user, user_definition
+
+  include address_definition
+end
+```
+Above Definition will equal the following:
+```ruby
+user_definition = Definition.Keys do
+  required :user, user_definition
+
+  required :street, Definition.Type(String)
+  required :postal_code, Definition.Type(String)
+  required :country_code, Definition.Type(String)
+end
+```
+
 ### Predefined Definitions
 
 #### Strings and Arrays
@@ -394,5 +441,5 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/Goltergaul/definition.
 
-[travis]: https://travis-ci.org/Goltergaul/definition
+[circleci]: https://circleci.com/gh/Goltergaul/definition
 [rubygems]: https://rubygems.org/gems/definition

data/config/locales/en.yml

@@ -1,22 +1,22 @@
 en:
   definition:
-    max_size: "Value is bigger then %{max_size}"
-    min_size: "Value is smaller then %{min_size}"
-    greater_then: "Value must be greater then %{min_value}"
-    greater_then_equal: "Value must be greater or eqaul to %{min_value}"
-    less_then: "Value must be less then %{max_value}"
-    less_then_equal: "Value must be less or eqaul to %{max_value}"
+    max_size: "Value is bigger than %{max_size}"
+    min_size: "Value is smaller than %{min_size}"
+    greater_then: "Value must be greater than %{min_value}"
+    greater_then_equal: "Value must be greater or equal to %{min_value}"
+    less_then: "Value must be less than %{max_value}"
+    less_then_equal: "Value must be less or equal to %{max_value}"
     equal: "Value must be equal to '%{expected_value}'"
     empty: "Value must be empty"
     non_empty: "Value must not be empty"
     nil: "Value must be nil"
+    each: "Is not an Array"
+    include: "Does not include %{value}"
     type: "Value is of wrong type, needs to be a %{class}"
     enum: "Value is not one of: %{allowed_values}"
-    each: "Not all values are valid"
-    and: "Not all definitions conform"
-    or: "None of the definitions conform"
     non_empty_string: "Value must be a non empty string"
-    regex: "Value dos not match regex %{regex}"
+    regex: "Value does not match regex %{regex}"
     keys:
-      has_extra_key: "Hash has unexpected key %{key}"
-      has_missing_key: "Hash is missing key %{key}"
+      has_extra_key: "Is unexpected"
+      has_missing_key: "Is missing"
+      not_a_hash: "Is not a Hash"

data/definition.gemspec

@@ -31,9 +31,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-its", "~> 1.2"
+  spec.add_development_dependency "rspec_junit_formatter"
   spec.add_development_dependency "rubocop", "0.66.0"
   spec.add_development_dependency "rubocop-rspec", "1.32.0"
   spec.add_development_dependency "rubocop_runner"

data/lib/definition/conform_error.rb

@@ -4,16 +4,18 @@ require "i18n"
 
 module Definition
   class ConformError
-    def initialize(definition, message, sub_errors: [], i18n_key: definition.name)
+    def initialize(definition, message, sub_errors: [], **options)
       self.definition = definition
       self.message = message
       self.sub_errors = sub_errors
-      self.i18n_key = i18n_key
+      self.i18n_key = options.fetch(:i18n_key, definition.name)
+      self.i18n_context = options.fetch(:i18n_context, {})
+      self.translated_error = options.fetch(:translated_message, nil)
       assign_parents
     end
 
-    attr_accessor :definition, :sub_errors, :parent, :i18n_key
-    attr_writer :message
+    attr_accessor :definition, :sub_errors, :parent, :i18n_key, :i18n_context
+    attr_writer :message, :translated_error
 
     def message
       if sub_errors.empty?
@@ -50,10 +52,8 @@ module Definition
       sub_errors.map(&:leaf_errors).flatten
     end
 
-    def translated_error(namespace = "definition", vars: {})
-      namespace ||= "definition"
-      vars[:key] = key if respond_to?(:key)
-      ::I18n.t("#{namespace}.#{i18n_key}", definition.context.merge!(vars))
+    def translated_error(namespace = "definition")
+      @translated_error ||= definition.error_renderer.new(self, i18n_namespace: namespace).translated_error
     end
 
     private

data/lib/definition/conform_result.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/hash"
+require "active_support"
 
 module Definition
   class ConformResult

data/lib/definition/dsl.rb

@@ -41,11 +41,9 @@ module Definition
                                 "a primitive that has a coercion function defined")
       end
       Types::Type.new(:type, klass) do |value|
-        begin
-          method(klass.name).call(value)
-        rescue ArgumentError
-          value
-        end
+        method(klass.name).call(value)
+      rescue ArgumentError
+        value
       end
     end
 

data/lib/definition/key_conform_error.rb

@@ -4,9 +4,9 @@ require "definition/conform_error"
 
 module Definition
   class KeyConformError < ConformError
-    def initialize(definition, message, key:, sub_errors: [], i18n_key: definition.name)
+    def initialize(definition, message, key:, sub_errors: [], **options)
       self.key = key
-      super(definition, message, sub_errors: sub_errors, i18n_key: i18n_key)
+      super(definition, message, sub_errors: sub_errors, **options)
     end
 
     attr_accessor :key

data/lib/definition/types/and.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "definition/types/base"
+require "definition/types/error_renderers/leaf"
 
 module Definition
   module Types
@@ -23,6 +24,10 @@ module Definition
         Conformer.new(self).conform(value)
       end
 
+      def error_renderer
+        ErrorRenderers::Leaf
+      end
+
       class Conformer
         def initialize(definition)
           self.definition = definition

data/lib/definition/types/base.rb

@@ -2,6 +2,7 @@
 
 require "definition/conform_result"
 require "definition/conform_error"
+require "definition/types/error_renderers/standard"
 
 module Definition
   module Types
@@ -23,6 +24,10 @@ module Definition
       def conform(_value)
         raise NotImplementedError
       end
+
+      def error_renderer
+        ErrorRenderers::Standard
+      end
     end
   end
 end

data/lib/definition/types/each.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "definition/types/base"
+require "definition/types/error_renderers/leaf"
 
 module Definition
   module Types
@@ -16,6 +17,10 @@ module Definition
         Conformer.new(self).conform(value)
       end
 
+      def error_renderer
+        ErrorRenderers::Leaf
+      end
+
       class Conformer
         def initialize(definition)
           self.definition = definition

data/lib/definition/types/error_renderers/lambda.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "definition/types/error_renderers/standard"
+
+module Definition
+  module Types
+    module ErrorRenderers
+      class Lambda < Standard
+        def default
+          "Did not pass test for '#{conform_error.definition.name}'"
+        end
+      end
+    end
+  end
+end

data/lib/definition/types/error_renderers/leaf.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "definition/types/error_renderers/standard"
+
+module Definition
+  module Types
+    module ErrorRenderers
+      class Leaf < Standard
+        def translated_error(_namespace = "definition")
+          # When there are no sub errors, proceeding gets us into an infinite loop.
+          return i18n_error if conform_error.sub_errors.empty?
+
+          conform_error.leaf_errors.map(&:translated_error).join(", ")
+        end
+      end
+    end
+  end
+end

data/lib/definition/types/error_renderers/standard.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Definition
+  module Types
+    module ErrorRenderers
+      class Standard
+        def initialize(conform_error, i18n_namespace:)
+          self.conform_error = conform_error
+          self.i18n_namespace = i18n_namespace
+        end
+
+        def translated_error
+          i18n_error
+        end
+
+        private
+
+        def i18n_error
+          ::I18n.t("#{i18n_namespace}.#{conform_error.i18n_key}",
+                   **i18n_vars)
+        end
+
+        def i18n_vars
+          conform_error.definition.context.merge(
+            conform_error.i18n_context
+          ).tap do |vars|
+            vars[:default] = default if default
+          end
+        end
+
+        def default
+          nil
+        end
+
+        attr_accessor :conform_error, :i18n_namespace
+      end
+    end
+  end
+end

data/lib/definition/types/include.rb

@@ -38,7 +38,8 @@ module Definition
           definition.required_items.map do |item|
             next if value.include?(item)
 
-            KeyConformError.new(definition, "#{definition.name} does not include #{item.inspect}", key: item)
+            KeyConformError.new(definition, "#{definition.name} does not include #{item.inspect}",
+                                key: item, i18n_context: { value: item.inspect })
           end.compact
         end
 

data/lib/definition/types/keys.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# frozen_string_literal: true
-
 require "definition/types/base"
 require "definition/types/include"
 require "definition/key_conform_error"
@@ -19,10 +17,6 @@ module Definition
           default(key, opts[:default]) if opts.key?(:default)
         end
 
-        def default(key, value)
-          defaults[key] = value
-        end
-
         def option(option_name)
           case option_name
           when :ignore_extra_keys
@@ -31,6 +25,36 @@ module Definition
             raise "Option #{option_name} is not defined"
           end
         end
+
+        def include(other)
+          raise ArgumentError.new("Included Definition can only be a Keys Definition") unless other.is_a?(Types::Keys)
+
+          ensure_keys_do_not_interfere(other)
+          other.required_definitions.each do |key, definition|
+            required(key, definition)
+          end
+          other.optional_definitions.each do |key, definition|
+            optional(key, definition)
+          end
+          other.defaults.each do |key, default|
+            default(key, default)
+          end
+        end
+
+        private
+
+        def default(key, value)
+          defaults[key] = value
+        end
+
+        def ensure_keys_do_not_interfere(other)
+          overlapping_keys = keys & other.keys
+          return if overlapping_keys.empty?
+
+          raise ArgumentError.new(
+            "Included definition tries to redefine already defined fields: #{overlapping_keys.join(', ')}"
+          )
+        end
       end
 
       include Dsl
@@ -60,9 +84,15 @@ module Definition
         end
 
         def conform
-          add_extra_key_errors unless definition.ignore_extra_keys
-          add_missing_key_errors
-          values = conform_all_keys
+          if valid_input_type?
+            add_extra_key_errors unless definition.ignore_extra_keys
+            add_missing_key_errors
+            values = conform_all_keys
+          else
+            errors.push(ConformError.new(definition,
+                                         "#{definition.name} is not a Hash",
+                                         i18n_key: "keys.not_a_hash"))
+          end
 
           ConformResult.new(values, errors: errors)
         end
@@ -71,6 +101,10 @@ module Definition
 
         attr_accessor :errors
 
+        def valid_input_type?
+          value.is_a?(Hash)
+        end
+
         def add_extra_key_errors
           extra_keys = value.keys - all_keys
           return if extra_keys.empty?

data/lib/definition/types/lambda.rb

@@ -1,34 +1,65 @@
 # frozen_string_literal: true
 
 require "definition/types/base"
+require "definition/types/error_renderers/lambda"
 
 module Definition
   module Types
     class Lambda < Base
-      module Dsl
-        def conform_with(value)
-          ConformResult.new(value)
-        end
-      end
-      include Dsl
+      attr_accessor :conformity_test_lambda
 
-      def initialize(name, context: {}, &test_lambda)
-        self.test_lambda = test_lambda
+      def initialize(name, context: {}, &conformity_test_lambda)
+        self.conformity_test_lambda = conformity_test_lambda
         super(name, context: context)
       end
 
       def conform(value)
-        lambda_result = instance_exec(value, &test_lambda)
-        return lambda_result if lambda_result.is_a?(ConformResult)
+        Conformer.new(self).conform(value)
+      end
 
-        ConformResult.new(value, errors: [
-                            ConformError.new(self, "Did not pass test for #{name}")
-                          ])
+      def error_renderer
+        ErrorRenderers::Lambda
       end
 
-      private
+      class Conformer
+        module Dsl
+          def conform_with(value)
+            ConformResult.new(value)
+          end
+
+          def fail_with(error_message)
+            self.error_message = error_message
+          end
+        end
+        include Dsl
+
+        def initialize(definition)
+          self.definition = definition
+        end
+
+        def conform(value)
+          lambda_result = instance_exec(value, &definition.conformity_test_lambda)
+          return lambda_result if lambda_result.is_a?(ConformResult)
 
-      attr_accessor :test, :test_lambda
+          failure_result_with(value, error_message)
+        end
+
+        private
+
+        attr_accessor :definition, :error_message
+
+        def standard_error_message
+          "Did not pass test for #{definition.name}"
+        end
+
+        def failure_result_with(value, error_message)
+          ConformResult.new(value, errors: [
+                              ConformError.new(definition,
+                                               standard_error_message,
+                                               translated_message: error_message)
+                            ])
+        end
+      end
     end
   end
 end

data/lib/definition/types/or.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "definition/types/base"
+require "definition/types/error_renderers/leaf"
 
 module Definition
   module Types
@@ -23,6 +24,10 @@ module Definition
         Conformer.new(self).conform(value)
       end
 
+      def error_renderer
+        ErrorRenderers::Leaf
+      end
+
       class Conformer
         def initialize(definition)
           self.definition = definition
@@ -34,7 +39,8 @@ module Definition
             result
           else
             error = ConformError.new(definition,
-                                     "None of the definitions are valid for '#{definition.name}'",
+                                     "None of the definitions are valid for '#{definition.name}'."\
+                                     " Errors for last tested definition:",
                                      sub_errors: result)
             ConformResult.new(value, errors: [error])
           end
@@ -48,7 +54,7 @@ module Definition
             result = definition.conform(value)
             return result if result.passed?
 
-            errors.push(result.error_tree)
+            errors = result.error_tree
           end
 
           errors.flatten

data/lib/definition/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Definition
-  VERSION = "0.5.2"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: definition
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Dominik Goltermann
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +248,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - dominik@goltermann.cc
 executables: []
@@ -242,12 +256,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".approvals"
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Changelog.md
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -271,6 +286,9 @@ files:
 - lib/definition/types/and.rb
 - lib/definition/types/base.rb
 - lib/definition/types/each.rb
+- lib/definition/types/error_renderers/lambda.rb
+- lib/definition/types/error_renderers/leaf.rb
+- lib/definition/types/error_renderers/standard.rb
 - lib/definition/types/include.rb
 - lib/definition/types/keys.rb
 - lib/definition/types/lambda.rb
@@ -283,7 +301,7 @@ homepage: https://github.com/Goltergaul/definition
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -298,9 +316,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Simple and composable validation and coercion of data structures inspired
   by clojure specs

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-rvm:
-  - jruby-9.1.17.0 # ruby 2.3
-  - jruby-9.2.0.0 # ruby 2.5
-  - jruby-head
-  - 2.3.0
-  - 2.4.0
-  - 2.5.0
-  - ruby-head
-jobs:
-  include:
-    - stage: linting
-      rvm: ruby-head
-      script: bundle exec rake rubocop
-    - stage: benchmark
-      script: bundle exec ruby benchmark/complex_example.rb
-      rvm: ruby-head
-    - script: bundle exec ruby benchmark/coercion.rb
-      rvm: ruby-head
-    - script: bundle exec ruby benchmark/validation_only.rb
-      rvm: ruby-head