servactory 1.4.7 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb2ed3b4e1672a4065624d3a71b210011fb793fc340319d62720502581bb9c15
-  data.tar.gz: 916e1cf10398a6d34baf87828acdacdbebdaf13a8e78736a3c60732e19149017
+  metadata.gz: 77f19d5b6971cbec1d9f9c5861d14cfe511d4bdcd7d4636349909d2fc66136cd
+  data.tar.gz: a0db50ba89379e4de2155b3b3d4b574bf0284aa23ef672071f1f0afa74ec5fb5
 SHA512:
-  metadata.gz: e75415f8a46cd15aa7a5a7943a2cef385a31ebc9f2b837f0149d5d95a0cae004fd232878e6b6fd5a0c8b539c439b2d6e3745a5e95deb349dae90566e3184943a
-  data.tar.gz: 59837e7e7339635926ce3c5bb4457b79dd9717d0bdc39ab91f9c9cb30cb30d32860a160ecf08d49504e2a3d2de136646734c5203a750bec8c3f814f3f3ba38ba
+  metadata.gz: 33720d025d61d2874b17181a5aa6d9f74ac060f1bb606da70495426c431afc1fb0e9d4ffdb8575a389a9d675fa0a900ef96a769df6653cc478d2df27176e894a
+  data.tar.gz: 7e2ec6b1c657b943154e2f41ca7b43fe45fb77bc172664811a48a6575e6459ae154759f800ce59d1b179f3ff760a0f8ebf6dd97f4a3eb67f78d094e9cf55870b

data/README.md

@@ -26,7 +26,7 @@ A set of tools for building reliable services of any complexity.
     - [Must](#must)
   - [Output attributes](#output-attributes)
   - [Internal attributes](#internal-attributes)
-  - [Stage](#stage)
+  - [Make](#make)
   - [Failures](#failures)
 - [I18n](#i18n)
 - [Testing](#testing)
@@ -102,7 +102,7 @@ end
 
 ```ruby
 class MinimalService < ApplicationService::Base
-  stage { make :call }
+  make :call
   
   private
   
@@ -164,8 +164,8 @@ With this approach, all input attributes are available only from `inputs`. This
 ```ruby
 class UsersService::Accept < ApplicationService::Base
   input :user, type: User
-  
-  stage { make :accept! }
+
+  make :accept!
   
   private
   
@@ -182,8 +182,8 @@ With this approach, all input attributes are available from `inputs` as well as
 ```ruby
 class UsersService::Accept < ApplicationService::Base
   input :user, type: User, internal: true
-  
-  stage { make :accept! }
+
+  make :accept!
   
   private
   
@@ -217,7 +217,7 @@ class NotificationService::Create < ApplicationService::Base
 
   output :notification, type: Notification
 
-  stage { make :create_notification! }
+  make :create_notification!
 
   private
 
@@ -273,8 +273,8 @@ class NotificationService::Create < ApplicationService::Base
   input :user, type: User
   
   output :notification, type: Notification
-  
-  stage { make :create_notification! }
+
+  make :create_notification!
   
   private
   
@@ -293,11 +293,9 @@ class NotificationService::Create < ApplicationService::Base
   internal :inviter, type: User
   
   output :notification, type: Notification
-  
-  stage do
-    make :assign_inviter
-    make :create_notification!
-  end
+
+  make :assign_inviter
+  make :create_notification!
   
   private
   
@@ -311,14 +309,12 @@ class NotificationService::Create < ApplicationService::Base
 end
 ```
 
-### Stage
-
-A "stage" is a single action or group of actions that needs to be "make".
+### Make
 
 #### Minimal example
 
 ```ruby
-stage { make :something }
+make :something
 
 def something
   # ...
@@ -328,26 +324,19 @@ end
 #### Condition
 
 ```ruby
-stage { make :something, if: -> { Settings.something.enabled } }
+make :something, if: -> { Settings.something.enabled }
 
 def something
   # ...
 end
 ```
 
-#### Groups
-
-The functionality of stage groups will be expanded in future releases.
+#### Several
 
 ```ruby
-stage do
-  make :assign_api_model
-  make :perform_api_request
-end
-
-stage do
-  make :process_result
-end
+make :assign_api_model
+make :perform_api_request
+make :process_result
 
 def assign_api_model
   self.api_model = APIModel.new
@@ -362,14 +351,18 @@ def process_result
 end
 ```
 
+#### Inheritance
+
+Service inheritance is also supported.
+
 ### Failures
 
-The methods that are used in the stages may fail. In order to more informatively provide information about this outside the service, the following methods were prepared.
+The methods that are used in `make` may fail. In order to more informatively provide information about this outside the service, the following methods were prepared.
 
 #### Fail
 
 ```ruby
-stage { make :check! }
+make :check!
 
 def check!
   return if inputs.invoice_number.start_with?("AA")
@@ -381,7 +374,7 @@ end
 #### Fail for input
 
 ```ruby
-stage { make :check! }
+make :check!
 
 def check!
   return if inputs.invoice_number.start_with?("AA")

data/lib/servactory/base.rb

@@ -7,7 +7,7 @@ module Servactory
     include InputArguments::DSL
     include InternalArguments::DSL
     include OutputArguments::DSL
-    include Stage::DSL
+    include MakeMethods::DSL
 
     private_class_method :new
   end

data/lib/servactory/context/callable.rb

@@ -18,7 +18,7 @@ module Servactory
 
         input_arguments_workbench.check!
 
-        stage_handyman.run_methods!
+        make_methods_workbench.run!
 
         context_store.context.raise_first_fail
 
@@ -43,7 +43,7 @@ module Servactory
 
         input_arguments_workbench.check!
 
-        stage_handyman.run_methods!
+        make_methods_workbench.run!
 
         Servactory::Result.prepare_for(
           context: context_store.context,
@@ -55,16 +55,15 @@ module Servactory
 
       attr_reader :context_store
 
-      def assign_data_with(arguments) # rubocop:disable Metrics/AbcSize
+      def assign_data_with(arguments)
         input_arguments_workbench.assign(
           context: context_store.context,
-          arguments: arguments,
-          collection_of_input_options: collection_of_input_options
+          arguments: arguments
         )
 
         internal_arguments_workbench.assign(context: context_store.context)
         output_arguments_workbench.assign(context: context_store.context)
-        stage_handyman&.assign(context: context_store.context)
+        make_methods_workbench.assign(context: context_store.context)
       end
 
       def prepare_data

data/lib/servactory/input_arguments/collection.rb

@@ -5,7 +5,7 @@ module Servactory
     class Collection
       # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
       extend Forwardable
-      def_delegators :@collection, :<<, :each, :map
+      def_delegators :@collection, :<<, :each, :map, :merge
 
       def initialize(*)
         @collection = Set.new

data/lib/servactory/input_arguments/dsl.rb

@@ -8,12 +8,17 @@ module Servactory
       end
 
       module ClassMethods
+        def inherited(child)
+          super
+
+          child.send(:collection_of_input_arguments).merge(collection_of_input_arguments)
+        end
+
         private
 
         def input(name, **options)
           collection_of_input_arguments << InputArgument.new(
             name,
-            collection_of_options: collection_of_input_options,
             **options
           )
         end
@@ -22,10 +27,6 @@ module Servactory
           @collection_of_input_arguments ||= Collection.new
         end
 
-        def collection_of_input_options
-          @collection_of_input_options ||= OptionsCollection.new
-        end
-
         def input_arguments_workbench
           @input_arguments_workbench ||= Workbench.work_with(collection_of_input_arguments)
         end

data/lib/servactory/input_arguments/input_argument.rb

@@ -6,24 +6,20 @@ module Servactory
       ARRAY_DEFAULT_VALUE = ->(is: false, message: nil) { { is: is, message: message } }
 
       attr_reader :name,
-                  :internal_name,
-                  :collection_of_options
+                  :internal_name
 
       # rubocop:disable Style/KeywordParametersOrder
       def initialize(
         name,
         as: nil,
-        collection_of_options:,
         type:,
         **options
       )
         @name = name
         @internal_name = as.present? ? as : name
-        @collection_of_options = collection_of_options
-
         add_basic_options_with(type: type, options: options)
 
-        @collection_of_options.each do |option|
+        collection_of_options.each do |option|
           self.class.attr_reader(:"#{option.name}")
 
           instance_variable_set(:"@#{option.name}", option.value)
@@ -182,6 +178,10 @@ module Servactory
         )
       end
 
+      def collection_of_options
+        @collection_of_options ||= OptionsCollection.new
+      end
+
       def options_for_checks
         collection_of_options.options_for_checks
       end

data/lib/servactory/input_arguments/tools/check.rb

@@ -8,11 +8,10 @@ module Servactory
           new(...).check!
         end
 
-        def initialize(context, incoming_arguments, collection_of_input_arguments, collection_of_input_options)
+        def initialize(context, incoming_arguments, collection_of_input_arguments)
           @context = context
           @incoming_arguments = incoming_arguments
           @collection_of_input_arguments = collection_of_input_arguments
-          @collection_of_input_options = collection_of_input_options
         end
 
         def check!
@@ -32,7 +31,7 @@ module Servactory
         end
 
         def process_option(check_key, check_options, input:)
-          check_classes.each do |check_class|
+          check_classes_from(input).each do |check_class|
             errors_from_checks = process_check_class(
               check_class,
               input: input,
@@ -56,8 +55,8 @@ module Servactory
 
         ########################################################################
 
-        def check_classes
-          @collection_of_input_options.check_classes
+        def check_classes_from(input)
+          input.collection_of_options.check_classes
         end
 
         ########################################################################

data/lib/servactory/input_arguments/workbench.rb

@@ -11,10 +11,9 @@ module Servactory
         @collection_of_input_arguments = collection_of_input_arguments
       end
 
-      def assign(context:, arguments:, collection_of_input_options:)
+      def assign(context:, arguments:)
         @context = context
         @incoming_arguments = arguments
-        @collection_of_input_options = collection_of_input_options
       end
 
       def find_unnecessary!
@@ -30,14 +29,13 @@ module Servactory
       end
 
       def check!
-        Tools::Check.check!(context, @incoming_arguments, collection_of_input_arguments, collection_of_input_options)
+        Tools::Check.check!(context, @incoming_arguments, collection_of_input_arguments)
       end
 
       private
 
       attr_reader :context,
-                  :collection_of_input_arguments,
-                  :collection_of_input_options
+                  :collection_of_input_arguments
     end
   end
 end

data/lib/servactory/internal_arguments/collection.rb

@@ -5,7 +5,7 @@ module Servactory
     class Collection
       # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
       extend Forwardable
-      def_delegators :@collection, :<<, :each, :map
+      def_delegators :@collection, :<<, :each, :map, :merge
 
       def initialize(*)
         @collection = Set.new

data/lib/servactory/internal_arguments/dsl.rb

@@ -8,6 +8,12 @@ module Servactory
       end
 
       module ClassMethods
+        def inherited(child)
+          super
+
+          child.send(:collection_of_internal_arguments).merge(collection_of_internal_arguments)
+        end
+
         private
 
         def internal(name, **options)

data/lib/servactory/internal_arguments/workbench.rb

@@ -21,7 +21,8 @@ module Servactory
 
       private
 
-      attr_reader :context, :collection_of_internal_arguments
+      attr_reader :context,
+                  :collection_of_internal_arguments
     end
   end
 end

data/lib/servactory/{stage/methods.rb → make_methods/collection.rb}

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

data/lib/servactory/make_methods/dsl.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Servactory
+  module MakeMethods
+    module DSL
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def inherited(child)
+          super
+
+          child.send(:collection_of_make_methods).merge(collection_of_make_methods)
+        end
+
+        private
+
+        def make(name, **options)
+          collection_of_make_methods << MakeMethod.new(name, **options)
+        end
+
+        def collection_of_make_methods
+          @collection_of_make_methods ||= Collection.new
+        end
+
+        def make_methods_workbench
+          @make_methods_workbench ||= Workbench.work_with(collection_of_make_methods)
+        end
+      end
+    end
+  end
+end

data/lib/servactory/{stage/method.rb → make_methods/make_method.rb}

@@ -1,21 +1,16 @@
 # frozen_string_literal: true
 
 module Servactory
-  module Stage
-    class Method
-      attr_reader :name, :condition
+  module MakeMethods
+    class MakeMethod
+      attr_reader :name,
+                  :condition
 
       def initialize(name, **options)
         @name = name
 
         @condition = options.fetch(:if, nil)
       end
-
-      # def options
-      #   {
-      #     condition:
-      #   }
-      # end
     end
   end
 end

data/lib/servactory/make_methods/workbench.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Servactory
+  module MakeMethods
+    class Workbench
+      def self.work_with(...)
+        new(...)
+      end
+
+      def initialize(collection_of_make_methods)
+        @collection_of_make_methods = collection_of_make_methods
+      end
+
+      def assign(context:)
+        @context = context
+      end
+
+      def run!
+        collection_of_make_methods.each do |make_method|
+          next if unnecessary_for?(make_method)
+
+          context.send(make_method.name)
+        end
+      end
+
+      private
+
+      attr_reader :context,
+                  :collection_of_make_methods
+
+      def unnecessary_for?(make_method)
+        condition = make_method.condition
+
+        return false if condition.blank?
+        return !Servactory::Utils.boolean?(condition) unless condition.is_a?(Proc)
+
+        !condition.call(context)
+      end
+    end
+  end
+end

data/lib/servactory/output_arguments/collection.rb

@@ -5,7 +5,7 @@ module Servactory
     class Collection
       # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
       extend Forwardable
-      def_delegators :@collection, :<<, :each, :map
+      def_delegators :@collection, :<<, :each, :map, :merge
 
       def initialize(*)
         @collection = Set.new

data/lib/servactory/output_arguments/dsl.rb

@@ -8,6 +8,12 @@ module Servactory
       end
 
       module ClassMethods
+        def inherited(child)
+          super
+
+          child.send(:collection_of_output_arguments).merge(collection_of_output_arguments)
+        end
+
         private
 
         def output(name, **options)

data/lib/servactory/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.5.1
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2023-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -219,6 +219,10 @@ files:
 - lib/servactory/internal_arguments/internal_argument.rb
 - lib/servactory/internal_arguments/tools/prepare.rb
 - lib/servactory/internal_arguments/workbench.rb
+- lib/servactory/make_methods/collection.rb
+- lib/servactory/make_methods/dsl.rb
+- lib/servactory/make_methods/make_method.rb
+- lib/servactory/make_methods/workbench.rb
 - lib/servactory/output_arguments/checks/base.rb
 - lib/servactory/output_arguments/checks/type.rb
 - lib/servactory/output_arguments/collection.rb
@@ -228,11 +232,6 @@ files:
 - lib/servactory/output_arguments/tools/prepare.rb
 - lib/servactory/output_arguments/workbench.rb
 - lib/servactory/result.rb
-- lib/servactory/stage/dsl.rb
-- lib/servactory/stage/factory.rb
-- lib/servactory/stage/handyman.rb
-- lib/servactory/stage/method.rb
-- lib/servactory/stage/methods.rb
 - lib/servactory/utils.rb
 - lib/servactory/version.rb
 homepage: https://github.com/afuno/servactory

data/lib/servactory/stage/dsl.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Stage
-    module DSL
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        private
-
-        attr_reader :stage_handyman
-
-        def stage(&block)
-          @stage_factory ||= Factory.new
-
-          @stage_factory.instance_eval(&block)
-
-          @stage_handyman = Handyman.work_in(@stage_factory)
-
-          # @stage_factory
-
-          nil
-        end
-      end
-    end
-  end
-end

data/lib/servactory/stage/factory.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Stage
-    class Factory
-      def make(name, **options)
-        methods << Method.new(name, **options)
-      end
-
-      def methods
-        @methods ||= Methods.new
-      end
-    end
-  end
-end

data/lib/servactory/stage/handyman.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Stage
-    class Handyman
-      def self.work_in(...)
-        new(...)
-      end
-
-      def initialize(factory)
-        @factory = factory
-      end
-
-      def assign(context:)
-        @context = context
-      end
-
-      def methods
-        factory.methods
-      end
-
-      def run_methods!
-        methods.each do |method|
-          next if method.condition && !method.condition.call(context)
-
-          context.send(method.name)
-        end
-      end
-
-      private
-
-      attr_reader :factory, :context
-    end
-  end
-end