dynarex 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b0819d94ee366e3dd26ba97373908cb8683c06
-  data.tar.gz: 492090c76d41b762771724111fd3369eeaa7b50a
+  metadata.gz: fa8b7da4e8d5cd1b23e6bce5d1d852b4abe26fed
+  data.tar.gz: b1b2b7004882805809d372c78b610cce6cc5ce13
 SHA512:
-  metadata.gz: 5f0c3dbfd05f038e9783ddf43dc5f9922ca824d4f0dbd488a0673f8d8b9905745faa8ea13ee80f86a11a7949a58cf2e435a86113a7502c74646fe1fca257aab6
-  data.tar.gz: ba3039fcffe2b1a6da4e7aafd03adebc5fb16477da00139f5c0a97fce0ed5470693f88d487231967a82ecc7c02814525b05db47ef383d77cc1f55e12541a40db
+  metadata.gz: 957ba23b15ccef7e0c08bc78c7dfb2f22e769c8250c0b0b665ba1ee7c256e881f1f6774fa76be6d67f23380a0ec830a8f40829f8a7beb78811750c6875aa908e
+  data.tar.gz: a538cfac322d0bb91e679e2b2023d189ecb5d04e363e73f91a7735e24b444fbb0a84d385913fc3084587a3186cb08ca81ce759768ccad58df9197ea289388998

data/lib/dynarex.rb

@@ -470,21 +470,22 @@ EOF
   def to_xslt(opt={})    
 
     h = {limit: -1}.merge(opt)
-    xslt_schema = @xslt_schema || self.summary[:xslt_schema]
-    raise 'to_xsl(): xslt_schema nil' unless xslt_schema
+    @xslt_schema = @xslt_schema || self.summary[:xslt_schema]
+    raise 'to_xsl(): xslt_schema nil' unless @xslt_schema
+
+    xslt = DynarexXSLT.new(schema: @schema, xslt_schema: @xslt_schema ).to_xslt
 
-    xslt = DynarexXSLT.new(schema: @schema, xslt_schema: @xslt_schema ).to_xslt    
     return xslt
   end
   
   def to_rss(opt={}, xslt=nil)
     
     unless xslt then
-
+            
       h = {limit: 11}.merge(opt)
       doc = Rexle.new(self.to_xslt)
-
       e = doc.element('//xsl:apply-templates[2]')
+
       order = self.order || 'descending'
       doc2 = Rexle.new "<xsl:sort order='#{order}' data-type='number' select='@id'/>"
       e.add doc2.root
@@ -495,22 +496,22 @@ EOF
       item.delete
       
       pubdate = @xslt_schema[/pubDate:/]
-      
       xslif = Rexle.new("<xsl:if test='position() &lt; #{h[:limit]}'/>").root
 
       if pubdate.nil? then
         pubdate = Rexle.new("<pubDate><xsl:value-of select='pubDate'></xsl:value-of></pubDate>").root
         new_item.add pubdate      
       end
-      
-      xslif.add new_item      
 
+      xslif.add new_item      
       e2.add xslif.root
       xslt = doc.xml      
+
+      xslt
     end
     
     doc = self.to_doc
-    
+
     if pubdate.nil? then
       doc.root.xpath('records/*').each do |x|
         raw_dt = DateTime.parse x.attributes[:created]
@@ -524,11 +525,14 @@ EOF
     #xml = Rexslt.new(xslt, doc.xml).to_s
 #=begin
     xslt  = Nokogiri::XSLT(xslt)
-    out = xslt.transform(Nokogiri::XML(doc.root.xml))
+    out = xslt.transform(Nokogiri::XML(doc.root.xml)).to_xml \
+                 :save_with => Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
 #=end
 
     #Rexle.new("<rss version='2.0'>%s</rss>" % xml).xml(pretty: true)
-    Rexle.new("<rss version='2.0'>%s</rss>" % out).xml(pretty: true)
+
+    xml = Rexle.new("<rss version='2.0'>%s</rss>" % out.to_s).xml(pretty: true)
+    xml
   end
   
   def xpath(x)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   SLshUY2PSjSnVYx3Gln9vzST8CSTQPZbVpDfzbTqqAZnzqhIe2UaLbzGCMoz8kbw
   jQ7NXbu03ZrsvQ==
   -----END CERTIFICATE-----
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle