html2doc 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2a2c43dd161c558af6a773c9a13a66cdab0f1d7761f133ed871944478bcad08
-  data.tar.gz: 1d64197bf6009686fa80f4137d28838c6d22bec7cf38352ef0f66e5d73959f0a
+  metadata.gz: 5fb722a791f01d46b99c0b26ab91a3463f2552e213b0a4d864a9d66ab2b49ccf
+  data.tar.gz: 4dd6ce8f87af7bb2189fdd7abb56ba0f6008b66d16c08a9abedef4416c5bd2e3
 SHA512:
-  metadata.gz: 46c4310554974525fda44159b11d25eec7edad5bd8e5b8f4154142b5cbb91cbefe86325233df66cb01c588f204afb54799ae8ff547b41d8faa8bb0998677f118
-  data.tar.gz: d0dcebb5033f6e41fb430912f10d814f47c7e35c32d111e16424b773473c3555e3bba5e782b55dafcffdcfa49869ae139af6014ecb72a6420a6b6f49962bcf68
+  metadata.gz: d8c96786c7a0879498c2db78f3b73014a0aafb562255e48d4045305dde5fcce747a1d6301595ca34ea0f8302b9699f0a6a7b9101c39ac0300c2c687f5776672f
+  data.tar.gz: 601bed8fb8a0ed595e9937d39afca1fdfa89f574a3b3f1029a88534bf0f4c6982d68d148106f0568a407f97c1adc314619d8a315108494a04d88fdbea511d313

data/Gemfile

@@ -2,7 +2,6 @@ source "https://rubygems.org"
 
 group :development, :test do
   gem "rspec"
-  gem "rspec-match_fuzzy"
 end
 
 

data/Gemfile.lock

@@ -120,7 +120,7 @@ DEPENDENCIES
   html2doc!
   rake (~> 12.0)
   rspec
-  rspec-match_fuzzy
+  rspec-match_fuzzy (~> 0.1.3)
   rubocop (~> 0.50)
   simplecov (~> 0.15)
   timecop (~> 0.9)

data/html2doc.gemspec

@@ -44,5 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.50"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "rspec-match_fuzzy"
+  spec.add_development_dependency "rspec-match_fuzzy", "~> 0.1.3"
 end

data/lib/html2doc/mime.rb

@@ -58,21 +58,22 @@ module Html2Doc
     File.open("#{filename}.doc", "w") { |f| f.write mhtml }
   end
 
+  # max height for Word document is 400, max width is 680
   def self.image_resize(i, maxheight, maxwidth)
-    size = [i["width"].to_i, i["height"].to_i]
-    size = ImageSize.path(i["src"]).size if size[0].zero? && size[1].zero?
-    # max height for Word document is 400, max width is 680
-    if size[0] > maxheight
-      size = [maxheight, (size[1] * maxheight / size[0]).ceil]
-    end
-    if size[1] > maxwidth
-      size = [(size[0] * maxwidth / size[1]).ceil, maxwidth]
-    end
-    size
+    realSize = ImageSize.path(i["src"]).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?
+    s[0] = s[1] * realSize[0] / realSize[1] if s[0].zero? && !s[1].zero?
+    s = [(s[0] * maxheight / s[1]).ceil, maxheight] if s[1] > maxheight
+    s = [maxwidth, (s[1] * maxwidth / s[0]).ceil] if s[0] > maxwidth
+    s
   end
 
+  IMAGE_PATH = "//*[local-name() = 'img' or local-name() = 'imagedata']".freeze
+
   def self.image_cleanup(docxml, dir)
-    docxml.xpath("//*[local-name() = 'img' or local-name() = 'imagedata']").each do |i|
+    docxml.xpath(IMAGE_PATH).each do |i|
       matched = /\.(?<suffix>\S+)$/.match i["src"]
       uuid = UUIDTools::UUID.random_create.to_s
       new_full_filename = File.join(dir, "#{uuid}.#{matched[:suffix]}")
@@ -93,16 +94,16 @@ module Html2Doc
   end
 
   def self.header_image_cleanup1(a, dir, filename)
-      if a.size == 2
-        matched = / src=['"](?<src>[^"']+)['"]/.match a[1]
-        matched2 = /\.(?<suffix>\S+)$/.match matched[:src]
-        uuid = UUIDTools::UUID.random_create.to_s
-        new_full_filename = "file:///C:/Doc/#{filename}_files/#{uuid}.#{matched2[:suffix]}"
-        dest_filename = File.join(dir, "#{uuid}.#{matched2[:suffix]}")
-        system "cp #{matched[:src]} #{dest_filename}"
-        a[1].sub!(%r{ src=['"](?<src>[^"']+)['"]}, " src='#{new_full_filename}'")
-      end
-      a.join
+    if a.size == 2
+      matched = / src=['"](?<src>[^"']+)['"]/.match a[1]
+      matched2 = /\.(?<suffix>\S+)$/.match matched[:src]
+      uuid = UUIDTools::UUID.random_create.to_s
+      new_full_filename = "file:///C:/Doc/#{filename}_files/#{uuid}.#{matched2[:suffix]}"
+      dest_filename = File.join(dir, "#{uuid}.#{matched2[:suffix]}")
+      system "cp #{matched[:src]} #{dest_filename}"
+      a[1].sub!(%r{ src=['"](?<src>[^"']+)['"]}, " src='#{new_full_filename}'")
+    end
+    a.join
   end
 
   def self.generate_filelist(filename, dir)

data/lib/html2doc/version.rb

@@ -1,3 +1,3 @@
 module Html2Doc
-  VERSION = "0.8.1".freeze
+  VERSION = "0.8.2".freeze
 end

data/spec/html2doc_spec.rb

@@ -546,6 +546,38 @@ RSpec.describe Html2Doc do
     OUTPUT
   end
 
+  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]
+    image["width"] = "20"
+    expect(Html2Doc.image_resize(image, 100, 100)).to eq [20, 65]
+    image.delete("width")
+    image["height"] = "50"
+    expect(Html2Doc.image_resize(image, 100, 100)).to eq [15, 50]
+    image.delete("height")
+    image["width"] = "500"
+    expect(Html2Doc.image_resize(image, 100, 100)).to eq [30, 100]
+    image.delete("width")
+    image["height"] = "500"
+    expect(Html2Doc.image_resize(image, 100, 100)).to eq [30, 100]
+    image["width"] = "20"
+    image["height"] = "auto"
+    expect(Html2Doc.image_resize(image, 100, 100)).to eq [20, 65]
+    image["width"] = "auto"
+    image["height"] = "50"
+    expect(Html2Doc.image_resize(image, 100, 100)).to eq [15, 50]
+    image["width"] = "500"
+    image["height"] = "auto"
+    expect(Html2Doc.image_resize(image, 100, 100)).to eq [30, 100]
+    image["width"] = "auto"
+    image["height"] = "500"
+    expect(Html2Doc.image_resize(image, 100, 100)).to eq [30, 100]
+    image["width"] = "auto"
+    image["height"] = "auto"
+    expect(Html2Doc.image_resize(image, 100, 100)).to eq [30, 100]
+  end
+
+
   it "processes epub:type footnotes" do
     simple_body = '<div>This is a very simple 
      document<a epub:type="footnote" href="#a1">1</a> allegedly<a epub:type="footnote" href="#a2">2</a></div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2doc
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-08 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -266,16 +266,16 @@ dependencies:
   name: rspec-match_fuzzy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 description: |
   Convert HTML document to Microsoft Word document.