gir_ffi 0.14.1 → 0.15.4

data/lib/ffi-glib/list.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ffi-glib/list_methods'
+require "ffi-glib/list_methods"
 
 GLib.load_class :List
 
@@ -9,13 +9,19 @@ module GLib
   class List
     include ListMethods
 
-    def self.from_enumerable(type, arr)
-      arr.reduce(new(type)) { |lst, val| lst.append val }
+    def append(data)
+      store_pointer Lib.g_list_append(self, element_ptr_for(data))
+      self
     end
 
-    def append(data)
-      self.class.wrap(element_type,
-                      Lib.g_list_append(self, element_ptr_for(data)))
+    def prepend(data)
+      store_pointer Lib.g_list_prepend(self, element_ptr_for(data))
+      self
+    end
+
+    def reverse
+      store_pointer Lib.g_list_reverse(self)
+      self
     end
   end
 end

data/lib/ffi-glib/list_methods.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ffi-glib/container_class_methods'
+require "ffi-glib/container_class_methods"
 
 module GLib
   # Common methods for List and SList.
@@ -14,6 +14,7 @@ module GLib
       replace_method base, :data, :head
 
       base.extend ContainerClassMethods
+      base.extend ClassMethods
     end
 
     def self.replace_method(base, old, new)
@@ -36,10 +37,14 @@ module GLib
     end
 
     def tail
+      return nil if struct.null?
+
       self.class.wrap(element_type, struct[:next])
     end
 
     def head
+      return nil if struct.null?
+
       GirFFI::ArgHelper.cast_from_pointer(element_type, struct[:data])
     end
 
@@ -69,5 +74,12 @@ module GLib
     def element_ptr_for(data)
       GirFFI::InPointer.from(element_type, data)
     end
+
+    # Common class methods for List and SList
+    module ClassMethods
+      def from_enumerable(type, arr)
+        arr.reduce(new(type)) { |lst, val| lst.prepend val }.reverse
+      end
+    end
   end
 end

data/lib/ffi-glib/main_loop.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'singleton'
+require "singleton"
 
 GLib.load_class :MainLoop
 
@@ -40,7 +40,7 @@ module GLib
     setup_instance_method! :run
 
     def run_with_thread_enabler
-      ThreadEnabler.instance.setup_idle_handler if RUBY_ENGINE == 'ruby'
+      ThreadEnabler.instance.setup_idle_handler if RUBY_ENGINE == "ruby"
       RUNNING_LOOPS << self
       result = run_without_thread_enabler
       exception = EXCEPTIONS.shift
@@ -63,6 +63,6 @@ module GLib
   end
 end
 
-Signal.trap 'INT' do
+Signal.trap "INT" do
   GLib::MainLoop.handle_exception(Interrupt.new)
 end

data/lib/ffi-glib/ptr_array.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'ffi-glib/container_class_methods'
-require 'ffi-glib/array_methods'
+require "ffi-glib/container_class_methods"
+require "gir_ffi/array_element_convertor"
 
 GLib.load_class :PtrArray
 
@@ -10,7 +10,6 @@ module GLib
   # pointers.
   class PtrArray
     include Enumerable
-    include ArrayMethods
     extend ContainerClassMethods
 
     attr_reader :element_type
@@ -49,12 +48,25 @@ module GLib
       ary.each { |item| add item }
     end
 
-    def data_ptr
-      struct[:pdata]
-    end
+    # Re-implementation of the g_ptrarray_index macro
+    def index(idx)
+      unless (0...length).cover? idx
+        raise IndexError, "Index #{idx} outside of bounds 0..#{length - 1}"
+      end
 
-    def element_size
-      POINTER_SIZE
+      item_ptr = data_ptr + idx * element_size
+
+      convert_element_type = case element_type
+                             when :utf8
+                               :utf8
+                             when GirFFI::ObjectBase
+                               element_type
+                             else
+                               [:pointer, element_type]
+                             end
+
+      convertor = GirFFI::ArrayElementConvertor.new convert_element_type, item_ptr
+      convertor.to_ruby_value
     end
 
     def each
@@ -70,5 +82,15 @@ module GLib
     def ==(other)
       to_a == other.to_a
     end
+
+    private
+
+    def element_size
+      POINTER_SIZE
+    end
+
+    def data_ptr
+      struct[:pdata]
+    end
   end
 end

data/lib/ffi-glib/s_list.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ffi-glib/list_methods'
+require "ffi-glib/list_methods"
 
 GLib.load_class :SList
 
@@ -9,13 +9,19 @@ module GLib
   class SList
     include ListMethods
 
-    def self.from_enumerable(type, arr)
-      arr.reverse.reduce(new(type)) { |lst, val| lst.prepend val }
+    def append(data)
+      store_pointer Lib.g_slist_append(self, element_ptr_for(data))
+      self
     end
 
     def prepend(data)
-      self.class.wrap(element_type,
-                      Lib.g_slist_prepend(self, element_ptr_for(data)))
+      store_pointer Lib.g_slist_prepend(self, element_ptr_for(data))
+      self
+    end
+
+    def reverse
+      store_pointer Lib.g_slist_reverse(self)
+      self
     end
   end
 end

data/lib/ffi-glib/variant.rb

@@ -5,7 +5,7 @@ GLib.load_class :Variant
 module GLib
   # Overrides for GVariant, GLib's variant data type.
   class Variant
-    setup_instance_method! 'get_string'
+    setup_instance_method! "get_string"
 
     def get_string_with_override
       get_string_without_override.first

data/lib/ffi-gobject.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/core'
+require "gir_ffi/core"
 
 # Bypass check for existing modules
-GirFFI::Builders::ModuleBuilder.new('GObject').generate
+GirFFI::Builders::ModuleBuilder.new("GObject").generate
 
-require 'ffi-gobject/value'
-require 'ffi-gobject/initially_unowned'
-require 'ffi-gobject/closure'
-require 'ffi-gobject/object'
-require 'ffi-gobject/object_class'
-require 'ffi-gobject/param_spec'
-require 'ffi-gobject/ruby_closure'
-require 'gir_ffi/signal_not_found_error'
+require "ffi-gobject/value"
+require "ffi-gobject/initially_unowned"
+require "ffi-gobject/closure"
+require "ffi-gobject/object"
+require "ffi-gobject/object_class"
+require "ffi-gobject/param_spec"
+require "ffi-gobject/ruby_closure"
+require "gir_ffi/signal_not_found_error"
 
 # Module representing GLib's GObject namespace.
 module GObject
@@ -47,7 +47,7 @@ module GObject
   end
 
   def self.signal_emit(object, detailed_signal, *args)
-    signal, detail = detailed_signal.split('::')
+    signal, detail = detailed_signal.split("::")
     signal_id = signal_lookup_from_instance signal, object
     detail_quark = GLib.quark_from_string(detail)
 
@@ -63,9 +63,9 @@ module GObject
   end
 
   def self.signal_connect(object, detailed_signal, data = nil, after = false, &block)
-    raise ArgumentError, 'Block needed' unless block_given?
+    raise ArgumentError, "Block needed" unless block_given?
 
-    signal_name, = detailed_signal.split('::')
+    signal_name, = detailed_signal.split("::")
     sig_info = object.class.find_signal signal_name
 
     closure = sig_info.wrap_in_closure do |*args|
@@ -92,7 +92,6 @@ module GObject
     attach_function :g_object_unref, [:pointer], :pointer
 
     attach_function :g_value_copy, [:pointer, :pointer], :void
-    attach_function :g_value_init, [:pointer, :size_t], :pointer
     attach_function :g_value_unset, [:pointer], :pointer
 
     attach_function :g_signal_connect_data,
@@ -106,7 +105,5 @@ module GObject
 
     attach_function :g_param_spec_ref, [:pointer], :pointer
     attach_function :g_param_spec_sink, [:pointer], :pointer
-
-    attach_function :g_type_class_ref, [:size_t], :pointer
   end
 end

data/lib/ffi-gobject/object.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/property_not_found_error'
+require "gir_ffi/property_not_found_error"
 
 GObject.load_class :Object
 
@@ -44,7 +44,7 @@ module GObject
         obj
       end
     else
-      setup_method! 'new'
+      setup_method! "new"
 
       # Before GLib 2.54.0, use g_object_newv, which takes an array of GParameter.
       def initialize_with_automatic_gtype(properties = {})
@@ -74,11 +74,6 @@ module GObject
       self
     end
 
-    def store_pointer(ptr)
-      super
-      ObjectSpace.define_finalizer self, self.class.make_finalizer(ptr)
-    end
-
     def self.make_finalizer(ptr)
       proc do
         rc = GObject::Object::Struct.new(ptr)[:ref_count]
@@ -90,22 +85,6 @@ module GObject
       end
     end
 
-    # TODO: Generate accessor methods from GIR at class definition time
-    def method_missing(method, *args)
-      getter_name = "get_#{method}"
-      return send(getter_name, *args) if respond_to?(getter_name)
-
-      if method.to_s =~ /(.*)=$/
-        setter_name = "set_#{Regexp.last_match[1]}"
-        return send(setter_name, *args) if respond_to?(setter_name)
-      end
-      super
-    end
-
-    def respond_to_missing?(*)
-      false
-    end
-
     def signal_connect(event, data = nil, &block)
       GObject.signal_connect(self, event, data, &block)
     end
@@ -114,44 +93,22 @@ module GObject
       GObject.signal_connect_after(self, event, data, &block)
     end
 
-    setup_instance_method! 'get_property'
-    setup_instance_method! 'set_property'
-
-    def get_property_extended(property_name)
-      value = get_property(property_name)
-      type_info = get_property_type property_name
-      property_value_post_conversion value, type_info
-    end
+    setup_instance_method! "get_property"
+    setup_instance_method! "set_property"
+    setup_instance_method! "is_floating"
+    alias floating? is_floating
 
-    def get_property_with_override(property_name)
-      gvalue = gvalue_for_property property_name
-      get_property_without_override property_name, gvalue
-      gvalue.get_value
-    end
+    private
 
-    def set_property_extended(property_name, value)
-      type_info = get_property_type property_name
-      adjusted_value = property_value_pre_conversion(value, type_info)
-      set_property property_name, adjusted_value
+    def store_pointer(ptr)
+      super
+      make_finalizer
     end
 
-    def set_property_with_override(property_name, value)
-      gvalue = gvalue_for_property(property_name)
-      gvalue.set_value value
-      set_property_without_override property_name, gvalue
+    def make_finalizer
+      ObjectSpace.define_finalizer self, self.class.make_finalizer(struct.to_ptr)
     end
 
-    alias get_property_without_override get_property
-    alias get_property get_property_with_override
-
-    alias set_property_without_override set_property
-    alias set_property set_property_with_override
-
-    setup_instance_method! 'is_floating'
-    alias floating? is_floating
-
-    private
-
     def names_and_gvalues_for_properties(properties)
       return [], [] unless properties.any?
 
@@ -164,19 +121,13 @@ module GObject
       end.transpose
     end
 
-    def get_property_type(property_name)
-      prop = self.class.find_property(property_name)
-      prop.property_type
-    end
-
     def gvalue_for_property(property_name)
       gtype = property_gtype property_name
       GObject::Value.for_gtype gtype
     end
 
     def property_gtype(property_name)
-      pspec = property_param_spec(property_name)
-      pspec.value_type
+      property_param_spec(property_name).value_type
     end
 
     def property_param_spec(property_name)
@@ -184,34 +135,78 @@ module GObject
         raise GirFFI::PropertyNotFoundError.new(property_name, self.class)
     end
 
-    # TODO: Move to ITypeInfo and unify with ArgHelper.cast_from_pointer
-    def property_value_post_conversion(val, type_info)
-      case type_info.flattened_tag
-      when :ghash
-        GLib::HashTable.from type_info.element_type, val
-      when :glist
-        GLib::List.from type_info.element_type, val
-      when :callback
-        GirFFI::Builder.build_class(type_info.interface).wrap val
-      else
-        val
+    # Overrides for GObject, GObject's generic base class.
+    module Overrides
+      # @deprecated
+      def get_property_extended(property_name)
+        get_property(property_name)
       end
-    end
 
-    # TODO: Move to ITypeInfo and unify with ArgHelper.cast_from_pointer
-    def property_value_pre_conversion(val, type_info)
-      case type_info.flattened_tag
-      when :ghash
-        GLib::HashTable.from type_info.element_type, val
-      when :glist
-        GLib::List.from type_info.element_type, val
-      when :strv
-        GLib::Strv.from val
-      when :callback
-        GirFFI::Builder.build_class(type_info.interface).from val
-      else
-        val
+      def get_property(property_name)
+        gvalue = gvalue_for_property property_name
+        super property_name, gvalue
+        value = gvalue.get_value
+
+        type_info = get_property_type property_name
+        value = property_value_post_conversion(value, type_info) if type_info
+
+        value
+      end
+
+      # @deprecated
+      def set_property_extended(property_name, value)
+        set_property property_name, value
+      end
+
+      def set_property(property_name, value)
+        type_info = get_property_type property_name
+        value = property_value_pre_conversion(value, type_info) if type_info
+
+        gvalue = gvalue_for_property(property_name)
+        gvalue.set_value value
+
+        super property_name, gvalue
+      end
+
+      private
+
+      def get_property_type(property_name)
+        self.class.find_property(property_name)&.property_type
+      end
+
+      # TODO: Move to ITypeInfo and unify with ArgHelper.cast_from_pointer
+      def property_value_post_conversion(val, type_info)
+        case type_info.flattened_tag
+        when :ghash
+          GLib::HashTable.from type_info.element_type, val
+        when :glist
+          GLib::List.from type_info.element_type, val
+        when :callback
+          GirFFI::Builder.build_class(type_info.interface).wrap val
+        else
+          val
+        end
+      end
+
+      # TODO: Move to ITypeInfo and unify with ArgHelper.cast_from_pointer
+      def property_value_pre_conversion(val, type_info)
+        case type_info.flattened_tag
+        when :ghash
+          GLib::HashTable.from type_info.element_type, val
+        when :glist
+          GLib::List.from type_info.element_type, val
+        when :strv
+          GLib::Strv.from val
+        when :byte_array
+          GLib::ByteArray.from val
+        when :callback
+          GirFFI::Builder.build_class(type_info.interface).from val
+        else
+          val
+        end
       end
     end
+
+    prepend Overrides
   end
 end