html2doc 1.10.0 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9ef55b2a805994f5ca26253285cdc062ff7d9a16c12ce009935956513d3eb3c
-  data.tar.gz: 8229037b442e8c9fd93790b14ec25daff760b4f98697b787da2ae8daef344699
+  metadata.gz: c8c443b99cbd047a0b18d7533d67d0c0b2aef65b46454dc4bf144aeb45bd8c05
+  data.tar.gz: bdd4cef5357c4003f4091bd4a78219439d4c2b56c4814b8cd2f46ad4ac9d08c7
 SHA512:
-  metadata.gz: 293dcfb6a88743f5a3a5e8bc7042d3a5f7c1e7f93683b22d21153591f2e82fdae5d3bb2c446817b2a06372469db09554078e2c5a804ff54cf2ba4ee54706e0bf
-  data.tar.gz: 4bfac10267769fecca5b85fe68319bf17fce9ed021e6c1534cf7d76cee34193468919f3d4e1f9114257884d09661d8502a7a0f1de06ab05586842c360a4a7228
+  metadata.gz: 54773965e4c77880a525bbe9b59e45472b3f9b745048a289848d170240b6ebdd1e72f201eba8f55739e2586d30400b3deea71b58dcc0da2ef6b705633497cc6a
+  data.tar.gz: 45139d8ed49d211ca64f368cd7a3207a6554f72375c9861882a09d4f291cc77decebe9fc9078bbb4615096f394eac6a9f69b1f4f41c4f9221c8423110e619107

data/README.adoc

@@ -4,7 +4,7 @@ https://github.com/metanorma/html2doc/workflows/main/badge.svg
 
 image:https://img.shields.io/gem/v/html2doc.svg["Gem Version", link="https://rubygems.org/gems/html2doc"]
 image:https://github.com/metanorma/html2doc/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/html2doc/actions?workflow=rake"]
-image:https://codeclimate.com/github/metanorma/html2doc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/html2doc"]
+// image:https://codeclimate.com/github/metanorma/html2doc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/html2doc"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/html2doc.svg["Pull Requests", link="https://github.com/metanorma/html2doc/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/html2doc/latest.svg["Commits since latest",link="https://github.com/metanorma/html2doc/releases"]
 

data/html2doc.gemspec

@@ -29,14 +29,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "base64"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "lutaml-model", "~> 0.7.0"
+  spec.add_dependency "marcel"
   spec.add_dependency "metanorma-utils", ">= 1.9.0"
-  spec.add_dependency "mime-types"
   spec.add_dependency "nokogiri", "~> 1.18.3"
   spec.add_dependency "plane1converter", "~> 0.0.1"
   spec.add_dependency "plurimath", "~> 0.9.0"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
-  spec.add_dependency "unitsml"
   spec.add_dependency "vectory", "~> 0.8"
 
   spec.add_development_dependency "debug"

data/lib/html2doc/mime.rb

@@ -1,6 +1,6 @@
 require "uuidtools"
 require "base64"
-require "mime/types"
+require "marcel"
 require "fileutils"
 require "vectory"
 
@@ -21,7 +21,7 @@ class Html2Doc
   end
 
   def mime_attachment(boundary, _filename, item, dir)
-    content_type = mime_type(item)
+    content_type = mime_type(File.join(dir, item))
     text_mode = %w[text application].any? { |p| content_type.start_with? p }
 
     path = File.join(dir, item)
@@ -41,9 +41,17 @@ class Html2Doc
   end
 
   def mime_type(item)
-    types = MIME::Types.type_for(item)
-    type = types ? types.first.to_s : 'text/plain; charset="utf-8"'
-    type = %(#{type} charset="utf-8") if /^text/.match(type) && types
+    abs_path = File.absolute_path(item)
+    type = Marcel::MimeType.for(Pathname.new(abs_path))
+    
+    # Marcel sometimes fails to detect XML files and returns application/octet-stream
+    # Override for .xml files when detection fails
+    if type == "application/octet-stream" && File.extname(abs_path).downcase == ".xml"
+      type = "application/xml"
+    end
+    
+    type ||= 'text/plain; charset="utf-8"'
+    type = %(#{type} charset="utf-8") if /^text/.match?(type)
     type
   end
 
@@ -59,7 +67,6 @@ class Html2Doc
     Dir.foreach(dir) do |item|
       next if item == "." || item == ".." || /^\./.match(item) ||
         item == "filelist.xml"
-
       mhtml += mime_attachment(boundary, "#{filename}.htm", item, dir)
     end
     mhtml += "--#{boundary}--"
@@ -90,22 +97,36 @@ class Html2Doc
     %r{^([A-Z]:)?/}.match?(src) ? src : File.join(localdir, src)
   end
 
+  IMAGE_IMAGEDATA =
+    ".//*[local-name() = 'img' or local-name() = 'imagedata']".freeze
+
   # only processes locally stored images
   def image_cleanup(docxml, dir, localdir)
     maxheight, maxwidth = page_dimensions(docxml)
-    docxml.traverse do |i|
+    docxml.xpath(IMAGE_IMAGEDATA).each do |i|
       skip_image_cleanup?(i) and next
       local_filename = rename_image(i, dir, localdir)
-      i["width"], i["height"] =
-        if landscape?(i)
-          Vectory.image_resize(i, local_filename, maxwidth, maxheight)
-        else
-          Vectory.image_resize(i, local_filename, maxheight, maxwidth)
-        end
+      if tr_ancestor = i.xpath("ancestor::*[local-name() = 'tr']").first
+        image_count = tr_ancestor.xpath(IMAGE_IMAGEDATA).count
+        image_resize(i, local_filename, maxheight, maxwidth, image_count)
+      else # Normal behavior for non-table images
+        image_resize(i, local_filename, maxheight, maxwidth, 1)
+      end
     end
     docxml
   end
 
+  def image_resize(img, local_filename, maxheight, maxwidth, image_count)
+    img["width"], img["height"] =
+      if landscape?(img)
+        Vectory.image_resize(img, local_filename, maxwidth,
+                             maxheight / image_count)
+      else
+        Vectory.image_resize(img, local_filename, maxheight,
+                             maxwidth / image_count)
+      end
+  end
+
   def landscape?(img)
     img.ancestors.each do |a|
       a.name == "div" or next

data/lib/html2doc/version.rb

@@ -1,3 +1,3 @@
 class Html2Doc
-  VERSION = "1.10.0".freeze
+  VERSION = "1.10.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2doc
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-02 00:00:00.000000000 Z
+date: 2026-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: metanorma-utils
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: unitsml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: vectory
   requirement: !ruby/object:Gem::Requirement