gir_ffi 0.15.4 → 0.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cd304c670b5b7b26e9bbaa939f2b5162ef3f92f7c0bd78d8e524b1586cbdb3b
-  data.tar.gz: ccf4916ed552cf23752fb6270a61cfffdea53269b7d4bdb0bb408f3e3de7ae59
+  metadata.gz: d1bab3fa290a2ef0cb49ee4bb2b24f29f6ef5ae0bf4bbdd83ed92bc28b9aa8e0
+  data.tar.gz: c87ddb7f7f41a033319dafd849db129a72afb2cd6fba5e2ffc64715e1cc1e446
 SHA512:
-  metadata.gz: 59fa0cf7451808b87a1ff028c0b8309d7c46c2acbbc894c535db4e1b3f30be7d6ee9649472a6932dd1fea0747bda6f56ceb3c753c48370750966c06da509f5bf
-  data.tar.gz: e2bd4de38d2db08b17e20c1bc42556530b4b14312400d5b9e15dc201eaf1494606bfe56c7fcdf78d632d164f6b553e897f488d533d70ab6d35042e069e5c5f61
+  metadata.gz: 7ff032878aa00fea1c6096f8b09509e6cbee0c492f864c1c258e4c1b1932f0052e2efda13517e2e381f367f91713ed0e56f42bcc302abe2de04103607beac8dd
+  data.tar.gz: 4f90c766aee3e8953a8f017e94284db5be4cc0cf93991795ee2e77aa66c700995ec9f3feeb336169f02b618468675a2744f5159a790819c5248422a85baa789f

data/Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.15.5 / 2020-11-13
+
+* Make building and finding metaclasses via Builder.build_class work again
+
 ## 0.15.4 / 2020-11-01
 
 * Support disguised object class structs

data/lib/ffi-glib/container_class_methods.rb

@@ -11,9 +11,7 @@ module GLib
               nil
             when FFI::Pointer
               ptr
-            when self
-              ptr.to_ptr
-            when GirFFI::BoxedBase
+            when self, GirFFI::BoxedBase
               ptr.to_ptr
             end
 

data/lib/ffi-gobject.rb

@@ -86,7 +86,7 @@ module GObject
   load_class :ParamFlags
 
   # NOTE: This Lib module is set up in `gir_ffi-base/gobject/lib.rb`.
-  module Lib
+  Lib.class_eval do
     attach_function :g_object_ref_sink, [:pointer], :pointer
     attach_function :g_object_ref, [:pointer], :pointer
     attach_function :g_object_unref, [:pointer], :pointer

data/lib/ffi-gobject/object.rb

@@ -7,7 +7,25 @@ GObject.load_class :Object
 module GObject
   # Overrides for GObject, GObject's generic base class.
   class Object
-    if !GLib.check_version(2, 54, 0)
+    if GLib.check_version(2, 54, 0)
+      setup_method! "new"
+
+      # Before GLib 2.54.0, use g_object_newv, which takes an array of GParameter.
+      def initialize_with_automatic_gtype(properties = {})
+        gparameters = properties.map do |name, value|
+          name = name.to_s
+          property_param_spec(name)
+          GObject::Parameter.new.tap do |gparam|
+            gparam.name = name
+            gparam.value = value
+          end
+        end
+        initialize_without_automatic_gtype(self.class.gtype, gparameters)
+      end
+
+      alias initialize_without_automatic_gtype initialize
+      alias initialize initialize_with_automatic_gtype
+    else
       GObject::Lib.attach_function(:g_object_new_with_properties,
                                    [:size_t, :uint32, :pointer, :pointer],
                                    :pointer)
@@ -43,24 +61,6 @@ module GObject
         obj.__send__ :initialize, *args, &block
         obj
       end
-    else
-      setup_method! "new"
-
-      # Before GLib 2.54.0, use g_object_newv, which takes an array of GParameter.
-      def initialize_with_automatic_gtype(properties = {})
-        gparameters = properties.map do |name, value|
-          name = name.to_s
-          property_param_spec(name)
-          GObject::Parameter.new.tap do |gparam|
-            gparam.name = name
-            gparam.value = value
-          end
-        end
-        initialize_without_automatic_gtype(self.class.gtype, gparameters)
-      end
-
-      alias initialize_without_automatic_gtype initialize
-      alias initialize initialize_with_automatic_gtype
     end
 
     alias base_initialize initialize

data/lib/ffi-gobject_introspection/i_base_info.rb

@@ -110,10 +110,10 @@ module GObjectIntrospection
     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
+                       unless ptr.null?
+                         Lib.g_base_info_ref ptr
+                         IRepository.wrap_ibaseinfo_pointer ptr
+                       end
                      end
     end
 

data/lib/gir_ffi/builder.rb

@@ -23,9 +23,8 @@ module GirFFI
                  fund = GObject.type_fundamental gtype
                  if fund == GObject::TYPE_BOXED
                    UnintrospectableBoxedInfo.new gtype
-                 elsif fund == GObject::TYPE_OBJECT
-                   UnintrospectableTypeInfo.new gtype
-                 elsif fund >= GObject::TYPE_RESERVED_USER_FIRST
+                 elsif fund == GObject::TYPE_OBJECT ||
+                       fund >= GObject::TYPE_RESERVED_USER_FIRST
                    UnintrospectableTypeInfo.new gtype
                  else
                    raise "Unable to handle type #{GObject.type_name gtype}"

data/lib/gir_ffi/builders/function_builder.rb

@@ -39,7 +39,7 @@ module GirFFI
       def receiver_call_argument
         container_type_info = ReceiverTypeInfo.new(container_info)
         if @info.instance_ownership_transfer == :everything &&
-            container_type_info.flattened_tag == :object
+           container_type_info.flattened_tag == :object
           "self.ref"
         else
           "self"

data/lib/gir_ffi/builders/interface_builder.rb

@@ -9,8 +9,8 @@ module GirFFI
     class InterfaceBuilder < RegisteredTypeBuilder
       def interface_struct
         @interface_struct ||=
-          ClassStructBuilder.new(iface_struct_info,
-                                 GObject::TypeInterface).build_class
+          StructBuilder.new(iface_struct_info,
+                            superclass: GObject::TypeInterface).build_class
       end
 
       private

data/lib/gir_ffi/builders/module_builder.rb

@@ -43,7 +43,7 @@ module GirFFI
       def find_namespaced_class_info(classname)
         name = classname.to_s
         info = gir.find_by_name(@namespace, name) ||
-          gir.find_by_name(@namespace, name.sub(/^./, &:downcase))
+               gir.find_by_name(@namespace, name.sub(/^./, &:downcase))
         unless info
           raise NameError,
                 "Class #{classname} not found in namespace #{@namespace}"

data/lib/gir_ffi/builders/object_builder.rb

@@ -3,7 +3,6 @@
 require "gir_ffi/builders/registered_type_builder"
 require "gir_ffi/builders/with_layout"
 require "gir_ffi/builders/property_builder"
-require "gir_ffi/builders/class_struct_builder"
 require "gir_ffi/object_base"
 require "gir_ffi/struct"
 
@@ -38,11 +37,14 @@ module GirFFI
 
       def object_class_struct
         @object_class_struct ||=
-          if object_class_struct_info
-            ClassStructBuilder.new(object_class_struct_info,
-                                   parent_builder.object_class_struct).build_class
-          else
-            parent_builder.object_class_struct
+          begin
+            parent_struct = parent_builder.object_class_struct
+            if object_class_struct_info
+              StructBuilder.new(object_class_struct_info,
+                                superclass: parent_struct).build_class
+            else
+              parent_struct
+            end
           end
       end
 

data/lib/gir_ffi/builders/struct_builder.rb

@@ -10,23 +10,48 @@ module GirFFI
     class StructBuilder < RegisteredTypeBuilder
       include StructLike
 
-      def layout_superclass
-        GirFFI::Struct
+      def initialize(info, superclass: nil)
+        @superclass = superclass
+        super info
       end
 
       def superclass
-        raise "Use ClassStructBuilder to build #{info.full_type_name}" if info.gtype_struct?
-        return BoxedBase if GObject.type_fundamental(info.gtype) == GObject::TYPE_BOXED
+        @superclass ||= if info.gtype_struct?
+                          gtype_struct_parent
+                        elsif GObject.type_fundamental(info.gtype) == GObject::TYPE_BOXED
+                          BoxedBase
+                        else
+                          StructBase
+                        end
+      end
 
-        StructBase
+      private
+
+      def layout_superclass
+        GirFFI::Struct
       end
 
       def klass
         @klass ||= get_or_define_class(namespace_module, @classname) { superclass }
       end
 
+      def parent_info
+        @parent_info ||= parent_field_type&.interface
+      end
+
       def parent_field_type
-        fields.first.field_type
+        fields.first&.field_type
+      end
+
+      def gtype_struct_parent
+        full_name = info.full_type_name
+        if full_name == "GObject::InitiallyUnownedClass"
+          GObject::ObjectClass
+        else
+          raise "Unable to calculate parent class for #{full_name}" unless parent_info
+
+          Builder.build_class parent_info
+        end
       end
     end
   end

data/lib/gir_ffi/version.rb

@@ -2,5 +2,5 @@
 
 # Current GirFFI version
 module GirFFI
-  VERSION = "0.15.4"
+  VERSION = "0.15.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.5
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +286,6 @@ files:
 - lib/gir_ffi/builders/callback_argument_builder.rb
 - lib/gir_ffi/builders/callback_builder.rb
 - lib/gir_ffi/builders/callback_return_value_builder.rb
-- lib/gir_ffi/builders/class_struct_builder.rb
 - lib/gir_ffi/builders/closure_argument_builder.rb
 - lib/gir_ffi/builders/closure_convertor.rb
 - lib/gir_ffi/builders/closure_return_value_builder.rb

data/lib/gir_ffi/builders/class_struct_builder.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require "gir_ffi/builders/struct_builder"
-
-module GirFFI
-  module Builders
-    # Implements the creation of a class representing a Struct.
-    class ClassStructBuilder < RegisteredTypeBuilder
-      include StructLike
-
-      attr_reader :superclass
-
-      def initialize(info, super_class_struct)
-        @superclass = super_class_struct
-        super info
-        raise "Info does not represent gtype_struct" unless info.gtype_struct?
-      end
-
-      def layout_superclass
-        GirFFI::Struct
-      end
-    end
-  end
-end