dynarex 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f159d50429b47dd811e608d5e037e28ce3b65087
-  data.tar.gz: 223fe64b26299cf573c3e3822e2f0f2c1f6c59bb
+  metadata.gz: 497e98c0cc9e83321ab14a3962246040ecd26a96
+  data.tar.gz: aebacc2dd1ff7fffcfd0f2b65c0fef193ab728f1
 SHA512:
-  metadata.gz: 15d3b9320e169a92e8273f81079564172bacd85e581a1a1d19aaa577fd394ca7e64cea43aaceebcb44642bd9be01a26f41ee14fbac37c8238148e7a50f3daf5c
-  data.tar.gz: 76ef70d56f3c545f18453f3882ca5d0a889a1e80c3858f7c807ddd0c60dc53090b58c31447007232e716ddf0acacd863628a8c29bd9e99e60f637cd207dbe4a2
+  metadata.gz: 18feda8c47b940955190d4c03705e93cfeb068fa0eec3e79b97320777cb8842f0d994d5f14f4147467b8dac310d5aa1b0f9f5bba6fa24ef15a38b798620fdb44
+  data.tar.gz: c7058361ee9ab63498f9d0c7d589dc4a5896a2b6a67d6744a4a46576f22df7fb720952fd05235f99a6e3a53c22728b4dd4d33abf2b4572b43b11085490e815ee

data/lib/dynarex.rb

@@ -266,11 +266,8 @@ EOF
       xslt_format = a.join      
 
       xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
-      #jr100316 xslt  = Nokogiri::XSLT(xsl_buffer)
-      #jr100316 out = xslt.transform(Nokogiri::XML(@doc.to_s))
       out = Rexslt.new(xsl_buffer, @doc).to_s
       
-      #jr100316 header + "\n--+\n" + out.text
       header + "\n--+\n" + out
     elsif self.summary[:rawdoc_type] == 'sectionx' then  
       
@@ -282,13 +279,9 @@ EOF
 
       xslt_format = a.join      
 
-      xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
-      
-      #jr100316 xslt  = Nokogiri::XSLT(xsl_buffer)
-      #jr100316 out = xslt.transform(Nokogiri::XML(@doc.to_s))
+      xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)      
       out = Rexslt.new(xsl_buffer, @doc).to_s
       
-      #jr100316 header + "--#\n" + out.text
       header + "--#\n" + out
       
     elsif self.delimiter.length > 0 then
@@ -306,21 +299,10 @@ EOF
         .gsub(/\[!(\w+)\]/, '<xsl:value-of select="\1"/>')
         
       xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
-      #jr100316 xslt  = Nokogiri::XSLT(xsl_buffer)
       
-      #jr100316 out = xslt.transform(Nokogiri::XML(self.to_xml))
       out = Rexslt.new(xsl_buffer, @doc).to_s
-      #jr100316 header + "\n" + out.text
       header + "\n" + out
     end
-                             
-    #xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
-    #xslt  = Nokogiri::XSLT(xsl_buffer)
-    #out = xslt.transform(Nokogiri::XML(@doc.to_s))
-    #jr250811 puts 'xsl_buffer: ' + xsl_buffer
-    #jr250811 puts 'doc_to_s: ' + @doc.to_s
-    #out.text
-    #jr231211 Rexslt.new(xsl_buffer, @doc.to_s).to_s
 
   end
 
@@ -485,6 +467,36 @@ EOF
   def record_exists?(id)
     !@doc.root.element("records/*[@id='#{id}']").nil?
   end
+  
+  # used internally by to_rss()
+  #
+  def rss_xslt(opt={})
+  
+    h = {limit: 11}.merge(opt)
+    doc = Rexle.new(self.to_xslt)
+    e = doc.element('//xsl:apply-templates[2]')
+    
+    e2 = doc.root.element('xsl:template[3]')
+    item = e2.element('item')
+    new_item = item.deep_clone
+    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      
+    e2.add xslif.root
+    xslt = doc.xml      
+
+    xslt    
+    
+  end
 
   def to_xslt(opt={})    
 
@@ -1056,7 +1068,7 @@ EOF
 
     @default_key ||= e.text('default_key')
     @format_mask = e.text('format_mask')
-    
+
     @fields = @schema[/([^(]+)\)$/,1].split(/\s*,\s*/).map(&:to_sym)
 
     @fields << @default_key if @default_key and \
@@ -1244,7 +1256,9 @@ XSL
   
   def summary_to_h
 
-    @doc.root.xpath('summary/*').inject({}) do |r,node|
+    h = {recordx_type: 'dynarex'}
+    
+    @doc.root.xpath('summary/*').inject(h) do |r,node|
       r.merge node.name.to_s.to_sym => node.text.to_s
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   nP4bxzo6o8Qw40KPcv/n3Vcx8tV8hUOOe4XkImYbeWst9hbbHfbg8daipgkn9NEu
   YXuVi+EfN14P6g==
   -----END CERTIFICATE-----
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import