lab42_rgxargs 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1284c83060453b9b65c017381fb3afb8388a2bff50bc256bfd1d4456f46a94d1
-  data.tar.gz: 8e51fe32f62a1d16b6ba4e6a7b99a6011e203041c5dcd7b19cce3ed751af818d
+  metadata.gz: ad2ab026f6192cc81dd04008d035a79188ed42723b4d687a536a49c010d8a0db
+  data.tar.gz: b4503cbb9403aec807fb871c5d901690d6ba026edb8c6b6080e0af4506b6e2a7
 SHA512:
-  metadata.gz: 428e2088c5f440857f952069a63e9dce4cb33e7ee331d4b7bfbde2bbaa7d9e623ed74b121a93650e8621c3c80e536b50761d1dfbcc04dbaba84bbee9210b238f
-  data.tar.gz: 2b455ae68e0a12c97a43f4395d3d49dcd0ca059532db4489fc71e2b17c74e664d8b422194e550fcec30992d16a0febe7294e641043bf1926bea7eb84fce136c4
+  metadata.gz: e41fc413182c5a6e6ca070c8980b9356738df2b956915c1fdf55849136642ff36b97cef4ee01e1fc3505269a7f9c7b9328044bd8c7a1d4b3401e08aa8820a5b8
+  data.tar.gz: e75cbfc5b427e68838513444862d0e3ccca90fe5363f517fe24f40beae2655c830c020f2c55559375069bfe837c4ab55940559f3625e318656b12c9c4ff3d5cc

data/lib/lab42/rgxargs.rb

@@ -1,117 +1,119 @@
 require 'forwardable'
 require 'ostruct'
 require 'lab42/enumerable'
+module Lab42
 
-class Lab42::Rgxargs
-  require_relative 'rgxargs/predefined_matchers'
-  Predefined = PredefinedMatchers
+  class Rgxargs
+    require_relative 'rgxargs/predefined_matchers'
+    Predefined = PredefinedMatchers
 
-  extend Forwardable
-  def_delegators Predefined, :list_matcher
+    extend Forwardable
+    def_delegators Predefined, :list_matcher
 
-  attr_reader :args, :conversions, :defined_rules, :errors, :options, :syntaxes
+    attr_reader :args, :conversions, :defined_rules, :errors, :options, :syntaxes
 
 
-  def add_conversion(param, conversion)
-    case conversion
-    when Symbol
-      conversions[param] = Predefined.fetch(conversion, conversion)
-    else
-      conversions[param] = conversion
+    def add_conversion(param, conversion)
+      case conversion
+      when Symbol
+        conversions[param] = Predefined.fetch(conversion, conversion)
+      else
+        conversions[param] = conversion
+      end
     end
-  end
 
-  def add_syntax(rgx, parser=nil)
-    if parser
-      syntaxes << [rgx, parser]
-    else
-      if predef = Predefined.fetch(rgx)
-        syntaxes << predef
+    def add_syntax(rgx, parser=nil)
+      if parser
+        syntaxes << [rgx, parser]
       else
-        raise ArgumentError, "#{rgx} is not a predefined syntax, use one of the following:\n\t#{Predefined.defined_names}"
+        if predef = Predefined.fetch(rgx)
+          syntaxes << predef
+          else
+            raise ArgumentError, "#{rgx} is not a predefined syntax, use one of the following:\n\t#{Predefined.defined_names}"
+          end
+        end
       end
-    end
-  end
 
-  def parse argv
-    until argv.empty?
-      argv = _parse_next argv
-    end
-    [options, args, errors]
-  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.last.(match.captures) 
-      else
-        errors << [:syntax_error, name, "#{value} does not match #{conv.first}"]
-        nil
+      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.last.(match.captures) 
+          else
+            errors << [:syntax_error, name, "#{value} does not match #{conv.first}"]
+            nil
+          end
+        else
+          value
+        end
       end
-    else
-      value
-    end
-  end
 
-  def _defined_rules(_arg)
-    false
-  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
-  end
+      def _parse_next argv
+        first, *rest = argv
+        if _defined_rules(first)
+          return rest
+        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
-  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
-    args << syntaxes.find_value(first) do |(rgx, converter)|
-      (match = rgx.match(first)) && converter.(match.captures) 
-    end
-  end
+      def _parse_syntax first
+        args << syntaxes.find_value(first) do |(rgx, converter)|
+          (match = rgx.match(first)) && converter.(match.captures) 
+        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]
+        []
+      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]
-    []
   end
-
-end

metadata

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