polyrex 0.2.2 → 0.2.3

data/lib/polyrex.rb

@@ -17,32 +17,33 @@ class Polyrex
     schema_rpath = schema.gsub(/\[[^\]]+\]/,'')
     @recordx = schema_rpath.split('/')
     
-    root_format_mask = @format_masks.shift
-    field_names = root_format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)
-    @root_name = @recordx.shift
-
-    summary = field_names.map {|x| "<%s/>" % x}.join
-    @doc = Document.new("<%s><summary>%s</summary></%s>" % [@root_name, summary, @root_name])
-
+    if @format_masks.length == @recordx.length then
+      root_format_mask = @format_masks.shift 
+      field_names = root_format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)
+      summary = field_names.map {|x| "<%s/>" % x}.join
+    end
     #----
     
     @schema = schema
 
     @id = '1'
-    #a = @schema.split('/')
-    a = @recordx.clone
-    #@root_name = a[0]
-        
-    #@doc = Document.new "<%s><summary/><records/></%s>" % ([@root_name] * 2)
-    @parent_node = XPath.first(@doc.root,'records')
+    a = @schema.split('/')        
 
-    #@rpaths = (a.length).times.inject({}) {|r| r.merge ({a.join('/').gsub(/\[[^\]]+\]/,'') => a.pop}) }
-    @rpaths = (@recordx.length).times.inject({}) {|r| r.merge ({a.join('/') => a.pop}) }
+    @rpaths = (a.length).times.inject({}) {|r| r.merge ({a.join('/').gsub(/\[[^\]]+\]/,'') => a.pop}) }
 
-    names = @rpaths.to_a[0..-2].map {|k,v| [v[/.[^\[]+/], k]}
+    names = @rpaths.to_a[0..-2].map {|k,v| [v[/[^\[]+/], k]}
+    attach_create_handlers(names)
 
+    @root_name = @recordx.shift
+
+    @doc = Document.new("<%s><summary>%s</summary><records/></%s>" % [@root_name, (summary || '') , @root_name])
+    @parent_node = XPath.first(@doc.root,'records')
+    
+  end
+
+  def attach_create_handlers(names)
     names[0..-2].each do |name, xpath|
-      self.instance_eval(
+    self.instance_eval(
 %Q(
   def create_#{name}(params) 
     create_node(@parent_node, @rpaths['#{xpath}'], params)
@@ -62,9 +63,9 @@ def create_#{name}(params)
   self
 end
 ))
-
+    
   end
-
+  
   # -- start of crud methods --
   def valid_creation?()
 
@@ -125,7 +126,12 @@ end
     out = scan_link(new_a)
 
     records = Document.new("<records>%s</records>" % out)
-    @doc.root.add records
+    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=[])
@@ -170,18 +176,15 @@ end
 
       line= x[0].reverse.map(&:strip).join
 
-      puts 'format_masks ' + @format_masks.inspect
       @field_names = @format_masks[i].to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)
-      puts 'field_names : ' + @field_names.inspect
 
       t = @format_masks[i].to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
-      puts 'line : ' + line.inspect
       field_values = line.match(/#{t}/).captures
-      puts 'field_values : ' + field_values.inspect
       
       fields = @field_names.zip(field_values).map{|name, value| "<%s>%s</%s>" % [name,value,name]}.join
       
-      out << indent + "<#{tag_name}><summary>#{fields}</summary>"
+      @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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: polyrex
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: []