servactory 3.1.0.rc2 → 3.1.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a7c9b4d9ad2e7d15265ba278d740eb34e6df33590bf517a0b42d914dad46e22
-  data.tar.gz: 21ad5c1814f6bd2c62221057547f5388cf928fd1f937f37131dab041d6325983
+  metadata.gz: c5acfb374e0e85d7779b99658fcb899007ca346ca63c71344800490428ac61dd
+  data.tar.gz: 94ff484e768908909aa856d63310af3c896f198357b88c3089fe9393de53bc88
 SHA512:
-  metadata.gz: 9f231bf3c0662ec8285125cacd138d765622eb1ebad7e9eae5d95ae2dd84ad48f80a65783e208b3b9752e40e9bc755ca245bcf2f3b1c68b3724ca13a68d1f6a5
-  data.tar.gz: 8fb3f9f3bcf2a49f26d4cff76885537559ba4173c78585c2432fc7bf814a8e587303dc941c36a7992800bff1c561661cc04ae20beffbc17dac4d5a0af64de387
+  metadata.gz: 61facdd48b89752c3f2bfe0735c87c24f83c225c2474608c9aa871f150003a996b2b4775ef25941f0916f45524383cdf1e1814a237b522add763782c2ec03e9b
+  data.tar.gz: 13202fe9276b8323cd83fc2c0919613eeabfd9d99b4d1cfac541ef7ed88739a84c6d5719a44ca76fe960c33aaf6a66b1b9c9353e12a1e5662b8e19df05a68fd3

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Anton Sokolov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -52,7 +52,7 @@ gem "servactory"
 ### Define service
 
 ```ruby
-class UserService::Authenticate < Servactory::Base
+class Users::Authenticate < Servactory::Base
   input :email, type: String
   input :password, type: String
 
@@ -77,7 +77,7 @@ end
 ```ruby
 class SessionsController < ApplicationController
   def create
-    service = UserService::Authenticate.call(**session_params)
+    service = Users::Authenticate.call(**session_params)
 
     if service.success?
       session[:current_user_id] = service.user.id

data/config/locales/ja.yml

@@ -0,0 +1,134 @@
+ja:
+  servactory:
+    common:
+      undefined_method:
+        missing_name: "[%{service_class_name}] %{error_text}"
+    methods:
+      call:
+        not_used: "[%{service_class_name}] 実行する処理がありません。`make`を使用するか、`call`メソッドを作成してください。"
+      cannot_be_overwritten: "[%{service_class_name}] 次のメソッドは上書きできません: %{list_of_methods}"
+    inputs:
+      undefined:
+        for_fetch: "[%{service_class_name}] 未定義の入力`%{input_name}`"
+        for_assign: "[%{service_class_name}] 未定義の入力`%{input_name}`"
+      validations:
+        must:
+          default_error: "[%{service_class_name}] 入力`%{input_name}`は「%{code}」を満たす必要があります"
+          syntax_error: "[%{service_class_name}] 入力`%{input_name}`の`%{code}`内の構文エラー: %{exception_message}"
+          dynamic_options:
+            consists_of:
+              required: "[%{service_class_name}] 入力コレクション`%{input_name}`の必須要素が不足しています"
+              wrong_type: "[%{service_class_name}] 入力コレクション`%{input_name}`の型が不正です。`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+              wrong_element_type: "[%{service_class_name}] 入力コレクション`%{input_name}`の要素の型が不正です。`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+            format:
+              default: "[%{service_class_name}] 入力`%{input_name}`は`%{format_name}`フォーマットに一致しません"
+              wrong_pattern: "[%{service_class_name}] 入力`%{input_name}`は`%{format_name}`フォーマットに一致しません"
+              wrong_type: "[%{service_class_name}] 入力`%{input_name}`は`%{format_name}`フォーマット検証のためにStringである必要があります"
+              unknown: "[%{service_class_name}] 入力`%{input_name}`に指定された`%{format_name}`フォーマットは不明です"
+            inclusion:
+              default: "[%{service_class_name}] `%{input_name}`の値が不正です。`%{input_inclusion}`のいずれかである必要がありますが、`%{value}`が渡されました"
+              invalid_option: "[%{service_class_name}] 入力`%{input_name}`の`%{option_name}`オプションに値がありません"
+            min:
+              default: "[%{service_class_name}] 入力`%{input_name}`は値`%{value}`を受け取りましたが、`%{option_value}`より小さいです"
+            max:
+              default: "[%{service_class_name}] 入力`%{input_name}`は値`%{value}`を受け取りましたが、`%{option_value}`より大きいです"
+            multiple_of:
+              default: "[%{service_class_name}] 入力`%{input_name}`の値`%{value}`は`%{option_value}`の倍数ではありません"
+              blank: "[%{service_class_name}] 入力`%{input_name}`の`%{option_name}`オプションに無効な値`%{option_value}`があります"
+              divided_by_0: "[%{service_class_name}] 入力`%{input_name}`の`%{option_name}`オプションに無効な値`%{option_value}`があります"
+            schema:
+              wrong_type: "[%{service_class_name}] 入力`%{input_name}`の型が不正です。`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+              wrong_element_type: "[%{service_class_name}] 入力ハッシュ`%{input_name}`の型が不正です。`%{key_name}`には`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+              wrong_element_value: "[%{service_class_name}] 入力ハッシュ`%{input_name}`の値が不正です。`%{key_name}`には`%{expected_type}`型の値が期待されましたが、`%{given_type}`が渡されました"
+            target:
+              default: "[%{service_class_name}] 入力`%{input_name}`のターゲットが不正です。`%{expected_target}`である必要がありますが、`%{value}`が渡されました"
+              invalid_option: "[%{service_class_name}] 入力`%{input_name}`の`%{option_name}`オプションに値がありません"
+        required:
+          default_error:
+            default: "[%{service_class_name}] 必須の入力`%{input_name}`が不足しています"
+        type:
+          default_error:
+            default: "[%{service_class_name}] 入力`%{input_name}`の型が不正です。`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+      tools:
+        find_unnecessary:
+          error: "[%{service_class_name}] 予期しない属性: `%{unnecessary_attributes}`"
+        rules:
+          error: "[%{service_class_name}] 入力`%{input_name}`のオプションに競合があります: `%{conflict_code}`"
+    internals:
+      undefined:
+        for_fetch: "[%{service_class_name}] 未定義の内部属性`%{internal_name}`"
+        for_assign: "[%{service_class_name}] 未定義の内部属性`%{internal_name}`"
+      validations:
+        must:
+          default_error: "[%{service_class_name}] 内部属性`%{internal_name}`は「%{code}」を満たす必要があります"
+          syntax_error: "[%{service_class_name}] 内部属性`%{internal_name}`の`%{code}`内の構文エラー: %{exception_message}"
+          dynamic_options:
+            consists_of:
+              required: "[%{service_class_name}] 内部属性コレクション`%{internal_name}`の必須要素が不足しています"
+              wrong_type: "[%{service_class_name}] 内部属性コレクション`%{internal_name}`の型が不正です。`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+              wrong_element_type: "[%{service_class_name}] 内部属性コレクション`%{internal_name}`の要素の型が不正です。`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+            format:
+              default: "[%{service_class_name}] 内部属性`%{internal_name}`は`%{format_name}`フォーマットに一致しません"
+              wrong_pattern: "[%{service_class_name}] 内部属性`%{internal_name}`は`%{format_name}`フォーマットに一致しません"
+              wrong_type: "[%{service_class_name}] 内部属性`%{internal_name}`は`%{format_name}`フォーマット検証のためにStringである必要があります"
+              unknown: "[%{service_class_name}] 内部属性`%{internal_name}`に指定された`%{format_name}`フォーマットは不明です"
+            inclusion:
+              default: "[%{service_class_name}] `%{internal_name}`の値が不正です。`%{internal_inclusion}`のいずれかである必要がありますが、`%{value}`が渡されました"
+              invalid_option: "[%{service_class_name}] 内部属性`%{internal_name}`の`%{option_name}`オプションに値がありません"
+            min:
+              default: "[%{service_class_name}] 内部属性`%{internal_name}`は値`%{value}`を受け取りましたが、`%{option_value}`より小さいです"
+            max:
+              default: "[%{service_class_name}] 内部属性`%{internal_name}`は値`%{value}`を受け取りましたが、`%{option_value}`より大きいです"
+            multiple_of:
+              default: "[%{service_class_name}] 内部属性`%{internal_name}`の値`%{value}`は`%{option_value}`の倍数ではありません"
+              blank: "[%{service_class_name}] 内部属性`%{internal_name}`の`%{option_name}`オプションに無効な値`%{option_value}`があります"
+              divided_by_0: "[%{service_class_name}] 内部属性`%{internal_name}`の`%{option_name}`オプションに無効な値`%{option_value}`があります"
+            schema:
+              wrong_type: "[%{service_class_name}] 内部属性`%{internal_name}`の型が不正です。`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+              wrong_element_type: "[%{service_class_name}] 内部属性ハッシュ`%{internal_name}`の型が不正です。`%{key_name}`には`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+              wrong_element_value: "[%{service_class_name}] 内部属性ハッシュ`%{internal_name}`の値が不正です。`%{key_name}`には`%{expected_type}`型の値が期待されましたが、`%{given_type}`が渡されました"
+            target:
+              default: "[%{service_class_name}] 内部属性`%{internal_name}`のターゲットが不正です。`%{expected_target}`である必要がありますが、`%{value}`が渡されました"
+              invalid_option: "[%{service_class_name}] 内部属性`%{internal_name}`の`%{option_name}`オプションに値がありません"
+        type:
+          default_error:
+            default: "[%{service_class_name}] 内部属性`%{internal_name}`の型が不正です。`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+    outputs:
+      undefined:
+        for_fetch: "[%{service_class_name}] 未定義の出力属性`%{output_name}`"
+        for_assign: "[%{service_class_name}] 未定義の出力属性`%{output_name}`"
+      validations:
+        must:
+          default_error: "[%{service_class_name}] 出力属性`%{output_name}`は「%{code}」を満たす必要があります"
+          syntax_error: "[%{service_class_name}] 出力属性`%{output_name}`の`%{code}`内の構文エラー: %{exception_message}"
+          dynamic_options:
+            consists_of:
+              required: "[%{service_class_name}] 出力属性コレクション`%{output_name}`の必須要素が不足しています"
+              wrong_type: "[%{service_class_name}] 出力属性コレクション`%{output_name}`の型が不正です。`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+              wrong_element_type: "[%{service_class_name}] 出力属性コレクション`%{output_name}`の要素の型が不正です。`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+            format:
+              default: "[%{service_class_name}] 出力属性`%{output_name}`は`%{format_name}`フォーマットに一致しません"
+              wrong_pattern: "[%{service_class_name}] 出力属性`%{output_name}`は`%{format_name}`フォーマットに一致しません"
+              wrong_type: "[%{service_class_name}] 出力属性`%{output_name}`は`%{format_name}`フォーマット検証のためにStringである必要があります"
+              unknown: "[%{service_class_name}] 出力属性`%{output_name}`に指定された`%{format_name}`フォーマットは不明です"
+            inclusion:
+              default: "[%{service_class_name}] `%{output_name}`の値が不正です。`%{output_inclusion}`のいずれかである必要がありますが、`%{value}`が渡されました"
+              invalid_option: "[%{service_class_name}] 出力属性`%{output_name}`の`%{option_name}`オプションに値がありません"
+            min:
+              default: "[%{service_class_name}] 出力属性`%{output_name}`は値`%{value}`を受け取りましたが、`%{option_value}`より小さいです"
+            max:
+              default: "[%{service_class_name}] 出力属性`%{output_name}`は値`%{value}`を受け取りましたが、`%{option_value}`より大きいです"
+            multiple_of:
+              default: "[%{service_class_name}] 出力属性`%{output_name}`の値`%{value}`は`%{option_value}`の倍数ではありません"
+              blank: "[%{service_class_name}] 出力属性`%{output_name}`の`%{option_name}`オプションに無効な値`%{option_value}`があります"
+              divided_by_0: "[%{service_class_name}] 出力属性`%{output_name}`の`%{option_name}`オプションに無効な値`%{option_value}`があります"
+            schema:
+              wrong_type: "[%{service_class_name}] 出力属性`%{output_name}`の型が不正です。`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+              wrong_element_type: "[%{service_class_name}] 出力属性ハッシュ`%{output_name}`の型が不正です。`%{key_name}`には`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"
+              wrong_element_value: "[%{service_class_name}] 出力属性ハッシュ`%{output_name}`の値が不正です。`%{key_name}`には`%{expected_type}`型の値が期待されましたが、`%{given_type}`が渡されました"
+            target:
+              default: "[%{service_class_name}] 出力属性`%{output_name}`のターゲットが不正です。`%{expected_target}`である必要がありますが、`%{value}`が渡されました"
+              invalid_option: "[%{service_class_name}] 出力属性`%{output_name}`の`%{option_name}`オプションに値がありません"
+        type:
+          default_error:
+            default: "[%{service_class_name}] 出力属性`%{output_name}`の型が不正です。`%{expected_type}`が期待されましたが、`%{given_type}`が渡されました"

data/lib/generators/README.md

@@ -9,7 +9,7 @@ rails generate servactory:install [options]
 **Options:**
 - `--namespace` — Base namespace (default: `ApplicationService`)
 - `--path` — Path to install service files (default: `app/services`)
-- `--locales` — Locales to install (available: `en`, `ru`, `de`, `fr`, `es`, `it`)
+- `--locales` — Locales to install (available: `en`, `ru`, `de`, `fr`, `es`, `it`, `ja`)
 - `--minimal` — Generate minimal setup without configuration examples
 
 ## Service

data/lib/servactory/configuration/config.rb

@@ -30,6 +30,22 @@ module Servactory
         @collection_mode_class_names = original.collection_mode_class_names.dup
         @hash_mode_class_names = original.hash_mode_class_names.dup
         @action_rescue_handlers = original.action_rescue_handlers.dup
+
+        rebind_dynamic_option_helpers!
+      end
+
+      private
+
+      def rebind_dynamic_option_helpers!
+        new_consists_of = Servactory::ToolKit::DynamicOptions::ConsistsOf
+                          .use(collection_mode_class_names: @collection_mode_class_names)
+        new_schema = Servactory::ToolKit::DynamicOptions::Schema
+                     .use(default_hash_mode_class_names: @hash_mode_class_names)
+
+        [@input_option_helpers, @internal_option_helpers, @output_option_helpers].each do |helpers|
+          helpers.replace(name: :consists_of, with: new_consists_of)
+          helpers.replace(name: :schema, with: new_schema)
+        end
       end
     end
   end

data/lib/servactory/configuration/configurable.rb

@@ -67,7 +67,8 @@ module Servactory
             .new(name: :optional, equivalent: { required: false }),
             Servactory::ToolKit::DynamicOptions::ConsistsOf
               .use(collection_mode_class_names: config.collection_mode_class_names),
-            Servactory::ToolKit::DynamicOptions::Schema.use(default_hash_mode_class_names:),
+            Servactory::ToolKit::DynamicOptions::Schema
+              .use(default_hash_mode_class_names: config.hash_mode_class_names),
             Servactory::ToolKit::DynamicOptions::Inclusion.use
           ]
         end
@@ -76,7 +77,8 @@ module Servactory
           Set[
             Servactory::ToolKit::DynamicOptions::ConsistsOf
             .use(collection_mode_class_names: config.collection_mode_class_names),
-            Servactory::ToolKit::DynamicOptions::Schema.use(default_hash_mode_class_names:),
+            Servactory::ToolKit::DynamicOptions::Schema
+              .use(default_hash_mode_class_names: config.hash_mode_class_names),
             Servactory::ToolKit::DynamicOptions::Inclusion.use
           ]
         end
@@ -85,7 +87,8 @@ module Servactory
           Set[
             Servactory::ToolKit::DynamicOptions::ConsistsOf
             .use(collection_mode_class_names: config.collection_mode_class_names),
-            Servactory::ToolKit::DynamicOptions::Schema.use(default_hash_mode_class_names:),
+            Servactory::ToolKit::DynamicOptions::Schema
+              .use(default_hash_mode_class_names: config.hash_mode_class_names),
             Servactory::ToolKit::DynamicOptions::Inclusion.use
           ]
         end

data/lib/servactory/configuration/hash_mode/class_names_collection.rb

@@ -6,7 +6,10 @@ module Servactory
       class ClassNamesCollection
         extend Forwardable
 
-        def_delegators :@collection, :include?, :intersect?
+        def_delegators :@collection,
+                       :merge,
+                       :include?,
+                       :intersect?
 
         def initialize(collection)
           @collection = collection

data/lib/servactory/configuration/option_helpers/option_helpers_collection.rb

@@ -72,6 +72,20 @@ module Servactory
           helpers_index[name]
         end
 
+        # Replaces a helper by name with a new one, invalidating the index cache.
+        #
+        # @param name [Symbol] the helper name to replace
+        # @param with [Maintenance::Attributes::OptionHelper] the replacement helper
+        # @return [void]
+        def replace(name:, with:)
+          old = find_by(name:)
+          return unless old
+
+          @collection.delete(old)
+          @collection.add(with)
+          @helpers_index = nil
+        end
+
         private
 
         # Builds and caches a hash index for O(1) helper lookups.

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

@@ -29,30 +29,22 @@ module Servactory
         def process_input(context, warehouse, input)
           value = warehouse.fetch_input(input.name)
 
-          input.options_for_checks.each do |check_key, check_options|
-            error = process_option(context, input, value, check_key, check_options)
+          input.collection_of_options.validations_for_checks.each do |check_key, check_options, validation_class|
+            error = process_option(context, input, value, check_key, check_options, validation_class)
             return error if error.present?
           end
 
           nil
         end
 
-        def process_option(context, input, value, check_key, check_options) # rubocop:disable Metrics/MethodLength
-          validation_classes = input.collection_of_options.validation_classes
-          return if validation_classes.empty?
-
-          validation_classes.each do |validation_class|
-            error_message = validation_class.check(
-              context:,
-              attribute: input,
-              value:,
-              check_key:,
-              check_options:
-            )
-            return error_message if error_message.present?
-          end
-
-          nil
+        def process_option(context, input, value, check_key, check_options, validation_class)
+          validation_class.check(
+            context:,
+            attribute: input,
+            value:,
+            check_key:,
+            check_options:
+          )
         end
       end
     end

data/lib/servactory/maintenance/options/collection.rb

@@ -38,8 +38,8 @@ module Servactory
         def_delegators :@collection,
                        :<<,
                        :filter,
-                       :each_with_object,
-                       :map, :flat_map,
+                       :each, :each_with_object,
+                       :map,
                        :size,
                        :empty?
 
@@ -76,13 +76,33 @@ module Servactory
           end
         end
 
+        # Returns options that need validation checks as an array of tuples.
+        # Each tuple contains [check_key, check_options, validation_class],
+        # enabling direct dispatch without nested iteration.
+        #
+        # @return [Array<Array(Symbol, Object, Class)>] tuples for direct validation dispatch
+        def validations_for_checks
+          @validations_for_checks ||= filter(&:need_for_checks?).filter_map do |option|
+            next if option.validation_class.nil?
+
+            [option.name, extract_normalized_body_from(option:), option.validation_class]
+          end
+        end
+
         # Returns the first conflict code found among options.
         #
-        # @return [Object, nil] conflict code or nil if no conflicts
+        # @return [Symbol, nil] conflict code or nil if no conflicts
         def defined_conflict_code
-          flat_map { |option| resolve_conflicts_from(option:) }
-            .reject(&:blank?)
-            .first
+          each do |option|
+            next unless option.define_conflicts
+
+            option.define_conflicts.each do |conflict|
+              code = conflict.content.call
+              return code if code.present?
+            end
+          end
+
+          nil
         end
 
         # Finds an option by its name using indexed lookup.
@@ -111,16 +131,6 @@ module Servactory
         def extract_normalized_body_from(option:)
           option.value
         end
-
-        # Resolves conflict codes from an option's define_conflicts.
-        #
-        # @param option [Option] the option to check for conflicts
-        # @return [Array<Object>] array of conflict codes (may contain nils/blanks)
-        def resolve_conflicts_from(option:)
-          return [] unless option.define_conflicts
-
-          option.define_conflicts.map { |conflict| conflict.content.call }
-        end
       end
     end
   end

data/lib/servactory/maintenance/options/registrar.rb

@@ -98,7 +98,7 @@ module Servactory
                 content: ->(option:) { !option[:is].nil? }
               )
             ],
-            need_for_checks: true,
+            need_for_checks: false,
             body_key: :is,
             body_fallback: nil,
             detect_advanced_mode: false,

data/lib/servactory/maintenance/validations/performer.rb

@@ -19,14 +19,11 @@ module Servactory
 
         private
 
-        def process(context:, attribute:, value:) # rubocop:disable Metrics/MethodLength
-          attribute.options_for_checks.each do |check_key, check_options|
+        def process(context:, attribute:, value:)
+          attribute.collection_of_options.validations_for_checks.each do |check_key, check_options, validation_class|
             error = process_option(
-              context:,
-              attribute:,
-              value:,
-              check_key:,
-              check_options:
+              context:, attribute:, value:,
+              check_key:, check_options:, validation_class:
             )
             return error if error.present?
           end
@@ -34,22 +31,14 @@ module Servactory
           nil
         end
 
-        def process_option(context:, attribute:, value:, check_key:, check_options:) # rubocop:disable Metrics/MethodLength
-          validation_classes = attribute.collection_of_options.validation_classes
-          return if validation_classes.empty?
-
-          validation_classes.each do |validation_class|
-            error_message = validation_class.check(
-              context:,
-              attribute:,
-              value:,
-              check_key:,
-              check_options:
-            )
-            return error_message if error_message.present?
-          end
-
-          nil
+        def process_option(context:, attribute:, value:, check_key:, check_options:, validation_class:)
+          validation_class.check(
+            context:,
+            attribute:,
+            value:,
+            check_key:,
+            check_options:
+          )
         end
       end
     end

data/lib/servactory/test_kit/rspec/helpers/mock_executor.rb

@@ -37,7 +37,7 @@ module Servactory
         # - ServiceMockConfig - provides configuration for each stub
         # - ServiceMockBuilder - creates executor with configs
         # - RSpec Context - provides allow/receive/etc. methods
-        class MockExecutor
+        class MockExecutor # rubocop:disable Metrics/ClassLength
           include Concerns::ErrorMessages
 
           # Creates a new mock executor.
@@ -170,7 +170,11 @@ module Servactory
           # @param config [ServiceMockConfig] Configuration with result/exception
           # @return [void]
           def apply_return_behavior(message_expectation, config)
-            if config.failure? && config.bang_method?
+            if config.call_original?
+              message_expectation.and_call_original
+            elsif config.wrap_original?
+              message_expectation.and_wrap_original(&config.wrap_block)
+            elsif config.failure? && config.bang_method?
               message_expectation.and_raise(config.exception)
             else
               message_expectation.and_return(config.build_result)

data/lib/servactory/test_kit/rspec/helpers/service_mock_builder.rb

@@ -77,6 +77,15 @@ module Servactory
           include Concerns::ServiceClassValidation
           include Concerns::ErrorMessages
 
+          RESULT_TYPE_TO_METHOD = {
+            success: :succeeds,
+            failure: :fails,
+            call_original: :and_call_original,
+            wrap_original: :and_wrap_original
+          }.freeze
+
+          private_constant :RESULT_TYPE_TO_METHOD
+
           # @return [Class] The Servactory service class being mocked
           attr_reader :service_class
 
@@ -188,6 +197,51 @@ module Servactory
             self
           end
 
+          # ============================================================
+          # RSpec Pass-Through API
+          # ============================================================
+
+          # Delegates to the original unmodified method.
+          # Useful for spy pattern or selective mocking.
+          #
+          # @return [ServiceMockBuilder] self for method chaining
+          #
+          # @example Pass-through (spy)
+          #   allow_service(S).and_call_original
+          #
+          # @example Selective mocking with input matching
+          #   allow_service(S).with(id: 1).and_call_original
+          def and_call_original
+            validate_not_in_sequential_mode!(:and_call_original)
+            validate_result_type_not_switched!(:and_call_original)
+
+            @config.result_type = :call_original
+            execute_or_re_execute_mock
+            self
+          end
+
+          # Wraps the original method with custom logic.
+          # Block receives the original method and call arguments.
+          #
+          # @yield [original, **inputs] Block wrapping the original
+          # @return [ServiceMockBuilder] self for method chaining
+          #
+          # @example Modify result
+          #   allow_service(S).and_wrap_original do |original, **inputs|
+          #     result = original.call(**inputs)
+          #     # custom logic
+          #     result
+          #   end
+          def and_wrap_original(&block)
+            validate_not_in_sequential_mode!(:and_wrap_original)
+            validate_result_type_not_switched!(:and_wrap_original)
+
+            @config.result_type = :wrap_original
+            @config.wrap_block = block
+            execute_or_re_execute_mock
+            self
+          end
+
           # ============================================================
           # Sequential Call API
           # ============================================================
@@ -208,6 +262,7 @@ module Servactory
           # @raise [ArgumentError] if called without first calling succeeds/fails
           # @raise [OutputValidator::ValidationError] if outputs don't match service definition
           def then_succeeds(outputs_hash = {})
+            validate_not_passthrough!(:then_succeeds)
             validate_result_type_defined!(:then_succeeds)
 
             validate_outputs!(outputs_hash)
@@ -237,6 +292,7 @@ module Servactory
           #
           # @raise [ArgumentError] if called without first calling succeeds/fails
           def then_fails(exception_class = nil, type: :base, message:, meta: nil) # rubocop:disable Style/KeywordParametersOrder
+            validate_not_passthrough!(:then_fails)
             validate_result_type_defined!(:then_fails)
 
             finalize_current_to_sequence
@@ -281,22 +337,36 @@ module Servactory
 
           # Validates that result type is not being switched.
           #
-          # Prevents accidental switching between succeeds() and fails().
+          # Prevents accidental switching between different result types.
           #
-          # @param new_type [Symbol] :succeeds or :fails
+          # @param new_type [Symbol] :succeeds, :fails, :and_call_original, or :and_wrap_original
           # @raise [ArgumentError] if trying to switch result type
           # @return [void]
-          def validate_result_type_not_switched!(new_type) # rubocop:disable Metrics/CyclomaticComplexity
+          def validate_result_type_not_switched!(new_type)
             return unless @config.result_type_defined?
 
-            current_type = @config.success? ? :succeeds : :fails
-            return if (new_type == :succeeds && current_type == :succeeds) ||
-                      (new_type == :fails && current_type == :fails)
+            current_type = RESULT_TYPE_TO_METHOD[@config.result_type]
+            return if new_type == current_type
 
             raise ArgumentError,
                   "Cannot call #{new_type}() after #{current_type}() was already called. " \
-                  "#{new_type == :succeeds ? 'succeeds()' : 'fails()'} replaces the result type, " \
-                  "which is likely a mistake. Create a new mock if you need different behavior."
+                  "This replaces the result type, which is likely a mistake. " \
+                  "Create a new mock if you need different behavior."
+          end
+
+          # Validates that pass-through methods are not mixed with sequential responses.
+          #
+          # @param method_name [Symbol] The method being called
+          # @raise [ArgumentError] if current config is a pass-through type
+          # @return [void]
+          def validate_not_passthrough!(method_name)
+            return unless @config.call_original? || @config.wrap_original?
+
+            passthrough = @config.call_original? ? :and_call_original : :and_wrap_original
+
+            raise ArgumentError,
+                  "Cannot call #{method_name}() after #{passthrough}(). " \
+                  "Pass-through methods are not compatible with sequential responses."
           end
 
           # Validates outputs against service definition.

data/lib/servactory/test_kit/rspec/helpers/service_mock_config.rb

@@ -38,7 +38,8 @@ module Servactory
                         :method_type,
                         :outputs,
                         :exception,
-                        :argument_matcher
+                        :argument_matcher,
+                        :wrap_block
 
           # Creates a new mock configuration.
           #
@@ -51,6 +52,7 @@ module Servactory
             @outputs = {}
             @exception = nil
             @argument_matcher = nil
+            @wrap_block = nil
           end
 
           # Checks if this is a success mock.
@@ -67,6 +69,20 @@ module Servactory
             result_type == :failure
           end
 
+          # Checks if this is a call_original mock.
+          #
+          # @return [Boolean] True if result_type is :call_original
+          def call_original?
+            result_type == :call_original
+          end
+
+          # Checks if this is a wrap_original mock.
+          #
+          # @return [Boolean] True if result_type is :wrap_original
+          def wrap_original?
+            result_type == :wrap_original
+          end
+
           # Checks if this mocks the .call! method.
           #
           # @return [Boolean] True if method_type is :call!
@@ -113,13 +129,14 @@ module Servactory
           # Creates a deep copy of this config.
           #
           # @return [ServiceMockConfig] New config with copied values
-          def dup
+          def dup # rubocop:disable Metrics/AbcSize
             copy = self.class.new(service_class:)
             copy.result_type = result_type
             copy.method_type = method_type
             copy.outputs = outputs.dup
             copy.exception = exception
             copy.argument_matcher = argument_matcher
+            copy.wrap_block = wrap_block
             copy
           end
         end

data/lib/servactory/tool_kit/dynamic_options/consists_of.rb

@@ -31,7 +31,7 @@ module Servactory
       # Specify type directly as the option value:
       #
       # ```ruby
-      # class ProcessUsersService < ApplicationService::Base
+      # class Users::Process < ApplicationService::Base
       #   input :user_ids, type: Array, consists_of: Integer
       #   input :tags, type: Array, consists_of: [String, Symbol]
       #   input :scores, type: Array, consists_of: Float
@@ -88,7 +88,8 @@ module Servactory
         # Creates a ConsistsOf validator instance.
         #
         # @param option_name [Symbol] The option name (default: :consists_of)
-        # @param collection_mode_class_names [Array<Class>] Valid collection types
+        # @param collection_mode_class_names [Servactory::Configuration::CollectionMode::ClassNamesCollection]
+        #   Valid collection types
         # @return [Servactory::Maintenance::Attributes::OptionHelper]
         def self.use(option_name = :consists_of, collection_mode_class_names:)
           instance = new(option_name, :type, false)
@@ -98,7 +99,8 @@ module Servactory
 
         # Assigns the list of valid collection class names.
         #
-        # @param collection_mode_class_names [Array<Class>] Collection types to accept
+        # @param collection_mode_class_names [Servactory::Configuration::CollectionMode::ClassNamesCollection]
+        #   Collection types to accept
         # @return [void]
         def assign(collection_mode_class_names)
           @collection_mode_class_names = collection_mode_class_names

data/lib/servactory/tool_kit/dynamic_options/format.rb

@@ -72,7 +72,7 @@ module Servactory
       # Specify format directly as the option value:
       #
       # ```ruby
-      # class ValidateUserService < ApplicationService::Base
+      # class Users::Validate < ApplicationService::Base
       #   input :uuid, type: String, format: :uuid
       #   input :email, type: String, format: :email
       #   input :password, type: String, format: :password

data/lib/servactory/tool_kit/dynamic_options/inclusion.rb

@@ -20,7 +20,7 @@ module Servactory
       # Use in your service definition:
       #
       # ```ruby
-      # class CreateUserService < ApplicationService::Base
+      # class Users::Create < ApplicationService::Base
       #   input :role, type: String, inclusion: { in: %w[admin user guest] }
       #   input :status, type: Symbol, inclusion: { in: [:active, :inactive] }
       #   input :level, type: Integer, inclusion: { in: [1, 2, 3, 4, 5] }
@@ -32,7 +32,7 @@ module Servactory
       # Specify inclusion values directly:
       #
       # ```ruby
-      # class CreateUserService < ApplicationService::Base
+      # class Users::Create < ApplicationService::Base
       #   input :role, type: String, inclusion: %w[admin user guest]
       #   input :status, type: Symbol, inclusion: [:active, :inactive]
       #   input :level, type: Integer, inclusion: 1..10

data/lib/servactory/tool_kit/dynamic_options/max.rb

@@ -35,7 +35,7 @@ module Servactory
       # Use in your service definition:
       #
       # ```ruby
-      # class ProcessDataService < ApplicationService::Base
+      # class Data::Process < ApplicationService::Base
       #   input :count, type: Integer, max: 100
       #   input :name, type: String, max: 255
       #   input :items, type: Array, max: 50
@@ -47,7 +47,7 @@ module Servactory
       # Specify maximum value directly:
       #
       # ```ruby
-      # class ProcessDataService < ApplicationService::Base
+      # class Data::Process < ApplicationService::Base
       #   input :count, type: Integer, max: 100
       #   input :name, type: String, max: 255
       #   input :items, type: Array, max: 50

data/lib/servactory/tool_kit/dynamic_options/min.rb

@@ -35,7 +35,7 @@ module Servactory
       # Use in your service definition:
       #
       # ```ruby
-      # class ProcessDataService < ApplicationService::Base
+      # class Data::Process < ApplicationService::Base
       #   input :age, type: Integer, min: 18
       #   input :password, type: String, min: 8
       #   input :tags, type: Array, min: 1
@@ -47,7 +47,7 @@ module Servactory
       # Specify minimum value directly:
       #
       # ```ruby
-      # class ProcessDataService < ApplicationService::Base
+      # class Data::Process < ApplicationService::Base
       #   input :age, type: Integer, min: 18
       #   input :password, type: String, min: 8
       #   input :tags, type: Array, min: 1

data/lib/servactory/tool_kit/dynamic_options/multiple_of.rb

@@ -35,7 +35,7 @@ module Servactory
       # Use in your service definition:
       #
       # ```ruby
-      # class ProcessOrderService < ApplicationService::Base
+      # class Orders::Process < ApplicationService::Base
       #   input :quantity, type: Integer, multiple_of: 5
       #   input :price, type: Float, multiple_of: 0.25
       #   input :batch_size, type: Integer, multiple_of: 100
@@ -47,7 +47,7 @@ module Servactory
       # Specify divisor directly:
       #
       # ```ruby
-      # class ProcessOrderService < ApplicationService::Base
+      # class Orders::Process < ApplicationService::Base
       #   input :quantity, type: Integer, multiple_of: 5
       #   input :price, type: Float, multiple_of: 0.25
       #   input :batch_size, type: Integer, multiple_of: 100

data/lib/servactory/tool_kit/dynamic_options/schema.rb

@@ -29,7 +29,7 @@ module Servactory
       # Define schema in your service:
       #
       # ```ruby
-      # class CreateUserService < ApplicationService::Base
+      # class Users::Create < ApplicationService::Base
       #   input :user_data,
       #         type: Hash,
       #         schema: {
@@ -49,7 +49,7 @@ module Servactory
       # Specify schema definition directly:
       #
       # ```ruby
-      # class CreateUserService < ApplicationService::Base
+      # class Users::Create < ApplicationService::Base
       #   input :user_data,
       #         type: Hash,
       #         schema: {
@@ -127,7 +127,8 @@ module Servactory
         # Creates a Schema validator instance.
         #
         # @param option_name [Symbol] The option name (default: :schema)
-        # @param default_hash_mode_class_names [Array<Class>] Valid Hash-like types
+        # @param default_hash_mode_class_names [Servactory::Configuration::HashMode::ClassNamesCollection]
+        #   Valid Hash-like types
         # @return [Servactory::Maintenance::Attributes::OptionHelper]
         def self.use(option_name = :schema, default_hash_mode_class_names:)
           instance = new(option_name, :is, false)
@@ -137,7 +138,8 @@ module Servactory
 
         # Assigns the list of valid Hash-compatible class names.
         #
-        # @param default_hash_mode_class_names [Array<Class>] Hash-like types to accept
+        # @param default_hash_mode_class_names [Servactory::Configuration::HashMode::ClassNamesCollection]
+        #   Hash-like types to accept
         # @return [void]
         def assign(default_hash_mode_class_names)
           @default_hash_mode_class_names = default_hash_mode_class_names

data/lib/servactory/tool_kit/dynamic_options/target.rb

@@ -37,8 +37,8 @@ module Servactory
       # Use in your service definition:
       #
       # ```ruby
-      # class ProcessOrderService < ApplicationService::Base
-      #   input :service_class, type: Class, target: UserService
+      # class Orders::Process < ApplicationService::Base
+      #   input :service_class, type: Class, target: Payments::Charge
       #   input :handler_class, type: Class, target: [CreateHandler, UpdateHandler]
       # end
       # ```
@@ -48,7 +48,7 @@ module Servactory
       # Specify target class directly or as an array:
       #
       # ```ruby
-      # input :service_class, type: Class, target: UserService
+      # input :service_class, type: Class, target: Payments::Charge
       # input :handler_class, type: Class, target: [CreateHandler, UpdateHandler]
       # ```
       #

data/lib/servactory/version.rb

@@ -5,7 +5,7 @@ module Servactory
     MAJOR = 3
     MINOR = 1
     PATCH = 0
-    PRE = "rc2"
+    PRE = "rc3"
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

data/lib/servactory.rb

@@ -16,10 +16,6 @@ loader.inflector.inflect(
 )
 loader.setup
 
-# Eager load DSL to initialize Stroma::Registry.
-# Registry must be populated before any service class is defined.
-require_relative "servactory/dsl"
-
 module Servactory; end
 
 require "servactory/engine" if defined?(Rails::Engine)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc2
+  version: 3.1.0.rc3
 platform: ruby
 authors:
 - Anton Sokolov
@@ -43,14 +43,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +190,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - Rakefile
 - config/locales/de.yml
@@ -191,6 +198,7 @@ files:
 - config/locales/es.yml
 - config/locales/fr.yml
 - config/locales/it.yml
+- config/locales/ja.yml
 - config/locales/ru.yml
 - lib/generators/README.md
 - lib/generators/servactory/base.rb
@@ -357,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A set of tools for building reliable services of any complexity
 test_files: []