polyrex 0.2.3 → 0.3.0

data/lib/polyrex.rb

@@ -1,9 +1,10 @@
-#!/usr/bin/ruby
+#/usr/bin/ruby
 
 # file: polyrex.rb
 
 require 'polyrex-schema'
 require 'backtrack-xpath'
+require 'line-tree'
 require 'rexml/document'
 
 class Polyrex
@@ -26,7 +27,7 @@ class Polyrex
     
     @schema = schema
 
-    @id = '1'
+    @id = '0'
     a = @schema.split('/')        
 
     @rpaths = (a.length).times.inject({}) {|r| r.merge ({a.join('/').gsub(/\[[^\]]+\]/,'') => a.pop}) }
@@ -112,92 +113,40 @@ end
   end 
 
   def parse(lines)
-    a = lines.split("\n")
-
-    a.map! do |x|
-      x.match(/(\s+)?(.*)/).captures
-    end
-
-    new_a = []
-    history = []
-    history << new_a
-
-    build_tree(a, new_a, 0, history) 
-    out = scan_link(new_a)
-
-    records = Document.new("<records>%s</records>" % out)
-    doc_records = XPath.first(@doc.root, 'records')
-
-    records.each do |record|
-      doc_records.add record
-    end
-
-  end
-
-  def build_tree(a, new_a, prev_indent, history=[])
-    if a.length > 0 then
-      x = a.shift
-      n = x.shift
-      cur_indent = n ? n.length : 0
-      indent, xr = build_branch(a, new_a, cur_indent, prev_indent, x, history )
-
-      if xr then
-        history.pop
-        cur_indent, xr = build_branch(a, history[-1] || new_a, indent, prev_indent, xr, history ) 
-        return [cur_indent, xr] if xr
-      end
-    end
-  end
-
-  def build_branch(a, new_a, cur_indent, prev_indent, x, history=[])
-    if cur_indent > prev_indent then
-      new_a = history[-1]
-      new_inner_a = [x]
-      new_a << new_inner_a
-      history << new_inner_a
-      build_tree(a, history[-2], cur_indent, history)
-    elsif cur_indent == prev_indent then
-      new_inner_a = [x]
-      new_a << new_inner_a
-      history << new_inner_a
-      build_tree(a, new_inner_a, cur_indent, history)
-    else
-      # revert to the earlier new_a
-      return [cur_indent, x]
-    end
+    format_line!(@parent_node, LineTree.new(lines).to_a)
+    self
   end
 
-  def scan_link(a,indent='')
-    out = []
-    i2 = indent.clone
-    a.each do |x|
-      i = indent.length / 2
-      tag_name = @recordx[i].to_s
-
-      line= x[0].reverse.map(&:strip).join
-
+  def format_line!(records, a, i=0)
+    
+    a.each do |x|    
+      
+      tag_name = @recordx[i].to_s      
+      line = x.shift.join
+      
       @field_names = @format_masks[i].to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)
-
       t = @format_masks[i].to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
-      field_values = line.match(/#{t}/).captures
+      field_values = line.match(/#{t}/).captures      
+
+      @id = (@id.to_i + 1).to_s      
+      record = Element.new(tag_name)
+      record.add_attribute('id', @id)
+      summary = Element.new('summary')
       
-      fields = @field_names.zip(field_values).map{|name, value| "<%s>%s</%s>" % [name,value,name]}.join
+      @field_names.zip(field_values).each do |name, value|  
+        field =  Element.new(name.to_s)
+        field.text = value
+        summary.add field
+      end
       
-      @id = (@id.to_i + 1).to_s
-      out << indent + "<#{tag_name} id='#{@id}'><summary>#{fields}</summary>"
-      if x.length > 1 and x[0].is_a? Array then
-        #i2 += '  '
-        out << indent + "<records>\n"
-        x.shift
-        out << scan_link(x,i2 + '  ') 
-        out << indent + "</records>\n"
-      else
-        out << indent + "<records/>\n"    
+      new_records = Element.new('records')
 
-      end
-      out << indent + "</#{tag_name}>\n"
+      record.add summary
+      record.add new_records
+      records.add record
+      
+      format_line!(new_records, x, i+1) unless x.empty?
     end
-    out.join
   end
   
   # -- end of full text edit methods
@@ -207,4 +156,3 @@ end
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: polyrex
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-22 00:00:00 +01:00
+date: 2010-05-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: line-tree
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: 
 executables: []