dynarex 1.2.52 → 1.2.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebdb32b21f425a446f0b8a699d42059a6f7efe79
-  data.tar.gz: bb80090c325c1d5cb040af3919a085dcafcd4be3
+  metadata.gz: e446b23c5ed0741e769621e2bc06f8cb0ddbd22f
+  data.tar.gz: f0ceed0e9282d7501eec2995a7ea5911adc5e942
 SHA512:
-  metadata.gz: 8880097149db0b5806cf7c43ead80fd6a66fe8c3014879630662810b4e6053dfa96bf3469457bf77e12b30b5ae0702c7b3cd176627885329657f8f871d266c9a
-  data.tar.gz: 6868fc4260ed955a893ceb1c456929aa04eff95f9a28d93b7978bcc207fa0c7c360cd82cd484e09c21d470c2c36d084b44d6b1eeb3bb312bf302307f15dc1290
+  metadata.gz: f305bd93f8dd49e681c6af583cb1d6b20852ed82b934c800c3fca0c493706511b1f178a1c7809d50e36687886be4298288a283af26a56ce1fa6a1f6d57b2757d
+  data.tar.gz: 238d140bd83f1e60a9b8fa9e8d2e7df3c5ce4450941d0c418429eae24ff5fa56ca382ad591943cbc0ad6f8e964984532f6d6a08273d0f4e99ffe22707c898ca2

data/lib/dynarex.rb

@@ -407,6 +407,7 @@ EOF
       
       h = {limit: 11}.merge(opt)
       doc = Rexle.new(self.to_xslt)
+
       e = doc.element('//xsl:apply-templates[2]')
       doc2 = Rexle.new "<xsl:sort order='descending' data-type='number' select='@id'/>"
       e.add doc2.root
@@ -433,7 +434,14 @@ EOF
       x.add Rexle::Element.new('pubDate').add_text dt.to_s 
     end
 
+    File.open('dynarex.xsl','w'){|f| f.write xslt}
+    File.open('dynarex.xml','w'){|f| f.write doc.xml}
     xml = Rexslt.new(xslt, doc.xml).to_s
+=begin
+    xslt  = Nokogiri::XSLT(xslt)
+    out = xslt.transform(Nokogiri::XML(doc.root.xml))
+=end
+
     Rexle.new("<rss version='2.0'>%s</rss>" % xml).xml(pretty: true)
   end
   
@@ -545,7 +553,8 @@ EOF
 
     #buffer = rowx if rowx
     
-    raw_lines = buffer.gsub(/^\s*#[^\n]+/,'').lines.to_a
+    #jr061013 raw_lines = buffer.gsub(/^\s*#[^\n]+/,'').lines.to_a
+    raw_lines = buffer.lines.to_a
 
     if raw_summary then
 
@@ -562,7 +571,8 @@ EOF
         @summary[label] = val
       end
     end
-        
+
+
     if @type == 'checklist' then
       
       # extract the brackets from the line
@@ -595,7 +605,7 @@ EOF
     @summary[:format_mask] = @format_mask
        
     raw_lines.shift while raw_lines.first.strip.empty?
-
+    
     lines = case raw_lines.first.chomp
       
       when '---'
@@ -622,19 +632,20 @@ EOF
         self.summary[:rawdoc_type] = 'rowx'
         raw_lines.shift
 
-        a3 = raw_lines.join.strip.gsub(/^\-+$/,'').split(/\n\n/)
+        a3 = raw_lines.join.strip.gsub(/^\-+$/,'').split(/\n\n(?=\w+:)/)
         # get the fields
         a4 = a3.map{|x| x.scan(/\w+(?=:)/)}.flatten(1).uniq
         a5 = a3.map do |xlines|
 
           missing_fields = a4 - xlines.scan(/^\w+(?=:)/)
-          r = xlines.lines.map(&:strip)
+          #r061013 r = xlines.lines.map(&:strip)
+          r = xlines.split(/\n(\w+:.*)/)
           r += missing_fields.map{|x| x + ":"}
           r.sort.join("\n")
 
         end        
 
-        xml = RowX.new(a5.join("\n")).to_xml
+        xml = RowX.new(a5.join("\n").strip).to_xml
 
         a2 = Rexle.new(xml).root.xpath('item').inject([]) do |r,x|          
           r << @fields.map do |field| 
@@ -651,10 +662,10 @@ EOF
         a2
         
     else
-        
+    raw_lines = raw_lines.join("\n").gsub(/^\s*#[^\n]+/,'').lines.to_a        
       a2 = raw_lines.map.with_index do |x,i|
-        
-        next if x[/^\s+$/]
+
+        next if x[/^\s+$|\n\s*#/]
         
         begin
           

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.2.52
+  version: 1.2.53
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   kUea9jZD+xTq1Js9t2BHCz3Ev/sgS7CaijrbQetbNwzasFGHRd30xBEwd4zANQOp
   i0OBH0e4iIMkv+Q+PYlNRnlpQogsAdTs
   -----END CERTIFICATE-----
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle