vectory 0.8.0 → 0.8.1

data/lib/vectory/pdf.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require_relative "vector"
+require_relative "inkscape_wrapper"
+
+module Vectory
+  class Pdf < Vector
+    attr_accessor :original_height, :original_width
+
+    def self.default_extension
+      "pdf"
+    end
+
+    def self.mimetype
+      "application/pdf"
+    end
+
+    def to_svg
+      svg = InkscapeWrapper.convert(
+        content: content,
+        input_format: :pdf,
+        output_format: :svg,
+        output_class: Svg,
+        plain: true,
+      )
+
+      # If we have original dimensions from EPS/PS, adjust the SVG
+      if original_height && original_width
+        adjusted_content = adjust_svg_dimensions(svg.content, original_width,
+                                                 original_height)
+        svg = Svg.new(adjusted_content, svg.initial_path)
+      end
+
+      svg
+    end
+
+    def to_eps
+      InkscapeWrapper.convert(
+        content: content,
+        input_format: :pdf,
+        output_format: :eps,
+        output_class: Eps,
+      )
+    end
+
+    def to_ps
+      InkscapeWrapper.convert(
+        content: content,
+        input_format: :pdf,
+        output_format: :ps,
+        output_class: Ps,
+      )
+    end
+
+    def to_emf
+      InkscapeWrapper.convert(
+        content: content,
+        input_format: :pdf,
+        output_format: :emf,
+        output_class: Emf,
+      )
+    end
+
+    private
+
+    def adjust_svg_dimensions(svg_content, width, height)
+      # Replace width and height attributes in SVG root element
+      svg_content.gsub(/(<svg[^>]*\s)width="[^"]*"/, "\\1width=\"#{width}\"")
+        .gsub(/(<svg[^>]*\s)height="[^"]*"/, "\\1height=\"#{height}\"")
+        .gsub(/(<svg[^>]*\s)viewBox="[^"]*"/) do |match|
+          # Adjust viewBox to match new dimensions
+          "#{match.split('viewBox')[0]}viewBox=\"0 0 #{width} #{height}\""
+      end
+    end
+  end
+end

data/lib/vectory/platform.rb

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+module Vectory
+  # Platform abstraction for centralized OS-specific behavior
+  #
+  # This class provides a single source of truth for platform detection
+  # and platform-specific path handling, eliminating duplicated logic
+  # across InkscapeWrapper, GhostscriptWrapper, and other classes.
+  #
+  # @example Check if running on Windows
+  #   Vectory::Platform.windows? # => true or false
+  #
+  # @example Format a path for execution on the current platform
+  #   Vectory::Platform.path_for_execution("C:/Program Files/Inkscape/inkscape.exe")
+  #   # On Windows: "C:\\Program Files\\Inkscape\\inkscape.exe"
+  #   # On Unix:   "C:/Program Files/Inkscape/inkscape.exe"
+  class Platform
+    class << self
+      # Detect if running on Windows
+      #
+      # @return [Boolean] true if on Windows platform
+      def windows?
+        Gem.win_platform?
+      end
+
+      # Detect if running on macOS
+      #
+      # @return [Boolean] true if on macOS platform
+      def macos?
+        RbConfig::CONFIG["host_os"].include?("darwin")
+      end
+
+      # Detect if running on Linux
+      #
+      # @return [Boolean] true if on Linux platform
+      def linux?
+        RbConfig::CONFIG["host_os"].include?("linux")
+      end
+
+      # Format a file path for execution on the current platform
+      #
+      # On Windows, converts forward slashes to backslashes and quotes paths with spaces.
+      # On Unix-like systems, returns the path unchanged.
+      #
+      # @param path [String] the file path to format
+      # @return [String] platform-formatted path
+      def path_for_execution(path)
+        return path unless path
+
+        formatted_path = windows? ? path.gsub("/", "\\") : path
+
+        # Quote paths with spaces to prevent shell parsing issues
+        formatted_path[/\s/] ? "\"#{formatted_path}\"" : formatted_path
+      end
+
+      # Get the PATH environment variable as an array
+      #
+      # Handles different PATH separators on Windows (;) vs Unix (:)
+      #
+      # @return [Array<String>] array of directory paths
+      def executable_search_paths
+        @executable_search_paths ||= begin
+          path_sep = windows? ? ";" : ":"
+          (ENV["PATH"] || "").split(path_sep)
+        end
+      end
+
+      # Check if a command is available in the system PATH
+      #
+      # @param command [String] the command to check
+      # @return [Boolean] true if command is found in PATH
+      def command_available?(command)
+        executable_search_paths.any? do |dir|
+          executable_path = File.join(dir, command)
+          File.executable?(executable_path) && !File.directory?(executable_path)
+        end
+      end
+
+      # Get the appropriate shell command extension for the platform
+      #
+      # @return [String, nil] ".exe" on Windows, nil on Unix
+      def command_extension
+        windows? ? ".exe" : nil
+      end
+
+      # Get the default shell for the platform
+      #
+      # @return [String] shell command (e.g., "cmd.exe" on Windows, "sh" on Unix)
+      def default_shell
+        if windows?
+          "cmd.exe"
+        else
+          "sh"
+        end
+      end
+
+      # Reset cached values (primarily for testing)
+      #
+      # @api private
+      def reset_cache
+        @executable_search_paths = nil
+      end
+    end
+  end
+end

data/lib/vectory/ps.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative "ghostscript_wrapper"
+require_relative "pdf"
+
 module Vectory
   class Ps < Vector
     def self.default_extension
@@ -20,15 +23,56 @@ module Vectory
     end
 
     def to_eps
-      convert_with_inkscape("--export-type=eps", Eps)
+      to_pdf.to_eps
     end
 
     def to_emf
-      convert_with_inkscape("--export-type=emf", Emf)
+      to_pdf.to_emf
     end
 
     def to_svg
-      convert_with_inkscape("--export-type=svg", Svg)
+      to_pdf.to_svg
+    end
+
+    def to_pdf
+      pdf_content = GhostscriptWrapper.convert(content, eps_crop: false)
+      pdf = Pdf.new(pdf_content)
+      # Pass original BoundingBox dimensions to preserve them in conversions
+      bbox = parse_bounding_box
+      if bbox
+        pdf.original_width = bbox[:urx] - bbox[:llx]
+        pdf.original_height = bbox[:ury] - bbox[:lly]
+      end
+      pdf
+    end
+
+    def height
+      bbox = parse_bounding_box
+      return super unless bbox
+
+      bbox[:ury] - bbox[:lly]
+    end
+
+    def width
+      bbox = parse_bounding_box
+      return super unless bbox
+
+      bbox[:urx] - bbox[:llx]
+    end
+
+    private
+
+    def parse_bounding_box
+      # Look for %%BoundingBox: llx lly urx ury
+      match = content.match(/^%%BoundingBox:\s+(-?\d+)\s+(-?\d+)\s+(-?\d+)\s+(-?\d+)/m)
+      return nil unless match
+
+      {
+        llx: match[1].to_f,
+        lly: match[2].to_f,
+        urx: match[3].to_f,
+        ury: match[4].to_f,
+      }
     end
   end
 end

data/lib/vectory/svg.rb

@@ -32,15 +32,58 @@ module Vectory
     end
 
     def to_emf
-      convert_with_inkscape("--export-type=emf", Emf)
+      InkscapeWrapper.convert(
+        content: content,
+        input_format: :svg,
+        output_format: :emf,
+        output_class: Emf,
+      )
     end
 
     def to_eps
-      convert_with_inkscape("--export-type=eps", Eps)
+      InkscapeWrapper.convert(
+        content: content,
+        input_format: :svg,
+        output_format: :eps,
+        output_class: Eps,
+      )
     end
 
     def to_ps
-      convert_with_inkscape("--export-type=ps", Ps)
+      InkscapeWrapper.convert(
+        content: content,
+        input_format: :svg,
+        output_format: :ps,
+        output_class: Ps,
+      )
+    end
+
+    def height
+      # Try to read height from SVG attributes first
+      doc = Nokogiri::XML(content)
+      svg_element = doc.at_xpath("//svg:svg",
+                                 "svg" => SVG_NS) || doc.at_xpath("//svg")
+
+      if svg_element && svg_element["height"]
+        svg_element["height"].to_f.round
+      else
+        # Fall back to Inkscape query if no height attribute
+        super
+      end
+    end
+
+    def width
+      # Try to read width from SVG attributes first
+      doc = Nokogiri::XML(content)
+      svg_element = doc.at_xpath("//svg:svg",
+                                 "svg" => SVG_NS) || doc.at_xpath("//svg")
+
+      if svg_element && svg_element["width"]
+        svg_element["width"].to_f.round
+      else
+        # Fall back to Inkscape query if no width attribute
+        super
+      end
     end
 
     private

data/lib/vectory/svg_document.rb

@@ -4,6 +4,44 @@ module Vectory
   class SvgDocument
     SVG_NS = "http://www.w3.org/2000/svg".freeze
 
+    class << self
+      # Update instances of id in style statements in a nokogiri document
+      def update_ids_css(document, ids, suffix)
+        suffix = suffix.is_a?(Integer) ? sprintf("%09d", suffix) : suffix
+        document.xpath(".//m:style", "m" => SVG_NS).each do |s|
+          c = s.children.to_xml
+          s.children = update_ids_css_string(c, ids, suffix)
+        end
+        document.xpath(".//*[@style]").each do |s|
+          s["style"] = update_ids_css_string(s["style"], ids, suffix)
+        end
+      end
+
+      # Update instances of id in style statements in the string style
+      def update_ids_css_string(style, ids, suffix)
+        ids.each do |i|
+          style = style.gsub(%r[##{i}\b],
+                             sprintf("#%<id>s_%<suffix>s", id: i,
+                                                           suffix: suffix))
+            .gsub(%r(\[id\s*=\s*['"]?#{i}['"]?\]),
+                  sprintf("[id='%<id>s_%<suffix>s']", id: i,
+                                                      suffix: suffix))
+        end
+        style
+      end
+
+      def update_ids_attrs(document, ids, suffix)
+        suffix = suffix.is_a?(Integer) ? sprintf("%09d", suffix) : suffix
+        document.xpath(". | .//*[@*]").each do |a|
+          a.attribute_nodes.each do |x|
+            val = x.value.sub(/^#/, "")
+            ids.include?(val) and x.value += "_#{suffix}"
+            x.value = x.value.sub(%r{url\(#([^()]+)\)}, "url(#\\1_#{suffix})")
+          end
+        end
+      end
+    end
+
     def initialize(content)
       @document = Nokogiri::XML(content)
     end
@@ -33,8 +71,8 @@ module Vectory
       ids = collect_ids
       return if ids.empty?
 
-      update_ids_attrs(ids, suffix)
-      update_ids_css(ids, suffix)
+      self.class.update_ids_attrs(@document.root, ids, suffix)
+      self.class.update_ids_css(@document.root, ids, suffix)
 
       self
     end
@@ -50,27 +88,5 @@ module Vectory
     def collect_ids
       @document.xpath("./@id | .//@id").map(&:value)
     end
-
-    def update_ids_attrs(ids, suffix)
-      @document.xpath(". | .//*[@*]").each do |a|
-        a.attribute_nodes.each do |x|
-          ids.include?(x.value) and x.value += sprintf("_%09d", suffix)
-        end
-      end
-    end
-
-    def update_ids_css(ids, suffix)
-      @document.xpath("//m:style", "m" => SVG_NS).each do |s|
-        c = s.children.to_xml
-        ids.each do |i|
-          c = c.gsub(%r[##{i}\b],
-                     sprintf("#%<id>s_%<suffix>09d", id: i, suffix: suffix))
-            .gsub(%r(\[id\s*=\s*['"]?#{i}['"]?\]),
-                  sprintf("[id='%<id>s_%<suffix>09d']", id: i, suffix: suffix))
-        end
-
-        s.children = c
-      end
-    end
   end
 end

data/lib/vectory/system_call.rb

@@ -7,15 +7,16 @@ module Vectory
 
     attr_reader :status, :stdout, :stderr, :cmd
 
-    def initialize(cmd, timeout = TIMEOUT)
+    def initialize(cmd, timeout = TIMEOUT, env: {})
       @cmd = cmd
       @timeout = timeout
+      @env = env
     end
 
     def call
       log_cmd(@cmd)
 
-      execute(@cmd)
+      execute(@cmd, @env)
 
       log_result
 
@@ -30,14 +31,26 @@ module Vectory
       Vectory.ui.debug("Cmd: '#{cmd}'")
     end
 
-    def execute(cmd)
-      result = Capture.with_timeout(cmd,
-                                    timeout: @timeout,
-                                    signal: :KILL, # only KILL works on Windows
-                                    kill_after: @timeout)
-      @stdout = result[:stdout]
-      @stderr = result[:stderr]
+    def execute(cmd, env)
+      # Build spawn options with environment variables and timeout settings
+      spawn_opts = {}
+      spawn_opts.merge!(env) if env.any?
+      spawn_opts[:timeout] = @timeout
+      spawn_opts[:signal] = :TERM # Use TERM on Unix for graceful shutdown
+      spawn_opts[:kill_after] = 2
+
+      # Pass command and options directly (without splatting)
+      # Capture.with_timeout expects: cmd, options_hash
+      # It will handle extracting the options correctly
+      result = if cmd.is_a?(Array)
+                 Capture.with_timeout(*cmd, spawn_opts)
+               else
+                 Capture.with_timeout(cmd, spawn_opts)
+               end
+      @stdout = result[:stdout] || ""
+      @stderr = result[:stderr] || ""
       @status = result[:status]
+      @timed_out = result[:timeout]
     rescue Errno::ENOENT => e
       raise SystemCallError, e.inspect
     end
@@ -49,6 +62,20 @@ module Vectory
     end
 
     def raise_error
+      if @timed_out
+        raise SystemCallError,
+              "Command timed out after #{@timeout} seconds: #{@cmd},\n  " \
+              "stdout: '#{@stdout.strip}',\n  " \
+              "stderr: '#{@stderr.strip}'"
+      end
+
+      if @status.nil?
+        raise SystemCallError,
+              "Failed to run #{@cmd} (no status available),\n  " \
+              "stdout: '#{@stdout.strip}',\n  " \
+              "stderr: '#{@stderr.strip}'"
+      end
+
       raise SystemCallError,
             "Failed to run #{@cmd},\n  " \
             "status: #{@status.exitstatus},\n  " \

data/lib/vectory/vector.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "tempfile"
-require_relative "inkscape_converter"
+require_relative "inkscape_wrapper"
 
 module Vectory
   class Vector < Image
@@ -47,28 +47,17 @@ module Vectory
     end
 
     def height
-      InkscapeConverter.instance.height(content, self.class.default_extension)
+      InkscapeWrapper.instance.height(content, self.class.default_extension)
     end
 
     def width
-      InkscapeConverter.instance.width(content, self.class.default_extension)
+      InkscapeWrapper.instance.width(content, self.class.default_extension)
     end
 
     def to_uri
       Datauri.from_vector(self)
     end
 
-    def convert_with_inkscape(inkscape_options, target_class)
-      with_file(self.class.default_extension) do |input_path|
-        output_extension = target_class.default_extension
-        output_path = InkscapeConverter.instance.convert(input_path,
-                                                         output_extension,
-                                                         inkscape_options)
-
-        target_class.from_path(output_path)
-      end
-    end
-
     def write(path = nil)
       target_path = path || @path || tmp_path
       File.binwrite(target_path, content)
@@ -83,15 +72,6 @@ module Vectory
 
     private
 
-    def with_file(input_extension)
-      Dir.mktmpdir do |dir|
-        input_path = File.join(dir, "image.#{input_extension}")
-        File.binwrite(input_path, content)
-
-        yield input_path
-      end
-    end
-
     def tmp_path
       dir = Dir.mktmpdir
       filename = "image.#{self.class.default_extension}"

data/lib/vectory/version.rb

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

data/lib/vectory.rb

@@ -3,10 +3,21 @@
 require "logger"
 require_relative "vectory/version"
 require_relative "vectory/utils"
+
+module Vectory
+  class Error < StandardError; end
+end
+
+require_relative "vectory/errors"
+require_relative "vectory/platform"
+require_relative "vectory/configuration"
+require_relative "vectory/conversion"
 require_relative "vectory/image"
 require_relative "vectory/image_resize"
 require_relative "vectory/datauri"
 require_relative "vectory/vector"
+require_relative "vectory/ghostscript_wrapper"
+require_relative "vectory/pdf"
 require_relative "vectory/eps"
 require_relative "vectory/ps"
 require_relative "vectory/emf"
@@ -14,16 +25,8 @@ require_relative "vectory/svg"
 require_relative "vectory/svg_mapping"
 
 module Vectory
-  class Error < StandardError; end
-
-  class ConversionError < Error; end
-
   class SystemCallError < Error; end
 
-  class InkscapeNotFoundError < Error; end
-
-  class InkscapeQueryError < Error; end
-
   class NotImplementedError < Error; end
 
   class NotWrittenToDiskError < Error; end
@@ -31,9 +34,11 @@ module Vectory
   class ParsingError < Error; end
 
   def self.ui
-    @ui ||= Logger.new(STDOUT).tap do |logger|
-      logger.level = ENV['VECTORY_LOG'] || Logger::WARN
-      logger.formatter = proc { |severity, datetime, progname, msg| "#{msg}\n" }
+    @ui ||= Logger.new($stdout).tap do |logger|
+      logger.level = ENV["VECTORY_LOG"] || Logger::WARN
+      logger.formatter = proc { |_severity, _datetime, _progname, msg|
+        "#{msg}\n"
+      }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vectory
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-03 00:00:00.000000000 Z
+date: 2026-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -105,25 +105,56 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/automerge.yml"
+- ".github/workflows/docs.yml"
+- ".github/workflows/links.yml"
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - Gemfile
 - README.adoc
 - Rakefile
+- docs/Gemfile
+- docs/_config.yml
+- docs/features/conversion.adoc
+- docs/features/external-dependencies.adoc
+- docs/features/format-detection.adoc
+- docs/features/index.adoc
+- docs/getting-started/core-concepts.adoc
+- docs/getting-started/index.adoc
+- docs/getting-started/installation.adoc
+- docs/getting-started/quick-start.adoc
+- docs/guides/error-handling.adoc
+- docs/guides/index.adoc
+- docs/index.adoc
+- docs/lychee.toml
+- docs/reference/api.adoc
+- docs/reference/index.adoc
+- docs/understanding/architecture.adoc
+- docs/understanding/index.adoc
+- docs/understanding/inkscape-wrapper.adoc
 - exe/vectory
 - lib/vectory.rb
 - lib/vectory/capture.rb
 - lib/vectory/cli.rb
+- lib/vectory/configuration.rb
+- lib/vectory/conversion.rb
+- lib/vectory/conversion/ghostscript_strategy.rb
+- lib/vectory/conversion/inkscape_strategy.rb
+- lib/vectory/conversion/strategy.rb
 - lib/vectory/datauri.rb
 - lib/vectory/emf.rb
 - lib/vectory/eps.rb
+- lib/vectory/errors.rb
 - lib/vectory/file_magic.rb
+- lib/vectory/ghostscript_wrapper.rb
 - lib/vectory/image.rb
 - lib/vectory/image_resize.rb
-- lib/vectory/inkscape_converter.rb
+- lib/vectory/inkscape_wrapper.rb
+- lib/vectory/pdf.rb
+- lib/vectory/platform.rb
 - lib/vectory/ps.rb
 - lib/vectory/svg.rb
 - lib/vectory/svg_document.rb