numo-gnuplot 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23318f9476abeabe7f3b1cf973750b8a6e4a84b0
-  data.tar.gz: 94534cf81c5e11030deddebfa2ff4507dc35ee2b
+  metadata.gz: e87eaed8bca276f54c5fe06d2e009ceeb3a5355a
+  data.tar.gz: 6f26b92d3cb90a633703b4392dbd0adb60ff070b
 SHA512:
-  metadata.gz: 2f9e70d4c27142494d857a0fba1ae7c0a3bdd8d9f31095a18c8a08621d309275067224a519eac14218c168a5a8b684ea559d0c99d9405737d5b7be6bb6894632
-  data.tar.gz: a90ac0f94296c4828317087d408b64c408233cd7c84ed9da8956ca9fc29add975712d2af9378fa3cb89340d9ea509831825f40758f1d1c12ecf6c007ccae0da6
+  metadata.gz: 2c6aaed522a0cdd5386afc91a40f26c3d51030d5aa31b3f9f3e535febf0abd6895aea67be8bdede43774ffae97d8b4f7590b93098b12854de12b4bb0b8a5b0b8
+  data.tar.gz: e6d06e0c9b00554eb7194b5284ea2c2c5f960810a2dfb3a652e6006028c95ea88f57f1b2ffd50688465cd1a1ce1517dcc308f0fc3416d219879825b31d8cc04b

data/lib/numo/gnuplot.rb

@@ -16,7 +16,7 @@ module Numo
 
 class Gnuplot
 
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
   POOL = []
   DATA_FORMAT = "%.7g"
 
@@ -116,7 +116,7 @@ class Gnuplot
       case a
       when Hash
         a.each do |k,v|
-          run "#{cmd} #{KvItem.new(k,v)}"
+          run "#{cmd} #{OptArg.parse_kv(k,v)}"
         end
       else
         run "#{cmd} #{a}"
@@ -150,7 +150,7 @@ class Gnuplot
   #    pause 'mouse'
   #    pause mouse:%w[keypress button1 button2 button3 close any]
   def pause(*args)
-    send_cmd("pause #{OptsToS.new(*args)}").join.chomp
+    send_cmd("pause #{OptArg.parse(*args)}").join.chomp
     nil
   end
 
@@ -264,6 +264,8 @@ class Gnuplot
     "gnuplot"
   end
 
+  # private methods
+
   def run(s,data=nil)
     res = send_cmd(s,data)
     if !res.empty?
@@ -327,25 +329,19 @@ class Gnuplot
 
 
   # @private
-  class OptsToS # :nodoc: all
-    def initialize(*opts)
-      @opts = opts
-    end
+  module OptArg # :nodoc: all
 
-    def to_s
-      opts_to_s(*@opts)
-    end
+    module_function
 
-    def opts_to_s(*opts)
-      #p opts
+    def parse(*opts)
       sep = ","
       opts.map do |opt|
         sep = " " if !opt.kind_of?(Numeric)
         case opt
         when Array
-          opt.map{|v| "#{opts_to_s(*v)}"}.join(sep)
+          opt.map{|v| "#{parse(*v)}"}.join(sep)
         when Hash
-          opt.map{|k,v| KvItem.new(k,v).to_s}.compact.join(" ")
+          opt.map{|k,v| parse_kv(k,v)}.compact.join(" ")
         when Range
           "[#{opt.begin}:#{opt.end}]"
         else
@@ -353,17 +349,17 @@ class Gnuplot
         end
       end.join(sep)
     end
-  end
 
-  # @private
-  class KvItem # :nodoc: all
     NEED_QUOTE = %w[
       background
       cblabel
       clabel
+      commentschars
       dashtype
+      decimalsign
       dt
       font
+      fontpath
       format
       format_cb
       format_x
@@ -372,8 +368,14 @@ class Gnuplot
       format_y
       format_y2
       format_z
+      locale
+      logfile
+      missing
       output
+      print
       rgb
+      separator
+      table
       timefmt
       title
       x2label
@@ -381,30 +383,54 @@ class Gnuplot
       y2label
       ylabel
       zlabel
-    ].map{|x| x.to_sym}
-
-    def initialize(k,v)
-      @k = k
-      @v = v
-    end
-
-    def need_quote?(k)
-      NEED_QUOTE.any? do |q|
-        /^#{k}/ =~ q
-      end
-    end
-
-    def to_s
-      kv_to_s(@k,@v)
-    end
-
-    def kv_to_s(k,v)
-      if need_quote?(k)
+      cb
+      x
+      xy
+      x2
+      y
+      y2
+      z
+    ]
+
+    def NEED_QUOTE.===(k)
+      re = /^#{k}/
+      any?{|q| re =~ q}
+    end
+
+    def parse_kv(k,v)
+      case k.to_sym
+      when :at
+        case v
+        when String
+          "#{k} #{v}" # not quote
+        when Array
+          "#{k} #{v.map{|x|(x.kind_of? String) ? x.inspect : x.to_s}.join(",")}"
+        else
+          "#{k} #{parse(v)}"
+        end
+      when :label
         case v
         when String
           "#{k} #{v.inspect}"
         when Array
-          "#{k} #{v[0].inspect} #{OptsToS.new(*v[1..-1])}"
+          if v[0].kind_of?(Integer) && v[1].kind_of?(String)
+            "#{k} #{parse(v[0],v[1].inspect,*v[2..-1])}"
+          elsif v[0].kind_of?(String)
+            "#{k} #{parse(v[0].inspect,*v[1..-1])}"
+          else
+            "#{k} #{parse(*v)}"
+          end
+        else
+          "#{k} #{parse(v)}"
+        end
+      when NEED_QUOTE
+        case v
+        when String
+          "#{k.to_s.sub(/_/,' ')} #{v.inspect}"
+        when Array
+          "#{k} #{v[0].inspect} #{parse(*v[1..-1])}"
+        else
+          "#{k} #{parse(v)}"
         end
       else
         case v
@@ -420,14 +446,15 @@ class Gnuplot
           if /^#{k}/ =~ "using"
             "#{k} #{v.join(':')}"
           else
-            "#{k} #{OptsToS.new(*v)}"
+            "#{k} #{parse(*v)}"
           end
         else
-          "#{k} #{OptsToS.new(v)}"
+          "#{k} #{parse(v)}"
         end
       end
     end
-  end # KvItem
+
+  end # OptArg
 
 
   # @private
@@ -499,9 +526,9 @@ class Gnuplot
     def cmd_str
       parse_items
       if @function
-        "%s %s" % [@function, OptsToS.new(*@options)]
+        "%s %s" % [@function, OptArg.parse(*@options)]
       else
-        "%s %s" % [@data.cmd_str, OptsToS.new(*@options)]
+        "%s %s" % [@data.cmd_str, OptArg.parse(*@options)]
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-gnuplot
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,9 +82,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Gnuplot interface for Ruby.
 test_files: []
-has_rdoc: