lab42_rgxargs 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad2ab026f6192cc81dd04008d035a79188ed42723b4d687a536a49c010d8a0db
-  data.tar.gz: b4503cbb9403aec807fb871c5d901690d6ba026edb8c6b6080e0af4506b6e2a7
+  metadata.gz: 9d995928882bad168df974b923ccb5d725eb86bbd56a694cedd9059ef568e6ad
+  data.tar.gz: 4e4194883792088934889ebd8f7a6fdcd6126ad55cf1fa3a0eb30249ad938d0a
 SHA512:
-  metadata.gz: e41fc413182c5a6e6ca070c8980b9356738df2b956915c1fdf55849136642ff36b97cef4ee01e1fc3505269a7f9c7b9328044bd8c7a1d4b3401e08aa8820a5b8
-  data.tar.gz: e75cbfc5b427e68838513444862d0e3ccca90fe5363f517fe24f40beae2655c830c020f2c55559375069bfe837c4ab55940559f3625e318656b12c9c4ff3d5cc
+  metadata.gz: fb3138610aa1d243ed7bc5d7b7b782901b788d5b75b50e227f7cc0d5ba3ca0f524f8f501139bb67ac808a4b697f915afe89312a0c2f3ec4bf4396cce81d75908
+  data.tar.gz: f662d35d67de38063f978716ca85a9e68548c71dd428867e4354d3706b6d070a3c5efd4fd18e3e55ac375aba9a7b218f5fe5fefe04e63a33e407646fbfd54671

data/lib/lab42/rgxargs/predefined_matchers.rb

@@ -10,8 +10,8 @@ module Lab42::Rgxargs::PredefinedMatchers extend self
      @__defined_names__ ||= PREDEFINED.keys.join("\n\t")
   end
 
-  def fetch(key, default=nil, &blk)
-    return PREDEFINED[key] if PREDEFINED.has_key?(key)
+  def fetch(key, default=nil, as: nil, &blk)
+    return PREDEFINED[key] + [as] if PREDEFINED.has_key?(key)
     blk ? blk.(key) : default
   end
 

data/lib/lab42/rgxargs.rb

@@ -22,11 +22,11 @@ module Lab42
       end
     end
 
-    def add_syntax(rgx, parser=nil)
+    def add_syntax(rgx, parser=nil, as: nil)
       if parser
-        syntaxes << [rgx, parser]
+        syntaxes << [rgx, parser, as]
       else
-        if predef = Predefined.fetch(rgx)
+        if predef = Predefined.fetch(rgx, as: as)
           syntaxes << predef
           else
             raise ArgumentError, "#{rgx} is not a predefined syntax, use one of the following:\n\t#{Predefined.defined_names}"
@@ -64,7 +64,7 @@ module Lab42
           conv.(value)
         when Array
           if (match = conv.first.match(value))
-            conv.last.(match.captures) 
+            conv[1].(match.captures) 
           else
             errors << [:syntax_error, name, "#{value} does not match #{conv.first}"]
             nil
@@ -100,8 +100,13 @@ module Lab42
       end
 
       def _parse_syntax first
-        args << syntaxes.find_value(first) do |(rgx, converter)|
-          (match = rgx.match(first)) && converter.(match.captures) 
+        value, as = syntaxes.find_value(first) do |(rgx, converter, as)|
+          (match = rgx.match(first)) && [converter.(match.captures), as] 
+        end
+        if as
+          options[as] = value
+        else
+          args << value
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lab42_rgxargs
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Robert Dober