servactory 2.15.1 → 2.16.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce9429e1b0d9bddfab017bae08915f91a41cf81826d54becffa3021e1fdcdb58
-  data.tar.gz: a9d1ad2b9cd25dfd805df46df18cf4ef73d6feda77d16b0b208100b04984af29
+  metadata.gz: 3ff6af883d52092f1fd6589a77d962a3bd8b346ca5b8f40ffe4489b993e023e3
+  data.tar.gz: 8eb05b74076fa1c75e6688ffa1503daaca3f5f0a43d32d621eeda3912456d4cc
 SHA512:
-  metadata.gz: 2a7a1d4a5356333cbec5eb3d25c11c9716cd4c56e9b15c320c572f49a58268da2ff4735706cd163c49d7d351e44daf02201fde43a0035dea9a7c8e96a6d28b74
-  data.tar.gz: 81f5b4831820c6b944561409f2729875c021d554c880cac952a311214bf4fb05417c24e26a73f99b2104c80facc8b270b58228d3995cd753479ad3a9d3664648
+  metadata.gz: 9bf62d2f5546ccf038ba21009e9cca29d27dfe10431d1117bd020e5c537d45afc10f1323b2ce34ae87b7e43d750b4cae767277390d51de81c3692fe984fb7aaf
+  data.tar.gz: 0c1c762bccd20fc0d9738a6c5788dd27d874567306adeb6edabe5d2ba0522fdabd0c507ac97d63ca9b35dba7fa4475ff9c54c6ffdb76ebd819e58d092e9acf98

data/lib/servactory/actions/collection.rb

@@ -4,7 +4,7 @@ module Servactory
   module Actions
     class Collection
       extend Forwardable
-      def_delegators :@collection, :<<, :each, :sort_by
+      def_delegators :@collection, :<<, :each, :map, :sort_by
 
       def initialize(collection = Set.new)
         @collection = collection

data/lib/servactory/actions/dsl.rb

@@ -77,7 +77,7 @@ module Servactory
 
           current_stage = @current_stage.presence || Stages::Stage.new(position:)
 
-          current_stage.methods << Action.new(
+          current_stage.actions << Action.new(
             name,
             position:,
             **options

data/lib/servactory/actions/stages/collection.rb

@@ -5,7 +5,7 @@ module Servactory
     module Stages
       class Collection
         extend Forwardable
-        def_delegators :@collection, :<<, :each, :merge, :sort_by, :size, :empty?
+        def_delegators :@collection, :<<, :each, :merge, :to_h, :sort_by, :size, :empty?
 
         def initialize(collection = Set.new)
           @collection = collection

data/lib/servactory/actions/stages/stage.rb

@@ -17,12 +17,8 @@ module Servactory
           @condition = condition
         end
 
-        def next_method_position
-          methods.size + 1
-        end
-
-        def methods
-          @methods ||= Collection.new
+        def actions
+          @actions ||= Servactory::Actions::Collection.new
         end
       end
     end

data/lib/servactory/actions/tools/runner.rb

@@ -32,17 +32,17 @@ module Servactory
 
           wrapper = stage.wrapper
           rollback = stage.rollback
-          methods = stage.methods.sorted_by_position
+          actions = stage.actions.sorted_by_position
 
           if wrapper.is_a?(Proc)
-            call_wrapper_with_methods(wrapper, rollback, methods)
+            call_wrapper_with_actions(wrapper, rollback, actions)
           else
-            call_methods(methods)
+            call_actions(actions)
           end
         end
 
-        def call_wrapper_with_methods(wrapper, rollback, methods) # rubocop:disable Metrics/MethodLength
-          wrapper.call(methods: -> { call_methods(methods) }, context: @context)
+        def call_wrapper_with_actions(wrapper, rollback, actions) # rubocop:disable Metrics/MethodLength
+          wrapper.call(methods: -> { call_actions(actions) }, context: @context)
         rescue StandardError => e
           if rollback.present?
             @context.send(rollback, e)
@@ -56,16 +56,16 @@ module Servactory
           end
         end
 
-        def call_methods(methods)
-          methods.each do |method|
-            next if unnecessary_for_make?(method)
+        def call_actions(actions)
+          actions.each do |action|
+            next if unnecessary_for_make?(action)
 
-            call_method(method)
+            call_action(action)
           end
         end
 
-        def call_method(method)
-          @context.send(method.name)
+        def call_action(action)
+          @context.send(action.name)
         rescue StandardError => e
           rescue_with_handler(e) || raise
         end
@@ -79,9 +79,9 @@ module Servactory
           is_condition_opposite ? !result : result
         end
 
-        def unnecessary_for_make?(make_method)
-          condition = make_method.condition
-          is_condition_opposite = make_method.is_condition_opposite
+        def unnecessary_for_make?(make_action)
+          condition = make_action.condition
+          is_condition_opposite = make_action.is_condition_opposite
 
           result = prepare_condition_for(condition)
 

data/lib/servactory/context/warehouse/inputs.rb

@@ -44,11 +44,7 @@ module Servactory
             input_name:
           )
 
-          raise @context.class.config.input_exception_class.new(
-            context: @context,
-            message: message_text,
-            input_name:
-          )
+          @context.fail_input!(input_name, message: message_text)
         end
       end
     end

data/lib/servactory/context/workspace/inputs.rb

@@ -68,11 +68,7 @@ module Servactory
             input_name: name
           )
 
-          raise @context.class.config.input_exception_class.new(
-            context: @context,
-            message: message_text,
-            input_name: name
-          )
+          @context.fail_input!(name, message: message_text)
         end
       end
     end

data/lib/servactory/context/workspace/internals.rb

@@ -80,10 +80,7 @@ module Servactory
             internal_name: name
           )
 
-          raise @context.class.config.internal_exception_class.new(
-            context: @context,
-            message: message_text
-          )
+          @context.fail_internal!(name, message: message_text)
         end
       end
     end

data/lib/servactory/context/workspace/outputs.rb

@@ -74,10 +74,7 @@ module Servactory
             output_name: name
           )
 
-          raise @context.class.config.output_exception_class.new(
-            context: @context,
-            message: message_text
-          )
+          @context.fail_output!(name, message: message_text)
         end
       end
     end

data/lib/servactory/info/builder.rb

@@ -5,17 +5,19 @@ module Servactory
     class Builder # rubocop:disable Metrics/ClassLength
       attr_reader :inputs,
                   :internals,
-                  :outputs
+                  :outputs,
+                  :stages
 
       def self.build(...)
         new.build(...)
       end
 
-      def build(collection_of_inputs:, collection_of_internals:, collection_of_outputs:, config:)
+      def build(collection_of_inputs:, collection_of_internals:, collection_of_outputs:, collection_of_stages:, config:)
         build_all_attributes(
           inputs: collection_of_inputs,
           internals: collection_of_internals,
           outputs: collection_of_outputs,
+          stages: collection_of_stages,
           config:
         )
 
@@ -25,7 +27,7 @@ module Servactory
       private
 
       # rubocop:disable Metrics/MethodLength
-      def build_all_attributes(inputs:, internals:, outputs:, config:)
+      def build_all_attributes(inputs:, internals:, outputs:, stages:, config:)
         build_input_attributes_with(
           collection: inputs,
           dynamic_options: config.input_option_helpers.dynamic_options
@@ -40,6 +42,8 @@ module Servactory
           collection: outputs,
           dynamic_options: config.output_option_helpers.dynamic_options
         )
+
+        build_action_stages_with(collection: stages)
       end
       # rubocop:enable Metrics/MethodLength
 
@@ -65,6 +69,22 @@ module Servactory
         )
       end
 
+      def build_action_stages_with(collection:) # rubocop:disable Metrics/MethodLength
+        @stages = collection.to_h do |stage|
+          [
+            :"stage_#{stage.position}",
+            stage.actions.map do |action|
+              {
+                action.name => {
+                  position: action.position,
+                  condition: action.condition
+                }
+              }
+            end
+          ]
+        end
+      end
+
       def build_attributes_with(collection:, dynamic_options:, include_specific_options: false) # rubocop:disable Metrics/MethodLength
         collection.to_h do |attribute|
           options = process_options_for(

data/lib/servactory/info/dsl.rb

@@ -13,11 +13,17 @@ module Servactory
             collection_of_inputs:,
             collection_of_internals:,
             collection_of_outputs:,
+            collection_of_stages:,
             config:
           )
 
           Result.new(builder)
         end
+
+        # API: Servactory Web
+        def servactory?
+          true
+        end
       end
     end
   end

data/lib/servactory/info/result.rb

@@ -5,12 +5,14 @@ module Servactory
     class Result
       attr_reader :inputs,
                   :internals,
-                  :outputs
+                  :outputs,
+                  :stages
 
       def initialize(builder)
         @inputs = builder.inputs
         @internals = builder.internals
         @outputs = builder.outputs
+        @stages = builder.stages
       end
     end
   end

data/lib/servactory/inputs/tools/rules.rb

@@ -34,11 +34,7 @@ module Servactory
             conflict_code: input.conflict_code
           )
 
-          raise @context.class.config.input_exception_class.new(
-            context: @context,
-            message: message_text,
-            input_name: input.name
-          )
+          @context.fail_input!(input.name, message: message_text)
         end
       end
     end

data/lib/servactory/inputs/tools/unnecessary.rb

@@ -21,10 +21,7 @@ module Servactory
             unnecessary_attributes: unnecessary_attributes.join(", ")
           )
 
-          raise @context.class.config.input_exception_class.new(
-            context: @context,
-            message: message_text
-          )
+          @context.fail_input!(nil, message: message_text)
         end
 
         private

data/lib/servactory/inputs/tools/validation.rb

@@ -29,18 +29,21 @@ module Servactory
           end
         end
 
-        def process_option(check_key, check_options, input:)
-          validation_classes_from(input).each do |validation_class|
+        def process_option(check_key, check_options, input:) # rubocop:disable Metrics/MethodLength
+          validation_classes = validation_classes_from(input)
+          return if validation_classes.empty?
+
+          validation_classes.each do |validation_class|
             errors_from_checks = process_validation_class(
               validation_class:,
               input:,
               check_key:,
               check_options:
-            ).to_a
+            )
 
-            next if errors_from_checks.empty?
+            next if errors_from_checks.nil? || errors_from_checks.empty?
 
-            errors.merge(errors_from_checks)
+            errors.merge(errors_from_checks.to_a)
           end
         end
 
@@ -62,7 +65,7 @@ module Servactory
         ########################################################################
 
         def validation_classes_from(input)
-          input.collection_of_options.validation_classes
+          @validation_classes_cache ||= input.collection_of_options.validation_classes # rubocop:disable Naming/MemoizedInstanceVariableName
         end
 
         ########################################################################
@@ -74,10 +77,7 @@ module Servactory
         def raise_errors
           return if (tmp_errors = errors.not_blank).empty?
 
-          raise @context.class.config.input_exception_class.new(
-            context: @context,
-            message: tmp_errors.first
-          )
+          @context.fail_input!(nil, message: tmp_errors.first)
         end
       end
     end

data/lib/servactory/maintenance/attributes/options_collection.rb

@@ -17,7 +17,8 @@ module Servactory
         end
 
         def validation_classes
-          filter { |option| option.validation_class.present? }
+          @validation_classes ||=
+            filter { |option| option.validation_class.present? }
             .map(&:validation_class)
             .uniq
         end

data/lib/servactory/maintenance/attributes/tools/validation.rb

@@ -30,6 +30,8 @@ module Servactory
           end
 
           def process_option(check_key, check_options)
+            return if validation_classes.empty?
+
             validation_classes.each do |validation_class|
               errors_from_checks = process_validation_class(
                 validation_class:,
@@ -37,6 +39,8 @@ module Servactory
                 check_options:
               )
 
+              next if errors_from_checks.nil? || errors_from_checks.empty?
+
               errors.merge(errors_from_checks.to_a)
             end
           end

data/lib/servactory/maintenance/attributes/validations/errors.rb

@@ -6,7 +6,7 @@ module Servactory
       module Validations
         class Errors
           extend Forwardable
-          def_delegators :@collection, :<<, :to_a
+          def_delegators :@collection, :<<, :to_a, :empty?
 
           def initialize(*)
             @collection = Set.new

data/lib/servactory/version.rb

@@ -3,9 +3,9 @@
 module Servactory
   module VERSION
     MAJOR = 2
-    MINOR = 15
-    PATCH = 1
-    PRE = nil
+    MINOR = 16
+    PATCH = 0
+    PRE = "rc2"
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.16.0.rc2
 platform: ruby
 authors:
 - Anton Sokolov