servactory 2.16.0.rc1 → 2.16.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc13e8261f2784169fde009e5f3fd2527e963e55cbda931d728c46319b395187
-  data.tar.gz: 9b4f88c9ba2695f0fa8c8084866bb27a1bcf99702890985e080d08a750d6e1c1
+  metadata.gz: 3ff6af883d52092f1fd6589a77d962a3bd8b346ca5b8f40ffe4489b993e023e3
+  data.tar.gz: 8eb05b74076fa1c75e6688ffa1503daaca3f5f0a43d32d621eeda3912456d4cc
 SHA512:
-  metadata.gz: ab74975be82b4e3231a1ed12d92d12853755afe051e7e0f7144ae34efbc909c124e70091a333fba41c657c2f5344abd7cc649c5f9def2d37e7363b41ab39d794
-  data.tar.gz: b46024d472db88be0c99e9eb15c912089b4ebace519e39e5e840ba84272f7d61572fcf851c47b106e4acd44037798d9a7fd40547093521a87a180f6c3bac677a
+  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/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,12 +13,14 @@ 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

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/version.rb

@@ -5,7 +5,7 @@ module Servactory
     MAJOR = 2
     MINOR = 16
     PATCH = 0
-    PRE = "rc1"
+    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.16.0.rc1
+  version: 2.16.0.rc2
 platform: ruby
 authors:
 - Anton Sokolov