pathway 0.12.3 → 1.1.0

data/bin/sequel

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'sequel' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../.ruby-lsp/Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("sequel", "sequel")

data/bin/yard

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'yard' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../.ruby-lsp/Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("yard", "yard")

data/bin/yardoc

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'yardoc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../.ruby-lsp/Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("yard", "yardoc")

data/bin/yri

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'yri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../.ruby-lsp/Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("yard", "yri")

data/lib/pathway/plugins/auto_deconstruct_state.rb

@@ -1,12 +1,22 @@
 # frozen_string_literal: true
 
-if RUBY_VERSION =~ /^3\./
-  require 'pathway/plugins/auto_deconstruct_state/ruby3'
-end
-
 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.rb

@@ -5,21 +5,82 @@ require 'dry/validation'
 module Pathway
   module Plugins
     module DryValidation
-      def self.apply(operation, **kwargs)
+      module ClassMethods
+        attr_reader :contract_class, :contract_options
+        attr_accessor :auto_wire
+
+        alias_method :auto_wire_options, :auto_wire
+        alias_method :auto_wire_options=, :auto_wire=
+
+        def contract(base = nil, &)
+          if block_given?
+            base ||= _base_contract
+            self.contract_class = Class.new(base, &)
+          elsif base
+            self.contract_class = base
+          else
+            raise ArgumentError, 'Either a contract class or a block must be provided'
+          end
+        end
+
+        def params(...)
+          contract { params(...) }
+        end
+
+        def contract_class= klass
+          @contract_class   = klass
+          @contract_options = (klass.dry_initializer.options - Dry::Validation::Contract.dry_initializer.options).map(&:target)
+          @builded_contract = @contract_options.empty? && klass.schema ? klass.new : nil
+        end
+
+        def build_contract(**)
+          @builded_contract || contract_class.new(**)
+        end
+
+        def inherited(subclass)
+          super
+          subclass.auto_wire      = auto_wire
+          subclass.contract_class = contract_class
+        end
+
+        private
+
+        def _base_contract
+          superclass.respond_to?(:contract_class) ? superclass.contract_class : Dry::Validation::Contract
+        end
+      end
+
+      module InstanceMethods
+        extend Forwardable
+
+        delegate %i[build_contract contract_options auto_wire_options auto_wire] => 'self.class'
+        alias_method :contract, :build_contract
+
+        def validate(state, with: nil)
+          if auto_wire && contract_options.any?
+            with ||= contract_options.zip(contract_options).to_h
+          end
+          opts = Hash(with).map { |to, from| [to, state[from]] }.to_h
+          validate_with(state[:input], **opts)
+            .then { |params| state.update(params:) }
+        end
+
+        def validate_with(input, **)
+          result = contract(**).call(input)
+
+          result.success? ? wrap(result.values.to_h) : error(:validation, details: result.errors.to_h)
+        end
+      end
+
+      def self.apply(operation, auto_wire_options: (auto_wire_options_was_not_used=true; false), auto_wire: auto_wire_options)
         #:nocov:
-        if Gem.loaded_specs['dry-validation'].version < Gem::Version.new('0.11')
-          fail 'unsupported dry-validation gem version'
-        elsif Gem.loaded_specs['dry-validation'].version < Gem::Version.new('0.12')
-          require 'pathway/plugins/dry_validation/v0_11'
-          operation.plugin(Plugins::DryValidation::V0_11, **kwargs)
-        elsif Gem.loaded_specs['dry-validation'].version < Gem::Version.new('1.0')
-          require 'pathway/plugins/dry_validation/v0_12'
-          operation.plugin(Plugins::DryValidation::V0_12, **kwargs)
-        else
-          require 'pathway/plugins/dry_validation/v1_0'
-          operation.plugin(Plugins::DryValidation::V1_0, **kwargs)
+        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.contract_class = Dry::Validation::Contract
       end
     end
   end

data/lib/pathway/plugins/responder.rb

@@ -4,15 +4,15 @@ module Pathway
   module Plugins
     module Responder
       module ClassMethods
-        ruby2_keywords def call(*args, &bl)
-          result = super(*args)
+        def call(*args, **kwargs, &bl)
+          result = super(*args, **kwargs)
           block_given? ? Responder.respond(result, &bl) : result
         end
       end
 
       class Responder
-        def self.respond(result, &bl)
-          r = new(result, &bl)
+        def self.respond(...)
+          r = new(...)
           r.respond
         end
 
@@ -21,9 +21,7 @@ module Pathway
           instance_eval(&bl)
         end
 
-        def success(&bl)
-          @ok = bl
-        end
+        def success(&bl)= @ok = bl
 
         def failure(type = nil, &bl)
           if type.nil?

data/lib/pathway/plugins/sequel_models.rb

@@ -6,33 +6,43 @@ module Pathway
   module Plugins
     module SequelModels
       module DSLMethods
-        def transaction(step_name = nil, &bl)
-          fail 'must provide a step or a block but not both' if !step_name.nil? == block_given?
+        def transaction(step_name = nil, if: nil, unless: nil, &steps)
+          _with_db_steps(steps, step_name, *_opts_if_unless(binding)) do |runner|
+            db.transaction(savepoint: true) do
+              raise Sequel::Rollback if runner.call.failure?
+            end
+          end
+        end
 
-          if step_name
-            transaction { step step_name }
-          else
-            around(-> steps, _ {
-              db.transaction(savepoint: true) do
-                raise Sequel::Rollback if steps.call.failure?
-              end
-            }, &bl)
+        def after_commit(step_name = nil, if: nil, unless: nil, &steps)
+          _with_db_steps(steps, step_name, *_opts_if_unless(binding)) do |runner, state|
+            dsl_copy = _dsl_for(state)
+            db.after_commit { runner.call(dsl_copy) }
           end
         end
 
-        def after_commit(step_name = nil, &bl)
-          fail 'must provide a step or a block but not both' if !step_name.nil? == block_given?
+        def after_rollback(step_name = nil, if: nil, unless: nil, &steps)
+          _with_db_steps(steps, step_name, *_opts_if_unless(binding)) do |runner, state|
+            dsl_copy = _dsl_for(state)
+            db.after_rollback(savepoint: true) { runner.call(dsl_copy) }
+          end
+        end
 
-          if step_name
-            after_commit { step step_name }
-          else
-            around(-> steps, state {
-              dsl = self.class::DSL.new(State.new(self, state.to_h.dup), self)
+        private
+
+        def _opts_if_unless(bg) = %i[if unless].map { bg.local_variable_get(_1) }
 
-              db.after_commit do
-                steps.call(dsl)
-              end
-            }, &bl)
+        def _with_db_steps(steps, step_name=nil, if_cond=nil, unless_cond=nil, &db_logic)
+          raise ArgumentError, 'options :if and :unless are mutually exclusive' if if_cond && unless_cond
+          raise ArgumentError, 'must provide either a step or a block but not both' if !!step_name == !!steps
+          steps ||= proc { step step_name }
+
+          if if_cond
+            if_true(if_cond) { _with_db_steps(steps, &db_logic) }
+          elsif unless_cond
+            if_false(unless_cond) { _with_db_steps(steps, &db_logic) }
+          else
+            around(db_logic, &steps)
           end
         end
       end
@@ -41,10 +51,10 @@ module Pathway
         attr_accessor :model_class, :search_field, :model_not_found
 
         def model(model_class, search_by: model_class.primary_key, set_result_key: true, set_context_param: true, error_message: nil)
-          self.model_class      = model_class
-          self.search_field     = search_by
-          self.result_key       = Inflector.underscore(Inflector.demodulize(model_class.name)).to_sym if set_result_key
-          self.model_not_found  = error_message || "#{Inflector.humanize(Inflector.underscore(Inflector.demodulize(model_class.name)))} not found".freeze
+          self.model_class     = model_class
+          self.search_field    = search_by
+          self.result_key      = Inflector.underscore(Inflector.demodulize(model_class.name)).to_sym if set_result_key
+          self.model_not_found = error_message || "#{Inflector.humanize(Inflector.underscore(Inflector.demodulize(model_class.name)))} not found".freeze
 
           self.context(result_key => Contextualizer::OPTIONAL) if set_result_key && set_context_param
         end

data/lib/pathway/plugins/simple_auth.rb

@@ -26,9 +26,7 @@ module Pathway
           authorized?(*objs) ? wrap(objs) : error(:forbidden)
         end
 
-        def authorized?(*)
-          true
-        end
+        def authorized?(*) = true
       end
     end
   end

data/lib/pathway/result.rb

@@ -6,48 +6,32 @@ module Pathway
     attr_reader :value, :error
 
     class Success < Result
-      def initialize(value)
-        @value = value
-      end
-
-      def success?
-        true
-      end
+      def initialize(value) = @value = value
+      def success? = true
 
       def then(bl=nil)
         result(block_given? ? yield(value): bl.call(value))
       end
 
-      def tee(bl=nil, &block)
-        follow = self.then(bl, &block)
+      def tee(...)
+        follow = self.then(...)
         follow.failure? ? follow : self
       end
 
       private
 
-      alias :value_for_deconstruct :value
+      alias_method :value_for_deconstruct, :value
     end
 
     class Failure < Result
-      def initialize(error)
-        @error = error
-      end
-
-      def success?
-        false
-      end
-
-      def then(_=nil)
-        self
-      end
-
-      def tee(_=nil)
-        self
-      end
+      def initialize(error) = @error = error
+      def success? = false
+      def then(_=nil) = self
+      def tee(_=nil) = self
 
       private
 
-      alias :value_for_deconstruct :error
+      alias_method :value_for_deconstruct, :error
     end
 
     module Mixin
@@ -55,10 +39,16 @@ module Pathway
       Failure = Result::Failure
     end
 
-    def deconstruct
-      [value_for_deconstruct]
+    def self.success(value) = Success.new(value)
+    def self.failure(error) = Failure.new(error)
+
+    def self.result(object)
+      object.is_a?(Result) ? object : success(object)
     end
 
+    def failure? = !success?
+    def deconstruct = [value_for_deconstruct]
+
     def deconstruct_keys(keys)
       if value_for_deconstruct.respond_to?(:deconstruct_keys)
         value_for_deconstruct.deconstruct_keys(keys)
@@ -67,22 +57,6 @@ module Pathway
       end
     end
 
-    def failure?
-      !success?
-    end
-
-    def self.success(value)
-      Success.new(value)
-    end
-
-    def self.failure(error)
-      Failure.new(error)
-    end
-
-    def self.result(object)
-      object.is_a?(Result) ? object : success(object)
-    end
-
     delegate :result => 'self.class'
   end
 end

data/lib/pathway/rspec/matchers/fail_on.rb

@@ -22,22 +22,22 @@ RSpec::Matchers.define :fail_on do |input|
     @type = type
   end
 
-  alias :with_type :type
-  alias :and_type :type
+  alias_method :with_type, :type
+  alias_method :and_type, :type
 
   chain :message do |message|
     @message = message
   end
 
-  alias :with_message :message
-  alias :and_message :message
+  alias_method :with_message, :message
+  alias_method :and_message, :message
 
   chain :details do |details|
     @details = details
   end
 
-  alias :with_details :details
-  alias :and_details :details
+  alias_method :with_details, :details
+  alias_method :and_details, :details
 
   description do
     'fail' + (@type ? " with :#@type error" : '')

data/lib/pathway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pathway
-  VERSION = '0.12.3'
+  VERSION = '1.1.0'
 end