html2doc 1.7.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9ccbcf331056dfa6edf4c3a028a1327751695589a3881ba34631fcfe0840ece
-  data.tar.gz: 50146c87c3c2b49942449917e2e549fa2d998c0d3713ce6ae4594046beb25971
+  metadata.gz: '09057eeb233c7a7834dd70e9a15e0ceddaf166687a0878d3f2a23942f22400d0'
+  data.tar.gz: 93b1ba5a3d6be89b90c200f901f8c38382dd2abc46cd4b8ce1955a2dcfd2ae39
 SHA512:
-  metadata.gz: b6d9e333ea11bf0fbfb0021a115c2359a949af78254bec227a11c144e1a9316353163ac15302be8769f744c62b0273602001013dcbf07e6f85ffde3e45cf6abc
-  data.tar.gz: 4f51999d644f50dc08ab70980418d660d8c78baba8ce58b2ed957ddb8fac41cefc1310d1078dea5150270f32c0d76f90f51f7467f6a2c5006efcbe245ec5622f
+  metadata.gz: a959a3661ee68c4e8c476a878e7f5f830fac0fa8e6c9280dd477e8576b28fb1f8e66c363325c24fd88f67246f5ef0564fe15350e637db2955005bc9b59e4410d
+  data.tar.gz: 9e4bc16a4fb89d0690fff40d438959655a37ac7064d86c42155076a4483191afe98b04d939921ae9f0436f5858f8168ff078d70bf6d714f7e51430c20b7270e1

data/html2doc.gemspec

@@ -27,8 +27,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "image_size", ">= 3.2.0"
-  spec.add_dependency "metanorma-utils"
+  spec.add_dependency "metanorma-utils", "~> 1.7.0"
   spec.add_dependency "mime-types"
   spec.add_dependency "nokogiri", "~> 1.15"
   spec.add_dependency "plane1converter", "~> 0.0.1"

data/lib/html2doc/mime.rb

@@ -76,27 +76,6 @@ class Html2Doc
     end
   end
 
-  def image_resize(img, path, maxheight, maxwidth)
-    s, realsize = get_image_size(img, path)
-    s[0] == nil && s[1] == nil and return s
-    if img.name == "svg" && !img["viewBox"]
-      img["viewBox"] = "0 0 #{s[0]} #{s[1]}"
-    end
-    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
-
-  def get_image_size(img, path)
-    realsize = ImageSize.path(path).size
-    s = [img["width"].to_i, img["height"].to_i]
-    s = realsize if s[0].zero? && s[1].zero?
-    s = [nil, nil]  if realsize.nil? || realsize[0].nil? || realsize[1].nil?
-    [s, realsize]
-  end
-
   IMAGE_PATH = "//*[local-name() = 'img' or local-name() = 'imagedata']".freeze
 
   def mkuuid
@@ -119,9 +98,9 @@ class Html2Doc
       local_filename = rename_image(i, dir, localdir)
       i["width"], i["height"] =
         if landscape?(i)
-          image_resize(i, local_filename, maxwidth, maxheight)
+          Metanorma::Utils.image_resize(i, local_filename, maxwidth, maxheight)
         else
-          image_resize(i, local_filename, maxheight, maxwidth)
+          Metanorma::Utils.image_resize(i, local_filename, maxheight, maxwidth)
         end
     end
     docxml

data/lib/html2doc/version.rb

@@ -1,3 +1,3 @@
 class Html2Doc
-  VERSION = "1.7.2".freeze
+  VERSION = "1.8.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2doc
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -24,34 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: image_size
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement