gir_ffi 0.4.0 → 0.4.1

data/lib/{ffi-gobject_introspection/gobject_lib.rb → gir_ffi-base/gobject/lib.rb}

@@ -1,5 +1,7 @@
-module GObjectIntrospection
-  module GObjectLib
+require 'ffi'
+
+module GObject
+  module Lib
     extend FFI::Library
     ffi_lib "gobject-2.0"
     attach_function :g_type_init, [], :void

data/lib/gir_ffi/arg_helper.rb

@@ -11,9 +11,11 @@ module GirFFI
     SIMPLE_G_TYPES = [
       :gint8, :gint16, :gint, :gint32, :gint64,
       :guint8, :guint16, :guint32, :guint64,
-      :gfloat, :gdouble]
+      :gfloat, :gdouble
+    ]
 
-    # FIXME: Hideous.
+    # FIXME: Hideous
+    # TODO: Move this implementation to InPointer
     def self.object_to_inptr obj
       return obj.to_ptr if obj.respond_to? :to_ptr
       return nil if obj.nil?

data/lib/gir_ffi/builder.rb

@@ -71,13 +71,7 @@ module GirFFI
     end
 
     def self.ffi_function_return_type info
-      rt = info.return_type
-      # FIXME: Workaround for older gobject-introspection not identifying all
-      # objects as being pointers.
-      if rt.tag == :interface and rt.interface.info_type == :object
-        return :pointer
-      end
-      itypeinfo_to_ffitype rt
+      itypeinfo_to_ffitype info.return_type
     end
 
     def self.itypeinfo_to_callback_ffitype info

data/lib/gir_ffi/builder/argument.rb

@@ -31,33 +31,15 @@ module GirFFI::Builder
                 case type.interface.info_type
                 when :callback
                   return CallbackInArgument.new var_gen, name, type, libmodule
-                when :object, :struct
-                  ObjectInArgument
                 else
                   RegularInArgument
                 end
-              when :void
-                VoidInArgument
               when :array
                 if type.array_type == :c
                   CArrayInArgument
                 else
                   RegularInArgument
                 end
-              when :glist, :gslist
-                it = Argument::InBase.new var_gen, name, type
-                it.extend ContainerClassName
-                it.extend ListElementTypeProvider
-                it.extend WithTypedContainerPreMethod
-                return it
-              when :ghash
-                it = Argument::InBase.new var_gen, name, type
-                it.extend ContainerClassName
-                it.extend HashTableElementTypeProvider
-                it.extend WithTypedContainerPreMethod
-                return it
-              when :utf8
-                Utf8InArgument
               else
                 RegularInArgument
               end
@@ -80,42 +62,8 @@ module GirFFI::Builder
     end
   end
 
-  # Implements argument processing for void pointer arguments with
-  # direction :in.
-  class VoidInArgument < Argument::InBase
-    def pre
-      [ "#{callarg} = GirFFI::ArgHelper.object_to_inptr #{@name}" ]
-    end
-  end
-
-  module ContainerClassName
-    TAG_TO_CONTAINER_CLASS_MAP = {
-      :glist => 'GLib::List',
-      :gslist => 'GLib::SList',
-      :ghash => 'GLib::HashTable',
-      :array => 'GLib::Array'
-    }
-
-    def class_name
-      TAG_TO_CONTAINER_CLASS_MAP[type_info.tag]
-    end
-  end
-
-  module ListElementTypeProvider
-    def elm_t
-      subtype_tag.inspect
-    end
-  end
-
-  module HashTableElementTypeProvider
-    def elm_t
-      [subtype_tag(0), subtype_tag(1)].inspect
-    end
-  end
-
   # Implements argument processing for array arguments with direction :in.
   class CArrayInArgument < Argument::InBase
-    include ListElementTypeProvider
     def pre
       pr = []
       size = type_info.array_fixed_size
@@ -127,40 +75,43 @@ module GirFFI::Builder
     end
   end
 
-  module WithTypedContainerPreMethod
-    def pre
-      [ "#{callarg} = #{class_name}.from #{elm_t}, #{@name}" ]
-    end
-  end
-
-  # Implements argument processing for UTF8 string arguments with direction
-  # :in.
-  class Utf8InArgument < Argument::InBase
-    def pre
-      [ "#{callarg} = GirFFI::InPointer.from :utf8, #{@name}" ]
-    end
-  end
-
-  # Implements argument processing for arguments with direction :in that
-  # are GObjects.
-  class ObjectInArgument < Argument::InBase
-    def pre
-      [ "#{callarg} = #{argument_class_name}.from #{@name}" ]
-    end
-  end
-
   # Implements argument processing for arguments with direction :in whose
   # type-specific processing is left to FFI (e.g., ints and floats, and
   # objects that implement to_ptr.).
+  #
+  # Implements argument processing for arguments with direction :in that
+  # are GObjects.
+  #
+  # Implements argument processing for UTF8 string arguments with direction
+  # :in.
+  #
+  # Implements argument processing for void pointer arguments with
+  # direction :in.
   class RegularInArgument < Argument::InBase
     def pre
       pr = []
+      assign_array_length(pr)
+      set_function_call_argument(pr)
+      pr
+    end
+
+    def assign_array_length(pr)
       if @array_arg
         arrname = @array_arg.name
-	pr << "#{@name} = #{arrname}.nil? ? 0 : #{arrname}.length"
+        pr << "#{@name} = #{arrname}.nil? ? 0 : #{arrname}.length"
+      end
+    end
+
+    def set_function_call_argument(pr)
+      if type_tag == :interface && [:object, :struct].include?(type_info.interface.info_type)
+        pr << "#{callarg} = #{argument_class_name}.from #{@name}"
+      elsif [:utf8, :void].include? type_tag
+        pr << "#{callarg} = #{argument_class_name}.from #{type_tag.inspect}, #{@name}"
+      elsif [:glist, :gslist, :ghash].include? type_tag
+        pr << "#{callarg} = #{argument_class_name}.from #{elm_t}, #{@name}"
+      else
+        pr << "#{callarg} = #{@name}"
       end
-      pr << "#{callarg} = #{@name}"
-      pr
     end
   end
 
@@ -182,29 +133,23 @@ module GirFFI::Builder
                 end
               when :array
                 if type.zero_terminated?
-                  StrvOutArgument
+                  InterfaceOutArgument
                 else
                   case type.array_type
                   when :c
                     CArrayOutArgument
                   when :array
                     it = PointerLikeOutArgument.new var_gen, arginfo.name, type
-                    it.extend ContainerClassName
-                    it.extend ListElementTypeProvider
                     it.extend WithTypedContainerPostMethod
                     return it
                   end
                 end
               when :glist, :gslist
                 it = PointerLikeOutArgument.new var_gen, arginfo.name, type
-                it.extend ContainerClassName
-                it.extend ListElementTypeProvider
                 it.extend WithTypedContainerPostMethod
                 return it
               when :ghash
                 it = PointerLikeOutArgument.new var_gen, arginfo.name, type
-                it.extend ContainerClassName
-                it.extend HashTableElementTypeProvider
                 it.extend WithTypedContainerPostMethod
                 return it
               else
@@ -273,23 +218,18 @@ module GirFFI::Builder
 
   # Implements argument processing for interface arguments with direction
   # :out (structs, objects, etc.).
-  class InterfaceOutArgument < PointerLikeOutArgument
-    def post
-      [ "#{retname} = #{argument_class_name}.wrap #{callarg}.to_value" ]
-    end
-  end
-
+  #
   # Implements argument processing for strv arguments with direction
   # :out.
-  class StrvOutArgument < PointerLikeOutArgument
+  class InterfaceOutArgument < PointerLikeOutArgument
     def post
-      [ "#{retname} = GLib::Strv.wrap #{callarg}.to_value" ]
+      [ "#{retname} = #{argument_class_name}.wrap #{callarg}.to_value" ]
     end
   end
 
   module WithTypedContainerPostMethod
     def post
-      [ "#{retname} = #{class_name}.wrap #{elm_t}, #{callarg}.to_value" ]
+      [ "#{retname} = #{argument_class_name}.wrap #{elm_t}, #{callarg}.to_value" ]
     end
   end
 
@@ -314,8 +254,6 @@ module GirFFI::Builder
                     CArrayInOutArgument
                   when :array
                     it = Argument::InOutBase.new var_gen, arginfo.name, type
-                    it.extend ContainerClassName
-                    it.extend ListElementTypeProvider
                     it.extend WithTypedContainerInOutPreMethod
                     it.extend WithTypedContainerPostMethod
                     return it
@@ -323,15 +261,11 @@ module GirFFI::Builder
                 end
               when :glist, :gslist
                 it = Argument::InOutBase.new var_gen, arginfo.name, type
-                it.extend ContainerClassName
-                it.extend ListElementTypeProvider
                 it.extend WithTypedContainerInOutPreMethod
                 it.extend WithTypedContainerPostMethod
                 return it
               when :ghash
                 it = Argument::InOutBase.new var_gen, arginfo.name, type
-                it.extend ContainerClassName
-                it.extend HashTableElementTypeProvider
                 it.extend WithTypedContainerInOutPreMethod
                 it.extend WithTypedContainerPostMethod
                 return it
@@ -372,7 +306,6 @@ module GirFFI::Builder
   # Implements argument processing for strv arguments with direction
   # :inout.
   class StrvInOutArgument < Argument::InOutBase
-    include ListElementTypeProvider
     def pre
       [ "#{callarg} = GirFFI::InOutPointer.from_array #{elm_t}, #{@name}" ]
     end
@@ -385,7 +318,6 @@ module GirFFI::Builder
   # Implements argument processing for array arguments with direction
   # :inout.
   class CArrayInOutArgument < Argument::InOutBase
-    include ListElementTypeProvider
     def pre
       [ "#{callarg} = GirFFI::InOutPointer.from_array #{elm_t}, #{@name}" ]
     end
@@ -399,7 +331,7 @@ module GirFFI::Builder
 
   module WithTypedContainerInOutPreMethod
     def pre
-      [ "#{callarg} = GirFFI::InOutPointer.from :pointer, #{class_name}.from(#{elm_t}, #{@name})" ]
+      [ "#{callarg} = GirFFI::InOutPointer.from :pointer, #{argument_class_name}.from(#{elm_t}, #{@name})" ]
     end
   end
 
@@ -466,8 +398,6 @@ module GirFFI::Builder
                     CArrayReturnValue
                   when :array
                     it = ReturnValue.new var_gen, name, type
-                    it.extend ContainerClassName
-                    it.extend ListElementTypeProvider
                     it.extend WithTypedContainerPostMethod
                     return it
                   when :byte_array
@@ -478,14 +408,10 @@ module GirFFI::Builder
                 end
               when :glist, :gslist
                 it = ReturnValue.new var_gen, name, type
-                it.extend ContainerClassName
-                it.extend ListElementTypeProvider
                 it.extend WithTypedContainerPostMethod
                 return it
               when :ghash
                 it = ReturnValue.new var_gen, name, type
-                it.extend ContainerClassName
-                it.extend HashTableElementTypeProvider
                 it.extend WithTypedContainerPostMethod
                 return it
               when :utf8

data/lib/gir_ffi/builder/argument/base.rb

@@ -32,33 +32,35 @@ module GirFFI
         end
 
         def type_tag
-          tag = type_info.tag
-          tag == :GType ? :gtype : tag
+          type_info.tag
         end
 
-        def subtype_tag index=0
-          st = type_info.param_type(index)
-          tag = st.tag
-          case tag
-          when :GType
-            return :gtype
+        TAG_TO_WRAPPER_CLASS_MAP = {
+          :glist => 'GLib::List',
+          :gslist => 'GLib::SList',
+          :ghash => 'GLib::HashTable',
+          :array => 'GLib::Array',
+          :utf8 => 'GirFFI::InPointer',
+          :void => 'GirFFI::InPointer'
+        }
+
+        def argument_class_name
+          case (tag = type_tag)
           when :interface
-            return :interface_pointer if st.pointer?
-            return :interface
-          when :void
-            return :gpointer if st.pointer?
-            return :void
+            iface = type_info.interface
+            # FIXME: Extract to ITypeInfo.
+            "::#{iface.safe_namespace}::#{iface.name}"
+          when :array
+            if type_info.zero_terminated?
+              'GLib::Strv'
+            else
+              'GLib::Array'
+            end
           else
-            return tag
+            TAG_TO_WRAPPER_CLASS_MAP[tag]
           end
         end
 
-        def argument_class_name
-          iface = type_info.interface
-          # FIXME: Extract to ITypeInfo.
-          "::#{iface.safe_namespace}::#{iface.name}"
-        end
-
         def subtype_tag_or_class_name index=0
           type = type_info.param_type(index)
           tag = type.tag
@@ -75,6 +77,10 @@ module GirFFI
           end
         end
 
+        def elm_t
+          type_info.element_type.inspect
+        end
+
         def array_size
           if @length_arg
             @length_arg.retname

data/lib/gir_ffi/builder/type/object.rb

@@ -1,6 +1,7 @@
 require 'gir_ffi/builder/type/struct_based'
 require 'gir_ffi/builder/property'
 require 'gir_ffi/info_ext/i_property_info'
+require 'gir_ffi/object_base'
 
 module GirFFI
   module Builder
@@ -15,7 +16,7 @@ module GirFFI
             end
           end
           if parent
-            return superclass._find_signal signal_name
+            return superclass.find_signal signal_name
           end
           raise "Signal #{signal_name} not found"
         end
@@ -25,7 +26,7 @@ module GirFFI
             return prop if prop.name == property_name
           end
           if parent
-            return superclass._find_property property_name
+            return superclass.find_property property_name
           end
           raise "Property #{property_name} not found"
         end
@@ -58,6 +59,17 @@ module GirFFI
           @parent
         end
 
+        def superclass
+          unless defined? @superclass
+            if parent
+              @superclass = Builder.build_class parent
+            else
+              @superclass = ObjectBase
+            end
+          end
+          @superclass
+        end
+
         def setup_property_accessors
           info.properties.each do |prop|
             setup_accessors_for_property_info prop

data/lib/gir_ffi/builder/type/registered_type.rb

@@ -54,19 +54,9 @@ module GirFFI
         end
 
         def superclass
-          unless defined? @superclass
-            if parent
-              @superclass = Builder.build_class parent
-            else
-              @superclass = GirFFI::ClassBase
-            end
-          end
-          @superclass
+          @superclass ||= ClassBase
         end
       end
     end
   end
 end
-
-
-

data/lib/gir_ffi/class_base.rb

@@ -9,14 +9,6 @@ module GirFFI
     extend Forwardable
     def_delegators :@struct, :to_ptr
 
-    def ffi_structure
-      self.class.ffi_structure
-    end
-
-    def _builder
-      self.class._builder
-    end
-
     def setup_and_call method, *arguments, &block
       result = self.class.ancestors.any? do |klass|
         klass.respond_to?(:_setup_instance_method) &&
@@ -44,31 +36,39 @@ module GirFFI
     end
 
     class << self
+      # @deprecated Compatibility function. Remove in version 0.5.0.
       def ffi_structure
-	self.const_get(:Struct)
+        self::Struct
       end
 
       def gir_info
-	self.const_get :GIR_INFO
+        self.const_get :GIR_INFO
       end
 
+      # @deprecated Compatibility function. Remove in version 0.5.0.
       def _builder
-	self.const_get :GIR_FFI_BUILDER
+        gir_ffi_builder
       end
 
-      def _find_signal name
-        _builder.find_signal name
+      def gir_ffi_builder
+        self.const_get :GIR_FFI_BUILDER
       end
 
-      def _find_property name
-        _builder.find_property name
+      # @deprecated Compatibility function. Remove in version 0.5.0.
+      def _setup_method name
+        setup_method name
       end
 
-      def _setup_method name
+      def setup_method name
         _builder.setup_method name
       end
 
+      # @deprecated Compatibility function. Remove in version 0.5.0.
       def _setup_instance_method name
+        setup_instance_method name
+      end
+
+      def setup_instance_method name
         _builder.setup_instance_method name
       end
 
@@ -76,20 +76,15 @@ module GirFFI
       undef new
 
       def wrap ptr
-	return nil if ptr.nil? or ptr.null?
-	obj = _real_new
-        obj.instance_variable_set :@struct, ffi_structure.new(ptr.to_ptr)
+        return nil if ptr.nil? or ptr.null?
+        obj = _real_new
+        obj.instance_variable_set :@struct, self::Struct.new(ptr.to_ptr)
         obj
       end
 
-      # TODO: Only makes sense for :objects.
-      def constructor_wrap ptr
-        wrap ptr
-      end
-
       def allocate
-	obj = _real_new
-        obj.instance_variable_set :@struct, ffi_structure.new
+        obj = _real_new
+        obj.instance_variable_set :@struct, self::Struct.new
         obj
       end