refactor(can_have_connected_steps): remove runtime based implementation

marian13 · Jan 30, 2024 · ed396ab · ed396ab
1 parent ca7e4af
commit ed396ab
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 631 deletions.
diff --git a/lib/convenient_service/service/configs/standard.rb b/lib/convenient_service/service/configs/standard.rb
@@ -36,7 +36,6 @@ module Standard
 
             use ConvenientService::Plugins::Service::HasNegatedResult::Concern
             use ConvenientService::Plugins::Service::HasNegatedJSendResult::Concern
-            use ConvenientService::Plugins::Service::CanHaveConnectedSteps::Concern
             use ConvenientService::Plugins::Service::CanHaveFallbacks::Concern
             use ConvenientService::Plugins::Service::HasMermaidFlowchart::Concern
           end
@@ -183,7 +182,6 @@ class self::Step
             concerns do
               use ConvenientService::Plugins::Common::HasJSendResultDuckShortSyntax::Concern
               use ConvenientService::Plugins::Step::CanHaveFallbacks::Concern
-              use ConvenientService::Plugins::Step::CanBeNegated::Concern
             end
 
             middlewares :result do
@@ -192,12 +190,6 @@ class self::Step
               insert_after \
                 ConvenientService::Plugins::Step::HasResult::Middleware,
                 ConvenientService::Plugins::Step::CanHaveParentResult::Middleware
-
-              insert_after \
-                ConvenientService::Plugins::Step::HasResult::Middleware,
-                ConvenientService::Plugins::Step::CanBeNegated::Middleware
-
-              use ConvenientService::Plugins::Step::CanHaveAlternativeSteps::Middleware
             end
           end
 

diff --git a/lib/convenient_service/service/plugins.rb b/lib/convenient_service/service/plugins.rb
@@ -11,7 +11,6 @@
 require_relative "plugins/has_negated_j_send_result"
 
 require_relative "plugins/can_recalculate_result"
-require_relative "plugins/can_have_connected_steps"
 require_relative "plugins/can_have_method_steps"
 require_relative "plugins/can_have_steps"
 require_relative "plugins/can_have_stubbed_results"

diff --git a/lib/convenient_service/service/plugins/can_have_connected_steps.rb b/lib/convenient_service/service/plugins/can_have_connected_steps.rb
diff --git a/lib/convenient_service/service/plugins/can_have_connected_steps/concern.rb b/lib/convenient_service/service/plugins/can_have_connected_steps/concern.rb
diff --git a/lib/convenient_service/service/plugins/can_have_steps/entities/step/plugins.rb b/lib/convenient_service/service/plugins/can_have_steps/entities/step/plugins.rb
@@ -5,8 +5,6 @@
 require_relative "plugins/can_be_completed"
 require_relative "plugins/can_be_method_step"
 require_relative "plugins/can_be_result_step"
-require_relative "plugins/can_be_negated"
-require_relative "plugins/can_have_alternative_steps"
 require_relative "plugins/can_have_fallbacks"
 require_relative "plugins/can_have_parent_result"
 require_relative "plugins/has_inspect"

diff --git a/...convenient_service/service/plugins/can_have_steps/entities/step/plugins/can_be_negated.rb b/...convenient_service/service/plugins/can_have_steps/entities/step/plugins/can_be_negated.rb
diff --git a/...nt_service/service/plugins/can_have_steps/entities/step/plugins/can_be_negated/concern.rb b/...nt_service/service/plugins/can_have_steps/entities/step/plugins/can_be_negated/concern.rb
diff --git a/...service/service/plugins/can_have_steps/entities/step/plugins/can_be_negated/middleware.rb b/...service/service/plugins/can_have_steps/entities/step/plugins/can_be_negated/middleware.rb
diff --git a/...ice/plugins/can_have_steps/entities/step/plugins/can_have_alternative_steps/middleware.rb b/...ice/plugins/can_have_steps/entities/step/plugins/can_have_alternative_steps/middleware.rb
diff --git a/spec/lib/convenient_service/examples/dry/gemfile/dry_service/config_spec.rb b/spec/lib/convenient_service/examples/dry/gemfile/dry_service/config_spec.rb
@@ -47,7 +47,7 @@
               ConvenientService::Common::Plugins::HasAroundCallbacks::Concern,
               ConvenientService::Service::Plugins::HasNegatedResult::Concern,
               ConvenientService::Service::Plugins::HasNegatedJSendResult::Concern,
-              ConvenientService::Service::Plugins::CanHaveConnectedSteps::Concern,
+
               ConvenientService::Service::Plugins::CanHaveFallbacks::Concern,
               ConvenientService::Service::Plugins::HasMermaidFlowchart::Concern,
               ConvenientService::Common::Plugins::AssignsAttributesInConstructor::UsingDryInitializer::Concern,
@@ -482,8 +482,8 @@
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeResultStep::Concern,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::HasInspect::Concern,
                 ConvenientService::Common::Plugins::HasJSendResultDuckShortSyntax::Concern,
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveFallbacks::Concern,
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeNegated::Concern
+                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveFallbacks::Concern
+
               ]
             end
 
@@ -498,13 +498,13 @@
                 ConvenientService::Common::Plugins::NormalizesEnv::Middleware,
                 ConvenientService::Common::Plugins::CachesReturnValue::Middleware,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::HasResult::Middleware,
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeNegated::Middleware,
+
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveParentResult::Middleware,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::RaisesOnNotResultReturnValue::Middleware,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeResultStep::CanBeExecuted::Middleware,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeMethodStep::CanBeExecuted::Middleware,
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveFallbacks::Middleware.with(fallback_true_status: :failure),
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveAlternativeSteps::Middleware
+                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveFallbacks::Middleware.with(fallback_true_status: :failure)
+
               ]
             end
 

diff --git a/spec/lib/convenient_service/examples/rails/gemfile/rails_service/config_spec.rb b/spec/lib/convenient_service/examples/rails/gemfile/rails_service/config_spec.rb
@@ -47,7 +47,7 @@
               ConvenientService::Common::Plugins::HasAroundCallbacks::Concern,
               ConvenientService::Service::Plugins::HasNegatedResult::Concern,
               ConvenientService::Service::Plugins::HasNegatedJSendResult::Concern,
-              ConvenientService::Service::Plugins::CanHaveConnectedSteps::Concern,
+
               ConvenientService::Service::Plugins::CanHaveFallbacks::Concern,
               ConvenientService::Service::Plugins::HasMermaidFlowchart::Concern,
               ConvenientService::Common::Plugins::AssignsAttributesInConstructor::UsingActiveModelAttributeAssignment::Concern,
@@ -484,8 +484,8 @@
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeResultStep::Concern,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::HasInspect::Concern,
                 ConvenientService::Common::Plugins::HasJSendResultDuckShortSyntax::Concern,
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveFallbacks::Concern,
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeNegated::Concern
+                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveFallbacks::Concern
+
               ]
             end
 
@@ -500,13 +500,13 @@
                 ConvenientService::Common::Plugins::NormalizesEnv::Middleware,
                 ConvenientService::Common::Plugins::CachesReturnValue::Middleware,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::HasResult::Middleware,
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeNegated::Middleware,
+
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveParentResult::Middleware,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::RaisesOnNotResultReturnValue::Middleware,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeResultStep::CanBeExecuted::Middleware,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeMethodStep::CanBeExecuted::Middleware,
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveFallbacks::Middleware.with(fallback_true_status: :failure),
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveAlternativeSteps::Middleware
+                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveFallbacks::Middleware.with(fallback_true_status: :failure)
+
               ]
             end
 

diff --git a/spec/lib/convenient_service/service/configs/standard_spec.rb b/spec/lib/convenient_service/service/configs/standard_spec.rb
@@ -45,7 +45,7 @@
               ConvenientService::Common::Plugins::HasAroundCallbacks::Concern,
               ConvenientService::Service::Plugins::HasNegatedResult::Concern,
               ConvenientService::Service::Plugins::HasNegatedJSendResult::Concern,
-              ConvenientService::Service::Plugins::CanHaveConnectedSteps::Concern,
+
               ConvenientService::Service::Plugins::CanHaveFallbacks::Concern,
               ConvenientService::Service::Plugins::HasMermaidFlowchart::Concern
             ]
@@ -476,8 +476,8 @@
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeResultStep::Concern,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::HasInspect::Concern,
                 ConvenientService::Common::Plugins::HasJSendResultDuckShortSyntax::Concern,
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveFallbacks::Concern,
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeNegated::Concern
+                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveFallbacks::Concern
+
               ]
             end
 
@@ -492,13 +492,13 @@
                 ConvenientService::Common::Plugins::NormalizesEnv::Middleware,
                 ConvenientService::Common::Plugins::CachesReturnValue::Middleware,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::HasResult::Middleware,
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeNegated::Middleware,
+
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveParentResult::Middleware,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::RaisesOnNotResultReturnValue::Middleware,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeResultStep::CanBeExecuted::Middleware,
                 ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanBeMethodStep::CanBeExecuted::Middleware,
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveFallbacks::Middleware.with(fallback_true_status: :failure),
-                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveAlternativeSteps::Middleware
+                ConvenientService::Service::Plugins::CanHaveSteps::Entities::Step::Plugins::CanHaveFallbacks::Middleware.with(fallback_true_status: :failure)
+
               ]
             end