lineparser 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdea8822388ddba9652deae82f6710ab030c9735
-  data.tar.gz: 9218d07cff42e46a5e85533fecfadb738ce5ff5f
+  metadata.gz: fb48f3617f69e4b3d93dc16d98e61e1bdfa3ca24
+  data.tar.gz: c907b97a9d725b94c2594fc6ab95a819a301f355
 SHA512:
-  metadata.gz: 3ad5217a907f9e68af04f4fba5dccec5b279dc5440f00deb146165701fcb68722adf3ca35719a91e972e16c3e0457165b39cec4ed36b59c69d74120310bbc764
-  data.tar.gz: cfbee8de0b26d2939e0c0e6492d120917609cb6116f1a3143bf1681f74a5710d2d6ce2b0c1ca0fdd7f418929adaeff1cf2e94c2617a4b85cc3673e4947848bc8
+  metadata.gz: cd40a63253435f1c219c394d02745d7cffa2fa814913f97ad8204f6c6c3afe5c0bb4d70204d09de0676184da09abb8b0cfe1ad080ca85a272d24428830cfc2d3
+  data.tar.gz: e2db55c194a8349b9e9d2a137eabf9226f024b0c7c8510d399b5503b81635c6cdca57f759f0bd71f78702d7402022179864fa349b6c0e807e0e2158c1ec129af

data/lib/lineparser.rb

@@ -16,7 +16,7 @@ class LineParser
         labels = []
 
         pattern.gsub!('+',"\\\\+")
-        r = s.match(/#{pattern.gsub(/:\w+/) {|x| labels << x; '(\\w+)'}}/)
+        r = s.match(/#{pattern.gsub(/:\w+/) {|x| labels << x; '(\\S+)'}}/)
 
         if r then
           params = Hash[*labels.zip(r.captures).flatten(1)]
@@ -70,7 +70,7 @@ class LineParser
       if found then
         children = nil
         children = scan(found.last, x[1..-1]) if found.last.is_a? Array
-        records << [found.first, params, x, children]
+        records << [found[2], params, x, children]
       else
 
         found = xpatterns.detect do |_, pattern| 
@@ -80,7 +80,7 @@ class LineParser
         if found then
           children = nil
           children = scan(found[3..-1], x[1..-1]) if found.last.is_a? Array
-          records << [found.first, params, x, children]
+          records << [found[2], params, x, children]
         end
       end
     end
@@ -116,30 +116,14 @@ patterns = [
   [:resource, 'model', :model],
   [:model, ':class_name', :model_class],
   [:model_class, /orange (\w+)/, :model_class_attribute],
-  [:all, /#/]
+  [:all, /#/, :comment]
 ]
 
 lp = LineParser.new patterns
 r = lp.parse lines
 #=>  
-[
-  [:root, {":resources"=>"posts"}, ["resources: posts"], nil], 
-  [:all, {:captures=>[]}, ["# winning"], nil], 
-  [:all, {:captures=>[]}, ["#"], nil], 
-  [:root, {":resource"=>"post"}, ["post", ["model", ["Post", ["orange 123"], ["fff"]]]],
-    [[:resource, {}, ["model", ["Post", ["orange 123"], ["fff"]]],
-      [[:model, {":class_name"=>"Post"}, ["Post", ["orange 123"], ["fff"]], 
-        [[:model_class, {:captures=>["123"]}, ["orange 123"], nil]]
-      ]]
-    ]]
-  ], 
-  [:root, {":resource"=>"comments"}, ["comments", ["model", ["Comment", ["orange 576"], ["ggg"]]]],
-    [[:resource, {}, ["model", ["Comment", ["orange 576"], ["ggg"]]], 
-      [[:model, {":class_name"=>"Comment"}, ["Comment", ["orange 576"], ["ggg"]],
-        [[:model_class, {:captures=>["576"]}, ["orange 576"], nil]]
-      ]]
-    ]]
-  ]
-] 
-
+ => [
+  [:app_path, {":app_path"=>"/tmp"}, ["app_path: /tmp"], nil], 
+  [:app, {":app"=>"blog"}, ["app: blog"], nil], 
+  [:resources, {":resources"=>"posts"}, ["resources: posts"], ...
 =end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lineparser
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - James Robertson