ruby-gr 0.0.5 → 0.0.6

data/lib/gr_commons/gr_common_utils.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'gr_commons/fiddley'
+
 module GRCommons
   # This module provides functionality common to GR and GR3.
   module GRCommonUtils
@@ -7,45 +9,23 @@ module GRCommons
 
     def equal_length(*args)
       lengths = args.map(&:length)
-      raise ArgumentError, 'Sequences must have same length.' unless lengths.all? { |l| l == lengths[0] }
+      unless lengths.all? { |l| l == lengths[0] }
+        raise ArgumentError,
+              'Sequences must have same length.'
+      end
 
       lengths[0]
     end
 
-    def uint8(data)
-      data = data.to_a.flatten
-      pt = ::FFI::MemoryPointer.new(:uint8, data.size)
-      pt.write_array_of_uint8 data
-    end
-
-    def uint16(data)
-      data = data.to_a.flatten
-      pt = ::FFI::MemoryPointer.new(:uint16, data.size)
-      pt.write_array_of_uint16 data
-    end
-
-    def int(data)
-      data = data.to_a.flatten
-      pt = ::FFI::MemoryPointer.new(:int, data.size)
-      pt.write_array_of_int data
-    end
-
-    def uint(data)
-      data = data.to_a.flatten
-      pt = ::FFI::MemoryPointer.new(:uint, data.size)
-      pt.write_array_of_uint data
-    end
-
-    def double(data)
-      data = data.to_a.flatten
-      pt = ::FFI::MemoryPointer.new(:double, data.size)
-      pt.write_array_of_double data
-    end
+    SUPPORTED_TYPES = %i[uint8 uint16 int uint double float].freeze
 
-    def float(data)
-      data = data.to_a.flatten
-      pt = ::FFI::MemoryPointer.new(:float, data.size)
-      pt.write_array_of_float data
+    # NOTE: The following method converts Ruby Array or NArray into packed string.
+    SUPPORTED_TYPES.each do |type|
+      define_method(type) do |data|
+        # FIXME: Use NArray#to_string
+        data = data.to_a.flatten
+        Fiddley::Utils.array2str(type, data)
+      end
     end
 
     def inquiry_int(&block)
@@ -63,9 +43,9 @@ module GRCommons
     def inquiry(types)
       case types
       when Hash, Symbol
-        pt = create_ffi_pointer(types)
-        yield(pt)
-        read_ffi_pointer(pt, types)
+        ptr = create_ffi_pointer(types)
+        yield(ptr)
+        read_ffi_pointer(ptr, types)
       when Array
         pts = types.map { |type| create_ffi_pointer(type) }
         yield(*pts)
@@ -80,9 +60,9 @@ module GRCommons
       when Hash
         typ = type.keys[0]
         len = type.values[0]
-        ::FFI::MemoryPointer.new(typ, len)
+        Fiddley::MemoryPointer.new(typ, len)
       else
-        ::FFI::MemoryPointer.new(type)
+        Fiddley::MemoryPointer.new(type)
       end
     end
 
@@ -102,12 +82,3 @@ module GRCommons
     end
   end
 end
-
-# Ruby 2.4.0 introduces Comparable#clamp
-if RUBY_VERSION.to_f <= 2.3
-  class Numeric
-    def clamp(min, max)
-      [[self, max].min, min].max
-    end
-  end
-end

data/lib/gr_commons/jupyter_support.rb

@@ -24,8 +24,11 @@ module GRCommons
         when 'webm', 'ogg', 'mp4', 'mov'
           require 'base64'
           data = File.binread(ENV['GKS_FILEPATH'] + '.' + type)
-          IRuby.display("<video controls autoplay type=\"video/#{type}\" src=\"data:video/#{type};base64,#{Base64.encode64(data)}\">",
-                        mime: 'text/html')
+          IRuby.display(
+            "<video controls autoplay type=\"video/#{type}\" " \
+            "src=\"data:video/#{type};base64,#{Base64.encode64(data)}\">",
+            mime: 'text/html'
+          )
         end
         nil
       end

data/lib/gr_commons/version.rb

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ruby-gr
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: histogram
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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: test-unit
+  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: wavefile
   requirement: !ruby/object:Gem::Requirement
@@ -133,18 +147,21 @@ files:
 - lib/gr.rb
 - 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
 - lib/gr3/gr3base.rb
 - lib/gr3/version.rb
 - lib/gr_commons.rb
-- lib/gr_commons/attach_function.rb
 - lib/gr_commons/define_methods.rb
+- lib/gr_commons/extern.rb
+- lib/gr_commons/fiddley.rb
 - lib/gr_commons/gr_common_utils.rb
 - lib/gr_commons/jupyter_support.rb
 - lib/gr_commons/version.rb
-homepage: https://github.com/kojix2/GR.rb
+homepage: https://github.com/red-data-tools/GR.rb
 licenses:
 - MIT
 metadata: {}
@@ -156,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/gr_commons/attach_function.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module GRCommons
-  # This module modifies the behavior of the attach_function method.
-  module AttachFunction
-    # Remember added method name
-    def attach_function(name, *args)
-      @ffi_methods ||= []
-      @ffi_methods << name
-      super(name, *args)
-    end
-
-    attr_reader :ffi_methods
-  end
-end