avv2word 1.1.30 → 1.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f21aa08f0eb889b07a6ae13cb5ed80156eb8bd3b2730b3bd99eb204a2c5b790
-  data.tar.gz: 172e0cde722ad248e304ca092769bef904806efb5d43a11fdc4173385ad5963b
+  metadata.gz: 5d8568faddf890ada2e05ab971a1d9829938e0300213f0c510921322ad2f71a0
+  data.tar.gz: 3a175e32880587cdad276769604517f774c1995c1134802c5d8214aee82e7365
 SHA512:
-  metadata.gz: 6a46e14ff10f766f006a3c3513875d6b58afe385f715b471ecedb4e5a2711514dcc468364949fdb6e51210d017e36624147f8006be361d460f137e90060922cc
-  data.tar.gz: '03578535709c0f1761318c6cf9c723f8bc073b8566485d7bb4b61d98df1beb18916d5a40d8c33f69a87945bef5d345022e6171b763a42df391433c945e4c679f'
+  metadata.gz: e2e040b9b91976b7ce8a58723af3de9863e433d93f35728aaa46a74527932f7514d4ffd9c974bcb017c38d282c2c0b016e8e97b428c1c0fd4ba59f8bad2c5747
+  data.tar.gz: f971b5da98c1f4af48fbb7ce3c24870a1eb218e4174589d88a9a1503fb89726fdec17df71d3953879a3f6e1504ce20577c27cdcdde715927c24d88a5b9b4be07

data/lib/avv2word/document.rb

@@ -272,19 +272,34 @@ module Avv2word
       end
     end
 
-    def inject_image_relations(relations, noko_html_source)
+    def inject_relations(relations, noko_html_source)
       rel_doc = Nokogiri::XML(relations)
       relations_root = rel_doc.css("Relationships").first
-
       relations_size = relations_root.css("Relationship").size
+      img_counter = 0
 
-      noko_html_source.css("img").each_with_index do |img,i|
+      html = noko_html_source.to_xml
+      html.scan(/<img.*?>|<a.*?\/a>/).each_with_index do |link,i|
         new_relation = relations_root.css("Relationship").last.clone
-        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])}"
+
+        case link
+        when /^<a/
+          a_href = link.match(/href="(.*?)"/)[1]
+          new_relation["Id"] = "rId#{i + 1 + relations_size}"
+          new_relation["Type"] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
+          new_relation["TargetMode"] = "External"
+          new_relation["Target"] = a_href
+        when /^<img/
+          img_counter += 1
+          img_src = link.match(/src="(.*?)"/)[1]
+          new_relation["Id"] = "rId#{i + 1 + relations_size}"
+          new_relation["Type"] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
+          new_relation["Target"] = "media/image#{img_counter}#{File.extname(img_src)}"
+          new_relation.remove_attribute("TargetMode") if new_relation["TargetMode"]
+        end
         relations_root.add_child new_relation
       end
+
       rel_doc.to_xml
     end
 
@@ -292,8 +307,9 @@ module Avv2word
       stylesheet = xslt(stylesheet_path: stylesheet_path)
       content = stylesheet.apply_to(source)
       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)
+
+      if ( file =~ /document\.xml\.rels/ ) && (( source.css("a").size > 0 ) || ( source.css("img").size > 0 ))
+        content = inject_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|

data/lib/avv2word/version.rb

@@ -1,3 +1,3 @@
 module Avv2word
-  VERSION = '1.1.30'
+  VERSION = '1.1.31'
 end

data/lib/avv2word/xslt/links.xslt

@@ -27,9 +27,7 @@
           <w:color w:val="000080"/>
           <w:u w:val="single"/>
         </w:rPr>
-        <w:t xml:space="preserve">
-          <xsl:value-of select="."/>
-        </w:t>
+        <w:t xml:space="preserve"><xsl:value-of select="."/></w:t>
       </w:r>
     </w:hyperlink>
   </xsl:template>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avv2word
 version: !ruby/object:Gem::Version
-  version: 1.1.30
+  version: 1.1.31
 platform: ruby
 authors:
 - Marián Bilas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack