vectory 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f51d610adc333c06f92e8e28ca9722a890f12b03668bf12e96ce057d2574dea
-  data.tar.gz: 792bc815a0b86a6211b83268f16b9abe7a138aba0081a2d7a95242c5e9a7af82
+  metadata.gz: 4bff19041540b0039ebd4a816e88214e2d5d18ad238e3b4db67fd5765341e587
+  data.tar.gz: d85d715fb24d936ada734ea3164aa516918fb23d7da6194ef17578b8192946a1
 SHA512:
-  metadata.gz: 249d3f2fa7df2d216cdf5d046647507b81a55bd5db56a603a90a3890501adb10e8a03f41b272385c65a8de48c50b8b52db743ec5ddc20be88e4e5aab6ed21ca6
-  data.tar.gz: 5ed331050b3c4a3231cabc7ba061695f017de5ea44a3056bf01537144b12c96cf5587c0a52793d3d435d961052210aefed73a52c4afc9c3563695fca8e23c91d
+  metadata.gz: 2d546b8081346f32e0264bb8a8629f77c1240729e15fc0ce0c3b61d33df3630696f4b82a7712c4e9f2ffcc7d336c8a686c14cbd47755a1a39690af890c688bb3
+  data.tar.gz: b294e41a48e6aa93c73d51aa878e862c853531f58d3ca99123fd161482f3c3d0237a4f6c7165ff2dc0554e0b5f80293061ec5e253378c28c601c869a7077bac4

data/Gemfile

@@ -5,6 +5,8 @@ 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"

data/Rakefile

@@ -5,10 +5,6 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :inkscape_version do
-  system('inkscape --version')
-end
-
 task default: :spec
 
 # require "rubocop/rake_task"

data/exe/vectory

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require "vectory/cli"
+
+Vectory.ui.level = Logger::INFO
+
+status_code = Vectory::CLI.start(ARGV)
+exit status_code.is_a?(Integer) ? status_code : Vectory::CLI::STATUS_UNKNOWN_ERROR

data/lib/vectory/inkscape_converter.rb

@@ -23,8 +23,6 @@ module Vectory
       output_path = find_output(uri, output_extension)
       raise_conversion_error(call) unless output_path
 
-      # and return Vectory::Utils::datauri(file)
-
       output_path
     end
 

data/lib/vectory/utils.rb

@@ -1,58 +1,10 @@
 # frozen_string_literal: true
 
-require "marcel"
 require "timeout"
 
 module Vectory
   class Utils
-    # Extracted from https://github.com/metanorma/metanorma-utils/blob/v1.5.2/lib/utils/image.rb
     class << self
-      # sources/plantuml/plantuml20200524-90467-1iqek5i.png
-      # already includes localdir
-      # Check whether just the local path or the other specified relative path
-      # works.
-      def datauri(uri, local_dir = ".")
-        return uri if datauri?(uri) || url?(uri)
-
-        options = absolute_path?(uri) ? [uri] : [uri, File.join(local_dir, uri)]
-        path = options.detect do |p|
-          File.exist?(p) ? p : nil
-        end
-
-        unless path
-          warn "Image specified at `#{uri}` does not exist."
-          return uri # Return original provided location
-        end
-
-        encode_datauri(path)
-      end
-
-      def encode_datauri(path)
-        return nil unless File.exist?(path)
-
-        type = Marcel::MimeType.for(Pathname.new(path)) ||
-          'text/plain; charset="utf-8"'
-
-        bin = File.binread(path)
-        data = Base64.strict_encode64(bin)
-        "data:#{type};base64,#{data}"
-      rescue StandardError
-        warn "Data-URI encoding of `#{path}` failed."
-        nil
-      end
-
-      def datauri?(uri)
-        /^data:/.match?(uri)
-      end
-
-      def url?(url)
-        %r{^[A-Z]{2,}://}i.match?(url)
-      end
-
-      def absolute_path?(uri)
-        %r{^/}.match?(uri) || %r{^[A-Z]:/}.match?(uri)
-      end
-
       # rubocop:disable all
       #
       # Originally from https://gist.github.com/pasela/9392115

data/lib/vectory/version.rb

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

data/spec/support/vectory_helper.rb

@@ -1,4 +1,3 @@
-require "htmlentities"
 require "nokogiri"
 require "tmpdir"
 

data/vectory.gemspec

@@ -18,16 +18,12 @@ Gem::Specification.new do |spec|
   spec.license       = "BSD-2-Clause"
 
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = ["vectory"]
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.required_ruby_version = ">= 2.5.0"
 
   spec.add_runtime_dependency "emf2svg"
+  spec.add_runtime_dependency "nokogiri", "~> 1.14"
   spec.add_runtime_dependency "thor", "~> 1.2.1"
-  spec.add_runtime_dependency "marcel", "~> 1.0.0"
-
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "htmlentities", "~> 4.3.4"
-  spec.add_development_dependency "nokogiri", "~> 1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vectory
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-06 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emf2svg
@@ -25,81 +25,40 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: marcel
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 1.2.1
 description: |
   Vectory performs pairwise vector image conversions for common
   vector image formats, such as SVG, EMF, EPS and PS.
 email:
 - open.source@ribose.com
-executables: []
+executables:
+- vectory
 extensions: []
 extra_rdoc_files: []
 files:
@@ -113,7 +72,7 @@ files:
 - README.adoc
 - Rakefile
 - bin/vectory
-- emf.emf
+- exe/vectory
 - lib/vectory.rb
 - lib/vectory/cli.rb
 - lib/vectory/datauri.rb

data/emf.emf

@@ -1 +0,0 @@
-AQAAAMgAAAAAAAAAAAAAAPsEAAD7BAAAAAAAAAAAAACLCgAAiwoAACBFTUYAAAEAJAQAACgAAAACAAAALgAAAGwAAAAAAAAA3ScAAH0zAADYAAAAFwEAAAAAAAAAAAAAAAAAAMBLAwDYQQQASQBuAGsAcwBjAGEAcABlACAAMQAuADAAIAAoADQAMAAzADUAYQA0AGYALAAgADIAMAAyADAALQAwADUALQAwADEAKQAgAAAAbwBkAGYALgBlAG0AZgAAAAAAAAARAAAADAAAAAEAAAAkAAAAJAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAIAAABGAAAALAAAACAAAABTY3JlZW49MTAyMDV4MTMxODFweCwgMjE2eDI3OW1tAEYAAAAwAAAAIwAAAERyYXdpbmc9MTAwLjB4MTAwLjBweCwgMjYuNXgyNi41bW0AABIAAAAMAAAAAQAAABMAAAAMAAAAAgAAABYAAAAMAAAAGAAAABgAAAAMAAAAAAAAABQAAAAMAAAADQAAACcAAAAYAAAAAQAAAAAAAAAAAJkABgAAACUAAAAMAAAAAQAAADsAAAAIAAAAGwAAABAAAACkBAAAcQIAAAUAAAA0AAAAAAAAAAAAAAD//////////wMAAACkBAAAqAMAAKgDAACkBAAAcQIAAKQEAAAFAAAANAAAAAAAAAAAAAAA//////////8DAAAAOgEAAKQEAAA/AAAAqAMAAD8AAABxAgAABQAAADQAAAAAAAAAAAAAAP//////////AwAAAD8AAAA6AQAAOgEAAD8AAABxAgAAPwAAAAUAAAA0AAAAAAAAAAAAAAD//////////wMAAACoAwAAPwAAAKQEAAA6AQAApAQAAHECAAA9AAAACAAAADwAAAAIAAAAPgAAABgAAAAAAAAAAAAAAP//////////JQAAAAwAAAAFAACAKAAAAAwAAAABAAAAJwAAABgAAAABAAAAAAAAAP///wAGAAAAJQAAAAwAAAABAAAAOwAAAAgAAAAbAAAAEAAAAJ0BAABFAQAANgAAABAAAADPAwAARQEAAAUAAAA0AAAAAAAAAAAAAAD//////////wMAAABfBAAA7QEAAGQEAADjAgAA2wMAAJEDAAAFAAAANAAAAAAAAAAAAAAA//////////8DAAAAUgMAAD4EAABhAgAAcwQAAJ0BAAAOBAAANgAAABAAAACdAQAAyQIAADYAAAAQAAAA4gIAAMkCAAA2AAAAEAAAAOICAAAaAgAANgAAABAAAACdAQAAGgIAAD0AAAAIAAAAPAAAAAgAAAA+AAAAGAAAAAAAAAAAAAAA//////////8lAAAADAAAAAUAAIAoAAAADAAAAAEAAAAOAAAAFAAAAAAAAAAAAAAAJAQAAA==