servactory 1.6.3 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 321c1d5afff2d05fca47c222254ed759bcab36acce61f346d4a141f936e25fa7
-  data.tar.gz: 9820d66f4f2985665b3552583c2f84eddeb6860cb588c5444da7f32d32bf6c89
+  metadata.gz: 7e0ef0253d0030321767ea6a532f52fada7923dcf9f0cc87e7651d7df5a1ec57
+  data.tar.gz: 5e080cef06176ffdd734802503cf987fa6608f3acccf7d1497da6ad0968142c9
 SHA512:
-  metadata.gz: 3db3d15d89132bcb65afe6d25f278cb59e3c40f1cae70a02bb9f8af681356dc2aa14e05017c03088a10baf6b1de22833aaa3b70fb6f3138027cb283a279b77cb
-  data.tar.gz: 1d01c55aba13762649115010a8cb3ca99489773abc8d48236529139318f9f12e636de08b8b66c417157918ff44b7223d0d9bd9a0f9faa9663aef1e908a869d79
+  metadata.gz: 1195d6f2dcebe355307197eaf11cf0591ba5d9486020572afc8e4991741920664d0f8525052c1d1742e9af14eee627634e7be439529e9827ecfdaa437e87c8a0
+  data.tar.gz: 48ed814dff14b30ac71d3484649ac7412e54ec8edcdc2bc8bcaa925d2babac1573efd473547717d83ea821064926ca8a9810c34fa91995d018d7b5e6c23bc221

data/README.md

@@ -11,7 +11,7 @@ See [servactory.com](https://servactory.com) for documentation.
 
 ## Contributing
 
-This project is intended to be a safe, welcoming space for collaboration. Contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct. We recommend reading the [contributing guide](./docs/pages/CONTRIBUTING.md) as well.
+This project is intended to be a safe, welcoming space for collaboration. Contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct. We recommend reading the [contributing guide](./website/docs/CONTRIBUTING.md) as well.
 
 ## License
 

data/lib/servactory/methods/dsl.rb

@@ -11,13 +11,45 @@ module Servactory
         def inherited(child)
           super
 
-          child.send(:collection_of_methods).merge(collection_of_methods)
+          child.send(:collection_of_stages).merge(collection_of_stages)
         end
 
         private
 
-        def make(name, **options)
-          collection_of_methods << Method.new(name, **options)
+        def stage(&block)
+          @current_stage = Stage.new(position: next_position)
+
+          instance_eval(&block)
+
+          @current_stage = nil
+
+          nil
+        end
+
+        def wrap_in(wrapper)
+          return if @current_stage.blank?
+
+          @current_stage.wrapper = wrapper
+        end
+
+        def rollback(rollback)
+          return if @current_stage.blank?
+
+          @current_stage.rollback = rollback
+        end
+
+        def make(name, position: nil, **options)
+          position = position.presence || next_position
+
+          @current_stage = @current_stage.presence || Stage.new(position: position)
+
+          @current_stage.methods << Method.new(
+            name,
+            position: position,
+            **options
+          )
+
+          collection_of_stages << @current_stage
         end
 
         def method_missing(shortcut_name, *args, &block)
@@ -34,12 +66,16 @@ module Servactory
           Servactory.configuration.method_shortcuts.include?(shortcut_name) || super
         end
 
-        def collection_of_methods
-          @collection_of_methods ||= Collection.new
+        def next_position
+          collection_of_stages.size + 1
+        end
+
+        def collection_of_stages
+          @collection_of_stages ||= StageCollection.new
         end
 
         def methods_workbench
-          @methods_workbench ||= Workbench.work_with(collection_of_methods)
+          @methods_workbench ||= Workbench.work_with(collection_of_stages)
         end
       end
     end

data/lib/servactory/methods/method.rb

@@ -4,11 +4,13 @@ module Servactory
   module Methods
     class Method
       attr_reader :name,
+                  :position,
                   :condition,
                   :is_condition_opposite
 
-      def initialize(name, **options)
+      def initialize(name, position:, **options)
         @name = name
+        @position = position
 
         @is_condition_opposite = false
         @condition = options.fetch(:if, nil)

data/lib/servactory/methods/method_collection.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Methods
+    class MethodCollection
+      # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
+      extend Forwardable
+      def_delegators :@collection, :<<, :each, :sort_by
+
+      def initialize(collection = Set.new)
+        @collection = collection
+      end
+
+      def sorted_by_position
+        MethodCollection.new(sort_by(&:position))
+      end
+    end
+  end
+end

data/lib/servactory/methods/stage.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Methods
+    class Stage
+      attr_accessor :position,
+                    :wrapper,
+                    :rollback
+
+      def initialize(position:, wrapper: nil, rollback: nil)
+        @position = position
+        @wrapper = wrapper
+        @rollback = rollback
+      end
+
+      def next_method_position
+        methods.size + 1
+      end
+
+      def methods
+        @methods ||= MethodCollection.new
+      end
+    end
+  end
+end

data/lib/servactory/methods/stage_collection.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Methods
+    class StageCollection
+      # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
+      extend Forwardable
+      def_delegators :@collection, :<<, :each, :merge, :sort_by, :size, :empty?
+
+      def initialize(collection = Set.new)
+        @collection = collection
+      end
+
+      def sorted_by_position
+        StageCollection.new(sort_by(&:position))
+      end
+    end
+  end
+end

data/lib/servactory/methods/workbench.rb

@@ -7,8 +7,8 @@ module Servactory
         new(...)
       end
 
-      def initialize(collection_of_methods)
-        @collection_of_methods = collection_of_methods
+      def initialize(collection_of_stages)
+        @collection_of_stages = collection_of_stages
       end
 
       def assign(context:)
@@ -16,24 +16,48 @@ module Servactory
       end
 
       def run!
-        return try_to_use_call if collection_of_methods.empty?
+        return try_to_use_call if collection_of_stages.empty?
 
-        collection_of_methods.each do |make_method|
-          next if unnecessary_for?(make_method)
-
-          context.send(make_method.name)
+        collection_of_stages.sorted_by_position.each do |stage|
+          call_stage(stage)
         end
       end
 
       private
 
       attr_reader :context,
-                  :collection_of_methods
+                  :collection_of_stages
 
       def try_to_use_call
         context.try(:send, :call)
       end
 
+      def call_stage(stage)
+        wrapper = stage.wrapper
+        rollback = stage.rollback
+        methods = stage.methods.sorted_by_position
+
+        if wrapper.is_a?(Proc)
+          call_wrapper_with_methods(wrapper, rollback, methods)
+        else
+          call_methods(methods)
+        end
+      end
+
+      def call_wrapper_with_methods(wrapper, rollback, methods)
+        wrapper.call(methods: -> { call_methods(methods) })
+      rescue StandardError => e
+        context.send(rollback, e) if rollback.present?
+      end
+
+      def call_methods(methods)
+        methods.each do |make_method|
+          next if unnecessary_for?(make_method)
+
+          context.send(make_method.name)
+        end
+      end
+
       def unnecessary_for?(make_method)
         condition = make_method.condition
         is_condition_opposite = make_method.is_condition_opposite

data/lib/servactory/version.rb

@@ -4,7 +4,7 @@ module Servactory
   module VERSION
     MAJOR = 1
     MINOR = 6
-    PATCH = 3
+    PATCH = 5
 
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.5
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -231,10 +231,12 @@ files:
 - lib/servactory/internals/validations/base.rb
 - lib/servactory/internals/validations/type.rb
 - lib/servactory/internals/workbench.rb
-- lib/servactory/methods/collection.rb
 - lib/servactory/methods/dsl.rb
 - lib/servactory/methods/method.rb
+- lib/servactory/methods/method_collection.rb
 - lib/servactory/methods/shortcuts/collection.rb
+- lib/servactory/methods/stage.rb
+- lib/servactory/methods/stage_collection.rb
 - lib/servactory/methods/workbench.rb
 - lib/servactory/outputs/collection.rb
 - lib/servactory/outputs/dsl.rb
@@ -252,7 +254,9 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/afuno/servactory
+  documentation_uri: https://servactory.com
   source_code_uri: https://github.com/afuno/servactory
+  bug_tracker_uri: https://github.com/afuno/servactory/issues
   changelog_uri: https://github.com/afuno/servactory/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:

data/lib/servactory/methods/collection.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Methods
-    class Collection
-      # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
-      extend Forwardable
-      def_delegators :@collection, :<<, :each, :merge, :empty?
-
-      def initialize(*)
-        @collection = Set.new
-      end
-    end
-  end
-end