rxraw-lineparser 0.1.17 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8ad1231ba9340b8a58766193e468e162dbe7ad4
-  data.tar.gz: 7aff2188e2f7c190c84842ae2de40fc16dcb0d6e
+  metadata.gz: a12efc9aa2b177fac1172501c4445fb992a021dc
+  data.tar.gz: 94f31fe33f4d3f4339ba69ce74be570238548e29
 SHA512:
-  metadata.gz: 8e8775be83defa653e19521ecde88621aca99bb0216d961911e16b8a345072486135b95a1154032dc410696dd29243b6dcfaf78ec511120e7d773ea59a130734
-  data.tar.gz: dcc819807480b5dca5e2396157fe035fa6b1d194143bceeeebc8fd310ade7d1099e50565804bde6eb17a99ae7d40fe9d8c17ebe43bff990ae35c8ef0407a7e45
+  metadata.gz: e24faa9d469cbdf05282189df052c83032b026332615ab1a8e1c28768de41f252533e77a3e6ef63205c9d9b3a8514f49c5cb0411e4a53810ae08913eddf6ef3a
+  data.tar.gz: a06362c4018a4008540493bccafbb6c2559d5fd91edf23520307436fa29e34e88a66cc8bd038af4867e0d3afdb03b7052c57b7249f800c69529f92d5aad64f4f

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-of�/���~��lO����|ojH�%~����A����ǘ8�|k��U�#6 ���t�e)�`�E�)���(F��]�D2����,�X��[SB5B��"��R.|�^����7bl�X��ݦ����ܙ�7���iώ�O�9�E��ȡ�7��������A�w���CP��p�f]kQ��^t������^/��56�l�@��b���1�,W۠����Q?�q[���Ω}A��%�{�2��/��Җz�y�
+����B!R3����$�2��H�r�h����prQp��A��k���t��u�E��m͗*
+ �
+/�q쓯,A�ף�iSQƚ�h�ȷ@t�O+�����q*Yj��Ǭ�5�M��ϟ�m���x,�G4��đs�/D��@ ���%מ���D�7վ��d9���6q���p��:.�Z����(��DNM�԰v�0�,�jI#�y�#���6����8ez����lZ��6�-��_�9!��?���=�+�cg

data/lib/rxraw-lineparser.rb

@@ -29,44 +29,51 @@ class RXRawLineParser
   end
   
   def parse(line)
+    
+    if @format_mask.to_s.include? '(?<'  then      
 
-    field_names = @format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)        
+      r = line.match(/#{@format_mask}/)
+      field_names, field_values = r.names, r.captures
+      
+    else
 
-    # only perform possible patterns to match when a custom
-    #                                                  format_mask is detected
-    pattern = if @format_mask[0] != '\\' then
+      field_names = @format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)        
 
-      patterns = possible_patterns(@format_mask)        
+      # 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)
-      end
+        patterns = possible_patterns(@format_mask)        
 
-      pattern = patterns.detect do |x|
-        line.match(/#{x.join}/)
-      end.join
+        if field_names.map{|x| "[!%s]" % x}.join(' ') == @format_mask \
+            and field_names.length > 1 then
+          insert2space_patterns(field_names.length, patterns)
+        end
 
-      if patterns.length > 1 then
-        end_part = @format_mask[/[^\]]+$/].to_s
-        pattern += end_part      
-      else
-        pattern
-      end
-    else
+        pattern = patterns.detect do |x|
+          line.match(/#{x.join}/)
+        end.join
 
-      @format_mask.gsub(/\[!\w+\]/,'(.*)')
-    end
-        
-    field_values = line.match(/#{pattern}/).captures.map(&:strip)
-    #field_values = line.match(/#{@format_mask}/).captures.map(&:strip)        
+        if patterns.length > 1 then
+          end_part = @format_mask[/[^\]]+$/].to_s
+          pattern += end_part      
+        else
+          pattern
+        end
+      else
 
-    found_quotes = find_qpattern(pattern)
+        @format_mask.gsub(/\[!\w+\]/,'(.*)')
+      end
+          
+      field_values = line.match(/#{pattern}/).captures.map(&:strip)
 
-    if found_quotes then
-      found_quotes.each {|i| field_values[i] = field_values[i][1..-2]}
-    end        
+      found_quotes = find_qpattern(pattern)
 
+      if found_quotes then
+        found_quotes.each {|i| field_values[i] = field_values[i][1..-2]}
+      end        
+    end
+    
     field_values += [''] * (field_names.length - field_values.length)
 
     [field_names, field_values]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxraw-lineparser
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   y45JMqhHAfolGfPEOTYT4AtwQxTDUs67uvebNBxsU8sh31pL8L0zX3jIz1bVhNHQ
   4p4pAlul6ELCYA==
   -----END CERTIFICATE-----
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk