lab42_rgxargs 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d995928882bad168df974b923ccb5d725eb86bbd56a694cedd9059ef568e6ad
-  data.tar.gz: 4e4194883792088934889ebd8f7a6fdcd6126ad55cf1fa3a0eb30249ad938d0a
+  metadata.gz: e7ea5cf52b4dcf047e658abb12af417cbc24a055941f79645eb51f22e0697707
+  data.tar.gz: f5970679785663ca6ea8e831cc26f060824bc6ea8f79c8f00eebd6502b4b5201
 SHA512:
-  metadata.gz: fb3138610aa1d243ed7bc5d7b7b782901b788d5b75b50e227f7cc0d5ba3ca0f524f8f501139bb67ac808a4b697f915afe89312a0c2f3ec4bf4396cce81d75908
-  data.tar.gz: f662d35d67de38063f978716ca85a9e68548c71dd428867e4354d3706b6d070a3c5efd4fd18e3e55ac375aba9a7b218f5fe5fefe04e63a33e407646fbfd54671
+  metadata.gz: c4d7c897da552ee32fa69d40fde98a398fbd274337fb64aa5739ebd01533807cc4e5d185512a5af75a561d805e82eacdad603dd9cba3275bb81866ad68bc71bc
+  data.tar.gz: 45854555bb805ea65e797cc3b835f440efa2505107a73e5a6b58d4a1c884b2b8776378061a4ea5e6bc50c1a493a9b230dc9b983e39e480819ca702826b86bb6b

data/lib/lab42/rgxargs.rb

@@ -5,6 +5,8 @@ module Lab42
 
   class Rgxargs
     require_relative 'rgxargs/predefined_matchers'
+    require_relative 'rgxargs/argument_matcher'
+    require_relative 'rgxargs/syntax_definer'
     Predefined = PredefinedMatchers
 
     extend Forwardable
@@ -23,102 +25,94 @@ module Lab42
     end
 
     def add_syntax(rgx, parser=nil, as: nil)
-      if parser
-        syntaxes << [rgx, parser, as]
-      else
-        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}"
-          end
-        end
-      end
+      syntaxes << ArgumentMatcher.new(rgx, parser, arg_name: as) 
+    end
 
-      def parse argv
-        until argv.empty?
-          argv = _parse_next argv
-        end
-        [options, args, errors]
+    def define_arg name, &blk
+      SyntaxDefiner.new(self, name).run(blk)
+    end
+
+    def parse argv
+      until argv.empty?
+        argv = _parse_next argv
       end
+      [options, args, errors]
+    end
 
 
-      private
+    private
 
-      def initialize &blk
-        @args          = []
-        @conversions   = {}
-        @defined_rules = []
-        @errors        = []
-        @options       = OpenStruct.new
-        @syntaxes      = []
+    def initialize &blk
+      @args          = []
+      @conversions   = {}
+      @defined_rules = []
+      @errors        = []
+      @options       = OpenStruct.new
+      @syntaxes      = []
 
-        instance_exec(&blk) if blk
-      end
+      instance_exec(&blk) if blk
+    end
 
-      def _convert(value, name:) 
-        conv = conversions.fetch(name, nil)
-        case conv
-        when Symbol
-          value.send conv
-        when Proc
-          conv.(value)
-        when Array
-          if (match = conv.first.match(value))
-            conv[1].(match.captures) 
-          else
-            errors << [:syntax_error, name, "#{value} does not match #{conv.first}"]
-            nil
-          end
+    def _convert(value, name:) 
+      conv = conversions.fetch(name, nil)
+      case conv
+      when Symbol
+        value.send conv
+      when Proc
+        conv.(value)
+      when Array
+        if (match = conv.first.match(value))
+          conv[1].(match.captures) 
         else
-          value
+          errors << [:syntax_error, name, "#{value} does not match #{conv.first}"]
+          nil
         end
+      else
+        value
       end
+    end
 
-      def _defined_rules(_arg)
-        false
-      end
 
-      def _parse_next argv
-        first, *rest = argv
-        if _defined_rules(first)
-          return rest
-        end
-        _parse_symbolic first, rest
+    def _parse_next argv
+      first, *rest = argv
+      if first == '--'
+        @args += rest
+        return []
       end
+      _parse_symbolic first, rest
+    end
 
-      def _parse_symbolic first, rest
-        case first
-        when %r{\A:(.*)}
-          options[$1.gsub('-','_').to_sym]=true
-          rest
-        when %r{(.*):\z}
-          _parse_value $1.gsub('-', '_').to_sym, rest
-        else
-          _parse_syntax(first)
-          rest
-        end
+    def _parse_symbolic first, rest
+      case first
+      when %r{\A:(.*)}
+        options[$1.gsub('-','_').to_sym]=true
+        rest
+      when %r{(.*):\z}
+        _parse_value $1.gsub('-', '_').to_sym, rest
+      else
+        _parse_syntax(first)
+        rest
       end
+    end
 
-      def _parse_syntax first
-        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
+    def _parse_syntax first
+      value, as = syntaxes.find_value(first){ |matcher| matcher.match(first) }
+      if as
+        options[as] = value
+      else
+        args << value
       end
+    end
 
-      def _parse_value name, rest
-        value, *rest1 = rest
-        if value
-          options[name] = _convert(value, name: name)
-          return rest1
-        end
-        errors << [:missing_required_value, name]
-        []
+    def _parse_value name, rest
+      value, *rest1 = rest
+      if value
+        options[name] = _convert(value, name: name)
+        return rest1
       end
-
+      errors << [:missing_required_value, name]
+      []
     end
+
   end
+end

data/lib/lab42/rgxargs/argument_matcher.rb

@@ -0,0 +1,35 @@
+class Lab42::Rgxargs::ArgumentMatcher
+  require_relative './error'
+  require_relative './predefined_matchers'
+
+  Predefined = Lab42::Rgxargs::PredefinedMatchers 
+  Error      = Lab42::Rgxargs::Error
+
+  attr_reader :arg_name, :converter, :matcher
+
+
+
+  def match value
+    case matcher
+    when Regexp
+      match = matcher.match(value)
+      match && [converter.(match.captures), arg_name] 
+    else
+      matcher.to_s == value && [converter.(), arg_name]
+    end
+  end
+
+  private
+
+  def initialize(matcher, converter, arg_name: nil)
+    @arg_name  = arg_name
+    @matcher   = matcher
+    @converter = converter || _get_predefined
+  end
+
+  def _get_predefined
+    @matcher, converter = Predefined.fetch(matcher) { raise Error, "undefined syntax #{matcher}" }
+    converter
+  end
+
+end

data/lib/lab42/rgxargs/error.rb

@@ -0,0 +1,2 @@
+class Lab42::Rgxargs::Error < RuntimeError
+end

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, as: nil, &blk)
-    return PREDEFINED[key] + [as] if PREDEFINED.has_key?(key)
+  def fetch(key, default=nil, &blk)
+    return PREDEFINED[key] if PREDEFINED.has_key?(key)
     blk ? blk.(key) : default
   end
 

data/lib/lab42/rgxargs/syntax_definer.rb

@@ -0,0 +1,23 @@
+class Lab42::Rgxargs::SyntaxDefiner
+
+  attr_reader :arg_name, :parser
+
+  def run code
+    instance_exec(&code)
+  end
+
+  def syntax(matcher, value=nil, &blk)
+    if value
+      parser.add_syntax(matcher, ->(){value}, as: arg_name )
+    else
+      parser.add_syntax(matcher, blk, as: arg_name)
+    end
+  end
+
+  private
+
+  def initialize(parser, arg_name)
+    @arg_name = arg_name
+    @parser   = parser
+  end
+end

metadata

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