vectory 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50efb043c71096f66bc72c7804b8707b6210ab4af071f231d7e81f52a0c66da0
-  data.tar.gz: a3ffda2f587f7796f2033fab1230db852d98e82da88b269d230646dad6acbd39
+  metadata.gz: 208113512c63f1549e160d037bf418c61ce1495cd4475fc517adaa8f962fe5e3
+  data.tar.gz: bbabf9cb905e9c08706d350e476feba0f8403becd943910bf704edcf80cc2a21
 SHA512:
-  metadata.gz: aca9af8bee9a5f916fc0360b9473705307bfeda4b0086ae9fa53929381169a4791a483a126f98f1295574da06d70a2ea92bf3a706cd7359f91fa6b492c305205
-  data.tar.gz: '05286cb944c4235c5d60d5591b63be2d15c43f796fa0d63b00205ced005fe8c84f314c2d468fd5ec2a02336682d4b4c0357fd63bd6757056f95aa727ec8a3884'
+  metadata.gz: b7e5fd2ad0686242cc2c578e16f9456bf15fb95128e9ad26ee95a55cbee4a22edc06d4c8dc50a19f7c63954b2dff8ebfc99091a79e9099b8ac6aa4d574ab0b87
+  data.tar.gz: f25e2881b8d25b8ba3b9351fd7d613247e8489a9deeba557d9a3f259cb919b5e89beda150ae6069fc62d571d0acc55fd664456b6d9bfa935e254c033c749cb00

data/lib/vectory/cli.rb

@@ -11,6 +11,7 @@ module Vectory
     STATUS_CONVERSION_ERROR = 4
     STATUS_SYSTEM_CALL_ERROR = 5
     STATUS_INKSCAPE_NOT_FOUND_ERROR = 6
+    STATUS_SAME_FORMAT_ERROR = 7
 
     MAP_ERROR_TO_STATUS = {
       Vectory::ConversionError => STATUS_CONVERSION_ERROR,
@@ -62,6 +63,10 @@ module Vectory
       end
 
       input_format = detect_input_format(file)
+      if same_format?(input_format, options[:format])
+        return same_format_error(options[:format])
+      end
+
       unless supported_input_format?(input_format)
         return unsupported_input_format_error
       end
@@ -93,6 +98,16 @@ module Vectory
       FileMagic.detect(file)
     end
 
+    def same_format?(input_format, output_format)
+      input_format.to_s == output_format
+    end
+
+    def same_format_error(format)
+      Vectory.ui.error("Could not convert to the same format '#{format}'.")
+
+      STATUS_SAME_FORMAT_ERROR
+    end
+
     def supported_input_format?(format)
       SupportedInputFormats.all.include?(format)
     end

data/lib/vectory/image_resize.rb

@@ -0,0 +1,70 @@
+require "image_size"
+
+module Vectory
+  class ImageResize
+    def call(img, path, maxheight, maxwidth)
+      s, realsize = get_image_size(img, path)
+      img.name == "svg" && !img["viewBox"] && s[0] && s[1] and
+        img["viewBox"] = "0 0 #{s[0]} #{s[1]}"
+      s, skip = image_dont_resize(s, realsize)
+      skip and return s
+      s = image_size_fillin(s, realsize)
+      image_shrink(s, maxheight, maxwidth)
+    end
+
+    def get_image_size(img, path)
+      realsize = ImageSize.path(path).size
+      s = image_size_interpret(img, realsize || [nil, nil])
+      image_size_zeroes_complete(s, realsize)
+    end
+
+    private
+
+    def image_dont_resize(dim, realsize)
+      dim.nil? and return [[nil, nil], true]
+      realsize.nil? and return [dim, true]
+      dim[0] == nil && dim[1] == nil and return [dim, true]
+      [dim, false]
+    end
+
+    def image_size_fillin(dim, realsize)
+      dim[1] = fill_size(dim[1], dim[0], realsize[1], realsize[0])
+      dim[0] = fill_size(dim[0], dim[1], realsize[0], realsize[1])
+
+      dim
+    end
+
+    def fill_size(current, another, real_current, real_another)
+      return current unless current.zero? && !another.zero?
+
+      another * real_current / real_another
+    end
+
+    def image_shrink(dim, maxheight, maxwidth)
+      dim[1] > maxheight and
+        dim = [(dim[0] * maxheight / dim[1]).ceil, maxheight]
+      dim[0] > maxwidth and
+        dim = [maxwidth, (dim[1] * maxwidth / dim[0]).ceil]
+      dim
+    end
+
+    def image_size_interpret(img, realsize)
+      w = image_size_percent(img["width"], realsize[0])
+      h = image_size_percent(img["height"], realsize[1])
+      [w, h]
+    end
+
+    def image_size_percent(value, real)
+      /%$/.match?(value) && !real.nil? and
+        value = real * (value.sub(/%$/, "").to_f / 100)
+      value.to_i
+    end
+
+    def image_size_zeroes_complete(dim, realsize)
+      if dim[0].zero? && dim[1].zero?
+        dim = realsize
+      end
+      [dim, realsize]
+    end
+  end
+end

data/lib/vectory/utils.rb

@@ -19,7 +19,7 @@ module Vectory
         path = path_which_exist(uri, local_dir)
         path and return encode_datauri(path)
 
-        warn "Image specified at `#{uri}` does not exist."
+        Vectory.ui.warn "Image specified at `#{uri}` does not exist."
         uri # Return original provided location
       end
 

data/lib/vectory/version.rb

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

data/lib/vectory.rb

@@ -4,6 +4,7 @@ require "logger"
 require_relative "vectory/version"
 require_relative "vectory/utils"
 require_relative "vectory/image"
+require_relative "vectory/image_resize"
 require_relative "vectory/datauri"
 require_relative "vectory/vector"
 require_relative "vectory/eps"
@@ -41,4 +42,8 @@ module Vectory
   def self.convert(image, format)
     image.convert(format)
   end
+
+  def self.image_resize(img, path, maxheight, maxwidth)
+    Vectory::ImageResize.new.call(img, path, maxheight, maxwidth)
+  end
 end

data/vectory.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   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.0"
   spec.add_runtime_dependency "nokogiri", "~> 1.14"
   spec.add_runtime_dependency "thor", "~> 1.2.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vectory
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-04 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emf2svg
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: image_size
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,7 @@ files:
 - lib/vectory/eps.rb
 - lib/vectory/file_magic.rb
 - lib/vectory/image.rb
+- lib/vectory/image_resize.rb
 - lib/vectory/inkscape_converter.rb
 - lib/vectory/ps.rb
 - lib/vectory/svg.rb