html2doc 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1c601730137c578b807990f177d8ded7b35c644d9239b57f22207d61d0a080d
-  data.tar.gz: 93f31b6831c3b9a32eb26165e0d702e7d0a92335fffc8660e3fd8215fbfc1d85
+  metadata.gz: 55191304dd43ffe3500f371d089e1b94523dbf66827b58e79a1eee3a6bdd193e
+  data.tar.gz: 65b07767fae84da8f4224a519307ba4b81d4b2e6f4ca37fc44b2350f5b4f231e
 SHA512:
-  metadata.gz: fcbc14ccff1c8ac0e11796def1bc0b15a64425ed09a5a1960ec5a26b1b486f7d7cf924ef19906c654729d6f4040a903006c1028189b6bbc3c76af78e0e612f11
-  data.tar.gz: 07f2968ad98ee9607c5b2c3b07c978c763cd276c83415399501f09a59a649b6a30a05b2bcbbeaa99e7dd50a148a6997c0f6d2f990406aefd40a5067a2bdb7fa1
+  metadata.gz: f07f8b86bff5b028453453060f52adfb15dbf51276028af83fe52accc290dcee86b05c71f674be62e9917405da7d4a5e0171280e20bb3f6a37d3db2f3271c40b
+  data.tar.gz: 374db0a1338c2dd0ca433ef5197c903a10d58d1305fe26df29669117070c04b0006b23363a614fab9959b9a004fc6487dd15963c0d756354d23ab59549a42dc0

data/lib/html2doc/mime.rb

@@ -93,7 +93,8 @@ module Html2Doc
       warnsvg(i["src"])
       next if /^http/.match i["src"]
       next if %r{^data:image/[^;]+;base64}.match i["src"]
-      local_filename = File.join(localdir, i["src"])
+      local_filename = %r{^([A-Z]:)?/}.match(i["src"]) ? i["src"] :
+        File.join(localdir, i["src"])
       new_filename = "#{mkuuid}#{File.extname(i["src"])}"
       FileUtils.cp local_filename, File.join(dir, new_filename)
       i["width"], i["height"] = image_resize(i, local_filename, 680, 400)
@@ -117,7 +118,8 @@ module Html2Doc
       warnsvg(m[:src])
       m2 = /\.(?<suffix>\S+)$/.match m[:src]
       new_filename = "file:///C:/Doc/#{filename}_files/#{mkuuid}.#{m2[:suffix]}"
-      FileUtils.cp File.join(localdir, m[:src]), File.join(dir, "#{mkuuid}.#{m2[:suffix]}")
+      old_filename = %r{^([A-Z]:)?/}.match(m[:src]) ? m[:src] : File.join(localdir, m[:src])
+      FileUtils.cp old_filename, File.join(dir, "#{mkuuid}.#{m2[:suffix]}")
       a[1].sub!(%r{ src=['"](?<src>[^"']+)['"]}, " src='#{new_filename}'")
     end
     a.join

data/lib/html2doc/version.rb

@@ -1,3 +1,3 @@
 module Html2Doc
-  VERSION = "0.9.1".freeze
+  VERSION = "0.9.2".freeze
 end

data/spec/html2doc_spec.rb

@@ -338,7 +338,20 @@ RSpec.describe Html2Doc do
 
   it "processes a header with an image" do
     Html2Doc.process(html_input(""), filename: "test", header_file: "spec/header_img.html")
-    expect(guid_clean(File.read("test.doc", encoding: "utf-8"))).to match(%r{Content-Type: image/png})
+    doc = guid_clean(File.read("test.doc", encoding: "utf-8"))
+    expect(doc).to match(%r{Content-Type: image/png})
+    expect(doc).to match(%r{file:///C:/Doc/test_files/[^.]+\.png})
+  end
+
+  it "processes a header with an image with absolute path" do
+    doc = File.read("spec/header_img.html", encoding: "utf-8")
+    File.open("spec/header_img1.html", "w:UTF-8") do |f|
+      f.write doc.sub(%r{spec/19160-6.png}, File.expand_path(File.join(File.dirname(__FILE__), "19160-6.png")))
+    end
+    Html2Doc.process(html_input(""), filename: "test", header_file: "spec/header_img.html")
+    doc = guid_clean(File.read("test.doc", encoding: "utf-8"))
+    expect(doc).to match(%r{Content-Type: image/png})
+    expect(doc).to match(%r{file:///C:/Doc/test_files/[^.]+\.png})
   end
 
 
@@ -541,6 +554,18 @@ RSpec.describe Html2Doc do
     OUTPUT
   end
 
+  it "deals with absolute image locations" do
+    simple_body = %{<img src="#{File.expand_path(File.dirname(__FILE__))}/19160-6.png">}
+    Html2Doc.process(html_input(simple_body), filename: "spec/test")
+    testdoc = File.read("spec/test.doc", encoding: "utf-8")
+    expect(testdoc).to match(%r{Content-Type: image/png})
+    expect(image_clean(guid_clean(testdoc))).to match_fuzzy(<<~OUTPUT)
+    #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
+    #{image_clean(word_body('<img src="test_files/cb7b0d19-891e-4634-815a-570d019d454c.png" width="400" height="388"></img>', '<div style="mso-element:footnote-list"/>'))}
+    #{image_clean(WORD_FTR3)}
+    OUTPUT
+  end
+
   it "warns about SVG" do
     simple_body = '<img src="https://example.com/19160-6.svg">'
     expect{ Html2Doc.process(html_input(simple_body), filename: "test") }.to output("https://example.com/19160-6.svg: SVG not supported\n").to_stderr

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2doc
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities