inkmake 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fdeb5f4c1fa671f1b808a4f52e29753beb8e4be9
-  data.tar.gz: 169fdc73075e5fd42383a7db0fb6a8b7d92bb465
+SHA256:
+  metadata.gz: e8f974d5799a2dad944fc34bc8ff9ee6357493f19166ccdf8baa93db3e76dac3
+  data.tar.gz: 03777d34d7aa798e57cb6f7a3ea55300284157c424636aa551ee6502eb9f4ddd
 SHA512:
-  metadata.gz: a22adc571cfc31b553f149bc2c10205a577d4c6dbde966120642cd22f3fa142f620834fe6938c0283a57f3fcb65425ac98dbfe480ece43a015f3efb7d20577fb
-  data.tar.gz: 8788db74b0632df20cec91427c1214ef034a83b8992db9e7c7abb563ae95f2b240a937978e805b67e694dc1d2b7ca1d6d9e0027114a3ca7c16851d5d04f4a9ec
+  metadata.gz: ddf8cdeefbfbf3b7f3aff2cfcebfb48cc8f6916d96f56794fabec3470e9e382fa12eeb65c14a016aeb0c12406542ba98255d62c8c677979166f531abcf1cd5c7
+  data.tar.gz: f68bb1b2b9229aee3d8f64038dfcccf5ea615b2770115419e049741c9ce31b77ceefca1801afef005feae83f3a683ee1ff4f73d5db67d48827ded5754289b0cf

data/lib/inkmake.rb

@@ -113,9 +113,11 @@ class Inkmake
   end
 
   class InkscapeRemote
+    attr_reader :inkscape_version
+
     def initialize
-      open
-      probe_decimal_symbol
+      @inkscape_version = probe_inkscape_version
+      open_shell
       yield self
     ensure
       quit
@@ -125,14 +127,38 @@ class Inkmake
       @is_windows ||= (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/) != nil
     end
 
-    def open
+    def open(args)
       if is_windows
-        # Inkscape on Windows for some reason needs to run from its binary dir
-        @in, @out, @err = Open3.popen3(*[File.basename(self.class.path), "--shell"],
+        # Inkscape on Windows for some reason needs to run from its binary dir.
+        # popen2e so get stdout and stderr in one pipe. inkscape 1 shell seems to
+        # use both as output and we need to read to not block it.
+        Open3.popen2e(*[File.basename(self.class.path)] + args,
                                        :chdir => File.dirname(self.class.path))
       else
-        @in, @out, @err = Open3.popen3(*[self.class.path, "--shell"])
+        Open3.popen2e(*[self.class.path] + args)
       end
+    end
+
+    def response
+      if @inkscape_version == 0
+        o = @out.getc
+        if o == ">"
+          puts "1> #{o}" if Inkmake.verbose
+          return :prompt;
+        end
+      else
+        o = @out.getc + @out.getc
+        if o == "> "
+          puts "1> #{o}" if Inkmake.verbose
+          return :prompt;
+        end
+      end
+      o = o + @out.readline
+      puts "2> '#{o}'" if Inkmake.verbose
+      o
+    end
+
+    def wait_prompt
       loop do
         case response
         when :prompt then break
@@ -140,7 +166,12 @@ class Inkmake
       end
     end
 
-    def command(args)
+    def open_shell
+      @in, @out = open(["--shell"])
+      wait_prompt
+    end
+
+    def command0(args)
       c = args.collect do |key, value|
         if value
           "\"#{key}=#{self.class.escape value.to_s}\""
@@ -148,54 +179,42 @@ class Inkmake
           key
         end
       end.join(" ")
-      puts "> #{c}" if Inkmake.verbose
+      puts "< #{c}" if Inkmake.verbose
       @in.write "#{c}\n"
       @in.flush
     end
 
-    def response
-      o = @out.read(1)
-      if o == ">"
-        puts "< #{o}" if Inkmake.verbose
-        return :prompt;
-      end
-      o = o + @out.readline
-      puts "< #{o}" if Inkmake.verbose
-      o
+    def command1(args)
+      c = args.collect do |key, value|
+        if value
+          "#{key}:#{value.to_s}"
+        else
+          "#{key}:"
+        end
+      end.join("\n")
+      puts "< #{c}" if Inkmake.verbose
+      @in.write "#{c}\n"
+      @in.flush
     end
 
-    # this is weird but is the least weird and most protable way i could come up with
-    # to figuring out what decimal symbol to use.
-    # forcing LC_NUMERIC=C seems hard to do in a portable way
-    # trying to use env inkmake is running in is also not so portable (windows?)
-    def probe_decimal_symbol
-      svg =
-        "<?xml version=\"1.0\"?>" +
-        "<svg xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"1\" height=\"1\">" +
-        "</svg>"
-      f = Tempfile.new("inkmake")
-      f.write(svg)
-      f.flush
+    def probe_inkscape_version
+      _in, out = open(["--version"])
+      version = 0
       begin
-        command({
-          "--file" => f.path,
-          "--export-png" => Tempfile.new("inkmake").path,
-          "--export-area" => "0.0:0.0:1.0:1.0",
-        })
         loop do
-          case response
-          when :prompt then break
+          case out.readline()
+          when /^\s*Inkscape 1\..*$/ then
+            version = 1
+          when /^\s*Inkscape 0\..*$/ then
+            version = 0
           end
         end
-        @decimal_symbol = "."
       rescue EOFError
-        @decimal_symbol = ","
-        # restart inkscape
-        open
       end
+      version
     end
 
-    def export(opts)
+    def export0(opts)
       c = {
         "--file" => opts[:svg_path],
         "--export-#{opts[:format]}" => opts[:out_path]
@@ -209,41 +228,109 @@ class Inkmake
         c["--export-dpi"] = opts[:dpi]
       end
       if opts[:area].kind_of? Array
-        c["--export-area"] = ("%f:%f:%f:%f" % opts[:area]).gsub(".", @decimal_symbol)
+        c["--export-area"] = ("%f:%f:%f:%f" % opts[:area])
       elsif opts[:area] == :drawing
         c["--export-area-drawing"] = nil
       elsif opts[:area].kind_of? String
         c["--export-id"] = opts[:area]
       end
-      command(c)
+      command0(c)
+      width, height = [0, 0]
+      loop do
+        case response
+        when /^Area .* exported to (\d+) x (\d+) pixels.*$/ then
+          width = $1
+          height = $2
+        when :prompt then break
+        end
+      end
+
+      [width, height]
+    end
+
+    def export1(opts)
+      c = [
+        ["file-open", opts[:svg_path]],
+        ["export-type", opts[:format]],
+        ["export-filename", opts[:out_path]]
+      ]
+      if opts[:res]
+        s = opts[:rotate_scale_hack] ? 2 : 1
+        c += [["export-width", opts[:res].width.to_pixels(opts[:dpi] || 90) * s]]
+        c += [["export-height", opts[:res].height.to_pixels(opts[:dpi] || 90) * s]]
+      else
+        c += [["export-width", ""]]
+        c += [["export-height", ""]]
+      end
+      if opts[:dpi]
+        c += [["export-dpi", opts[:dpi]]]
+      end
+
+      c += [["export-area", ""]]
+      c += [["export-area-drawing", "false"]]
+      c += [["export-id", ""]]
+      c += [["export-area-page", "false"]]
+
+      if opts[:area].kind_of? Array
+        c += [["export-area", ("%f:%f:%f:%f" % opts[:area])]]
+      elsif opts[:area] == :drawing
+        c += [["export-area-drawing", "true"]]
+      elsif opts[:area].kind_of? String
+        c += [["export-id", opts[:area]]]
+      else
+        c += [["export-area-page", "true"]]
+      end
+      c.each do |a|
+        command1([a])
+        wait_prompt
+      end
+
+      command1([["export-do"]])
       width, height = [0, 0]
-      out = nil
       loop do
         case response
-        when /^Bitmap saved as: (.*)$/ then
-          out = $1
         when /^Area .* exported to (\d+) x (\d+) pixels.*$/ then
           width = $1
           height = $2
         when :prompt then break
         end
       end
+      command1([["file-close"]])
+      wait_prompt
 
       [width, height]
     end
 
+    def export(opts)
+      if @inkscape_version == 0 then
+        export0(opts)
+      else
+        export1(opts)
+      end
+    end
+
     def query_all(file)
       ids = []
-      command({
-        "--file" => file,
-        "--query-all" => nil,
-      })
+      if @inkscape_version == 0 then
+        command0({
+          "--file" => file,
+          "--query-all" => nil,
+        })
+      else
+        command1([["file-open", file]])
+        wait_prompt
+        command1([["query-all", file]])
+      end
       loop do
         case response
         when /^(.*),(.*),(.*),(.*),(.*)$/ then ids << [$1, $2.to_f, $3.to_f, $4.to_f, $5.to_f]
         when :prompt then break
         end
       end
+      if @inkscape_version == 1 then
+        command1([["file-close", file]])
+        wait_prompt
+      end
       ids
     end
 
@@ -256,23 +343,30 @@ class Inkmake
     end
 
     def quit
-      command({"quit" => nil})
+      if @inkscape_version == 0 then
+        command0({"quit" => nil})
+      else
+        @in.close
+      end
       @out.read
       nil
     end
 
     def self.escape(s)
-      s.gsub(/(["'])/, '\\\\\1')
+      s.gsub(/([\\"'])/, '\\\\\1')
     end
 
     def self.path
       return Inkmake.inkscape_path if Inkmake.inkscape_path
 
       # try to figure out inkscape path
-      p = (
-        (["/Applications/Inkscape.app/Contents/Resources/bin/inkscape",
+      p = ( 
+        (["/Applications/Inkscape.app/Contents/MacOS/inkscape",
+          "/Applications/Inkscape.app/Contents/Resources/bin/inkscape",
           'c:\Program Files\Inkscape\inkscape.exe',
-          'c:\Program Files (x86)\Inkscape\inkscape.exe'] +
+          'c:\Program Files\Inkscape\bin\inkscape.exe',
+          'c:\Program Files (x86)\Inkscape\inkscape.exe',
+          'c:\Program Files (x86)\Inkscape\bin\inkscape.exe'] +
           (ENV['PATH'].split(':').map {|p| File.join(p, "inkscape")}))
         .select do |path|
           File.exists? path
@@ -283,7 +377,12 @@ class Inkmake
       else
         begin
           require "osx/cocoa"
-          "#{OSX::NSWorkspace.sharedWorkspace.fullPathForApplication:"Inkscape"}/Contents/Resources/bin/inkscape"
+          app_path = OSX::NSWorkspace.sharedWorkspace.fullPathForApplication:"Inkscape"
+          ["#{app_path}/Contents/MacOS/inkscape",
+           "#{app_path}/Contents/Resources/bin/inkscape"]
+          .select do |path|
+            File.exists? path
+          end
         rescue NameError, LoadError
           nil
         end
@@ -303,29 +402,29 @@ class Inkmake
     }
     # 123x123, 12.3cm*12.3cm
     RES_RE = /^(\d+(?:\.\d+)?(?:px|pt|pc|mm|cm|dm|m|in|ft|uu)?)[x*](\d+(?:\.\d+)?(?:px|pt|pc|mm|cm|dm|m|in|ft|uu)?)$/
-      # *123, *1.23
-      SCALE_RE = /^\*(\d+(?:\.\d+)?)$/
-      # 180dpi
-      DPI_RE = /^(\d+(?:\.\d+)?)dpi$/i
+    # *123, *1.23
+    SCALE_RE = /^\*(\d+(?:\.\d+)?)$/
+    # 180dpi
+    DPI_RE = /^(\d+(?:\.\d+)?)dpi$/i
     # (prefix)[(...)](suffix)
     DEST_RE = /^([^\[]*)(?:\[(.*)\])?(.*)$/
-      # test.svg, test.SVG
-      SVG_RE = /\.svg$/i
+    # test.svg, test.SVG
+    SVG_RE = /\.svg$/i
     # ext to format, supported inkscape output formats
     EXT_RE = /\.(png|pdf|ps|eps)$/i
     # supported inkscape output formats
     FORMAT_RE = /^(png|pdf|ps|eps)$/i
     # @name
     AREA_NAME_RE = /^@(.*)$/
-      # @x:y:w:h
-      AREA_SPEC_RE = /^@(\d+(?:\.\d+)?):(\d+(?:\.\d+)?):(\d+(?:\.\d+)?):(\d+(?:\.\d+)?)$/
-      # right, left, upsidedown
-      ROTATE_RE = /^(right|left|upsidedown)$/
-      # show/hide layer or id, "+Layer 1", +#id, -*
-      SHOWHIDE_RE = /^([+-])(.+)$/
+    # @x:y:w:h
+    AREA_SPEC_RE = /^@(\d+(?:\.\d+)?):(\d+(?:\.\d+)?):(\d+(?:\.\d+)?):(\d+(?:\.\d+)?)$/
+    # right, left, upsidedown
+    ROTATE_RE = /^(right|left|upsidedown)$/
+    # show/hide layer or id, "+Layer 1", +#id, -*
+    SHOWHIDE_RE = /^([+-])(.+)$/
 
-      class SyntaxError < StandardError
-      end
+    class SyntaxError < StandardError
+    end
 
     class ProcessError < StandardError
     end
@@ -360,10 +459,11 @@ class Inkmake
 
     def parse_split_line(line)
       # changed CSV API in ruby 1.9
+      # - [nil] to remove empty fields
       if RUBY_VERSION.start_with? "1.8"
-        CSV::parse_line(line, fs = " ")
+        CSV::parse_line(line, fs = " ") - [nil]
       else
-        CSV::parse_line(line, {:col_sep => " "})
+        CSV::parse_line(line, **{:col_sep => " "}) - [nil]
       end
     end
 
@@ -468,16 +568,17 @@ class Inkmake
       else
         out_width, out_height = width, height
       end
+      file_href = "file://#{path}"
       svg =
         "<?xml version=\"1.0\"?>" +
         "<svg xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"#{out_width}\" height=\"#{out_height}\">" +
         "<g>" +
         "<image transform=\"translate(#{out_width/2} #{out_height/2}) rotate(#{degrees})\"" +
         "  width=\"#{width}\" height=\"#{height}\" x=\"#{-width/2}\" y=\"#{-height/2}\"" +
-          "  xlink:href=\"file:///#{URI.escape(path)}\" />" +
+          "  xlink:href=#{file_href.encode(:xml => :attr)} />" +
         "</g>" +
           "</svg>"
-        f = Tempfile.new("inkmake")
+        f = Tempfile.new(["inkmake", ".svg"])
         f.write(svg)
         f.flush
         f.seek(0)
@@ -679,7 +780,7 @@ class Inkmake
             end
           end
 
-          f = Tempfile.new("inkmake")
+          f = Tempfile.new(["inkmake", ".svg"])
           doc.write(:output => f)
           f.flush
           f

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inkmake
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Mattias Wadman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: mattias.wadman@gmail.com
@@ -38,8 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Makefile inspired export from SVG files using Inkscape as backend with some