lab42_rgxargs 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7ea5cf52b4dcf047e658abb12af417cbc24a055941f79645eb51f22e0697707
-  data.tar.gz: f5970679785663ca6ea8e831cc26f060824bc6ea8f79c8f00eebd6502b4b5201
+  metadata.gz: dfe60f4e05870ad8a1766abbe5b06b0a6925276696285bb19139ef11aeee70a3
+  data.tar.gz: 682386ba4e34b99f53877e0826b0e10f824c3750198c1b6bf66d634de3104d46
 SHA512:
-  metadata.gz: c4d7c897da552ee32fa69d40fde98a398fbd274337fb64aa5739ebd01533807cc4e5d185512a5af75a561d805e82eacdad603dd9cba3275bb81866ad68bc71bc
-  data.tar.gz: 45854555bb805ea65e797cc3b835f440efa2505107a73e5a6b58d4a1c884b2b8776378061a4ea5e6bc50c1a493a9b230dc9b983e39e480819ca702826b86bb6b
+  metadata.gz: 87cba6d04bfe08e2df0b1f90ccb273e2dd37594f4b44b15814a0c6def76466e244ae164f6876a9ad83dceee3ee43ffa815a2e5aa1ad877d929d352febdafab32
+  data.tar.gz: 75744824c57165417049bc8415315efc29de23a3af3c88a94b4cada576652a47e54ae472097a9819020c563bea93ec0e357fa7dfc3672a65b4e7700deaa402ed

data/lib/lab42/rgxargs.rb

@@ -62,7 +62,7 @@ module Lab42
         conv.(value)
       when Array
         if (match = conv.first.match(value))
-          conv[1].(match.captures) 
+          conv[1].(*match.captures) 
         else
           errors << [:syntax_error, name, "#{value} does not match #{conv.first}"]
           nil
@@ -89,6 +89,9 @@ module Lab42
         rest
       when %r{(.*):\z}
         _parse_value $1.gsub('-', '_').to_sym, rest
+      when %r{\A\\(.*)}
+        args << $1
+        rest
       else
         _parse_syntax(first)
         rest

data/lib/lab42/rgxargs/argument_matcher.rb

@@ -13,7 +13,7 @@ class Lab42::Rgxargs::ArgumentMatcher
     case matcher
     when Regexp
       match = matcher.match(value)
-      match && [converter.(match.captures), arg_name] 
+      match && [converter.(*match.captures), arg_name] 
     else
       matcher.to_s == value && [converter.(), arg_name]
     end

data/lib/lab42/rgxargs/predefined_matchers.rb

@@ -1,9 +1,9 @@
 module Lab42::Rgxargs::PredefinedMatchers extend self
   PREDEFINED = {
-    int_list: [%r{\A(-?\d+(?:,-?\d+)*)\z}, ->(groups){ groups.first.split(",").map(&:to_i)}],
-    int_range: [%r{\A(-?\d+)(?:-|\.\.)(-?\d+)\z}, ->((f, l)){ Range.new(f.to_i, l.to_i) }],
-    list:  [%r{(\w+)(?:,(\w+))*},   ->(groups){ groups.compact }],
-    range: [%r{\A(\d+)\.\.(\d+)\z}, ->(groups){ Range.new(*groups.map(&:to_i)) }]
+    int_list: [%r{\A(-?\d+(?:,-?\d+)*)\z}, ->(*groups){ groups.first.split(",").map(&:to_i)}],
+    int_range: [%r{\A(-?\d+)(?:-|\.\.)(-?\d+)\z}, ->(f, l){ Range.new(f.to_i, l.to_i) }],
+    list:  [%r{(\w+)(?:,(\w+))*},   ->(*groups){ groups.compact }],
+    range: [%r{\A(\d+)\.\.(\d+)\z}, ->(*groups){ Range.new(*groups.map(&:to_i)) }]
   }
 
   def defined_names
@@ -22,6 +22,6 @@ module Lab42::Rgxargs::PredefinedMatchers extend self
 
   # Memoized
   def _list_extractor
-    @__list_extractor__ ||= ->(groups){ groups.first.split(",") }
+    @__list_extractor__ ||= ->(*groups){ groups.first.split(",") }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lab42_rgxargs
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-18 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -62,7 +62,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="