decouplio 1.0.0alpha7 → 1.0.0rc

data/lib/decouplio/errors/step_name_error.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_error'
-require_relative '../const/validations/common'
-
 module Decouplio
   module Errors
     class StepNameError < Decouplio::Errors::BaseError

data/lib/decouplio/errors/wrap_block_is_not_defined_error.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_error'
-require_relative '../const/validations/wrap'
-
 module Decouplio
   module Errors
     class WrapBlockIsNotDefinedError < Decouplio::Errors::BaseError

data/lib/decouplio/errors/wrap_controversial_keys_error.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_error'
-require_relative '../const/validations/wrap'
-
 module Decouplio
   module Errors
     class WrapControversialKeysError < Decouplio::Errors::BaseError

data/lib/decouplio/errors/wrap_finish_him_error.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_error'
-require_relative '../const/validations/wrap'
-
 module Decouplio
   module Errors
     class WrapFinishHimError < Decouplio::Errors::BaseError

data/lib/decouplio/errors/wrap_klass_method_error.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base_error'
-require_relative '../const/validations/wrap'
-
 module Decouplio
   module Errors
     class WrapKlassMethodError < Decouplio::Errors::BaseError

data/lib/decouplio/graph.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decouplio
+  class Graph
+    def initialize
+      @edges = {}
+    end
+  end
+end

data/lib/decouplio/logic_dsl.rb

@@ -1,25 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'flow'
-require_relative 'const/types'
-require_relative 'const/doby_aide_options'
-require_relative 'const/step_options'
-require_relative 'octo_hash_case'
-require_relative 'errors/options_validation_error'
-require_relative 'errors/palp_validation_error'
-require_relative 'errors/resq_definition_error'
-require_relative 'errors/wrap_block_is_not_defined_error'
-require_relative 'errors/palp_block_is_not_defined_error'
-require_relative 'errors/fail_can_not_be_first_step_error'
-require_relative 'errors/aide_can_not_be_first_step_error'
-require_relative 'errors/octo_block_is_not_defined_error'
-
 module Decouplio
   class LogicDsl
-    DEFAULT_WRAP_NAME = 'wrap'
-
     class << self
-      attr_reader :steps, :palps
+      attr_reader :steps
 
       def inherited(subclass)
         subclass.init_steps
@@ -27,64 +11,199 @@ module Decouplio
 
       def init_steps
         @steps = []
-        @palps = {}
       end
 
       def step(stp, **options)
-        if stp.is_a?(Class) && !(stp < Decouplio::Action)
-          step_options = {}
+        if_condition = options.delete(:if)
+        unless_condition = options.delete(:unless)
 
-          options.each_key do |key|
-            step_options[key] = options.delete(key) if Decouplio::Const::StepOptions::ALLOWED.include?(key)
-          end
+        if if_condition && unless_condition
+          raise Decouplio::Errors::StepControversialKeysError.new(
+            errored_option: { if: if_condition, unless: unless_condition },
+            details: %i[if unless]
+          )
+        end
 
-          @steps << {
-            type: Decouplio::Const::Types::STEP_TYPE,
-            name: stp,
-            _args: options,
-            **step_options
-          }
+        if if_condition
+          @steps << Decouplio::Steps::IfConditionPass.new(
+            if_condition
+          )
+        end
+        if unless_condition
+          @steps << Decouplio::Steps::UnlessConditionPass.new(
+            unless_condition
+          )
+        end
+
+        if stp.is_a?(Class)
+          if stp < Decouplio::Action
+            @steps << Decouplio::Steps::InnerActionStep.new(
+              stp.name.to_sym,
+              stp,
+              options.delete(:on_success),
+              options.delete(:on_failure),
+              options.delete(:on_error),
+              options.delete(:finish_him)
+            )
+          elsif stp.respond_to?(:call)
+            @steps << Decouplio::Steps::ServiceAsStep.new(
+              stp.name.to_sym,
+              stp,
+              options.delete(:on_success),
+              options.delete(:on_failure),
+              options.delete(:on_error),
+              options.delete(:finish_him),
+              options
+            )
+          else
+            raise Decouplio::Errors::ActionClassError.new(
+              step_type: :step,
+              errored_option: "step #{stp}"
+            )
+          end
         else
-          @steps << options.merge(type: Decouplio::Const::Types::STEP_TYPE, name: stp)
+          @steps << Decouplio::Steps::Step.new(
+            stp,
+            options.delete(:on_success),
+            options.delete(:on_failure),
+            options.delete(:on_error),
+            options.delete(:finish_him)
+          )
         end
       end
 
       def fail(stp, **options)
         raise Decouplio::Errors::FailCanNotBeFirstStepError if @steps.empty?
 
-        if stp.is_a?(Class) && !(stp < Decouplio::Action)
-          step_options = {}
-          options.each_key do |key|
-            step_options[key] = options.delete(key) if Decouplio::Const::StepOptions::ALLOWED.include?(key)
-          end
+        if_condition = options.delete(:if)
+        unless_condition = options.delete(:unless)
+
+        if if_condition && unless_condition
+          raise Decouplio::Errors::FailControversialKeysError.new(
+            errored_option: { if: if_condition, unless: unless_condition },
+            details: %i[if unless]
+          )
+        end
 
-          @steps << {
-            type: Decouplio::Const::Types::FAIL_TYPE,
-            name: stp,
-            _args: options,
-            **step_options
-          }
+        if if_condition
+          @steps << Decouplio::Steps::IfConditionFail.new(
+            if_condition
+          )
+        end
+        if unless_condition
+          @steps << Decouplio::Steps::UnlessConditionFail.new(
+            unless_condition
+          )
+        end
+
+        if stp.is_a?(Class)
+          if stp < Decouplio::Action
+            @steps << Decouplio::Steps::InnerActionFail.new(
+              stp.name.to_sym,
+              stp,
+              options.delete(:on_success),
+              options.delete(:on_failure),
+              options.delete(:on_error),
+              options.delete(:finish_him)
+            )
+          elsif stp.respond_to?(:call)
+            @steps << Decouplio::Steps::ServiceAsFail.new(
+              stp.name.to_sym,
+              stp,
+              options.delete(:on_success),
+              options.delete(:on_failure),
+              options.delete(:on_error),
+              options.delete(:finish_him),
+              options
+            )
+          else
+            raise Decouplio::Errors::ActionClassError.new(
+              step_type: :fail,
+              errored_option: "fail #{stp}"
+            )
+          end
         else
-          @steps << options.merge(type: Decouplio::Const::Types::FAIL_TYPE, name: stp)
+          @steps << Decouplio::Steps::Fail.new(
+            stp,
+            options.delete(:on_success),
+            options.delete(:on_failure),
+            options.delete(:on_error),
+            options.delete(:finish_him)
+          )
         end
       end
 
       def pass(stp, **options)
-        if stp.is_a?(Class) && !(stp < Decouplio::Action)
-          step_options = {}
+        on_success = options.delete(:on_success)
+        on_failure = options.delete(:on_failure)
 
-          options.each_key do |key|
-            step_options[key] = options.delete(key) if Decouplio::Const::StepOptions::ALLOWED.include?(key)
-          end
+        if on_success
+          raise Decouplio::Errors::ExtraKeyForPassError.new(
+            errored_option: { on_success: on_success },
+            details: :on_success
+          )
+        elsif on_failure
+          raise Decouplio::Errors::ExtraKeyForPassError.new(
+            errored_option: { on_failure: on_failure },
+            details: :on_failure
+          )
+        end
+
+        if_condition = options.delete(:if)
+        unless_condition = options.delete(:unless)
+
+        if if_condition && unless_condition
+          raise Decouplio::Errors::PassControversialKeysError.new(
+            errored_option: { if: if_condition, unless: unless_condition },
+            details: %i[if unless]
+          )
+        end
+
+        if if_condition
+          @steps << Decouplio::Steps::IfConditionPass.new(
+            if_condition
+          )
+        end
+        if unless_condition
+          @steps << Decouplio::Steps::UnlessConditionPass.new(
+            unless_condition
+          )
+        end
 
-          @steps << {
-            type: Decouplio::Const::Types::PASS_TYPE,
-            name: stp,
-            _args: options,
-            **step_options
-          }
+        if stp.is_a?(Class)
+          if stp < Decouplio::Action
+            @steps << Decouplio::Steps::InnerActionPass.new(
+              stp.name.to_sym,
+              stp,
+              nil,
+              nil,
+              options.delete(:on_error),
+              options.delete(:finish_him)
+            )
+          elsif stp.respond_to?(:call)
+            @steps << Decouplio::Steps::ServiceAsPass.new(
+              stp.name.to_sym,
+              stp,
+              nil,
+              nil,
+              options.delete(:on_error),
+              options.delete(:finish_him),
+              options
+            )
+          else
+            raise Decouplio::Errors::ActionClassError.new(
+              step_type: :pass,
+              errored_option: "pass #{stp}"
+            )
+          end
         else
-          @steps << options.merge(type: Decouplio::Const::Types::PASS_TYPE, name: stp)
+          @steps << Decouplio::Steps::Pass.new(
+            stp,
+            nil,
+            nil,
+            options.delete(:on_error),
+            options.delete(:finish_him)
+          )
         end
       end
 
@@ -95,77 +214,188 @@ module Decouplio
 
         raise Decouplio::Errors::OctoBlockIsNotDefinedError if hash_case.empty?
 
-        options[:hash_case] = hash_case
-        @steps << options.merge(type: Decouplio::Const::Types::OCTO_TYPE, name: octo_name)
-      end
+        if_condition = options.delete(:if)
+        unless_condition = options.delete(:unless)
 
-      def palp(palp_name, **options, &block)
-        raise Decouplio::Errors::PalpBlockIsNotDefinedError unless block_given?
+        if if_condition && unless_condition
+          raise Decouplio::Errors::OctoControversialKeysError.new(
+            errored_option: { if: if_condition, unless: unless_condition },
+            details: %i[if unless]
+          )
+        end
 
-        options.empty? || raise(Decouplio::Errors::PalpValidationError)
+        if if_condition
+          @steps << Decouplio::Steps::IfConditionPass.new(
+            if_condition
+          )
+        end
+        if unless_condition
+          @steps << Decouplio::Steps::UnlessConditionPass.new(
+            unless_condition
+          )
+        end
 
-        @palps[palp_name] = Class.new(self, &block)
+        by_method = options.delete(:method)
+        by_key = options.delete(:ctx_key)
+        finish_him = options.delete(:finish_him)
+        on_success = options.delete(:on_success)
+        on_failure = options.delete(:on_failure)
+        on_error = options.delete(:on_error)
+
+        raise Decouplio::Errors::OctoFinishHimIsNotAllowedError if finish_him
+
+        if by_key && by_method
+          raise Decouplio::Errors::OctoControversialKeysError.new(
+            errored_option: { ctx_key: by_key, method: by_method },
+            details: %i[ctx_key method]
+          )
+        end
+
+        if by_method
+          @steps << Decouplio::Steps::OctoByMethod.new(
+            octo_name,
+            by_method,
+            hash_case,
+            on_success,
+            on_failure,
+            on_error,
+            finish_him
+          )
+        elsif by_key
+          @steps << Decouplio::Steps::OctoByKey.new(
+            octo_name,
+            by_key,
+            hash_case,
+            on_success,
+            on_failure,
+            on_error,
+            finish_him
+          )
+        else
+          raise Decouplio::Errors::RequiredOptionsIsMissingForOctoError.new(
+            details: 'ctx_key, method'
+          )
+        end
       end
 
-      def resq(name = :resq, **options)
-        unless Decouplio::Const::Types::MAIN_FLOW_TYPES.include?(@steps.last&.[](:type))
+      def resq(name = nil, **options)
+        unless Decouplio::Const::Flows::MAIN_FLOW.include?(@steps.last.class)
           raise Decouplio::Errors::ResqDefinitionError
         end
 
-        @steps << {
-          name: name,
-          type: Decouplio::Const::Types::RESQ_TYPE,
-          step_to_resq: @steps.delete(@steps.last),
-          handler_hash: options
-        }
+        last_step = @steps.delete(@steps.last)
+
+        resq_step = if name.is_a?(Symbol)
+                      if Decouplio::Const::Flows::PASS_FLOW.include?(last_step.class)
+                        Decouplio::Steps::ResqPass.new(
+                          last_step.name,
+                          name
+                        )
+                      elsif Decouplio::Const::Flows::FAIL_FLOW.include?(last_step.class)
+                        Decouplio::Steps::ResqFail.new(
+                          last_step.name,
+                          name
+                        )
+                      else
+                        raise StandardError, 'Most likely it is a bug, please create an issue here https://github.com/differencialx/decouplio/issues'
+                      end
+                    elsif options.size.positive?
+                      if Decouplio::Const::Flows::PASS_FLOW.include?(last_step.class)
+                        Decouplio::Steps::ResqWithMappingPass.new(
+                          last_step.name,
+                          Decouplio::Utils::PrepareResqMappings.call(options)
+                        )
+                      elsif Decouplio::Const::Flows::FAIL_FLOW.include?(last_step.class)
+                        Decouplio::Steps::ResqWithMappingFail.new(
+                          last_step.name,
+                          Decouplio::Utils::PrepareResqMappings.call(options)
+                        )
+                      else
+                        raise StandardError, 'Most likely it is a bug, please create an issue here https://github.com/differencialx/decouplio/issues'
+                      end
+                    else
+                      raise Decouplio::Errors::InvalidOptionsForResqStep.new(
+                        errored_option: "resq -->#{name}<--, -->#{options}<--"
+                      )
+                    end
+        if last_step.is_a?(Decouplio::Steps::BaseOcto)
+          last_step._add_resq(resq_step)
+          @steps << last_step
+        else
+          resq_step._add_step_to_resq(last_step)
+          @steps << resq_step
+        end
       end
 
       def wrap(name = nil, **options, &block)
         raise Decouplio::Errors::WrapBlockIsNotDefinedError unless block_given?
 
-        @steps << options.merge(
-          type: Decouplio::Const::Types::WRAP_TYPE,
-          name: name,
-          wrap_flow: block
-        )
-      end
+        wrap_class = options.delete(:klass)
+        wrap_method = options.delete(:method)
+        if_condition = options.delete(:if)
+        unless_condition = options.delete(:unless)
+        finish_him = options.delete(:finish_him)
+        on_success = options.delete(:on_success)
+        on_failure = options.delete(:on_failure)
+        on_error = options.delete(:on_error)
 
-      def doby(doby_class, **options)
-        warn(
-          'DEPRECATION WARNING: "doby" step type will be deprecated at alpha8 version. Use "step" or "pass" instead.'
-        )
-        step_options = {}
-        options.each_key do |key|
-          step_options[key] = options.delete(key) if Decouplio::Const::DobyAideOptions::ALLOWED.include?(key)
-        end
-        doby_options = options
-
-        @steps << {
-          type: Decouplio::Const::Types::DOBY_TYPE,
-          name: doby_class.name.to_sym,
-          doby_class: doby_class,
-          doby_options: doby_options,
-          **step_options
-        }
-      end
+        raise Decouplio::Errors::InvalidWrapNameError unless name
 
-      def aide(aide_class, **options)
-        warn('DEPRECATION WARNING: "aide" step type will be deprecated at alpha8 version. Use "fail" instead.')
-        raise Decouplio::Errors::AideCanNotBeFirstStepError if @steps.empty?
+        if if_condition && unless_condition
+          raise Decouplio::Errors::WrapControversialKeysError.new(
+            errored_option: { if: if_condition, unless: unless_condition },
+            details: %i[if unless]
+          )
+        end
 
-        step_options = {}
-        options.each_key do |key|
-          step_options[key] = options.delete(key) if Decouplio::Const::DobyAideOptions::ALLOWED.include?(key)
+        if if_condition
+          @steps << Decouplio::Steps::IfConditionPass.new(
+            if_condition
+          )
+        end
+        if unless_condition
+          @steps << Decouplio::Steps::UnlessConditionPass.new(
+            unless_condition
+          )
         end
-        aide_options = options
 
-        @steps << {
-          type: Decouplio::Const::Types::AIDE_TYPE,
-          name: aide_class.name.to_sym,
-          aide_class: aide_class,
-          aide_options: aide_options,
-          **step_options
-        }
+        wrap_block = block
+
+        if wrap_class && wrap_method
+          @steps << Decouplio::Steps::WrapWithClassMethod.new(
+            name,
+            wrap_block,
+            wrap_class,
+            wrap_method,
+            on_success,
+            on_failure,
+            on_error,
+            finish_him
+          )
+        elsif wrap_class
+          @steps << Decouplio::Steps::WrapWithClass.new(
+            name,
+            wrap_block,
+            wrap_class,
+            on_success,
+            on_failure,
+            on_error,
+            finish_him
+          )
+        elsif wrap_method
+          raise Decouplio::Errors::WrapKlassMethodError.new(
+            errored_option: { method: wrap_method }
+          )
+        else
+          @steps << Decouplio::Steps::Wrap.new(
+            name,
+            wrap_block,
+            on_success,
+            on_failure,
+            on_error,
+            finish_him
+          )
+        end
       end
     end
   end