servactory 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff122141adf96c61aac5e2c89b9ca1ea0644ec4a9e106737e114108adbf06e17
-  data.tar.gz: 04d8ab68d2ce909e7b2ab9b92e3c4cd0c356385b87fd6f1b17040d16b22f9c43
+  metadata.gz: ddbffa6de1db943a943b369efceef704bb98c5160b13fcada0515069705af423
+  data.tar.gz: 4b6c33e2d95002a784468ee064ff83d90ce63e01f1ca323dc1afccad103c5063
 SHA512:
-  metadata.gz: 3eea6b5733b7a80ceeac63a5fd9e16492367da3d3bd3ffbbdda343791578a788388eb1b77873595fc710d7ca0a62985a971d2e1ba02d1048b35dede880ce63e6
-  data.tar.gz: 35a1dee0a933768875c583678019c6f62cecc4b05fe7ffaf000edd3a01596a6dba18fa0111cce3b876013994e492b91e05062e7690a01ebfdd9b3f415325e3b6
+  metadata.gz: f57071853afa1e92822161608af16e9d303b03bdbe769110cb27d9e59be3d77b4517da5b55d8fdc93a86bcfd470617d5094d8ea03eeb5dd5abad342ead7ae1e9
+  data.tar.gz: ff862da58716ac985651f59d74aa49f44d06b10c6d8e000bc45877575f83062567f97e0acbaaa9559091ba888ec3a0dde38d9db571f400726a2c9a06a13d042e

data/README.md

@@ -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/factory.rb

@@ -23,8 +23,12 @@ module Servactory
         Servactory.configuration.input_option_helpers.merge(input_option_helpers)
       end
 
-      def method_shortcuts(method_shortcuts)
-        Servactory.configuration.method_shortcuts.merge(method_shortcuts)
+      def aliases_for_make(aliases_for_make)
+        Servactory.configuration.aliases_for_make.merge(aliases_for_make)
+      end
+
+      def shortcuts_for_make(shortcuts_for_make)
+        Servactory.configuration.shortcuts_for_make.merge(shortcuts_for_make)
       end
     end
   end

data/lib/servactory/configuration/setup.rb

@@ -8,7 +8,8 @@ module Servactory
                     :output_error_class,
                     :failure_class,
                     :input_option_helpers,
-                    :method_shortcuts
+                    :aliases_for_make,
+                    :shortcuts_for_make
 
       def initialize
         @input_error_class = Servactory::Errors::InputError
@@ -19,7 +20,8 @@ module Servactory
 
         @input_option_helpers = Servactory::Inputs::OptionHelpersCollection.new(default_input_option_helpers)
 
-        @method_shortcuts = Servactory::Methods::Shortcuts::Collection.new
+        @aliases_for_make = Servactory::Methods::AliasesForMake::Collection.new
+        @shortcuts_for_make = Servactory::Methods::ShortcutsForMake::Collection.new
       end
 
       private

data/lib/servactory/context/callable.rb

@@ -6,8 +6,6 @@ module Servactory
       def call!(arguments = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         @context_store = Store.new(self)
 
-        context_store.context.send(:assign_service_strict_mode, true)
-
         assign_data_with(arguments)
 
         inputs_workbench.find_unnecessary!
@@ -20,9 +18,7 @@ module Servactory
 
         methods_workbench.run!
 
-        context_store.context.raise_first_fail
-
-        Servactory::Result.prepare_for(
+        Servactory::Result.success_for(
           context: context_store.context,
           collection_of_outputs: collection_of_outputs
         )
@@ -31,8 +27,6 @@ module Servactory
       def call(arguments = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         @context_store = Store.new(self)
 
-        context_store.context.send(:assign_service_strict_mode, false)
-
         assign_data_with(arguments)
 
         inputs_workbench.find_unnecessary!
@@ -45,10 +39,12 @@ module Servactory
 
         methods_workbench.run!
 
-        Servactory::Result.prepare_for(
+        Servactory::Result.success_for(
           context: context_store.context,
           collection_of_outputs: collection_of_outputs
         )
+      rescue Servactory.configuration.failure_class => e
+        Servactory::Result.failure_for(exception: e)
       end
 
       private

data/lib/servactory/context/workspace.rb

@@ -18,16 +18,6 @@ module Servactory
       end
       alias out outputs
 
-      def errors
-        @errors ||= Servactory::Errors::Collection.new
-      end
-
-      def raise_first_fail
-        return if (tmp_errors = errors.for_fails.not_blank).empty?
-
-        raise tmp_errors.first
-      end
-
       protected
 
       def fail_input!(input_name, message:)
@@ -37,22 +27,8 @@ module Servactory
         )
       end
 
-      def fail!(
-        message:,
-        failure_class: Servactory.configuration.failure_class,
-        meta: nil
-      )
-        failure = failure_class.new(message: message, meta: meta)
-
-        raise failure if @service_strict_mode
-
-        errors << failure
-      end
-
-      private
-
-      def assign_service_strict_mode(flag)
-        @service_strict_mode = flag
+      def fail!(message:, meta: nil)
+        raise Servactory.configuration.failure_class.new(message: message, meta: meta)
       end
     end
   end

data/lib/servactory/methods/aliases_for_make/collection.rb

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

data/lib/servactory/methods/dsl.rb

@@ -58,9 +58,28 @@ module Servactory
           collection_of_stages << @current_stage
         end
 
-        def method_missing(shortcut_name, *args, &block)
-          return super unless Servactory.configuration.method_shortcuts.include?(shortcut_name)
+        def method_missing(name, *args, &block)
+          if Servactory.configuration.aliases_for_make.include?(name)
+            return method_missing_for_aliases_for_make(name, *args, &block)
+          end
+
+          if Servactory.configuration.shortcuts_for_make.include?(name)
+            return method_missing_for_shortcuts_for_make(name, *args, &block)
+          end
+
+          super
+        end
+
+        def method_missing_for_aliases_for_make(_alias_name, *args, &block) # rubocop:disable Lint/UnusedMethodArgument
+          method_name = args.first
+          method_options = args.last.is_a?(Hash) ? args.pop : {}
+
+          return if method_name.nil?
+
+          make(method_name, **method_options)
+        end
 
+        def method_missing_for_shortcuts_for_make(shortcut_name, *args, &block) # rubocop:disable Lint/UnusedMethodArgument
           method_options = args.last.is_a?(Hash) ? args.pop : {}
 
           args.each do |method_name|
@@ -69,7 +88,9 @@ module Servactory
         end
 
         def respond_to_missing?(shortcut_name, *)
-          Servactory.configuration.method_shortcuts.include?(shortcut_name) || super
+          Servactory.configuration.aliases_for_make.include?(shortcut_name) ||
+            Servactory.configuration.shortcuts_for_make.include?(name) ||
+            super
         end
 
         def next_position

data/lib/servactory/methods/{shortcuts → shortcuts_for_make}/collection.rb

@@ -2,7 +2,7 @@
 
 module Servactory
   module Methods
-    module Shortcuts
+    module ShortcutsForMake
       class Collection
         # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
         extend Forwardable

data/lib/servactory/result.rb

@@ -2,15 +2,30 @@
 
 module Servactory
   class Result
-    def self.prepare_for(...)
-      new.send(:prepare_for, ...)
+    def self.success_for(...)
+      new.send(:success_for, ...)
+    end
+
+    def self.failure_for(...)
+      new.send(:failure_for, ...)
     end
 
     private
 
-    def prepare_for(context:, collection_of_outputs:)
+    def success_for(context:, collection_of_outputs:)
       prepare_outputs_with(context: context, collection_of_outputs: collection_of_outputs)
-      prepare_statuses_with(context: context)
+
+      define_singleton_method(:success?) { true }
+      define_singleton_method(:failure?) { false }
+
+      self
+    end
+
+    def failure_for(exception:)
+      define_singleton_method(:error) { exception }
+
+      define_singleton_method(:success?) { false }
+      define_singleton_method(:failure?) { true }
 
       self
     end
@@ -22,11 +37,5 @@ module Servactory
         instance_variable_set(:"@#{output.name}", context.instance_variable_get(:"@#{output.name}"))
       end
     end
-
-    def prepare_statuses_with(context:)
-      define_singleton_method(:errors) { context.errors }
-      define_singleton_method(:success?) { context.errors.empty? }
-      define_singleton_method(:failure?) { !context.errors.empty? }
-    end
   end
 end

data/lib/servactory/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-17 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -202,7 +202,6 @@ files:
 - lib/servactory/context/workspace/outputs.rb
 - lib/servactory/engine.rb
 - lib/servactory/errors/base.rb
-- lib/servactory/errors/collection.rb
 - lib/servactory/errors/failure.rb
 - lib/servactory/errors/input_error.rb
 - lib/servactory/errors/internal_error.rb
@@ -235,10 +234,11 @@ files:
 - lib/servactory/internals/validations/base.rb
 - lib/servactory/internals/validations/type.rb
 - lib/servactory/internals/workbench.rb
+- lib/servactory/methods/aliases_for_make/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/shortcuts_for_make/collection.rb
 - lib/servactory/methods/stage.rb
 - lib/servactory/methods/stage_collection.rb
 - lib/servactory/methods/workbench.rb

data/lib/servactory/errors/collection.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Errors
-    class Collection
-      # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
-      extend Forwardable
-      def_delegators :@collection, :<<, :to_a, :filter, :reject, :empty?, :first
-
-      def initialize(collection = Set.new)
-        @collection = collection
-      end
-
-      def not_blank
-        Collection.new(reject(&:blank?))
-      end
-
-      def for_fails
-        filtered = filter { |error| error.is_a?(Failure) }
-
-        Collection.new(filtered)
-      end
-    end
-  end
-end