gir_ffi 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,9 @@
+== 0.0.3 / 2010-11-19
+
+* Update to restore Ruby 1.9 support.
+* Handle functions with the 'throws' property set.
+* Handle classes without specified fields.
+
 == 0.0.2 / 2010-11-14
 
 * Several fixes to method creation.

data/lib/gir_ffi/base.rb

@@ -14,16 +14,6 @@ module GirFFI
       self.class.ffi_structure
     end
 
-    def _fake_missing *args, &block
-      method_missing method_name.to_sym, *args, &block
-    end
-
-    private
-
-    def method_name
-      caller[0].gsub(/.*`(.*)'/, '\1')
-    end
-
     class << self
       def ffi_structure
 	self.const_get(:Struct)

data/lib/gir_ffi/builder.rb

@@ -109,6 +109,7 @@ module GirFFI
       end
       if info.type == :function
 	types.unshift :pointer if info.method?
+	types << :pointer if info.throws?
       end
       types
     end

data/lib/gir_ffi/class_builder.rb

@@ -69,27 +69,40 @@ module GirFFI
     end
 
     def setup_layout
-      layoutspec = []
-      @info.fields.each do |f|
-	layoutspec << f.name.to_sym
+      spec = layout_specification
+      @structklass.class_eval { layout(*spec) }
+    end
 
-	ffitype = Builder.itypeinfo_to_ffitype f.type
-	if ffitype.kind_of?(Class) and BuilderHelper.const_defined_for ffitype, :Struct
-	  ffitype = ffitype.const_get :Struct
+    def layout_specification
+      if @info.fields.empty?
+	if @parent
+	  return [:parent, @superclass.const_get(:Struct), 0]
 	end
+      end
+      spec = []
+      @info.fields.each do |f|
+	spec << f.name.to_sym
+	spec << itypeinfo_to_ffitype_for_struct(f.type)
+	spec << f.offset
+      end
+      spec
+    end
 
-	layoutspec << ffitype
-
-	layoutspec << f.offset
+    def itypeinfo_to_ffitype_for_struct typeinfo
+      ffitype = Builder.itypeinfo_to_ffitype typeinfo
+      if ffitype.kind_of?(Class) and BuilderHelper.const_defined_for ffitype, :Struct
+	ffitype = ffitype.const_get :Struct
       end
-      @structklass.class_eval { layout(*layoutspec) }
+      ffitype
     end
 
     def alias_instance_methods
       @info.methods.each do |m|
-	@klass.class_eval do
-	  alias_method m.name.to_sym, :_fake_missing
-	end
+	@klass.class_eval "
+	  def #{m.name} *args, &block
+	    method_missing :#{m.name}, *args, &block
+	  end
+	"
       end
     end
 

data/lib/gir_ffi/function_definition_builder.rb

@@ -116,6 +116,13 @@ module GirFFI
     end
 
     def adjust_accumulators
+      if @info.throws?
+	errvar = new_var
+	@pre << "#{errvar} = FFI::MemoryPointer.new(:pointer).write_pointer nil"
+	@post << "GirFFI::ArgHelper.check_error(#{errvar})"
+	@callargs << errvar
+      end
+
       @post << "return #{@retvals.join(', ')}" unless @retvals.empty?
 
       if @info.method?

data/lib/gir_ffi/i_error_domain_info.rb

@@ -0,0 +1,8 @@
+module GirFFI
+  # Wraps a GIErrorDomainInfo struct.
+  # Represents an error domain.
+  # Not implemented yet.
+  class IErrorDomainInfo < IRegisteredTypeInfo
+  end
+end
+

data/lib/gir_ffi/i_flags_info.rb

@@ -1,5 +1,6 @@
 module GirFFI
   # Wraps a GIEnumInfo struct, if it represents a flag type.
+  # TODO: Perhaps just use IEnumInfo. Seems to make more sense.
   class IFlagsInfo < IEnumInfo
   end
 end

data/lib/gir_ffi/i_repository.rb

@@ -19,24 +19,27 @@ require 'gir_ffi/i_value_info'
 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'
 
 module GirFFI
   # The Gobject Introspection Repository. This class is the point of
   # access to the introspection typelibs.
   # This class wraps the GIRepository struct.
   class IRepository
+    # Map info type to class. Default is IBaseInfo.
     TYPEMAP = {
-      #:invalid,
+      :invalid => IBaseInfo,
       :function => IFunctionInfo,
       :callback => ICallbackInfo,
       :struct => IStructInfo,
-      #:boxed => ,
+      # TODO: There's no GIBoxedInfo, so what does :boxed mean?
+      :boxed => IBaseInfo,
       :enum => IEnumInfo,
       :flags => IFlagsInfo,
       :object => IObjectInfo,
       :interface => IInterfaceInfo,
       :constant => IConstantInfo,
-      # :error_domain,
+      :error_domain => IErrorDomainInfo,
       :union => IUnionInfo,
       :value => IValueInfo,
       :signal => ISignalInfo,
@@ -45,7 +48,7 @@ module GirFFI
       :field => IFieldInfo,
       :arg => IArgInfo,
       :type => ITypeInfo,
-      #:unresolved
+      :unresolved => IBaseInfo
     }
 
     def initialize
@@ -63,11 +66,7 @@ module GirFFI
       Lib.g_type_tag_to_string type
     end
 
-    def n_infos namespace
-      Lib.g_irepository_get_n_infos @gobj, namespace
-    end
-
-    def require namespace, version
+    def require namespace, version=nil
       errpp = FFI::MemoryPointer.new(:pointer).write_pointer nil
 
       Lib.g_irepository_require @gobj, namespace, version, 0, errpp
@@ -76,11 +75,22 @@ module GirFFI
       raise GError.new(errp)[:message] unless errp.null?
     end
 
+    def n_infos namespace
+      Lib.g_irepository_get_n_infos @gobj, namespace
+    end
+
     def info namespace, index
       ptr = Lib.g_irepository_get_info @gobj, namespace, index
       return wrap ptr
     end
 
+    # Utility method
+    def infos namespace
+      (0..(n_infos(namespace) - 1)).map do |i|
+	info namespace, i
+      end
+    end
+
     def find_by_name namespace, name
       ptr = Lib.g_irepository_find_by_name @gobj, namespace, name
       return wrap ptr

data/test/base_test.rb

@@ -10,63 +10,9 @@ class BaseTest < Test::Unit::TestCase
 	def self.new; self._real_new; end
       end
     end
-
-    should "be able to use method_name to get the names of its methods" do
-      @klass.class_eval do
-	def this_is_my_name
-	  method_name
-	end
-      end
-      assert_equal "this_is_my_name", @klass.new.this_is_my_name
-    end
-
-    context "its #_fake_missing method" do
-      should "not be missing" do
-	assert @klass.new.respond_to? :_fake_missing
-      end
-
-      should "call method_missing" do
-	@klass.class_eval do
-	  def method_missing method, *args
-	    method
-	  end
-	end
-	assert_equal :_fake_missing, @klass.new._fake_missing
-      end
-
-      should "pass on its arguments" do
-	@klass.class_eval do
-	  def method_missing method, *args
-	    args.join(', ')
-	  end
-	end
-	assert_equal "a, b", @klass.new._fake_missing("a", "b")
-      end
-
-      should "pass on a given block" do
-	@klass.class_eval do
-	  def method_missing method, *args
-	    yield if block_given?
-	  end
-	end
-	assert_equal :called, @klass.new._fake_missing { :called }
-      end
-    end
-
-    should "be able to use alias_method to create a self-defining method" do
-      @klass.class_eval do
-	def method_missing method, *args
-	  self.class.class_eval "
-	    undef #{method}
-	    def #{method}
-	      :redefined
-	    end
-	  "
-	  self.send method
-	end
-	alias_method :new_method, :_fake_missing
-      end
-      assert_equal :redefined, @klass.new.new_method
+    # TODO: See if we can test some part of Base again.
+    should "pass" do
+      assert true
     end
   end
 end

data/test/class_builder_test.rb

@@ -0,0 +1,23 @@
+require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi'
+
+class ClassBuilderTest < Test::Unit::TestCase
+  context "The ClassBuilder" do
+    setup do
+      @gir = GirFFI::IRepository.default
+      @gir.require 'GObject', nil
+    end
+    should "use parent struct as default layout" do
+      @classbuilder = GirFFI::ClassBuilder.new 'Foo', 'Bar'
+      stub(info = Object.new).parent { @gir.find_by_name 'GObject', 'Object' }
+      stub(info).fields { [] }
+      @classbuilder.instance_eval { @info = info }
+      @classbuilder.instance_eval { @parent = info.parent }
+      @classbuilder.instance_eval { @superclass = GObject::Object }
+
+      spec = @classbuilder.send :layout_specification
+      assert_equal [:parent, GObject::Object::Struct, 0], spec
+    end
+  end
+end
+

data/test/function_definition_builder_test.rb

@@ -55,5 +55,21 @@ class FunctionDefinitionBuilderTest < Test::Unit::TestCase
 
       assert_equal cws(expected), cws(code)
     end
+
+    should "build correct definition of Everything::TestObj#new_from_file" do
+      go = get_method_introspection_data 'Everything', 'TestObj', 'new_from_file'
+      fbuilder = GirFFI::FunctionDefinitionBuilder.new go, Lib
+      code = fbuilder.generate
+
+      expected =
+	"def new_from_file x
+	  _v2 = FFI::MemoryPointer.new(:pointer).write_pointer nil
+	  _v1 = Lib.test_obj_new_from_file x, _v2
+	  GirFFI::ArgHelper.check_error(_v2)
+	  return Everything::TestObj._real_new(_v1)
+	end"
+
+      assert_equal cws(expected), cws(code)
+    end
   end
 end

data/test/i_repository_test.rb

@@ -31,7 +31,13 @@ module GirFFI
 
       should "allow version to be nil" do
 	assert_nothing_raised do
-	  IRepository.default.require 'Gtk', nil
+	  IRepository.default.require 'Everything', nil
+	end
+      end
+
+      should "allow version to be left out" do
+	assert_nothing_raised do
+	  IRepository.default.require 'Everything'
 	end
       end
     end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'shoulda'
+require 'rr'
 require 'ffi'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
@@ -23,6 +24,7 @@ module Lib
 end
 
 class Test::Unit::TestCase
+  include RR::Adapters::TestUnit
   def cws code
     code.gsub(/(^\s*|\s*$)/, "")
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gir_ffi
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Matijs van Zuijlen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-14 00:00:00 +01:00
+date: 2010-11-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,22 @@ dependencies:
         version: 2.11.3
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  type: :development
+  version_requirements: *id003
 description: Ruby-FFI-based binding of the GObject Introspection Repository
 email: 
 - matijs@matijs.net
@@ -88,6 +104,7 @@ files:
 - lib/gir_ffi/i_callable_info.rb
 - lib/gir_ffi/function_definition_builder.rb
 - lib/gir_ffi/i_function_info.rb
+- lib/gir_ffi/i_error_domain_info.rb
 - lib/gir_ffi/version.rb
 - lib/gir_ffi/overrides/gtk.rb
 - lib/gir_ffi/allocation_helper.rb
@@ -105,6 +122,7 @@ files:
 - test/function_definition_builder_test.rb
 - test/arg_helper_test.rb
 - test/test_helper.rb
+- test/class_builder_test.rb
 - test/girffi_test.rb
 - test/constructor_definition_builder_test.rb
 - test/base_test.rb
@@ -167,6 +185,7 @@ test_files:
 - test/arg_helper_test.rb
 - test/base_test.rb
 - test/builder_test.rb
+- test/class_builder_test.rb
 - test/constructor_definition_builder_test.rb
 - test/everything_test.rb
 - test/function_definition_builder_test.rb