dorian-arguments 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3842736e3a26ecd94df067996bdc259b7538ea017c7e4779789f31e6a49adf70
-  data.tar.gz: c1f363f50efb215e6b209b445c178872178dc5b93aae96cf07bd0547f8c938c0
+  metadata.gz: '09d9d32b127d6c1fa25991cc9cff847085177dc3172aaa819899922c6e959cba'
+  data.tar.gz: 8de0feb1f2b38a19e5c03de71f4b9d8327cb8dee3f156a2bb2430fe19910331e
 SHA512:
-  metadata.gz: 0bf3bf93d7445af8e4d53fc1b4d22e08fe6d9ce3d7bf57088ee367abcef21f87b305d30d13fa8dae787fe81abd4e8e3583fcdc1565d94b06ca9bcd382a6d756f
-  data.tar.gz: a65fb51190305fd70ccaf392c2967ce9fffc28cd6071d1d4efb709b57182351771d253aa823b9f94064862d5ee97850a39073acd91bbfd3ae221f3b5948e9961
+  metadata.gz: 30b7aea21028ceed58ae95be8ddee8d47f39e6bd3266c54aa7950307cd603ada2a26ba788d14d05e190d643113e269b5b09f3bd00a12428d8de9c527fa9107ad
+  data.tar.gz: dbbc563bd0387c247dba669edfbccc72775fdd19f8e2962dfdb759dd0c3c57cf5e9366f35d38c2c9473a4a8f5ec2effe4759cc14b9429d34ec2a51928cc8e37b

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.1

data/lib/dorian/arguments.rb

@@ -1,8 +1,10 @@
 require "dorian/to_struct"
 require "bigdecimal"
+require "bigdecimal/util"
 require "active_support"
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/array/wrap"
+require "active_support/core_ext/enumerable"
 
 class Dorian
   class Arguments
@@ -29,14 +31,14 @@ class Dorian
     }
 
     MATCHES = {
-      BOOLEAN => /^(0|1|true|false)$/i,
+      BOOLEAN => /^(true|false)$/i,
       STRING => /^.+$/i,
       NUMBER => /^[0-9.]+$/i,
       INTEGER => /^[0-9]+$/i,
       DECIMAL => /^[0-9.]+$/i
     }
 
-    BOOLEANS = { "0" => false, "1" => true, "true" => true, "false" => false }
+    BOOLEANS = { "true" => true, "false" => false }
 
     def initialize(**definition)
       @definition = definition
@@ -81,21 +83,11 @@ class Dorian
             end
             .reject(&:nil?)
 
-        if type == BOOLEAN
-          values = values.map { |value| BOOLEANS.fetch(value.downcase) }
-        end
-
-        values = values.map { |value| value.to_i } if type == INTEGER
-
-        if type == DECIMAL || type == NUMBER
-          values = values.map { |value| BigDecimal(value) }
-        end
-
-        values = values.first if values.size < 2
-        values || BOOLEANS.fetch(DEFAULTS.fetch(type)) if type == BOOLEAN
-
         indexes.sort.reverse.uniq.each { |index| arguments.delete_at(index) }
 
+        values = [DEFAULTS.fetch(type)] if values.empty?
+        values = values.map { |value| cast(type, value) }
+        values = values.first unless values.many?
         options[key] = values
       end
 
@@ -103,12 +95,19 @@ class Dorian
 
       arguments -= files
 
-      {
-        arguments:,
-        options:,
-        files:,
-        help:
-      }.to_deep_struct
+      { arguments:, options:, files:, help: }.to_deep_struct
+    end
+
+    def cast(type, value)
+      if type == BOOLEAN
+        BOOLEANS.fetch(value.downcase)
+      elsif type == INTEGER
+        value.to_i
+      elsif type == DECIMAL || type == NUMBER
+        value.to_d
+      else
+        value
+      end
     end
 
     def help
@@ -119,11 +118,15 @@ class Dorian
       definition.each do |key, value|
         type, default, aliases = normalize(value)
 
-        keys_message = ([key] + aliases).map(&:to_s).map(&:parameterize).map do |key|
-          key.size == 1 ? "-#{key}" : "--#{key}"
-        end.join("|")
+        keys_message =
+          ([key] + aliases)
+            .map(&:to_s)
+            .map(&:parameterize)
+            .map { |key| key.size == 1 ? "-#{key}" : "--#{key}" }
+            .join("|")
 
-        message += "  #{keys_message} #{type.upcase}, default: #{default}\n"
+        message +=
+          "  #{keys_message} #{type.upcase}, default: #{cast(type, default).inspect}\n"
       end
 
       message
@@ -133,9 +136,11 @@ class Dorian
       if value.is_a?(Hash)
         type = value[:type]&.to_s || DEFAULT_TYPE
         default = value[:default]&.to_s || DEFAULTS.fetch(type)
-        aliases = Array.wrap(
-          value[:alias]&.to_s || value[:aliases]&.map(&:to_s) || DEFAULT_ALIASES
-        )
+        aliases =
+          Array.wrap(
+            value[:alias]&.to_s || value[:aliases]&.map(&:to_s) ||
+              DEFAULT_ALIASES
+          )
       else
         type = value.to_s
         default = DEFAULTS.fetch(type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorian-arguments
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport