libui 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a70af9cdc5c6bdd0ff971474bfc3e7c7facaf9e3cd04af4375d40953e3827b7d
-  data.tar.gz: 19b9c62a9003a5a097ff1643a783fa3a9bb72d36c06e1eb65f361d7679f51398
+  metadata.gz: 02ee9e67a91414cbea40a50448a58bbb320f8962f34a35fa9c26d7ed0019878d
+  data.tar.gz: cfde88b2432abbf23f9dd0d195db0258c143bfd1ff339f51b3112ccaf4742af2
 SHA512:
-  metadata.gz: 9df4e5b0fb7a71c02b9b8715ebecf02cf0367829448d959ed1bd89fca65fd40fa51db37ee38b58546d60edb33c03719a183116f64fd95149081de711d095b9cb
-  data.tar.gz: 27daac95b0cc02f44ca94b9ea11e3f91ef983806a1bef3319689d4dc60596f600d0673369fe165fe6e01470dae61dcf4ba6f6c80fd0cc5df5cf26c291a547466
+  metadata.gz: cb131ab13e11e6573058c0ec611c7467557756904b49d4121541f4075518958d3fdf2adc74e21d52f0f433c537faeffd6a77ab4162f7d42321fdec75437d1be0
+  data.tar.gz: 0dc6139433b79bec3e0a096f376db6af7eedc6b989ccab25bf4d3a1123afc75d053d43625d5302122952b2a527a8a17665ec9bc1472c1574f5ae4262bef80197

data/README.md

@@ -1,4 +1,4 @@
-# libui
+# LibUI
 
 ![build](https://github.com/kojix2/libui/workflows/build/badge.svg)
 [![Gem Version](https://badge.fury.io/rb/libui.svg)](https://badge.fury.io/rb/libui)

data/lib/libui.rb

@@ -41,14 +41,23 @@ module LibUI
           if arg.is_a?(Proc)
             # The types of the function arguments are recorded beforehand.
             # See the monkey patch in ffi.rb.
-            Fiddle::Closure::BlockCaller.new(*func.inner_functions[idx][1..2], &arg)
+            callback = Fiddle::Closure::BlockCaller.new(
+              *func.callback_argument_types[idx][1..2], &arg
+            )
+            # Protect from GC
+            # See https://github.com/kojix2/LibUI/issues/8
+            receiver = args[0]
+            callbacks = receiver.instance_variable_get(:@callbacks) || []
+            callbacks << callback
+            receiver.instance_variable_set(:@callbacks, callback)
+            callback
           else
             arg
           end
         end
 
         # Make it possible to omit the last nil. This may be an over-optimization.
-        siz = func.argtype.size - 1
+        siz = func.argument_types.size - 1
         args[siz] = nil if args.size == siz
 
         FFI.public_send(original_method_name, *args)

data/lib/libui/ffi.rb

@@ -4,9 +4,11 @@ require 'fiddle/import'
 
 module Fiddle
   # Change the Function to hold a little more information.
-  # FIXME: Give inner_function a better name.
   class Function
-    attr_accessor :inner_functions, :argtype
+    # Note:
+    # Ruby 2.7 Fiddle::Function dose not have @argument_types
+    # Ruby 3.0 Fiddle::Function has @argument_types
+    attr_accessor :callback_argument_types, :argument_types
   end
 
   module Importer
@@ -21,32 +23,34 @@ module Fiddle
                             raise("can't parserake the function prototype: #{signature}")
                           end
       symname = func
-      inner_funcs = []                                                    # Added
-      argtype = split_arguments(args).collect.with_index do |arg, idx|    # Added with_index
+      callback_argument_types = {}                                              # Added
+      argtype = split_arguments(args).collect.with_index do |arg, idx|          # Added with_index
         # Check if it is a function pointer or not
-        if arg =~ /\(\*.*\)\(.*\)/ # Added
+        if arg =~ /\(\*.*\)\(.*\)/                                              # Added
           # From the arguments, create a notation that looks like a function declaration
           # int(*f)(int *, void *) -> int f(int *, void *)
-          func_arg = arg.sub('(*', ' ').sub(')', '') # Added
+          func_arg = arg.sub('(*', ' ').sub(')', '')                            # Added
           # Use Fiddle's parse_signature method again.
-          inner_funcs[idx] = parse_signature(func_arg)                    # Added
-        end                                                               # Added
+          callback_argument_types[idx] = parse_signature(func_arg)              # Added
+        end
         parse_ctype(arg, tymap)
       end
-      # Added inner_funcs. Original method return only 3 values.
-      [symname, ctype, argtype, inner_funcs]
+      # Added callback_argument_types. Original method return only 3 values.
+      [symname, ctype, argtype, callback_argument_types]
     end
 
     def extern(signature, *opts)
-      symname, ctype, argtype, inner_funcs = parse_signature(signature, type_alias)
+      symname, ctype, argtype, callback_argument_types = parse_signature(signature, type_alias)
       opt = parse_bind_options(opts)
-      f = import_function(symname, ctype, argtype, opt[:call_type])
+      func = import_function(symname, ctype, argtype, opt[:call_type])
 
-      f.inner_functions = inner_funcs # Added
-      f.argtype         = argtype     # Added
+      func.callback_argument_types = callback_argument_types                    # Added
+      # Ruby 2.7 Fiddle::Function dose not have @argument_types
+      # Ruby 3.0 Fiddle::Function has @argument_types
+      func.argument_types = argtype
 
       name = symname.gsub(/@.+/, '')
-      @func_map[name] = f
+      @func_map[name] = func
       # define_method(name){|*args,&block| f.call(*args,&block)}
       begin
         /^(.+?):(\d+)/ =~ caller.first
@@ -61,7 +65,7 @@ module Fiddle
         end
       EOS
       module_function(name)
-      f
+      func
     end
   end
 end

data/lib/libui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LibUI
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libui
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-26 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to libui