rxraw-lineparser 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7651da97d2eff42a8be807e5c233591a5686abc
-  data.tar.gz: 2e6632823c7ab686c99214dc341652d9fa0b018d
+  metadata.gz: 406590b7dbde2ddab15f9556ff5d73e0420caa62
+  data.tar.gz: 067dca78e362d3f104f0ed1ff1bd791f653125f1
 SHA512:
-  metadata.gz: d6cdbec7e54864279d35be5ae9192c4efdd45343d036f54a6e2762813154087d362d9eace37360853acf42279876fda21bcef050b77b96271cf2824215652275
-  data.tar.gz: 31a4151bd16fff0febccd1f57a24466df61ecbf3f086d27a3d4859bfdd419d79cf51f93aa99b0fe3ad3b1878f2e7fb0f1234a8eba206df9328e943a4993aa9ed
+  metadata.gz: b55c5d12567c87bfa5594ee74359fc1df42fee74209f0a3febdd72c6063353f3a16c893194b0115f0e650b3f4687c82a785da6cf3259be13a6c37dc6a7b68a67
+  data.tar.gz: 7ed52a9e234e8663090c67bb3bfe9787a9f107d9a83cfaa7fa6afa83b8351a04b236cd18242f47e6b6a856ce088b94475e9b644a4aea5681f98aeaba7fe60a94

data/lib/rxraw-lineparser.rb

@@ -33,20 +33,29 @@ class RXRawLineParser
 
     field_names = @format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)        
 
-    patterns = possible_patterns(@format_mask)        
-    #patterns.each{|x| puts x.inspect}
+    # only perform possible patterns to match when a custom
+    #                                                  format_mask is detected
+    pattern = if @format_mask[0] != '\\' then
 
-    if field_names.map{|x| "[!%s]" % x}.join(' ') == @format_mask \
-        and field_names.length > 1 then
-      insert2space_patterns(field_names.length, patterns)
+      patterns = possible_patterns(@format_mask)        
+
+      if field_names.map{|x| "[!%s]" % x}.join(' ') == @format_mask \
+          and field_names.length > 1 then
+        insert2space_patterns(field_names.length, patterns)
+      end
+      
+      pattern = patterns.detect {|x| line.match(/#{x.join}/)}.join
+
+      end_part = @format_mask[/[^\]]+$/].to_s
+      pattern += end_part      
+    else
+
+      @format_mask.gsub(/\[!\w+\]/,'(.*)')
     end
+
     
-    #patterns.each{|x| puts x.inspect}
-    pattern = patterns.detect {|x| line.match(/#{x.join}/)}.join
-    end_part = @format_mask[/[^\]]+$/].to_s
-    pattern += end_part
-    #puts 'pattern detected : ' + pattern.inspect
-    field_values = line.match(/#{pattern}/).captures.map(&:strip)    
+    field_values = line.match(/#{pattern}/).captures.map(&:strip)
+    #field_values = line.match(/#{@format_mask}/).captures.map(&:strip)        
 
     found_quotes = find_qpattern(pattern)
 
@@ -129,7 +138,6 @@ class RXRawLineParser
       
     end
 
-    #rr.each{|x| puts x.inspect}
 
     count = 2**main_fields
 

metadata

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