servactory 1.6.7 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36958cd40c5a7f821265cbbaa4509262da61fb1dcb799d9ba57433012d2e35c1
-  data.tar.gz: 3a7a5736e738bc71be30ddef3bee4c536c108a29f24493da9359aa3cfd3eef3c
+  metadata.gz: 2c500354cf4e4fdb64d43928419b2d5d90eb99a7f4075bb7b92c78fa0f498748
+  data.tar.gz: ffd1d27087d1f5ad5457738c20cda5cb9fa73821fca05cc9cf3161c0c035fb71
 SHA512:
-  metadata.gz: e9b3da95a52a025298169b2f6eea8e6b75bf538dc1ea98c4e903c3c43e50dccada335f37b6883f1cf7c1cb49ed4370a2b182ee2c05cb1c48e35b888575bdd26e
-  data.tar.gz: d52fe6ad625529e3f5efb114cbea5331505df217802f3acfc3a68acaa61e761de770c394210d28dd16be134c2eb1003e42d6ed1dc994e8ed8ec8ddad6538e1ad
+  metadata.gz: '039459dc8df65093417fe4b6703783e43ace1c401f86b9b067d5ce3aeeebd0f64866561904a15ea299c2be15224fb66a1fe71dfc8477d7e0f12458f086c09b8a'
+  data.tar.gz: 794a191acdc4f2d94d8b827d05c1994a4e644a2124ac2e8fc83106abcfdeb80b35fc069a413c89cf98fc43b22b5f343bb96070d38ed05ffd3f7123d741fc3256

data/lib/servactory/configuration/factory.rb

@@ -19,6 +19,10 @@ module Servactory
         Servactory.configuration.failure_class = failure_class
       end
 
+      def input_option_helpers(input_option_helpers)
+        Servactory.configuration.input_option_helpers.merge(input_option_helpers)
+      end
+
       def method_shortcuts(method_shortcuts)
         Servactory.configuration.method_shortcuts.merge(method_shortcuts)
       end

data/lib/servactory/configuration/setup.rb

@@ -7,6 +7,7 @@ module Servactory
                     :internal_error_class,
                     :output_error_class,
                     :failure_class,
+                    :input_option_helpers,
                     :method_shortcuts
 
       def initialize
@@ -16,8 +17,20 @@ module Servactory
 
         @failure_class = Servactory::Errors::Failure
 
+        @input_option_helpers = Servactory::Inputs::OptionHelpersCollection.new(default_input_option_helpers)
+
         @method_shortcuts = Servactory::Methods::Shortcuts::Collection.new
       end
+
+      private
+
+      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
     end
   end
 end

data/lib/servactory/inputs/input.rb

@@ -5,13 +5,7 @@ module Servactory
     class Input # rubocop:disable Metrics/ClassLength
       ARRAY_DEFAULT_VALUE = ->(is: false, message: nil) { { is: is, message: message } }
 
-      HELPER_LIBRARY = {
-        optional: { required: false },
-        internal: { internal: true },
-        as_array: { array: true }
-      }.freeze
-
-      private_constant :ARRAY_DEFAULT_VALUE, :HELPER_LIBRARY
+      private_constant :ARRAY_DEFAULT_VALUE
 
       attr_reader :name,
                   :internal_name
@@ -43,11 +37,11 @@ module Servactory
         prepared_options = {}
 
         helpers.each do |helper|
-          next unless HELPER_LIBRARY.key?(helper)
+          found_helper = Servactory.configuration.input_option_helpers.find_by(name: helper)
 
-          found_helper = HELPER_LIBRARY[helper]
+          next if found_helper.blank?
 
-          prepared_options.merge!(found_helper)
+          prepared_options.merge!(found_helper.equivalent)
         end
 
         options.merge(prepared_options)
@@ -69,6 +63,7 @@ module Servactory
         add_must_option_with(options)
 
         # Check Class: nil
+        add_prepare_option_with(options)
         add_internal_option_with(options)
       end
 
@@ -186,6 +181,29 @@ module Servactory
         )
       end
 
+      def add_prepare_option_with(options)
+        collection_of_options << Option.new(
+          name: :prepare,
+          input: self,
+          validation_class: nil,
+          define_input_methods: [
+            DefineInputMethod.new(
+              name: :prepare_present?,
+              content: ->(value:) { value[:in].present? }
+            )
+          ],
+          define_input_conflicts: [
+            DefineInputConflict.new(content: -> { :prepare_vs_array if prepare_present? && array? }),
+            DefineInputConflict.new(content: -> { :prepare_vs_inclusion if prepare_present? && inclusion_present? }),
+            DefineInputConflict.new(content: -> { :prepare_vs_must if prepare_present? && must_present? })
+          ],
+          need_for_checks: false,
+          value_key: :in,
+          value_fallback: false,
+          **options
+        )
+      end
+
       def add_internal_option_with(options) # rubocop:disable Metrics/MethodLength
         collection_of_options << Option.new(
           name: :internal,

data/lib/servactory/inputs/option_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Inputs
+    class OptionHelper
+      attr_reader :name,
+                  :equivalent
+
+      def initialize(name:, equivalent:)
+        @name = name
+        @equivalent = equivalent
+      end
+    end
+  end
+end

data/lib/servactory/inputs/option_helpers_collection.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Inputs
+    class OptionHelpersCollection
+      # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
+      extend Forwardable
+      def_delegators :@collection, :<<, :find, :merge
+
+      def initialize(collection)
+        @collection = collection
+      end
+
+      def find_by(name:)
+        find { |helper| helper.name == name }
+      end
+    end
+  end
+end

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

@@ -31,6 +31,9 @@ module Servactory
           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

data/lib/servactory/version.rb

@@ -4,7 +4,7 @@ module Servactory
   module VERSION
     MAJOR = 1
     MINOR = 6
-    PATCH = 7
+    PATCH = 9
 
     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.7
+  version: 1.6.9
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-10 00:00:00.000000000 Z
+date: 2023-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -211,6 +211,8 @@ files:
 - lib/servactory/inputs/dsl.rb
 - lib/servactory/inputs/input.rb
 - lib/servactory/inputs/option.rb
+- lib/servactory/inputs/option_helper.rb
+- lib/servactory/inputs/option_helpers_collection.rb
 - lib/servactory/inputs/options_collection.rb
 - lib/servactory/inputs/tools/check_errors.rb
 - lib/servactory/inputs/tools/find_unnecessary.rb