dynarex 1.2.39 → 1.2.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a6f78cf4c90e46cab4d039679b79f2f299633a8
-  data.tar.gz: be1f78ce17b2247039435f760718d50e61780030
+  metadata.gz: 77fcce15dd115120b200511802c9120151ba05f1
+  data.tar.gz: d6af745ecd930d7dfd65a6df69c1a53c18b4ad7a
 SHA512:
-  metadata.gz: d1639200f0b08215ecac5e607fe9c962b57360dab65d7e67d9fd015f3d63c9efe1f11baaa6c4f0ce0a6e8c2bfa5d7a441f361f414edeb67101d01f1e815b22a6
-  data.tar.gz: 8369ea00cb73eab347de86f870267a105f02ae9a3220a11c23c08bc4a5c64f69b3cf95f129e5721b725cf8c203ba457acc6220d1d9efa4efdf07f38c23f4cf6a
+  metadata.gz: c9c5b06973720ae3b787fc1a9b036bb2ad52a00af2a7e61cfe2cb9cc8b8c62ed3395276f5781d30ae0edf0cf70311d1e6a8a4f1c61d685d4c70ef6c28c0c4135
+  data.tar.gz: 4073fde1dc5e56cdcffb3e4f82ffd155c92d51ced0cd761e0bd791209bfb9a58901486d14bb10aaa288552f3f3d260119399101a0317a7b60264c7fda7e29b9d

data/lib/dynarex.rb

@@ -321,7 +321,6 @@ EOF
     a = xml.send @root_name do
       xml.summary do
         @summary.each{|key,value| xml.send key, value}
-        xml.send 'default_key', @default_key.to_s unless @summary['default_key']
       end
       if @records then
         xml.records do
@@ -406,6 +405,7 @@ EOF
 
   def add_id(a)
     @default_key = :id
+    @summary[:default_key] = 'id'
     @fields << :id
     a.each.with_index{|x,i| x << (i+1).to_s}    
   end
@@ -512,7 +512,7 @@ EOF
       
       @summary = {}
       raw_lines.shift while raw_lines.first.strip.empty?
-      
+
       # fetch any summary lines
       while not raw_lines.empty? and \
           raw_lines.first[/#{a_summary.join('|')}:\s+[\w\*\-\+]+/] do
@@ -721,6 +721,7 @@ EOF
     @format_mask = @doc.root.element('summary/format_mask/text()')
    
     @fields = @format_mask.to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym) if @format_mask 
+    @fields << @default_key if @default_key
 
     if @schema and @schema.match(/(\w+)\(([^\)]+)/) then
       @record_name, raw_fields = @schema.match(/(\w+)\(([^\)]+)/).captures
@@ -728,15 +729,17 @@ EOF
     end
 
     if @fields then
+
       @default_key = @fields[0] unless @default_key     
       # load the record query handler methods
       attach_record_methods
     else
 
       #jr080912 @default_key = @doc.root.xpath('records/*/*').first.name
-
       @default_key = @doc.root.element('records/./.[1]').name
     end
+    
+    @summary[:default_key] = @default_key.to_s
 
     if @doc.root.xpath('records/*').length > 0 then
       @record_name = @doc.root.element('records/*[1]').name            
@@ -766,8 +769,7 @@ EOF
   def records_to_h()
 
     i = @doc.root.xpath('max(records/*/attribute::id)') || 0
-    fields = @doc.root.text('summary/schema')[/\(.*\)/].scan(/\w+/)
-    fields << @default_key unless fields.include? @default_key
+    #jr090813 fields = @doc.root.text('summary/schema')[/\(.*\)/].scan(/\w+/)
     
     @doc.root.xpath('records/*').inject({}) do |result,row|
 
@@ -783,9 +785,9 @@ EOF
       created = row.attributes[:created] if row.attributes[:created]
       last_modified = row.attributes[:last_modified] if row.attributes[:last_modified]
 
-      body = fields.inject({}) do |r,field|
+      body = @fields.inject({}) do |r,field|
         
-        node = row.element field
+        node = row.element field.to_s
         
         if node then
           text = node.text.unescape

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.2.39
+  version: 1.2.40
 platform: ruby
 authors:
 - James Robertson