servactory 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a0bc2bbb7debf437c329c7d5e344e78783002e53a92a8a0375039c1856d2bec
-  data.tar.gz: a313727f841e0e15883684630f6adfe406b7da5f86a653ea031982583698fcad
+  metadata.gz: 5a6c62222fdb6c8296ad18090175dbae796eabb8758f382f1e5db6c24a2f6404
+  data.tar.gz: e01dc48bcb0153aab16235d955f1c569490fcc58c10b3c6ff56a29b7c1165dd5
 SHA512:
-  metadata.gz: df636f9537601f9b60997574b2174e22244e2c5f0600ae79751ec4b0f47b3fb0663f7b9bc619a705df63da45c56df17dea90cd1a835148d74f5bc56597f8692e
-  data.tar.gz: 1e487d7be9f2d86560c75c859e3f9de56a8cab8511f564876fc1002a33141a689f81df242db203f9070f23ee37a8e6290648e46e6ca4e485c22d2941ead51a4a
+  metadata.gz: 485c0b027a317d904d3bc0e70f93de122ec7c5009bcf9f41995a0156d09b0077b48f6b735cdf8f50918d42605664b960ee92cf008284c43620018fd21bcaf752
+  data.tar.gz: 4706a650d908ea150c46a19c83f784211ed517e5d0bba5f63999006f29e70768ab9c7bb082f6de0301afa669035cb929e7f31f64a53be50ce8305ddd044b3b9e

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

@@ -24,6 +24,15 @@ module Servactory
         def find_by(name:)
           find { |helper| helper.name == name }
         end
+
+        def replace(name:, with:)
+          # TODO: Add index-based lookup in version 3.1.
+          old = find { |helper| helper.name == name }
+          return unless old
+
+          @collection.delete(old)
+          @collection.add(with)
+        end
       end
     end
   end

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

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

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

@@ -4,7 +4,7 @@ module Servactory
   module VERSION
     MAJOR = 3
     MINOR = 0
-    PATCH = 2
+    PATCH = 3
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Anton Sokolov