vectory 0.7.8 → 0.8.1

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.7.8"
+  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.7.8
+  version: 0.8.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-26 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

data/lib/vectory/inkscape_converter.rb

@@ -1,141 +0,0 @@
-# frozen_string_literal: true
-
-require "singleton"
-require "tmpdir"
-require_relative "system_call"
-
-module Vectory
-  class InkscapeConverter
-    include Singleton
-
-    def self.convert(uri, output_extension, option)
-      instance.convert(uri, output_extension, option)
-    end
-
-    def convert(uri, output_extension, option)
-      exe = inkscape_path_or_raise_error
-      uri = external_path uri
-      exe = external_path exe
-      cmd = %(#{exe} #{option} #{uri})
-
-      call = SystemCall.new(cmd).call
-
-      output_path = find_output(uri, output_extension)
-      raise_conversion_error(call) unless output_path
-
-      output_path
-    end
-
-    def height(content, format)
-      query_integer(content, format, "--query-height")
-    end
-
-    def width(content, format)
-      query_integer(content, format, "--query-width")
-    end
-
-    private
-
-    def inkscape_path_or_raise_error
-      inkscape_path or raise(InkscapeNotFoundError,
-                             "Inkscape missing in PATH, unable to " \
-                             "convert image. Aborting.")
-    end
-
-    def inkscape_path
-      @inkscape_path ||= find_inkscape
-    end
-
-    def find_inkscape
-      cmds.each do |cmd|
-        extensions.each do |ext|
-          paths.each do |path|
-            exe = File.join(path, "#{cmd}#{ext}")
-
-            return exe if File.executable?(exe) && !File.directory?(exe)
-          end
-        end
-      end
-
-      nil
-    end
-
-    def cmds
-      ["inkscapecom", "inkscape"]
-    end
-
-    def extensions
-      ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
-    end
-
-    def paths
-      ENV["PATH"].split(File::PATH_SEPARATOR)
-    end
-
-    def find_output(source_path, output_extension)
-      basenames = [File.basename(source_path, ".*"),
-                   File.basename(source_path)]
-
-      paths = basenames.map do |basename|
-        "#{File.join(File.dirname(source_path), basename)}.#{output_extension}"
-      end
-
-      paths.find { |p| File.exist?(p) }
-    end
-
-    def raise_conversion_error(call)
-      raise Vectory::ConversionError,
-            "Could not convert with Inkscape. " \
-            "Inkscape cmd: '#{call.cmd}',\n" \
-            "status: '#{call.status}',\n" \
-            "stdout: '#{call.stdout.strip}',\n" \
-            "stderr: '#{call.stderr.strip}'."
-    end
-
-    def external_path(path)
-      win = !!((RUBY_PLATFORM =~ /(win|w)(32|64)$/) ||
-               (RUBY_PLATFORM =~ /mswin|mingw/))
-      if win
-        path.gsub!(%{/}, "\\")
-        path[/\s/] ? "\"#{path}\"" : path
-      else
-        path
-      end
-    end
-
-    def query_integer(content, format, options)
-      query(content, format, options).to_f.round
-    end
-
-    def query(content, format, options)
-      exe = inkscape_path_or_raise_error
-
-      with_file(content, format) do |path|
-        cmd = "#{external_path(exe)} #{options} #{external_path(path)}"
-
-        call = SystemCall.new(cmd).call
-        raise_query_error(call) if call.stdout.empty?
-
-        call.stdout
-      end
-    end
-
-    def with_file(content, extension)
-      Dir.mktmpdir do |dir|
-        path = File.join(dir, "image.#{extension}")
-        File.binwrite(path, content)
-
-        yield path
-      end
-    end
-
-    def raise_query_error(call)
-      raise Vectory::InkscapeQueryError,
-            "Could not query with Inkscape. " \
-            "Inkscape cmd: '#{call.cmd}',\n" \
-            "status: '#{call.status}',\n" \
-            "stdout: '#{call.stdout.strip}',\n" \
-            "stderr: '#{call.stderr.strip}'."
-    end
-  end
-end