vectory 0.7.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4766f919c6d0611e918d6f98bc2c5da4da95fb5399990b4e3884cff0b364f149
-  data.tar.gz: 2716d9cbbe94669080f8ba64063d41c1d1abeef7165409811d486c5ab2a9823e
+  metadata.gz: d7ebbb9e4146780f1f9d42e0dee106494c251eb27b7d3f52d69f172da0a0d2e7
+  data.tar.gz: 132e451c7c1e9298f305f67a7103f8da8b7d5af3df371f5705e8a2eb95b59991
 SHA512:
-  metadata.gz: dce04edf8b7f050236a5c7e73a3f3923e0ce7ef87745600ad68a8bcbcaff1665ce5fa362201848a8a1a681179191f50f62be650f71ba7dd00494756c178e22f0
-  data.tar.gz: 1ec04a35841dc06e62b5e44baeac1cbe7eccd38f5f4b910ebf282b0e58709f00fff0110ffc29f544a9c5a3711a7bab1a2a35324bdbc03a78943a6afa90638c7b
+  metadata.gz: 33a7acbdacd776a6627d30a2641123743d325b3c5f89b3f1f40a244556b4f363c1c2a4b49458d2260014c53004a2d06a9c8d7f617e732f82457c30576e9c6085
+  data.tar.gz: 4a243d964fcda1b2d7e8dab7ef9bea706265c646d168d70df847bc6fd4d4e6c9f3453334adf4b0824670a59c029e4fa8a5812d4aecb4714298dfaa3425e1010a

data/Gemfile

@@ -5,12 +5,9 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in vectory.gemspec
 gemspec
 
-gem "equivalent-xml", "~> 0.6"
-
-gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"
-
-gem "rubocop", "~> 1.22"
-gem "rubocop-performance", "~> 1.10"
-gem "rubocop-rails", "~> 2.9"
+gem "equivalent-xml"
+gem "rake"
+gem "rspec"
+gem "rubocop"
+gem "rubocop-performance"
+gem "rexml"

data/lib/vectory/datauri.rb

@@ -12,7 +12,14 @@ module Vectory
 
     def self.from_vector(vector)
       mimetype = vector.class.mimetype
-      content = vector.content.gsub("\r\n", "\n")
+      content = vector.content
+
+      # Normalize line endings for text-based types before encoding
+      # Apply to PS, EPS, and SVG. EMF is binary, so skip it.
+      if ["application/postscript", "image/svg+xml"].include?(vector.mime)
+        content = content.gsub("\r\n", "\n")
+      end
+
       data = Base64.strict_encode64(content)
 
       new("data:#{mimetype};base64,#{data}")

data/lib/vectory/image_resize.rb

@@ -6,6 +6,7 @@ module Vectory
 
     def call(img, path, maxheight, maxwidth)
       s, realsize = get_image_size(img, path)
+      # Ensure s[0] and s[1] are not nil before setting viewBox
       img.name == "svg" && !img["viewBox"] && s[0] && s[1] and
         img["viewBox"] = viewbox(s)
       s, skip = image_dont_resize(s, realsize)
@@ -18,7 +19,8 @@ module Vectory
       detected = detect_size(path)
       realsize = detected if detected
       s = image_size_interpret(img, realsize || [nil, nil])
-      image_size_zeroes_complete(s, realsize)
+      # No call to image_size_zeroes_complete here
+      [s, realsize] # s should now be correctly populated
     end
 
     private
@@ -53,7 +55,11 @@ module Vectory
     end
 
     def fill_size(current, another, real_current, real_another)
-      return current unless current.zero? && !another.zero?
+      # Ensure 'current' and 'another' are not nil before calling zero?
+      # Also ensure real_another is not nil or zero to prevent division by zero
+      return current unless (current.nil? || current.zero?) &&
+        !(another.nil? || another.zero?) &&
+        !(real_another.nil? || real_another.zero?)
 
       another * real_current / real_another
     end
@@ -67,22 +73,102 @@ module Vectory
     end
 
     def image_size_interpret(img, realsize)
-      w = image_size_percent(img["width"], realsize[0])
-      h = image_size_percent(img["height"], realsize[1])
+      # Extract parent dimensions for percentage calculations
+      parent_w_px = realsize.is_a?(Array) && realsize.length > 0 ? realsize[0] : nil
+      parent_h_px = realsize.is_a?(Array) && realsize.length > 1 ? realsize[1] : nil
+
+      # Process width and height using the original css_size_to_px signature
+      w = css_size_to_px(img["width"], parent_w_px)
+      h = css_size_to_px(img["height"], parent_h_px)
+
+      # If attributes resulted in no dimensions, but realsize exists, use realsize.
+      # This brings back some of the logic from the removed image_size_zeroes_complete.
+      if w.nil? && h.nil? && realsize && !(realsize[0].nil? && realsize[1].nil?)
+        w = realsize[0]
+        h = realsize[1]
+      end
+
+      # If a dimension attribute led to a nil value (e.g. "auto", or "%" of nil parent)
+      # and the other dimension is resolved, default the nil dimension to 0.
+      if img["width"] && w.nil? && !h.nil? 
+        w = 0
+      end
+      if img["height"] && h.nil? && !w.nil?
+        h = 0
+      end
+
       [w, h]
     end
 
-    def image_size_percent(value, real)
-      /%$/.match?(value) && !real.nil? and
-        value = real * (value.sub(/%$/, "").to_f / 100)
-      value.to_i
+    # Enhanced version of image_size_percent that handles percentage calculations
+    # This is now a helper method for css_size_to_px
+    def image_size_percent(percentage_numeric_value, real_dimension)
+      return nil if real_dimension.nil? || percentage_numeric_value.nil?
+
+      # Calculates the dimension in pixels. The result is a float.
+      (real_dimension * (percentage_numeric_value / 100.0))
     end
 
-    def image_size_zeroes_complete(dim, realsize)
-      if dim[0].zero? && dim[1].zero?
-        dim = realsize
+    # New method from image_sizer.rb, incorporated directly into ImageResize
+    # Converts CSS length string to pixels.
+    def css_size_to_px(size_str, real_dimension_for_percentage, dpi: 96)
+      return nil unless size_str.is_a?(String)
+
+      cleaned_size_str = size_str.strip.downcase
+
+      # Handle keywords like "auto" which don't resolve to a numeric pixel value.
+      return nil if cleaned_size_str == "auto"
+
+      # Handle plain numbers (e.g., "150") as pixels.
+      if cleaned_size_str.match?(/^\d+(\.\d+)?$/)
+        return cleaned_size_str.to_f.to_i
+      end
+
+      # Match numeric value and unit (e.g., "10.5cm", "50%", "-5px").
+      match = cleaned_size_str.match(/^([-+]?[0-9]*\.?[0-9]+)([a-z%]+)$/)
+      unless match
+        # Not a plain number and not in "valueUnit" format
+        return nil
+      end
+
+      value = match[1].to_f
+      unit = match[2]
+      px_value = nil # This will store the calculated pixel value as a float.
+
+      case unit
+      when "px"
+        px_value = value
+      when "in"
+        px_value = value * dpi
+      when "cm"
+        px_value = value * dpi / 2.54
+      when "mm"
+        px_value = value * dpi / 25.4
+      when "pt" # 1 point = 1/72 inch
+        px_value = value * dpi / 72.0
+      when "pc" # 1 pica = 12 points
+        px_value = value * 12.0 * dpi / 72.0
+      when "%"
+        # Use the enhanced image_size_percent method
+        px_value = image_size_percent(value, real_dimension_for_percentage)
+      else
+        return nil # Unknown unit
+      end
+
+      return nil if px_value.nil?
+
+      # For 'px' and '%' units, truncate to match "integer conversion" expectation.
+      # For physical units, round to handle floating point inaccuracies correctly.
+      if ["px", "%"].include?(unit)
+        px_value.to_i
+      else
+        px_value.round
       end
-      [dim, realsize]
     end
+
+    # REMOVE the image_size_zeroes_complete method entirely if it's still present
+    # def image_size_zeroes_complete(dim, realsize)
+    #   ...
+    # end
   end
 end

data/lib/vectory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vectory
-  VERSION = "0.7.7"
+  VERSION = "0.8.0"
 end

data/vectory.gemspec

@@ -23,12 +23,13 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(bin|spec)/})
   end
-  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  spec.test_files = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_runtime_dependency "emf2svg"
-  spec.add_runtime_dependency "image_size", ">= 3.2.0"
-  spec.add_runtime_dependency "marcel", "~> 1.0"
-  spec.add_runtime_dependency "nokogiri", "~> 1.14"
-  spec.add_runtime_dependency "thor", "~> 1.0"
+  spec.add_dependency "base64"
+  spec.add_dependency "emf2svg"
+  spec.add_dependency "image_size", ">= 3.2.0"
+  spec.add_dependency "marcel", "~> 1.0"
+  spec.add_dependency "nokogiri", "~> 1.14"
+  spec.add_dependency "thor", "~> 1.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vectory
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  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: emf2svg
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +138,7 @@ homepage: https://github.com/metanorma/vectory
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,8 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Pairwise vector image conversions.
 test_files: []