gir_ffi 0.0.13 → 0.0.14

data/History.txt

@@ -1,3 +1,11 @@
+== 0.0.14 / 2011-10-28
+
+* Support GObject Introspection version 1.30:
+  - Add support for layouts with fixed-length arrays.
+  - Handle type names starting with underscores.
+  - Call g_signal_emitv directly to avoid conflict in introspection info
+    with earlier versions of GObject Introspection.
+
 == 0.0.13 / 2011-09-09
 
 * Remove IErrorDomain related code. This functinality was removed from

data/lib/gir_ffi/builder/module.rb

@@ -11,6 +11,7 @@ module GirFFI
     def initialize namespace, version=nil
       @namespace = namespace
       @version = version
+      # FIXME: Pass safe namespace as an argument
       @safe_namespace = @namespace.gsub(/^(.)/) { $1.upcase }
     end
 

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

@@ -7,7 +7,7 @@ module GirFFI
         def initialize info
           @info = info
           @namespace = @info.namespace
-          @classname = @info.name.gsub(/^(.)/) { $1.upcase }
+          @classname = @info.safe_name
         end
 
         def build_class

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

@@ -20,6 +20,10 @@ module GirFFI
           if ffitype == :bool
             ffitype = :int
           end
+          if ffitype == :array
+            subtype = itypeinfo_to_ffitype_for_struct typeinfo.param_type(0)
+            ffitype = [subtype, typeinfo.array_fixed_size]
+          end
           ffitype
         end
 

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

@@ -31,11 +31,12 @@ module GirFFI
             end
           end
 
-          fields.map do |finfo|
-            [ finfo.name.to_sym,
-              itypeinfo_to_ffitype_for_struct(finfo.field_type),
-              finfo.offset ]
-          end.flatten
+          fields.inject([]) do |spec, finfo|
+            spec +
+              [ finfo.name.to_sym,
+                itypeinfo_to_ffitype_for_struct(finfo.field_type),
+                finfo.offset ]
+          end
         end
       end
     end

data/lib/gir_ffi/builder.rb

@@ -53,6 +53,7 @@ module GirFFI
       Builder::Module.new(namespace, version).build_module_non_recursive
     end
 
+    # TODO: Move elsewhere, perhaps to Builder::Function.
     def self.attach_ffi_function lib, info
       sym = info.symbol
       argtypes = ffi_function_argument_types info

data/lib/gir_ffi/i_base_info.rb

@@ -37,6 +37,14 @@ module GirFFI
       Lib.g_base_info_get_name @gobj
     end
 
+    def safe_name
+      if name =~ /^_/
+        "Private__" + name
+      else
+        name.gsub(/^(.)/) { $1.upcase }
+      end
+    end
+
     def info_type
       Lib.g_base_info_get_type @gobj
     end

data/lib/gir_ffi/overrides/gobject.rb

@@ -6,6 +6,7 @@ module GirFFI
 	base.extend ClassMethods
         extend_classes(base)
         attach_non_introspectable_functions(base)
+        preload_methods(base)
         build_extra_classes(base)
       end
 
@@ -29,6 +30,10 @@ module GirFFI
           [:pointer, base::ClosureMarshal], :void
       end
 
+      def self.preload_methods base
+        base._setup_method :signal_emitv
+      end
+
       def self.build_extra_classes base
         build_ruby_closure_class base
       end
@@ -99,7 +104,7 @@ module GirFFI
 	  arr = Helper.signal_arguments_to_gvalue_array signal, object, *args
 	  rval = Helper.gvalue_for_signal_return_value signal, object
 
-	  signal_emitv arr[:values], id, 0, rval
+	  ::GObject::Lib.g_signal_emitv arr[:values], id, 0, rval
 
 	  rval
 	end
@@ -129,7 +134,9 @@ module GirFFI
 
       module Helper
         TAG_TYPE_TO_GTYPE_NAME_MAP = {
-          :utf8 => "gchararray"
+          :utf8 => "gchararray",
+          :gboolean => "gboolean",
+          :void => "void"
         }
 
 	def self.signal_callback_args sig, klass, &block
@@ -162,13 +169,11 @@ module GirFFI
 
 	def self.signal_argument_to_gvalue info, arg
           arg_type = info.argument_type
-          tag = arg_type.tag
 
-	  if tag == :interface
-	    interface = info.argument_type.interface
+          val = gvalue_for_type_info arg_type
 
-	    val = ::GObject::Value.new
-	    val.init info.argument_type.interface.g_type
+	  if arg_type.tag == :interface
+	    interface = arg_type.interface
 	    case interface.info_type
 	    when :struct
 	      val.set_boxed arg
@@ -179,30 +184,31 @@ module GirFFI
 	    else
 	      raise NotImplementedError, interface.info_type
 	    end
-
-	    return val
 	  else
-            val = ::GObject::Value.new
-            val.init ::GObject.type_from_name(TAG_TYPE_TO_GTYPE_NAME_MAP[tag])
             val.set_ruby_value arg
 	  end
-	end
 
-	def self.gvalue_for_signal_return_value signal, object
-	  type = ::GObject.type_from_instance object
+          return val
+	end
 
-	  # TODO: Use same signal info as signal_arguments_to_gvalue_array
-	  id = ::GObject.signal_lookup signal, type
+        def self.gvalue_for_type_info info
+          tag = info.tag
+          gtype = case tag
+                  when :interface
+                    info.interface.g_type
+                  when :void
+                    return nil
+                  else
+                    ::GObject.type_from_name(TAG_TYPE_TO_GTYPE_NAME_MAP[tag])
+                  end
+          ::GObject::Value.new.tap {|val| val.init gtype}
+        end
 
-	  query = ::GObject::SignalQuery.new
-	  ::GObject.signal_query id, query
+	def self.gvalue_for_signal_return_value signal, object
+          sig = object.class._find_signal signal
+          rettypeinfo = sig.return_type
 
-	  use_ret = (query[:return_type] != ::GObject.type_from_name("void"))
-	  if use_ret
-	    rval = ::GObject::Value.new
-	    rval.init query[:return_type]
-	  end
-	  rval
+          gvalue_for_type_info rettypeinfo
 	end
 
         # TODO: Generate cast back methods using existing Argument builders.

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 module GirFFI
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end
 

data/test/type_builder_test.rb

@@ -9,7 +9,7 @@ class TypeBuilderTest < MiniTest::Spec
       stub(info = Object.new).parent { @gir.find_by_name 'GObject', 'Object' }
       stub(info).fields { [] }
       stub(info).info_type { :object }
-      stub(info).name { 'Bar' }
+      stub(info).safe_name { 'Bar' }
       stub(info).namespace { 'Foo' }
 
       @classbuilder = GirFFI::Builder::Type::Object.new info
@@ -18,6 +18,38 @@ class TypeBuilderTest < MiniTest::Spec
       assert_equal [:parent, GObject::Object::Struct, 0], spec
     end
 
+    describe "for a layout with a fixed-length array" do
+      before do
+        stub(subtype = Object.new).pointer? { false }
+        stub(subtype).tag { :foo }
+
+        stub(@type = Object.new).pointer? { false }
+        stub(@type).tag { :array }
+        stub(@type).array_fixed_size { 2 }
+        stub(@type).param_type { subtype }
+
+        stub(field = Object.new).field_type { @type }
+        stub(field).name { "bar" }
+        stub(field).offset { 0 }
+
+        stub(@struct = Object.new).safe_name { 'Bar' }
+        stub(@struct).namespace { 'Foo' }
+        stub(@struct).fields { [ field ] }
+      end
+
+      it "creates the correct ffi type for the array" do
+        builder = GirFFI::Builder::Type::RegisteredType.new @struct
+        spec = builder.send :itypeinfo_to_ffitype_for_struct, @type
+        assert_equal [:foo, 2], spec
+      end
+
+      it "creates the correct layout specification" do
+        builder = GirFFI::Builder::Type::Struct.new @struct
+        spec = builder.send :layout_specification
+        assert_equal [:bar, [:foo, 2], 0], spec
+      end
+    end
+
     context "for Gtk::Widget" do
       setup do
 	@cbuilder = GirFFI::Builder::Type::Object.new get_introspection_data('Gtk', 'Widget')

data/test/unit/i_base_info_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+describe GirFFI::IBaseInfo do
+  describe "#safe_name" do
+    it "makes names starting with an underscore safe" do
+      stub(ptr = Object.new).null? { false }
+
+      info = GirFFI::IBaseInfo.wrap ptr
+
+      stub(info).name { "_foo" }
+
+      assert_equal "Private___foo", info.safe_name
+    end
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gir_ffi
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Matijs van Zuijlen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 Z
+date: 2011-10-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -158,6 +158,7 @@ files:
 - test/unit/i_repository_test.rb
 - test/unit/constant_builder_test.rb
 - test/unit/in_out_pointer_test.rb
+- test/unit/i_base_info_test.rb
 - test/unit/callback_helper_test.rb
 - test/unit/builder_test.rb
 - test/unit/in_pointer_test.rb
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: FFI-based GObject binding using the GObject Introspection Repository
@@ -254,9 +255,9 @@ test_files:
 - test/unit/builder_test.rb
 - test/unit/callback_helper_test.rb
 - test/unit/constant_builder_test.rb
+- test/unit/i_base_info_test.rb
 - test/unit/i_constant_info_test.rb
 - test/unit/i_repository_test.rb
 - test/unit/in_out_pointer_test.rb
 - test/unit/in_pointer_test.rb
 - test/unit/object_type_builder_test.rb
-has_rdoc: