emf2svg 1.4.1-x64-mingw32 → 1.4.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11b63911d045d41a0f7234209ca109eb01c7ffa50fc49c81661da6d4ddddee17
-  data.tar.gz: c8b7ee6eb00c270f2b16b445c3adc037329681d205a36d0d84c7dc26c9cd9651
+  metadata.gz: e38580c0c08b52fbed7eabf8714348570d410a580cd24ae52791424c50de5e78
+  data.tar.gz: 6d8dea589c24f6c954c15bfbfb4315d1d3885ed8583c1138381e0092362acd1a
 SHA512:
-  metadata.gz: 4e078662aed49e9b85db8d8204e06330ef86658506849131b65bd0ed9af20926a08aa9b3f660c62e5a297381000ad65f4537900e169d0c0c4ada994feabc8e0c
-  data.tar.gz: 519579710c1f1db9022072a6248016c7b6985988af5b813f61ee54d9321ca8a18abc304e7549c800ef34d67e03ad0bfbcee3fa6b913a39066c8d33b266f7bcf4
+  metadata.gz: 9c086537c041bb6a84cfa36e1119b2c07bcfb7c794ddd9e6f29589d0afa9f4a678e4f14183e8b50a48dadb1b97beb85468b0bc95689d3bcf61f49f589865e1c5
+  data.tar.gz: e6b73dbefb8dca6f942fa46585fa01756122661613350e281faadf3acf5615a88833fc16eb0870d6b2a78e1070f58a357454053d8e79e9f1f54f6e47c73c7441

data/.github/workflows/build.yml

@@ -15,10 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
-        ruby-version: [ '2.7' ]
-        include:
-          - os: windows-latest
-            ruby-version: '3.1'
+        ruby-version: [ '2.7', '3.0', '3.1' ]
+
     steps:
     - uses: actions/checkout@v3
 
@@ -47,27 +45,23 @@ jobs:
           - os: ubuntu-18.04
             platform: any
             ruby-version: '2.7'
-            file: 'skip'
           - os: ubuntu-18.04
             platform: x86_64-linux
             ruby-version: '2.7'
-            file: 'ELF 64-bit LSB shared object, x86-64'
           - os: windows-latest
             platform: x64-mingw32
             ruby-version: '2.7'
-            file: 'skip'
           - os: windows-latest
             platform: x64-mingw-ucrt
             ruby-version: '3.1'
-            file: 'skip'
           - os: macos-latest
             platform: x86_64-darwin
             ruby-version: '2.7'
-            file: 'Mach-O 64-bit dynamically linked shared library x86_64'
     steps:
     - uses: actions/checkout@v3
 
-    - uses: ruby/setup-ruby@v1
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
@@ -85,48 +79,50 @@ jobs:
         name: pkg
         path: pkg/*.gem
 
-    - name: Install gem
-      run: gem install -b pkg/emf2svg-*.gem
-
-    - name: Test conversion
-      run: |
-        ruby -remf2svg -e "puts File.write('output.svg', Emf2svg.from_file('spec/examples/image1.emf'), mode: 'wb')"
-
-    - name: Check file format
-      if: matrix.file != 'skip'
-      run: file $(ls pkg/*/lib/emf2svg/libemf2svg.*) | grep "${{ matrix.file }}"
-
-  test-build:
-    needs: build
+  cross-build:
+    name: build ${{ matrix.os }}, ${{ matrix.ruby-version }}, ${{ matrix.platform }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: ubuntu-latest
-            platform: any
-            ruby-version: '2.7'
-          - os: windows-latest
-            platform: any
-            ruby-version: '2.7'
-          - os: macos-latest
-            platform: any
-            ruby-version: '2.7'
-          - os: ubuntu-18.04
-            platform: x86_64-linux
-            ruby-version: '2.7'
-          - os: ubuntu-latest
-            platform: x86_64-linux
-            ruby-version: '2.7'
-          - os: windows-latest
-            platform: x64-mingw32
+            platform: aarch64-linux
             ruby-version: '2.7'
-          - os: windows-latest
-            platform: x64-mingw-ucrt
-            ruby-version: '3.1'
           - os: macos-latest
-            platform: x86_64-darwin
+            platform: arm64-darwin
             ruby-version: '2.7'
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install Ubuntu packages
+      if: startsWith(matrix.os, 'ubuntu')
+      run: |
+        sudo apt-get update
+        sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu gperf
+
+    - name: Install Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+
+    - name: Build native extension
+      run: bundle exec rake gem:native:${{ matrix.platform }}
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: pkg
+        path: pkg/*.gem
+
+  test-build:
+    needs: [ build, cross-build ]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
+        ruby-version: [ '2.7', '3.0', '3.1' ]
 
     steps:
     - uses: actions/checkout@v2
@@ -140,62 +136,43 @@ jobs:
         name: pkg
         path: pkg
 
-    - name: Workaround for vcpkg
-      if: startsWith(matrix.os, 'ubuntu')
-      run: |
-        sudo apt-get update
-        sudo apt-get install gperf
-
-    - name: Install native gem
-      if: matrix.platform == 'any'
-      run: gem install -b pkg/emf2svg-$(ruby -I lib -r emf2svg/version -e "puts Emf2svg::VERSION").gem
-
     - name: Install binary gem
-      if: matrix.platform != 'any'
-      run: gem install -b pkg/emf2svg-*-${{ matrix.platform }}.gem
-
+      run: gem install -b pkg/emf2svg-$(ruby -I lib -r emf2svg/version -e "puts Emf2svg::VERSION")-$(ruby -e "puts RUBY_PLATFORM.sub(/darwin\d{2}$/, 'darwin')").gem
+# MacOS with have something like arm64-darwin19, others just aarch64-linux
     - name: Test conversion
       run: |
         ruby -remf2svg -e "puts File.write('output.svg', Emf2svg.from_file('spec/examples/image1.emf'), mode: 'wb')"
 
-  cross:
-    name: build ${{ matrix.os }}, ${{ matrix.ruby-version }}, ${{ matrix.platform }}
+  test-build-any:
+    needs: [ build, cross-build ]
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - os: ubuntu-latest
-            platform: aarch64-linux
-            ruby-version: '2.7'
-            file: 'ELF 64-bit LSB shared object, ARM aarch64'
-          - os: macos-latest
-            platform: arm64-darwin
-            ruby-version: '2.7'
-            file: 'Mach-O 64-bit dynamically linked shared library arm64'
-    steps:
-    - uses: actions/checkout@v3
+        os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
+        ruby-version: [ '2.7', '3.0', '3.1' ]
 
-    - name: Install packages
-      if: matrix.os == 'ubuntu-latest'
-      run: |
-        sudo apt-get update
-        sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu gperf
+    steps:
+    - uses: actions/checkout@v2
 
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true
-
-    - run: bundle exec rake gem:native:${{ matrix.platform }}
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/download-artifact@v2
       with:
         name: pkg
-        path: pkg/*.gem
+        path: pkg
+
+    - name: Workaround for vcpkg
+      if: startsWith(matrix.os, 'ubuntu')
+      run: |
+        sudo apt-get update
+        sudo apt-get install gperf
 
-    - name: Install gem
-      run: gem install -b pkg/emf2svg-*.gem
+    - name: Install native gem
+      run: gem install -b pkg/emf2svg-$(ruby -I lib -r emf2svg/version -e "puts Emf2svg::VERSION").gem
 
-    - name: Check file format
-      run: file $(ls pkg/*/lib/emf2svg/libemf2svg.*) | grep "${{ matrix.file }}"
+    - name: Test conversion
+      run: |
+        ruby -remf2svg -e "puts File.write('output.svg', Emf2svg.from_file('spec/examples/image1.emf'), mode: 'wb')"

data/README.adoc

@@ -54,9 +54,13 @@ There are two ways to provide EMF data to `emf2svg`.
 ----
 require "emf2svg"
 
-data = Emf2svg.from_file("example.emf")
+data = Emf2svg.from_file("example.emf", 800, 600)
 File.write("output.svg", data, mode: "wb")
 ----
+800, 600 - optional width and height of the bounding rectangle for svg file
+The image will be scaled to fit into this rectangle
+These parameters are optional. If skipped or set to 0 SVG image will have the
+same size as EMF (in pixels)
 ====
 
 === Loading binary data
@@ -71,9 +75,13 @@ File.write("output.svg", data, mode: "wb")
 require "emf2svg"
 
 emf_content = File.read("example.emf", mode: "rb")
-svg_data = Emf2svg.from_binary_string(emf_content)
+svg_data = Emf2svg.from_binary_string(emf_content, 800, 600)
 File.write("output.svg", svg_data, mode: "wb")
 ----
+800, 600 - optional width and height of the bounding rectangle for svg file
+The image will be scaled to fit into this rectangle
+These parameters are optional. If skipped or set to 0 SVG image will have the
+same size as EMF (in pixels)
 ====
 
 

data/Rakefile

@@ -14,6 +14,7 @@ task default: %i[spec rubocop]
 task :compile do
   require_relative "ext/extconf"
 end
+
 task spec: :compile
 
 desc "Build install-compilation gem"

data/bin/emf2svg

@@ -1,8 +1,38 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "bundler/setup"
 require "emf2svg"
 
-svg = Emf2svg.from_file(ARGV[0])
-File.write(ARGV[1], svg, mode: "wb")
+def print_usage
+  usage = %{Usage: emf2svg <input> <output> [<width>] [<height>]
+  <input>  -- emf file to convert
+  <output> -- svg file to save
+  <width>  -- svg image width, defaults to source width in px if not set or 0
+  <height> -- svg image height, defaults to source height in px if not set or 0
+  Note: width and height specify bounding rectangle, the image will be scaled
+        propotionally to fit into it.
+}
+  puts usage
+end
+
+def tint(pos)
+  ARGV.size > pos ? Integer(ARGV[pos]) : 0
+rescue ArgumentError, TypeError => e
+  puts "ERROR: Failed to convert #{ARGV[pos]} to integer: #{e.message}"
+  print_usage
+  exit 1
+end
+
+if ARGV.size < 2 || ARGV.size > 4 || ARGV[0].casecmp("help").zero?
+  print_usage
+  exit 0
+end
+
+begin
+  svg = Emf2svg.from_file(ARGV[0], tint(2), tint(3))
+  File.write(ARGV[1], svg, mode: "wb")
+rescue StandardError => e
+  puts "ERROR: Failed to process #{ARGV[0]}: #{e.message}"
+  print_usage
+  exit 1
+end

data/emf2svg.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ribose"]
   spec.email         = ["open.source@ribose.com"]
 
-  spec.summary       = "Ruby interface to libemf2svg."
+  spec.summary       = "EMF to SVG conversion in Ruby."
   spec.homepage      = "https://github.com/metanorma/emf2svg-ruby"
   spec.license       = "BSD-2-Clause"
   spec.required_ruby_version = ">= 2.6.0"

data/exe/emf2svg

@@ -3,5 +3,36 @@
 
 require "emf2svg"
 
-svg = Emf2svg.from_file(ARGV[0])
-File.write(ARGV[1], svg, mode: "wb")
+def print_usage
+  usage = %{Usage: emf2svg <input> <output> [<width>] [<height>]
+  <input>  -- emf file to convert
+  <output> -- svg file to save
+  <width>  -- svg image width, defaults to source width in px if not set or 0
+  <height> -- svg image height, defaults to source height in px if not set or 0
+  Note: width and height specify bounding rectangle, the image will be scaled
+        propotionally to fit into it.
+}
+  puts usage
+end
+
+def tint(pos)
+  ARGV.size > pos ? Integer(ARGV[pos]) : 0
+rescue ArgumentError, TypeError => e
+  puts "ERROR: Failed to convert #{ARGV[pos]} to integer: #{e.message}"
+  print_usage
+  exit 1
+end
+
+if ARGV.size < 2 || ARGV.size > 4 || ARGV[0].casecmp("help").zero?
+  print_usage
+  exit 0
+end
+
+begin
+  svg = Emf2svg.from_file(ARGV[0], tint(2), tint(3))
+  File.write(ARGV[1], svg, mode: "wb")
+rescue StandardError => e
+  puts "ERROR: Failed to process #{ARGV[0]}: #{e.message}"
+  print_usage
+  exit 1
+end

data/lib/emf2svg/recipe.rb

@@ -2,17 +2,19 @@ require "rbconfig"
 require "mini_portile2"
 require "pathname"
 require "tmpdir"
+require "open3"
+require_relative "version"
 
 module Emf2svg
   class Recipe < MiniPortileCMake
     ROOT = Pathname.new(File.expand_path("../..", __dir__))
 
     def initialize
-      super("libemf2svg", "1.7.0")
+      super("libemf2svg", LIBEMF2SVG_VERSION)
 
       @files << {
-        url: "https://github.com/metanorma/libemf2svg/releases/download/v1.7.0/libemf2svg.tar.gz",
-        sha256: "a87a02510f87ed4510a3426fa8636b340e26d96f25edf63c3ba465e7e9d7e2eb", # rubocop:disable Layout/LineLength
+        url: "https://github.com/metanorma/libemf2svg/releases/download/v#{LIBEMF2SVG_VERSION}/libemf2svg.tar.gz",
+        sha256: "c65f25040a351d18beb5172609a55d034245f85a1152d7f294780c6cc155d876", # rubocop:disable Layout/LineLength
       }
 
       @target = ROOT.join(@target).to_s
@@ -28,58 +30,6 @@ module Emf2svg
       FileUtils.touch(checkpoint)
     end
 
-    # rubocop:disable Metrics/MethodLength
-    # rubocop:disable Metrics/CyclomaticComplexity
-    def host_platform
-      @host_platform ||=
-        case @host
-        when /\Ax86_64.*mingw32/
-          "x64-mingw32"
-        when /\Ax86_64.*linux/
-          "x86_64-linux"
-        when /\A(arm64|aarch64).*linux/
-          "arm64-linux"
-        when /\Ax86_64.*(darwin|macos|osx)/
-          "x86_64-darwin"
-        when /\A(arm64|aarch64).*(darwin|macos|osx)/
-          "arm64-darwin"
-        else
-          @host
-        end
-    end
-
-    def target_platform
-      @target_platform ||=
-        case ENV["target_platform"]
-        when /\A(arm64|aarch64).*(darwin|macos|osx)/
-          "arm64-darwin"
-        when /\Ax86_64.*(darwin|macos|osx)/
-          "x86_64-darwin"
-        when /\A(arm64|aarch64).*linux/
-          "aarch64-linux"
-        else
-          ENV["target_platform"] || host_platform
-        end
-    end
-
-    def target_triplet
-      @target_triplet ||=
-        case target_platform
-        when "arm64-darwin"
-          "arm64-osx"
-        when "x86_64-darwin"
-          "x64-osx"
-        when "aarch64-linux"
-          "arm64-linux"
-        when "x86_64-linux"
-          "x64-linux"
-        when /\Ax64-mingw(32|-ucrt)/
-          "x64-mingw-static"
-        end
-    end
-    # rubocop:enable Metrics/CyclomaticComplexity
-    # rubocop:enable Metrics/MethodLength
-
     def windows_native?
       MiniPortile.windows? && target_triplet.eql?("x64-mingw-static")
     end
@@ -115,20 +65,42 @@ module Emf2svg
       "cmake --build #{File.expand_path(work_path)} --config Release"
     end
 
+    def lb_to_verify
+      pt = if MiniPortile.windows?
+             "emf2svg.dll"
+           else
+             "libemf2svg.{so,dylib}"
+           end
+      @lb_to_verify ||= Dir.glob(ROOT.join("lib", "emf2svg", pt))
+    end
+
+    def verify_libs
+      lb_to_verify.each do |l|
+        out, st = Open3.capture2("file #{l}")
+        raise "Failed to query file #{l}: #{out}" unless st.exitstatus.zero?
+
+        if out.include?(target_format)
+          message("Verifying #{l} ... OK\n")
+        else
+          raise "Invalid file format '#{out}', '#{@target_format}' expected"
+        end
+      end
+    end
+
     def install
-      message("Called install\n")
       libs = if MiniPortile.windows?
                Dir.glob(File.join(work_path, "Release", "*.dll"))
              else
                Dir.glob(File.join(work_path, "libemf2svg.{so,dylib}"))
                  .grep(/\/(?:lib)?[a-zA-Z0-9\-]+\.(?:so|dylib)$/)
              end
-
       FileUtils.cp_r(libs, ROOT.join("lib", "emf2svg"), verbose: true)
+
+      verify_libs unless target_format.eql?("skip")
     end
 
     def execute(action, command, command_opts = {})
-      super(action, command, command_opts.merge(debug: true))
+      super(action, command, command_opts.merge(debug: false))
     end
 
     def message(text)
@@ -151,5 +123,75 @@ module Emf2svg
     def port_path
       "port"
     end
+
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def host_platform
+      @host_platform ||=
+        case @host
+        when /\Ax86_64.*mingw32/
+          "x64-mingw32"
+        when /\Ax86_64.*linux/
+          "x86_64-linux"
+        when /\A(arm64|aarch64).*linux/
+          "arm64-linux"
+        when /\Ax86_64.*(darwin|macos|osx)/
+          "x86_64-darwin"
+        when /\A(arm64|aarch64).*(darwin|macos|osx)/
+          "arm64-darwin"
+        else
+          @host
+        end
+    end
+
+    def target_platform
+      @target_platform ||=
+        case ENV.fetch("target_platform", nil)
+        when /\A(arm64|aarch64).*(darwin|macos|osx)/
+          "arm64-darwin"
+        when /\Ax86_64.*(darwin|macos|osx)/
+          "x86_64-darwin"
+        when /\A(arm64|aarch64).*linux/
+          "aarch64-linux"
+        else
+          ENV.fetch("target_platform", host_platform)
+        end
+    end
+
+    def target_triplet
+      @target_triplet ||=
+        case target_platform
+        when "arm64-darwin"
+          "arm64-osx"
+        when "x86_64-darwin"
+          "x64-osx"
+        when "aarch64-linux"
+          "arm64-linux"
+        when "x86_64-linux"
+          "x64-linux"
+        when /\Ax64-mingw(32|-ucrt)/
+          "x64-mingw-static"
+        end
+    end
+
+    def target_format
+      @target_format ||=
+        case target_platform
+        when "arm64-darwin"
+          "Mach-O 64-bit dynamically linked shared library arm64"
+        when "x86_64-darwin"
+          "Mach-O 64-bit dynamically linked shared library x86_64"
+        when "aarch64-linux"
+          "ELF 64-bit LSB shared object, ARM aarch64"
+        when "x86_64-linux"
+          "ELF 64-bit LSB shared object, x86-64"
+        when /\Ax64-mingw(32|-ucrt)/
+          "PE32+ executable (DLL) (console) x86-64, for MS Windows"
+        else
+          "skip"
+        end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/emf2svg/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module Emf2svg
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
+  LIBEMF2SVG_VERSION = "1.7.1"
 end

data/lib/emf2svg.rb

@@ -39,17 +39,18 @@ module Emf2svg
                   :int
 
   class << self
-    def from_file(path)
+    def from_file(path, width = 0, height = 0)
       content = File.read(path, mode: "rb")
-      from_binary_string(content)
+      from_binary_string(content, width, height)
     end
 
-    def from_binary_string(content)
+    def from_binary_string(content, width = 0, height = 0)
       svg_out = FFI::MemoryPointer.new(:pointer)
       svg_out_len = FFI::MemoryPointer.new(:pointer)
       content_ptr = FFI::MemoryPointer.from_string(content)
 
-      ret = emf2svg(content_ptr, content.size, svg_out, svg_out_len, options)
+      opt = options(width, height)
+      ret = emf2svg(content_ptr, content.size, svg_out, svg_out_len, opt)
       raise Error, "emf2svg failed with error code: #{ret}" unless ret == 1
 
       svg_out.read_pointer.read_bytes(svg_out_len.read_int)
@@ -57,13 +58,13 @@ module Emf2svg
 
     private
 
-    def options
+    def options(width, height)
       GeneratorOptions.new.tap do |opts|
         opts[:verbose] = false
         opts[:emfplus] = true
         opts[:svgDelimiter] = true
-        opts[:imgHeight] = 0
-        opts[:imgWidth] = 0
+        opts[:imgHeight] = height
+        opts[:imgWidth] = width
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emf2svg
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: x64-mingw32
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -128,5 +128,5 @@ requirements: []
 rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
-summary: Ruby interface to libemf2svg.
+summary: EMF to SVG conversion in Ruby.
 test_files: []