lab42_rgxargs 0.0.1.pre → 0.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e40069cd0f641fbe3813892a34648656d0d5316f1100ad46f5a8edf7712efe
-  data.tar.gz: 4b2cd38e43a2329c163f7ace5d0aa1ab4e40f6375408637ee650fc6d862756a8
+  metadata.gz: 00f0a79cda8803391dd5e2f9e21cdc06c7032be12741542b1d715bd044623182
+  data.tar.gz: 47ad2d322cdd22197b63378d76097523544f7f141077d44d5e1127884b73e042
 SHA512:
-  metadata.gz: a087544804de877921e4080f965edc1c78af408401f29f2b3465e7e3ceeaa3b0b470d3cc2b5bc25489a7010f6dbf5ce1f849c333797c7559ff9a03c9a672ec1e
-  data.tar.gz: ac73504757f56373a57e2e3bb2218e7060b797bf2b39421f3f41e22a2af8585d7a4e9ee373d5bf58b990916cd1c9a1d0aeda7d758ecd49a8760c6643fa16b1c7
+  metadata.gz: acf4d6f1e22bae17cfe89070e4a5a3e58650838d24e99545b75ab9c06c7b04fffeb3eecdcdbc131337a2324c0ac297ae16ac56c8d46adf85224ab92a42977fe5
+  data.tar.gz: bea5ef2c6b7d4d48645b6affd40716b5e14f57afc98ecc4d5fca045e530ae0ca52bfbf1148f763a0af97b069acd4c968f7dae83ac7f4e97bfe0e8b8637b4d251

data/lib/lab42/rgxargs/predefined_matchers.rb

@@ -0,0 +1,14 @@
+module Lab42::Rgxargs::PredefinedMatchers extend self
+  PREDEFINED = {
+    list:  [%r{(\w+)(?:,(\w+))*},   ->(groups){ groups }],
+    range: [%r{\A(\d+)\.\.(\d+)\z}, ->(groups){ Range.new(*groups.map(&:to_i)) }]
+  }
+
+  def defined_names
+     @__defined_names__ ||= PREDEFINED.keys.join("\n\t")
+  end
+  def fetch(key, default=nil, &blk)
+    return PREDEFINED[key] if PREDEFINED.has_key?(key)
+    blk ? blk.(key) : default
+  end
+end

data/lib/lab42/rgxargs.rb

@@ -1,25 +1,28 @@
 require 'ostruct'
 require 'lab42/enumerable'
 class Lab42::Rgxargs
-  PREDEFINED = {
-    list:  [%r{(\w+)(?:,(\w+))*},   ->(groups){ groups }],
-    range: [%r{\A(\d+)\.\.(\d+)\z}, ->(groups){ Range.new(*groups.map(&:to_i)) }]
-  }
+  require_relative 'rgxargs/predefined_matchers'
+  Predefined = PredefinedMatchers
 
   attr_reader :args, :conversions, :defined_rules, :errors, :options, :syntaxes
 
   def add_conversion(param, conversion)
-    conversions[param] = conversion
+    case conversion
+    when Symbol
+      conversions[param] = Predefined.fetch(conversion, conversion)
+    else
+      conversions[param] = conversion
+    end
   end
 
   def add_syntax(rgx, parser=nil)
     if parser
       syntaxes << [rgx, parser]
     else
-      if PREDEFINED[rgx]
-        syntaxes << PREDEFINED[rgx]
+      if predef = Predefined.fetch(rgx)
+        syntaxes << predef
       else
-        raise ArgumentError, "#{rgx} is not a predefined syntax, use one of the following:\n\t#{PREDEFINED.keys.join("\n\t")}"
+        raise ArgumentError, "#{rgx} is not a predefined syntax, use one of the following:\n\t#{Predefined.defined_names}"
       end
     end
   end
@@ -53,6 +56,13 @@ class Lab42::Rgxargs
       value.send conv
     when Proc
       conv.(value)
+    when Array
+      if (match = conv.first.match(value))
+         conv.last.(match.captures) 
+      else
+        errors << [:syntax_error, name, "#{value} does not match #{conv.first}"]
+        nil
+      end
     else
       value
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lab42_rgxargs
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.1.0.pre
 platform: ruby
 authors:
 - Robert Dober
@@ -46,6 +46,7 @@ extra_rdoc_files: []
 files:
 - lib/lab42/enumerable.rb
 - lib/lab42/rgxargs.rb
+- lib/lab42/rgxargs/predefined_matchers.rb
 homepage: https://github.com/robertdober/lab42_rgxargs
 licenses:
 - Apache-2.0