dynarex 0.7.2 → 0.7.3

data/lib/dynarex.rb

@@ -86,16 +86,14 @@ EOF
 
   def parse(buffer)
     i = XPath.match(@doc.root, 'records/*/attribute::id').max_by(&:value).to_s.to_i
-    format_mask = XPath.first(@doc.root, 'summary/format_mask/text()').to_s
-    t = format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
+    t = @format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
     lines = buffer.split(/\r?\n|\r(?!\n)/).map {|x|x.match(/#{t}/).captures}
-    fields = format_mask.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)
     
     a = lines.map do|x| 
       created = Time.now.to_s
       
-      h = Hash[fields.zip(x)]
-      [h[@default_key], {id: '', created: created, last_modified: '', body: h}]
+      h = Hash[@fields.zip(x)]
+      [h[@default_key.to_s], {id: '', created: created, last_modified: '', body: h}]
     end
     
     h2 = Hash[a]
@@ -140,13 +138,11 @@ EOF
 #  dynarex.create_from_line 'Tracy 37 15-Jun-1972'  
   
   def create_from_line(line)
-    format_mask = XPath.first(@doc.root, 'summary/format_mask/text()').to_s
-    t = format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
+    t = @format_mask.to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
     line.match(/#{t}/).captures
     
     a = line.match(/#{t}/).captures
-    fields = format_mask.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)   
-    h = Hash[fields.zip(a)]
+    h = Hash[@fields.zip(a)]
     create h
     self
   end
@@ -159,7 +155,7 @@ EOF
     
     # for each field update each record field
     record = XPath.first(@doc.root, "records/#{@record_name}[@id=#{id.to_s}]")
-    @fields.each {|k,v| record.elements[k.to_s].text = v if v}
+    fields.each {|k,v| record.elements[k.to_s].text = v if v}
     record.add_attribute('last_modified', Time.now.to_s)
 
     load_records
@@ -247,7 +243,6 @@ EOF
       xml.records
     end
     
-    @default_key = fields[0]
     @records = {}
     @flat_records = {}
     
@@ -275,27 +270,33 @@ end))
     end
 
     @doc = Document.new buffer
-    @schema = @doc.root.text('summary/schema').to_s
+    @schema = @doc.root.text('summary/schema')
     @root_name = @doc.root.name
     @summary = summary_to_h    
     @default_key = XPath.first(@doc.root, 'summary/default_key/text()')
-    
-    @record_name, raw_fields = @schema.match(/(\w+)\(([^\)]+)/).captures
-    @fields = Hash[raw_fields.split(',').map{|x| [x.strip.to_sym, nil]}]
+    @format_mask = XPath.first(@doc.root, 'summary/format_mask/text()')
+   
+    @fields = @format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym) if @format_mask 
 
-    
-    # load the record query handler methods
-    attach_record_methods
+    if @schema then
+      @record_name, raw_fields = @schema.match(/(\w+)\(([^\)]+)/).captures
+      @fields = Hash[raw_fields.split(',').map{|x| [x.strip.to_sym, nil]}] unless @fields      
+    end
+
+    if @fields then
+      @default_key = @fields[0] unless @default_key     
+      # load the record query handler methods
+      attach_record_methods
+    end
     
     if XPath.match(@doc.root, 'records/*').length > 0 then
+      @record_name = XPath.first(@doc.root, 'records/*[1]').name      
+      load_records 
+    end
 
-      load_records
-    end    
   end  
 
   def load_records
-    @default_key = (XPath.first(@doc.root, 'records/*[1]/*[1]').name).to_s.to_sym unless @default_key
-    @record_name = XPath.first(@doc.root, 'records/*[1]').name
     @records = records_to_h
     @flat_records = flat_records_to_h
   end
@@ -334,7 +335,7 @@ end))
         r[node.name.to_s.to_sym] = node.text.to_s
         r
       end
-      [body[@default_key],{id: id, created: created, last_modified: \
+      [body[@default_key.to_s],{id: id, created: created, last_modified: \
           last_modified, body: body}]
     end
     Hash[*ah.flatten]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dynarex
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-16 00:00:00 +01:00
+date: 2010-05-17 00:00:00 +01:00
 default_executable: 
 dependencies: []