servactory 1.6.14 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a9d23fed4bbdc5728e707c47939ccfd2ed055c3bf052300908d09816ce580b7
-  data.tar.gz: e64b68886cb0e74706fddf989f1facedf37fd6020419f1d11f533229688b55f1
+  metadata.gz: 16aa240b4c12f35c6cf2c43e1c5d56bdd39e19d40321ad3f66ac0bdd6ebcf110
+  data.tar.gz: ad3418afd34e75c869424708dd080c27b192b6ffdc6770485e74fa70047a6620
 SHA512:
-  metadata.gz: b108bb63a08baef6a09e11aa85f93407ce857a309e6d7e816a089db79285df5020a216ee3c4a1bef5ab87dd82951058514d11fbcd6c6b7682e2d984170545856
-  data.tar.gz: 6ae5e3e1ab815608900749693d010397c584439f809e71aac8ccbf00007285b625bcbe258a45cec22c95f3ef340e5f1b0f202b1747d71cbe7902f3707a85ec06
+  metadata.gz: 472eb5c2643cdb648e57ae8586e6a06795da73b90f7b0a2fcac30c43f02c932ba897f01fe0707707846b93b8131d4f16d7d0b143b4e3e08988dc7e5891cbaca3
+  data.tar.gz: e25034c6b2d4c166e27c9db570db16e1436ff7cca39de6a9cb8ce6a8754f835968c2afe21b9ee287a31661e3801715503a78c09294974cabd893da07137c8f1a

data/README.md

@@ -24,7 +24,7 @@ class UserService::Authenticate < ApplicationService::Base
 
   def call
     if (user = User.find_by(email: inputs.email)&.authenticate(inputs.password))
-      self.user = user
+      outputs.user = user
     else
       fail!(message: "Authentication failed")
     end
@@ -43,7 +43,7 @@ class SessionsController < ApplicationController
       session[:current_user_id] = service_result.user.id
       redirect_to service_result.user
     else
-      flash.now[:message] = service_result.errors.first.message
+      flash.now[:message] = service_result.error.message
       render :new
     end
   end

data/lib/servactory/configuration/setup.rb

@@ -27,7 +27,6 @@ module Servactory
       def default_input_option_helpers
         Set[
           Servactory::Inputs::OptionHelper.new(name: :optional, equivalent: { required: false }),
-          Servactory::Inputs::OptionHelper.new(name: :internal, equivalent: { internal: true }),
           Servactory::Inputs::OptionHelper.new(name: :as_array, equivalent: { array: true })
         ]
       end

data/lib/servactory/context/callable.rb

@@ -16,8 +16,6 @@ module Servactory
           collection_of_internals: collection_of_internals
         )
 
-        prepare_data
-
         inputs_workbench.validate!
 
         methods_workbench.run!
@@ -43,8 +41,6 @@ module Servactory
           collection_of_internals: collection_of_internals
         )
 
-        prepare_data
-
         inputs_workbench.validate!
 
         methods_workbench.run!
@@ -69,12 +65,6 @@ module Servactory
         outputs_workbench.assign(context: context_store.context)
         methods_workbench.assign(context: context_store.context)
       end
-
-      def prepare_data
-        inputs_workbench.prepare      # 1
-        outputs_workbench.prepare     # 2
-        internals_workbench.prepare   # 3
-      end
     end
   end
 end

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

@@ -3,9 +3,46 @@
 module Servactory
   module Context
     module Workspace
+      # class Inputs
+      #   def initialize(**)
+      #     # NOTE: Look at the file `lib/servactory/inputs/tools/prepare.rb`
+      #   end
+      # end
+
       class Inputs
-        def initialize(**)
-          # NOTE: Look at the file `lib/servactory/inputs/tools/prepare.rb`
+        def initialize(context, workbench:)
+          @context = context
+
+          @collection_of_inputs = workbench.collection
+          @incoming_arguments = workbench.incoming_arguments
+        end
+
+        def method_missing(name, *args, &block)
+          if name.to_s.end_with?("=")
+            super
+          else
+            getter_with(name: name) { super }
+          end
+        end
+
+        def respond_to_missing?(name, *)
+          @collection_of_inputs.names.include?(name) || super
+        end
+
+        private
+
+        def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
+          input = @collection_of_inputs.find_by(name: name)
+
+          return yield if input.nil?
+
+          input_value = @incoming_arguments.fetch(input.name, nil)
+          input_value = input.default if input.optional? && input_value.blank?
+
+          input_prepare = input.prepare.fetch(:in, nil)
+          input_value = input_prepare.call(value: input_value) if input_prepare.present?
+
+          input_value
         end
       end
     end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Context
+    module Workspace
+      class Internals
+        def initialize(context, workbench:)
+          @context = context
+          @collection_of_internals = workbench.collection
+        end
+
+        def method_missing(name, *args, &block)
+          if name.to_s.end_with?("=")
+            setter_with(name: name, value: args.pop) { super }
+          else
+            getter_with(name: name) { super }
+          end
+        end
+
+        def respond_to_missing?(name, *)
+          @collection_of_internals.names.include?(name) || super
+        end
+
+        private
+
+        def setter_with(name:, value:, &block) # rubocop:disable Lint/UnusedMethodArgument
+          prepared_name = name.to_s.delete("=").to_sym
+
+          return yield unless @collection_of_internals.names.include?(prepared_name)
+
+          internal = @collection_of_internals.find_by(name: prepared_name)
+
+          Servactory::Internals::Validations::Type.validate!(
+            context: @context,
+            internal: internal,
+            value: value
+          )
+
+          @context.instance_variable_set(:"@#{internal.name}", value)
+        end
+
+        def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
+          internal = @collection_of_internals.find_by(name: name)
+
+          return yield if internal.nil?
+
+          @context.instance_variable_get(:"@#{internal.name}")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Context
+    module Workspace
+      class Outputs
+        def initialize(context, workbench:)
+          @context = context
+          @collection_of_outputs = workbench.collection
+        end
+
+        def method_missing(name, *args, &block)
+          if name.to_s.end_with?("=")
+            setter_with(name: name, value: args.pop) { super }
+          else
+            getter_with(name: name) { super }
+          end
+        end
+
+        def respond_to_missing?(name, *)
+          @collection_of_outputs.names.include?(name) || super
+        end
+
+        private
+
+        def setter_with(name:, value:, &block) # rubocop:disable Lint/UnusedMethodArgument
+          prepared_name = name.to_s.delete("=").to_sym
+
+          return yield unless @collection_of_outputs.names.include?(prepared_name)
+
+          output = @collection_of_outputs.find_by(name: prepared_name)
+
+          Servactory::Outputs::Validations::Type.validate!(
+            context: @context,
+            output: output,
+            value: value
+          )
+
+          @context.instance_variable_set(:"@#{output.name}", value)
+        end
+
+        def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
+          output = @collection_of_outputs.find_by(name: name)
+
+          return yield if output.nil?
+
+          @context.instance_variable_get(:"@#{output.name}")
+        end
+      end
+    end
+  end
+end

data/lib/servactory/context/workspace.rb

@@ -3,12 +3,27 @@
 module Servactory
   module Context
     module Workspace
+      def inputs
+        @inputs ||= Inputs.new(self, workbench: self.class.send(:inputs_workbench))
+      end
+      alias inp inputs
+
+      def internals
+        @internals ||= Internals.new(self, workbench: self.class.send(:internals_workbench))
+      end
+      alias int internals
+
+      def outputs
+        @outputs ||= Outputs.new(self, workbench: self.class.send(:outputs_workbench))
+      end
+      alias out outputs
+
       def errors
         @errors ||= Servactory::Errors::Collection.new
       end
 
-      def assign_inputs(inputs)
-        @inputs = inputs
+      def error
+        errors.first
       end
 
       def raise_first_fail
@@ -19,8 +34,6 @@ module Servactory
 
       protected
 
-      attr_reader :inputs
-
       def fail_input!(input_name, message:)
         raise Servactory.configuration.input_error_class.new(
           input_name: input_name,

data/lib/servactory/inputs/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, :merge
+      def_delegators :@collection, :<<, :each, :map, :merge, :find
 
       def initialize(*)
         @collection = Set.new
@@ -14,6 +14,10 @@ module Servactory
       def names
         map(&:name)
       end
+
+      def find_by(name:)
+        find { |input| input.internal_name == name }
+      end
     end
   end
 end

data/lib/servactory/inputs/workbench.rb

@@ -3,12 +3,15 @@
 module Servactory
   module Inputs
     class Workbench
+      attr_reader :collection,
+                  :incoming_arguments
+
       def self.work_with(...)
         new(...)
       end
 
-      def initialize(collection_of_inputs)
-        @collection_of_inputs = collection_of_inputs
+      def initialize(collection)
+        @collection = collection
       end
 
       def assign(context:, arguments:)
@@ -17,25 +20,20 @@ module Servactory
       end
 
       def find_unnecessary!
-        Tools::FindUnnecessary.validate!(context, @incoming_arguments, collection_of_inputs)
+        Tools::FindUnnecessary.validate!(context, @incoming_arguments, collection)
       end
 
       def check_rules!
-        Tools::Rules.validate!(context, collection_of_inputs)
-      end
-
-      def prepare
-        Tools::Prepare.prepare(context, @incoming_arguments, collection_of_inputs)
+        Tools::Rules.validate!(context, collection)
       end
 
       def validate!
-        Tools::Validation.validate!(context, @incoming_arguments, collection_of_inputs)
+        Tools::Validation.validate!(context, @incoming_arguments, collection)
       end
 
       private
 
-      attr_reader :context,
-                  :collection_of_inputs
+      attr_reader :context
     end
   end
 end

data/lib/servactory/internals/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, :merge
+      def_delegators :@collection, :<<, :each, :map, :merge, :find
 
       def initialize(*)
         @collection = Set.new
@@ -14,6 +14,10 @@ module Servactory
       def names
         map(&:name)
       end
+
+      def find_by(name:)
+        find { |internal| internal.name == name }
+      end
     end
   end
 end

data/lib/servactory/internals/workbench.rb

@@ -3,26 +3,23 @@
 module Servactory
   module Internals
     class Workbench
+      attr_reader :collection
+
       def self.work_with(...)
         new(...)
       end
 
-      def initialize(collection_of_internals)
-        @collection_of_internals = collection_of_internals
+      def initialize(collection)
+        @collection = collection
       end
 
       def assign(context:)
         @context = context
       end
 
-      def prepare
-        Tools::Prepare.prepare(context, collection_of_internals)
-      end
-
       private
 
-      attr_reader :context,
-                  :collection_of_internals
+      attr_reader :context
     end
   end
 end

data/lib/servactory/outputs/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, :merge
+      def_delegators :@collection, :<<, :each, :map, :merge, :find
 
       def initialize(*)
         @collection = Set.new
@@ -14,6 +14,10 @@ module Servactory
       def names
         map(&:name)
       end
+
+      def find_by(name:)
+        find { |output| output.name == name }
+      end
     end
   end
 end

data/lib/servactory/outputs/workbench.rb

@@ -3,12 +3,14 @@
 module Servactory
   module Outputs
     class Workbench
+      attr_reader :collection
+
       def self.work_with(...)
         new(...)
       end
 
-      def initialize(collection_of_outputs)
-        @collection_of_outputs = collection_of_outputs
+      def initialize(collection)
+        @collection = collection
       end
 
       def assign(context:)
@@ -16,16 +18,12 @@ module Servactory
       end
 
       def find_conflicts_in!(collection_of_internals:)
-        Tools::Conflicts.validate!(context, collection_of_outputs, collection_of_internals)
-      end
-
-      def prepare
-        Tools::Prepare.prepare(context, collection_of_outputs)
+        Tools::Conflicts.validate!(context, collection, collection_of_internals)
       end
 
       private
 
-      attr_reader :context, :collection_of_outputs
+      attr_reader :context
     end
   end
 end

data/lib/servactory/result.rb

@@ -25,6 +25,7 @@ module Servactory
 
     def prepare_statuses_with(context:)
       define_singleton_method(:errors) { context.errors }
+      define_singleton_method(:error) { context.error }
       define_singleton_method(:success?) { context.errors.empty? }
       define_singleton_method(:failure?) { !context.errors.empty? }
     end

data/lib/servactory/version.rb

@@ -3,8 +3,8 @@
 module Servactory
   module VERSION
     MAJOR = 1
-    MINOR = 6
-    PATCH = 14
+    MINOR = 7
+    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.6.14
+  version: 1.7.1
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -198,6 +198,8 @@ files:
 - lib/servactory/context/store.rb
 - lib/servactory/context/workspace.rb
 - lib/servactory/context/workspace/inputs.rb
+- lib/servactory/context/workspace/internals.rb
+- lib/servactory/context/workspace/outputs.rb
 - lib/servactory/engine.rb
 - lib/servactory/errors/base.rb
 - lib/servactory/errors/collection.rb
@@ -218,7 +220,6 @@ files:
 - lib/servactory/inputs/options_collection.rb
 - lib/servactory/inputs/tools/check_errors.rb
 - lib/servactory/inputs/tools/find_unnecessary.rb
-- lib/servactory/inputs/tools/prepare.rb
 - lib/servactory/inputs/tools/rules.rb
 - lib/servactory/inputs/tools/validation.rb
 - lib/servactory/inputs/validations/base.rb
@@ -231,7 +232,6 @@ files:
 - lib/servactory/internals/collection.rb
 - lib/servactory/internals/dsl.rb
 - lib/servactory/internals/internal.rb
-- lib/servactory/internals/tools/prepare.rb
 - lib/servactory/internals/validations/base.rb
 - lib/servactory/internals/validations/type.rb
 - lib/servactory/internals/workbench.rb
@@ -246,7 +246,6 @@ files:
 - lib/servactory/outputs/dsl.rb
 - lib/servactory/outputs/output.rb
 - lib/servactory/outputs/tools/conflicts.rb
-- lib/servactory/outputs/tools/prepare.rb
 - lib/servactory/outputs/validations/base.rb
 - lib/servactory/outputs/validations/type.rb
 - lib/servactory/outputs/workbench.rb

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

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    module Tools
-      class Prepare
-        def self.prepare(...)
-          new(...).prepare
-        end
-
-        def initialize(context, incoming_arguments, collection_of_inputs)
-          @context = context
-          @incoming_arguments = incoming_arguments
-          @collection_of_inputs = collection_of_inputs
-        end
-
-        def prepare
-          @inputs_variables = {}
-          @internal_variables = {}
-
-          @collection_of_inputs.each do |input|
-            process_input(input)
-          end
-
-          create_instance_variables
-        end
-
-        private
-
-        def process_input(input)
-          input_value = @incoming_arguments.fetch(input.name, nil)
-          input_value = input.default if input.optional? && input_value.blank?
-
-          input_prepare = input.prepare.fetch(:in, nil)
-          input_value = input_prepare.call(value: input_value) if input_prepare.present?
-
-          if input.internal?
-            @internal_variables[input.name] = input_value
-          else
-            @inputs_variables[input.internal_name] = input_value
-          end
-        end
-
-        def create_instance_variables
-          inputs_class = Servactory::Context::Workspace::Inputs.dup
-          inputs_class.class_eval(class_inputs_template) if class_inputs_template.present?
-
-          @context.assign_inputs(inputs_class.new(**@inputs_variables))
-
-          @context.class.class_eval(context_internal_variables_template) if context_internal_variables_template.present?
-
-          @internal_variables.each do |input_name, input_value|
-            @context.instance_variable_set(:"@#{input_name}", input_value)
-          end
-        end
-
-        ########################################################################
-
-        # EXAMPLE:
-        #
-        #   attr_reader(*[:attr_1, :attr_2, :attr_3])
-        #
-        #   def initialize(attr_1:, attr_2:, attr_3:)
-        #     @attr_1 = attr_1; @attr_2 = attr_2; @attr_3 = attr_3;
-        #   end
-        #
-        def class_inputs_template
-          return if @inputs_variables.blank?
-
-          @class_inputs_template ||= <<-RUBY
-            attr_reader(*#{@inputs_variables.keys})
-
-            def initialize(#{@inputs_variables.keys.join(':, ')}:)
-              #{@inputs_variables.keys.map { |key| "@#{key} = #{key}" }.join('; ')}
-            end
-          RUBY
-        end
-
-        # EXAMPLE:
-        #
-        #   attr_reader(*[:attr_1])
-        #
-        def context_internal_variables_template
-          return if @internal_variables.blank?
-
-          @context_internal_variables_template ||= <<-RUBY
-            attr_reader(*#{@internal_variables.keys})
-          RUBY
-        end
-      end
-    end
-  end
-end

data/lib/servactory/internals/tools/prepare.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Internals
-    module Tools
-      class Prepare
-        def self.prepare(...)
-          new(...).prepare
-        end
-
-        def initialize(context, collection_of_internals)
-          @context = context
-          @collection_of_internals = collection_of_internals
-        end
-
-        def prepare
-          @collection_of_internals.each do |internal|
-            create_instance_variable_for(internal)
-          end
-        end
-
-        private
-
-        def create_instance_variable_for(internal)
-          @context.class.class_eval(context_internal_template_for(internal))
-        end
-
-        # EXAMPLE:
-        #
-        #   define_method(:user=) do |value|
-        #     Servactory::Internals::Validations::Type.validate!( context: self, internal:, value: )
-        #
-        #     instance_variable_set(:@user, value)
-        #   end
-        #
-        #   private attr_reader :user
-        #
-        def context_internal_template_for(internal)
-          <<-RUBY
-            define_method(:#{internal.name}=) do |value|
-              Servactory::Internals::Validations::Type.validate!(
-                context: self,
-                internal: internal,
-                value: value
-              )
-
-              instance_variable_set(:@#{internal.name}, value)
-            end
-
-            private
-
-            attr_reader :#{internal.name}
-          RUBY
-        end
-      end
-    end
-  end
-end

data/lib/servactory/outputs/tools/prepare.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Outputs
-    module Tools
-      class Prepare
-        def self.prepare(...)
-          new(...).prepare
-        end
-
-        def initialize(context, collection_of_outputs)
-          @context = context
-          @collection_of_outputs = collection_of_outputs
-        end
-
-        def prepare
-          @collection_of_outputs.each do |output|
-            create_instance_variable_for(output)
-          end
-        end
-
-        private
-
-        def create_instance_variable_for(output)
-          @context.class.class_eval(context_output_template_for(output))
-        end
-
-        # EXAMPLE:
-        #
-        #   define_method(:user=) do |value|
-        #     Servactory::Internals::Validations::Type.validate!( context: self, output:, value: )
-        #
-        #     instance_variable_set(:@user, value)
-        #   end
-        #
-        def context_output_template_for(output)
-          <<-RUBY
-            define_method(:#{output.name}=) do |value|
-              Servactory::Outputs::Validations::Type.validate!(
-                context: self,
-                output: output,
-                value: value
-              )
-
-              instance_variable_set(:@#{output.name}, value)
-            end
-
-            attr_reader :#{output.name}
-          RUBY
-        end
-      end
-    end
-  end
-end