dynarex 1.2.28 → 1.2.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 926aa9c0961f2dc726d0daf369783f900a5ec88a
-  data.tar.gz: ecd3a9f1a1f6d21e5495b64138fe996f175abeb8
+  metadata.gz: c8f9785899eadfdb8df928f8da8e210aac10b897
+  data.tar.gz: 3a4d97866d80ba64397ebc764e1e519b21cf6381
 SHA512:
-  metadata.gz: 8a2e24c7507d1bff6709eca13051caef06e49333983677a0594781f71b20e184fc2753a3bd1a5b4f17643b16d6c3143e0c99b4b15881f1c1e42c76e9b2fb3fa5
-  data.tar.gz: ff8d38e94fa24e71e966ff545f535a966b165c8f7267ddfbd24e56e00e0e308a19a382ed27e6b356226bf0424e2ae622d7327d7e73e2776a633fd6afbfadf6cf
+  metadata.gz: e3bf1b9cf0197070322f61cd1dc8b6d0ee85ccb3967c6f023d17d61ea23e1641475d3e4b0095eb372284902a2929a57c2ec71fd7cb33b13987f511cea8925e7c
+  data.tar.gz: e3c977a825d3bd2bac53a1adbe87f5f959e366768f65d709a709807d36c3586a5e7cfcdae7d3ec5fdf726a81edcdfccbb7f39d7ad93f8164619d40748bea6414

data/lib/dynarex.rb

@@ -145,6 +145,15 @@ EOF
     #format_mask = XPath.first(@doc.root, 'summary/format_mask/text()').to_s
     #format_mask = @doc.root.element('summary/format_mask/text()')
 
+    raw_summary_fields = self.summary[:schema][/^\w+\[([^\]]+)\]/,1]
+    sumry = ''
+    
+    if raw_summary_fields then
+      summary_fields = raw_summary_fields.split(',') 
+      sumry = "\n" + summary_fields.map {|x| x + ': ' + \
+                                         self.summary[x]}.join("\n")
+    end
+
     if self.summary[:rawdoc_type] == 'rowx' then
       a = self.fields.map do |field|
   "<xsl:if test=\"%s != ''\">
@@ -158,8 +167,12 @@ EOF
       xslt  = Nokogiri::XSLT(xsl_buffer)
       out = xslt.transform(Nokogiri::XML(@doc.to_s))
       
-      declaration = %Q(<?dynarex schema="%s"?>\n--+) % self.schema
-      declaration + out.text
+      if @raw_header then
+        declaration = @raw_header
+      else        
+        declaration = %Q(<?dynarex schema="%s"?>\n) % self.schema.gsub('"', '\"')
+      end
+      declaration + sumry + "\n--+\n" + out.text
       
     else
       
@@ -172,9 +185,13 @@ EOF
       xslt  = Nokogiri::XSLT(xsl_buffer)
       
       out = xslt.transform(Nokogiri::XML(@doc.to_s))
-      declaration = %Q(<?dynarex schema="%s" format_mask="%s"?>\n) % 
-        [self.schema, self.format_mask]
-      out.text
+      if @raw_header then
+        declaration = @raw_header
+      else              
+        declaration = %Q(<?dynarex schema="%s" format_mask="%s"?>\n) % 
+          [self.schema, self.format_mask.gsub('"', '\"')]
+      end
+      declaration + sumry + "\n" + out.text
     end
                              
     #xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
@@ -458,10 +475,10 @@ EOF
   alias refresh_doc display_xml
 
   def string_parse(buffer)
-    raw_header = buffer.slice!(/<\?dynarex[^>]+>/)
+    @raw_header = buffer.slice!(/<\?dynarex[^>]+>/)
 
-    if raw_header then
-      header = raw_header[/<?dynarex (.*)?>/,1]
+    if @raw_header then
+      header = @raw_header[/<?dynarex (.*)?>/,1]
 
       r1 = /([\w\-]+\s*\=\s*'[^']*)'/
       r2 = /([\w\-]+\s*\=\s*"[^"]*)"/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.2.28
+  version: 1.2.29
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   kUea9jZD+xTq1Js9t2BHCz3Ev/sgS7CaijrbQetbNwzasFGHRd30xBEwd4zANQOp
   i0OBH0e4iIMkv+Q+PYlNRnlpQogsAdTs
   -----END CERTIFICATE-----
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle