vectory 0.10.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50d97784f6629c9150bb2da21c151ba9f5a971e0c949bcb40c6f1e56a56a9e0c
-  data.tar.gz: 1494199096329b53ec283fc424df6b49fcb1a0f95271b841e8289ee7d2e7fb49
+  metadata.gz: 3a9abbde7cd6a7876ad8a2f8077786e870dcf860b3206bef30f061f997145d31
+  data.tar.gz: 05c8f3c7a6ab01aa09e3facc83d145ba17a6a8ea7dde5e2bba02ab1405d49999
 SHA512:
-  metadata.gz: 13129736f9ec596505e93e5e2b8904928be9dfb98ee9198259b34bdfecfdcbc2e0ca35e8e99133af06f9e65899434c55873f7bb5c94f42951360d13e6d812fc6
-  data.tar.gz: 4daa37bcf802de4eaac71466694b229d6fee62e10b11237253f05a4e855da18b7646fcd14d4530ae8961ebf49b6cfcc60887b29761e4096ac65a885224fa9ec9
+  metadata.gz: a9651cbe852b2ba5dbdbdb07db31105aa33bf9a41bcc7bd0cb4f621c679ba41f4343f85ae0d4f3722a34cfaab2cb4cb80210e2aa383b71d7df34256b36a781ac
+  data.tar.gz: c03d30678dfa73b41dac5b987cd70905fc0edc2dcd5621a7bdfb2d61bf8be11769f1d4135602c93aa7b51b243e05b915d0c7b0e55f5002badc50d45365863e3a

data/README.adoc

@@ -21,14 +21,12 @@ ____
 
 === Prerequisites
 
-Vectory relies on the following software to be installed:
+Vectory ships as a pure-Ruby gem. Format support is provided by these Ruby gems (installed automatically):
 
-* https://github.com/claricle/emfsvg[emfsvg]
-* https://inkscape.org[Inkscape]
-* https://www.ghostscript.com/[Ghostscript]
+* https://github.com/claricle/emfsvg[emfsvg] (EMF <-> SVG)
+* https://github.com/claricle/postsvg[postsvg] (PS/EPS <-> SVG)
 
-NOTE: Inkscape 1.3.1+ does not work properly with EPS/PS on Windows. To avoid
-this issue, the 1.3.0 version of Inkscape can be used.
+No external binaries are required.
 
 
 === Gem install

data/lib/vectory/cli.rb

@@ -9,14 +9,10 @@ module Vectory
     STATUS_UNSUPPORTED_OUTPUT_FORMAT_ERROR = 3
     STATUS_CONVERSION_ERROR = 4
     STATUS_SYSTEM_CALL_ERROR = 5
-    STATUS_INKSCAPE_NOT_FOUND_ERROR = 6
     STATUS_SAME_FORMAT_ERROR = 7
-    STATUS_GHOSTSCRIPT_NOT_FOUND_ERROR = 8
 
     MAP_ERROR_TO_STATUS = {
       Vectory::ConversionError => STATUS_CONVERSION_ERROR,
-      Vectory::InkscapeNotFoundError => STATUS_INKSCAPE_NOT_FOUND_ERROR,
-      Vectory::GhostscriptNotFoundError => STATUS_GHOSTSCRIPT_NOT_FOUND_ERROR,
       Vectory::SystemCallError => STATUS_SYSTEM_CALL_ERROR,
     }.freeze
 

data/lib/vectory/configuration.rb

@@ -3,14 +3,10 @@
 module Vectory
   # Configuration for Vectory
   #
-  # Provides centralized configuration for tool paths, timeouts, caching, etc.
+  # Provides centralized configuration for timeouts, caching, etc.
   # Can be loaded from environment variables or a configuration file.
   #
-  # @example Set custom Inkscape path
-  #   Vectory::Configuration.instance.inkscape_path = "/path/to/inkscape"
-  #
   # @example Load from environment variables
-  #   # Set VECTORY_INKSCAPE_PATH environment variable
   #   Vectory::Configuration.load_from_environment
   class Configuration
     # Default timeout for external tool execution (seconds)
@@ -22,8 +18,8 @@ module Vectory
     # Default temporary directory
     DEFAULT_TEMP_DIR = nil # Use system default
 
-    attr_accessor :inkscape_path, :ghostscript_path, :timeout, :cache_ttl,
-                  :cache_enabled, :temp_dir, :verbose_logging
+    attr_accessor :timeout, :cache_ttl, :cache_enabled, :temp_dir,
+                  :verbose_logging
 
     # Get the singleton instance
     #
@@ -46,15 +42,11 @@ module Vectory
       @cache_enabled = true
       @temp_dir = DEFAULT_TEMP_DIR
       @verbose_logging = false
-      @inkscape_path = nil
-      @ghostscript_path = nil
     end
 
     # Load configuration from environment variables
     #
     # Supported environment variables:
-    # - VECTORY_INKSCAPE_PATH: Path to Inkscape executable
-    # - VECTORY_GHOSTSCRIPT_PATH: Path to Ghostscript executable
     # - VECTORY_TIMEOUT: Timeout for external tools (default: 120)
     # - VECTORY_CACHE_TTL: Cache TTL in seconds (default: 300)
     # - VECTORY_CACHE_ENABLED: Enable/disable caching (default: true)
@@ -65,8 +57,6 @@ module Vectory
     def self.load_from_environment
       config = instance
 
-      config.inkscape_path = ENV["VECTORY_INKSCAPE_PATH"] if ENV["VECTORY_INKSCAPE_PATH"]
-      config.ghostscript_path = ENV["VECTORY_GHOSTSCRIPT_PATH"] if ENV["VECTORY_GHOSTSCRIPT_PATH"]
       config.timeout = ENV["VECTORY_TIMEOUT"]&.to_i || config.timeout
       config.cache_ttl = ENV["VECTORY_CACHE_TTL"]&.to_i || config.cache_ttl
       config.cache_enabled = ENV["VECTORY_CACHE_ENABLED"] != "false"
@@ -86,8 +76,6 @@ module Vectory
       config_data = YAML.load_file(path)
 
       config = instance
-      config.inkscape_path = config_data["inkscape_path"] if config_data["inkscape_path"]
-      config.ghostscript_path = config_data["ghostscript_path"] if config_data["ghostscript_path"]
       config.timeout = config_data["timeout"] || config.timeout
       config.cache_ttl = config_data["cache_ttl"] || config.cache_ttl
       config.cache_enabled = config_data.fetch("cache_enabled",
@@ -104,8 +92,6 @@ module Vectory
     # @return [Hash] the configuration as a hash
     def to_h
       {
-        inkscape_path: @inkscape_path,
-        ghostscript_path: @ghostscript_path,
         timeout: @timeout,
         cache_ttl: @cache_ttl,
         cache_enabled: @cache_enabled,
@@ -114,20 +100,6 @@ module Vectory
       }
     end
 
-    # Get the Inkscape path (custom or auto-detected)
-    #
-    # @return [String, nil] the configured Inkscape path or nil if not set
-    def effective_inkscape_path
-      @inkscape_path
-    end
-
-    # Get the Ghostscript path (custom or auto-detected)
-    #
-    # @return [String, nil] the configured Ghostscript path or nil if not set
-    def effective_ghostscript_path
-      @ghostscript_path
-    end
-
     # Check if caching is enabled
     #
     # @return [Boolean] true if caching is enabled

data/lib/vectory/emf.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "emf"
 require "emfsvg"
 
 module Vectory
@@ -32,21 +33,33 @@ module Vectory
     end
 
     def to_eps
-      InkscapeWrapper.convert(
-        content: content,
-        input_format: :emf,
-        output_format: :eps,
-        output_class: Eps,
-      )
+      to_svg.to_eps
     end
 
     def to_ps
-      InkscapeWrapper.convert(
-        content: content,
-        input_format: :emf,
-        output_format: :ps,
-        output_class: Ps,
-      )
+      to_svg.to_ps
+    end
+
+    def height
+      bounds = parse_header_bounds
+      return super unless bounds
+
+      bounds.bottom - bounds.top
+    end
+
+    def width
+      bounds = parse_header_bounds
+      return super unless bounds
+
+      bounds.right - bounds.left
+    end
+
+    private
+
+    def parse_header_bounds
+      ::Emf.parse(content).header.bounds
+    rescue StandardError
+      nil
     end
   end
 end

data/lib/vectory/eps.rb

@@ -22,7 +22,7 @@ module Vectory
     end
 
     def to_ps
-      to_pdf.to_ps
+      to_svg.to_ps
     end
 
     def to_svg
@@ -30,19 +30,7 @@ module Vectory
     end
 
     def to_emf
-      to_pdf.to_emf
-    end
-
-    def to_pdf
-      pdf_content = GhostscriptWrapper.convert(content, eps_crop: true)
-      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
+      to_svg.to_emf
     end
 
     def height

data/lib/vectory/errors.rb

@@ -3,20 +3,6 @@
 module Vectory
   class ConversionError < Error; end
 
-  class InkscapeNotFoundError < Error
-    def initialize(msg = nil)
-      super(msg || "Inkscape not found in PATH. Please install Inkscape.")
-    end
-  end
-
-  class GhostscriptNotFoundError < Error
-    def initialize(msg = nil)
-      super(msg || "Ghostscript not found in PATH. Please install Ghostscript.")
-    end
-  end
-
-  class InkscapeQueryError < Error; end
-
   class InvalidFormatError < Error
     def initialize(format, supported_formats)
       super("Invalid format '#{format}'. Supported formats: #{supported_formats.join(', ')}")

data/lib/vectory/ps.rb

@@ -22,29 +22,17 @@ module Vectory
     end
 
     def to_eps
-      to_pdf.to_eps
+      to_svg.to_eps
     end
 
     def to_emf
-      to_pdf.to_emf
+      to_svg.to_emf
     end
 
     def to_svg
       Svg.from_content(Postsvg.convert(content))
     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

data/lib/vectory/svg.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "nokogiri"
+require "postsvg"
 
 module Vectory
   class Svg < Vector
@@ -36,53 +37,43 @@ module Vectory
     end
 
     def to_eps
-      InkscapeWrapper.convert(
-        content: content,
-        input_format: :svg,
-        output_format: :eps,
-        output_class: Eps,
-      )
+      Eps.from_content(Postsvg.to_eps(content))
     end
 
     def to_ps
-      InkscapeWrapper.convert(
-        content: content,
-        input_format: :svg,
-        output_format: :ps,
-        output_class: Ps,
-      )
+      Ps.from_content(Postsvg.to_ps(content))
     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
+      dim_from_attr("height") || dim_from_viewbox(3) || super
     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
+      dim_from_attr("width") || dim_from_viewbox(2) || super
     end
 
     private
 
+    def svg_root
+      doc = Nokogiri::XML(content)
+      doc.at_xpath("//svg:svg", "svg" => SVG_NS) || doc.at_xpath("//svg")
+    end
+
+    def dim_from_attr(name)
+      value = svg_root&.[](name)
+      value&.to_f&.round
+    end
+
+    def dim_from_viewbox(index)
+      vb = svg_root&.[]("viewBox")
+      return nil unless vb
+
+      parts = vb.split
+      return nil unless parts.length == 4
+
+      parts[index].to_f.round
+    end
+
     def content=(content)
       # non-root node inserts the xml tag which breaks markup when placed in
       # another xml document

data/lib/vectory/vector.rb

@@ -46,11 +46,15 @@ module Vectory
     end
 
     def height
-      InkscapeWrapper.instance.height(content, self.class.default_extension)
+      raise Vectory::NotImplementedError,
+            "#height should be implemented in a subclass when no intrinsic " \
+            "dimension source is available."
     end
 
     def width
-      InkscapeWrapper.instance.width(content, self.class.default_extension)
+      raise Vectory::NotImplementedError,
+            "#width should be implemented in a subclass when no intrinsic " \
+            "dimension source is available."
     end
 
     def to_uri

data/lib/vectory/version.rb

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

data/lib/vectory.rb

@@ -2,7 +2,6 @@
 
 # External dependencies
 require "logger"
-require "ukiryu"
 
 # Define base error class and additional error classes
 # (used in class bodies like cli.rb, so can't be autoloaded)
@@ -25,14 +24,6 @@ require_relative "vectory/version"
 module Vectory
   # Core utilities
   autoload :Utils, "vectory/utils"
-  autoload :Platform, "vectory/platform"
-
-  # Wrappers
-  autoload :GhostscriptWrapper, "vectory/ghostscript_wrapper"
-  autoload :InkscapeWrapper, "vectory/inkscape_wrapper"
-
-  # Conversion system
-  autoload :Conversion, "vectory/conversion"
 
   # Format classes
   autoload :Configuration, "vectory/configuration"
@@ -40,7 +31,6 @@ module Vectory
   autoload :ImageResize, "vectory/image_resize"
   autoload :Datauri, "vectory/datauri"
   autoload :Vector, "vectory/vector"
-  autoload :Pdf, "vectory/pdf"
   autoload :Eps, "vectory/eps"
   autoload :Ps, "vectory/ps"
   autoload :Emf, "vectory/emf"

data/scripts/regenerate_fixtures.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# One-shot fixture regeneration script.
+# Run from the vectory root: `bundle exec ruby scripts/regenerate_fixtures.rb`
+
+require_relative "../lib/vectory"
+
+Pairs = [
+  ["spec/examples/emf2eps/img.emf", :to_eps, "spec/examples/emf2eps/ref.eps"],
+  ["spec/examples/emf2ps/img.emf",  :to_ps,  "spec/examples/emf2ps/ref.ps"],
+  ["spec/examples/eps2emf/img.eps", :to_emf, "spec/examples/eps2emf/ref.emf"],
+  ["spec/examples/eps2ps/img.eps",  :to_ps,  "spec/examples/eps2ps/ref.ps"],
+  ["spec/examples/eps2svg/img.eps", :to_svg, "spec/examples/eps2svg/ref.svg"],
+  ["spec/examples/ps2emf/img.ps",   :to_emf, "spec/examples/ps2emf/ref.emf"],
+  ["spec/examples/ps2eps/img.ps",   :to_eps, "spec/examples/ps2eps/ref.eps"],
+  ["spec/examples/ps2svg/img.ps",   :to_svg, "spec/examples/ps2svg/ref.svg"],
+  ["spec/examples/svg2emf/img.svg", :to_emf, "spec/examples/svg2emf/ref.emf"],
+  ["spec/examples/svg2eps/img.svg", :to_eps, "spec/examples/svg2eps/ref.eps"],
+  ["spec/examples/svg2ps/img.svg",  :to_ps,  "spec/examples/svg2ps/ref.ps"],
+].freeze
+
+Pairs.each do |input, method, output|
+  ext = File.extname(input).delete(".")
+  klass_name = { "emf" => "Emf", "eps" => "Eps", "ps" => "Ps",
+                 "svg" => "Svg" }.fetch(ext)
+  klass = Vectory.const_get(klass_name)
+  result = klass.from_path(input).public_send(method)
+  File.binwrite(output, result.content)
+  puts "[OK] #{input} -> #{output} (#{result.content.bytesize} bytes)"
+rescue => e
+  puts "[FAIL] #{input} -> #{output}: #{e.class}: #{e.message}"
+end

data/vectory.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "image_size", ">= 3.2.0"
   spec.add_dependency "marcel", "~> 1.0"
   spec.add_dependency "nokogiri", "~> 1.14"
-  spec.add_dependency "postsvg", "~> 0.1"
+  spec.add_dependency "postsvg", "~> 0.3"
   spec.add_dependency "thor", "~> 1.0"
-  spec.add_dependency "ukiryu", "~> 0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vectory
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Ribose Inc.
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -114,20 +114,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: ukiryu
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 description: |
   Vectory performs pairwise vector image conversions for common
   vector image formats, such as SVG, EMF, EPS and PS.
@@ -172,21 +158,13 @@ files:
 - lib/vectory.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_wrapper.rb
-- lib/vectory/pdf.rb
-- lib/vectory/platform.rb
 - lib/vectory/ps.rb
 - lib/vectory/svg.rb
 - lib/vectory/svg_document.rb
@@ -194,6 +172,7 @@ files:
 - lib/vectory/utils.rb
 - lib/vectory/vector.rb
 - lib/vectory/version.rb
+- scripts/regenerate_fixtures.rb
 - tmp/.keep
 - vectory.gemspec
 homepage: https://github.com/metanorma/vectory

data/lib/vectory/conversion/ghostscript_strategy.rb

@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-module Vectory
-  module Conversion
-    # Ghostscript-based conversion strategy
-    #
-    # Handles PS/EPS → PDF conversions using Ghostscript.
-    # Ghostscript is used for its accurate BoundingBox preservation.
-    #
-    # @see https://www.ghostscript.com/
-    class GhostscriptStrategy < Strategy
-      # Ghostscript supports PS/EPS → PDF conversions
-      SUPPORTED_CONVERSIONS = [
-        %i[ps pdf],
-        %i[eps pdf],
-      ].freeze
-
-      # Convert PS/EPS content to PDF using Ghostscript
-      #
-      # @param content [String] the PS/EPS content to convert
-      # @param input_format [Symbol] the input format (:ps or :eps)
-      # @param output_format [Symbol] the output format (must be :pdf)
-      # @param options [Hash] additional options
-      # @option options [Boolean] :eps_crop use EPSCrop for better BoundingBox handling
-      # @return [String] the PDF content
-      # @raise [Vectory::GhostscriptNotFoundError] if Ghostscript is not available
-      # @raise [Vectory::ConversionError] if conversion fails
-      def convert(content, input_format:, output_format:, **options)
-        unless output_format == :pdf
-          raise ArgumentError,
-                "Ghostscript only supports PDF output, got: #{output_format}"
-        end
-
-        unless %i[ps eps].include?(input_format)
-          raise ArgumentError,
-                "Ghostscript only supports PS/EPS input, got: #{input_format}"
-        end
-
-        GhostscriptWrapper.convert(content,
-                                   eps_crop: options[:eps_crop] || false)
-      end
-
-      # Check if this conversion is supported
-      #
-      # @param input_format [Symbol] the input format
-      # @param output_format [Symbol] the output format
-      # @return [Boolean] true if Ghostscript supports this conversion
-      def supports?(input_format, output_format)
-        SUPPORTED_CONVERSIONS.include?([input_format, output_format])
-      end
-
-      # Get supported conversions
-      #
-      # @return [Array<Array<Symbol>>] array of [input, output] format pairs
-      def supported_conversions
-        SUPPORTED_CONVERSIONS
-      end
-
-      # Check if Ghostscript is available
-      #
-      # @return [Boolean] true if Ghostscript can be found
-      def available?
-        GhostscriptWrapper.available?
-      end
-
-      # Get the tool name
-      #
-      # @return [String] "ghostscript"
-      def tool_name
-        "ghostscript"
-      end
-    end
-  end
-end