html2doc 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36da12f189ac6654c4024d328fe2ceca7c171e5b8aa834c291f2ebef568a44b6
-  data.tar.gz: 38f446130c868c6368752f39a6f74c632ceab4c6e3016b48f63a454f3b1a7d22
+  metadata.gz: a1e07932ce2329645bb69ae3c9c5f401d229d3080be417428e5aa36b900d9f6c
+  data.tar.gz: 9e916f0a465fa1e11d693fcfc04197f7fcfae0b423da255bb3c4cdc3a02a61f7
 SHA512:
-  metadata.gz: f7d6ba90a533613f18e7edbb1bf1287109b750e97faf2d05800b9da7c7058e5be1f8ce0765a7546369ae528d332cf60aa64ea91781b45c902f74eccec87f682b
-  data.tar.gz: 73623c29bfbd99f6c089dd86d2bd25ba78e6096145f17bcc5a6efd9a28f2c17ff0b9a7baed55574decfb05f068f28257dedeab8c89b610e5b2df0389a40ba714
+  metadata.gz: 3bad513cc61d42db8d5bd24b7e0b0eaf66c631d40d39128817549a84e8c8d3f9fbd917b5a1fff949d57604981833f64579e9e630ead7366feb1694510bb42591
+  data.tar.gz: 6733ac123a379ca70712acdc39f32048ee6220f4b58e894af93df87c84defb382ffec978fc6cc084f6fb1b040da3fe5dffdc111c237d4d6afce4cf397a42144e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    html2doc (0.8.5)
+    html2doc (0.8.6)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
@@ -59,7 +59,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.12.1)
-    parser (2.5.1.2)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.11.3)
@@ -76,7 +76,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-match_fuzzy (0.1.3)
@@ -85,14 +85,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.59.2)
+    rubocop (0.60.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
     ruby-xslt (0.9.10)
     ruby_dep (1.5.0)
@@ -126,4 +126,4 @@ DEPENDENCIES
   timecop (~> 0.9)
 
 BUNDLED WITH
-   1.16.2
+   1.17.1

data/lib/html2doc/base.rb

@@ -20,7 +20,7 @@ module Html2Doc
   def self.process_header(headerfile, hash)
     return if headerfile.nil?
     doc = File.read(headerfile, encoding: "utf-8")
-    doc = header_image_cleanup(doc, hash[:dir1], hash[:filename])
+    doc = header_image_cleanup(doc, hash[:dir1], hash[:filename], File.dirname(hash[:filename]))
     File.open("#{hash[:dir1]}/header.html", "w:UTF-8") { |f| f.write(doc) }
   end
 
@@ -44,7 +44,7 @@ module Html2Doc
   end
 
   def self.cleanup(docxml, hash)
-    image_cleanup(docxml, hash[:dir1])
+    image_cleanup(docxml, hash[:dir1], File.dirname(hash[:filename]))
     mathml_to_ooml(docxml)
     lists(docxml, hash[:liststyles])
     footnotes(docxml)
@@ -112,7 +112,7 @@ module Html2Doc
     docxml.xpath("//*[local-name() = 'head']").each do |h|
       h.children.first.add_previous_sibling <<~XML
       #{PRINT_VIEW}
-        <link rel="File-List" href="#{dir}/filelist.xml"/>
+        <link rel="File-List" href="#{File.basename(dir)}/filelist.xml"/>
       XML
     end
   end
@@ -121,7 +121,7 @@ module Html2Doc
     if header_filename.nil?
       stylesheet.gsub!(/\n[^\n]*FILENAME[^\n]*i\n/, "\n")
     else
-      stylesheet.gsub!(/FILENAME/, filename)
+      stylesheet.gsub!(/FILENAME/, File.basename(filename))
     end
     stylesheet
   end

data/lib/html2doc/mime.rb

@@ -11,7 +11,7 @@ module Html2Doc
     Content-Type: multipart/related; boundary="#{boundary}"
 
     --#{boundary}
-    Content-Location: file:///C:/Doc/#{filename}.htm
+    Content-Location: file:///C:/Doc/#{File.basename(filename)}.htm
     Content-Type: text/html; charset="utf-8"
 
     #{result}
@@ -25,7 +25,7 @@ module Html2Doc
     ).gsub(/(.{76})/, "\\1\n")
     <<~"FILE"
     --#{boundary}
-    Content-Location: file:///C:/Doc/#{filename}_files/#{item}
+    Content-Location: file:///C:/Doc/#{File.basename(filename)}_files/#{item}
     Content-Transfer-Encoding: base64
     Content-Type: #{mime_type(item)}
 
@@ -60,8 +60,8 @@ module Html2Doc
   end
 
   # max width for Word document is 400, max height is 680
-  def self.image_resize(i, maxheight, maxwidth)
-    realSize = ImageSize.path(i["src"]).size
+  def self.image_resize(i, path, maxheight, maxwidth)
+    realSize = ImageSize.path(path).size
     s = [i["width"].to_i, i["height"].to_i]
     s = realSize if s[0].zero? && s[1].zero?
     s[1] = s[0] * realSize[1] / realSize[0] if s[1].zero? && !s[0].zero?
@@ -82,34 +82,34 @@ module Html2Doc
   end
 
   # only processes locally stored images
-  def self.image_cleanup(docxml, dir)
+  def self.image_cleanup(docxml, dir, localdir)
     docxml.xpath(IMAGE_PATH).each do |i|
-      matched = /\.(?<suffix>\S+)$/.match i["src"]
       warnsvg(i["src"])
       next if /^http/.match i["src"]
-      new_full_filename = File.join(dir, "#{mkuuid}.#{matched[:suffix]}")
-      FileUtils.cp i["src"], new_full_filename
-      i["width"], i["height"] = image_resize(i, 680, 400)
-      i["src"] = new_full_filename
+      local_filename = 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)
+      i["src"] = File.join(File.basename(dir), new_filename)
     end
     docxml
   end
 
   # do not parse the header through Nokogiri, since it will contain 
   # non-XML like <![if !supportFootnotes]>
-  def self.header_image_cleanup(doc, dir, filename)
+  def self.header_image_cleanup(doc, dir, filename, localdir)
     doc.split(%r{(<img [^>]*>|<v:imagedata [^>]*>)}).each_slice(2).map do |a|
-      header_image_cleanup1(a, dir, filename)
+      header_image_cleanup1(a, dir, filename, localdir)
     end.join
   end
 
-  def self.header_image_cleanup1(a, dir, filename)
+  def self.header_image_cleanup1(a, dir, filename, localdir)
     if a.size == 2 && !(/ src="https?:/.match a[1])
       m = / src=['"](?<src>[^"']+)['"]/.match a[1]
       warnsvg(m[:src])
       m2 = /\.(?<suffix>\S+)$/.match m[:src]
       new_filename = "file:///C:/Doc/#{filename}_files/#{mkuuid}.#{m2[:suffix]}"
-      FileUtils.cp m[:src], File.join(dir, "#{mkuuid}.#{m2[:suffix]}")
+      FileUtils.cp File.join(localdir, m[:src]), 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.8.5".freeze
+  VERSION = "0.8.6".freeze
 end

data/spec/html2doc_spec.rb

@@ -510,10 +510,10 @@ RSpec.describe Html2Doc do
     OUTPUT
   end
 
-  it "resizes images for height" do
-    simple_body = '<img src="spec/19160-6.png">'
-    Html2Doc.process(html_input(simple_body), filename: "test")
-    testdoc = File.read("test.doc", encoding: "utf-8")
+  it "resizes images for height, in a file in a subdirectory" do
+    simple_body = '<img src="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}
@@ -548,33 +548,33 @@ RSpec.describe Html2Doc do
 
   it "resizes images with missing or auto sizes" do
     image = { "src" => "spec/19160-8.jpg" }
-    expect(Html2Doc.image_resize(image, 100, 100)).to eq [30, 100]
+    expect(Html2Doc.image_resize(image, "spec/19160-8.jpg", 100, 100)).to eq [30, 100]
     image["width"] = "20"
-    expect(Html2Doc.image_resize(image, 100, 100)).to eq [20, 65]
+    expect(Html2Doc.image_resize(image, "spec/19160-8.jpg", 100, 100)).to eq [20, 65]
     image.delete("width")
     image["height"] = "50"
-    expect(Html2Doc.image_resize(image, 100, 100)).to eq [15, 50]
+    expect(Html2Doc.image_resize(image, "spec/19160-8.jpg", 100, 100)).to eq [15, 50]
     image.delete("height")
     image["width"] = "500"
-    expect(Html2Doc.image_resize(image, 100, 100)).to eq [30, 100]
+    expect(Html2Doc.image_resize(image, "spec/19160-8.jpg", 100, 100)).to eq [30, 100]
     image.delete("width")
     image["height"] = "500"
-    expect(Html2Doc.image_resize(image, 100, 100)).to eq [30, 100]
+    expect(Html2Doc.image_resize(image, "spec/19160-8.jpg", 100, 100)).to eq [30, 100]
     image["width"] = "20"
     image["height"] = "auto"
-    expect(Html2Doc.image_resize(image, 100, 100)).to eq [20, 65]
+    expect(Html2Doc.image_resize(image, "spec/19160-8.jpg", 100, 100)).to eq [20, 65]
     image["width"] = "auto"
     image["height"] = "50"
-    expect(Html2Doc.image_resize(image, 100, 100)).to eq [15, 50]
+    expect(Html2Doc.image_resize(image, "spec/19160-8.jpg", 100, 100)).to eq [15, 50]
     image["width"] = "500"
     image["height"] = "auto"
-    expect(Html2Doc.image_resize(image, 100, 100)).to eq [30, 100]
+    expect(Html2Doc.image_resize(image, "spec/19160-8.jpg", 100, 100)).to eq [30, 100]
     image["width"] = "auto"
     image["height"] = "500"
-    expect(Html2Doc.image_resize(image, 100, 100)).to eq [30, 100]
+    expect(Html2Doc.image_resize(image, "spec/19160-8.jpg", 100, 100)).to eq [30, 100]
     image["width"] = "auto"
     image["height"] = "auto"
-    expect(Html2Doc.image_resize(image, 100, 100)).to eq [30, 100]
+    expect(Html2Doc.image_resize(image, "spec/19160-8.jpg", 100, 100)).to eq [30, 100]
   end
 
   it "does not move images if they are external URLs" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2doc
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities