gir_ffi 0.0.10 → 0.0.11

data/test/test_helper.rb

@@ -15,10 +15,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'gir_ffi'
 
-# Since the tests will call Gtk+ functions, Gtk+ must be initialized.
-GirFFI.setup :Gtk, '2.0'
-Gtk.init
-
 GirFFI::IRepository.prepend_search_path File.join(File.dirname(__FILE__), 'lib')
 module GirFFI
   class IRepository
@@ -48,17 +44,16 @@ class MiniTest::Unit::TestCase
     code.gsub(/(^\s*|\s*$)/, "")
   end
 
-  # FIXME: Rename. It can also get object, interface, etc., data.
-  def get_function_introspection_data namespace, function
+  def get_introspection_data namespace, name
     gir = GirFFI::IRepository.default
     gir.require namespace, nil
-    gir.find_by_name namespace, function
+    gir.find_by_name namespace, name
   end
 
-  def get_method_introspection_data namespace, klass, function
+  def get_method_introspection_data namespace, klass, name
     gir = GirFFI::IRepository.default
     gir.require namespace, nil
-    gir.find_by_name(namespace, klass).find_method function
+    gir.find_by_name(namespace, klass).find_method name
   end
 
   SAVED_MODULES = {}

data/test/type_builder_test.rb

@@ -20,7 +20,7 @@ class TypeBuilderTest < MiniTest::Spec
 
     context "for Gtk::Widget" do
       setup do
-	@cbuilder = GirFFI::Builder::Type::Object.new get_function_introspection_data('Gtk', 'Widget')
+	@cbuilder = GirFFI::Builder::Type::Object.new get_introspection_data('Gtk', 'Widget')
       end
 
       context "looking at Gtk::Widget#show" do
@@ -39,19 +39,19 @@ class TypeBuilderTest < MiniTest::Spec
 
     context 'the find_signal method' do
       should 'find the signal "test" for TestObj' do
-	builder = GirFFI::Builder::Type::Object.new get_function_introspection_data('Regress', 'TestObj')
+	builder = GirFFI::Builder::Type::Object.new get_introspection_data('Regress', 'TestObj')
 	sig = builder.find_signal 'test'
 	assert_equal 'test', sig.name
       end
 
       should 'find the signal "test" for TestSubObj' do
-	builder = GirFFI::Builder::Type::Object.new get_function_introspection_data('Regress', 'TestSubObj')
+	builder = GirFFI::Builder::Type::Object.new get_introspection_data('Regress', 'TestSubObj')
 	sig = builder.find_signal 'test'
 	assert_equal 'test', sig.name
       end
 
       should 'find the signal "changed" for Gtk::Entry' do
-	builder = GirFFI::Builder::Type::Object.new get_function_introspection_data('Gtk', 'Entry')
+	builder = GirFFI::Builder::Type::Object.new get_introspection_data('Gtk', 'Entry')
 	sig = builder.find_signal 'changed'
 	assert_equal 'changed', sig.name
       end
@@ -59,7 +59,7 @@ class TypeBuilderTest < MiniTest::Spec
 
     context "for GObject::TypeCValue (a union)" do
       setup do
-	@cbuilder = GirFFI::Builder::Type::Union.new get_function_introspection_data('GObject', 'TypeCValue')
+	@cbuilder = GirFFI::Builder::Type::Union.new get_introspection_data('GObject', 'TypeCValue')
       end
 
       should "returns false looking for a method that doesn't exist" do

data/test/{dynamic_type_builder_test.rb → unintrospectable_type_builder_test.rb}

@@ -1,21 +1,19 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
-require 'gir_ffi/builder/dynamic_type'
-
-describe "GirFFI::Builder::DynamicType" do
+describe GirFFI::Builder::Type::Unintrospectable do
   describe "building the GLocalFile type" do
     before do
       # Ensure existence of GLocalFile type
       GirFFI.setup :Gio
       unless Gio::Lib.respond_to? :g_file_new_for_path
-        Gio.gir_ffi_builder.setup_function "file_new_for_path"
+        Gio._setup_method "file_new_for_path"
       end
-      ptr = GirFFI::ArgHelper.utf8_to_inptr '/'
+      ptr = GirFFI::InPointer.from :utf8, '/'
       Gio::Lib.g_file_new_for_path(ptr)
 
       @gtype = GObject.type_from_name 'GLocalFile'
-      bldr = GirFFI::Builder::DynamicType.new(@gtype)
-      @klass = bldr.build_class
+      @bldr = GirFFI::Builder::Type::Unintrospectable.new(@gtype)
+      @klass = @bldr.build_class
     end
 
     it "builds a class" do
@@ -31,10 +29,16 @@ describe "GirFFI::Builder::DynamicType" do
     end
 
     it "returns the same class when built again" do
-      other_bldr = GirFFI::Builder::DynamicType.new(@gtype)
+      other_bldr = GirFFI::Builder::Type::Unintrospectable.new(@gtype)
       other_klass = other_bldr.build_class
 
       assert_equal @klass, other_klass
     end
+
+    describe "its #find_signal method" do
+      it "works for a signal that doesn't exist" do
+        assert_nil @bldr.find_signal "foo"
+      end
+    end
   end
 end

data/test/unit/builder_test.rb

@@ -0,0 +1,31 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+describe GirFFI::Builder do
+  describe ".itypeinfo_to_callback_ffitype" do
+    describe "for an :interface argument" do
+      setup do
+        @iface = Object.new
+        stub(@info = Object.new).interface { @iface }
+        stub(@info).tag { :interface }
+        stub(@info).pointer? { false }
+      end
+
+      it "correctly maps a :union argument to :pointer" do
+        stub(@iface).info_type { :union }
+
+        result = GirFFI::Builder.itypeinfo_to_callback_ffitype @info
+
+        assert_equal :pointer, result
+      end
+
+      it "correctly maps a :flags argument to :int32" do
+        stub(@iface).info_type { :flags }
+
+        result = GirFFI::Builder.itypeinfo_to_callback_ffitype @info
+
+        assert_equal :int32, result
+      end
+    end
+  end
+end
+

data/test/unit/callback_helper_test.rb

@@ -0,0 +1,19 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+describe GirFFI::CallbackHelper do
+  describe ".map_single_callback_arg" do
+    it "correctly maps a :struct type" do
+      GirFFI.setup :GObject
+
+      cl = GObject::Closure.new_simple GObject::Closure::Struct.size, nil
+
+      cinfo = GirFFI::IRepository.default.find_by_name 'GObject', 'ClosureMarshal'
+      ainfo = cinfo.args[0]
+
+      r = GirFFI::CallbackHelper.map_single_callback_arg cl.to_ptr, ainfo
+
+      assert_instance_of GObject::Closure, r
+      assert_equal r.to_ptr, cl.to_ptr
+    end
+  end
+end

data/test/unit/constant_builder_test.rb

@@ -0,0 +1,5 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+describe GirFFI::Builder::Type::Constant do
+end
+

data/test/unit/i_constant_info_test.rb

@@ -0,0 +1,17 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+describe GirFFI::IConstantInfo do
+  describe "for GLib::ALLOCATOR_LIST, a constant of type :gint32" do
+    before do
+      @info = get_introspection_data 'GLib', 'ALLOCATOR_LIST'
+    end
+
+    it "returns :gint32 as its type" do
+      assert_equal :gint32, @info.constant_type.tag
+    end
+
+    it "returns a value union with member :v_int32 with value 1" do
+      assert_equal 1, @info.value[:v_int32]
+    end
+  end
+end

data/test/unit/in_out_pointer_test.rb

@@ -0,0 +1,118 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+require 'gir_ffi/in_out_pointer'
+
+describe GirFFI::InOutPointer do
+  describe "an instance created with .from" do
+    setup do
+      @result = GirFFI::InOutPointer.from :gint32, 23
+    end
+
+    it "holds a pointer to the given value" do
+      assert_equal 23, @result.read_int32
+    end
+
+    it "is an instance of GirFFI::InOutPointer" do
+      assert_instance_of GirFFI::InOutPointer, @result
+    end
+  end
+
+  describe ".from" do
+    it "handles :gboolean" do
+      GirFFI::InOutPointer.from :gboolean, false
+    end
+
+    it "handles :utf8" do
+      GirFFI::InOutPointer.from :utf8, "Hello"
+    end
+  end
+
+  describe "an instance created with .from_array" do
+    setup do
+      @result = GirFFI::InOutPointer.from_array :gint32, [24, 13]
+    end
+
+    it "holds a pointer to a non-null pointer" do
+      ptr = @result.read_pointer
+      refute ptr.null?
+    end
+
+    it "holds a pointer to a pointer to the correct input values" do
+      ptr = @result.read_pointer
+      assert_equal [24, 13], [ptr.get_int(0), ptr.get_int(4)]
+    end
+
+    it "is an instance of GirFFI::InPointer" do
+      assert_instance_of GirFFI::InOutPointer, @result
+    end
+  end
+
+  describe ".from_array" do
+    it "returns nil when passed nil" do
+      result = GirFFI::InOutPointer.from_array :gint32, nil
+      assert_nil result
+    end
+  end
+
+  describe "an instance created with .from_array :utf8" do
+    before do
+      @result = GirFFI::InOutPointer.from_array :utf8, ["foo", "bar", "baz"]
+    end
+
+    it "returns a pointer to an array of pointers to strings" do
+      ptr = @result.read_pointer
+      ary = ptr.read_array_of_pointer(3)
+      assert_equal ["foo", "bar", "baz"], ary.map {|p| p.read_string}
+    end
+  end
+
+  describe "in instance created with .for" do
+    setup do
+      @result = GirFFI::InOutPointer.for :gint32
+    end
+
+    it "holds a pointer to a null value" do
+      assert_equal 0, @result.read_int32
+    end
+
+    it "is an instance of GirFFI::InOutPointer" do
+      assert_instance_of GirFFI::InOutPointer, @result
+    end
+  end
+
+  describe ".for" do
+    it "handles :gboolean" do
+      GirFFI::InOutPointer.for :gboolean
+    end
+
+    it "handles :utf8" do
+      GirFFI::InOutPointer.for :utf8
+    end
+  end
+
+  describe "#to_value" do
+    it "returns the held value" do
+      ptr = GirFFI::InOutPointer.from :gint32, 123
+      assert_equal 123, ptr.to_value
+    end
+
+    describe "for :gboolean values" do
+      it "works when the value is false" do
+        ptr = GirFFI::InOutPointer.from :gboolean, false
+        assert_equal false, ptr.to_value
+      end
+
+      it "works when the value is true" do
+        ptr = GirFFI::InOutPointer.from :gboolean, true
+        assert_equal true, ptr.to_value
+      end
+    end
+
+    describe "for :utf8 values" do
+      it "returns the held value" do
+        ptr = GirFFI::InOutPointer.from :utf8, "Some value"
+        assert_equal "Some value", ptr.to_value
+      end
+    end
+  end
+end

data/test/unit/in_pointer_test.rb

@@ -0,0 +1,69 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+require 'gir_ffi/in_pointer'
+
+describe GirFFI::InPointer do
+  describe ".from_array" do
+    it "returns nil when passed nil" do
+      result = GirFFI::InPointer.from_array :gint32, nil
+      assert_nil result
+    end
+
+    it "handles type tag :gtype" do
+      GirFFI::InPointer.from_array :gtype, [2]
+    end
+
+    it "handles type tag :interface_pointer" do
+      GirFFI::InPointer.from_array :interface_pointer, []
+    end
+  end
+
+  describe "an instance created with .from_array" do
+    setup do
+      @result = GirFFI::InPointer.from_array :gint32, [24, 13]
+    end
+
+    it "holds a pointer to the correct input values" do
+      assert_equal 24, @result.get_int(0)
+      assert_equal 13, @result.get_int(4)
+    end
+
+    it "is an instance of GirFFI::InPointer" do
+      assert_instance_of GirFFI::InPointer, @result
+    end
+  end
+
+  describe "an instance created with .from_array :utf8" do
+    before do
+      @result = GirFFI::InPointer.from_array :utf8, ["foo", "bar", "baz"]
+    end
+
+    it "returns an array of pointers to strings" do
+      ary = @result.read_array_of_pointer(3)
+      assert_equal ["foo", "bar", "baz"], ary.map {|p| p.read_string}
+    end
+  end
+
+  describe "an instance created with .from :utf8" do
+    before do
+      @result = GirFFI::InPointer.from :utf8, "foo"
+    end
+
+    it "returns an pointers to the given string" do
+      ary = @result.read_array_of_pointer(3)
+      assert_equal "foo", @result.read_string
+    end
+
+    it "is an instance of GirFFI::InPointer" do
+      assert_instance_of GirFFI::InPointer, @result
+    end
+  end
+
+  describe ".from" do
+    it "returns nil when passed nil" do
+      result = GirFFI::InPointer.from :foo, nil
+      assert_nil result
+    end
+  end
+end
+

data/test/unit/object_type_builder_test.rb

@@ -0,0 +1,20 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+describe GirFFI::Builder::Type::Object do
+  before do
+    GirFFI.setup :Regress
+  end
+
+  describe "#setup_method" do
+    it "sets up singleton methods defined in a class's parent" do
+      info = get_introspection_data 'Regress', 'TestSubObj'
+      assert_nil info.find_method "static_method"
+      parent = info.parent
+      assert_not_nil parent.find_method "static_method"
+
+      b = GirFFI::Builder::Type::Object.new(info)
+      b.setup_method "static_method"
+      pass
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gir_ffi
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Matijs van Zuijlen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 Z
+date: 2011-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -86,9 +86,16 @@ files:
 - lib/gir_ffi/g_error.rb
 - lib/gir_ffi/i_object_info.rb
 - lib/gir_ffi/builder.rb
-- lib/gir_ffi/builder/dynamic_type.rb
+- lib/gir_ffi/in_out_pointer.rb
+- lib/gir_ffi/builder/argument/list_base.rb
+- lib/gir_ffi/builder/argument/base.rb
+- lib/gir_ffi/builder/argument/in_base.rb
+- lib/gir_ffi/builder/argument/hash_table_base.rb
+- lib/gir_ffi/builder/argument/out_base.rb
+- lib/gir_ffi/builder/argument/in_out_base.rb
 - lib/gir_ffi/builder/module.rb
 - lib/gir_ffi/builder/function.rb
+- lib/gir_ffi/builder/type/with_methods.rb
 - lib/gir_ffi/builder/type/base.rb
 - lib/gir_ffi/builder/type/constant.rb
 - lib/gir_ffi/builder/type/interface.rb
@@ -97,12 +104,15 @@ files:
 - lib/gir_ffi/builder/type/enum.rb
 - lib/gir_ffi/builder/type/registered_type.rb
 - lib/gir_ffi/builder/type/callback.rb
+- lib/gir_ffi/builder/type/unintrospectable.rb
+- lib/gir_ffi/builder/type/with_layout.rb
 - lib/gir_ffi/builder/type/union.rb
 - lib/gir_ffi/builder/type/object.rb
 - lib/gir_ffi/builder/type.rb
 - lib/gir_ffi/builder/argument.rb
 - lib/gir_ffi/i_enum_info.rb
 - lib/gir_ffi/i_value_info.rb
+- lib/gir_ffi/interface_base.rb
 - lib/gir_ffi/module_base.rb
 - lib/gir_ffi/i_signal_info.rb
 - lib/gir_ffi/i_callback_info.rb
@@ -113,7 +123,9 @@ files:
 - lib/gir_ffi/i_vfunc_info.rb
 - lib/gir_ffi/i_constant_info.rb
 - lib/gir_ffi/class_base.rb
+- lib/gir_ffi/callback_helper.rb
 - lib/gir_ffi/i_struct_info.rb
+- lib/gir_ffi/in_pointer.rb
 - lib/gir_ffi/i_callable_info.rb
 - lib/gir_ffi/i_function_info.rb
 - lib/gir_ffi/i_error_domain_info.rb
@@ -130,7 +142,7 @@ files:
 - lib/gir_ffi/i_arg_info.rb
 - lib/gir_ffi/i_type_info.rb
 - test/i_repository_test.rb
-- test/generated_regress_test.rb
+- test/unintrospectable_type_builder_test.rb
 - test/function_definition_builder_test.rb
 - test/g_object_test.rb
 - test/arg_helper_test.rb
@@ -138,7 +150,6 @@ files:
 - test/lib/autogen.sh
 - test/lib/configure.ac
 - test/lib/m4/jhflags.m4
-- test/dynamic_type_builder_test.rb
 - test/class_base_test.rb
 - test/test_helper.rb
 - test/girffi_test.rb
@@ -146,18 +157,28 @@ files:
 - test/module_builder_test.rb
 - test/i_object_info_test.rb
 - test/g_object_overrides_test.rb
-- test/generated_gtk_test.rb
+- test/unit/constant_builder_test.rb
+- test/unit/in_out_pointer_test.rb
+- test/unit/callback_helper_test.rb
+- test/unit/builder_test.rb
+- test/unit/in_pointer_test.rb
+- test/unit/object_type_builder_test.rb
+- test/unit/i_constant_info_test.rb
 - test/type_builder_test.rb
 - test/builder_test.rb
 - test/glib_overrides_test.rb
 - test/gtk_overrides_test.rb
-- test/object_type_builder_test.rb
-- test/generated_gobject_test.rb
-- test/generated_gio_test.rb
-- test/generated_gimarshallingtests_test.rb
+- test/integration/generated_regress_test.rb
+- test/integration/generated_gtk_test.rb
+- test/integration/generated_gobject_test.rb
+- test/integration/generated_gio_test.rb
+- test/integration/generated_gimarshallingtests_test.rb
+- tasks/yardoc.rake
+- tasks/rdoc.rake
 - tasks/test.rake
 - tasks/setup.rb
 - tasks/notes.rake
+- examples/05_notification.rb
 - examples/demo_ffi_safe_inherited_layout.rb
 - examples/04_webkit.rb
 - examples/demo_ffi_nested_struct.rb
@@ -209,26 +230,33 @@ test_files:
 - test/arg_helper_test.rb
 - test/builder_test.rb
 - test/class_base_test.rb
-- test/dynamic_type_builder_test.rb
 - test/function_definition_builder_test.rb
 - test/g_object_overrides_test.rb
 - test/g_object_test.rb
-- test/generated_gimarshallingtests_test.rb
-- test/generated_gio_test.rb
-- test/generated_gobject_test.rb
-- test/generated_gtk_test.rb
-- test/generated_regress_test.rb
 - test/girffi_test.rb
 - test/glib_overrides_test.rb
 - test/gtk_overrides_test.rb
 - test/i_object_info_test.rb
 - test/i_repository_test.rb
+- test/integration/generated_gimarshallingtests_test.rb
+- test/integration/generated_gio_test.rb
+- test/integration/generated_gobject_test.rb
+- test/integration/generated_gtk_test.rb
+- test/integration/generated_regress_test.rb
 - test/interface_type_builder_test.rb
 - test/lib/Makefile.am
 - test/lib/autogen.sh
 - test/lib/configure.ac
 - test/lib/m4/jhflags.m4
 - test/module_builder_test.rb
-- test/object_type_builder_test.rb
 - test/test_helper.rb
 - test/type_builder_test.rb
+- test/unintrospectable_type_builder_test.rb
+- test/unit/builder_test.rb
+- test/unit/callback_helper_test.rb
+- test/unit/constant_builder_test.rb
+- test/unit/i_constant_info_test.rb
+- test/unit/in_out_pointer_test.rb
+- test/unit/in_pointer_test.rb
+- test/unit/object_type_builder_test.rb
+has_rdoc: 

data/lib/gir_ffi/builder/dynamic_type.rb

@@ -1,41 +0,0 @@
-module GirFFI
-  module Builder
-    class DynamicType
-      CACHE = {}
-
-      def initialize gtype
-        @gtype = gtype
-      end
-
-      def build_class
-        CACHE[@gtype] ||= Class.new(parent).tap do |klass|
-          interfaces.each do |iface|
-            klass.class_eval do
-              include iface
-            end
-          end
-        end
-      end
-
-      private
-
-      def parent
-        parent_type = ::GObject.type_parent @gtype
-        info = gir.find_by_gtype(parent_type)
-        GirFFI::Builder.build_class info
-      end
-
-      def interfaces
-        iface_types = ::GObject.type_interfaces @gtype
-        iface_types.map do |gtype|
-          info = gir.find_by_gtype gtype
-          GirFFI::Builder.build_class info
-        end
-      end
-
-      def gir
-        @gir ||= GirFFI::IRepository.default
-      end
-    end
-  end
-end

data/test/generated_gio_test.rb

@@ -1,39 +0,0 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-
-# Tests generated methods and functions in the Gio namespace.
-class GeneratedGioTest < MiniTest::Spec
-  context "In the generated Gio module" do
-    setup do
-      GirFFI.setup :Gio
-    end
-
-    describe "#file_new_from_path, a method returning an interface," do
-      it "does not throw an error when generated" do
-        assert_nothing_raised {
-          Gio.file_new_for_path('/')
-        }
-      end
-
-      it "returns an object of a more specific class" do
-        file = Gio.file_new_for_path('/')
-        refute_instance_of Gio::File, file
-        assert_includes file.class.ancestors, Gio::File
-      end
-    end
-
-    context "the FileInfo class" do
-      context "an instance" do
-	setup do
-	  file = Gio.file_new_for_path('/')
-	  @fileinfo = file.query_info "*", :none, nil
-	end
-
-	should "hava a working #get_attribute_type method" do
-	  type = @fileinfo.get_attribute_type "standard::display-name"
-          assert_equal :string, type
-	end
-      end
-    end
-  end
-end
-

data/test/generated_gobject_test.rb

@@ -1,15 +0,0 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-
-describe "The generated GObject module" do
-  before do
-    GirFFI.setup :GObject
-  end
-
-  describe "#type_interfaces" do
-    it "works, showing that returning an array of GType works" do
-      tp = GObject.type_from_name 'GTypeModule'
-      ifcs = GObject.type_interfaces tp
-      assert_equal 1, ifcs.size
-    end
-  end
-end