ruby-gr 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 668fdb6db9526bf6b55fb6b293aa776ec625b76a650be20852efcd2869f1c751
-  data.tar.gz: 3b3a7645021470b12840734506f2a466d32fdff111c0e7dd6762ccf9e374ee92
+  metadata.gz: 46a782911565b4128622399489e47d79e7ced0d3880d9c5c5adacdae7fa24709
+  data.tar.gz: e89d9c7e5a5ae0bf53352f3afb71fd1206c9a0e7aa5a3ba83504457fa5689b7d
 SHA512:
-  metadata.gz: 982637afaeb9be0f9b7abb631e1554fd04a2082ec7b019cb55e4f8d4ec870634f734b1b28dda8177e784a593476e0f065a924bd362ba58a881210015a7ec2f4c
-  data.tar.gz: 5bd9205778607854747d7ab9e4c1165600792710a9c3df0452c3c306fceff7ab90d665ccb244aa4761c407f59df9c3f80413bf4663ff81643887966b87109e27
+  metadata.gz: 21a8aeb6c49da80f87bb764ba149ffa8c7e7bffa3ed171002d1c6963537b9f0b500a96f77eac6876c8c3a8af9601aad6c8a79dfd4e0aea6d7d356adfc59b04db
+  data.tar.gz: 99a2e4204e8eef936979895183d86003860e2b9b356a24bc0f132793177459fa8fc782cf8bdd4ac4c2a29fca6e77aff41d7501123e84917172009bc5b5907547

data/README.md

@@ -50,7 +50,7 @@ GR.plot(x, y)
 ## Examples
 
 Have a look in the [`examples`](https://github.com/red-data-tools/GR.rb/tree/master/examples) directory. 
-* [Example Gallery](https://github.com/red-data-tools/GR.rb/wiki/Example-gallery)
+* [Example Gallery](https://github.com/red-data-tools/GR.rb/wiki/1.-Example-gallery)
 
 ## Features
 

data/lib/gr.rb

@@ -52,16 +52,20 @@ module GR
     attr_accessor :ffi_lib
   end
 
-  raise Error, 'Please set env variable GRDIR' unless ENV['GRDIR']
-
   # Platforms |  path
   # Windows   |  bin/libgr.dll
   # MacOSX    |  lib/libGR.so (NOT .dylib)
   # Ubuntu    |  lib/libGR.so
   if Object.const_defined?(:RubyInstaller)
+    ENV['GRDIR'] ||= [
+      RubyInstaller::Runtime.msys2_installation.msys_path,
+      RubyInstaller::Runtime.msys2_installation.mingwarch
+    ].join(File::ALT_SEPARATOR)
     self.ffi_lib = File.expand_path('bin/libgr.dll', ENV['GRDIR'])
     RubyInstaller::Runtime.add_dll_directory(File.dirname(ffi_lib))
   else
+    raise Error, 'Please set env variable GRDIR' unless ENV['GRDIR']
+
     self.ffi_lib = File.expand_path('lib/libGR.so', ENV['GRDIR'])
   end
 

data/lib/gr/plot.rb

@@ -332,7 +332,7 @@ module GR
         GR.axes(xtick, ytick, xorg[1], yorg[1], -majorx, -majory, -ticksize)
       end
 
-      if kvs.has_key?(:title)
+      if kvs[:title]
         GR.savestate
         GR.settextalign(GR::TEXT_HALIGN_CENTER, GR::TEXT_VALIGN_TOP)
         text(0.5 * (viewport[0] + viewport[1]), vp[3], kvs[:title])
@@ -700,11 +700,18 @@ module GR
             a, b = z.shape
             x = (1..b).to_a
             y = (1..a).to_a
-            zmin, zmax = kvs[:zlim] || z.minmax
+            zmin, zmax = z.minmax
           elsif equal_length(x, y, z)
             x, y, z = GR.gridit(x, y, z, 200, 200)
-            zmin, zmax = kvs[:zlim] || z.compact.minmax # compact : removed nil
+            zmin, zmax = z.compact.minmax # compact : removed nil
+          end
+
+          # kvs[:zlim] is supposed to be Array or Range
+          if kvs.has_key?(:zlim)
+            zmin = kvs[:zlim].first if kvs[:zlim].first
+            zmax = kvs[:zlim].last if kvs[:zlim].last
           end
+
           GR.setspace(zmin, zmax, 0, 90)
           levels = kvs[:levels] || 0
           clabels = kvs[:clabels] || false
@@ -1093,30 +1100,12 @@ module GR
       xmin, xmax = fix_minmax(xmin, xmax)
       ymin, ymax = fix_minmax(ymin, ymax)
       zmin, zmax = fix_minmax(zmin, zmax)
-      if kvs.has_key?(:xlim)
-        x0, x1 = kvs[:xlim]
-        x0 ||= xmin
-        x1 ||= xmax
-        kvs[:xrange] = [x0, x1]
-      else
-        kvs[:xrange] = [xmin, xmax]
-      end
-      if kvs.has_key?(:ylim)
-        y0, y1 = kvs[:ylim]
-        y0 ||= ymin
-        y1 ||= ymax
-        kvs[:yrange] = [y0, y1]
-      else
-        kvs[:yrange] = [ymin, ymax]
-      end
-      if kvs.has_key?(:zlim)
-        z0, z1 = kvs[:zlim]
-        z0 ||= zmin
-        z1 ||= zmax
-        kvs[:zrange] = [z0, z1]
-      else
-        kvs[:zrange] = [zmin, zmax]
-      end
+
+      # kvs[:xlim], kvs[:ylim], kvs[:zlim] is supposed to be Array or Range
+      kvs[:xrange] = [(kvs[:xlim]&.first || xmin), (kvs[:xlim]&.last || xmax)]
+      kvs[:yrange] = [(kvs[:ylim]&.first || ymin), (kvs[:ylim]&.last || ymax)]
+      kvs[:zrange] = [(kvs[:zlim]&.first || zmin), (kvs[:zlim]&.last || zmax)]
+
       if kvs.has_key?(:clim)
         c0, c1 = kvs[:clim]
         c0 ||= cmin

data/lib/gr3.rb

@@ -60,16 +60,20 @@ module GR3
     attr_accessor :ffi_lib
   end
 
-  raise Error, 'Please set env variable GRDIR' unless ENV['GRDIR']
-
   # Platforms |  path
   # Windows   |  bin/libGR3.dll
   # MacOSX    |  lib/libGR3.so (NOT .dylib)
   # Ubuntu    |  lib/libGR3.so
   if Object.const_defined?(:RubyInstaller)
+    ENV['GRDIR'] ||= [
+      RubyInstaller::Runtime.msys2_installation.msys_path,
+      RubyInstaller::Runtime.msys2_installation.mingwarch
+    ].join(File::ALT_SEPARATOR)
     self.ffi_lib = File.expand_path('bin/libGR3.dll', ENV['GRDIR'])
     RubyInstaller::Runtime.add_dll_directory(File.dirname(ffi_lib))
   else
+    raise Error, 'Please set env variable GRDIR' unless ENV['GRDIR']
+
     self.ffi_lib = File.expand_path('lib/libGR3.so', ENV['GRDIR'])
   end
 

data/lib/gr_commons/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GRCommons
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-03 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,8 @@ files:
 homepage: https://github.com/red-data-tools/GR.rb
 licenses:
 - MIT
-metadata: {}
+metadata:
+  msys2_mingw_dependencies: gr
 post_install_message: 
 rdoc_options: []
 require_paths: