gir_ffi 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8d94670dbb092ece3c0225fe0c77a7457396df6e9c2fea40d11dabe5a4a2a55
-  data.tar.gz: f6e93738320b337279fbad487ea40996f4e99c40a90c892ae1c9d7836f89adff
+  metadata.gz: 2ee5f86f4d4106139b51edf6855aa3a84bff5437b728dac4c0b878a61bbf86ea
+  data.tar.gz: de0aef98573ba69d41ffa094d08f576977928e6e55598586cf07c08c9c38da6f
 SHA512:
-  metadata.gz: 39265520b4755ffd62d8e065ff07793cc3dbb086d9062c12c06210cd85b2586b03838a931154175773aecb70cbae9e3a0c59ff08dfef63588d983c159688c5fb
-  data.tar.gz: 5e9e9cdd8c21b416279afea10bc7283497d5c52010497e45142a5aa40098d7680e430afacf6fecea61e7ac2720224fcb9fe34a2f74588dbe77af9aa6c0a4ae76
+  metadata.gz: 57de8a0753d8add11635ca497712988aa16507312d719bdc6ed7c8f63a707275622b73c1d968e742d13ba96094fe253baf6d60076dd186683851479cffa8cbe2
+  data.tar.gz: abc9d12f2590a325ab3d8deb087cc4dcf4f5e1eccf0a4dd2f74f48c50553c3b63c19cd799661830da3c13850d50b32cdcb6113ebfb0569b15e7875796a7287ed

data/Changelog.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.15.3 / 2020-06-14
+
+* Officially support Ruby 2.7
+* Officially drop support for Ruby 2.4
+* Store classes representing inline callback types in the class that defines
+  them instead of in the main namespace, thus avoiding some potential name
+  clashes
+* Update development dependencies
+* Various code quality improvements
+* Record approved licenses for dependencies
+
 ## 0.15.2 / 2019-11-29
 
 * Load girepository-1.0 library in a way that does not require installing a

data/Gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 # The gem's dependencies are specified in gir_ffi.gemspec
 gemspec
 
-gem "pry", "~> 0.12.0"
+gem "pry", "~> 0.13.0"
 gem "ruby-prof", platform: :mri
 gem "test-prof", platform: :mri
 

data/lib/ffi-gobject/value.rb

@@ -179,7 +179,9 @@ module GObject
     end
 
     def check_type_compatibility(val)
-      return if GObject::Value.type_compatible(GObject.type_from_instance(val), current_gtype)
+      if GObject::Value.type_compatible(GObject.type_from_instance(val), current_gtype)
+        return
+      end
 
       raise ArgumentError, "#{val.class} is incompatible with #{current_gtype_name}"
     end

data/lib/ffi-gobject_introspection/i_base_info.rb

@@ -107,10 +107,10 @@ module GObjectIntrospection
       namespace.sub(/^[a-z]/, &:upcase)
     end
 
-    # TODO: Avoid calling for IStructInfo
     def container
       @container ||= begin
                        ptr = Lib.g_base_info_get_container self
+                       return if ptr.null?
                        Lib.g_base_info_ref ptr
                        IRepository.wrap_ibaseinfo_pointer ptr
                      end

data/lib/gir_ffi/builder_helper.rb

@@ -12,7 +12,12 @@ module GirFFI
     end
 
     def get_or_define_class(namespace, name, parent)
-      optionally_define_constant(namespace, name) { Class.new parent }
+      klass = optionally_define_constant(namespace, name) { Class.new parent }
+      unless klass.superclass == parent
+        raise "Expected superclass #{parent}, found #{klass.superclass}"
+      end
+
+      klass
     end
 
     def get_or_define_module(parent, name)

data/lib/gir_ffi/builders/callback_builder.rb

@@ -23,7 +23,19 @@ module GirFFI
       end
 
       def klass
-        @klass ||= get_or_define_class namespace_module, @classname, CallbackBase
+        @klass ||= get_or_define_class container_module, @classname, CallbackBase
+      end
+
+      def container_module
+        @container_module ||=
+          if @info.container
+            type_info = @info.container
+            field_info = type_info.container
+            container_class_info = field_info.container
+            namespace_module.const_get container_class_info.safe_name
+          else
+            namespace_module
+          end
       end
 
       def mapping_method_definition

data/lib/gir_ffi/builders/enum_builder.rb

@@ -16,7 +16,7 @@ module GirFFI
       end
 
       def value_spec
-        info.values.map do |vinfo|
+        value_infos.map do |vinfo|
           val = GirFFI::ArgHelper.cast_uint32_to_int32(vinfo.value)
           [vinfo.name.to_sym, val]
         end.flatten
@@ -42,7 +42,7 @@ module GirFFI
       end
 
       def setup_value_constants
-        info.values.each do |vinfo|
+        value_infos.each do |vinfo|
           optionally_define_constant klass, vinfo.constant_name do
             vinfo.value
           end
@@ -64,6 +64,10 @@ module GirFFI
       def superclass
         EnumBase
       end
+
+      def value_infos
+        @value_infos ||= info.values
+      end
     end
   end
 end

data/lib/gir_ffi/builders/field_builder.rb

@@ -58,7 +58,8 @@ module GirFFI
         private
 
         def pointer_to_value_conversion
-          PointerValueConvertor.new(field_type_tag).pointer_to_value(field_ptr, field_offset)
+          PointerValueConvertor.new(field_type_tag)
+            .pointer_to_value(field_ptr, field_offset)
         end
 
         def field_offset

data/lib/gir_ffi/builders/module_builder.rb

@@ -88,7 +88,9 @@ module GirFFI
         lib.extend FFI::Library
         lib.extend FFI::BitMasks
         lib.ffi_lib_flags :global, :lazy
-        lib.ffi_lib(*shared_library_specification.split(/,/)) if shared_library_specification
+        if shared_library_specification
+          lib.ffi_lib(*shared_library_specification.split(/,/))
+        end
       end
 
       def shared_library_specification

data/lib/gir_ffi/builders/struct_builder.rb

@@ -16,7 +16,9 @@ module GirFFI
 
       def superclass
         # HACK: Inheritance chain is not expressed in GObject's code correctly.
-        return GObject::ObjectClass if info.full_type_name == "GObject::InitiallyUnownedClass"
+        if info.full_type_name == "GObject::InitiallyUnownedClass"
+          return GObject::ObjectClass
+        end
         return parent_field_type.tag_or_class if info.gtype_struct?
         return BoxedBase if GObject.type_fundamental(info.gtype) == GObject::TYPE_BOXED
 

data/lib/gir_ffi/callback_base.rb

@@ -57,11 +57,9 @@ module GirFFI
       return unless prc
 
       new do |*args|
-        begin
-          call_with_argument_mapping(prc, *args)
-        rescue StandardError => e
-          GLib::MainLoop.handle_exception e
-        end
+        call_with_argument_mapping(prc, *args)
+      rescue StandardError => e
+        GLib::MainLoop.handle_exception e
       end
     end
 

data/lib/gir_ffi/class_base.rb

@@ -18,6 +18,7 @@ module GirFFI
     GIR_FFI_BUILDER = Builders::NullClassBuilder.new
 
     attr_reader :struct
+
     def_delegators :@struct, :to_ptr
 
     def setup_and_call(method, arguments, &block)

data/lib/gir_ffi/version.rb

@@ -2,5 +2,5 @@
 
 # Current GirFFI version
 module GirFFI
-  VERSION = "0.15.2"
+  VERSION = "0.15.3"
 end

data/test/ffi-gobject/object_test.rb

@@ -53,7 +53,8 @@ describe GObject::Object do
   describe "#set_property" do
     it "raises an error for a property that does not exist" do
       instance = GObject::Object.new
-      _(proc { instance.set_property "foo-bar", 123 }).must_raise GirFFI::PropertyNotFoundError
+      _(proc { instance.set_property "foo-bar", 123 })
+        .must_raise GirFFI::PropertyNotFoundError
     end
   end
 
@@ -103,7 +104,7 @@ describe GObject::Object do
 
   describe "upon garbage collection" do
     it "lowers the reference count" do
-      skip "cannot be reliably tested on JRuby and Rubinius" if jruby? || rubinius?
+      skip "cannot be reliably tested on JRuby" if jruby?
 
       ptr = GObject::Object.new.to_ptr
       _(object_ref_count(ptr)).must_equal 1

data/test/ffi-gobject/value_test.rb

@@ -369,7 +369,7 @@ describe GObject::Value do
 
   describe "upon garbage collection" do
     it "restores the underlying GValue to its pristine state" do
-      skip "cannot be reliably tested on JRuby and Rubinius" if jruby? || rubinius?
+      skip "cannot be reliably tested on JRuby" if jruby?
 
       value = GObject::Value.from 42
 

data/test/ffi-gobject_introspection/i_base_info_test.rb

@@ -32,7 +32,7 @@ describe GObjectIntrospection::IBaseInfo do
 
   describe "upon garbage collection" do
     it "calls g_base_info_unref" do
-      skip "cannot be reliably tested on JRuby and Rubinius" if jruby? || rubinius?
+      skip "cannot be reliably tested on JRuby" if jruby?
 
       expect(ptr = Object.new).to receive(:null?).and_return false
       expect(lib = Object.new).to receive(:g_base_info_unref).with(ptr).and_return nil

data/test/ffi-gobject_test.rb

@@ -40,7 +40,8 @@ describe GObject do
       callback = FFI::Function.new(:void, argtypes) do |_a, b, _c|
         b2 = b
       end
-      ::GObject::Lib.g_signal_connect_data o, "test-with-static-scope-arg", callback, nil, nil, 0
+      ::GObject::Lib.g_signal_connect_data(o, "test-with-static-scope-arg",
+                                           callback, nil, nil, 0)
       GObject.signal_emit o, "test-with-static-scope-arg", sb
 
       sb2 = Regress::TestSimpleBoxedA.wrap b2
@@ -121,7 +122,8 @@ describe GObject do
         sb = Regress::TestSimpleBoxedA.new
         sb.some_int = 23
 
-        GObject.signal_connect(o, "test-with-static-scope-arg", 2) do |_instance, object, user_data|
+        GObject.signal_connect(o, "test-with-static-scope-arg", 2) \
+          do |_instance, object, user_data|
           @a = user_data
           @b = object
         end

data/test/gir_ffi/arg_helper_test.rb

@@ -7,7 +7,8 @@ describe GirFFI::ArgHelper do
     it "handles class types" do
       klass = Class.new
       expect(klass).to receive(:wrap).with(:pointer_value).and_return :wrapped_value
-      _(GirFFI::ArgHelper.cast_from_pointer(klass, :pointer_value)).must_equal :wrapped_value
+      _(GirFFI::ArgHelper.cast_from_pointer(klass, :pointer_value))
+        .must_equal :wrapped_value
     end
 
     describe "for :gint8" do
@@ -62,32 +63,38 @@ describe GirFFI::ArgHelper do
     it "handles GHashTable" do
       hash = GLib::HashTable.from [:utf8, :gint32], "foo" => 1, "bar" => 2
       ptr = hash.to_ptr
-      result = GirFFI::ArgHelper.cast_from_pointer([:pointer, [:ghash, :utf8, :gint32]], ptr)
+      result = GirFFI::ArgHelper.cast_from_pointer([:pointer, [:ghash, :utf8, :gint32]],
+                                                   ptr)
       _(result.to_hash).must_equal hash.to_hash
     end
 
     describe "when passing a broken typespec" do
       it "raises on unknown symbol" do
         ptr = FFI::Pointer.new(0xffffffff)
-        exception = _(-> { GirFFI::ArgHelper.cast_from_pointer(:foo, ptr) }).must_raise RuntimeError
+        exception = _(-> { GirFFI::ArgHelper.cast_from_pointer(:foo, ptr) })
+          .must_raise RuntimeError
         _(exception.message).must_equal "Don't know how to cast foo"
       end
 
       it "raises on unexpected main type for complex type" do
         ptr = FFI::Pointer.new(0xffffffff)
-        exception = _(-> { GirFFI::ArgHelper.cast_from_pointer([:utf8], ptr) }).must_raise RuntimeError
+        exception = _(-> { GirFFI::ArgHelper.cast_from_pointer([:utf8], ptr) })
+          .must_raise RuntimeError
         _(exception.message).must_equal "Don't know how to cast [:utf8]"
       end
 
       it "raises on unexpected sub type for complex type" do
         ptr = FFI::Pointer.new(0xffffffff)
-        exception = _(-> { GirFFI::ArgHelper.cast_from_pointer([:pointer, :utf8], ptr) }).must_raise RuntimeError
+        exception = _(-> { GirFFI::ArgHelper.cast_from_pointer([:pointer, :utf8], ptr) })
+          .must_raise RuntimeError
         _(exception.message).must_equal "Don't know how to cast [:pointer, :utf8]"
       end
 
       it "raises on unexpected container type for complex type" do
         ptr = FFI::Pointer.new(0xffffffff)
-        exception = _(-> { GirFFI::ArgHelper.cast_from_pointer([:pointer, [:gint32]], ptr) }).must_raise RuntimeError
+        exception =
+          _(-> { GirFFI::ArgHelper.cast_from_pointer([:pointer, [:gint32]], ptr) })
+            .must_raise RuntimeError
         _(exception.message).must_equal "Don't know how to cast [:pointer, [:gint32]]"
       end
     end

data/test/gir_ffi/boxed_base_test.rb

@@ -38,7 +38,7 @@ describe GirFFI::BoxedBase do
 
   describe "upon garbage collection" do
     it "frees and disowns the underlying struct if it is owned" do
-      skip "cannot be reliably tested on JRuby and Rubinius" if jruby? || rubinius?
+      skip "cannot be reliably tested on JRuby" if jruby?
 
       allow(GObject).to receive(:boxed_free)
       gtype = GIMarshallingTests::BoxedStruct.gtype

data/test/gir_ffi/builder_test.rb

@@ -108,7 +108,7 @@ describe GirFFI::Builder do
   describe ".attach_ffi_function" do
     let(:lib) { Module.new }
 
-    it "calls attach_function with the correct types for Regress.test_callback_destroy_notify" do
+    it "attaches regress_test_callback_destroy_notify with the correct types" do
       function_info = get_introspection_data "Regress", "test_callback_destroy_notify"
 
       expect(lib)
@@ -121,7 +121,7 @@ describe GirFFI::Builder do
       GirFFI::Builder.attach_ffi_function(lib, function_info)
     end
 
-    it "calls attach_function with the correct types for Regress::TestObj#torture_signature_0" do
+    it "attaches regress_test_obj_torture_signature_0 with the correct types" do
       info = get_method_introspection_data "Regress", "TestObj", "torture_signature_0"
 
       expect(lib)
@@ -134,7 +134,7 @@ describe GirFFI::Builder do
       GirFFI::Builder.attach_ffi_function(lib, info)
     end
 
-    it "calls attach_function with the correct types for Regress::TestObj#instance_method" do
+    it "attaches regress_test_obj_instance_method with the correct types" do
       info = get_method_introspection_data "Regress", "TestObj", "instance_method"
       expect(lib).to receive(:attach_function)
         .with("regress_test_obj_instance_method", [:pointer], :int32)
@@ -165,158 +165,4 @@ describe GirFFI::Builder do
       GirFFI::Builder.attach_ffi_function(lib, info)
     end
   end
-
-  #
-  # NOTE: Legacy tests below.
-  #
-
-  describe "looking at Regress.test_callback_destroy_notify" do
-    before do
-      save_module :GObject
-      save_module :Regress
-      GirFFI::Builder.build_module "GObject"
-      GirFFI::Builder.build_module "Regress"
-      @go = get_introspection_data "Regress", "test_callback_destroy_notify"
-    end
-
-    it "defines ffi callback types :Callback and :ClosureNotify" do
-      Regress.setup_method! "test_callback_destroy_notify"
-      tcud = Regress::Lib.find_type :TestCallbackUserData
-      dn = GLib::Lib.find_type :DestroyNotify
-
-      assert_equal FFI.find_type(:int32), tcud.result_type
-      assert_equal FFI.find_type(:void), dn.result_type
-      assert_equal [FFI.find_type(:pointer)], tcud.param_types
-      assert_equal [FFI.find_type(:pointer)], dn.param_types
-    end
-
-    after do
-      restore_module :Regress
-      restore_module :GObject
-    end
-  end
-
-  describe "building Regress::TestBoxed" do
-    before do
-      GirFFI::Builder.build_class get_introspection_data("Regress", "TestBoxed")
-    end
-
-    it "sets up #wrap" do
-      assert Regress::TestBoxed.respond_to? "wrap"
-    end
-
-    it "sets up #allocate" do
-      assert Regress::TestBoxed.respond_to? "allocate"
-    end
-  end
-
-  describe "built Regress module" do
-    before do
-      save_module :Regress
-      GirFFI::Builder.build_module "Regress"
-    end
-
-    it "autocreates singleton methods" do
-      refute_defines_singleton_method Regress, :test_uint
-      Regress.test_uint 31
-      assert_defines_singleton_method Regress, :test_uint
-    end
-
-    it "autocreates the TestObj class on first access" do
-      assert !Regress.const_defined?(:TestObj)
-      _(Regress::TestObj).must_be_instance_of Class
-      assert Regress.const_defined? :TestObj
-    end
-
-    it "knows its own module builder" do
-      _(Regress.gir_ffi_builder).must_be_instance_of GirFFI::Builders::ModuleBuilder
-    end
-
-    after do
-      restore_module :Regress
-    end
-  end
-
-  describe "having built Regress::TestObj" do
-    before do
-      GirFFI::Builder.build_class get_introspection_data("Regress", "TestObj")
-    end
-
-    it "C functions for called instance methods get attached to Regress::Lib" do
-      o = Regress::TestObj.new_from_file("foo")
-      o.instance_method
-      _(Regress::Lib).must_respond_to :regress_test_obj_instance_method
-    end
-
-    it "the built class knows its own GIR info" do
-      _(Regress::TestObj.gir_info.name).must_equal "TestObj"
-    end
-
-    it "the built class knows its own class builder" do
-      _(Regress::TestObj.gir_ffi_builder).must_be_instance_of GirFFI::Builders::ObjectBuilder
-    end
-  end
-
-  describe "built Regress::TestSubObj" do
-    it "inherits #set_bare from its superclass" do
-      o1 = Regress::TestSubObj.new
-      o1.set_bare(nil)
-      pass
-    end
-
-    it "overrides #instance_method" do
-      obj = Regress::TestObj.new_from_file("foo")
-      subobj = Regress::TestSubObj.new
-
-      _(obj.instance_method).must_equal(-1)
-      _(subobj.instance_method).must_equal 0
-    end
-  end
-
-  describe "building Regress::TestSubObj" do
-    before do
-      save_module :Regress
-      GirFFI::Builder.build_class get_introspection_data("Regress", "TestSubObj")
-    end
-
-    it "sets up the Regress namespace" do
-      assert Regress.const_defined? :Lib
-      assert Regress.respond_to? :gir_ffi_builder
-      assert Regress.const_defined? :GIR_FFI_BUILDER
-    end
-
-    it "creates the Regress::Lib module ready to attach functions from the shared library" do
-      expected = [gir.shared_library("Regress")]
-      assert_equal expected, Regress::Lib.ffi_libraries.map(&:name)
-    end
-
-    it "builds parent classes also" do
-      assert Regress.const_defined? :TestObj
-      assert Object.const_defined? :GObject
-      assert GObject.const_defined? :Object
-    end
-
-    it "sets up the inheritance chain" do
-      # Introduced in version 1.59.1
-      expected = if Regress::TestSubObj.find_property :boolean
-                   [Regress::TestSubObj,
-                    Regress::TestInterface,
-                    Regress::TestObj,
-                    GObject::Object]
-                 else
-                   [Regress::TestSubObj,
-                    Regress::TestObj,
-                    GObject::Object]
-                 end
-      _(Regress::TestSubObj.registered_ancestors).must_equal expected
-    end
-
-    it "creates a Regress::TestSubObj#to_ptr method" do
-      assert Regress::TestSubObj.public_method_defined? :to_ptr
-    end
-
-    after do
-      restore_module :Regress
-    end
-  end
 end