metaractor 3.3.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a67b3860db00780ce1c03f5c551fdb7bbace32bdd7e16d6adabadb541516cb0
-  data.tar.gz: 2c24a4a91199c196eae047b09830891ff5ea3c0fd2e2d734acfe57059775fc74
+  metadata.gz: cbcfbfe6d5747efa204a9b2213e1b25a1579ab80d6ea200b73d66af38e4da26c
+  data.tar.gz: 96523e7f340d36266de4a3e4170c2a400cf847c153897806e62d10853ca5986b
 SHA512:
-  metadata.gz: 40fdf35588580edf4b57e719958bad16f6dece4e74fd7a4c202c03a3aab47c6c7647fe90c2152a84eb6e8fd20a1bafd84e137efea9676cbd75966b39f22cacff
-  data.tar.gz: 30fdcf53265820b0e510823730ed027e64171316f757b4047b304ba7f9a1bcc9e95b63016114ee4f2807c2a7a1cb94fc8779ecbb9adca47fd4ea8c0a17fa5245
+  metadata.gz: 87493268ef51c78e87e19fd2afec14ee0338602a39ded8a58ec1045afa1f0b334908fe3bcddb08f7c3197fb4a64d6a3954a25f38e0879dfd03d4f76e8404ddf3
+  data.tar.gz: 27dc794eea32848f07a7ae6c75173d18ff4ccce2a8a0485a0579043cf5b485ca5d7fdf9379d2a8e6a9fbc835d59759a4dc5f57379793a32c99a0144dd593dc6c

data/.envrc

@@ -0,0 +1,3 @@
+source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
+
+use devenv

data/.github/workflows/specs.yml

@@ -0,0 +1,13 @@
+name: Specs
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rspec spec

data/.gitignore

@@ -7,3 +7,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+# Devenv
+.devenv*
+devenv.local.nix
+.direnv*

data/.rspec

@@ -1,4 +1,3 @@
 --color
 --require spec_helper
 --format progress
---format RSpec::Buildkite::AnnotationFormatter

data/.ruby-version

@@ -0,0 +1 @@
+3.2.2

data/Gemfile

@@ -1,4 +1,3 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
-gem 'rspec-buildkite', github: 'outstand/rspec-buildkite', branch: 'error-output'

data/README.md

@@ -1,4 +1,5 @@
-# Metaractor [![Build status](https://badge.buildkite.com/70063a5154eb7366b8b7fd65a875c5f64301bc60f6d29a2ad7.svg)](https://buildkite.com/outstand/metaractor)
+![logo-color](https://user-images.githubusercontent.com/146013/225313017-ea1e42d6-741d-4db6-a492-a1e75106d720.png)
+
 Adds parameter validation and error control to [interactor](https://github.com/collectiveidea/interactor).
 
 ## Installation
@@ -54,7 +55,7 @@ See Interactor's [README](https://github.com/collectiveidea/interactor/blob/mast
 Metaractor is meant to be extensible (hence the 'meta').  You can add additional modules in the following way:
 
 ```ruby
-# This is an example from Outstand's production app to add some sidekiq magic.
+# This is an example from a production app to add some sidekiq magic.
 # Feel free to place this in start up code or a Rails initializer.
 Metaractor.configure do |config|
   config.prepend_module Metaractor::SidekiqCallbacks
@@ -358,5 +359,5 @@ To release a new version:
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/outstand/metaractor.
+Bug reports and pull requests are welcome on GitHub at https://github.com/metaractor/metaractor.
 

data/Rakefile

@@ -1,2 +1,2 @@
 require "bundler/gem_tasks"
-task :default => :spec
+task default: :spec

data/devenv.lock

@@ -0,0 +1,210 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1686054274,
+        "narHash": "sha256-93aebyN7EMmeFFXisFIvp28UEbrozu79vd3pKPjvNR0=",
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "c51a56bac8853c019241fe8d821c0a0d82422835",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1660459072,
+        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1685938391,
+        "narHash": "sha256-96Jw6TbWDLSopt5jqCW8w1Fc1cjQyZlhfBnJ3OZGpME=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "31cd1b4afbaf0b1e81272ee9c31d1ab606503aed",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-ruby": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1685159223,
+        "narHash": "sha256-rwHYapZEvxDJ8dw3hMGY/AE9c6qls9CifAUvObnx7e0=",
+        "owner": "bobvanderlinden",
+        "repo": "nixpkgs-ruby",
+        "rev": "dfaf58567eda18bad5340a9432e601d96c497943",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bobvanderlinden",
+        "repo": "nixpkgs-ruby",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1685801374,
+        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1686050334,
+        "narHash": "sha256-R0mczWjDzBpIvM3XXhO908X5e2CQqjyh/gFbwZk/7/Q=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "6881eb2ae5d8a3516e34714e7a90d9d95914c4dc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-ruby": "nixpkgs-ruby",
+        "pre-commit-hooks": "pre-commit-hooks"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

data/devenv.nix

@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+
+{
+  # https://devenv.sh/packages/
+  packages = with pkgs; [
+    git
+  ];
+
+  # https://devenv.sh/languages/
+  languages.ruby.enable = true;
+  # Uses bobvanderlinden/nixpkgs-ruby to supply any version of ruby
+  languages.ruby.versionFile = ./.ruby-version;
+
+  enterShell = ''
+    export BUNDLE_BIN="$DEVENV_ROOT/.devenv/bin"
+    export PATH="$DEVENV_PROFILE/bin:$DEVENV_ROOT/bin:$BUNDLE_BIN:$PATH"
+    export BOOTSNAP_CACHE_DIR="$DEVENV_ROOT/.devenv/state"
+  '';
+
+  # The unix socket path can't be "too long".
+  # Make sure it's short for when we need it.
+  env.RUBY_DEBUG_SOCK_DIR = "/tmp/";
+
+  # See full reference at https://devenv.sh/reference/options/
+}

data/devenv.yaml

@@ -0,0 +1,8 @@
+inputs:
+  nixpkgs:
+    url: github:NixOS/nixpkgs/nixpkgs-unstable
+  nixpkgs-ruby:
+    url: github:bobvanderlinden/nixpkgs-ruby
+    inputs:
+      nixpkgs:
+        follows: nixpkgs

data/lib/metaractor/context_errors.rb

@@ -28,7 +28,7 @@ module Metaractor
 
     def add_errors(messages: [], errors: {}, **args)
       if !messages.empty?
-        self.errors.add(errors: { base: messages }, **args)
+        self.errors.add(errors: {base: messages}, **args)
       else
         self.errors.add(errors: errors, **args)
       end

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/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.2"
 end

data/lib/metaractor.rb

@@ -1,17 +1,17 @@
-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"
 
 module Metaractor
   def self.included(base)
@@ -42,20 +42,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 +67,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.2
 platform: ruby
 authors:
 - Ryan Schlesinger
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-26 00:00:00.000000000 Z
+date: 2023-06-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,25 @@ 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
+- devenv.lock
+- devenv.nix
+- devenv.yaml
 - lib/metaractor.rb
 - lib/metaractor/chain_failures.rb
 - lib/metaractor/context_errors.rb
@@ -170,13 +176,13 @@ files:
 - 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: []

data/.buildkite/pipeline.yml

@@ -1,93 +0,0 @@
-env:
-  BUILDKITE_PLUGIN_DOCKER_CACHE_S3_BUCKET: "outstand-buildkite-cache"
-  # BUILDKITE_PLUGIN_DOCKER_CACHE_VOLUME_DEBUG: "true"
-  BUILDKITE_PLUGIN_DOCKER_COMPOSE_SHELL: "false"
-  # BUILDKITE_PLUGIN_DOCKER_COMPOSE_UPLOAD_CONTAINER_LOGS: "always"
-  BUILDKITE_PLUGIN_DOCKER_COMPOSE_PULL_RETRIES: 5
-  BUILDKITE_PLUGIN_DOCKER_COMPOSE_PUSH_RETRIES: 5
-  PLUGIN_DOCKER_COMPOSE_VERSION: "03d746fbf5171b217b732ff7d8a3e417d664df1c"
-  PLUGIN_DOCKER_CACHE_VERSION: "50ecc80f736a4a3a0ab1f5990e58ae8e536c85e1"
-  WORKSPACE_DIR: "${BUILDKITE_BUILD_CHECKOUT_PATH}"
-
-steps:
-  - label: ":docker: Build"
-    key: build
-    plugins:
-      - seek-oss/aws-sm#v2.3.1:
-          env:
-            DOCKER_LOGIN_PASSWORD: "/buildkite/docker_password"
-
-      - docker-login#v2.1.0:
-          username: outstandci
-          retries: 2
-
-      - ecr#v2.5.0:
-          login: true
-          region: "us-east-1"
-
-      - https://github.com/outstand/docker-compose-buildkite-plugin.git#${PLUGIN_DOCKER_COMPOSE_VERSION}:
-          build: metaractor
-          image-repository: 786715713882.dkr.ecr.us-east-1.amazonaws.com/ci-images
-          config:
-            - compose.yml
-
-  - label: ":bundler: :rubygems:"
-    key: bundle_install
-    command: bundle install
-    depends_on: build
-    plugins:
-      - seek-oss/aws-sm#v2.3.1:
-          env:
-            DOCKER_LOGIN_PASSWORD: "/buildkite/docker_password"
-
-      - docker-login#v2.1.0:
-          username: outstandci
-          retries: 2
-
-      - ecr#v2.5.0:
-          login: true
-          region: "us-east-1"
-
-      - https://github.com/outstand/docker-compose-buildkite-plugin.git#${PLUGIN_DOCKER_COMPOSE_VERSION}:
-          run: metaractor
-          dependencies: false
-          config:
-            - compose.yml
-
-      - https://github.com/outstand/docker-cache-buildkite-plugin.git#${PLUGIN_DOCKER_CACHE_VERSION}:
-          name: bundler-cache
-          keys:
-            - v2-bundler-cache-{{ arch }}-{{ checksum "metaractor.gemspec" }}-{{ checksum "Gemfile" }}
-            - v2-bundler-cache-{{ arch }}-
-          save: true
-          volumes:
-            - bundler-data
-
-  - label: ":ruby: Specs"
-    command: rspec spec
-    depends_on: bundle_install
-    plugins:
-      - seek-oss/aws-sm#v2.3.1:
-          env:
-            DOCKER_LOGIN_PASSWORD: "/buildkite/docker_password"
-
-      - docker-login#v2.1.0:
-          username: outstandci
-          retries: 2
-
-      - ecr#v2.5.0:
-          login: true
-          region: "us-east-1"
-
-      - https://github.com/outstand/docker-compose-buildkite-plugin.git#${PLUGIN_DOCKER_COMPOSE_VERSION}:
-          run: metaractor
-          config:
-            - compose.yml
-
-      - https://github.com/outstand/docker-cache-buildkite-plugin.git#${PLUGIN_DOCKER_CACHE_VERSION}:
-          name: bundler-cache
-          keys:
-            - v2-bundler-cache-{{ arch }}-{{ checksum "metaractor.gemspec" }}-{{ checksum "Gemfile" }}
-            - v2-bundler-cache-{{ arch }}-
-          volumes:
-            - bundler-data

data/Deskfile

@@ -1,3 +0,0 @@
-rspec() {
-  docker compose run --rm metaractor rspec "$@"
-}

data/Dockerfile

@@ -1,78 +0,0 @@
-FROM outstand/su-exec:latest as su-exec
-FROM outstand/fixuid as fixuid
-
-FROM ruby:3.1.2-bullseye
-LABEL maintainer="Ryan Schlesinger <ryan@outstand.com>"
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN set -eux; \
-      \
-      groupadd -g 1000 metaractor && \
-      useradd -u 1000 -g metaractor -ms /bin/bash metaractor && \
-      \
-      apt-get update -y; \
-      apt-get install -y \
-        ca-certificates \
-        curl \
-        git \
-        build-essential \
-        tini \
-      ; \
-      apt-get clean; \
-      rm -f /var/lib/apt/lists/*_*
-
-# install su-exec
-COPY --from=su-exec /sbin/su-exec /sbin/su-exec
-
-# install fixuid
-COPY --from=fixuid /usr/local/bin/fixuid /usr/local/bin/fixuid
-RUN set -eux; \
-      \
-      chmod 4755 /usr/local/bin/fixuid; \
-      USER=metaractor; \
-      GROUP=metaractor; \
-      mkdir -p /etc/fixuid; \
-      printf "user: $USER\ngroup: $GROUP\n" > /etc/fixuid/config.yml
-
-ENV BUNDLER_VERSION 2.3.21
-ENV GITHUB_CLI_VERSION 2.14.4
-ENV GITHUB_CLI_CHECKSUM b0073fdcc07d1de5a19a1a782c7ad9f593f991da06a809ea39f0b6148869aa96
-RUN set -eux; \
-      \
-      mkdir -p /tmp/build; \
-      cd /tmp/build; \
-      \
-      gem install bundler -v ${BUNDLER_VERSION} -i /usr/local/lib/ruby/gems/$(ls /usr/local/lib/ruby/gems) --force; \
-      curl -fsSL https://github.com/cli/cli/releases/download/v${GITHUB_CLI_VERSION}/gh_${GITHUB_CLI_VERSION}_linux_amd64.deb -o gh_${GITHUB_CLI_VERSION}_linux_amd64.deb; \
-      echo "${GITHUB_CLI_CHECKSUM}  gh_${GITHUB_CLI_VERSION}_linux_amd64.deb" | sha256sum --check; \
-      apt-get update -y; \
-      apt-get install -y --no-install-recommends \
-        ./gh_${GITHUB_CLI_VERSION}_linux_amd64.deb \
-      ; \
-      apt-get clean; \
-      rm -f /var/lib/apt/lists/*_*; \
-      rm -rf /tmp/build
-
-COPY brew-shim /usr/bin/brew
-
-WORKDIR /metaractor
-RUN set -eux; \
-      \
-      chown -R metaractor:metaractor /metaractor
-
-USER metaractor
-
-COPY --chown=metaractor:metaractor Gemfile metaractor.gemspec /metaractor/
-COPY --chown=metaractor:metaractor lib/metaractor/version.rb /metaractor/lib/metaractor/
-RUN set -eux; \
-      \
-      git config --global push.default simple
-COPY --chown=metaractor:metaractor . /metaractor/
-
-USER root
-COPY docker-entrypoint.sh /docker-entrypoint.sh
-
-ENTRYPOINT ["/usr/bin/tini", "-g", "--", "/docker-entrypoint.sh"]
-CMD ["rspec", "spec"]

data/brew-shim

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-# Docker host has the following git config:
-# helper = !$(brew --prefix)/bin/gh auth git-credential
-#
-# We're going to lie inside the container so we can find the local gh
-
-echo "/usr"

data/compose.yml

@@ -1,35 +0,0 @@
-services:
-  metaractor:
-    build: .
-    image: outstand/metaractor:dev
-    stdin_open: true
-    tty: true
-    environment:
-      FIXUID:
-      FIXGID:
-      BUILDKITE:
-      BUILDKITE_BUILD_URL:
-      BUILDKITE_JOB_ID:
-      BUILDKITE_AGENT_ACCESS_TOKEN:
-    volumes:
-      - bundler-data:/usr/local/bundle
-      - .:/metaractor
-
-  release:
-    image: outstand/metaractor:dev
-    stdin_open: true
-    tty: true
-    command: rake release
-    environment:
-      FIXUID:
-      FIXGID:
-    volumes:
-      - bundler-data:/usr/local/bundle
-      - ~/.gitconfig:/home/metaractor/.gitconfig
-      - ~/.gitconfig.user:/home/metaractor/.gitconfig.user
-      - ~/.config/gh/hosts.yml:/home/metaractor/.config/gh/hosts.yml
-      - ~/.local/share/gem/credentials:/home/metaractor/.local/share/gem/credentials
-      - ~/.local/share/gem/credentials:/home/metaractor/.gem/credentials
-
-volumes:
-  bundler-data:

data/docker-entrypoint.sh

@@ -1,39 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-su-exec ${FIXUID:?Missing FIXUID var}:${FIXGID:?Missing FIXGID var} fixuid
-
-chown_dir() {
-  dir=$1
-  if [[ -d ${dir} ]] && [[ "$(stat -c %u:%g ${dir})" != "${FIXUID}:${FIXGID}" ]]; then
-    echo chown $dir
-    chown metaractor:metaractor $dir
-  fi
-}
-
-chown_dir /usr/local/bundle
-chown_dir /home/metaractor/.local/share/gem
-chown_dir /home/metaractor/.gem
-
-if [ "$(which "$1")" = '' ]; then
-  if [ "$(ls -A /usr/local/bundle/bin)" = '' ]; then
-    echo 'command not in path and bundler not initialized'
-    echo 'running bundle install'
-    su-exec metaractor bundle install
-  fi
-fi
-
-if [ "$1" = 'bundle' ]; then
-  set -- su-exec metaractor "$@"
-elif [ "$1" = 'rake' ]; then
-  set -- su-exec metaractor bundle exec "$@"
-
-  su-exec metaractor bash -c 'bundle check || bundle install'
-elif ls /usr/local/bundle/bin | grep -q "\b$1\b"; then
-  set -- su-exec metaractor bundle exec "$@"
-
-  su-exec metaractor bash -c 'bundle check || bundle install'
-fi
-
-exec "$@"