ruby-gr 0.0.23 → 0.58.1.0

data/lib/gr3/ffi.rb

@@ -15,7 +15,7 @@ module GR3
       raise LoadError, 'Could not find GR Framework'
     end
 
-    extend GRCommons::Extern
+    extend GRCommons::TryExtern
 
     # https://github.com/sciapp/gr/blob/master/lib/gr3/gr3.h
     # keep same order
@@ -138,5 +138,7 @@ module GR3
     # try_extern 'void gr3_drawtrianglesurface(int n, const float *triangles)'
     try_extern 'void gr_volume(int nx, int ny, int nz, double *data, ' \
            'int algorithm, double *dmin_ptr, double *dmax_ptr)'
+    try_extern 'void gr3_setorthographicprojection' \
+           '(float left, float right, float bottom, float top, float znear, float zfar)'
   end
 end

data/lib/gr_commons/define_methods.rb

@@ -5,8 +5,8 @@ module GRCommons
   module DefineMethods
     private
 
-    def define_ffi_methods(ffi_class, prefix: '', default_type: :double)
-      ffi_class.ffi_methods.each do |method|
+    def define_ffi_methods(ffi_module, prefix: '', default_type: :double)
+      ffi_module.ffi_methods.each do |method|
         # Use delete_prefix (Ruby >= 2.5)
         method_name = method.to_s.sub(/^#{prefix}/, '')
 
@@ -16,14 +16,14 @@ module GRCommons
           args.map! do |arg|
             case arg
             when Array
-              GRCommons::GRCommonUtils.send(default_type, arg)
+              GRCommonUtils.public_send(default_type, arg)
             when ->(x) { defined?(Numo::NArray) && x.is_a?(Numo::NArray) }
-              GRCommons::GRCommonUtils.send(default_type, arg)
+              GRCommonUtils.public_send(default_type, arg)
             else
               arg
             end
           end
-          ffi_class.send(method, *args)
+          ffi_module.public_send(method, *args)
         end
       end
     end

data/lib/gr_commons/fiddley.rb

@@ -210,7 +210,7 @@ module GRCommons
         end
 
         define_method("put_array_of_int#{bits}") do |offset, ary|
-          put_bytes(offset, ary.pack(form + '*'))
+          put_bytes(offset, ary.pack("#{form}*"))
         end
 
         define_method("write_array_of_int#{bits}") do |ary|
@@ -226,7 +226,7 @@ module GRCommons
         end
 
         define_method("get_array_of_int#{bits}") do |offset, num|
-          @ptr[offset, bytes * num].unpack(form + '*')
+          @ptr[offset, bytes * num].unpack("#{form}*")
         end
 
         define_method("read_array_of_int#{bits}") do |num|
@@ -244,7 +244,7 @@ module GRCommons
         end
 
         define_method("put_array_of_uint#{bits}") do |offset, ary|
-          put_bytes(offset, ary.pack(form2 + '*'))
+          put_bytes(offset, ary.pack("#{form2}*"))
         end
 
         define_method("write_array_of_uint#{bits}") do |ary|
@@ -260,7 +260,7 @@ module GRCommons
         end
 
         define_method("get_array_of_uint#{bits}") do |offset, num|
-          @ptr[offset, bytes * num].unpack(form2 + '*')
+          @ptr[offset, bytes * num].unpack("#{form2}*")
         end
 
         define_method("read_array_of_uint#{bits}") do |num|
@@ -330,12 +330,12 @@ module GRCommons
 
       # added
       define_method('get_array_of_double') do |offset, num|
-        @ptr[offset, 8 * num].unpack('d' + '*')
+        @ptr[offset, 8 * num].unpack('d*')
       end
 
       # added
       define_method('get_array_of_float') do |offset, num|
-        @ptr[offset, 4 * num].unpack('f' + '*')
+        @ptr[offset, 4 * num].unpack('f*')
       end
 
       # added

data/lib/gr_commons/gr_common_utils.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gr_commons/fiddley'
+require_relative 'fiddley'
 
 module GRCommons
   # This module provides functionality common to GR and GR3.
@@ -52,7 +52,7 @@ module GRCommons
       if narray?(data)
         Numo::UInt32.cast(data).to_binary
       else
-        Fiddley::Utils.array2str(:uint, data.to_a.flatten)
+        Fiddley::Utils.array2str(:uint32, data.to_a.flatten)
       end
     end
 
@@ -117,9 +117,9 @@ module GRCommons
       when Hash
         typ = type.keys[0]
         len = type.values[0]
-        pt.send("read_array_of_#{typ}", len)
+        pt.public_send("read_array_of_#{typ}", len)
       else
-        pt.send("read_#{type}")
+        pt.public_send("read_#{type}")
       end
     end
 

data/lib/gr_commons/gr_commons.rb

@@ -7,8 +7,8 @@ end
 # Change the default encoding to UTF-8.
 ENV['GKS_ENCODING'] ||= 'utf8'
 
-require_relative 'search_shared_library'
-require_relative 'extern'
+require_relative 'gr_lib'
+require_relative 'try_extern'
 require_relative 'define_methods'
 require_relative 'gr_common_utils'
 require_relative 'jupyter_support'

data/lib/gr_commons/gr_lib.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'pkg-config'
+
+module GRCommons
+  # This module helps GR, GR and GRM to search the shared library.
+  #
+  # The order of priority:
+  # 1. RubyInstaller ( for Windows only )
+  # 2. Environment variable GRDIR
+  # 3. pkg-config : https://github.com/ruby-gnome/pkg-config
+  # The following packages (should) support pkg-config.
+  # - Linux
+  #   - Red Data Tools https://github.com/red-data-tools/packages.red-data-tools.org
+  #     - libgr-dev
+  #     - libgr3-dev
+  #     - libgrm-dev
+  # - Mac
+  #   - Homebrew https://github.com/Homebrew/homebrew-core
+  #     - libgr
+  # - Windows
+  #   - MinGW https://github.com/msys2/MINGW-packages
+  #     - mingw-w64-gr
+  module GRLib
+    class << self
+      # Check if using RubyInstaller or not.
+      def ruby_installer?
+        Object.const_defined?(:RubyInstaller)
+      end
+
+      # Return the directory path from the GRDIR environment variable.
+      def get_grdir_from_env(lib_names)
+        return nil unless ENV['GRDIR']
+        return ENV['GRDIR'] if Dir.exist?(ENV['GRDIR'])
+
+        warn "#{lib_names} : Dir GRDIR=#{ENV['GRDIR']} not found." # return nil
+      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
+      def search(lib_names, pkg_name)
+        # FIXME: There may be a better way to do it...
+        def lib_names.map_find(&block)
+          lazy.map(&block).find { |path| path }
+        end
+
+        # ENV['GRDIR']
+        # Verify that the directory exists.
+        grdir = get_grdir_from_env(lib_names)
+
+        # Windows + RubyInstaller
+        if ruby_installer?
+          grdir ||= File.join(RubyInstaller::Runtime.msys2_installation.msys_path,
+                              RubyInstaller::Runtime.msys2_installation.mingwarch)
+        end
+
+        # Search grdir
+        if grdir
+          lib_path = lib_names.map_find do |lib_name|
+            recursive_search(lib_name, grdir)
+          end
+        end
+
+        # Search with pkg-config
+        lib_path ||= lib_names.map_find do |lib_name|
+          pkg_config_search(lib_name, pkg_name)
+        end
+
+        # Windows + RubyInstaller
+        if ruby_installer?
+          RubyInstaller::Runtime.add_dll_directory(File.dirname(lib_path))
+          # FIXME: Where should I write this code?
+          ENV['GKS_FONTPATH'] ||= grdir
+        end
+
+        lib_path
+      end
+
+      # Recursive file search in directories
+      # @param name [String] File to search for
+      # @param base_dir [String] Directory to search
+      # @return path [String, NilClass] Returns the first path found.
+      #                                 If not found, nil is returned.
+      def recursive_search(name, base_dir)
+        Dir.chdir(base_dir) do
+          paths = Dir["**/#{name}"].sort
+          warn "More than one file found: #{paths}" if paths.size > 1
+          path = paths.first
+          File.expand_path(path) if path
+        end
+      end
+
+      # Use pkg-config to search for shared libraries
+      def pkg_config_search(lib_name, pkg_name)
+        PKGConfig.variable(pkg_name, 'sopath')
+      rescue PackageConfig::NotFoundError => e
+        warn "#{e.message} Cannot find #{lib_name}. "
+      end
+    end
+  end
+end

data/lib/gr_commons/gr_logger.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+# This script was created primarily for debugging purposes.
+# Note: This script should be isolated.
+# It should not be loaded when gr_commons/gr_commons is loaded.
+
+require 'logger'
+require 'pp'
+
+module GRCommons
+  # Convenience class methods
+
+  class << self
+    # Create a new GRLogger
+    # @param out [String]
+    # @return [GRLogger]
+    # @example
+    #   require 'gr_commons/gr_logger'
+    #   GRCommons.gr_log("log.txt")
+
+    def gr_log(out = $stderr)
+      GRCommons::GRLogger.new(out)
+    end
+
+    # Return the last created GRLogger
+    # @return [GRLogger]
+
+    def gr_logger
+      GRCommons::GRLogger.logger
+    end
+  end
+
+  # If GR.rb call native functions of the GR framework,
+  # it will be recorded in the log file.
+  #
+  # @note Mainly used by developers for debugging.
+  #
+  # = How it works　
+  # It prepend a module named Inspector to the singular class of the FFI module.
+  # It will inspects the GR function call of the FFI module
+  #
+  # @example
+  #   require 'gr_commons/gr_logger'
+  #   GRCommons::GRLogger.new("log.txt")
+
+  class GRLogger < Logger
+    # Return the last created GRLogger
+
+    def self.logger
+      @@logger ||= GRCommons::GRLogger.new
+    end
+
+    def initialize(out = $stderr)
+      super(out, level: :info)
+      @@logger ||= self
+    end
+  end
+end
+
+# GR
+
+if Object.const_defined?(:GR)
+  module GR
+    module FFI
+      module Inspector
+        GR::FFI.ffi_methods.each do |s|
+          define_method(s) do |*args|
+            GRCommons.gr_logger.info "GR::FFI.#{s}\n#{args.pretty_inspect}\n"
+            super(*args)
+          end
+        end
+      end
+      class << self
+        prepend Inspector
+      end
+    end
+  end
+end
+
+# GR3
+
+if Object.const_defined?(:GR3)
+  module GR3
+    module FFI
+      module Inspector
+        GR3::FFI.ffi_methods.each do |s|
+          define_method(s) do |*args|
+            GRCommons.gr_logger.info "GR3::FFI.#{s}\n#{args.pretty_inspect}\n"
+            super(*args)
+          end
+        end
+      end
+      class << self
+        prepend Inspector
+      end
+    end
+  end
+end
+
+# GRM
+
+if Object.const_defined?(:GRM)
+  module GRM
+    module FFI
+      module Inspector
+        GRM::FFI.ffi_methods.each do |s|
+          define_method(s) do |*args|
+            GRCommons.gr_logger.info "GRM::FFI.#{s}\n#{args.pretty_inspect}\n"
+            super(*args)
+          end
+        end
+      end
+      class << self
+        prepend Inspector
+      end
+    end
+  end
+end

data/lib/gr_commons/jupyter_support.rb

@@ -8,7 +8,7 @@ module GRCommons
       # Sets the environment variable when the module is extended.
       def self.extended(_obj)
         require 'tmpdir'
-        ENV['GKSwstype'] = 'svg'
+        ENV['GKS_WSTYPE'] = 'svg'
         ENV['GKS_FILEPATH'] = Dir::Tmpname.create('plot-') {}
       end
 
@@ -16,19 +16,19 @@ module GRCommons
       def show(display = true)
         emergencyclosegks
         sleep 0.5
-        type = ENV['GKSwstype']
+        type = ENV['GKS_WSTYPE']
         case type
         when 'svg'
-          data = File.read(ENV['GKS_FILEPATH'] + '.svg')
+          data = File.read("#{ENV['GKS_FILEPATH']}.svg")
           IRuby.display(data, mime: 'image/svg+xml') if display
         when 'png', '322', '140'
-          data = File.read(ENV['GKS_FILEPATH'] + '.png')
+          data = File.read("#{ENV['GKS_FILEPATH']}.png")
           IRuby.display(data, mime: 'image/png') if display
         when 'jpg', '321', '144'
-          data = File.read(ENV['GKS_FILEPATH'] + '.jpg')
+          data = File.read("#{ENV['GKS_FILEPATH']}.jpg")
           IRuby.display(data, mime: 'image/jpeg') if display
         when 'gif', '130'
-          data = File.read(ENV['GKS_FILEPATH'] + '.gif')
+          data = File.read("#{ENV['GKS_FILEPATH']}.gif")
           IRuby.display(data, mime: 'image/gif') if display
         when 'webm', 'ogg', 'mp4', 'mov'
           require 'base64'
@@ -37,7 +37,7 @@ module GRCommons
                      else
                        "video/#{type}"
                      end
-          data = File.binread(ENV['GKS_FILEPATH'] + '.' + type)
+          data = File.binread("#{ENV['GKS_FILEPATH']}.#{type}")
           if display
             IRuby.display(
               "<video autoplay controls><source type=\"#{mimespec}\" " \

data/lib/gr_commons/{extern.rb → try_extern.rb}

@@ -2,7 +2,7 @@
 
 module GRCommons
   # This module records the names of the methods defined by Fiddle::Importer.
-  module Extern
+  module TryExtern
     attr_reader :ffi_methods
 
     # Improved extern method.

data/lib/gr_commons/version.rb

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

data/lib/grm.rb

@@ -17,23 +17,36 @@ end
 module GRM
   class Error < StandardError; end
 
+  class NotFoundError < Error; end
+
   class << self
     attr_accessor :ffi_lib
   end
 
   require_relative 'gr_commons/gr_commons'
-  extend GRCommons::SearchSharedLibrary
 
   # Platforms |  path
   # Windows   |  bin/libGRM.dll
-  # MacOSX    |  lib/libGRM.so (NOT .dylib)
+  # MacOSX    |  lib/libGRM.dylib ( <= v0.53.0 .so)
   # Ubuntu    |  lib/libGRM.so
-  self.ffi_lib = case RbConfig::CONFIG['host_os']
-                 when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-                   search_shared_library('libGRM.dll', 'grm')
-                 else
-                   search_shared_library('libGRM.so', 'grm')
-                 end
+  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/
+      [['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
 
   require_relative 'grm/version'
   require_relative 'grm/ffi'