lab42_rgxargs 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfe60f4e05870ad8a1766abbe5b06b0a6925276696285bb19139ef11aeee70a3
-  data.tar.gz: 682386ba4e34b99f53877e0826b0e10f824c3750198c1b6bf66d634de3104d46
+  metadata.gz: 47d38fb3f0f3f9881fd9ccc16ca4c883b88d4c275d7e18f857bd61da29c595a6
+  data.tar.gz: 489530b10f2d2aa4ce02c4f3766aae359b5a03742bd3109bcf902839103d93ac
 SHA512:
-  metadata.gz: 87cba6d04bfe08e2df0b1f90ccb273e2dd37594f4b44b15814a0c6def76466e244ae164f6876a9ad83dceee3ee43ffa815a2e5aa1ad877d929d352febdafab32
-  data.tar.gz: 75744824c57165417049bc8415315efc29de23a3af3c88a94b4cada576652a47e54ae472097a9819020c563bea93ec0e357fa7dfc3672a65b4e7700deaa402ed
+  metadata.gz: a08a0dd92f963b90860f833ff070b41a1da5dc0c1725a3e67d8748277db9be7173ac2527f1f25eabeebbb7e3a67cc847b240466f2ce06da1d992d57f325fae38
+  data.tar.gz: bcf5fdb925293e0a0ad10bfb372b6a3ae23990cb7ff72ea08baa621c45a09a181216592b36423d62663da6a85df562ab4b4f0643a95d7d8316eebc46cea72b9b

data/lib/lab42/rgxargs/predefined_matchers.rb

@@ -1,5 +1,6 @@
 module Lab42::Rgxargs::PredefinedMatchers extend self
   PREDEFINED = {
+    int: [%r{\A([-+]?\d+)\z}, :to_i.to_proc],
     int_list: [%r{\A(-?\d+(?:,-?\d+)*)\z}, ->(*groups){ groups.first.split(",").map(&:to_i)}],
     int_range: [%r{\A(-?\d+)(?:-|\.\.)(-?\d+)\z}, ->(f, l){ Range.new(f.to_i, l.to_i) }],
     list:  [%r{(\w+)(?:,(\w+))*},   ->(*groups){ groups.compact }],
@@ -16,12 +17,11 @@ module Lab42::Rgxargs::PredefinedMatchers extend self
   end
 
   def list_matcher values
-    [%r{\A((?:#{values.join("|")})(?:,(?:#{values.join("|")}))*)\z}, _list_extractor]
+    [%r{\A((?:#{values.join("|")})(?:,(?:#{values.join("|")}))*)\z}, method(:_list_extractor)]
   end
 
 
-  # Memoized
-  def _list_extractor
-    @__list_extractor__ ||= ->(*groups){ groups.first.split(",") }
+  def _list_extractor(*groups)
+    groups.first.split(",")
   end
 end

data/lib/lab42/rgxargs/syntax.rb

@@ -0,0 +1,19 @@
+class Lab42::Rgxargs::Syntax
+
+  attr_reader :converter, :matcher
+
+  def matches? value
+    if match = matcher.match(value)
+      yield converter.(*match.captures)
+      true
+    end
+  end
+
+  private
+  
+  def initialize matcher, converter
+    @converter = converter
+    @matcher   = matcher
+  end
+
+end

data/lib/lab42/rgxargs/syntax_definer.rb

@@ -1,5 +1,16 @@
+# Instanciated with an Rgxargs parser it can run a block
+# in its own context so that the block accesses the
+# parser's functionality with syntactic sugar w/o cluttering
+# ther parser itself with too many methods
+# E.g.:
+#
+#     ```ruby
+#         syntax
+#         
+#     ```
 class Lab42::Rgxargs::SyntaxDefiner
 
+
   attr_reader :arg_name, :parser
 
   def run code

data/lib/lab42/rgxargs.rb

@@ -15,12 +15,12 @@ module Lab42
     attr_reader :args, :conversions, :defined_rules, :errors, :options, :syntaxes
 
 
-    def add_conversion(param, conversion)
+    def add_conversion(param, conversion, &block)
       case conversion
       when Symbol
         conversions[param] = Predefined.fetch(conversion, conversion)
       else
-        conversions[param] = conversion
+        conversions[param] = block ? [conversion, block] : conversion
       end
     end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lab42_rgxargs
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: lab42_speculate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Parse CL args according to regexen
 email: robert.dober@gmail.com
 executables: []
@@ -49,6 +77,7 @@ files:
 - lib/lab42/rgxargs/argument_matcher.rb
 - lib/lab42/rgxargs/error.rb
 - lib/lab42/rgxargs/predefined_matchers.rb
+- lib/lab42/rgxargs/syntax.rb
 - lib/lab42/rgxargs/syntax_definer.rb
 homepage: https://github.com/robertdober/lab42_rgxargs
 licenses:
@@ -62,14 +91,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Parse CL args according to regexen