strop 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c021ef142a7a5155da860f70e400c232afdf91bfe2b160d4bf12fd44356714b9
-  data.tar.gz: ba3a9549ff23d7636d09f4eece2aad318490b2143b78f0af86bd7e0178e75885
+  metadata.gz: 225cf6a25d9576df114857aab9e157c4f9d2c666f74e066bd21fc012b9a8f83d
+  data.tar.gz: 2dfc769e16d1dff9db71788250fedeb23973a46fc2e86633bda69d03b3afef5c
 SHA512:
-  metadata.gz: ef12ddce52bac421a5a9320bd07b554bbb1ead04a4f0b7627e43ba835ac9c90bc9a7262d74fdbc4dad23e1cb834180575e60b5eb4a4d2c25aac54f57bcf4f24e
-  data.tar.gz: edb2a597fd1fff45d38b90c2b62c97b06742055c0f3ec9d12c5220c0dbf1ab80bcc595388db2a4b1183e71c5b3e2b894f4948ab0c77e9e9983f0a56320dd93c8
+  metadata.gz: 57a71386c4e906a3b444da5dabb81a145faef6795639e420917f20386ee75d7c4e8a1442c398ea72db413ee363f5b284ebee113b0e3875b14867c331968c8a99
+  data.tar.gz: a77e623a861b637d2c01e955bf984d556fdd54d4b3c8f9896d22ac8b346fb370702eb04053a1c1a922de51a050e5627e5429ecc1c568bb21f650cf28c7e8f4e5

data/lib/strop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Strop
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/strop.rb

@@ -6,17 +6,18 @@ require_relative "strop/version"
 # Command-line option parser that builds options from help text
 module Strop
   def self.prefix(name) = (name[1] ? "--" : "-") + name # helper for printing back option names with the right prefix
+  def self.name_from_symbol(name) = Symbol === name ? name.to_s.gsub(?_, ?-) : name
 
   # Option declaration: names, argument requirement, and canonical label (auto-determined)
   # Optdecl[:f, :foo, arg: :may] #=> Optdecl(names: ["f", "foo"], arg: :may, label: "foo")
   Optdecl = Data.define(:names, :arg, :label) do
     def self.[](*names, arg: nil) = new(names:, arg:) # Custom builder: Optdecl[names, ..., arg: ...]
     def initialize(names:, arg: nil)
-      names = [*names].map{ Symbol === it ? it.to_s.gsub(?_, ?-) : it } # :foo_bar to "foo-bar" for symbols
-      names[0] = names[0].sub(/[!?]$/, "") unless arg                   # opt? / opt! to opt, and... (unless arg given)
-      arg ||= { ?? => :may, ?! => :must }[$&] || :shant                 # use ?/! to determine arg (unless arg given)
-      label = names.find{ it.size > 1 } || names.first                  # the canonical name used to search for it
-      %i[must may shant].member? arg or raise "invalid arg"             # validate arg
+      names = [*names].map{ Strop.name_from_symbol it }       # :foo_bar to "foo-bar" for symbols
+      names[0] = names[0].sub(/[!?]$/, "") unless arg         # opt? / opt! to opt, and... (unless arg given)
+      arg ||= { ?? => :may, ?! => :must }[$&] || :shant       # use ?/! to determine arg (unless arg given)
+      label = names.find{ it.size > 1 } || names.first        # the canonical name used to search for it
+      %i[must may shant].member? arg or raise "invalid arg"   # validate arg
       super names:, arg:, label:
     end
 
@@ -34,7 +35,7 @@ module Strop
     def [](k, ...)
       case k
       in String | Symbol
-        s = k.to_s
+        s = Strop.name_from_symbol k
         found = find{ it.names.member? s } and return found
         found, *others = select{ it.names.any?{ it.start_with? s }} if s[1]
         found if found && others.empty?
@@ -95,8 +96,8 @@ module Strop
     def opts = Result.new(select { Opt === it })
     def [](k, ...)
       case k
-      in [String | Symbol => name] then opts.select{ it.decl.names.include? name.to_s }
-      in String | Symbol           then find{ Opt === it && it.decl.names.member?(k.to_s) }
+      in [String | Symbol => name] then opts.select{ it.decl.names.include? Strop.name_from_symbol name }
+      in String | Symbol           then find{ Opt === it && it.decl.names.member?(Strop.name_from_symbol k) }
       else super(k, ...)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strop
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Caio Chassot