gir_ffi 0.13.0 → 0.13.1

data/lib/ffi-gobject_introspection/i_callable_info.rb

@@ -9,37 +9,37 @@ module GObjectIntrospection
   # IFunctionInfo, ICallbackInfo or IVFuncInfo.
   class ICallableInfo < IBaseInfo
     def return_type
-      ITypeInfo.wrap Lib.g_callable_info_get_return_type(@gobj)
+      ITypeInfo.wrap Lib.g_callable_info_get_return_type(self)
     end
 
     def caller_owns
-      Lib.g_callable_info_get_caller_owns @gobj
+      Lib.g_callable_info_get_caller_owns self
     end
 
     def may_return_null?
-      Lib.g_callable_info_may_return_null @gobj
+      Lib.g_callable_info_may_return_null self
     end
 
     def can_throw_gerror?
-      Lib.g_callable_info_can_throw_gerror @gobj
+      Lib.g_callable_info_can_throw_gerror self
     end
 
     def n_args
-      Lib.g_callable_info_get_n_args @gobj
+      Lib.g_callable_info_get_n_args self
     end
 
     def arg(index)
-      IArgInfo.wrap Lib.g_callable_info_get_arg(@gobj, index)
+      IArgInfo.wrap Lib.g_callable_info_get_arg(self, index)
     end
     ##
     build_array_method :args
 
     def skip_return?
-      Lib.g_callable_info_skip_return @gobj
+      Lib.g_callable_info_skip_return self
     end
 
     def instance_ownership_transfer
-      Lib.g_callable_info_get_instance_ownership_transfer @gobj
+      Lib.g_callable_info_get_instance_ownership_transfer self
     end
   end
 end

data/lib/ffi-gobject_introspection/i_enum_info.rb

@@ -5,21 +5,21 @@ module GObjectIntrospection
   # If it represents a flag, an IFlagsInfo object is used instead.
   class IEnumInfo < IRegisteredTypeInfo
     def n_values
-      Lib.g_enum_info_get_n_values @gobj
+      Lib.g_enum_info_get_n_values self
     end
 
     def value(index)
-      IValueInfo.wrap Lib.g_enum_info_get_value(@gobj, index)
+      IValueInfo.wrap Lib.g_enum_info_get_value(self, index)
     end
     ##
     build_array_method :values
 
     def get_n_methods
-      Lib.g_enum_info_get_n_methods @gobj
+      Lib.g_enum_info_get_n_methods self
     end
 
     def get_method(index)
-      IFunctionInfo.wrap Lib.g_enum_info_get_method(@gobj, index)
+      IFunctionInfo.wrap Lib.g_enum_info_get_method(self, index)
     end
 
     ##
@@ -27,7 +27,7 @@ module GObjectIntrospection
     build_finder_method :find_method, :get_n_methods, :get_method
 
     def storage_type
-      Lib.g_enum_info_get_storage_type @gobj
+      Lib.g_enum_info_get_storage_type self
     end
   end
 end

data/lib/ffi-gobject_introspection/i_field_info.rb

@@ -5,19 +5,19 @@ module GObjectIntrospection
   # Represents a field of an IStructInfo or an IUnionInfo.
   class IFieldInfo < IBaseInfo
     def flags
-      Lib.g_field_info_get_flags @gobj
+      Lib.g_field_info_get_flags self
     end
 
     def size
-      Lib.g_field_info_get_size @gobj
+      Lib.g_field_info_get_size self
     end
 
     def offset
-      Lib.g_field_info_get_offset @gobj
+      Lib.g_field_info_get_offset self
     end
 
     def field_type
-      ITypeInfo.wrap Lib.g_field_info_get_type(@gobj)
+      ITypeInfo.wrap Lib.g_field_info_get_type(self)
     end
 
     def readable?

data/lib/ffi-gobject_introspection/i_function_info.rb

@@ -5,11 +5,11 @@ module GObjectIntrospection
   # Represents a function or method.
   class IFunctionInfo < ICallableInfo
     def symbol
-      Lib.g_function_info_get_symbol @gobj
+      Lib.g_function_info_get_symbol self
     end
 
     def flags
-      Lib.g_function_info_get_flags @gobj
+      Lib.g_function_info_get_flags self
     end
 
     def method?

data/lib/ffi-gobject_introspection/i_interface_info.rb

@@ -5,22 +5,22 @@ module GObjectIntrospection
   # Represents an interface.
   class IInterfaceInfo < IRegisteredTypeInfo
     def n_prerequisites
-      Lib.g_interface_info_get_n_prerequisites @gobj
+      Lib.g_interface_info_get_n_prerequisites self
     end
 
     def prerequisite(index)
-      IBaseInfo.wrap Lib.g_interface_info_get_prerequisite(@gobj, index)
+      IBaseInfo.wrap Lib.g_interface_info_get_prerequisite(self, index)
     end
 
     ##
     build_array_method :prerequisites
 
     def n_properties
-      Lib.g_interface_info_get_n_properties @gobj
+      Lib.g_interface_info_get_n_properties self
     end
 
     def property(index)
-      IPropertyInfo.wrap Lib.g_interface_info_get_property(@gobj, index)
+      IPropertyInfo.wrap Lib.g_interface_info_get_property(self, index)
     end
 
     ##
@@ -28,26 +28,26 @@ module GObjectIntrospection
     build_finder_method :find_property, :n_properties
 
     def get_n_methods
-      Lib.g_interface_info_get_n_methods @gobj
+      Lib.g_interface_info_get_n_methods self
     end
 
     def get_method(index)
-      IFunctionInfo.wrap Lib.g_interface_info_get_method(@gobj, index)
+      IFunctionInfo.wrap Lib.g_interface_info_get_method(self, index)
     end
 
     ##
     build_array_method :get_methods
 
     def find_method(name)
-      IFunctionInfo.wrap Lib.g_interface_info_find_method(@gobj, name.to_s)
+      IFunctionInfo.wrap Lib.g_interface_info_find_method(self, name.to_s)
     end
 
     def n_signals
-      Lib.g_interface_info_get_n_signals @gobj
+      Lib.g_interface_info_get_n_signals self
     end
 
     def signal(index)
-      ISignalInfo.wrap Lib.g_interface_info_get_signal(@gobj, index)
+      ISignalInfo.wrap Lib.g_interface_info_get_signal(self, index)
     end
 
     ##
@@ -55,33 +55,33 @@ module GObjectIntrospection
     build_finder_method :find_signal
 
     def n_vfuncs
-      Lib.g_interface_info_get_n_vfuncs @gobj
+      Lib.g_interface_info_get_n_vfuncs self
     end
 
     def vfunc(index)
-      IVFuncInfo.wrap Lib.g_interface_info_get_vfunc(@gobj, index)
+      IVFuncInfo.wrap Lib.g_interface_info_get_vfunc(self, index)
     end
 
     ##
     build_array_method :vfuncs
 
     def find_vfunc(name)
-      IVFuncInfo.wrap Lib.g_interface_info_find_vfunc(@gobj, name)
+      IVFuncInfo.wrap Lib.g_interface_info_find_vfunc(self, name)
     end
 
     def n_constants
-      Lib.g_interface_info_get_n_constants @gobj
+      Lib.g_interface_info_get_n_constants self
     end
 
     def constant(index)
-      IConstantInfo.wrap Lib.g_interface_info_get_constant(@gobj, index)
+      IConstantInfo.wrap Lib.g_interface_info_get_constant(self, index)
     end
 
     ##
     build_array_method :constants
 
     def iface_struct
-      IStructInfo.wrap Lib.g_interface_info_get_iface_struct(@gobj)
+      IStructInfo.wrap Lib.g_interface_info_get_iface_struct(self)
     end
   end
 end

data/lib/ffi-gobject_introspection/i_object_info.rb

@@ -5,53 +5,53 @@ module GObjectIntrospection
   # Represents an object.
   class IObjectInfo < IRegisteredTypeInfo
     def type_name
-      Lib.g_object_info_get_type_name @gobj
+      Lib.g_object_info_get_type_name self
     end
 
     def type_init
-      Lib.g_object_info_get_type_init @gobj
+      Lib.g_object_info_get_type_init self
     end
 
     def abstract?
-      Lib.g_object_info_get_abstract @gobj
+      Lib.g_object_info_get_abstract self
     end
 
     def fundamental?
-      Lib.g_object_info_get_fundamental @gobj
+      Lib.g_object_info_get_fundamental self
     end
 
     def parent
-      IObjectInfo.wrap Lib.g_object_info_get_parent(@gobj)
+      IObjectInfo.wrap Lib.g_object_info_get_parent(self)
     end
 
     def n_interfaces
-      Lib.g_object_info_get_n_interfaces @gobj
+      Lib.g_object_info_get_n_interfaces self
     end
 
     def interface(index)
-      IInterfaceInfo.wrap Lib.g_object_info_get_interface(@gobj, index)
+      IInterfaceInfo.wrap Lib.g_object_info_get_interface(self, index)
     end
 
     ##
     build_array_method :interfaces
 
     def n_fields
-      Lib.g_object_info_get_n_fields @gobj
+      Lib.g_object_info_get_n_fields self
     end
 
     def field(index)
-      IFieldInfo.wrap Lib.g_object_info_get_field(@gobj, index)
+      IFieldInfo.wrap Lib.g_object_info_get_field(self, index)
     end
 
     ##
     build_array_method :fields
 
     def n_properties
-      Lib.g_object_info_get_n_properties @gobj
+      Lib.g_object_info_get_n_properties self
     end
 
     def property(index)
-      IPropertyInfo.wrap Lib.g_object_info_get_property(@gobj, index)
+      IPropertyInfo.wrap Lib.g_object_info_get_property(self, index)
     end
 
     def properties
@@ -64,26 +64,26 @@ module GObjectIntrospection
     end
 
     def get_n_methods
-      Lib.g_object_info_get_n_methods @gobj
+      Lib.g_object_info_get_n_methods self
     end
 
     def get_method(index)
-      IFunctionInfo.wrap Lib.g_object_info_get_method(@gobj, index)
+      IFunctionInfo.wrap Lib.g_object_info_get_method(self, index)
     end
 
     ##
     build_array_method :get_methods
 
     def find_method(name)
-      IFunctionInfo.wrap Lib.g_object_info_find_method(@gobj, name.to_s)
+      IFunctionInfo.wrap Lib.g_object_info_find_method(self, name.to_s)
     end
 
     def n_signals
-      Lib.g_object_info_get_n_signals @gobj
+      Lib.g_object_info_get_n_signals self
     end
 
     def signal(index)
-      ISignalInfo.wrap Lib.g_object_info_get_signal(@gobj, index)
+      ISignalInfo.wrap Lib.g_object_info_get_signal(self, index)
     end
 
     ##
@@ -91,31 +91,31 @@ module GObjectIntrospection
     build_finder_method :find_signal
 
     def n_vfuncs
-      Lib.g_object_info_get_n_vfuncs @gobj
+      Lib.g_object_info_get_n_vfuncs self
     end
 
     def vfunc(index)
-      IVFuncInfo.wrap Lib.g_object_info_get_vfunc(@gobj, index)
+      IVFuncInfo.wrap Lib.g_object_info_get_vfunc(self, index)
     end
 
     def find_vfunc(name)
-      IVFuncInfo.wrap Lib.g_object_info_find_vfunc(@gobj, name.to_s)
+      IVFuncInfo.wrap Lib.g_object_info_find_vfunc(self, name.to_s)
     end
     ##
     build_array_method :vfuncs
 
     def n_constants
-      Lib.g_object_info_get_n_constants @gobj
+      Lib.g_object_info_get_n_constants self
     end
 
     def constant(index)
-      IConstantInfo.wrap Lib.g_object_info_get_constant(@gobj, index)
+      IConstantInfo.wrap Lib.g_object_info_get_constant(self, index)
     end
     ##
     build_array_method :constants
 
     def class_struct
-      IStructInfo.wrap Lib.g_object_info_get_class_struct(@gobj)
+      IStructInfo.wrap Lib.g_object_info_get_class_struct(self)
     end
   end
 end

data/lib/ffi-gobject_introspection/i_property_info.rb

@@ -5,11 +5,11 @@ module GObjectIntrospection
   # Represents a property of an IObjectInfo or an IInterfaceInfo.
   class IPropertyInfo < IBaseInfo
     def property_type
-      ITypeInfo.wrap Lib.g_property_info_get_type(@gobj)
+      ITypeInfo.wrap Lib.g_property_info_get_type(self)
     end
 
     def flags
-      Lib.g_property_info_get_flags @gobj
+      Lib.g_property_info_get_flags self
     end
 
     def readable?

data/lib/ffi-gobject_introspection/i_registered_type_info.rb

@@ -5,15 +5,15 @@ module GObjectIntrospection
   # Represents a registered type.
   class IRegisteredTypeInfo < IBaseInfo
     def type_name
-      Lib.g_registered_type_info_get_type_name @gobj
+      Lib.g_registered_type_info_get_type_name self
     end
 
     def type_init
-      Lib.g_registered_type_info_get_type_init @gobj
+      Lib.g_registered_type_info_get_type_init self
     end
 
     def g_type
-      Lib.g_registered_type_info_get_g_type @gobj
+      Lib.g_registered_type_info_get_g_type self
     end
 
     alias gtype g_type

data/lib/ffi-gobject_introspection/i_repository.rb

@@ -12,7 +12,11 @@ module GObjectIntrospection
   # This class wraps the GIRepository struct.
   class IRepository
     def initialize
-      @gobj = Lib.g_irepository_get_default
+      @pointer = Lib.g_irepository_get_default
+    end
+
+    def to_ptr
+      @pointer
     end
 
     include Singleton
@@ -32,18 +36,18 @@ module GObjectIntrospection
     def require(namespace, version = nil, flags = 0)
       errpp = FFI::MemoryPointer.new(:pointer).write_pointer nil
 
-      Lib.g_irepository_require @gobj, namespace, version, flags, errpp
+      Lib.g_irepository_require self, namespace, version, flags, errpp
 
       errp = errpp.read_pointer
       raise GError.new(errp).message unless errp.null?
     end
 
     def n_infos(namespace)
-      Lib.g_irepository_get_n_infos @gobj, namespace
+      Lib.g_irepository_get_n_infos self, namespace
     end
 
     def info(namespace, index)
-      wrap_info Lib.g_irepository_get_info(@gobj, namespace, index)
+      wrap_info Lib.g_irepository_get_info(self, namespace, index)
     end
 
     # Utility method
@@ -54,30 +58,32 @@ module GObjectIntrospection
     end
 
     def find_by_name(namespace, name)
-      wrap_info Lib.g_irepository_find_by_name(@gobj, namespace, name)
+      wrap_info Lib.g_irepository_find_by_name(self, namespace, name)
     end
 
     def find_by_gtype(gtype)
-      raise ArgumentError, "Type #{gtype} is not a valid type" if gtype.zero?
-      wrap_info Lib.g_irepository_find_by_gtype(@gobj, gtype)
+      raise ArgumentError, "Type #{gtype} is not a valid type" if gtype == 0
+
+      wrap_info Lib.g_irepository_find_by_gtype(self, gtype)
     end
 
     def dependencies(namespace)
-      strv_p = Lib.g_irepository_get_dependencies(@gobj, namespace)
+      strv_p = Lib.g_irepository_get_dependencies(self, namespace)
       strv = Strv.new strv_p
       strv.to_a
     end
 
     def shared_library(namespace)
-      Lib.g_irepository_get_shared_library @gobj, namespace
+      Lib.g_irepository_get_shared_library self, namespace
     end
 
     def version(namespace)
-      Lib.g_irepository_get_version @gobj, namespace
+      Lib.g_irepository_get_version self, namespace
     end
 
     def self.wrap_ibaseinfo_pointer(ptr)
       return nil if ptr.null?
+
       type = Lib.g_base_info_get_type ptr
       klass = TYPEMAP[type]
       klass.wrap ptr