gir_ffi 0.0.6 → 0.0.7

data/lib/gir_ffi/{class_builder.rb → builder/class.rb}

@@ -2,11 +2,13 @@ require 'gir_ffi/builder_helper'
 module GirFFI
   # Builds a class based on information found in the introspection
   # repository.
-  class ClassBuilder
+  class Builder::Class
     include BuilderHelper
-    def initialize namespace, classname
-      @namespace = namespace
-      @classname = classname
+
+    def initialize info
+      @info = info
+      @namespace = @info.namespace
+      @classname = @info.name.gsub(/^(.)/) { $1.upcase }
     end
 
     def generate
@@ -18,7 +20,8 @@ module GirFFI
       meta = (class << klass; self; end)
 
       go = method_introspection_data method
-      return attach_and_define_method method, go, meta
+      raise NoMethodError unless go
+      attach_and_define_method method, go, meta
     end
 
     def setup_instance_method method
@@ -26,11 +29,11 @@ module GirFFI
       result = attach_and_define_method method, go, build_class
 
       unless result
-	if parent
-	  return superclass.gir_ffi_builder.setup_instance_method method
-	else
-	  return false
-	end
+        if parent
+          return superclass.gir_ffi_builder.setup_instance_method method
+        else
+          return false
+        end
       end
 
       true
@@ -42,8 +45,8 @@ module GirFFI
           return sig if sig.name == signal_name
         end
       end
-      if info.parent
-	return superclass.gir_ffi_builder.find_signal signal_name
+      if parent
+        return superclass.gir_ffi_builder.find_signal signal_name
       end
     end
 
@@ -51,42 +54,53 @@ module GirFFI
 
     def build_class
       unless defined? @klass
-	case info.type
-	when :object, :struct, :interface
-	  instantiate_struct_class
-	when :union
-	  instantiate_union_class
-	when :enum, :flags
-	  instantiate_enum_class
-	else
-	  raise NotImplementedError, "Cannot build classes of type #{info.type}"
-	end
+        case info.type
+        when :object, :struct, :interface
+          instantiate_struct_class
+        when :union
+          instantiate_union_class
+        when :enum, :flags
+          instantiate_enum_class
+        when :callback
+          instantiate_callback_class
+        else
+          raise NotImplementedError, "Cannot build classes of type #{info.type}"
+        end
       end
       @klass
     end
 
     def info
       unless defined? @info
-	@info = gir.find_by_name @namespace, @classname
-	raise "Class #{@classname} not found in namespace #{@namespace}" if @info.nil?
+        @info = gir.find_by_name @namespace, @classname
+        raise "Class #{@classname} not found in namespace #{@namespace}" if @info.nil?
       end
       @info
     end
 
     def parent
       unless defined? @parent
-	@parent = info.type == :object ? info.parent : nil
+        if info.type == :object
+	  pr = info.parent
+	  if pr.nil? or (pr.name == @classname and pr.namespace == @namespace)
+	    @parent = nil
+	  else
+	    @parent = pr
+	  end
+	else
+	  @parent = nil
+	end
       end
       @parent
     end
 
     def superclass
       unless defined? @superclass
-	if parent
-	  @superclass = Builder.build_class parent.namespace, parent.name
-	else
-	  @superclass = GirFFI::ClassBase
-	end
+        if parent
+          @superclass = Builder.build_class parent
+        else
+          @superclass = GirFFI::ClassBase
+        end
       end
       @superclass
     end
@@ -113,8 +127,16 @@ module GirFFI
 
     def instantiate_enum_class
       @klass = optionally_define_constant namespace_module, @classname do
-	vals = info.values.map {|vinfo| [vinfo.name.to_sym, vinfo.value]}.flatten
-	lib.enum(@classname.to_sym, vals)
+        vals = info.values.map {|vinfo| [vinfo.name.to_sym, vinfo.value]}.flatten
+        lib.enum(@classname.to_sym, vals)
+      end
+    end
+
+    def instantiate_callback_class
+      @klass = optionally_define_constant namespace_module, @classname do
+	args = Builder.ffi_function_argument_types info
+	ret = Builder.ffi_function_return_type info
+	lib.callback @classname.to_sym, args, ret
       end
     end
 
@@ -135,48 +157,48 @@ module GirFFI
 
     def layout_specification
       fields = if info.type == :interface
-		 []
-	       else
-		 info.fields
-	       end
+                 []
+               else
+                 info.fields
+               end
 
       if fields.empty?
-	if parent
-	  return [:parent, superclass.const_get(:Struct), 0]
-	else
-	  return [:dummy, :char, 0]
-	end
+        if parent
+          return [:parent, superclass.const_get(:Struct), 0]
+        else
+          return [:dummy, :char, 0]
+        end
       end
 
       fields.map do |finfo|
-	[ finfo.name.to_sym,
-	  itypeinfo_to_ffitype_for_struct(finfo.type),
-	  finfo.offset ]
+        [ finfo.name.to_sym,
+          itypeinfo_to_ffitype_for_struct(finfo.type),
+          finfo.offset ]
       end.flatten
     end
 
     def itypeinfo_to_ffitype_for_struct typeinfo
       ffitype = Builder.itypeinfo_to_ffitype typeinfo
       if ffitype.kind_of?(Class) and const_defined_for ffitype, :Struct
-	ffitype = ffitype.const_get :Struct
+        ffitype = ffitype.const_get :Struct
       end
       if ffitype == :bool
-	ffitype = :int
+        ffitype = :int
       end
       ffitype
     end
 
     def stub_methods
       info.methods.each do |minfo|
-	@klass.class_eval method_stub(minfo.name, minfo.method?)
+        @klass.class_eval method_stub(minfo.name, minfo.method?)
       end
     end
 
     def method_stub symbol, is_instance_method
       "
-	def #{is_instance_method ? '' : 'self.'}#{symbol} *args, &block
-	  setup_and_call :#{symbol}, *args, &block
-	end
+        def #{is_instance_method ? '' : 'self.'}#{symbol} *args, &block
+          setup_and_call :#{symbol}, *args, &block
+        end
       "
     end
 
@@ -185,23 +207,23 @@ module GirFFI
       return if getter.nil? or getter == "intern"
       lib.attach_function getter.to_sym, [], :size_t
       @klass.class_eval "
-	def self.get_gtype
-	  ::#{lib}.#{getter}
-	end
+        def self.get_gtype
+          ::#{lib}.#{getter}
+        end
       "
     end
 
     def setup_vfunc_invokers
       info.vfuncs.each do |vfinfo|
-	invoker = vfinfo.invoker
-	next if invoker.nil?
-	next if invoker.name == vfinfo.name
-
-	@klass.class_eval "
-	  def #{vfinfo.name} *args, &block
-	    #{invoker.name}(*args, &block)
-	  end
-	"
+        invoker = vfinfo.invoker
+        next if invoker.nil?
+        next if invoker.name == vfinfo.name
+
+        @klass.class_eval "
+          def #{vfinfo.name} *args, &block
+            #{invoker.name}(*args, &block)
+          end
+        "
       end
     end
 
@@ -209,7 +231,7 @@ module GirFFI
       return if info.find_method 'new'
 
       (class << @klass; self; end).class_eval {
-	alias_method :new, :allocate
+        alias_method :new, :allocate
       }
     end
 
@@ -232,7 +254,7 @@ module GirFFI
     end
 
     def function_definition go
-      FunctionDefinitionBuilder.new(go, lib).generate
+      Builder::Function.new(go, lib).generate
     end
 
     def attach_and_define_method method, go, modul
@@ -245,15 +267,15 @@ module GirFFI
 
     def gir
       unless defined? @gir
-	@gir = IRepository.default
-	@gir.require @namespace, nil
+        @gir = IRepository.default
+        @gir.require @namespace, nil
       end
       @gir
     end
 
     def get_or_define_class namespace, name, parent
       optionally_define_constant(namespace, name) {
-	Class.new parent
+        Class.new parent
       }
     end
 

data/lib/gir_ffi/{function_definition_builder.rb → builder/function.rb}

@@ -1,9 +1,9 @@
-require 'gir_ffi/argument_builder'
+require 'gir_ffi/builder/argument'
 
-module GirFFI
+module GirFFI::Builder
   # Implements the creation of a Ruby function definition out of a GIR
   # IFunctionInfo.
-  class FunctionDefinitionBuilder
+  class Function
     def initialize info, libmodule
       @info = info
       @libmodule = libmodule
@@ -11,19 +11,20 @@ module GirFFI
 
     def generate
       setup_accumulators
-      @data = @info.args.map {|arg| ArgumentBuilder.build self, arg, @libmodule}
-      @rvdata = ReturnValueBuilder.new self, @info
+      @data = @info.args.map {|arg| Argument.build self, arg, @libmodule}
+      @rvdata = ReturnValue.build self, @info
 
       alldata = @data.dup << @rvdata
 
       alldata.each {|data|
         data.prepare
 	idx = data.type.array_length
-        data.length_arg = @data[idx] if idx > -1
+        if idx > -1
+          data.length_arg = @data[idx] 
+          @data[idx].length_arg_for = data
+        end
       }
 
-      alldata.each {|data| data.process }
-
       adjust_accumulators
       return filled_out_template
     end
@@ -35,10 +36,9 @@ module GirFFI
     end
 
     def adjust_accumulators
-      klass = @info.throws? ? ErrorHandlerBuilder : NullArgumentBuilder
+      klass = @info.throws? ? ErrorArgument : NullArgument
       @errarg = klass.new(self)
       @errarg.prepare
-      @errarg.process
     end
 
     def filled_out_template

data/lib/gir_ffi/{module_builder.rb → builder/module.rb}

@@ -4,7 +4,7 @@ require 'gir_ffi/module_base'
 module GirFFI
   # Builds a module based on information found in the introspection
   # repository.
-  class ModuleBuilder
+  class Builder::Module
     include BuilderHelper
 
     def initialize namespace
@@ -32,16 +32,17 @@ module GirFFI
     end
 
     def build_class classname
-      Builder.build_class @namespace, classname.to_s
+      info = gir.find_by_name @namespace, classname.to_s
+      Builder.build_class info
     end
 
     private
 
     def build_module
       unless defined? @module
-	instantiate_module
-	setup_lib_for_ffi
-	setup_module unless already_set_up
+        instantiate_module
+        setup_lib_for_ffi
+        setup_module unless already_set_up
       end
       @module
     end
@@ -54,8 +55,8 @@ module GirFFI
       @module.extend ModuleBase
       @module.const_set :GIR_FFI_BUILDER, self
       begin
-	require "gir_ffi/overrides/#{@namespace.downcase}"
-	@module.class_eval "include GirFFI::Overrides::#{@namespace}"
+        require "gir_ffi/overrides/#{@namespace.downcase}"
+        @module.class_eval "include GirFFI::Overrides::#{@namespace}"
       rescue LoadError
       end
     end
@@ -68,10 +69,10 @@ module GirFFI
       @lib = get_or_define_module @module, :Lib
 
       unless (class << @lib; self.include? FFI::Library; end)
-	@lib.extend FFI::Library
-	libs = gir.shared_library(@namespace).split(/,/)
-	@lib.ffi_lib_flags :global, :lazy
-	@lib.ffi_lib(*libs)
+        @lib.extend FFI::Library
+        libs = gir.shared_library(@namespace).split(/,/)
+        @lib.ffi_lib_flags :global, :lazy
+        @lib.ffi_lib(*libs)
       end
 
       optionally_define_constant(@lib, :CALLBACKS) { [] }
@@ -81,20 +82,20 @@ module GirFFI
       info = gir.find_by_name @namespace, function.to_s
 
       if info.type == :function
-	info
+        info
       else
-	nil
+        nil
       end
     end
 
     def function_definition info, libmodule
-      FunctionDefinitionBuilder.new(info, libmodule).generate
+      Builder::Function.new(info, libmodule).generate
     end
 
     def gir
       unless defined? @gir
-	@gir = IRepository.default
-	@gir.require @namespace, nil
+        @gir = IRepository.default
+        @gir.require @namespace, nil
       end
       @gir
     end

data/lib/gir_ffi/builder.rb

@@ -1,8 +1,8 @@
 require 'gir_ffi/arg_helper'
-require 'gir_ffi/function_definition_builder'
+require 'gir_ffi/builder/function'
 require 'gir_ffi/class_base'
-require 'gir_ffi/class_builder'
-require 'gir_ffi/module_builder'
+require 'gir_ffi/builder/class'
+require 'gir_ffi/builder/module'
 require 'gir_ffi/builder_helper'
 
 module GirFFI
@@ -10,13 +10,33 @@ module GirFFI
   # introspection repository. Call its build_module and build_class methods
   # to create the modules and classes used in your program.
   module Builder
+    FFI_TYPE_FOR_SSIZE_T = "int#{FFI.type_size(:size_t) * 8}".to_sym
+
     extend BuilderHelper
-    def self.build_class namespace, classname
-      ClassBuilder.new(namespace, classname).generate
+
+    TAG_TYPE_MAP = {
+      :boolean => :bool,
+      :GType => :size_t,
+      :size => :size_t,
+      :gboolean => :bool,
+      :gint8 => :int8,
+      :guint8 => :uint8,
+      :gint16 => :int16,
+      :guint16 => :uint16,
+      :gint32 => :int32,
+      :guint32 => :uint32,
+      :gint64 => :int64,
+      :guint64 => :uint64,
+      :gfloat => :float,
+      :gdouble => :double,
+    }
+
+    def self.build_class info
+      Builder::Class.new(info).generate
     end
 
     def self.build_module namespace
-      ModuleBuilder.new(namespace).generate
+      Builder::Module.new(namespace).generate
     end
 
     def self.attach_ffi_function lib, info
@@ -27,8 +47,6 @@ module GirFFI
       lib.attach_function sym, argtypes, rt
     end
 
-    # All methods below will be made private at the end.
-
     def self.ffi_function_argument_types info
       types = info.args.map do |arg|
 	tp = iarginfo_to_ffitype arg
@@ -56,20 +74,15 @@ module GirFFI
       case tag
       when :interface
 	interface = info.interface
-	case interface.type
-	when :object, :struct, :flags, :enum
-	  return build_class interface.namespace, interface.name
-	when :callback
-	  return build_callback interface
+        return build_class interface
+      when :ssize
+        return FFI_TYPE_FOR_SSIZE_T
+      else
+        if TAG_TYPE_MAP[tag]
+	  return TAG_TYPE_MAP[tag]
 	else
-	  raise NotImplementedError
+	  return tag
 	end
-      when :boolean
-	return :bool
-      when :GType, :size
-	return :size_t
-      else
-	return tag
       end
     end
 
@@ -91,13 +104,5 @@ module GirFFI
 	lib.callback sym, args, ret
       end
     end
-
-    # Set up method access.
-    (self.public_methods - Module.public_methods).each do |method|
-      private_class_method method.to_sym
-    end
-    public_class_method :build_module, :build_class
-    public_class_method :itypeinfo_to_ffitype
-    public_class_method :attach_ffi_function
   end
 end

data/lib/gir_ffi/class_base.rb

@@ -3,6 +3,7 @@ module GirFFI
   # Base class for all generated classes. Contains code for dealing with
   # the generated Struct classes.
   class ClassBase
+    # TODO: Make separate base for :struct, :union, :object.
     extend Forwardable
     def_delegators :@struct, :[], :[]=, :to_ptr
 
@@ -25,8 +26,7 @@ module GirFFI
     end
 
     def self.setup_and_call method, *arguments, &block
-      result = gir_ffi_builder.setup_method method.to_s
-      return super unless result
+      gir_ffi_builder.setup_method method.to_s
       self.send method, *arguments, &block
     end
 
@@ -51,6 +51,11 @@ module GirFFI
 	_real_new ptr
       end
 
+      # TODO: Only makes sense for :objects.
+      def constructor_wrap ptr
+        wrap ptr
+      end
+
       def allocate
 	_real_new
       end

data/lib/gir_ffi/i_base_info.rb

@@ -35,12 +35,20 @@ module GirFFI
     def name
       Lib.g_base_info_get_name @gobj
     end
+
     def type
       Lib.g_base_info_get_type @gobj
     end
+
     def namespace
       Lib.g_base_info_get_namespace @gobj
     end
+
+    def container
+      ptr = Lib.g_base_info_get_container @gobj
+      IRepository.wrap_ibaseinfo_pointer ptr
+    end
+
     def deprecated?
       Lib.g_base_info_is_deprecated @gobj
     end

data/lib/gir_ffi/i_repository.rb

@@ -62,6 +62,12 @@ module GirFFI
       self.instance
     end
 
+    # TODO: Make sure GType is initialized first.
+    def self.prepend_search_path path
+      Lib.g_irepository_prepend_search_path path
+    end
+
+    # TODO: Make sure GType is initialized first.
     def self.type_tag_to_string type
       Lib.g_type_tag_to_string type
     end

data/lib/gir_ffi/i_struct_info.rb

@@ -22,8 +22,12 @@ module GirFFI
     ##
     build_array_method :methods
 
+    def methods_hash
+      @methods_hash ||= methods.inject({}) {|h,m| h[m.name] = m; h}
+    end
+
     def find_method(name)
-      IFunctionInfo.wrap(Lib.g_struct_info_find_method @gobj, name)
+      methods_hash[name]
     end
     def size
       Lib.g_struct_info_get_size @gobj

data/lib/gir_ffi/lib.rb

@@ -9,6 +9,7 @@ module GirFFI
     enum :IRepositoryLoadFlags, [:LAZY, (1<<0)]
 
     attach_function :g_irepository_get_default, [], :pointer
+    attach_function :g_irepository_prepend_search_path, [:string], :void
     attach_function :g_irepository_require,
       [:pointer, :string, :string, :IRepositoryLoadFlags, :pointer],
       :pointer
@@ -49,6 +50,7 @@ module GirFFI
     attach_function :g_base_info_get_type, [:pointer], :IInfoType
     attach_function :g_base_info_get_name, [:pointer], :string
     attach_function :g_base_info_get_namespace, [:pointer], :string
+    attach_function :g_base_info_get_container, [:pointer], :pointer
     attach_function :g_base_info_is_deprecated, [:pointer], :bool
     attach_function :g_base_info_equal, [:pointer, :pointer], :bool
 

data/lib/gir_ffi/overrides/glib.rb

@@ -0,0 +1,30 @@
+module GirFFI
+  module Overrides
+    module GLib
+      def self.included base
+	base.extend ClassMethods
+        attach_non_introspectable_functions(base)
+      end
+
+      def self.attach_non_introspectable_functions base
+        base::Lib.attach_function :g_slist_prepend, [:pointer, :pointer],
+          :pointer
+        base::Lib.attach_function :g_list_append, [:pointer, :pointer],
+          :pointer
+      end
+
+      module ClassMethods
+        # FIXME: Should not be so visible for end users. 
+        def slist_prepend slist, data
+          ::GLib::SList.wrap(::GLib::Lib.g_slist_prepend slist, data)
+        end
+
+        # FIXME: Should not be so visible for end users. 
+        def list_append list, data
+          ::GLib::List.wrap(::GLib::Lib.g_list_append list, data)
+        end
+      end
+    end
+  end
+end
+