pathway 0.12.3 → 1.1.0

data/lib/pathway.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'ruby2_keywords'
 require 'forwardable'
 require 'dry/inflector'
 require 'contextualizer'
@@ -11,7 +10,7 @@ module Pathway
   Inflector = Dry::Inflector.new
   class Operation
     class << self
-      ruby2_keywords def plugin(name, *args)
+      def plugin(name,...)
         require "pathway/plugins/#{Inflector.underscore(name)}" if name.is_a?(Symbol)
 
         plugin = name.is_a?(Module) ? name : Plugins.const_get(Inflector.camelize(name))
@@ -20,7 +19,7 @@ module Pathway
         self.include plugin::InstanceMethods if plugin.const_defined? :InstanceMethods
         self::DSL.include plugin::DSLMethods if plugin.const_defined? :DSLMethods
 
-        plugin.apply(self, *args) if plugin.respond_to?(:apply)
+        plugin.apply(self,...) if plugin.respond_to?(:apply)
       end
 
       def inherited(subclass)
@@ -45,13 +44,8 @@ module Pathway
       @details = details || {}
     end
 
-    def deconstruct
-      [type, message, details]
-    end
-
-    def deconstruct_keys(_)
-      { type: type, message: message, details: details }
-    end
+    def deconstruct = [type, message, details]
+    def deconstruct_keys(_) = { type:, message:, details: }
 
     private
 
@@ -62,35 +56,29 @@ module Pathway
 
   class State
     extend Forwardable
+    delegate %i([] []= fetch store include? values_at deconstruct_keys) => :@hash
 
     def initialize(operation, values = {})
       @hash = operation.context.merge(values)
       @result_key = operation.result_key
     end
 
-    delegate %i([] []= fetch store include? values_at deconstruct_keys) => :@hash
-
     def update(kargs)
       @hash.update(kargs)
       self
     end
 
-    def result
-      @hash[@result_key]
-    end
-
-    def to_hash
-      @hash
-    end
+    def result = @hash[@result_key]
+    def to_hash = @hash
 
     def use(&bl)
       raise ArgumentError, 'a block must be provided' if !block_given?
-      if bl.parameters.any? {|(type,_)| type == :keyrest || type == :rest }
+      if bl.parameters in [*, [:rest|:keyrest,], *]
         raise ArgumentError, 'rest arguments are not supported'
       end
 
-      keys = bl.parameters.select {|(type,_)| type == :key || type == :keyreq }.map(&:last)
-      names = bl.parameters.select {|(type,_)| type == :req || type == :opt }.map(&:last)
+      keys = bl.parameters.select { _1 in :key|:keyreq, }.map(&:last)
+      names = bl.parameters.select { _1 in :req|:opt, }.map(&:last)
 
       if keys.any? && names.any?
         raise ArgumentError, 'cannot mix positional and keyword arguments'
@@ -110,20 +98,18 @@ module Pathway
     module Base
       module ClassMethods
         attr_accessor :result_key
-        alias :result_at :result_key=
 
-        def process(&bl)
-          dsl = self::DSL
+        alias_method :result_at, :result_key=
+
+        def process(&steps)
           define_method(:call) do |input|
-            dsl.new(State.new(self, input: input), self)
-               .run(&bl)
+            _dsl_for(input:)
+               .run(&steps)
                .then(&:result)
           end
         end
 
-        ruby2_keywords def call(ctx, *params)
-          new(ctx).call(*params)
-        end
+        def call(ctx,...) = new(ctx).call(...)
 
         def inherited(subclass)
           super
@@ -137,19 +123,21 @@ module Pathway
         delegate :result_key => 'self.class'
         delegate %i[result success failure] => Result
 
-        alias :wrap :result
+        alias_method :wrap, :result
 
-        def call(*)
-          fail 'must implement at subclass'
-        end
+        def call(*) = raise 'must implement at subclass'
 
         def error(type, message: nil, details: nil)
-          failure(Error.new(type: type, message: message, details: details))
+          failure(Error.new(type:, message:, details:))
         end
 
         def wrap_if_present(value, type: :not_found, message: nil, details: {})
-          value.nil? ? error(type, message: message, details: details) : success(value)
+          value.nil? ? error(type, message:, details:) : success(value)
         end
+
+        private
+
+        def _dsl_for(vals) = self.class::DSL.new(State.new(self, vals), self)
       end
 
       def self.apply(klass)
@@ -162,51 +150,48 @@ module Pathway
           @result, @operation = wrap(state), operation
         end
 
-        def run(&bl)
-          instance_eval(&bl)
+        def run(&steps)
+          instance_eval(&steps)
           @result
         end
 
         # Execute step and preserve the former state
-        ruby2_keywords def step(callable, *args)
+        def step(callable,...)
           bl = _callable(callable)
-
-          @result = @result.tee { |state| bl.call(state, *args) }
+          @result = @result.tee { |state| bl.call(state,...) }
         end
 
         # Execute step and modify the former state setting the key
-        def set(callable, *args, to: @operation.result_key)
+        def set(callable, *args, to: @operation.result_key, **kwargs, &bl)
           bl = _callable(callable)
 
           @result = @result.then do |state|
-            wrap(bl.call(state, *args))
+            wrap(bl.call(state, *args, **kwargs, &bl))
               .then { |value| state.update(to => value) }
           end
         end
 
         # Execute step and replace the current state completely
-        def map(callable)
+        def map(callable,...)
           bl = _callable(callable)
-          @result = @result.then(bl)
+          @result = @result.then { |state| bl.call(state,...) }
         end
 
-        def around(wrapper, &steps)
+        def around(execution_strategy, &steps)
           @result.then do |state|
-            seq = -> (dsl = self) { @result = dsl.run(&steps) }
-            _callable(wrapper).call(seq, state)
+            steps_runner = ->(dsl = self) { dsl.run(&steps) }
+
+            _callable(execution_strategy).call(steps_runner, state)
           end
         end
 
         def if_true(cond, &steps)
           cond = _callable(cond)
-          around(-> seq, state {
-            seq.call if cond.call(state)
-          }, &steps)
+          around(->(runner, state) { runner.call if cond.call(state) }, &steps)
         end
 
         def if_false(cond, &steps)
-          cond = _callable(cond)
-          if_true(-> state { !cond.call(state) }, &steps)
+          if_true(_callable(cond) >> :!.to_proc, &steps)
         end
 
         alias_method :sequence, :around
@@ -214,16 +199,14 @@ module Pathway
 
         private
 
-        def wrap(obj)
-          Result.result(obj)
-        end
+        def wrap(obj) = Result.result(obj)
 
         def _callable(callable)
           case callable
-          when Proc
-            -> *args { @operation.instance_exec(*args, &callable) }.ruby2_keywords
+          when Proc # unless (callable.binding rescue nil)&.receiver == @operation
+            ->(*args, **kwargs) { @operation.instance_exec(*args, **kwargs, &callable) }
           when Symbol
-            -> *args { @operation.send(callable, *args) }.ruby2_keywords
+            ->(*args, **kwargs) { @operation.send(callable, *args, **kwargs) }
           else
             callable
           end

data/pathway.gemspec

@@ -27,13 +27,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 3.2.0"
 
   spec.add_dependency "dry-inflector", ">= 0.1.0"
-  spec.add_dependency "contextualizer", "~> 0.0.4"
-  spec.add_dependency "ruby2_keywords"
+  spec.add_dependency "contextualizer", "~> 0.1.0"
 
-  spec.add_development_dependency "dry-validation", ">= 0.11"
+  spec.add_development_dependency "dry-validation", ">= 1.0"
   spec.add_development_dependency "bundler", ">= 2.4.10"
   spec.add_development_dependency "sequel", "~> 5.0"
   spec.add_development_dependency "rake", "~> 13.0"
@@ -41,6 +40,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov-lcov", '~> 0.8.0'
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "reline"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "pry-doc"
   spec.add_development_dependency "pry-stack"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pathway
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Pablo Herrero
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -30,42 +29,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
-- !ruby/object:Gem::Dependency
-  name: ruby2_keywords
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +149,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: reline
+  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: byebug
+  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: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -221,18 +234,33 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/bundle
 - bin/byebug
+- bin/coderay
 - bin/console
+- bin/erb
+- bin/htmldiff
+- bin/irb
+- bin/ldiff
+- bin/pry
 - bin/rake
+- bin/rbs
+- bin/rdbg
+- bin/rdoc
+- bin/ri
 - bin/rspec
+- bin/ruby-lsp
+- bin/ruby-lsp-check
+- bin/ruby-lsp-launcher
+- bin/ruby-lsp-test-exec
+- bin/sequel
 - bin/setup
+- bin/yard
+- bin/yardoc
+- bin/yri
 - lib/pathway.rb
 - lib/pathway/plugins/auto_deconstruct_state.rb
-- lib/pathway/plugins/auto_deconstruct_state/ruby3.rb
 - lib/pathway/plugins/dry_validation.rb
-- lib/pathway/plugins/dry_validation/v0_11.rb
-- lib/pathway/plugins/dry_validation/v0_12.rb
-- lib/pathway/plugins/dry_validation/v1_0.rb
 - lib/pathway/plugins/responder.rb
 - lib/pathway/plugins/sequel_models.rb
 - lib/pathway/plugins/simple_auth.rb
@@ -254,7 +282,6 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/pabloh/pathway/issues
   source_code_uri: https://github.com/pabloh/pathway
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -262,15 +289,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Define your business logic in simple steps.
 test_files: []

data/lib/pathway/plugins/auto_deconstruct_state/ruby3.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Pathway
-  module Plugins
-    module AutoDeconstructState
-      module DSLMethods
-        private
-
-        def _callable(callable)
-          if callable.is_a?(Symbol) && @operation.respond_to?(callable, true) &&
-            @operation.method(callable).arity != 0 &&
-            @operation.method(callable).parameters.all? { _1 in [:key|:keyreq|:keyrest|:block,*] }
-
-            -> state { @operation.send(callable, **state) }
-          else
-            super
-          end
-        end
-      end
-    end
-  end
-end

data/lib/pathway/plugins/dry_validation/v0_11.rb

@@ -1,96 +0,0 @@
-# frozen_string_literal: true
-
-module Pathway
-  module Plugins
-    module DryValidation
-      module V0_11
-        module ClassMethods
-          attr_reader :form_class, :form_options
-          attr_accessor :auto_wire
-
-          alias_method :auto_wire_options, :auto_wire
-          alias_method :auto_wire_options=, :auto_wire=
-
-          def form(base = nil, **opts, &block)
-            if block_given?
-              base ||= _base_form
-              self.form_class = _block_definition(base, opts, &block)
-            elsif base
-              self.form_class = _form_class(base)
-            else
-              raise ArgumentError, 'Either a form class or a block must be provided'
-            end
-          end
-
-          def form_class= klass
-            @builded_form = klass.options.empty? ? klass.new : nil
-            @form_class = klass
-            @form_options = klass.options.keys
-          end
-
-          def build_form(opts = {})
-            @builded_form || form_class.new(opts)
-          end
-
-          def inherited(subclass)
-            super
-            subclass.form_class = form_class
-            subclass.auto_wire  = auto_wire
-          end
-
-          private
-
-          def _base_form
-            superclass.respond_to?(:form_class) ? superclass.form_class : Dry::Validation::Schema::Form
-          end
-
-          def _form_class(form)
-            form.is_a?(Class) ? form : form.class
-          end
-
-          def _form_opts(opts = {})
-            opts.merge(build: false)
-          end
-
-          def _block_definition(base, opts, &block)
-            Dry::Validation.Form(_form_class(base), _form_opts(opts), &block)
-          end
-        end
-
-        module InstanceMethods
-          extend Forwardable
-
-          delegate %i[build_form form_options auto_wire_options] => 'self.class'
-          delegate %i[build_form form_options auto_wire_options auto_wire] => 'self.class'
-          alias_method :form, :build_form
-
-          def validate(state, with: nil)
-            if auto_wire && form_options.any?
-              with ||= form_options.zip(form_options).to_h
-            end
-            opts = Hash(with).map { |opt, key| [opt, state[key]] }.to_h
-            validate_with(state[:input], opts)
-              .then { |params| state.update(params: params) }
-          end
-
-          def validate_with(params, opts = {})
-            val = form(opts).call(params)
-
-            val.success? ? wrap(val.output) : error(:validation, details: val.messages)
-          end
-        end
-
-        def self.apply(operation, auto_wire_options: (auto_wire_options_was_not_used=true; false), auto_wire: auto_wire_options)
-          #:nocov:
-          unless auto_wire_options_was_not_used
-            warn "[DEPRECATION] `auto_wire_options` is deprecated. Please use `auto_wire` instead"
-          end
-          #:nocov:
-
-          operation.auto_wire  = auto_wire
-          operation.form_class = Dry::Validation::Schema::Form
-        end
-      end
-    end
-  end
-end

data/lib/pathway/plugins/dry_validation/v0_12.rb

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-module Pathway
-  module Plugins
-    module DryValidation
-      module V0_12
-        module ClassMethods
-          attr_reader :form_class, :form_options
-          attr_accessor :auto_wire
-
-          alias_method :auto_wire_options, :auto_wire
-          alias_method :auto_wire_options=, :auto_wire=
-
-          def form(base = nil, **opts, &block)
-            if block_given?
-              base ||= _base_form
-              self.form_class = _block_definition(base, opts, &block)
-            elsif base
-              self.form_class = _form_class(base)
-            else
-              raise ArgumentError, 'Either a form class or a block must be provided'
-            end
-          end
-
-          def form_class= klass
-            @builded_form = klass.options.empty? ? klass.new : nil
-            @form_class = klass
-            @form_options = klass.options.keys
-          end
-
-          def build_form(opts = {})
-            @builded_form || form_class.new(opts)
-          end
-
-          def inherited(subclass)
-            super
-            subclass.form_class = form_class
-            subclass.auto_wire  = auto_wire
-          end
-
-          private
-
-          def _base_form
-            superclass.respond_to?(:form_class) ? superclass.form_class : Dry::Validation::Schema::Params
-          end
-
-          def _form_class(form)
-            form.is_a?(Class) ? form : form.class
-          end
-
-          def _form_opts(opts = {})
-            opts.merge(build: false)
-          end
-
-          def _block_definition(base, opts, &block)
-            Dry::Validation.Params(_form_class(base), _form_opts(opts), &block)
-          end
-        end
-
-        module InstanceMethods
-          extend Forwardable
-
-          delegate %i[build_form form_options auto_wire_options auto_wire] => 'self.class'
-          alias_method :form, :build_form
-
-          def validate(state, with: nil)
-            if auto_wire && form_options.any?
-              with ||= form_options.zip(form_options).to_h
-            end
-            opts = Hash(with).map { |opt, key| [opt, state[key]] }.to_h
-            validate_with(state[:input], opts)
-              .then { |params| state.update(params: params) }
-          end
-
-          def validate_with(params, opts = {})
-            val = form(opts).call(params)
-
-            val.success? ? wrap(val.output) : error(:validation, details: val.messages)
-          end
-        end
-
-        def self.apply(operation, auto_wire_options: (auto_wire_options_was_not_used=true; false), auto_wire: auto_wire_options)
-          #:nocov:
-          unless auto_wire_options_was_not_used
-            warn "[DEPRECATION] `auto_wire_options` is deprecated. Please use `auto_wire` instead"
-          end
-          #:nocov:
-
-          operation.auto_wire  = auto_wire
-          operation.form_class = Dry::Validation::Schema::Params
-        end
-      end
-    end
-  end
-end