lab42_rgxargs 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47d38fb3f0f3f9881fd9ccc16ca4c883b88d4c275d7e18f857bd61da29c595a6
-  data.tar.gz: 489530b10f2d2aa4ce02c4f3766aae359b5a03742bd3109bcf902839103d93ac
+  metadata.gz: 5fae43fdec0a7fa2a2a63de4b8d09af54dfcc8edb0896541b34c014d1159555f
+  data.tar.gz: '098a4febbda2d76145e9c86e3125838ddbbdea669e1fdc682f97866f76c44974'
 SHA512:
-  metadata.gz: a08a0dd92f963b90860f833ff070b41a1da5dc0c1725a3e67d8748277db9be7173ac2527f1f25eabeebbb7e3a67cc847b240466f2ce06da1d992d57f325fae38
-  data.tar.gz: bcf5fdb925293e0a0ad10bfb372b6a3ae23990cb7ff72ea08baa621c45a09a181216592b36423d62663da6a85df562ab4b4f0643a95d7d8316eebc46cea72b9b
+  metadata.gz: 111debca1b9c019b820976c1400e4991f5e0b5ccc72167b15967d9e4ccb45770d9a97ed68551e9d997ce36f58ec180c2498b384a97cc2b0f7dd56079f4b9007d
+  data.tar.gz: 7d1cecefc9996d3274c0703136babdc7e6d5a03310f68c7a0639c3cc6c1da5c3df0f640f898a0b30ab5db46a39afe23aee5b6e475d6dbdad70e56729e51e9fdc

data/lib/lab42/rgxargs.rb

@@ -4,28 +4,42 @@ require 'lab42/enumerable'
 module Lab42
 
   class Rgxargs
+    require_relative 'rgxargs/checker'
+    require_relative 'rgxargs/constrainer'
     require_relative 'rgxargs/predefined_matchers'
     require_relative 'rgxargs/argument_matcher'
     require_relative 'rgxargs/syntax_definer'
+    include Checker
+    include Constrainer
+
     Predefined = PredefinedMatchers
 
     extend Forwardable
     def_delegators Predefined, :list_matcher
 
-    attr_reader :args, :conversions, :defined_rules, :errors, :options, :syntaxes
+    attr_reader :allowed, :args, :conversions, :defaults, :defined_rules, :errors, :options, :required, :syntaxes
 
 
-    def add_conversion(param, conversion, &block)
+    def add_conversion(param, conversion=nil, required=nil, &block)
       case conversion
       when Symbol
-        conversions[param] = Predefined.fetch(conversion, conversion)
+        _add_symbolic_conversion(param, conversion, required)
+      when NilClass
+        _add_simple_conversion(param, block)
       else
-        conversions[param] = block ? [conversion, block] : conversion
+        _add_proc_conversion(param, conversion, block, required)
       end
     end
 
     def add_syntax(rgx, parser=nil, as: nil)
-      syntaxes << ArgumentMatcher.new(rgx, parser, arg_name: as) 
+      case rgx
+      when Symbol, Regexp
+        syntaxes << ArgumentMatcher.new(rgx, parser, arg_name: as)
+      when Array
+        rgx.each do |rg1|
+          add_syntax( rg1, parser, as: as)
+        end
+      end
     end
 
     def define_arg name, &blk
@@ -36,24 +50,36 @@ module Lab42
       until argv.empty?
         argv = _parse_next argv
       end
+      _check_required_kwds
       [options, args, errors]
     end
 
 
+    def allows name, matcher=nil, &converter
+      add_conversion(name, matcher, &converter)
+    end
+
+    def needs name, matcher=nil, &converter
+      add_conversion(name, matcher, :required, &converter)
+    end
+
     private
 
     def initialize &blk
       @args          = []
+      @allowed       = nil
       @conversions   = {}
+      @defaults      = {}
       @defined_rules = []
       @errors        = []
-      @options       = OpenStruct.new
+      @required      = ::Set.new
       @syntaxes      = []
 
       instance_exec(&blk) if blk
+      @options       = ::OpenStruct.new(defaults)
     end
 
-    def _convert(value, name:) 
+    def _convert(value, name:)
       conv = conversions.fetch(name, nil)
       case conv
       when Symbol
@@ -62,7 +88,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
@@ -72,6 +98,25 @@ module Lab42
       end
     end
 
+    def _add_proc_conversion(param, conversion, block, required)
+      Array(param).each do |para|
+        @required.add para if required == :required
+        conversions[para] =  block ? [conversion, block] : conversion
+      end
+    end
+
+    def _add_simple_conversion(param, block)
+      Array(param).each do |para|
+        conversions[para] = block
+      end
+    end
+
+    def _add_symbolic_conversion(param, conversion, required)
+      Array(param).each do |para|
+        @required.add para if required == :required
+        conversions[para] = Predefined.fetch(conversion, conversion)
+      end
+    end
 
     def _parse_next argv
       first, *rest = argv
@@ -85,10 +130,14 @@ module Lab42
     def _parse_symbolic first, rest
       case first
       when %r{\A:(.*)}
-        options[$1.gsub('-','_').to_sym]=true
+        switch = $1.gsub('-','_').to_sym
+        _check_switch(switch)
+        options[switch]=true
         rest
       when %r{(.*):\z}
-        _parse_value $1.gsub('-', '_').to_sym, rest
+        kwd = $1.gsub('-', '_').to_sym
+        _check_kwd(kwd)
+        _parse_value kwd, rest
       when %r{\A\\(.*)}
         args << $1
         rest

data/lib/lab42/rgxargs/checker.rb

@@ -0,0 +1,33 @@
+module Lab42
+  class Rgxargs
+    module Checker
+
+      private
+
+      def _check_kwd(kwd)
+        return if allowed.nil?
+        return if allowed.member? kwd
+        return if required.member? kwd
+        errors << [:unauthorized_kwd, kwd]
+      end
+
+      def _check_required_kwds
+        missing = required - options.to_h.keys
+        @errors += missing.map(&_mk_pair(:required_kwd_missing))
+      end
+      
+
+      def _mk_pair(prefix)
+        -> element do
+          [prefix, element]
+        end
+      end
+
+      def _check_switch(_)
+        
+      end
+
+
+    end
+  end
+end

data/lib/lab42/rgxargs/constrainer.rb

@@ -0,0 +1,15 @@
+module Lab42
+  class Rgxargs
+    module Constrainer
+
+      def allow_kwds(*kwds)
+        @allowed = (allowed||Set.new).union(Set.new(kwds.flatten))
+      end
+
+      def require_kwds(*kwds)
+        @required = (required||Set.new).union(Set.new(kwds.flatten))
+      end
+
+    end
+  end
+end

data/lib/lab42/rgxargs/version.rb

@@ -0,0 +1,5 @@
+module Lab42
+  class Rgxargs
+    VERSION = "0.1.10"
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lab42_rgxargs
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.10
 platform: ruby
 authors:
 - Robert Dober
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: lab42_speculate
+  name: speculate_about
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -75,15 +75,18 @@ files:
 - lib/lab42/enumerable.rb
 - lib/lab42/rgxargs.rb
 - lib/lab42/rgxargs/argument_matcher.rb
+- lib/lab42/rgxargs/checker.rb
+- lib/lab42/rgxargs/constrainer.rb
 - lib/lab42/rgxargs/error.rb
 - lib/lab42/rgxargs/predefined_matchers.rb
 - lib/lab42/rgxargs/syntax.rb
 - lib/lab42/rgxargs/syntax_definer.rb
+- lib/lab42/rgxargs/version.rb
 homepage: https://github.com/robertdober/lab42_rgxargs
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Parse CL args according to regexen
 test_files: []