rxraw-lineparser 0.1.0 → 0.1.1

data/lib/rxraw-lineparser.rb

@@ -1,14 +1,38 @@
-#�!/usr/bin/env ruby
+#!/usr/bin/env ruby
 
 # file: rxraw-lineparser.rb
 
-class RXRawLineParser
+module Enumerable
+  def repeated_permutation(size, &blk)
+    f = proc do |memo, &blk|
+      if memo.size == size
+        blk.call memo
+      else
+        self.each do |i|
+          f.call memo + [i], &blk
+        end
+      end
+    end
+
+    if block_given?
+      f.call [], &blk
+    else
+      Enumerator.new(f, :call, [])
+    end
+  end
+end
 
-  def self.parse(format_mask, line)
+class RXRawLineParser
+  
+  def initialize(format_mask)
+    @format_mask = format_mask
+  end
+  
+  def parse(line)
 
-    field_names = format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)        
+    field_names = @format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)        
 
-    patterns = possible_patterns(format_mask)        
+    patterns = possible_patterns(@format_mask)        
     pattern = patterns.detect {|x| line.match(/#{x.join}/)}.join
     field_values = line.match(/#{pattern}/).captures      
 
@@ -23,6 +47,8 @@ class RXRawLineParser
     [field_names, field_values]
   end
 
+  private 
+  
   def possible_patterns(format_mask)
     
     tot_fields = format_mask.scan(/\[!\w+\]/).length
@@ -54,10 +80,10 @@ class RXRawLineParser
     end
 
     count = 2**main_fields
-    rr2 = rr.take(count).map {|x| x + [a[-1] + '(.*)']} 
+    rr2 = rr.take(count+1).map {|x| x + [a[-1] + '(.*)']} 
     wild_r = rr2.slice!(-1)
 
-    rrr = rr2 + rr[0..count-2] + [wild_r] + rr[count-1..-1]    
+    rrr = rr2 + rr[0..count-1] + [wild_r] + rr[count..-1]    
     
   end
 

metadata

@@ -2,7 +2,7 @@
 name: rxraw-lineparser
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - James Robertson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-18 00:00:00 +01:00
+date: 2012-04-19 00:00:00 +01:00
 default_executable: 
 dependencies: []