gir_ffi 0.12.1 → 0.13.0

data/lib/ffi-glib/bytes.rb

@@ -23,14 +23,14 @@ module GLib
       data.each(&block)
     end
 
-    def self.from(it)
-      case it
+    def self.from(obj)
+      case obj
       when self
-        it
+        obj
       when FFI::Pointer
-        wrap it
+        wrap obj
       else
-        new it
+        new obj
       end
     end
 

data/lib/ffi-glib/container_class_methods.rb

@@ -22,18 +22,18 @@ module GLib
       end
     end
 
-    def from(typespec = :void, it)
-      case it
+    def from(typespec = :void, obj)
+      case obj
       when nil
         nil
       when FFI::Pointer
-        wrap typespec, it
+        wrap typespec, obj
       when self
-        it.reset_typespec typespec
+        obj.reset_typespec typespec
       when GirFFI::BoxedBase
-        wrap typespec, it.to_ptr
+        wrap typespec, obj.to_ptr
       else
-        from_enumerable typespec, it
+        from_enumerable typespec, obj
       end
     end
   end

data/lib/ffi-glib/error.rb

@@ -7,12 +7,12 @@ module GLib
   class Error
     GIR_FFI_DOMAIN = GLib.quark_from_string('gir_ffi')
 
-    def self.from_exception(ex)
-      new_literal GIR_FFI_DOMAIN, 0, ex.message
+    def self.from_exception(exception)
+      new_literal GIR_FFI_DOMAIN, 0, exception.message
     end
 
-    def self.from(it)
-      from_exception it
+    def self.from(obj)
+      from_exception obj
     end
   end
 end

data/lib/ffi-glib/main_loop.rb

@@ -37,27 +37,27 @@ module GLib
     EXCEPTIONS = []
     RUNNING_LOOPS = []
 
-    setup_instance_method :run
+    setup_instance_method! :run
 
     def run_with_thread_enabler
       ThreadEnabler.instance.setup_idle_handler if RUBY_ENGINE == 'ruby'
       RUNNING_LOOPS << self
       result = run_without_thread_enabler
-      ex = EXCEPTIONS.shift
+      exception = EXCEPTIONS.shift
       RUNNING_LOOPS.pop
-      raise ex if ex
+      raise exception if exception
       result
     end
 
-    def self.handle_exception(ex)
+    def self.handle_exception(exception)
       current_loop = RUNNING_LOOPS.last
-      raise ex unless current_loop
-      EXCEPTIONS << ex
+      raise exception unless current_loop
+      EXCEPTIONS << exception
       current_loop.quit
     end
 
-    alias_method :run_without_thread_enabler, :run
-    alias_method :run, :run_with_thread_enabler
+    alias run_without_thread_enabler run
+    alias run run_with_thread_enabler
   end
 end
 

data/lib/ffi-glib/ptr_array.rb

@@ -27,8 +27,8 @@ module GLib
       store_pointer Lib.g_ptr_array_new
     end
 
-    def self.from_enumerable(type, it)
-      new(type).tap { |arr| arr.add_array it }
+    def self.from_enumerable(type, arr)
+      new(type).tap { |it| it.add_array arr }
     end
 
     def self.add(array, data)

data/lib/ffi-glib/strv.rb

@@ -10,16 +10,16 @@ module GLib
       to_a == other.to_a
     end
 
-    def self.from(it)
-      case it
+    def self.from(obj)
+      case obj
       when nil
         nil
       when FFI::Pointer
-        wrap it
+        wrap obj
       when self
-        it
+        obj
       else
-        from_enumerable it
+        from_enumerable obj
       end
     end
 

data/lib/ffi-glib/variant.rb

@@ -5,14 +5,14 @@ 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
     end
 
-    alias_method :get_string_without_override, :get_string
-    alias_method :get_string, :get_string_with_override
+    alias get_string_without_override get_string
+    alias get_string get_string_with_override
 
     # Initializing method used in constructors. For Variant, this needs to sink
     # the variant's floating reference.

data/lib/ffi-gobject.rb

@@ -87,6 +87,7 @@ module GObject
     attach_function :g_object_ref_sink, [:pointer], :pointer
     attach_function :g_object_ref, [:pointer], :pointer
     attach_function :g_object_unref, [:pointer], :pointer
+    attach_function :g_object_new, [:size_t, :pointer], :pointer
 
     attach_function :g_value_copy, [:pointer, :pointer], :void
     attach_function :g_value_init, [:pointer, :size_t], :pointer

data/lib/ffi-gobject/closure.rb

@@ -7,8 +7,8 @@ module GObject
   #
   # To create Closure objects wrapping Ruby code, use {RubyClosure}.
   class Closure
-    setup_method :new_simple
-    setup_instance_method :invoke
+    setup_method! :new_simple
+    setup_instance_method! :invoke
 
     # @override
     #

data/lib/ffi-gobject/object.rb

@@ -7,11 +7,20 @@ GObject.load_class :Object
 module GObject
   # Overrides for GObject, GObject's generic base class.
   class Object
-    setup_method 'new'
     if !GLib.check_version(2, 54, 0)
-      setup_method 'newv'
+      GObject::Lib.attach_function(:g_object_new_with_properties,
+                                   [:size_t, :uint32, :pointer, :pointer],
+                                   :pointer)
+
+      def self.new(*args, &block)
+        obj = allocate
+        obj.__send__ :initialize, *args, &block
+        obj
+      end
 
-      def initialize_with_automatic_gtype(properties = {})
+      # Starting with GLib 2.54.0, use g_object_new_with_properties, which
+      # takes an array of names and an array of values.
+      def initialize(properties = {})
         names = []
         values = []
         properties.each do |name, value|
@@ -22,9 +31,21 @@ module GObject
           names << name
           values << gvalue
         end
-        initialize_without_automatic_gtype(self.class.gtype, names, values)
+
+        n_properties = names.length
+        names_arr = GirFFI::SizedArray.from(:utf8, -1, names)
+        values_arr = GirFFI::SizedArray.from(GObject::Value, -1, values)
+
+        ptr = GObject::Lib.g_object_new_with_properties(self.class.gtype,
+                                                        n_properties,
+                                                        names_arr,
+                                                        values_arr)
+        store_pointer ptr
       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
@@ -36,11 +57,12 @@ module GObject
         end
         initialize_without_automatic_gtype(self.class.gtype, gparameters)
       end
+
+      alias initialize_without_automatic_gtype initialize
+      alias initialize initialize_with_automatic_gtype
     end
 
-    alias_method :initialize_without_automatic_gtype, :initialize
-    alias_method :initialize, :initialize_with_automatic_gtype
-    alias_method :base_initialize, :initialize
+    alias base_initialize initialize
 
     private :base_initialize
 
@@ -90,8 +112,8 @@ module GObject
       GObject.signal_connect_after(self, event, data, &block)
     end
 
-    setup_instance_method 'get_property'
-    setup_instance_method 'set_property'
+    setup_instance_method! 'get_property'
+    setup_instance_method! 'set_property'
 
     def get_property_extended(property_name)
       value = get_property(property_name)
@@ -117,14 +139,14 @@ module GObject
       set_property_without_override property_name, gvalue
     end
 
-    alias_method :get_property_without_override, :get_property
-    alias_method :get_property, :get_property_with_override
+    alias get_property_without_override get_property
+    alias get_property get_property_with_override
 
-    alias_method :set_property_without_override, :set_property
-    alias_method :set_property, :set_property_with_override
+    alias set_property_without_override set_property
+    alias set_property set_property_with_override
 
-    setup_instance_method 'is_floating'
-    alias_method :floating?, :is_floating
+    setup_instance_method! 'is_floating'
+    alias floating? is_floating
 
     private
 

data/lib/ffi-gobject/value.rb

@@ -58,7 +58,7 @@ module GObject
       send set_method, val
     end
 
-    alias_method :value=, :set_value
+    alias value= set_value
 
     def current_gtype
       @struct[:g_type]
@@ -146,7 +146,7 @@ module GObject
       raise "Can't handle #{val.class}"
     end
 
-    def set_none(_); end
+    def set_none(_val); end
 
     def get_none; end
 
@@ -169,9 +169,9 @@ module GObject
     end
 
     def check_type_compatibility(val)
-      unless GObject::Value.type_compatible(GObject.type_from_instance(val), current_gtype)
-        raise ArgumentError, "#{val.class} is incompatible with #{current_gtype_name}"
-      end
+      return if GObject::Value.type_compatible(GObject.type_from_instance(val), current_gtype)
+
+      raise ArgumentError, "#{val.class} is incompatible with #{current_gtype_name}"
     end
 
     def wrap_boxed(boxed)

data/lib/ffi-gobject_introspection/i_registered_type_info.rb

@@ -16,6 +16,6 @@ module GObjectIntrospection
       Lib.g_registered_type_info_get_g_type @gobj
     end
 
-    alias_method :gtype, :g_type
+    alias gtype g_type
   end
 end

data/lib/gir_ffi/builders/argument_builder.rb

@@ -32,9 +32,7 @@ module GirFFI
       end
 
       def return_value_name
-        if has_output_value?
-          post_converted_name unless array_length_parameter?
-        end
+        post_converted_name if has_output_value? && !array_length_parameter?
       end
 
       def capture_variable_name

data/lib/gir_ffi/builders/argument_builder_collection.rb

@@ -76,13 +76,13 @@ module GirFFI
           end
         end
         all_builders.each do |bldr|
-          if (idx = bldr.array_length_idx) >= 0
-            other = @base_argument_builders[idx]
-            next unless other
+          idx = bldr.array_length_idx
+          next unless idx >= 0
+          other = @base_argument_builders[idx]
+          next unless other
 
-            bldr.length_arg = other
-            other.array_arg = bldr
-          end
+          bldr.length_arg = other
+          other.array_arg = bldr
         end
       end
 

data/lib/gir_ffi/builders/c_to_ruby_convertor.rb

@@ -60,11 +60,7 @@ module GirFFI
       end
 
       def array_size
-        if @length_arg
-          @length_arg
-        else
-          @type_info.array_fixed_size
-        end
+        @length_arg || @type_info.array_fixed_size
       end
 
       def argument_class

data/lib/gir_ffi/builders/callback_argument_builder.rb

@@ -37,15 +37,11 @@ module GirFFI
       end
 
       def call_argument_name
-        if [:in, :inout].include? direction
-          pre_converted_name unless array_arg
-        end
+        pre_converted_name if [:in, :inout].include?(direction) && !array_arg
       end
 
       def capture_variable_name
-        unless array_arg
-          result_name if [:out, :inout].include? direction
-        end
+        result_name if [:out, :inout].include?(direction) && !array_arg
       end
 
       def pre_conversion

data/lib/gir_ffi/builders/module_builder.rb

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

data/lib/gir_ffi/builders/null_class_builder.rb

@@ -4,11 +4,11 @@ module GirFFI
   module Builders
     # Class builder that does nothing
     class NullClassBuilder
-      def setup_method(_)
+      def setup_method(_method)
         nil
       end
 
-      def setup_instance_method(_)
+      def setup_instance_method(_method)
         nil
       end
     end

data/lib/gir_ffi/builders/user_defined_builder.rb

@@ -127,7 +127,7 @@ module GirFFI
           superclass.gir_ffi_builder.object_class_struct::Struct.new(object_class_ptr)
 
         info.vfunc_implementations.each do |impl|
-          setup_vfunc super_class_struct, impl
+          setup_vfunc parent_info, super_class_struct, impl
         end
       end
 
@@ -138,26 +138,16 @@ module GirFFI
         interface_info = interface_builder.info
 
         info.vfunc_implementations.each do |impl|
-          setup_interface_vfunc interface_info, interface_struct, impl
+          setup_vfunc interface_info, interface_struct, impl
         end
       end
 
-      def setup_vfunc(super_class_struct, impl)
+      def setup_vfunc(ancestor_info, ancestor_struct, impl)
         vfunc_name = impl.name
-        vfunc_info = parent_info.find_vfunc vfunc_name.to_s
+        vfunc_info = ancestor_info.find_vfunc vfunc_name.to_s
+        return unless vfunc_info
 
-        if vfunc_info
-          install_vfunc super_class_struct, vfunc_name, vfunc_info, impl.implementation
-        end
-      end
-
-      def setup_interface_vfunc(interface_info, interface_struct, impl)
-        vfunc_name = impl.name
-        vfunc_info = interface_info.find_vfunc vfunc_name.to_s
-
-        if vfunc_info
-          install_vfunc interface_struct, vfunc_name, vfunc_info, impl.implementation
-        end
+        install_vfunc ancestor_struct, vfunc_name, vfunc_info, impl.implementation
       end
 
       def install_vfunc(container_struct, vfunc_name, vfunc_info, implementation)
@@ -265,7 +255,7 @@ module GirFFI
       def setup_constructor
         code = <<-CODE
         def initialize
-          ptr = GObject::Lib.g_object_newv #{@gtype}, 0, nil
+          ptr = GObject::Lib.g_object_new #{@gtype}, nil
           store_pointer(ptr)
         end
         CODE