avv2word 1.1.18 → 1.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95e387833887863cebe3143db7017ab686644701424caa5b49343c51300ad310
-  data.tar.gz: 7c24d2050e2a38d43347b520262a4a1c8214a84e6e0e3888f7a24285df44b4cc
+  metadata.gz: 8c2007bdd078951c37ebd73c35daf9a6a6022b23b366e28335c1f482a6da18b0
+  data.tar.gz: 42af443d0dce033451ebd545115fe2db68438b338287cb8b6713f91a8de87fb2
 SHA512:
-  metadata.gz: 5b511db218b1df2be1e85e663c0ddd0479d5bc3b3ad463b096b382adcc285d383688aa37d1ed74388cd7979f8dbba97fe15841caf23bdc6a6c6f4781f265bfb4
-  data.tar.gz: fd00d1831daca0f1a8b1d7fc882b2af026d5c709122c1e5ef3560eb0822f9c591655f67f91a16f73edc37831b8a208ec17caff08578ad3479b57e262fcdcf106
+  metadata.gz: 6bedab9f56d9134974c78f20ab3b500102c281bae9d69c8f0c0c0c56e28be74b650421f7ed3730e13a5c32ed293d99cd415681346964dc0cbe72171a9d37a5f5
+  data.tar.gz: ac2849c81b0dfd36a327b6b86673c936aa2d035777477093f9bd178a3a9375fa5a4d977ff3bd14e2d172109925c29b3ee19e6c50da0218ba71207d8ef243ffac

data/lib/avv2word/document.rb

@@ -11,13 +11,15 @@ module Avv2word
 
         # create working dir
         FileUtils.mkdir_p("tmp_imgs")
-        resize = 1 # for testing purposes; half size: 0.5
+        resize = 1 # future feature; half size: 0.5
 
         doc = Nokogiri::HTML.fragment(html)
         doc.css("img").each_with_index do |img_elm,i|
           mime_type, img_data = img_elm.attributes["src"].value.split(",")
           # ^--data:image/jpeg;base64
-          img_path = "tmp_imgs/image_#{i}.jpg"
+          ext = mime_type.match(/image\/(\w+?);base64/)[1]
+          ext = "jpg" if ext == "jpeg"
+          img_path = "tmp_imgs/image#{i+1}.#{ext}"
           File.open(img_path,"wb"){|f| f.write Base64.decode64(img_data)}
           img_elm.attributes["src"].value = img_path
           match_dimensions = %x( file #{img_path} ).match(/, (?<x>\d+) ?x ?(?<y>\d+),/)
@@ -29,8 +31,20 @@ module Avv2word
         doc.to_html
       end
 
+      def escape_footnotes(html)
+        doc = Nokogiri::HTML.fragment(html)
+        nodes_with_footnotes = doc.css("footnote")
+        nodes_with_footnotes.each do |node|
+          node.name = "footnote"
+          node.content = node.attributes["data-value"]
+          node.attributes.map{|k,v| node.attributes[k].remove }
+        end
+        doc.to_html
+      end
+
       def create(content, template_name = nil, extras = false)
         content = extract_images_html(content)
+        content = escape_footnotes(content)
         template_name += extension if template_name && !template_name.end_with?(extension)
         document = new(template_file(template_name))
         document.replace_files(content, extras)
@@ -44,6 +58,7 @@ module Avv2word
       end
 
       def create_with_content(template, content, extras = false)
+        content = extract_images_html(content)
         template += extension unless template.end_with?(extension)
         document = new(template_file(template))
         document.replace_files(content, extras)
@@ -109,7 +124,6 @@ module Avv2word
             elsif entry.name == Document.content_types_xml_file
               raw_file = entry.get_input_stream.read
               content_types = @image_files.empty? ? raw_file : inject_image_content_types(raw_file)
-
               out.write(content_types)
             else
               out.write(template_zip.read(entry.name))
@@ -124,6 +138,18 @@ module Avv2word
               end
             end
           end
+
+          %w( word/_rels/header.xml.rels
+              word/_rels/footer.xml.rels
+              word/footnotes.xml
+              word/endnotes.xml
+          ).each do |f|
+            if @replaceable_files[f]
+              out.put_next_entry f
+              out.write(@replaceable_files[f])
+            end
+          end
+
         end
         buffer.string
       end
@@ -143,9 +169,15 @@ module Avv2word
       transform_and_replace(footer, xslt_path('footer'), Document.footer_xml_file)
       transform_and_replace(original_source, xslt_path('relations'), Document.relations_xml_file)
       source = xslt(stylesheet_name: 'cleanup').transform(original_source)
+
+      add_footnotes(source.css("footnote").map{ |footnote| footnote.text })
+
       transform_and_replace(source, xslt_path('numbering'), Document.numbering_xml_file)
       transform_doc_xml(source, extras)
+
       local_images(source)
+      local_images(footer, :footer) if @footer
+      local_images(header, :header) if @header
     end
 
     def transform_doc_xml(source, extras = false)
@@ -156,13 +188,40 @@ module Avv2word
 
     private
 
+    def add_footnotes(footnotes)
+      if footnotes.empty?
+        @replaceable_files["word/footnotes.xml"] = ""
+        return
+      end
+      doc = Nokogiri::XML.parse(File.read("templates/default/word/footnotes.xml"))
+      fn_node = doc.xpath("//w:footnote").last
+      footnotes.each_with_index do |footnote,i|
+        fn_node2 = fn_node.clone
+        fn_node2.parent = fn_node.parent
+        fn_node2["w:id"] = (fn_node["w:id"].to_i + i).to_s
+        fn_node2.xpath("w:p/w:r/w:t").first.content = " " + footnote
+      end
+      fn_node.remove
+
+      @replaceable_files["word/footnotes.xml"] = doc.to_xml
+      # add relation
+      rels = Nokogiri::XML(@replaceable_files["word/_rels/document.xml.rels"])
+      new_rel = '<Relationship Id="rIdXXXXX" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes" Target="footnotes.xml"/>'
+      new_rel.sub!(/XXXXX/, (rels.xpath("//xmlns:Relationship").size+1).to_s )
+      new_rel = Nokogiri::XML.parse(new_rel).child
+      rels.children.first << new_rel
+      @replaceable_files["word/_rels/document.xml.rels"] = rels.to_xml
+    end
+
     def inject_image_relations(relations, noko_html_source)
       rel_doc = Nokogiri::XML(relations)
       relations_root = rel_doc.css("Relationships").first
 
+      relations_size = relations_root.css("Relationship").size
+
       noko_html_source.css("img").each_with_index do |img,i|
         new_relation = relations_root.css("Relationship").last.clone
-        new_relation["Id"] = "rId#{i+10}"
+        new_relation["Id"] = "rId#{i + 10}" # use relations_size for dynamic relations create, todo
         new_relation["Type"] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
         new_relation["Target"] = "media/image#{i+1}#{File.extname(img[:src])}"
         relations_root.add_child new_relation
@@ -176,18 +235,30 @@ module Avv2word
       content.gsub!(/\s*xmlns:(\w+)="(.*?)\s*"/, '') if remove_ns
       if ( file =~ /document\.xml\.rels/ ) && ( source.css("img").size > 0 )
         content = inject_image_relations(content, source)
+      elsif file =~ /header/i
+        @replaceable_files["word/_rels/header.xml.rels"] = %(<?xml version="1.0" encoding="UTF-8"?>\n<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">\n</Relationships>)
+        source.css("img").each_with_index do |noko_img,i|
+          # <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/image3.png"/>
+          new_head_rel = %Q(<Relationship Id="rId#{i+10}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/#{File.basename(noko_img["src"])}"/>)
+          @replaceable_files["word/_rels/header.xml.rels"].sub!(/<\/Relationships>/, new_head_rel + "</Relationships>")
+        end
+      elsif file =~ /footer/i
+        @replaceable_files["word/_rels/footer.xml.rels"] = %(<?xml version="1.0" encoding="UTF-8"?>\n<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">\n</Relationships>)
+        source.css("img").each_with_index do |noko_img,i|
+          new_foot_rel = %Q(<Relationship Id="rId#{i+10}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="media/#{File.basename(noko_img["src"])}"/>)
+          @replaceable_files["word/_rels/footer.xml.rels"].sub!(/<\/Relationships>/, new_foot_rel + "</Relationships>")
+        end
       end
       @replaceable_files[file] = content
     end
 
     #generates an array of hashes with filename and full url
     #for all images to be embeded in the word document
-    def local_images(source)
-      source.css('img').each_with_index do |image,i|
+    def local_images(source, type = nil)
+      source.css('img').sort_by{|e| e.attributes['src'].value}.each_with_index do |image,i|
         filename = image['data-filename'] ? image['data-filename'] : image['src'].split("/").last
         ext = File.extname(filename).delete(".").downcase
-
-        @image_files << { filename: "image#{i+1}.#{ext}", url: image['src'], ext: ext }
+        @image_files << { filename: "image#{@image_files.size+1}.#{ext}", url: image['src'], ext: ext }
       end
     end
 

data/lib/avv2word/version.rb

@@ -1,3 +1,3 @@
 module Avv2word
-  VERSION = '1.1.18'
+  VERSION = '1.1.20'
 end

data/lib/avv2word/xslt/base.xslt

@@ -20,6 +20,7 @@
   <xsl:include href="./tables.xslt"/>
   <xsl:include href="./links.xslt"/>
   <xsl:include href="./images.xslt"/>
+  <xsl:include href="./footnote.xslt"/>
   <xsl:template match="/">
     <xsl:apply-templates />
   </xsl:template>

data/lib/avv2word/xslt/footnote.xslt

@@ -0,0 +1,29 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas"
+                xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                xmlns:o="urn:schemas-microsoft-com:office:office"
+                xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+                xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
+                xmlns:v="urn:schemas-microsoft-com:vml"
+                xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing"
+                xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
+                xmlns:w10="urn:schemas-microsoft-com:office:word"
+                xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+                xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"
+                xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup"
+                xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk"
+                xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
+                xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape"
+                mc:Ignorable="w14 wp14">
+
+  <xsl:template match="footnote">
+    <xsl:number level="any" count="footnote" format="1"/>
+    <w:r>
+      <w:rPr>
+        <w:rStyle w:val="FootnoteReference"/>
+      </w:rPr>
+      <w:footnoteReference w:id="{format-number(count(preceding::footnote)+1,'0')}"/>
+      <xsl:apply-templates select="@*|node()"/>
+    </w:r>
+  </xsl:template>
+</xsl:stylesheet>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avv2word
 version: !ruby/object:Gem::Version
-  version: 1.1.18
+  version: 1.1.20
 platform: ruby
 authors:
 - Marián Bilas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -146,6 +146,7 @@ files:
 - lib/avv2word/xslt/cleanup.xslt
 - lib/avv2word/xslt/extras.xslt
 - lib/avv2word/xslt/footer.xslt
+- lib/avv2word/xslt/footnote.xslt
 - lib/avv2word/xslt/functions.xslt
 - lib/avv2word/xslt/header.xslt
 - lib/avv2word/xslt/htmltoword.xslt