ruby-gr 0.73.19.1 → 0.73.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 875e34444c38c15bd8d817784ded0a930e3126a3cc57ae90f8ae34e720ea7e06
-  data.tar.gz: d3e8357786782a3da6b2256f40865a82a3408506d605d27692b8f52e5f8d787f
+  metadata.gz: 160f844394c8d7094012ff62b591a217cc427b8a39c5750bd9b092829e632795
+  data.tar.gz: ec2cb05bb3a9b4997691d0e2db4faf88e5c69873f31986a24add3a7f2f8bb9f9
 SHA512:
-  metadata.gz: 6d49ab20cb176d37d092600164fb29fbb6c762d445c8b18803aca52d557f23873ba6af60126a62ece955a22c4274d7430aeb2e0ba7a31d07af8e211d7077dfda
-  data.tar.gz: f8594bf5ea403ef7cd663ce44919e760f5d79d5d1122e2b29ac45195f9108226407c1953da225667b0f26ed788009fc6e26c983e38902b49cc196dd79860b464
+  metadata.gz: 077e1c882ccdea72597faf657dd41de18f3a3c004b3236f9fe96de81857cf4838ff46f3a43dd75784d157ca096475d39885a49ef2784733ddea6aac1ffa21cc2
+  data.tar.gz: 6d82381e5d6c8172361d4a0af3bc6a4c747d5d7498d6671d95ebe291c190d2bb10e17539850cf1b4e0d8def478dfee8bebc434b2a14e73246353cdae9749ed6e

data/README.md

@@ -25,12 +25,20 @@
 
 ## Installation
 
-First, [install GR](#gr-installation). Then install [`gr-plot`](https://github.com/red-data-tools/gr-plot) gem.
+First, [install GR](#gr-installation). If your goal is to draw plots from Ruby,
+install [`gr-plot`](https://github.com/red-data-tools/gr-plot).
 
 ```sh
 gem install gr-plot
 ```
 
+For low-level access to the GR, GR3, and GRM native libraries, install the
+`ruby-gr` gem directly.
+
+```sh
+gem install ruby-gr
+```
+
 [pkg-config](https://github.com/ruby-gnome/pkg-config) will detect the location of the shared library. Otherwise, you need to specify the environment variable.
 
 ```sh

data/lib/gr/ffi.rb

@@ -56,12 +56,14 @@ module GR
     CpuBasedVolume2Pass = struct [
       'double dmin',
       'double dmax',
+      'int action',
       'cpubasedvolume_2pass_priv_t *priv'
     ]
 
     Hexbin2Pass = struct [
       'int nc',
-      'int nntmax',
+      'int cntmax',
+      'int action',
       'hexbin_2pass_priv_t *priv'
     ]
 
@@ -77,8 +79,8 @@ module GR
     ]
 
     Axis = struct [
-      'double min',
-      'double max',
+      'double min_val', # min conflict with Enumerable min
+      'double max_val', # max conflict with Enumerable max
       'double tick',
       'double org',
       'double position',
@@ -253,12 +255,16 @@ module GR
     try_extern 'void gr_inqmathtex3d(double, double, double, char *, int, double *, double *, double *, double *)'
     try_extern 'void gr_beginselection(int, int)'
     try_extern 'void gr_endselection(void)'
-    try_extern 'void gr_setbboxcallback(int, void (*)(int, double, double, double, double))'
+    try_extern 'void gr_setbboxcallback(int, void (*)(int, double, double, double, double),' \
+               ' void (*)(unsigned int, unsigned int, unsigned int *))'
     try_extern 'void gr_cancelbboxcallback(void)'
+    try_extern 'void gr_beginpartial(int, void (*)(int, unsigned int, unsigned int,' \
+               ' unsigned int, unsigned int, unsigned int *))'
+    try_extern 'void gr_endpartial(int)'
     try_extern 'void gr_moveselection(double, double)'
     try_extern 'void gr_resizeselection(int, double, double)'
     try_extern 'void gr_inqbbox(double *, double *, double *, double *)'
-    try_extern 'void gr_setbackground(void)'
+    try_extern 'void gr_setbackground(double, double, double, double)'
     try_extern 'void gr_clearbackground(void)'
     try_extern 'double gr_precision(void)'
     try_extern 'int gr_text_maxsize(void)'

data/lib/gr.rb

@@ -40,7 +40,7 @@
 #
 # Fiddley is Ruby-FFI compatible API layer for Fiddle.
 #
-# The GR module works without Numo::Narrray.
+# The GR module works without Numo::NArray.
 # GR3 and GR::Plot depends on numo-narray.
 #
 # This is a procedural interface to the GR plotting library,
@@ -60,25 +60,9 @@ module GR
   # Windows   |  bin/libgr.dll
   # MacOSX    |  lib/libGR.dylib ( <= v0.53.0 .so)
   # Ubuntu    |  lib/libGR.so
-  platform = RbConfig::CONFIG['host_os']
-  lib_names, pkg_name = \
-    case platform
-    when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-      [['libGR.dll'], 'gr']
-    when /darwin|mac os/
-      ENV['GKSwstype'] ||= 'gksqt'
-      [['libGR.dylib', 'libGR.so'], 'gr']
-    else
-      [['libGR.so'], 'gr']
-    end
-
   # On Windows + RubyInstaller,
   # the environment variable GKS_FONTPATH will be set.
-  lib_path = GRCommons::GRLib.search(lib_names, pkg_name)
-
-  raise NotFoundError, "#{lib_names} not found" if lib_path.nil?
-
-  self.ffi_lib = lib_path
+  GRCommons::GRLib.load_library(self, pkg_name: 'gr', not_found_error: NotFoundError)
 
   require_relative 'gr/version'
   require_relative 'gr/ffi'
@@ -95,6 +79,54 @@ module GR
   # a Fiddley::MemoryPointer in the GRBase class.
   extend GRBase
 
+  # High-level axis/tick objects
+  class GRTick
+    attr_accessor :value, :is_major
+
+    def initialize(value:, is_major:)
+      @value = value
+      @is_major = is_major
+    end
+  end
+
+  class GRTickLabel
+    attr_accessor :tick, :label, :width
+
+    def initialize(tick:, label:, width:)
+      @tick = tick
+      @label = label
+      @width = width
+    end
+  end
+
+  class GRAxis
+    attr_accessor :min, :max, :tick, :org, :position,
+                  :major_count, :num_ticks, :ticks,
+                  :tick_size, :tick_labels, :label_position,
+                  :draw_axis_line, :label_orientation
+
+    def initialize(min: Float::NAN, max: Float::NAN, tick: Float::NAN,
+                   org: Float::NAN, position: Float::NAN,
+                   major_count: 1, num_ticks: 0, ticks: nil,
+                   tick_size: Float::NAN, tick_labels: nil,
+                   label_position: Float::NAN,
+                   draw_axis_line: 1, label_orientation: 0)
+      @min = min
+      @max = max
+      @tick = tick
+      @org = org
+      @position = position
+      @major_count = major_count
+      @num_ticks = num_ticks
+      @ticks = ticks
+      @tick_size = tick_size
+      @tick_labels = tick_labels
+      @label_position = label_position
+      @draw_axis_line = draw_axis_line
+      @label_orientation = label_orientation
+    end
+  end
+
   class << self
     # @!method initgr
 
@@ -815,6 +847,10 @@ module GR
       inquiry_int { |pt| super(pt) }
     end
 
+    def inqnominalsize
+      inquiry_double { |pt| super(pt) }
+    end
+
     # Redefine an existing color index representation by specifying an RGB color
     # triplet.
     #
@@ -956,6 +992,12 @@ module GR
 
     # @!method closeseg
 
+    def samplelocator
+      inquiry %i[double double int] do |*pts|
+        super(*pts)
+      end
+    end
+
     # @!method emergencyclosegks
 
     # @!method updategks
@@ -1116,50 +1158,35 @@ module GR
 
     alias axes2d axes
 
-    def axis(option, min: Float::NAN, max: Float::NAN, tick: Float::NAN, org: Float::NAN, position: Float::NAN, major_count: 1,
-             tick_size: Float::NAN, label_position: Float::NAN, draw_axis_line: 1, label_orientation: 0)
-      ax = FFI::Axis.malloc
-      ax[:min] = min
-      ax[:max] = max
-      ax[:tick] = tick
-      ax[:org] = org
-      ax[:position] = position
-      ax[:major_count] = major_count
-      ax[:tick_size] = tick_size
-      ax[:label_position] = label_position
-      ax[:draw_axis_line] = draw_axis_line
-      ax[:label_orientation] = label_orientation
-      ax[:ticks] = 0
-      ax[:num_ticks] = 0
-      ax[:tick_labels] = 0
-      ax[:num_tick_labels] = 0
-      super(option, ax)
-      ax
-    end
-
-    def drawaxis(option, min: Float::NAN, max: Float::NAN, tick: Float::NAN, org: Float::NAN, position: Float::NAN,
-                 major_count: 1, tick_size: Float::NAN, label_position: Float::NAN, draw_axis_line: 1, label_orientation: 0)
-      ax = FFI::Axis.malloc
-      ax[:min] = min
-      ax[:max] = max
-      ax[:tick] = tick
-      ax[:org] = org
-      ax[:position] = position
-      ax[:major_count] = major_count
-      ax[:tick_size] = tick_size
-      ax[:label_position] = label_position
-      ax[:draw_axis_line] = draw_axis_line
-      ax[:label_orientation] = label_orientation
-      ax[:ticks] = 0
-      ax[:num_ticks] = 0
-      ax[:tick_labels] = 0
-      ax[:num_tick_labels] = 0
-      super(option, ax)
-      ax
-    end
-
-    def drawaxes(x_axis, y_axis, option = 1)
-      super(x_axis, y_axis, option)
+    def axis(option, **opts)
+      axis = GRAxis.new
+      opts.each do |k, v|
+        setter = "#{k}="
+        axis.public_send(setter, v) if axis.respond_to?(setter)
+      end
+
+      c_axis = __axis_to_c_axis(axis)
+
+      str = option.to_s
+      raise ArgumentError, "axis option must be a single character, got #{str.inspect}" unless str.length == 1
+
+      FFI.gr_axis(str.ord, c_axis)
+      __axis_from_c_axis(c_axis)
+    end
+
+    def drawaxis(option, axis)
+      c_axis = __axis_to_c_axis(axis)
+
+      str = option.to_s
+      raise ArgumentError, "axis option must be a single character, got #{str.inspect}" unless str.length == 1
+
+      FFI.gr_drawaxis(str.ord, c_axis)
+    end
+
+    def drawaxes(x_axis = nil, y_axis = nil, option = 1)
+      c_x = x_axis && __axis_to_c_axis(x_axis)
+      c_y = y_axis && __axis_to_c_axis(y_axis)
+      FFI.gr_drawaxes(c_x&.to_ptr, c_y&.to_ptr, option)
     end
 
     # Create axes in the current workspace and supply a custom function for
@@ -1480,6 +1507,14 @@ module GR
       super(n, x, y, nbins)
     end
 
+    def hexbin_2pass(x, y, nbins, context = nil)
+      n = equal_length(x, y)
+      context ||= Fiddle::NULL
+      context = context.to_ptr if context.respond_to?(:to_ptr)
+      result = super(n, x, y, nbins, context)
+      result.null? ? nil : FFI::Hexbin2Pass.new(result)
+    end
+
     # Set the currently used colormap.
     #
     # * A list of colormaps can be found at: https://gr-framework.org/colormaps.html
@@ -1516,7 +1551,7 @@ module GR
       if positions.nil?
         positions = Fiddle::NULL
       elsif positions.length != n
-        raise
+        raise ArgumentError, "positions must have length #{n} (got #{positions.length})"
       end
       super(n, r, g, b, positions)
     end
@@ -1788,9 +1823,9 @@ module GR
       data = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INTPTR_T, Fiddle::RUBY_FREE)
       w, h = inquiry [:int, :int] do |width, height|
         # data is a pointer of a pointer
-        super(path, width, height, data.ref)
+        super(path, width, height, data)
       end
-      d = data.to_str(w * h * Fiddle::SIZEOF_INT).unpack('L*') # UInt32
+      d = data.ptr.to_str(w * h * Fiddle::SIZEOF_INT).unpack('L*') # UInt32
       [w, h, d]
     end
 
@@ -1841,12 +1876,16 @@ module GR
     #
     # @!method settransparency
 
+    def inqtransparency
+      inquiry_double { |pt| super(pt) }
+    end
+
     # Change the coordinate transformation according to the given matrix.
     #
     # @param mat [Array, NArray] 2D transformation matrix
     #
     def setcoordxform(mat)
-      raise if mat.size != 6
+      raise ArgumentError, "mat must have 6 elements (got #{mat.size})" if mat.size != 6
 
       super(mat)
     end
@@ -1886,6 +1925,12 @@ module GR
       end
     end
 
+    def inqmathtex3d(x, y, z, string, axis)
+      inquiry [{ double: 16 }, { double: 16 }, { double: 16 }, { double: 16 }] do |tbx, tby, tbz, tbw|
+        super(x, y, z, string, axis, tbx, tby, tbz, tbw)
+      end
+    end
+
     # @!method beginselection
 
     # @!method endselection
@@ -1928,10 +1973,10 @@ module GR
       triangles = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INTPTR_T, Fiddle::RUBY_FREE)
       dim = 3
       n_tri = inquiry_int do |ntri|
-        super(npoints, x, y, ntri, triangles.ref)
+        super(npoints, x, y, ntri, triangles)
       end
       if n_tri > 0
-        tri = triangles.to_str(dim * n_tri * Fiddle::SIZEOF_INT).unpack('l*') # Int32
+        tri = triangles.ptr.to_str(dim * n_tri * Fiddle::SIZEOF_INT).unpack('l*') # Int32
         # Ruby  : 0-based indexing
         # Julia : 1-based indexing
         tri = tri.each_slice(dim).to_a
@@ -2232,6 +2277,12 @@ module GR
       inquiry_int { |pt| super(pt) }
     end
 
+    def inqclip
+      inquiry [:int, { double: 4 }] do |region, points|
+        super(region, points)
+      end
+    end
+
     # Set the projection type with this flag.
     #
     # @param flag [Integer] projection type
@@ -2373,6 +2424,12 @@ module GR
     #
     # @!method setspace3d
 
+    def inqspace3d
+      inquiry %i[int double double double double] do |*pts|
+        super(*pts)
+      end
+    end
+
     # @!method text3d
 
     def inqtext3d(x, y, z, string, axis)
@@ -2511,6 +2568,113 @@ module GR
       super(string, value, format_ref)
       string.to_s
     end
+
+    private
+
+    # Convert high-level GRAxis into low-level FFI::Axis
+    def __axis_to_c_axis(axis)
+      c_axis = FFI::Axis.malloc
+      # Keep references to allocated memory to prevent GC
+      memory_refs = []
+
+      c_axis.min_val = axis.min
+      c_axis.max_val = axis.max
+      c_axis.tick = axis.tick
+      c_axis.org = axis.org
+      c_axis.position = axis.position
+      c_axis.major_count = axis.major_count
+
+      # ticks
+      if axis.ticks && !axis.ticks.empty?
+        count = axis.ticks.size
+        mem = Fiddle::Pointer.malloc(FFI::Tick.size * count, Fiddle::RUBY_FREE)
+        memory_refs << mem
+        axis.ticks.each_with_index do |t, i|
+          tick = FFI::Tick.new(mem + i * FFI::Tick.size)
+          tick.value = t.value
+          tick.is_major = t.is_major
+        end
+        c_axis.num_ticks = count
+        c_axis.ticks = mem.to_i
+      else
+        c_axis.num_ticks = 0
+        c_axis.ticks = 0
+      end
+
+      c_axis.tick_size = axis.tick_size
+
+      # tick labels
+      if axis.tick_labels && !axis.tick_labels.empty?
+        count = axis.tick_labels.size
+        mem = Fiddle::Pointer.malloc(FFI::TickLabel.size * count, Fiddle::RUBY_FREE)
+        memory_refs << mem
+        axis.tick_labels.each_with_index do |tl, i|
+          lbl = FFI::TickLabel.new(mem + i * FFI::TickLabel.size)
+          lbl.tick = tl.tick
+          # Allocate persistent memory for label string
+          label_str = tl.label.to_s + "\0"
+          label_ptr = Fiddle::Pointer.malloc(label_str.bytesize, Fiddle::RUBY_FREE)
+          memory_refs << label_ptr
+          label_ptr[0, label_str.bytesize] = label_str
+          lbl.label = label_ptr.to_i
+          lbl.width = tl.width
+        end
+        c_axis.num_tick_labels = count
+        c_axis.tick_labels = mem.to_i
+      else
+        c_axis.num_tick_labels = 0
+        c_axis.tick_labels = 0
+      end
+
+      c_axis.label_position = axis.label_position
+      c_axis.draw_axis_line = axis.draw_axis_line
+      c_axis.label_orientation = axis.label_orientation
+
+      # Store memory references in the axis object to prevent GC
+      c_axis.instance_variable_set(:@__memory_refs, memory_refs)
+
+      c_axis
+    end
+
+    # Convert low-level FFI::Axis back into high-level GRAxis
+    def __axis_from_c_axis(c_axis)
+      ticks = if c_axis.num_ticks.positive? && !Fiddle::Pointer[c_axis.ticks].null?
+                Array.new(c_axis.num_ticks) do |i|
+                  tick = FFI::Tick.new(c_axis.ticks + i * FFI::Tick.size)
+                  GRTick.new(value: tick.value, is_major: tick.is_major)
+                end
+              else
+                []
+              end
+
+      tick_labels = if c_axis.num_tick_labels.positive? && !Fiddle::Pointer[c_axis.tick_labels].null?
+                      Array.new(c_axis.num_tick_labels) do |i|
+                        lbl = FFI::TickLabel.new(c_axis.tick_labels + i * FFI::TickLabel.size)
+                        ptr = Fiddle::Pointer[lbl.label]
+                        next if ptr.null?
+
+                        GRTickLabel.new(tick: lbl.tick, label: ptr.to_s, width: lbl.width)
+                      end.compact
+                    else
+                      []
+                    end
+
+      GRAxis.new(
+        min: c_axis.min_val,
+        max: c_axis.max_val,
+        tick: c_axis.tick,
+        org: c_axis.org,
+        position: c_axis.position,
+        major_count: c_axis.major_count,
+        num_ticks: c_axis.num_ticks,
+        ticks: ticks,
+        tick_size: c_axis.tick_size,
+        tick_labels: tick_labels,
+        label_position: c_axis.label_position,
+        draw_axis_line: c_axis.draw_axis_line,
+        label_orientation: c_axis.label_orientation
+      )
+    end
   end
 
   ASF_BUNDLED    = 0

data/lib/gr3/gr3base.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GR3
-  # This module automatically converts Ruby arrays and Numo::Narray into
+  # This module automatically converts Ruby arrays and Numo::NArray into
   # Fiddley::MemoryPointer.
   module GR3Base
     extend GRCommons::DefineMethods

data/lib/gr3.rb

@@ -47,10 +47,10 @@
 #   * This is a opinion of kojix2 and may be changed by future maintainers.
 #
 # @note
-#   GR3 uses Numo::Narrray.
+#   GR3 uses Numo::NArray.
 #   * It is difficult to write GR3 modules with only Ruby arrays.
-#   * Numo::Narray has better performance and is easier to read.
-#   * Numo::Narray does not work with JRuby.
+#   * Numo::NArray has better performance and is easier to read.
+#   * Numo::NArray does not work with JRuby.
 #     * https://github.com/ruby-numo/numo-narray/issues/147
 #
 # This is a procedural interface to the GR3 in GR plotting library,
@@ -65,30 +65,15 @@ module GR3
   end
 
   require_relative 'gr_commons/gr_commons'
+  require 'numo/narray'
 
   # Platforms |  path
   # Windows   |  bin/libGR3.dll
   # MacOSX    |  lib/libGR3.dylib ( <= v0.53.0 .so)
   # Ubuntu    |  lib/libGR3.so
-  platform = RbConfig::CONFIG['host_os']
-  lib_names, pkg_name = \
-    case platform
-    when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-      [['libGR3.dll'], 'gr3']
-    when /darwin|mac os/
-      ENV['GKSwstype'] ||= 'gksqt'
-      [['libGR3.dylib', 'libGR3.so'], 'gr3']
-    else
-      [['libGR3.so'], 'gr3']
-    end
-
   # On Windows + RubyInstaller,
   # the environment variable GKS_FONTPATH will be set.
-  lib_path = GRCommons::GRLib.search(lib_names, pkg_name)
-
-  raise NotFoundError, "#{lib_names} not found" if lib_path.nil?
-
-  self.ffi_lib = lib_path
+  GRCommons::GRLib.load_library(self, pkg_name: 'gr3', not_found_error: NotFoundError)
 
   require_relative 'gr3/version'
   require_relative 'gr3/ffi'
@@ -354,7 +339,11 @@ module GR3
     #
     # @return [Integer]
     #
-    # @!method getcameraprojectionparameters
+    def getcameraprojectionparameters
+      inquiry %i[float float float] do |vfov, znear, zfar|
+        super(vfov, znear, zfar)
+      end
+    end
 
     # This function sets the direction of light. If it is called with (0, 0, 0),
     # the light is always pointing into the same direction as the camera.
@@ -387,10 +376,18 @@ module GR3
     # @!method setobjectid
 
     # @return [Integer]
-    # @!method selectid
+    def selectid(x, y, width, height)
+      inquiry_int do |selection_id|
+        super(x, y, width, height, selection_id)
+      end
+    end
 
     # @param m [Array, NArray] the 4x4 column major view matrix
-    # @!method getviewmatrix
+    def getviewmatrix
+      inquiry(float: 16) do |matrix|
+        super(matrix)
+      end
+    end
 
     # @param m [Array, NArray] the 4x4 column major view matrix
     # @!method setviewmatrix

data/lib/gr_commons/fiddley.rb

@@ -71,7 +71,7 @@ module GRCommons
         when :uint
           str.unpack('I!*')
         when :bool
-          str.unpack('i!*') != 0
+          str.unpack('i!*').map { |value| value != 0 }
         when :long
           str.unpack('l!*')
         when :ulong
@@ -115,7 +115,7 @@ module GRCommons
         when :uint
           arr.pack('I!*')
         when :bool
-          [arr ? 1 : 0].pack('i!*')
+          Array(arr).map { |value| value ? 1 : 0 }.pack('i!*')
         when :long
           arr.pack('l!*')
         when :ulong
@@ -329,7 +329,7 @@ module GRCommons
 
       # added
       define_method('read_float') do
-        __send__('get_double', 0)
+        __send__('get_float', 0)
       end
 
       # added
@@ -353,6 +353,7 @@ module GRCommons
       end
 
       def put_bytes(offset, str, idx = 0, len = str.bytesize - idx)
+        len ||= str.bytesize - idx
         @ptr[offset, len] = str[idx, len]
       end
 

data/lib/gr_commons/gr_lib.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require 'pkg-config'
+require 'rbconfig'
 
 module GRCommons
-  # This module helps GR, GR and GRM to search the shared library.
+  # This module helps GR, GR3 and GRM to search the shared library.
   #
   # The order of priority:
   # 1. RubyInstaller ( for Windows only )
@@ -36,11 +37,35 @@ module GRCommons
         warn "#{lib_names} : Dir GRDIR=#{ENV['GRDIR']} not found." # return nil
       end
 
+      # Return default shared library names for a GR package.
+      def default_lib_names(pkg_name)
+        lib_base = "lib#{pkg_name.upcase}"
+        case RbConfig::CONFIG['host_os']
+        when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+          ["#{lib_base}.dll"]
+        when /darwin|mac os/
+          ENV['GKS_WSTYPE'] ||= 'gksqt'
+          ["#{lib_base}.dylib", "#{lib_base}.so"]
+        else
+          ["#{lib_base}.so"]
+        end
+      end
+
+      # Search the shared library and assign it to the given module.
+      def load_library(mod, pkg_name:, lib_names: nil, not_found_error: LoadError)
+        lib_names ||= default_lib_names(pkg_name)
+        lib_path = search(lib_names, pkg_name)
+
+        raise not_found_error, "#{lib_names} not found" if lib_path.nil?
+
+        mod.ffi_lib = lib_path
+      end
+
       # Search the shared library.
       # @note This method does not detect the Operating System.
       #
       # @param lib_names [Array] The actual file name of the shared library.
-      # @param pkg_name [String] The package name to be used when searching with pkg-configg
+      # @param pkg_name [String] The package name to be used when searching with pkg-config
       def search(lib_names, pkg_name)
         # FIXME: There may be a better way to do it...
         def lib_names.map_find(&block)
@@ -70,7 +95,7 @@ module GRCommons
         end
 
         # Windows + RubyInstaller
-        if ruby_installer?
+        if ruby_installer? && lib_path
           RubyInstaller::Runtime.add_dll_directory(File.dirname(lib_path))
           # FIXME: Where should I write this code?
           ENV['GKS_FONTPATH'] ||= grdir

data/lib/gr_commons/version.rb

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

data/lib/grm/ffi.rb

@@ -82,7 +82,7 @@ module GRM
     try_extern 'int grm_plot(const grm_args_t *args)'
     try_extern 'int grm_render(void)'
     try_extern 'int grm_process_tree(void)'
-    try_extern 'int grm_export(const char *file_path)'
+    try_extern 'int grm_export(const char *file_path, int export_xml)'
     try_extern 'int grm_switch(unsigned int id)'
     try_extern 'int grm_get_error_code()'
     try_extern 'int grm_load_graphics_tree(FILE *file)'

data/lib/grm/grmbase.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GRM
-  # This module automatically converts Ruby arrays and Numo::Narray into
+  # This module automatically converts Ruby arrays and Numo::NArray into
   # Fiddley::MemoryPointer.
   module GRMBase
     extend GRCommons::DefineMethods

data/lib/grm.rb

@@ -29,25 +29,9 @@ module GRM
   # Windows   |  bin/libGRM.dll
   # MacOSX    |  lib/libGRM.dylib ( <= v0.53.0 .so)
   # Ubuntu    |  lib/libGRM.so
-  platform = RbConfig::CONFIG['host_os']
-  lib_names, pkg_name = \
-    case platform
-    when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-      [['libGRM.dll'], 'grm']
-    when /darwin|mac os/
-      ENV['GKSwstype'] ||= 'gksqt'
-      [['libGRM.dylib', 'libGRM.so'], 'grm']
-    else
-      [['libGRM.so'], 'grm']
-    end
-
   # On Windows + RubyInstaller,
   # the environment variable GKS_FONTPATH will be set.
-  lib_path = GRCommons::GRLib.search(lib_names, pkg_name)
-
-  raise NotFoundError, "#{lib_names} not found" if lib_path.nil?
-
-  self.ffi_lib = lib_path
+  GRCommons::GRLib.load_library(self, pkg_name: 'grm', not_found_error: NotFoundError)
 
   require_relative 'grm/version'
   require_relative 'grm/ffi'
@@ -111,7 +95,10 @@ module GRM
         GRM.args_push(@args, key, 'i', :int, value)
       when Float
         GRM.args_push(@args, key, 'd', :double, value)
+      when TrueClass, FalseClass
+        GRM.args_push(@args, key, 'i', :int, value ? 1 : 0)
       when Args
+        @references << value
         GRM.args_push(@args, key, 'a', :voidp, value.address)
         value.to_gr.free = nil
       when Array
@@ -138,30 +125,45 @@ module GRM
         case value[0]
         when String
           addresses = value.collect { |v| Fiddle::Pointer[v].to_i }
+          @references.concat(value)
+          packed = addresses.pack('J*')
+          @references << packed
           GRM.args_push(@args, key, 'nS',
                         :int, value.size,
-                        :voidp, addresses.pack('J*'))
-        when Integer
-          GRM.args_push(@args, key, 'nI',
-                        :int, value.size,
-                        :voidp, value.pack('i*'))
-        when Float
+                        :voidp, packed)
+        when Integer, Float
+          if value.all? { |v| v.is_a?(Integer) }
+            packed = value.pack('i*')
+            @references << packed
+            GRM.args_push(@args, key, 'nI',
+                          :int, value.size,
+                          :voidp, packed)
+            return
+          end
+
+          packed = value.map(&:to_f).pack('d*')
+          @references << packed
           GRM.args_push(@args, key, 'nD',
                         :int, value.size,
-                        :voidp, value.pack('d*'))
+                        :voidp, packed)
         when Args
+          @references.concat(value)
+          packed = value.collect(&:address).pack('J*')
+          @references << packed
           GRM.args_push(@args, key, 'nA',
                         :int, value.size,
-                        :voidp, value.collect(&:address).pack('J*'))
+                        :voidp, packed)
           value.each do |v|
             v.to_gr.free = nil
           end
         else
           vs = value.collect { |v| Args.new(**v) }
           @references.concat(vs)
+          packed = vs.collect(&:address).pack('J*')
+          @references << packed
           GRM.args_push(@args, key, 'nA',
                         :int, value.size,
-                        :voidp, vs.collect(&:address).pack('J*'))
+                        :voidp, packed)
           vs.each do |v|
             v.to_gr.free = nil
           end
@@ -213,5 +215,9 @@ module GRM
       args = Args.try_convert(args) || args
       super(args)
     end
+
+    def export(file_path, export_xml = 0)
+      super(file_path, export_xml)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.73.19.1
+  version: 0.73.24.0
 platform: ruby
 authors:
 - kojix2
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.10
 specification_version: 4
 summary: GR for Ruby
 test_files: []