metaractor 3.3.0 → 3.3.3

data/lib/metaractor/errors.rb

@@ -1,5 +1,5 @@
-require 'sycamore'
-require 'forwardable'
+require "sycamore"
+require "forwardable"
 module Metaractor
   class Errors
     extend Forwardable
@@ -21,15 +21,15 @@ module Metaractor
 
             names = object.class.i18n_parent_names
             until names.empty?
-              defaults << ['errors', names.join('.'), 'parameters', path_elements.join('.'), @value.to_s].reject do |item|
-                item.nil? || item == ''
-              end.join('.').to_sym
+              defaults << ["errors", names.join("."), "parameters", path_elements.join("."), @value.to_s].reject do |item|
+                item.nil? || item == ""
+              end.join(".").to_sym
               names.pop
             end
           end
 
           unless path_elements.empty?
-            defaults << :"errors.parameters.#{path_elements.join('.')}.#{@value}"
+            defaults << :"errors.parameters.#{path_elements.join(".")}.#{@value}"
           end
           defaults << :"errors.parameters.#{@value}"
 
@@ -41,18 +41,18 @@ module Metaractor
             parameter: path_elements.last
           )
         else
-          "#{path_elements.join('.')} #{@value}".lstrip
+          "#{path_elements.join(".")} #{@value}".lstrip
         end
       end
 
       def ==(other)
-        if other.is_a?(self.class)
-          @value == other.value
+        @value == if other.is_a?(self.class)
+          other.value
         else
-          @value == other
+          other
         end
       end
-      alias eql? ==
+      alias_method :eql?, :==
 
       def hash
         @value.hash
@@ -73,10 +73,10 @@ module Metaractor
       trees = []
       [error, errors].each do |h|
         tree = nil
-        if h.is_a? Metaractor::Errors
-          tree = Sycamore::Tree.from(h.instance_variable_get(:@tree))
+        tree = if h.is_a? Metaractor::Errors
+          Sycamore::Tree.from(h.instance_variable_get(:@tree))
         else
-          tree = Sycamore::Tree.from(normalize_error_hash(h))
+          Sycamore::Tree.from(normalize_error_hash(h))
         end
 
         unless tree.empty?
@@ -112,7 +112,7 @@ module Metaractor
 
       messages
     end
-    alias to_a full_messages
+    alias_method :to_a, :full_messages
 
     def full_messages_for(*path)
       child_tree = @tree.fetch_path(path)
@@ -133,19 +133,17 @@ module Metaractor
         unwrapped_tree(result).to_h
       end
     end
-    alias [] dig
+    alias_method :[], :dig
 
     def include?(*elements)
       if elements.size == 1 &&
           elements.first.is_a?(Hash)
         unwrapped_tree.include?(*elements)
+      elsif elements.all? { |e| e.is_a? String }
+        full_messages.include?(*elements)
       else
-        if elements.all? {|e| e.is_a? String }
-          full_messages.include?(*elements)
-        else
-          elements.all? do |element|
-            @tree.include_path?(element)
-          end
+        elements.all? do |element|
+          @tree.include_path?(element)
         end
       end
     end
@@ -169,12 +167,12 @@ module Metaractor
         @tree.to_h
       end
     end
-    alias to_hash to_h
+    alias_method :to_hash, :to_h
 
     def inspect
       str = "<##{self.class.name}: "
 
-      if !self.empty?
+      if !empty?
         str << "Errors:\n"
         str << Metaractor.format_hash(to_h(unwrap: false))
         str << "\n"

data/lib/metaractor/failure_output.rb

@@ -1,7 +1,7 @@
 module Metaractor
   module FailureOutput
     def to_s
-      str = ''
+      str = ""
 
       if !context.errors.empty?
         str << "Errors:\n"
@@ -19,7 +19,7 @@ module Metaractor
       end
 
       str << "Context:\n"
-      str << Metaractor.format_hash(context.to_h.reject{|k,_| k == :errors})
+      str << Metaractor.format_hash(context.to_h.except(:errors))
       str
     end
   end

data/lib/metaractor/handle_errors.rb

@@ -1,5 +1,6 @@
 module Metaractor
   class Error < StandardError; end
+
   class InvalidError < Error; end
 
   module HandleErrors

data/lib/metaractor/namespace.rb

@@ -11,7 +11,7 @@ module Metaractor
         if defined?(@parent_name)
           @parent_name
         else
-          parent_name = name =~ /::[^:]+\z/ ? -$` : nil
+          parent_name = (name =~ /::[^:]+\z/) ? -$` : nil
           @parent_name = parent_name unless frozen?
           parent_name
         end
@@ -26,7 +26,7 @@ module Metaractor
       end
 
       def i18n_parent_names
-        module_parent_names.map {|name| underscore_module_name(name).to_sym }
+        module_parent_names.map { |name| underscore_module_name(name).to_sym }
       end
 
       private
@@ -40,7 +40,6 @@ module Metaractor
         word.downcase!
         word
       end
-
     end
   end
 end

data/lib/metaractor/organizer.rb

@@ -0,0 +1,10 @@
+module Metaractor
+  module Organizer
+    def self.included(base)
+      base.class_eval do
+        include Metaractor
+        include Interactor::Organizer
+      end
+    end
+  end
+end

data/lib/metaractor/parameters.rb

@@ -31,7 +31,7 @@ module Metaractor
       def <=>(other)
         return nil unless other.instance_of? self.class
         return nil if name == other.name && options != other.options
-        self.name.to_s <=> other.name.to_s
+        name.to_s <=> other.name.to_s
       end
 
       def [](key)
@@ -59,16 +59,17 @@ module Metaractor
       end
 
       protected
+
       attr_reader :options
     end
 
     module ClassMethods
       def parameter(name, **options)
-        if param = self.parameter_hash[name.to_sym]
+        if (param = parameter_hash[name.to_sym])
           param.merge!(**options)
         else
           Parameter.new(name, **options).tap do |parameter|
-            self.parameter_hash[parameter.name] = parameter
+            parameter_hash[parameter.name] = parameter
           end
         end
       end
@@ -90,7 +91,7 @@ module Metaractor
       def required(*params, **options)
         if params.empty?
           tree = options
-          self.requirement_trees << tree
+          requirement_trees << tree
           parameters(*parameters_in_tree(tree), required: tree)
         else
           parameters(*params, required: true, **options)
@@ -103,7 +104,7 @@ module Metaractor
 
       def validate_parameters(*hooks, &block)
         hooks << block if block
-        hooks.each {|hook| validate_hooks.push(hook) }
+        hooks.each { |hook| validate_hooks.push(hook) }
       end
 
       def validate_hooks
@@ -112,7 +113,7 @@ module Metaractor
 
       def parameters_in_tree(tree)
         if tree.respond_to?(:to_h)
-          tree.to_h.values.first.to_a.flat_map {|t| parameters_in_tree(t)}
+          tree.to_h.values.first.to_a.flat_map { |t| parameters_in_tree(t) }
         else
           [tree]
         end
@@ -128,7 +129,7 @@ module Metaractor
     end
 
     def requirement_trees=(trees)
-      self.class.requirement_trees=(trees)
+      self.class.requirement_trees = (trees)
     end
 
     def remove_blank_values
@@ -156,12 +157,14 @@ module Metaractor
     end
 
     def _parameter_default(name)
-      default = self.parameters[name][:default]
+      default = parameters[name][:default]
 
-      case
-      when default.respond_to?(:call) then instance_exec(&default)
-      when default.respond_to?(:dup) then default.dup
-      else default
+      if default.respond_to?(:call)
+        instance_exec(&default)
+      elsif default.respond_to?(:dup)
+        default.dup
+      else
+        default
       end
     end
 
@@ -169,7 +172,7 @@ module Metaractor
       parameters.each do |name, parameter|
         next unless parameter[:type]
 
-        if context.has_key?(name) && context[name] != nil
+        if context.has_key?(name) && !context[name].nil?
           callable = parameter[:type]
 
           if callable.is_a?(Symbol)
@@ -206,7 +209,7 @@ module Metaractor
       valid, message = parameter_valid? param
 
       if !valid
-        if message_override != nil
+        if !message_override.nil?
           add_parameter_error(param: param, message: message_override)
         else
           add_parameter_error(message: "Required parameters: #{message}")
@@ -234,16 +237,16 @@ module Metaractor
 
         case operator
         when :or
-          return valids.any?, "(#{messages.join(' or ')})"
+          [valids.any?, "(#{messages.join(" or ")})"]
         when :xor
-          return valids.one?, "(#{messages.join(' xor ')})"
+          [valids.one?, "(#{messages.join(" xor ")})"]
         when :and
-          return valids.all?, "(#{messages.join(' and ')})"
+          [valids.all?, "(#{messages.join(" and ")})"]
         else
           raise "invalid required parameter #{param.inspect}"
         end
       else
-        return context[param] != nil, param.to_s
+        [!context[param].nil?, param.to_s]
       end
     end
 
@@ -256,7 +259,7 @@ module Metaractor
       run_hooks(self.class.validate_hooks)
     end
 
-    def add_parameter_error(param: nil, message:)
+    def add_parameter_error(message:, param: nil)
       add_error(
         message: "#{param} #{message}".lstrip
       )

data/lib/metaractor/spec.rb

@@ -1,5 +1,5 @@
-require 'metaractor'
-require 'forwardable'
+require "metaractor"
+require "forwardable"
 
 module Metaractor
   module Spec
@@ -13,15 +13,19 @@ module Metaractor
         result.add_errors(messages: error_messages)
         result.add_errors(errors: errors)
 
-        if (valid != nil && !valid) || (invalid != nil && invalid)
+        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
+            (!success.nil? && !success) ||
+            (!failure.nil? && failure)
+          begin
+            result.fail!
+          rescue
+            Interactor::Failure
+          end
         end
 
         result
@@ -69,6 +73,5 @@ module Metaractor
         end
       end
     end
-
   end
 end

data/lib/metaractor/version.rb

@@ -1,3 +1,3 @@
 module Metaractor
-  VERSION = "3.3.0"
+  VERSION = "3.3.3"
 end

data/lib/metaractor.rb

@@ -1,17 +1,18 @@
-require 'metaractor/version'
-require 'interactor'
-require 'metaractor/errors'
-require 'metaractor/handle_errors'
-require 'metaractor/context_errors'
-require 'metaractor/parameters'
-require 'metaractor/run_with_context'
-require 'metaractor/context_validity'
-require 'metaractor/chain_failures'
-require 'metaractor/fail_from_context'
-require 'metaractor/context_has_key'
-require 'metaractor/failure_output'
-require 'i18n'
-require 'metaractor/namespace'
+require "metaractor/version"
+require "interactor"
+require "metaractor/errors"
+require "metaractor/handle_errors"
+require "metaractor/context_errors"
+require "metaractor/parameters"
+require "metaractor/run_with_context"
+require "metaractor/context_validity"
+require "metaractor/chain_failures"
+require "metaractor/fail_from_context"
+require "metaractor/context_has_key"
+require "metaractor/failure_output"
+require "i18n"
+require "metaractor/namespace"
+require "metaractor/organizer"
 
 module Metaractor
   def self.included(base)
@@ -42,20 +43,20 @@ module Metaractor
 
   def self.default_modules
     [
-      { module: Metaractor::HandleErrors, method: :include },
-      { module: Metaractor::Parameters, method: :include },
-      { module: Metaractor::RunWithContext, method: :include },
-      { module: Metaractor::ChainFailures, method: :include },
-      { module: Metaractor::Namespace, method: :include }
+      {module: Metaractor::HandleErrors, method: :include},
+      {module: Metaractor::Parameters, method: :include},
+      {module: Metaractor::RunWithContext, method: :include},
+      {module: Metaractor::ChainFailures, method: :include},
+      {module: Metaractor::Namespace, method: :include}
     ]
   end
 
   def self.include_module(mod)
-    modules << { module: mod, method: :include }
+    modules << {module: mod, method: :include}
   end
 
   def self.prepend_module(mod)
-    modules << { module: mod, method: :prepend }
+    modules << {module: mod, method: :prepend}
   end
 
   def self.format_hash(hash)
@@ -67,7 +68,7 @@ module Metaractor
   end
 
   def self.default_hash_formatter
-    ->(hash){ hash.inspect }
+    ->(hash) { hash.inspect }
   end
 
   def self.hash_formatter

data/metaractor.gemspec

@@ -1,34 +1,33 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'metaractor/version'
+require "metaractor/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'metaractor'
-  spec.version       = Metaractor::VERSION
-  spec.license       = 'Apache-2.0'
-  spec.authors       = ['Ryan Schlesinger']
-  spec.email         = ['ryan@outstand.com']
+  spec.name = "metaractor"
+  spec.version = Metaractor::VERSION
+  spec.license = "Apache-2.0"
+  spec.authors = ["Ryan Schlesinger"]
+  spec.email = ["ryan@ryanschlesinger.com"]
 
-  spec.summary       = %q{Adds parameter validation and error control to interactor}
-  spec.metadata      = {
-    "homepage_uri" => "https://github.com/outstand/metaractor",
-    "source_code_uri" => "https://github.com/outstand/metaractor"
+  spec.summary = "Adds parameter validation and error control to interactor"
+  spec.metadata = {
+    "homepage_uri" => "https://github.com/metaractor/metaractor",
+    "source_code_uri" => "https://github.com/metaractor/metaractor"
   }
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'interactor', '~> 3.1'
-  spec.add_runtime_dependency 'outstand-sycamore', '0.4.0'
-  spec.add_runtime_dependency 'i18n', '~> 1.8'
+  spec.add_runtime_dependency "interactor", "~> 3.1"
+  spec.add_runtime_dependency "metaractor-sycamore", "~> 0.4", ">= 0.4.3"
+  spec.add_runtime_dependency "i18n", "~> 1.8"
 
-  spec.add_development_dependency 'bundler', '~> 2'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'awesome_print', '~> 1.8'
-  spec.add_development_dependency 'pry-byebug', '~> 3.9'
-  spec.add_development_dependency 'activemodel', '~> 6.1'
+  spec.add_development_dependency "bundler", "~> 2"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.9"
+  spec.add_development_dependency "awesome_print", "~> 1.8"
+  spec.add_development_dependency "pry-byebug", "~> 3.9"
+  spec.add_development_dependency "activemodel", "~> 6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaractor
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.3
 platform: ruby
 authors:
 - Ryan Schlesinger
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-26 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interactor
@@ -25,19 +25,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: outstand-sycamore
+  name: metaractor-sycamore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -136,25 +142,24 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.1'
-description: 
+description:
 email:
-- ryan@outstand.com
+- ryan@ryanschlesinger.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".buildkite/pipeline.yml"
+- ".envrc"
+- ".github/workflows/specs.yml"
 - ".gitignore"
 - ".rspec"
-- Deskfile
-- Dockerfile
+- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- brew-shim
-- compose.yml
-- docker-entrypoint.sh
+- flake.lock
+- flake.nix
 - lib/metaractor.rb
 - lib/metaractor/chain_failures.rb
 - lib/metaractor/context_errors.rb
@@ -165,18 +170,19 @@ files:
 - lib/metaractor/failure_output.rb
 - lib/metaractor/handle_errors.rb
 - lib/metaractor/namespace.rb
+- lib/metaractor/organizer.rb
 - lib/metaractor/parameters.rb
 - lib/metaractor/run_with_context.rb
 - lib/metaractor/spec.rb
 - lib/metaractor/version.rb
 - metaractor.gemspec
-homepage: 
+homepage:
 licenses:
 - Apache-2.0
 metadata:
-  homepage_uri: https://github.com/outstand/metaractor
-  source_code_uri: https://github.com/outstand/metaractor
-post_install_message: 
+  homepage_uri: https://github.com/metaractor/metaractor
+  source_code_uri: https://github.com/metaractor/metaractor
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,8 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Adds parameter validation and error control to interactor
 test_files: []