dorian-arguments 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e02f141d6bfdd389868a2971a9b0f36ed727fa78ab18b9b4715498ac55818d0b
-  data.tar.gz: 83b5ca9c05d4089c553f928bf9f21d86a2d4465bb89d1a448b5261b3dee3c768
+  metadata.gz: f9954bfae6d2589acc531515399fd72719c17e59850945789eda577bbdbf76a1
+  data.tar.gz: a515bd1890f8bb0f69f7851b17a3e2e7c81a347ff3bdd0043d9de6f5978b375d
 SHA512:
-  metadata.gz: 92b8cf10de0ea112586d59ee491ccbed78183c3457e60361c4dd9ca76fe7c2cc5400ce5cb209d2e683767d7b7f8ee7326473967b9c169a432d561253192b7449
-  data.tar.gz: 165bf376d5bd39c13ca104d32b098bdad23153714ca9c486f3290ddd977b02088bf84f4bfafefe2c80710d55c4bcf94fa11cb8af5841b6dc43e0edff24a3174a
+  metadata.gz: f162d7069cce665ddafef2c864e4cfb97e367303624bcfa9fedd9539c0f1776292bb5b52073b0cd202e2a713b27ff18c3db53950f38008a4b54f81640db57cdf
+  data.tar.gz: e45aaa64ba83d4c43e7b1cc08115556ded6942de9a2d85b16d1bf2b106870703347922558d5e99afdedbe65d89c1c2dcb26890d9552a645d5e136fc32bb21f1e

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/dorian/arguments.rb

@@ -1,10 +1,5 @@
-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
@@ -22,13 +17,7 @@ class Dorian
 
     TYPES = [BOOLEAN, STRING, NUMBER, INTEGER, DECIMAL]
 
-    DEFAULTS = {
-      BOOLEAN => "false",
-      STRING => "",
-      NUMBER => "0",
-      INTEGER => "0",
-      DECIMAL => "0"
-    }
+    DEFAULT = nil
 
     MATCHES = {
       BOOLEAN => /^(true|false)$/i,
@@ -56,7 +45,7 @@ class Dorian
       definition.each do |key, value|
         type, default, aliases = normalize(value)
 
-        keys = ([key] + aliases).map(&:to_s).map(&:parameterize)
+        keys = ([key] + aliases).map(&:to_s).map { |key| parameterize(key) }
         keys = keys.map { |key| ["--#{key}", "-#{key}"] }.flatten
 
         indexes = []
@@ -87,7 +76,7 @@ class Dorian
 
         values = [default] if values.empty?
         values = values.map { |value| cast(type, value) }
-        values = values.first unless values.many?
+        values = values.first unless many?(values)
         options[key] = values
       end
 
@@ -95,11 +84,17 @@ class Dorian
 
       arguments -= files
 
-      { arguments:, options:, files:, help: }.to_deep_struct
+      options = Struct.new(*options.keys).new(*options.values)
+
+      Struct.new(:arguments, :options, :files, :help).new(
+        arguments, options, files, help
+      )
     end
 
     def cast(type, value)
-      if type == BOOLEAN
+      if value.nil?
+        nil
+      elsif type == BOOLEAN
         BOOLEANS.fetch(value.downcase)
       elsif type == INTEGER
         value.to_i
@@ -121,7 +116,7 @@ class Dorian
         keys_message =
           ([key] + aliases)
             .map(&:to_s)
-            .map(&:parameterize)
+            .map { |key| parameterize(key) }
             .map { |key| key.size == 1 ? "-#{key}" : "--#{key}" }
             .join("|")
 
@@ -132,18 +127,31 @@ class Dorian
       message
     end
 
+    def many?(array)
+      array.size > 1
+    end
+
+    def parameterize(string, separator: "-")
+      string
+        .to_s
+        .encode("ASCII", invalid: :replace, undef: :replace, replace: "")
+        .downcase
+        .gsub(/[^a-z0-9]+/, separator)
+        .gsub(/^#{separator}+|#{separator}+$/, "")
+    end
+
     def normalize(value)
       if value.is_a?(Hash)
         type = value[:type]&.to_s || DEFAULT_TYPE
-        default = value[:default]&.to_s || DEFAULTS.fetch(type)
+        default = value[:default]&.to_s || DEFAULT
         aliases =
-          Array.wrap(
+          Array(
             value[:alias]&.to_s || value[:aliases]&.map(&:to_s) ||
               DEFAULT_ALIASES
           )
       else
         type = value.to_s
-        default = DEFAULTS.fetch(type)
+        default = DEFAULT
         aliases = DEFAULT_ALIASES
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dorian-arguments
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Dorian Marié
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2024-08-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dorian-to_struct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: parses arguments
 email: dorian@dorianmarie.com
 executables: