gir_ffi 0.0.8 → 0.0.9

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

@@ -1,4 +1,4 @@
-require 'gir_ffi/builder/type/base'
+require 'gir_ffi/builder/type/registered_type'
 module GirFFI
   module Builder
     module Type
@@ -6,7 +6,7 @@ module GirFFI
       # Implements the creation of an enum or flags type. The type will be
       # attached to the appropriate namespace module, and will be defined
       # as an enum for FFI.
-      class Enum < Base
+      class Enum < RegisteredType
         def build_class
           unless defined? @klass
             instantiate_enum_class
@@ -14,10 +14,20 @@ module GirFFI
           @klass
         end
 
+        def value_spec
+          return info.values.map {|vinfo|
+            val = GirFFI::ArgHelper.cast_uint32_to_int32(vinfo.value)
+            [vinfo.name.to_sym, val]
+          }.flatten
+        end
+
         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)
+          if const_defined_for namespace_module, @classname
+            @klass = namespace_module.const_get @classname
+          else
+            @klass = namespace_module.const_set @classname,
+              lib.enum(@classname.to_sym, value_spec)
+            setup_gtype_getter
           end
         end
       end

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

@@ -1,4 +1,6 @@
 require 'gir_ffi/builder/type/base'
+require 'gir_ffi/class_base'
+
 module GirFFI
   module Builder
     module Type
@@ -12,7 +14,14 @@ module GirFFI
           meta = (class << klass; self; end)
 
           go = method_introspection_data method
-          raise NoMethodError unless go
+          if go.nil?
+            if parent
+              return superclass.gir_ffi_builder.setup_method method
+            else
+              raise NoMethodError
+            end
+          end
+
           attach_and_define_method method, go, meta
         end
 
@@ -88,6 +97,7 @@ module GirFFI
           end.flatten
         end
 
+        # FIXME: Move this into a class with the other type knowledge.
         def itypeinfo_to_ffitype_for_struct typeinfo
           ffitype = Builder.itypeinfo_to_ffitype typeinfo
           if ffitype.kind_of?(Class) and const_defined_for ffitype, :Struct
@@ -122,17 +132,26 @@ module GirFFI
           "
         end
 
+        # TODO: Rename the created method, or use a constant.
         def setup_gtype_getter
-          getter = info.type_init
-          return if getter.nil? or getter == "intern"
-          lib.attach_function getter.to_sym, [], :size_t
-          @klass.class_eval "
+          gtype = info.g_type
+          return if gtype.nil?
+          @klass.instance_eval "
             def self.get_gtype
-              ::#{lib}.#{getter}
+              #{gtype}
             end
           "
         end
 
+        # FIXME: Only used in some of the subclases. Make mixin?
+        def provide_constructor
+          return if info.find_method 'new'
+
+          (class << @klass; self; end).class_eval {
+            alias_method :new, :allocate
+          }
+        end
+
         def parent
           nil
         end

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

@@ -7,15 +7,7 @@ module GirFFI
       class Struct < StructBased
         def setup_class
           super
-          provide_struct_constructor
-        end
-
-        def provide_struct_constructor
-          return if info.find_method 'new'
-
-          (class << @klass; self; end).class_eval {
-            alias_method :new, :allocate
-          }
+          provide_constructor
         end
       end
     end

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

@@ -18,6 +18,11 @@ module GirFFI
           @structklass = get_or_define_class @klass, :Struct, FFI::Union
           setup_class unless already_set_up
         end
+
+        def setup_class
+          super
+          provide_constructor
+        end
       end
     end
   end

data/lib/gir_ffi/builder/type.rb

@@ -1,6 +1,7 @@
 require 'gir_ffi/builder_helper'
 require 'gir_ffi/builder/type/base'
 require 'gir_ffi/builder/type/callback'
+require 'gir_ffi/builder/type/constant'
 require 'gir_ffi/builder/type/enum'
 require 'gir_ffi/builder/type/union'
 require 'gir_ffi/builder/type/object'
@@ -12,21 +13,19 @@ module GirFFI
   # repository.
   module Builder
     module Type
+      TYPE_MAP = {
+        :callback => Callback,
+        :constant => Constant,
+        :enum => Enum,
+        :flags => Enum,
+        :interface => Interface,
+        :object => Object,
+        :struct => Struct,
+        :union => Union
+      }
+
       def self.build info
-        case info.info_type
-        when :callback
-          Callback
-        when :enum, :flags
-          Enum
-        when :union
-          Union
-        when :object
-          Object
-        when :struct
-          Struct
-        when :interface
-          Interface
-        end.new(info).build_class
+        TYPE_MAP[info.info_type].new(info).build_class
       end
     end
   end

data/lib/gir_ffi/builder.rb

@@ -1,6 +1,3 @@
-require 'gir_ffi/arg_helper'
-require 'gir_ffi/builder/function'
-require 'gir_ffi/class_base'
 require 'gir_ffi/builder/type'
 require 'gir_ffi/builder/module'
 require 'gir_ffi/builder_helper'
@@ -15,10 +12,12 @@ module GirFFI
     TAG_TYPE_MAP = {
       :GType => :size_t,
       :gboolean => :bool,
+      :gunichar => :uint32,
       :gint8 => :int8,
       :guint8 => :uint8,
       :gint16 => :int16,
       :guint16 => :uint16,
+      :gint => :int,
       :gint32 => :int32,
       :guint32 => :uint32,
       :gint64 => :int64,
@@ -36,6 +35,10 @@ module GirFFI
       Builder::Module.new(namespace, version).generate
     end
 
+    def self.build_module_non_recursive namespace, version=nil
+      Builder::Module.new(namespace, version).build_module_non_recursive
+    end
+
     def self.attach_ffi_function lib, info
       sym = info.symbol
       argtypes = ffi_function_argument_types info
@@ -68,7 +71,7 @@ module GirFFI
       if tag == :interface
         return build_class info.interface
       else
-        return TAG_TYPE_MAP[tag]
+        return TAG_TYPE_MAP[tag] || tag
       end
     end
 

data/lib/gir_ffi/builder_helper.rb

@@ -9,10 +9,11 @@ module GirFFI
     end
 
     def optionally_define_constant parent, name
-      unless const_defined_for parent, name
-	parent.const_set name, yield
+      if const_defined_for parent, name
+        parent.const_get name
+      else
+        parent.const_set name, yield
       end
-      parent.const_get name
     end
 
   end

data/lib/gir_ffi/i_base_info.rb

@@ -45,6 +45,10 @@ module GirFFI
       Lib.g_base_info_get_namespace @gobj
     end
 
+    def safe_namespace
+      namespace.gsub(/^(.)/) { $1.upcase }
+    end
+
     def container
       ptr = Lib.g_base_info_get_container @gobj
       IRepository.wrap_ibaseinfo_pointer ptr

data/lib/gir_ffi/i_constant_info.rb

@@ -2,5 +2,14 @@ module GirFFI
   # Wraps a GIConstantInfo struct; represents an constant.
   # Not implemented yet.
   class IConstantInfo < IBaseInfo
+    def value
+      val = Lib::GIArgument.new
+      size = Lib.g_constant_info_get_value @gobj, val
+      return val
+    end
+
+    def constant_type
+      ITypeInfo.wrap(Lib.g_constant_info_get_type @gobj)
+    end
   end
 end

data/lib/gir_ffi/i_registered_type_info.rb

@@ -1,7 +1,6 @@
 module GirFFI
   # Wraps a GIRegisteredTypeInfo struct.
   # Represents a registered type.
-  # Not implemented yet.
   class IRegisteredTypeInfo < IBaseInfo
     def type_name
       Lib.g_registered_type_info_get_type_name @gobj

data/lib/gir_ffi/i_repository.rb

@@ -20,6 +20,7 @@ require 'gir_ffi/i_union_info'
 require 'gir_ffi/i_enum_info'
 require 'gir_ffi/i_flags_info'
 require 'gir_ffi/i_error_domain_info'
+require 'gir_ffi/arg_helper'
 
 module GirFFI
   # The Gobject Introspection Repository. This class is the point of
@@ -72,10 +73,10 @@ module GirFFI
       Lib.g_type_tag_to_string type
     end
 
-    def require namespace, version=nil
+    def require namespace, version=nil, flags=0
       errpp = FFI::MemoryPointer.new(:pointer).write_pointer nil
 
-      Lib.g_irepository_require @gobj, namespace, version, 0, errpp
+      Lib.g_irepository_require @gobj, namespace, version, flags, errpp
 
       errp = errpp.read_pointer
       raise GError.new(errp)[:message] unless errp.null?
@@ -107,6 +108,11 @@ module GirFFI
       return wrap ptr
     end
 
+    def dependencies namespace
+      strv = Lib.g_irepository_get_dependencies @gobj, namespace
+      ArgHelper.strv_to_utf8_array strv
+    end
+
     def shared_library namespace
       Lib.g_irepository_get_shared_library @gobj, namespace
     end

data/lib/gir_ffi/i_type_info.rb

@@ -15,12 +15,19 @@ module GirFFI
       ptr = Lib.g_type_info_get_interface @gobj
       IRepository.wrap_ibaseinfo_pointer ptr
     end
+
     def array_length
       Lib.g_type_info_get_array_length @gobj
     end
+
     def array_fixed_size
       Lib.g_type_info_get_array_fixed_size @gobj
     end
+
+    def array_type
+      Lib.g_type_info_get_array_type @gobj
+    end
+
     def zero_terminated?
       Lib.g_type_info_is_zero_terminated @gobj
     end

data/lib/gir_ffi/lib.rb

@@ -18,8 +18,10 @@ module GirFFI
       [:pointer, :string, :int], :pointer
     attach_function :g_irepository_find_by_name,
       [:pointer, :string, :string], :pointer
-    attach_function :g_irepository_find_by_gtype, [:pointer, :size_t], :pointer
-
+    attach_function :g_irepository_find_by_gtype,
+      [:pointer, :size_t], :pointer
+    attach_function :g_irepository_get_dependencies,
+      [:pointer, :string], :pointer
     attach_function :g_irepository_get_shared_library,
       [:pointer, :string], :string
 
@@ -112,12 +114,20 @@ module GirFFI
 
     #define G_TYPE_TAG_IS_BASIC(tag) (tag < GI_TYPE_TAG_ARRAY)
 
+    enum :IArrayType, [
+      :c,
+      :array,
+      :ptr_array,
+      :byte_array
+    ]
+
     attach_function :g_type_info_is_pointer, [:pointer], :bool
     attach_function :g_type_info_get_tag, [:pointer], :ITypeTag
     attach_function :g_type_info_get_param_type, [:pointer, :int], :pointer
     attach_function :g_type_info_get_interface, [:pointer], :pointer
     attach_function :g_type_info_get_array_length, [:pointer], :int
     attach_function :g_type_info_get_array_fixed_size, [:pointer], :int
+    attach_function :g_type_info_get_array_type, [:pointer], :IArrayType
     attach_function :g_type_info_is_zero_terminated, [:pointer], :bool
     attach_function :g_type_info_get_n_error_domains, [:pointer], :int
     attach_function :g_type_info_get_error_domain, [:pointer, :int], :pointer
@@ -216,6 +226,34 @@ module GirFFI
     attach_function :g_interface_info_get_n_constants, [:pointer], :int
     attach_function :g_interface_info_get_constant, [:pointer, :int], :pointer
     attach_function :g_interface_info_get_iface_struct, [:pointer], :pointer
-    
+
+    class GIArgument < FFI::Union
+      layout :v_boolean, :int,
+        :v_int8, :int8,
+        :v_uint8, :uint8,
+        :v_int16, :int16,
+        :v_uint16, :uint16,
+        :v_int32, :int32,
+        :v_uint32, :uint32,
+        :v_int64, :int64,
+        :v_uint64, :uint64,
+        :v_float, :float,
+        :v_double, :double,
+        :v_short, :short,
+        :v_ushort, :ushort,
+        :v_int, :int,
+        :v_uint, :uint,
+        :v_long, :long,
+        :v_ulong, :ulong,
+        :v_ssize, :size_t, # FIXME: Needs to be signed.
+        :v_size, :size_t,
+        :v_string, :string,
+        :v_pointer, :pointer
+    end
+
+    # IConstInfo
+    #
+    attach_function :g_constant_info_get_type, [:pointer], :pointer
+    attach_function :g_constant_info_get_value, [:pointer, :pointer], :int
   end
 end

data/lib/gir_ffi/overrides/glib.rb

@@ -3,25 +3,209 @@ module GirFFI
     module GLib
       def self.included base
 	base.extend ClassMethods
+        extend_classes(base)
         attach_non_introspectable_functions(base)
       end
 
+      def self.extend_classes base
+        base::SList.class_eval {
+          attr_accessor :element_type
+          include ListInstanceMethods
+          extend ListClassMethods
+          include Enumerable
+        }
+        base::List.class_eval {
+          attr_accessor :element_type
+          include ListInstanceMethods
+          extend ListClassMethods
+          include Enumerable
+        }
+        base::HashTable.class_eval {
+          attr_accessor :key_type
+          attr_accessor :value_type
+          include HashTableInstanceMethods
+          extend HashTableClassMethods
+          include Enumerable
+        }
+        base::ByteArray.class_eval {
+          include ByteArrayInstanceMethods
+        }
+        base::Array.class_eval {
+          attr_accessor :element_type
+          include ArrayInstanceMethods
+        }
+      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
+        base::Lib.attach_function :g_hash_table_foreach,
+          [:pointer, base::HFunc, :pointer], :void
+        base::Lib.attach_function :g_hash_table_new,
+          [base::HashFunc, base::EqualFunc], :pointer
+        base::Lib.attach_function :g_hash_table_insert,
+          [:pointer, :pointer, :pointer], :void
+        base::Lib.attach_function :g_byte_array_new, [], :pointer
+        base::Lib.attach_function :g_byte_array_append,
+          [:pointer, :pointer, :uint], :pointer
+        base::Lib.attach_function :g_array_new, [:int, :int, :uint], :pointer
+        base::Lib.attach_function :g_array_append_vals,
+          [:pointer, :pointer, :uint], :pointer
       end
 
       module ClassMethods
-        # FIXME: Should not be so visible for end users. 
+        # FIXME: Turn into real constructor
+        def slist_new elmttype
+          ::GLib::List._real_new(FFI::Pointer.new(0)).tap {|it|
+            it.element_type = elmttype}
+        end
+
+        # FIXME: Turn into instance method; Use element type.
         def slist_prepend slist, data
-          ::GLib::SList.wrap(::GLib::Lib.g_slist_prepend slist, data)
+          ::GLib::SList.wrap(slist.element_type, ::GLib::Lib.g_slist_prepend(slist, data))
+        end
+
+        # FIXME: Turn into real constructor
+        def list_new elmttype
+          ::GLib::List._real_new(FFI::Pointer.new(0)).tap {|it|
+            it.element_type = elmttype}
         end
 
-        # FIXME: Should not be so visible for end users. 
+        # FIXME: Turn into instance method; Use element type.
         def list_append list, data
-          ::GLib::List.wrap(::GLib::Lib.g_list_append list, data)
+          ::GLib::List.wrap(list.element_type, ::GLib::Lib.g_list_append(list, data))
+        end
+
+        # FIXME: Turn into real constructor
+        def hash_table_new keytype, valtype
+          hash_fn, eq_fn = case keytype
+                           when :utf8
+                             lib = ::GLib::Lib.ffi_libraries.first
+                             [ FFI::Function.new(:uint, [:pointer], lib.find_function("g_str_hash")),
+                               FFI::Function.new(:int, [:pointer, :pointer], lib.find_function("g_str_equal"))]
+                           else
+                             [nil, nil]
+                           end
+
+          ::GLib::HashTable.wrap(keytype, valtype, ::GLib::Lib.g_hash_table_new(hash_fn, eq_fn))
+        end
+
+        # FIXME: Turn into real constructor
+        def byte_array_new
+          ::GLib::ByteArray.wrap(::GLib::Lib.g_byte_array_new)
+        end
+
+        # FIXME: Turn into instance method
+        def byte_array_append arr, data
+          bytes = GirFFI::ArgHelper.utf8_to_inptr data
+          len = data.bytesize
+          ::GLib::ByteArray.wrap(::GLib::Lib.g_byte_array_append arr.to_ptr, bytes, len)
+        end
+
+        # FIXME: Turn into real constructor
+        def array_new type
+          ffi_type = type == :utf8 ? :pointer : type
+          arr = ::GLib::Array.wrap(
+            ::GLib::Lib.g_array_new(0, 0, FFI.type_size(ffi_type)))
+          arr.element_type = type
+          arr
+        end
+
+        # FIXME: Turn into instance method
+        def array_append_vals arr, data
+          bytes = GirFFI::ArgHelper.typed_array_to_inptr arr.element_type, data
+          len = data.length
+          res = ::GLib::Array.wrap(
+            ::GLib::Lib.g_array_append_vals(arr.to_ptr, bytes, len))
+          res.element_type = arr.element_type
+          res
+        end
+
+      end
+
+      module ListInstanceMethods
+        def each
+          list = self
+          rval = nil
+          until list.nil?
+            rval = yield GirFFI::ArgHelper.cast_from_pointer(element_type, list[:data])
+            list = self.class.wrap(element_type, list[:next])
+          end
+          rval
+        end
+      end
+
+      module ListClassMethods
+        def wrap elmttype, ptr
+          super(ptr).tap do |it|
+            break if it.nil?
+            it.element_type = elmttype
+          end
+        end
+      end
+
+      module HashTableClassMethods
+        def wrap keytype, valtype, ptr
+          super(ptr).tap do |it|
+            break if it.nil?
+            it.key_type = keytype
+            it.value_type = valtype
+          end
+        end
+      end
+
+      module HashTableInstanceMethods
+        def each
+          prc = Proc.new {|keyptr, valptr, userdata|
+            key = cast_from_pointer key_type, keyptr
+            val = cast_from_pointer value_type, valptr
+            yield key, val
+          }
+          ::GLib::Lib.g_hash_table_foreach self.to_ptr, prc, nil
+        end
+
+        def to_hash
+          Hash[self.to_a]
+        end
+
+        def insert key, value
+          keyptr = cast_to_pointer key_type, key
+          valptr = cast_to_pointer value_type, value
+          ::GLib::Lib.g_hash_table_insert self.to_ptr, keyptr, valptr
+        end
+
+        def cast_to_pointer type, it
+          if type == :utf8
+            GirFFI::ArgHelper.utf8_to_inptr it
+          else
+            FFI::Pointer.new(it)
+          end
+        end
+
+        def cast_from_pointer type, it
+          case type
+          when :utf8
+            GirFFI::ArgHelper.ptr_to_utf8 it
+          when :gint32
+            GirFFI::ArgHelper.cast_pointer_to_int32 it
+          else
+            it.address
+          end
+        end
+      end
+
+      module ByteArrayInstanceMethods
+        def to_string
+          GirFFI::ArgHelper.ptr_to_utf8_length self[:data], self[:len]
+        end
+      end
+
+      module ArrayInstanceMethods
+        def to_a
+          GirFFI::ArgHelper.ptr_to_typed_array(self.element_type,
+                                               self[:data], self[:len])
         end
       end
     end

data/lib/gir_ffi/overrides/gobject.rb

@@ -30,6 +30,12 @@ module GirFFI
       end
 
       def self.build_extra_classes base
+        build_ruby_closure_class base
+      end
+
+      # Build the GObject::RubyClosure class. This class encapsulates Ruby
+      # blocks as GObject Closures.
+      def self.build_ruby_closure_class base
         klass = Class.new(base::Closure) do
           const_set :BLOCK_STORE, {}
 
@@ -41,8 +47,7 @@ module GirFFI
           def self.new &block
             raise ArgumentError unless block_given?
             wrap(new_simple(self::Struct.size, nil).to_ptr).tap do |it|
-              # XXX: Check that this methods is fool-proof!
-              h = block.hash
+              h = block.object_id
               self::BLOCK_STORE[h] = block
               it[:blockhash] = h
               it.set_marshal Proc.new {|*args| marshaller(*args)}
@@ -272,11 +277,17 @@ module GirFFI
         end
 
         def ruby_value
-	  case current_gtype_name
-	  when "gboolean"
+	  case current_gtype_name.to_sym
+	  when :gboolean
 	    get_boolean
-	  when "gint"
+	  when :gint
 	    get_int
+          when :gchararray
+            get_string
+          when :GDate
+            ::GLib::Date.wrap(get_boxed)
+          when :GStrv
+            ArgHelper.strv_to_utf8_array get_boxed
 	  else
 	    nil
 	  end

data/tasks/test.rake

@@ -17,7 +17,7 @@ namespace :test do
 end
 
 file "test/lib/Makefile" => "test/lib/configure" do
-  sh %{cd test/lib && ./configure}
+  sh %{cd test/lib && ./configure --enable-maintainer-mode}
 end
 
 file "test/lib/configure" do

data/test/arg_helper_test.rb

@@ -1,9 +1,9 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
-class ArgHelperTest < Test::Unit::TestCase
-  context "The int_to_inoutptr method's return value" do
+class ArgHelperTest < MiniTest::Spec
+  context "The gint32_to_inoutptr method's return value" do
     setup do
-      @result = GirFFI::ArgHelper.int_to_inoutptr 24
+      @result = GirFFI::ArgHelper.gint32_to_inoutptr 24
     end
 
     should "be an FFI::Pointer" do
@@ -38,14 +38,14 @@ class ArgHelperTest < Test::Unit::TestCase
     end
   end
 
-  context "The outptr_to_int method" do
+  context "The outptr_to_gint32 method" do
     setup do
       @ptr = GirFFI::AllocationHelper.safe_malloc FFI.type_size(:int)
       @ptr.write_int 342
     end
 
     should "retrieve the correct integer value" do
-      assert_equal 342, GirFFI::ArgHelper.outptr_to_int(@ptr)
+      assert_equal 342, GirFFI::ArgHelper.outptr_to_gint32(@ptr)
     end
   end