servactory 3.1.0.rc2 → 3.1.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a7c9b4d9ad2e7d15265ba278d740eb34e6df33590bf517a0b42d914dad46e22
-  data.tar.gz: 21ad5c1814f6bd2c62221057547f5388cf928fd1f937f37131dab041d6325983
+  metadata.gz: f404944fef3e958464a2287b2aa1ca008cd5c6a04b0de7dbf3099f871878eee2
+  data.tar.gz: fd55568c5b5a48003ce84f1cb9aa64adbae0140b707517f99186ab2064127d94
 SHA512:
-  metadata.gz: 9f231bf3c0662ec8285125cacd138d765622eb1ebad7e9eae5d95ae2dd84ad48f80a65783e208b3b9752e40e9bc755ca245bcf2f3b1c68b3724ca13a68d1f6a5
-  data.tar.gz: 8fb3f9f3bcf2a49f26d4cff76885537559ba4173c78585c2432fc7bf814a8e587303dc941c36a7992800bff1c561661cc04ae20beffbc17dac4d5a0af64de387
+  metadata.gz: a2a7b707d93c5e210c9c0eefb54bbfd3374ac48fda5afbcce8669ec4eda8f1358c063a9a7c8121b3ea6c651fc4c8748e380f72c8a33ca13ab586d39b89fbe505
+  data.tar.gz: 36f8a525ca8a622771136ed8955a74091fd2a17a3aa444871c711048c45f60c6e612eaec28cd7220f1663762095fac203d9cb7996b7630448cc03d2964763cd7

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
@@ -96,6 +96,11 @@ class SessionsController < ApplicationController
 end
 ```
 
+## 🧩 Ecosystem
+
+- [**Stroma**](https://github.com/servactory/stroma) — A foundation for building modular, extensible DSLs in Ruby
+- [**OpenTelemetry Instrumentation**](https://github.com/servactory/opentelemetry-instrumentation-servactory) — Automatic tracing of service calls and actions with span attributes and failure detection
+
 ## 🤝 Contributing
 
 We love contributions! Check out our [Contributing Guide](https://servactory.com/CONTRIBUTING) to get started.

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
@@ -19,7 +19,7 @@ rails generate servactory:service NAME [inputs] [options]
 ```
 
 **Arguments:**
-- `NAME` — Service name (e.g., `Users::Create`, `ProcessOrder`)
+- `NAME` — Service name (e.g., `Users::Create`, `Orders::Process`)
 - `inputs` — Input attributes with optional types (e.g., `email:string name:String user:User`)
 
 **Options:**

data/lib/generators/servactory/extension/USAGE

@@ -47,7 +47,7 @@ Usage in Service:
 
     Then use the DSL method in your services:
 
-        class MyService < ApplicationService::Base
+        class Users::Create < ApplicationService::Base
           my_extension!(my_setting: "value")
 
           # ...

data/lib/generators/servactory/install/USAGE

@@ -6,7 +6,7 @@ Usage:
 
 Options:
     --namespace=NAMESPACE    Base namespace for services (default: ApplicationService)
-    --locales=LOCALES        Locales to install (available: en, ru, de, fr, es, it)
+    --locales=LOCALES        Locales to install (available: en, ru, de, fr, es, it, ja)
     --minimal                Generate minimal setup without configuration examples
     --path=PATH              Path to install service files (default: app/services)
 
@@ -21,7 +21,7 @@ Examples:
         Creates app/services/my_app/services/ with all files
 
     rails generate servactory:install --locales=en,de,fr
-        Also copies locale files to config/locales/ (available: en, ru, de, fr, es, it)
+        Also copies locale files to config/locales/ (available: en, ru, de, fr, es, it, ja)
 
     rails generate servactory:install --minimal
         Creates minimal setup without configuration examples

data/lib/generators/servactory/rspec/USAGE

@@ -5,7 +5,7 @@ Usage:
     rails generate servactory:rspec NAME [inputs] [options]
 
 Arguments:
-    NAME           The name of the service (e.g., Users::Create, ProcessOrder)
+    NAME           The name of the service (e.g., Users::Create, Orders::Process)
     inputs         Input attributes with optional types (e.g., email:string, user:User)
 
 Options:
@@ -33,14 +33,14 @@ Examples:
     rails generate servactory:rspec Users::Create email:String name:String
         Creates spec/services/users/create_spec.rb with Ruby class types
 
-    rails generate servactory:rspec ProcessOrder user:User event:Event
+    rails generate servactory:rspec Orders::Process user:User event:Event
         Creates spec with custom model/class type inputs
 
     rails generate servactory:rspec Users::Create --path=lib/my_gem/services
         Creates spec/my_gem/services/users/create_spec.rb for gem/library use
 
-    rails generate servactory:rspec ProcessOrder --call-method=call
+    rails generate servactory:rspec Orders::Process --call-method=call
         Creates spec using .call instead of .call!
 
-    rails generate servactory:rspec CacheData --skip-pending
+    rails generate servactory:rspec Caches::Write --skip-pending
         Creates spec without pending placeholder

data/lib/generators/servactory/rspec/rspec_generator.rb

@@ -78,8 +78,8 @@ module Servactory
         when "Float" then "1.0"
         when "TrueClass", "[TrueClass, FalseClass]" then "true"
         when "FalseClass" then "false"
-        when "Array" then "[]"
-        when "Hash" then "{}"
+        when "Array" then '["example"]'
+        when "Hash" then '{ key: "value" }'
         when "Symbol" then ":example"
         when "Date" then "Date.current"
         when "DateTime" then "DateTime.current"

data/lib/generators/servactory/service/USAGE

@@ -5,7 +5,7 @@ Usage:
     rails generate servactory:service NAME [inputs] [options]
 
 Arguments:
-    NAME           The name of the service (e.g., Users::Create, ProcessOrder)
+    NAME           The name of the service (e.g., Users::Create, Orders::Process)
     inputs         Input attributes with optional types (e.g., email:string, user:User)
 
 Options:
@@ -38,14 +38,14 @@ Examples:
     rails generate servactory:service Users::Create email:String name:String
         Creates service with typed inputs (capitalized Ruby class names)
 
-    rails generate servactory:service ProcessOrder user:User event:Event
+    rails generate servactory:service Orders::Process user:User event:Event
         Creates service with custom model/class type inputs
 
-    rails generate servactory:service ProcessOrder role:Admin::Users::Role
+    rails generate servactory:service Orders::Process role:Admin::Users::Role
         Creates service with nested namespace type
 
-    rails generate servactory:service SendEmail recipient
+    rails generate servactory:service Emails::Send recipient
         Creates service with untyped input (defaults to String)
 
-    rails generate servactory:service CacheData key:String --skip-output
+    rails generate servactory:service Caches::Write key:String --skip-output
         Creates service without default output declaration

data/lib/servactory/actions/collection.rb

@@ -30,10 +30,6 @@ module Servactory
     class Collection
       extend Forwardable
 
-      # @!method <<(action)
-      #   Adds an action to the collection.
-      #   @param action [Action] The action to add
-      #   @return [Set] The updated collection
       # @!method each
       #   Iterates over all actions in the collection.
       #   @yield [Action] Each action in the collection
@@ -50,7 +46,7 @@ module Servactory
       # @!method empty?
       #   Checks if the collection is empty.
       #   @return [Boolean] true if no actions registered
-      def_delegators :@collection, :<<, :each, :to_h, :sort_by, :size, :empty?
+      def_delegators :@collection, :each, :to_h, :sort_by, :size, :empty?
 
       # Creates a new actions collection.
       #
@@ -59,6 +55,26 @@ module Servactory
         @collection = collection
       end
 
+      # Duplicates the collection, resetting memoized caches.
+      #
+      # @param original [Collection] The collection being duplicated
+      # @return [void]
+      def initialize_dup(original)
+        super
+        @collection = original.instance_variable_get(:@collection).dup
+        @sorted_by_position = nil
+      end
+
+      # Adds an action to the collection, invalidating the sorted cache.
+      #
+      # @param action [Action] The action to add
+      # @return [Collection] self
+      def <<(action)
+        @collection << action
+        @sorted_by_position = nil
+        self
+      end
+
       # Returns a new collection with actions sorted by position.
       #
       # @return [Collection] New collection with actions in position order

data/lib/servactory/actions/stages/collection.rb

@@ -6,12 +6,30 @@ module Servactory
       class Collection
         extend Forwardable
 
-        def_delegators :@collection, :<<, :each, :merge, :to_h, :sort_by, :size, :empty?
+        def_delegators :@collection, :each, :to_h, :sort_by, :size, :empty?
 
         def initialize(collection = Set.new)
           @collection = collection
         end
 
+        def initialize_dup(original)
+          super
+          @collection = original.instance_variable_get(:@collection).dup
+          @sorted_by_position = nil
+        end
+
+        def <<(stage)
+          @collection << stage
+          @sorted_by_position = nil
+          self
+        end
+
+        def merge(other)
+          @collection.merge(other)
+          @sorted_by_position = nil
+          self
+        end
+
         def sorted_by_position
           @sorted_by_position ||= Collection.new(sort_by(&:position))
         end

data/lib/servactory/actions/tools/rules.rb

@@ -56,7 +56,7 @@ module Servactory
         end
 
         def raise_message_with!(formatted_text)
-          raise @context.config.failure_class.new(
+          raise @context.class.config.failure_class.new(
             type: :base,
             message: @context.send(:servactory_service_info).translate(
               "methods.cannot_be_overwritten",

data/lib/servactory/actions/tools/runner.rb

@@ -179,7 +179,7 @@ module Servactory
         # @param exception [Exception] The exception to handle
         # @return [Exception, nil] The exception if handled, nil otherwise
         def rescue_with_handler(exception) # rubocop:disable Metrics/MethodLength
-          _, handler = @context.config.action_rescue_handlers.reverse_each.detect do |class_or_name, _|
+          _, handler = @context.class.config.action_rescue_handlers.reverse_each.detect do |class_or_name, _|
             if (detected_exception = Servactory::Utils.constantize_class(class_or_name))
               detected_exception === exception # rubocop:disable Style/CaseEquality
             end

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

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

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

@@ -63,11 +63,12 @@ module Servactory
 
         def default_input_option_helpers(config)
           Set[
-            Servactory::Maintenance::Attributes::OptionHelper
+            Servactory::Maintenance::Options::Helper
             .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/factory.rb

@@ -60,15 +60,15 @@ module Servactory
       end
 
       def input_option_helpers(input_option_helpers)
-        @config.input_option_helpers.merge(input_option_helpers)
+        register_option_helpers_with(:input_option_helpers, @config.input_option_helpers, input_option_helpers)
       end
 
       def internal_option_helpers(internal_option_helpers)
-        @config.internal_option_helpers.merge(internal_option_helpers)
+        register_option_helpers_with(:internal_option_helpers, @config.internal_option_helpers, internal_option_helpers)
       end
 
       def output_option_helpers(output_option_helpers)
-        @config.output_option_helpers.merge(output_option_helpers)
+        register_option_helpers_with(:output_option_helpers, @config.output_option_helpers, output_option_helpers)
       end
 
       def collection_mode_class_names(collection_mode_class_names)
@@ -113,6 +113,19 @@ module Servactory
         value.is_a?(TrueClass) || value.is_a?(FalseClass)
       end
 
+      def register_option_helpers_with(config_name, collection, option_helpers)
+        option_helpers.each do |option_helper|
+          case collection.register(option_helper)
+          when :reserved
+            raise_error_about_reserved_option_helper_with(config_name, option_helper.name)
+          when :duplicated
+            raise_error_about_duplicated_option_helper_with(config_name, option_helper.name)
+          end
+        end
+
+        collection
+      end
+
       ##########################################################################
 
       def raise_error_about_wrong_exception_class_with(config_name, value)
@@ -142,6 +155,20 @@ module Servactory
               "The `#{value.inspect}` value must be `TrueClass` or `FalseClass`. " \
               "See configuration example here: https://servactory.com/guide/configuration"
       end
+
+      def raise_error_about_reserved_option_helper_with(config_name, option_helper_name)
+        raise ArgumentError,
+              "Error in `#{config_name}` configuration. " \
+              "The `#{option_helper_name}` option helper name is reserved by a built-in option helper. " \
+              "See configuration example here: https://servactory.com/guide/configuration"
+      end
+
+      def raise_error_about_duplicated_option_helper_with(config_name, option_helper_name)
+        raise ArgumentError,
+              "Error in `#{config_name}` configuration. " \
+              "The `#{option_helper_name}` option helper is already defined in this configuration. " \
+              "See configuration example here: https://servactory.com/guide/configuration"
+      end
     end
   end
 end

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

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