metaractor 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26bc406252dfc7f8839f49ca5ee2a4a85cb1961db82c0a0a24928e964010ec17
-  data.tar.gz: b1412660d447cba69a18ffa3a290942de9339751abf2aebbd737b8326b7d7b57
+  metadata.gz: 43fa8164083ceda9dca36dc6584da4bf3ac511e67d0f7a2232468ae841f8bd56
+  data.tar.gz: 1ed5b56c2524f9f73048a8f9f79c2ab4515bafe0749a60122b92841224b5194c
 SHA512:
-  metadata.gz: 02b54f2d308bbac395167a086aecbcca66bd2780a9a13871243ca150789b36d4f0717aec967b3fb5201e07e9ee9324b3a3ecfde203c2dd8bd3c15bc8d0b2ae22
-  data.tar.gz: ce8dda0f8c1a366dc311db0d32e7526d9fbf7bef45d23a3c77c49b67f591c06084f8a6a9ab1aa43063c002f42aaf1f1eecb93be10968b4803971cc6bc142a418
+  metadata.gz: 535d587dde182fd7c298f050eefb6a560a35f27ffba8e90afd117a0395f760374b88794c09e2cd84821ba760b26ee0322bd1fd95d8d9b0b2c22dceac8b7cac14
+  data.tar.gz: 8571061ff4a4fcd37d3592a82273db4bf308f394b92bb7f36b2241fbbb07cbca4c2e1b05882af339c4a99891efc0688e23d4f7643e12842e200e18379ac78ec4

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.6.5-alpine
-MAINTAINER Ryan Schlesinger <ryan@outstand.com>
+LABEL maintainer="Ryan Schlesinger <ryan@outstand.com>"
 
 RUN addgroup -g 1000 -S metaractor && \
     adduser -u 1000 -S -s /bin/ash -G metaractor metaractor && \
@@ -11,6 +11,9 @@ RUN addgroup -g 1000 -S metaractor && \
       git \
       openssh
 
+ENV BUNDLER_VERSION 2.1.4
+RUN gem install bundler -v ${BUNDLER_VERSION} -i /usr/local/lib/ruby/gems/$(ls /usr/local/lib/ruby/gems) --force
+
 WORKDIR /metaractor
 RUN chown -R metaractor:metaractor /metaractor
 USER metaractor

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec
+gem 'pry-byebug'

data/lib/metaractor.rb

@@ -1,6 +1,7 @@
 require 'metaractor/version'
 require 'interactor'
 require 'metaractor/errors'
+require 'metaractor/handle_errors'
 require 'metaractor/context_errors'
 require 'metaractor/parameters'
 require 'metaractor/run_with_context'
@@ -38,7 +39,7 @@ module Metaractor
 
   def self.default_modules
     [
-      { module: Metaractor::Errors, method: :include },
+      { module: Metaractor::HandleErrors, method: :include },
       { module: Metaractor::Parameters, method: :include },
       { module: Metaractor::RunWithContext, method: :include },
       { module: Metaractor::ChainFailures, method: :include }

data/lib/metaractor/context_errors.rb

@@ -2,47 +2,40 @@ module Metaractor
   module ContextErrors
     def errors
       if super.nil?
-        self.errors = []
+        self.errors = Metaractor::Errors.new
       end
 
       super
     end
 
-    def fail_with_error!(message: nil, **args)
-      add_error(message: message, **args)
+    def fail_with_error!(message: nil, errors: nil)
+      add_error(message: message, errors: errors)
       fail!
     end
 
-    def fail_with_errors!(messages: [], errors: [])
+    def fail_with_errors!(messages: [], errors: {})
       add_errors(messages: messages, errors: errors)
       fail!
     end
 
-    def add_error(message: nil, **args)
+    def add_error(message: nil, errors: nil)
       if message.nil?
-        add_errors(errors: [**args])
+        add_errors(errors: errors)
       else
         add_errors(messages: Array(message))
       end
     end
 
-    def add_errors(messages: [], errors: [])
-      self.errors += messages
-      self.errors += errors
+    def add_errors(messages: [], errors: {})
+      if !messages.empty?
+        self.errors.add(errors: { base: messages })
+      else
+        self.errors.add(errors: errors)
+      end
     end
 
     def error_messages
-      errors.map do |error|
-        if error.respond_to?(:has_key?) && error.has_key?(:title)
-          if error[:source] != nil
-            "#{error[:source]}: #{error[:title]}"
-          else
-            error[:title].to_s
-          end
-        else
-          error.to_s
-        end
-      end.join("\n")
+      errors.full_messages
     end
   end
 end

data/lib/metaractor/errors.rb

@@ -1,28 +1,102 @@
+require 'sycamore'
 require 'forwardable'
-
 module Metaractor
-  class Error < StandardError; end
-  class InvalidError < Error; end
+  class Errors
+    extend Forwardable
+
+    def initialize
+      @tree = Sycamore::Tree.new
+    end
+
+    def_delegators :@tree, :to_h, :empty?
+
+    def add(error: {}, errors: {})
+      trees = []
+      [error, errors].each do |h| 
+        tree = nil
+        if h.is_a? Metaractor::Errors
+          tree = Sycamore::Tree.from(h.instance_variable_get(:@tree))
+        else
+          tree = Sycamore::Tree.from(h)
+        end
+
+        unless tree.empty?
+          if tree.nodes.any? {|node| tree.strict_leaf?(node) }
+            raise ArgumentError, "Invalid hash!"
+          end
+          trees << tree
+        end
+      end
+
+      trees.each do |tree|
+        @tree.add(tree)
+      end
+      @tree.compact
+    end
+
+    def full_messages(tree = @tree)
+      messages = []
+      tree.each_path do |path|
+        messages << message_from_path(path)
+      end
 
-  module Errors
-    def fail_with_error!(*args)
-      context.fail_with_error!(*args)
+      messages
     end
+    alias to_a full_messages
 
-    def fail_with_errors!(*args)
-      context.fail_with_errors!(*args)
+    def full_messages_for(*path)
+      child_tree = @tree.fetch_path(path)
+
+      if child_tree.strict_leaves?
+        child_tree = @tree.fetch_path(path[0..-2])
+      end
+
+      full_messages(child_tree)
     end
 
-    def add_error(*args)
-      context.add_error(*args)
+    def dig(*path)
+      result = @tree.dig(*path)
+
+      if result.strict_leaves?
+        result.nodes
+      else
+        result.to_h
+      end
     end
+    alias [] dig
 
-    def add_errors(*args)
-      context.add_errors(*args)
+    def include?(*elements)
+      if elements.size == 1 &&
+          elements.first.is_a?(Hash)
+        @tree.include?(*elements)
+      else
+        full_messages.include?(*elements)
+      end
     end
 
-    def error_messages
-      context.error_messages
+    def slice(*paths)
+      new_tree = Sycamore::Tree.new
+
+      paths.each do |path|
+        if @tree.include_path?(path)
+          new_tree[path] = @tree[path].dup
+        end
+      end
+
+      new_tree.to_h
+    end
+
+    private
+
+    def message_from_path(path)
+      path_elements = []
+      path.parent&.each_node do |node|
+        unless node == :base
+          path_elements << node.to_s
+        end
+      end
+
+      "#{path_elements.join('.')} #{path.node.to_s}".lstrip
     end
   end
 end

data/lib/metaractor/fail_from_context.rb

@@ -4,7 +4,7 @@ module Metaractor
       return if context.equal?(self)
 
       invalidate! if context.invalid?
-      add_errors(messages: context.errors)
+      add_errors(errors: context.errors.to_h)
       @failure = true
     end
   end

data/lib/metaractor/handle_errors.rb

@@ -0,0 +1,26 @@
+module Metaractor
+  class Error < StandardError; end
+  class InvalidError < Error; end
+
+  module HandleErrors
+    def fail_with_error!(*args)
+      context.fail_with_error!(*args)
+    end
+
+    def fail_with_errors!(*args)
+      context.fail_with_errors!(*args)
+    end
+
+    def add_error(*args)
+      context.add_error(*args)
+    end
+
+    def add_errors(*args)
+      context.add_errors(*args)
+    end
+
+    def error_messages
+      context.error_messages
+    end
+  end
+end

data/lib/metaractor/parameters.rb

@@ -3,7 +3,7 @@ module Metaractor
     def self.included(base)
       base.extend ClassMethods
       base.class_eval do
-        include Metaractor::Errors
+        include Metaractor::HandleErrors
 
         class << self
           attr_writer :_required_parameters

data/lib/metaractor/spec.rb

@@ -0,0 +1,74 @@
+require 'metaractor'
+require 'forwardable'
+
+module Metaractor
+  module Spec
+    module Helpers
+      def context_creator(error_message: nil, error_messages: [], errors: [], valid: nil, invalid: nil, success: nil, failure: nil, **attributes)
+        if error_message.present?
+          error_messages << error_message
+        end
+
+        result = Interactor::Context.build(attributes)
+        result.add_errors(messages: error_messages)
+        result.add_errors(errors: errors)
+
+        if (valid != nil && !valid) || (invalid != nil && invalid)
+          result.invalidate!
+        end
+
+        if !result.errors.empty? ||
+            result.invalid? ||
+            (success != nil && !success) ||
+            (failure != nil && failure)
+          result.fail! rescue Interactor::Failure
+        end
+
+        result
+      end
+    end
+
+    module Matchers
+      def include_errors(*expected)
+        Metaractor::Spec::Matchers::IncludeErrors.new(*expected)
+      end
+
+      class IncludeErrors
+        extend Forwardable
+
+        def initialize(*expected)
+          @expected = expected
+          @include = RSpec::Matchers::BuiltIn::Include.new(*@expected)
+        end
+
+        def matches?(actual)
+          @actual = actual
+          @include.matches?(full_messages)
+        end
+
+        def does_not_match?(actual)
+          @actual = actual
+          @include.does_not_match?(full_messages)
+        end
+
+        def at_path(*path)
+          @path = path
+          self
+        end
+
+        def_delegators :@include, :description, :failure_message, :failure_message_when_negated, :diffable?, :actual, :expected
+
+        private
+
+        def full_messages
+          if @path
+            @actual.errors.full_messages_for(*@path)
+          else
+            @actual.errors.full_messages
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/metaractor/version.rb

@@ -1,3 +1,3 @@
 module Metaractor
-  VERSION = "1.2.1"
+  VERSION = "2.0.0"
 end

data/metaractor.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'interactor', '~> 3.1'
+  spec.add_runtime_dependency 'sycamore', '~> 0.3'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.4'
+  spec.add_development_dependency 'bundler', '~> 2'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaractor
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interactor
@@ -24,48 +24,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: sycamore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.9'
 description: 
 email:
 - ryan@outstand.com
@@ -89,8 +103,10 @@ files:
 - lib/metaractor/context_validity.rb
 - lib/metaractor/errors.rb
 - lib/metaractor/fail_from_context.rb
+- lib/metaractor/handle_errors.rb
 - lib/metaractor/parameters.rb
 - lib/metaractor/run_with_context.rb
+- lib/metaractor/spec.rb
 - lib/metaractor/version.rb
 - metaractor.gemspec
 homepage: https://github.com/outstand/metaractor