gir_ffi 0.7.10 → 0.8.0

data/lib/ffi-gobject/closure.rb

@@ -8,7 +8,7 @@ module GObject
     # @override
     #
     # @param [Proc] marshal The marshaller to use for this closure object
-    def set_marshal marshal
+    def set_marshal(marshal)
       callback = GObject::ClosureMarshal.from marshal
       Lib.g_closure_set_marshal self, callback
     end

data/lib/ffi-gobject/initially_unowned.rb

@@ -4,10 +4,11 @@ module GObject
   # Overrides for GInitiallyUnowned, GObject's base class for objects that
   # start with a floating reference.
   class InitiallyUnowned
-    # Wrapping method used in constructors. For InitiallyUnowned and
+    # Initializing method used in constructors. For InitiallyUnowned and
     # descendants, this needs to sink the object's floating reference.
-    def self.constructor_wrap ptr
-      super.tap { |obj| ::GObject::Lib.g_object_ref_sink obj }
+    def store_pointer(ptr)
+      super
+      ::GObject::Lib.g_object_ref_sink ptr
     end
   end
 end

data/lib/ffi-gobject/object.rb

@@ -5,25 +5,25 @@ module GObject
   class Object
     setup_method 'new'
 
-    def self.constructor_wrap ptr
-      super.tap do |obj|
-        ObjectSpace.define_finalizer obj, make_finalizer(ptr, obj.class.name) if obj
-      end
+    def store_pointer(ptr)
+      super
+      klass = self.class
+      ObjectSpace.define_finalizer self, klass.make_finalizer(ptr, klass.name)
     end
 
-    def self.make_finalizer ptr, name
-      proc {
+    def self.make_finalizer(ptr, name)
+      proc do
         rc = GObject::Object::Struct.new(ptr)[:ref_count]
-        if rc == 0 
+        if rc == 0
           warn "not unreffing #{name}:#{ptr} (#{rc})"
         else
           GObject::Lib.g_object_unref ptr
         end
-      }
+      end
     end
 
     # TODO: Generate accessor methods from GIR at class definition time
-    def method_missing method, *args
+    def method_missing(method, *args)
       getter_name = "get_#{method}"
       return send(getter_name, *args) if respond_to?(getter_name)
       if method.to_s =~ /(.*)=$/
@@ -33,18 +33,18 @@ module GObject
       super
     end
 
-    def signal_connect event, data = nil, &block
+    def signal_connect(event, data = nil, &block)
       GObject.signal_connect(self, event, data, &block)
     end
 
-    def signal_connect_after event, data = nil, &block
+    def signal_connect_after(event, data = nil, &block)
       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
+    def get_property_extended(property_name)
       gvalue = get_property property_name
       type_info = get_property_type property_name
       case type_info.tag
@@ -55,25 +55,25 @@ module GObject
       end
     end
 
-    def get_property_with_override property_name
+    def get_property_with_override(property_name)
       pspec = type_class.find_property property_name
 
-      gvalue = GObject::Value.for_g_type pspec.value_type
+      gvalue = GObject::Value.for_gtype pspec.value_type
       get_property_without_override property_name, gvalue
 
       gvalue
     end
 
-    def set_property_extended property_name, value
+    def set_property_extended(property_name, value)
       type_info = get_property_type property_name
       adjusted_value = adjust_value_to_type(value, type_info)
 
       set_property property_name, adjusted_value
     end
 
-    def set_property_with_override property_name, value
+    def set_property_with_override(property_name, value)
       pspec = type_class.find_property property_name
-      gvalue = GObject::Value.for_g_type pspec.value_type
+      gvalue = GObject::Value.for_gtype pspec.value_type
       gvalue.set_value value
       set_property_without_override property_name, gvalue
     end
@@ -93,13 +93,13 @@ module GObject
 
     private
 
-    def get_property_type property_name
+    def get_property_type(property_name)
       prop = self.class.find_property property_name
       prop.property_type
     end
 
     # TODO: Move to ITypeInfo
-    def adjust_value_to_type val, type_info
+    def adjust_value_to_type(val, type_info)
       case type_info.flattened_tag
       when :ghash
         GLib::HashTable.from type_info.element_type, val

data/lib/ffi-gobject/object_class.rb

@@ -3,11 +3,11 @@ GObject.load_class :ObjectClass
 module GObject
   # Overrides for GObjectClass, a struct containing GObject's class data
   class ObjectClass
-    def set_property= callback
+    def set_property=(callback)
       @struct[:set_property] = GObject::ObjectSetPropertyFunc.from callback
     end
 
-    def get_property= callback
+    def get_property=(callback)
       @struct[:get_property] = GObject::ObjectGetPropertyFunc.from callback
     end
   end

data/lib/ffi-gobject/ruby_closure.rb

@@ -15,7 +15,7 @@ module GObject
              :block_id, :int64
     end
 
-    def self.new &block
+    def self.new(&block)
       raise ArgumentError unless block_given?
 
       closure = wrap(new_simple(self::Struct.size, nil).to_ptr)
@@ -26,7 +26,8 @@ module GObject
     end
 
     # @api private
-    def self.marshaller closure, return_value, param_values, _invocation_hint, _marshal_data
+    def self.marshaller(closure, return_value, param_values, _invocation_hint,
+                        _marshal_data)
       # TODO: Improve by registering RubyClosure as a GObject type
       rclosure = wrap(closure.to_ptr)
       param_values ||= []
@@ -40,14 +41,14 @@ module GObject
 
     # @api private
     # TODO: Re-structure so block= and invoke_block can become private methods
-    def block= block
+    def block=(block)
       id = block.object_id
       BLOCK_STORE[id] = block
       @struct[:block_id] = id
     end
 
     # @api private
-    def invoke_block *args
+    def invoke_block(*args)
       block.call(*args)
     end
 

data/lib/ffi-gobject/value.rb

@@ -5,7 +5,7 @@ module GObject
   class Value
     setup_instance_method 'init'
 
-    def init_with_finalizer type
+    def init_with_finalizer(type)
       init_without_finalizer(type).tap do
         ObjectSpace.define_finalizer self, self.class.make_finalizer(to_ptr)
       end
@@ -14,14 +14,14 @@ module GObject
     alias_method :init_without_finalizer, :init
     alias_method :init, :init_with_finalizer
 
-    def self.make_finalizer ptr
-      proc {
+    def self.make_finalizer(ptr)
+      proc do
         GObject::Lib.g_value_unset ptr
-      }
+      end
     end
 
     # TODO: Give more generic name
-    def set_ruby_value val
+    def set_ruby_value(val)
       init_for_ruby_value val if current_gtype == 0
       set_value val
     end
@@ -49,7 +49,7 @@ module GObject
       TYPE_VARIANT => [:get_variant,       :set_variant]
     }
 
-    def set_value val
+    def set_value(val)
       send set_method, val
     end
 
@@ -62,7 +62,7 @@ module GObject
       String => TYPE_STRING
     }
 
-    def init_for_ruby_value val
+    def init_for_ruby_value(val)
       CLASS_TO_GTYPE_MAP.each do |klass, type|
         if val.is_a? klass
           init type
@@ -98,11 +98,11 @@ module GObject
     end
 
     # TODO: Give more generic name
-    def self.wrap_ruby_value val
+    def self.wrap_ruby_value(val)
       new.tap { |gv| gv.set_ruby_value val }
     end
 
-    def self.from val
+    def self.from(val)
       case val
       when self
         val
@@ -113,12 +113,7 @@ module GObject
       end
     end
 
-    # @deprecated Use GObject::Value.for_gtype instead. Will be removed in 0.8.0.
-    def self.for_g_type g_type
-      for_gtype g_type
-    end
-
-    def self.for_gtype gtype
+    def self.for_gtype(gtype)
       return nil if gtype == TYPE_NONE
       new.tap do |it|
         it.init gtype
@@ -126,7 +121,7 @@ module GObject
     end
 
     # TODO: Combine with wrap_ruby_value
-    def self.wrap_instance instance
+    def self.wrap_instance(instance)
       new.tap do |it|
         it.init GObject.type_from_instance instance
         it.set_instance instance
@@ -135,12 +130,12 @@ module GObject
 
     private
 
-    def set_instance_enhanced val
+    def set_instance_enhanced(val)
       check_type_compatibility val if val
       set_instance val
     end
 
-    def set_enum_enhanced val
+    def set_enum_enhanced(val)
       val = current_gtype_class[val] if val.is_a? Symbol
       set_enum val
     end
@@ -153,13 +148,13 @@ module GObject
       GirFFI::Builder.build_by_gtype(current_gtype)
     end
 
-    def check_type_compatibility val
+    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
     end
 
-    def wrap_boxed boxed
+    def wrap_boxed(boxed)
       case current_gtype
       when TYPE_STRV
         GLib::Strv.wrap boxed

data/lib/ffi-gobject_introspection/g_error.rb

@@ -8,7 +8,7 @@ module GObjectIntrospection
              :message, :string
     end
 
-    def initialize ptr
+    def initialize(ptr)
       @struct = self.class::Struct.new(ptr)
     end
 

data/lib/ffi-gobject_introspection/i_base_info.rb

@@ -2,7 +2,7 @@ module GObjectIntrospection
   # Wraps GIBaseInfo struct, the base \type for all info types.
   # Decendant types will be implemented as needed.
   class IBaseInfo
-    def initialize ptr, lib = Lib
+    def initialize(ptr, lib = Lib)
       raise ArgumentError, 'ptr must not be null' if ptr.null?
 
       ObjectSpace.define_finalizer self, self.class.make_finalizer(lib, ptr)
@@ -11,7 +11,7 @@ module GObjectIntrospection
       @lib = lib
     end
 
-    def self.make_finalizer lib, ptr
+    def self.make_finalizer(lib, ptr)
       proc { lib.g_base_info_unref ptr }
     end
 
@@ -34,7 +34,7 @@ module GObjectIntrospection
     #   build_array_mehtod :properties, :property
     #   build_array_method :get_methods
     #
-    def self.build_array_method method, single = nil
+    def self.build_array_method(method, single = nil)
       method = method.to_s
       single ||= method.to_s[0..-2]
       count = method.sub(/^(get_)?/, '\\1n_')
@@ -63,7 +63,7 @@ module GObjectIntrospection
     #   build_finder_method :find_property, :n_properties
     #   build_finder_method :find_method, :get_n_methods, :get_method
     #
-    def self.build_finder_method method, counter = nil, fetcher = nil
+    def self.build_finder_method(method, counter = nil, fetcher = nil)
       method = method.to_s
       single = method.sub(/^find_/, '')
       counter ||= "n_#{single}s"
@@ -105,11 +105,11 @@ module GObjectIntrospection
       Lib.g_base_info_is_deprecated @gobj
     end
 
-    def self.wrap ptr
+    def self.wrap(ptr)
       new ptr unless ptr.null?
     end
 
-    def == other
+    def ==(other)
       other.is_a?(IBaseInfo) && Lib.g_base_info_equal(@gobj, other)
     end
   end

data/lib/ffi-gobject_introspection/i_callable_info.rb

@@ -22,7 +22,7 @@ module GObjectIntrospection
       Lib.g_callable_info_get_n_args @gobj
     end
 
-    def arg index
+    def arg(index)
       IArgInfo.wrap(Lib.g_callable_info_get_arg @gobj, index)
     end
     ##

data/lib/ffi-gobject_introspection/i_enum_info.rb

@@ -6,7 +6,7 @@ module GObjectIntrospection
       Lib.g_enum_info_get_n_values @gobj
     end
 
-    def value index
+    def value(index)
       IValueInfo.wrap(Lib.g_enum_info_get_value @gobj, index)
     end
     ##
@@ -16,7 +16,7 @@ module GObjectIntrospection
       Lib.g_enum_info_get_n_methods @gobj
     end
 
-    def get_method index
+    def get_method(index)
       IFunctionInfo.wrap(Lib.g_enum_info_get_method @gobj, index)
     end
 

data/lib/ffi-gobject_introspection/i_interface_info.rb

@@ -6,7 +6,7 @@ module GObjectIntrospection
       Lib.g_interface_info_get_n_prerequisites @gobj
     end
 
-    def prerequisite index
+    def prerequisite(index)
       IBaseInfo.wrap(Lib.g_interface_info_get_prerequisite @gobj, index)
     end
 
@@ -17,7 +17,7 @@ module GObjectIntrospection
       Lib.g_interface_info_get_n_properties @gobj
     end
 
-    def property index
+    def property(index)
       IPropertyInfo.wrap(Lib.g_interface_info_get_property @gobj, index)
     end
 
@@ -29,14 +29,14 @@ module GObjectIntrospection
       Lib.g_interface_info_get_n_methods @gobj
     end
 
-    def get_method index
+    def get_method(index)
       IFunctionInfo.wrap(Lib.g_interface_info_get_method @gobj, index)
     end
 
     ##
     build_array_method :get_methods
 
-    def find_method name
+    def find_method(name)
       IFunctionInfo.wrap(Lib.g_interface_info_find_method @gobj, name)
     end
 
@@ -44,7 +44,7 @@ module GObjectIntrospection
       Lib.g_interface_info_get_n_signals @gobj
     end
 
-    def signal index
+    def signal(index)
       ISignalInfo.wrap(Lib.g_interface_info_get_signal @gobj, index)
     end
 
@@ -56,14 +56,14 @@ module GObjectIntrospection
       Lib.g_interface_info_get_n_vfuncs @gobj
     end
 
-    def vfunc index
+    def vfunc(index)
       IVFuncInfo.wrap(Lib.g_interface_info_get_vfunc @gobj, index)
     end
 
     ##
     build_array_method :vfuncs
 
-    def find_vfunc name
+    def find_vfunc(name)
       IVFuncInfo.wrap(Lib.g_interface_info_find_vfunc @gobj, name)
     end
 
@@ -71,7 +71,7 @@ module GObjectIntrospection
       Lib.g_interface_info_get_n_constants @gobj
     end
 
-    def constant index
+    def constant(index)
       IConstantInfo.wrap(Lib.g_interface_info_get_constant @gobj, index)
     end
 

data/lib/ffi-gobject_introspection/i_object_info.rb

@@ -26,7 +26,7 @@ module GObjectIntrospection
       Lib.g_object_info_get_n_interfaces @gobj
     end
 
-    def interface index
+    def interface(index)
       IInterfaceInfo.wrap(Lib.g_object_info_get_interface @gobj, index)
     end
 
@@ -37,7 +37,7 @@ module GObjectIntrospection
       Lib.g_object_info_get_n_fields @gobj
     end
 
-    def field index
+    def field(index)
       IFieldInfo.wrap(Lib.g_object_info_get_field @gobj, index)
     end
 
@@ -48,7 +48,7 @@ module GObjectIntrospection
       Lib.g_object_info_get_n_properties @gobj
     end
 
-    def property index
+    def property(index)
       IPropertyInfo.wrap(Lib.g_object_info_get_property @gobj, index)
     end
 
@@ -60,14 +60,14 @@ module GObjectIntrospection
       Lib.g_object_info_get_n_methods @gobj
     end
 
-    def get_method index
+    def get_method(index)
       IFunctionInfo.wrap(Lib.g_object_info_get_method @gobj, index)
     end
 
     ##
     build_array_method :get_methods
 
-    def find_method name
+    def find_method(name)
       IFunctionInfo.wrap(Lib.g_object_info_find_method @gobj, name)
     end
 
@@ -75,7 +75,7 @@ module GObjectIntrospection
       Lib.g_object_info_get_n_signals @gobj
     end
 
-    def signal index
+    def signal(index)
       ISignalInfo.wrap(Lib.g_object_info_get_signal @gobj, index)
     end
 
@@ -87,11 +87,11 @@ module GObjectIntrospection
       Lib.g_object_info_get_n_vfuncs @gobj
     end
 
-    def vfunc index
+    def vfunc(index)
       IVFuncInfo.wrap(Lib.g_object_info_get_vfunc @gobj, index)
     end
 
-    def find_vfunc name
+    def find_vfunc(name)
       IVFuncInfo.wrap(Lib.g_object_info_find_vfunc @gobj, name)
     end
     ##
@@ -101,7 +101,7 @@ module GObjectIntrospection
       Lib.g_object_info_get_n_constants @gobj
     end
 
-    def constant index
+    def constant(index)
       IConstantInfo.wrap(Lib.g_object_info_get_constant @gobj, index)
     end
     ##