gir_ffi 0.15.3 → 0.15.4

data/lib/gir_ffi/builders/callback_return_value_builder.rb

@@ -9,11 +9,7 @@ module GirFFI
     # callbacks.
     class CallbackReturnValueBuilder < BaseReturnValueBuilder
       def post_conversion
-        if has_post_conversion?
-          optional_outgoing_ref + base_post_conversion
-        else
-          []
-        end
+        optional_outgoing_ref + base_post_conversion
       end
 
       private
@@ -35,7 +31,9 @@ module GirFFI
       end
 
       def base_post_conversion
-        if specialized_type_tag == :object
+        if !has_post_conversion?
+          []
+        elsif specialized_type_tag == :object
           ["#{post_converted_name} = #{post_convertor.conversion}.to_ptr"]
         else
           ["#{post_converted_name} = #{post_convertor.conversion}"]

data/lib/gir_ffi/builders/class_struct_builder.rb

@@ -0,0 +1,24 @@
+# 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

data/lib/gir_ffi/builders/enum_builder.rb

@@ -51,9 +51,9 @@ module GirFFI
 
       def setup_inspect
         klass.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def self.inspect
-            "#{@namespace}::#{@classname}"
-          end
+          def self.inspect                  # def self.inspect
+            "#{@namespace}::#{@classname}"  #   "GFoo::Bar"
+          end                               # end
         RUBY
       end
 

data/lib/gir_ffi/builders/interface_builder.rb

@@ -8,7 +8,9 @@ module GirFFI
     # Implements the creation of a module representing an Interface.
     class InterfaceBuilder < RegisteredTypeBuilder
       def interface_struct
-        @interface_struct ||= Builder.build_class iface_struct_info
+        @interface_struct ||=
+          ClassStructBuilder.new(iface_struct_info,
+                                 GObject::TypeInterface).build_class
       end
 
       private

data/lib/gir_ffi/builders/mapping_method_builder.rb

@@ -23,7 +23,7 @@ module GirFFI
 
       def initialize(receiver_info, info, builder_class)
         super(info, CallbackReturnValueBuilder,
-              receiver_info: receiver_info,
+              receiver_info:          receiver_info,
               argument_builder_class: builder_class)
       end
 

data/lib/gir_ffi/builders/marshalling_method_builder.rb

@@ -12,13 +12,16 @@ module GirFFI
     # handler. This method converts arguments from C to Ruby, and the
     # result from Ruby to C.
     class MarshallingMethodBuilder < BaseMethodBuilder
-      def self.for_signal(receiver_info, info)
+      def self.for_signal(info)
+        container_info = info.container
+        container_type_info = ReceiverTypeInfo.new(container_info)
+        receiver_info = ReceiverArgumentInfo.new(container_type_info)
         new receiver_info, info
       end
 
       def initialize(receiver_info, info)
         super(info, ClosureReturnValueBuilder,
-              receiver_info: receiver_info,
+              receiver_info:          receiver_info,
               argument_builder_class: ClosureArgumentBuilder)
       end
 

data/lib/gir_ffi/builders/method_template.rb

@@ -18,10 +18,10 @@ module GirFFI
       end
 
       def method_definition
-        code = "def #{qualified_method_name}"
-        code += "(#{method_arguments.join(', ')})" if method_arguments.any?
-        method_lines.each { |line| code += "\n  #{line}" }
-        code + "\nend\n"
+        code = +"def #{qualified_method_name}"
+        code << "(#{method_arguments.join(', ')})" if method_arguments.any?
+        method_lines.each { |line| code << "\n  #{line}" }
+        code << "\nend\n"
       end
 
       private

data/lib/gir_ffi/builders/null_argument_builder.rb

@@ -3,8 +3,6 @@
 module GirFFI
   # Argument builder that does nothing. Implements the Null Object pattern.
   class NullArgumentBuilder
-    def initialize(*); end
-
     def pre_conversion
       []
     end

data/lib/gir_ffi/builders/null_return_value_builder.rb

@@ -4,8 +4,6 @@ module GirFFI
   module Builders
     # Implements a blank return value matching ReturnValueBuilder's interface.
     class NullReturnValueBuilder
-      def initialize; end
-
       def array_length_idx
         -1
       end

data/lib/gir_ffi/builders/object_builder.rb

@@ -3,6 +3,7 @@
 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"
 
@@ -18,6 +19,10 @@ module GirFFI
           ObjectBase
         end
 
+        def object_class_struct
+          GObject::TypeClass
+        end
+
         def ancestor_infos
           []
         end
@@ -32,7 +37,13 @@ module GirFFI
       end
 
       def object_class_struct
-        @object_class_struct ||= Builder.build_class object_class_struct_info
+        @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
+          end
       end
 
       def ancestor_infos
@@ -48,8 +59,7 @@ module GirFFI
       protected
 
       def object_class_struct_info
-        @object_class_struct_info ||=
-          info.class_struct || parent_builder.object_class_struct_info
+        @object_class_struct_info ||= info.class_struct
       end
 
       private
@@ -107,9 +117,9 @@ module GirFFI
         return if vfunc_name == invoker_name
 
         klass.class_eval <<-DEF, __FILE__, __LINE__ + 1
-          def #{vfunc_name} *args, &block
-            #{invoker_name}(*args, &block)
-          end
+          def #{vfunc_name} *args, &block   # def foo *args, &block
+            #{invoker_name}(*args, &block)  #   foo_invoker *args, &block
+          end                               # end
         DEF
       end
 

data/lib/gir_ffi/builders/property_builder.rb

@@ -11,8 +11,7 @@ module GirFFI
   module Builders
     # Method builder used for the creation of property getter methods.
     class PropertyGetterBuilder
-      attr_reader :info
-      attr_reader :return_value_builder
+      attr_reader :info, :return_value_builder
 
       def initialize(info, return_value_builder)
         @return_value_builder = return_value_builder

data/lib/gir_ffi/builders/signal_closure_builder.rb

@@ -18,13 +18,11 @@ module GirFFI
       end
 
       def marshaller_definition
-        container_type_info = ReceiverTypeInfo.new(container_info)
-        receiver_info = ReceiverArgumentInfo.new(container_type_info)
-
-        MarshallingMethodBuilder.for_signal(receiver_info,
-                                            info).method_definition
+        MarshallingMethodBuilder.for_signal(info).method_definition
       end
 
+      private
+
       def klass
         @klass ||= get_or_define_class container_class, @classname, GObject::RubyClosure
       end

data/lib/gir_ffi/builders/struct_builder.rb

@@ -15,16 +15,16 @@ module GirFFI
       end
 
       def superclass
-        # HACK: Inheritance chain is not expressed in GObject's code correctly.
-        if info.full_type_name == "GObject::InitiallyUnownedClass"
-          return GObject::ObjectClass
-        end
-        return parent_field_type.tag_or_class if info.gtype_struct?
+        raise "Use ClassStructBuilder to build #{info.full_type_name}" if info.gtype_struct?
         return BoxedBase if GObject.type_fundamental(info.gtype) == GObject::TYPE_BOXED
 
         StructBase
       end
 
+      def klass
+        @klass ||= get_or_define_class(namespace_module, @classname) { superclass }
+      end
+
       def parent_field_type
         fields.first.field_type
       end

data/lib/gir_ffi/builders/user_defined_builder.rb

@@ -12,6 +12,7 @@ module GirFFI
       end
 
       def setup_class
+        check_ancestry
         setup_layout
         register_type
         setup_constants
@@ -26,6 +27,12 @@ module GirFFI
 
       private
 
+      def check_ancestry
+        unless klass < GirFFI::ObjectBase
+          raise ArgumentError, "#{klass} is not a GObject class"
+        end
+      end
+
       def register_type
         @gtype = GObject.type_register_static(parent_gtype.to_i,
                                               info.g_name,
@@ -98,7 +105,7 @@ module GirFFI
       end
 
       def class_size
-        parent_gtype.class_size + interface_gtypes.map(&:class_size).inject(0, :+)
+        parent_gtype.class_size + interface_gtypes.map(&:class_size).sum
       end
 
       def setup_properties(object_class_ptr)

data/lib/gir_ffi/builders/vfunc_argument_builder.rb

@@ -9,7 +9,7 @@ module GirFFI
     class VFuncArgumentBuilder < CallbackArgumentBuilder
       def pre_conversion
         if ingoing_ref_needed?
-          super + ["#{pre_converted_name}.ref"]
+          super + ["#{pre_converted_name}&.ref"]
         else
           super
         end

data/lib/gir_ffi/callback_base.rb

@@ -35,14 +35,14 @@ module GirFFI
       from_native ptr, nil
     end
 
-    CALLBACKS = {}
+    CALLBACKS = Set.new
 
     def self.store_callback(prc)
-      CALLBACKS[prc.object_id] = prc
+      CALLBACKS.add prc
     end
 
     def self.drop_callback(prc)
-      CALLBACKS.delete prc.object_id
+      CALLBACKS.delete prc
     end
 
     # Create Callback from a Proc. Makes sure arguments are properly wrapped,

data/lib/gir_ffi/core.rb

@@ -28,8 +28,23 @@ module GirFFI
       Builder.build_module namespace, version
     end
 
-    def define_type(klass, &block)
-      info = UserDefinedObjectInfo.new(klass, &block)
+    def define_type(klass)
+      unless klass < GirFFI::ObjectBase
+        raise ArgumentError, "#{klass} is not a GObject class"
+      end
+
+      klass.prepare_user_defined_class
+      info = klass.gir_info
+
+      unless info.is_a? UserDefinedObjectInfo
+        raise ArgumentError, "#{klass} is not a user-defined class"
+      end
+
+      if block_given?
+        warn "Using define_type with a block is deprecated." \
+          " Call the relevant functions inside the class definition instead."
+        yield info
+      end
       Builders::UserDefinedBuilder.new(info).build_class
 
       klass.gtype

data/lib/gir_ffi/glib_error.rb

@@ -4,8 +4,7 @@ module GirFFI
   # Exception class to be raised whenever an error is signaled through
   # GLib::Error.
   class GLibError < RuntimeError
-    attr_reader :domain_quark
-    attr_reader :code
+    attr_reader :domain_quark, :code
 
     def initialize(g_error)
       @domain_quark = g_error.domain

data/lib/gir_ffi/in_pointer.rb

@@ -67,6 +67,8 @@ module GirFFI
           from_utf8_array ary
         when :gboolean
           from_boolean_array ary
+        when :guint8
+          from_char_array ary
         else
           from_basic_type_array type, ary
         end
@@ -92,6 +94,11 @@ module GirFFI
         from_basic_type_array :int, ary.map { |val| val ? 1 : 0 }
       end
 
+      def from_char_array(ary)
+        ary = ary.bytes if ary.is_a? String
+        from_basic_type_array :int8, ary
+      end
+
       def from_pointer_array(type, ary)
         from_basic_type_array :pointer, ary.map { |elem| from type, elem }
       end

data/lib/gir_ffi/object_base.rb

@@ -81,5 +81,32 @@ module GirFFI
         it < GirFFI::ObjectBase || it.singleton_class.include?(InterfaceBase)
       end
     end
+
+    def self.prepare_user_defined_class
+      return if const_defined? :GIR_INFO, false
+
+      info = UserDefinedObjectInfo.new(self)
+      const_set :GIR_INFO, info
+    end
+
+    def self.install_property(param_spec)
+      if const_defined? :GIR_FFI_BUILDER, false
+        raise "Installing a property in a class that is already set up is not supported"
+      end
+
+      prepare_user_defined_class
+
+      gir_info.install_property(param_spec)
+    end
+
+    def self.install_vfunc_implementation(name, implementation = nil)
+      if const_defined? :GIR_FFI_BUILDER, false
+        raise "Installing a property in a class that is already set up is not supported"
+      end
+
+      prepare_user_defined_class
+
+      gir_info.install_vfunc_implementation(name, implementation)
+    end
   end
 end

data/lib/gir_ffi/return_value_info.rb

@@ -3,8 +3,7 @@
 module GirFFI
   # Represents a return value with the same interface as IArgInfo
   class ReturnValueInfo
-    attr_reader :argument_type
-    attr_reader :ownership_transfer
+    attr_reader :argument_type, :ownership_transfer
 
     def initialize(type, ownership_transfer, skip)
       @argument_type = type

data/lib/gir_ffi/struct_base.rb

@@ -4,14 +4,6 @@ require "gir_ffi/struct_like_base"
 
 module GirFFI
   # Base class for generated classes representing GLib structs.
-  class StructBase < ClassBase
-    extend FFI::DataConverter
-    include GirFFI::StructLikeBase
-
-    def initialize
-      @struct = self.class::Struct.new
-      @struct.owned = true
-      @struct.to_ptr.autorelease = false
-    end
+  class StructBase < StructLikeBase
   end
 end

data/lib/gir_ffi/struct_like_base.rb

@@ -1,15 +1,19 @@
 # frozen_string_literal: true
 
 module GirFFI
-  # Base module providing class methods for generated classes representing GLib
+  # Base class providing methods for generated classes representing GLib
   # structs, unions and boxed types.
-  module StructLikeBase
-    def self.included(base)
-      base.extend ClassMethods
+  class StructLikeBase < ClassBase
+    extend FFI::DataConverter
+
+    def initialize
+      store_pointer(nil)
+      struct.owned = true
+      struct.to_ptr.autorelease = false
     end
 
     # Class methods for struct-like classes.
-    module ClassMethods
+    class << self
       def native_type
         FFI::Type::Struct.new(self::Struct)
       end