tty-option 0.2.0 → 0.3.0

data/lib/tty/option/param_validation.rb

@@ -4,37 +4,34 @@ require_relative "result"
 
 module TTY
   module Option
+    # Responsible for parameter validation
+    #
+    # @api private
     module ParamValidation
       # Validate parameter value against validation rule
       #
       # @example
-      #   param = Parameter::Option.create(:foo, validate: '\d+')
-      #   ParamValidation[param, "12"] # => "12"
+      #   param = TTY::Option::Parameter::Option.create(:foo, validate: "\d+")
+      #   TTY::Option::ParamValidation[param, "12"] # => "12"
+      #
+      # @param [TTY::Option::Parameter] param
+      #   the parameter with a validation rule
+      # @param [Object] value
+      #   the value to validate
+      #
+      # @return [TTY::Option::Result]
       #
       # @api public
-      def call(param, values)
-        return Result.success(values) unless param.validate?
+      def call(param, value)
+        return Result.success(value) if !param.validate? || value.nil?
 
         errors = []
-
-        result = Array(values).reduce([]) do |acc, value|
-          valid = case param.validate
-                  when Proc
-                    param.validate.(value)
-                  when Regexp
-                    !param.validate.match(value.to_s).nil?
-                  end
-
-          if valid
-            acc << value
-          else
-            errors << TTY::Option::InvalidArgument.new(param, value)
-          end
-          acc
+        result = validate_object(param, value) do |error|
+          errors << error
         end
 
         if errors.empty?
-          Result.success(result.size <= 1 ? result.first : result)
+          Result.success(result)
         else
           Result.failure(errors)
         end
@@ -43,6 +40,113 @@ module TTY
 
       alias [] call
       module_function :[]
+
+      # Validate an object
+      #
+      # @param [TTY::Option::Parameter] param
+      #   the parameter with a validation rule
+      # @param [Object] value
+      #   the value to validate
+      #
+      # @yield [TTY::Option::InvalidArgument]
+      #
+      # @return [Object, nil]
+      #
+      # @api private
+      def validate_object(param, value, &block)
+        case value
+        when Array
+          validate_array(param, value, &block)
+        when Hash
+          validate_hash(param, value, &block)
+        else
+          error = valid_or_error(param, value)
+          error ? block.(error) && return : value
+        end
+      end
+      module_function :validate_object
+      private_class_method :validate_object
+
+      # Validate array values
+      #
+      # @param [TTY::Option::Parameter] param
+      #   the parameter with a validation rule
+      # @param [Object] values
+      #   the values in an array to validate
+      #
+      # @yield [TTY::Option::InvalidArgument]
+      #
+      # @return [Array]
+      #
+      # @api private
+      def validate_array(param, values)
+        values.each_with_object([]) do |value, acc|
+          error = valid_or_error(param, value)
+          error ? yield(error) : acc << value
+        end
+      end
+      module_function :validate_array
+      private_class_method :validate_array
+
+      # Validate hash values
+      #
+      # @param [TTY::Option::Parameter] param
+      #   the parameter with a validation rule
+      # @param [Object] values
+      #   the values in a hash to validate
+      #
+      # @yield [TTY::Option::InvalidArgument]
+      #
+      # @return [Hash]
+      #
+      # @api private
+      def validate_hash(param, values)
+        values.each_with_object({}) do |value, acc|
+          error = valid_or_error(param, value)
+          error ? yield(error) : acc[value[0]] = value[1]
+        end
+      end
+      module_function :validate_hash
+      private_class_method :validate_hash
+
+      # Create an error for an invalid parameter value
+      #
+      # @param [TTY::Option::Parameter] param
+      #   the parameter with a validation rule
+      # @param [Object] value
+      #   the value to validate
+      #
+      # @return [TTY::Option::InvalidArgument, nil]
+      #
+      # @api private
+      def valid_or_error(param, value)
+        return if valid?(param, value)
+
+        TTY::Option::InvalidArgument.new(param, value)
+      end
+      module_function :valid_or_error
+      private_class_method :valid_or_error
+
+      # Check whether a parameter value is valid or not
+      #
+      # @param [TTY::Option::Parameter] param
+      #   the parameter with a validation rule
+      # @param [Object] value
+      #   the value to validate
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      def valid?(param, value)
+        case param.validate
+        when Proc
+          param.validate.(value)
+        when Regexp
+          !param.validate.match(value.to_s).nil?
+        end
+      end
+      module_function :valid?
+      private_class_method :valid?
     end # ParamValidation
   end # Option
 end # TTY

data/lib/tty/option/parameter.rb

@@ -274,7 +274,8 @@ module TTY
           value
         else
           raise ConfigurationError,
-                "#{to_sym} '#{name}' permitted value needs to be an Array"
+                "#{to_sym} '#{name}' permitted value needs to be " \
+                "an Array or a Hash"
         end
       end
 

data/lib/tty/option/parser/options.rb

@@ -175,7 +175,12 @@ module TTY
                 @remaining << long
               end
             elsif matching_options == 1
-              value = long[opt.long_name.size..-1]
+              # option stuck together with the argument
+              if sep.nil? && rest.empty?
+                value = long[opt.long_name.size..-1]
+              else
+                value = rest
+              end
             else
               @error_aggregator.(AmbiguousOption.new("option '#{long}' is ambiguous"))
             end

data/lib/tty/option/version.rb

@@ -2,6 +2,6 @@
 
 module TTY
   module Option
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end # Option
 end # TTY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-option
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2023-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,6 +100,7 @@ metadata:
   changelog_uri: https://github.com/piotrmurach/tty-option/blob/master/CHANGELOG.md
   documentation_uri: https://www.rubydoc.info/gems/tty-option
   homepage_uri: https://ttytoolkit.org
+  rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/piotrmurach/tty-option
 post_install_message:
 rdoc_options: []