ruby-gr 0.0.23 → 0.0.24

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)
+              GRCommons::GRCommonUtils.public_send(default_type, arg)
             when ->(x) { defined?(Numo::NArray) && x.is_a?(Numo::NArray) }
-              GRCommons::GRCommonUtils.send(default_type, arg)
+              GRCommons::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.
@@ -43,7 +43,7 @@ module GRCommons
       if narray?(data)
         Numo::Int32.cast(data).to_binary
       else
-        Fiddley::Utils.array2str(:int32, data.to_a.flatten)
+        Fiddley::Utils.array2str(:int32, data.to_a.flatten) # TODO
       end
     end
 
@@ -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(:uint, data.to_a.flatten) # TODO
       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_logger.rb

@@ -0,0 +1,106 @@
+# 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 'rainbow'
+require 'awesome_print'
+
+module GRCommons
+  class << self
+    # Create a new GRLogger
+    # @params 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
+
+  # Outputs function calls to GR Framework to a log file.
+  # Mainly used for debugging.
+  # @note This module is for those who want to see low-level function calls in GR.
+  #
+  # = How it works　
+  # 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.gr_log("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
+
+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.ai + "\n"
+            super(*args)
+          end
+        end
+      end
+      class << self
+        prepend Inspector
+      end
+    end
+  end
+end
+
+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.ai + "\n"
+            super(*args)
+          end
+        end
+      end
+      class << self
+        prepend Inspector
+      end
+    end
+  end
+end
+
+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.ai + "\n"
+            super(*args)
+          end
+        end
+      end
+      class << self
+        prepend Inspector
+      end
+    end
+  end
+end

data/lib/gr_commons/jupyter_support.rb

@@ -19,16 +19,16 @@ module GRCommons
         type = ENV['GKSwstype']
         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/search_shared_library.rb

@@ -54,10 +54,11 @@ module GRCommons
 
     def recursive_search(name, base_dir)
       Dir.chdir(base_dir) do
-        if path = Dir["**/#{name}"].first # FIXME
+        path = Dir["**/#{name}"].first # FIXME
+        if path
           File.expand_path(path)
         else
-          raise StandardError "#{name} not found in #{base_dir}"
+          raise "#{name} not found in #{base_dir}"
         end
       end
     end

data/lib/gr_commons/version.rb

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

data/lib/grm/ffi.rb

@@ -42,7 +42,6 @@ module GRM
     # https://github.com/sciapp/gr/blob/master/lib/grm/interaction.h
     try_extern 'int grm_input(const grm_args_t *input_args)'
     try_extern 'int grm_get_box(const int x1, const int y1, const int x2, const int y2, const int keep_aspect_ratio, int *x, int *y, int *w, int *h)'
-    try_extern 'grm_input(const grm_args_t *input_args)'
     try_extern 'grm_tooltip_info_t *grm_get_tooltip(const int, const int)'
 
     # https://github.com/sciapp/gr/blob/master/lib/grm/net.h

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: histogram
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fiddle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +148,6 @@ files:
 - lib/gr/ffi.rb
 - lib/gr/grbase.rb
 - lib/gr/plot.rb
-- lib/gr/plot.rb.md
 - lib/gr/version.rb
 - lib/gr3.rb
 - lib/gr3/ffi.rb
@@ -173,6 +158,7 @@ files:
 - lib/gr_commons/fiddley.rb
 - lib/gr_commons/gr_common_utils.rb
 - lib/gr_commons/gr_commons.rb
+- lib/gr_commons/gr_logger.rb
 - lib/gr_commons/jupyter_support.rb
 - lib/gr_commons/search_shared_library.rb
 - lib/gr_commons/version.rb
@@ -200,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: GR for Ruby

data/lib/gr/plot.rb.md

@@ -1,172 +0,0 @@
-This is a memo to think about the structure of Plot/Figure. 
-
-````ruby
-
-module GR
-  # object oriented way
-  class PlotBase
-  end
-
-  class Line < PlotBase
-  end
-
-  class << self
-    def set_viewport; end
-
-    def minmax; end
-
-    def set_window; end
-
-    def draw_axes; end
-
-    def draw_polar_axes; end
-
-    def _inqtext; end
-
-    def _text; end
-
-    def draw_legend; end
-
-    def draw_colorbar; end
-
-    def colormap; end
-
-    def to_rgba; end
-
-    # Ruby is object-oriented language.
-    # Julia is more functional...
-    # def create_context
-    # end
-    # def restore_context
-    # end
-    # def figure
-    # end
-
-    # def hold
-    # end
-    # def usecolorscheme
-    # end
-
-    # Set current subplot index.
-    def subplot; end
-
-    # draw_grid
-
-    # xticks
-    # yticks
-    # zticks
-
-    # xticklabels
-    # yticklabels
-
-    def plot_img; end # should be private?
-
-    def plot_iso; end # should be private?
-
-    def plot_polar; end # should be private?
-
-    # send_meta
-
-    def plot_data; end # should be private?
-
-    def plot_args; end # should be private?
-
-    # Draw one or more line plots.
-    def plot; end
-
-    # def plot_line_over oplot_line ?
-
-    # Draw one or more step or staircase plots.
-    def step; end
-
-    # Draw one or more scatter plots.
-    def scatter; end
-
-    # Draw a stem plot.
-    def stem; end
-
-    # Draw a bar plot.
-    def barplot; end
-
-    def hist; end # should be private?
-
-    # Draw a histogram.
-    def histgram; end
-
-    # Draw a polar histogram.
-    def polarhistogram; end
-
-    # Draw a contour plot.
-    def contour; end
-    # GR.contour is already defined in GR::FFI class.
-
-    # Draw a filled contour plot.
-    def contourf; end
-    # GR.contourf is already defined in GR::FFI class.
-
-    # Draw a hexagon binning plot.
-    def hexbin; end
-    # GR.hexbin is already defined in GR::FFI class.
-
-    # Draw a heatmap.
-    def heatmap; end
-
-    def polarheatmap; end
-
-    # Draw a three-dimensional wireframe plot.
-    def wireframe; end
-
-    # Draw a three-dimensional surface plot.
-    def surface; end
-
-    def volume; end
-
-    # Draw one or more three-dimensional line plots.
-    def plot3; end
-
-    # Draw one or more three-dimensional scatter plots.
-    def scatter3; end
-
-    def redraw; end
-
-    def title; end
-
-    def xlabel; end
-
-    def ylabel; end
-
-    def legend; end
-
-    def xlim; end
-
-    def ylim; end
-
-    def savefig; end
-
-    def meshgrid; end # should be private ?
-
-    def peaks; end # should be private ?
-
-    def imshow; end
-
-    # Draw an isosurface.
-    def isosurface; end
-
-    # Draw one or more polar plots.
-    def polar; end
-
-    # Draw a triangular surface plot.
-    def trisurf; end
-
-    # Draw a triangular contour plot.
-    def tricont; end
-
-    def shade; end
-
-    # def set_panzoom ?
-
-    # mainloop
-  end
-end
-
-```