gir_ffi 0.4.0 → 0.4.1

data/test/{unit → gir_ffi}/class_base_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::ClassBase do
   describe "a simple descendant" do

data/test/{unit → gir_ffi}/in_out_pointer_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 require 'gir_ffi/in_out_pointer'
 

data/test/{unit → gir_ffi}/in_pointer_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 require 'gir_ffi/in_pointer'
 
@@ -9,8 +9,8 @@ describe GirFFI::InPointer do
       assert_nil result
     end
 
-    it "handles type tag :gtype" do
-      GirFFI::InPointer.from_array :gtype, [2]
+    it "handles type tag :GType" do
+      GirFFI::InPointer.from_array :GType, [2]
     end
 
     it "handles type tag :interface_pointer" do
@@ -44,6 +44,17 @@ describe GirFFI::InPointer do
     end
   end
 
+  describe "an instance created with .from_array :filename" do
+    before do
+      @result = GirFFI::InPointer.from_array :filename, ["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"
@@ -58,6 +69,16 @@ describe GirFFI::InPointer do
     end
   end
 
+  describe "an instance created with .from :filename" do
+    before do
+      @result = GirFFI::InPointer.from :filename, "foo"
+    end
+
+    it "returns a pointer to the given string" do
+      assert_equal "foo", @result.read_string
+    end
+  end
+
   describe ".from" do
     it "returns nil when passed nil" do
       result = GirFFI::InPointer.from :foo, nil

data/test/{unit → gir_ffi/info_ext}/i_field_info_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::IFieldInfo do
   describe "#layout_specification" do

data/test/gir_ffi/info_ext/i_type_info_test.rb

@@ -0,0 +1,71 @@
+require 'gir_ffi_test_helper'
+
+describe GirFFI::InfoExt::ITypeInfo do
+  let(:testclass) { Class.new do
+    include GirFFI::InfoExt::ITypeInfo
+  end }
+
+  describe "#layout_specification_type" do
+    it "returns an array with elements subtype and size for type :array" do
+      mock(subtype = Object.new).layout_specification_type { :foo }
+
+      type = testclass.new
+      mock(type).array_fixed_size { 2 }
+      mock(type).param_type(0) { subtype }
+
+      mock(GirFFI::Builder).itypeinfo_to_ffitype(type) { :array }
+
+      result = type.layout_specification_type
+
+      assert_equal [:foo, 2], result
+    end
+  end
+
+  describe "#subtype_tag" do
+    it "returns :gpointer if the param_type is a pointer with tag :void" do
+      type_info = testclass.new
+
+      stub(subtype0 = Object.new).tag { :void }
+      stub(subtype0).pointer? { true }
+
+      mock(type_info).param_type(0) { subtype0 }
+
+      assert_equal :gpointer, type_info.subtype_tag(0)
+    end
+  end
+
+  describe "#element_type" do
+    it "returns the element type for lists" do
+      type_info = testclass.new
+      mock(elm_type = Object.new).tag { :foo }
+
+      mock(type_info).tag {:glist}
+      mock(type_info).param_type(0) { elm_type }
+
+      result = type_info.element_type
+      result.must_equal :foo
+    end
+
+    it "returns the key and value types for ghashes" do
+      type_info = testclass.new
+      mock(key_type = Object.new).tag { :foo }
+      mock(val_type = Object.new).tag { :bar }
+
+      mock(type_info).tag {:ghash}
+      mock(type_info).param_type(0) { key_type }
+      mock(type_info).param_type(1) { val_type }
+
+      result = type_info.element_type
+      result.must_equal [:foo, :bar]
+    end
+
+    it "returns nil for other types" do
+      type_info = testclass.new
+
+      mock(type_info).tag {:foo}
+
+      result = type_info.element_type
+      result.must_be_nil
+    end
+  end
+end

data/test/{unit/user_defined_object_info_test.rb → gir_ffi/user_defined/i_object_info_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::UserDefined::IObjectInfo do
   it "has the attribute #properties" do

data/test/{unit/user_defined_property_info_test.rb → gir_ffi/user_defined/i_property_info_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::UserDefined::IPropertyInfo do
   it "has the attribute #property_type" do

data/test/{unit/user_defined_registered_type_info_test.rb → gir_ffi/user_defined/i_registered_type_info_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::UserDefined::IRegisteredTypeInfo do
   it "derives from GirFFI::UserDefined::IBaseInfo" do

data/test/{unit → gir_ffi}/variable_name_generator_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 require 'gir_ffi/variable_name_generator'
 

data/test/{unit/gir_ffi_test.rb → gir_ffi_test.rb}

@@ -1,13 +1,34 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 GirFFI.setup :GIMarshallingTests
 
 describe GirFFI do
+  it "sets up cairo as Cairo" do
+    GirFFI.setup :cairo
+    assert Object.const_defined?(:Cairo)
+  end
+
+  it "sets up xlib, which has no shared library" do
+    gir = GObjectIntrospection::IRepository.default
+    gir.require 'xlib'
+    assert_nil gir.shared_library('xlib'), "Precondition for test failed"
+    GirFFI.setup :xlib
+  end
+
+  it "sets up dependencies" do
+    save_module :GObject
+    save_module :Regress
+    GirFFI.setup :Regress
+    assert Object.const_defined?(:GObject)
+    restore_module :Regress
+    restore_module :GObject
+  end
+
   describe "::define_type" do
     describe "without a block" do
       before do
         @klass = Class.new GIMarshallingTests::OverridesObject
-        Object.const_set "Derived#{Sequence.next}", @klass
+        Object.const_set "DerivedA#{Sequence.next}", @klass
         @gtype = GirFFI.define_type @klass
       end
 
@@ -40,7 +61,7 @@ describe GirFFI do
     describe "with a block with a call to #install_property" do
       before do
         @klass = Class.new GIMarshallingTests::OverridesObject
-        Object.const_set "Derived#{Sequence.next}", @klass
+        Object.const_set "DerivedB#{Sequence.next}", @klass
         @gtype = GirFFI.define_type @klass do
           install_property GObject.param_spec_int("foo", "foo bar",
                                                   "The Foo Bar Property",
@@ -66,4 +87,3 @@ describe GirFFI do
     end
   end
 end
-

data/test/gir_ffi_test_helper.rb

@@ -1,4 +1,4 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require 'introspection_test_helper'
 
 require 'gir_ffi'
 

data/test/integration/derived_classes_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 GirFFI.setup :Regress
 

data/test/integration/generated_gimarshallingtests_test.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 require 'gir_ffi'
 

data/test/integration/generated_gio_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 # Tests generated methods and functions in the Gio namespace.
 describe "The generated Gio module" do

data/test/integration/generated_gobject_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe "The generated GObject module" do
   before do

data/test/integration/generated_regress_test.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 GirFFI.setup :Regress
 
@@ -701,8 +701,7 @@ describe Regress, "The generated Regress module" do
   end
 
   it "has correct test_async_ready_callback" do
-    # FIXME: Use GLib::MainLoop.new eventually.
-    main_loop = GLib.main_loop_new nil, false
+    main_loop = GLib::MainLoop.new nil, false
 
     a = 1
     Regress.test_async_ready_callback Proc.new {

data/test/integration/method_lookup_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 # Tests how methods are looked up and generated on first use.
 describe "Looking up methods" do

data/test/integration/pretty_print_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 require 'tempfile'
 

data/test/introspection_test_helper.rb

@@ -0,0 +1,11 @@
+require 'base_test_helper'
+
+require 'ffi-gobject_introspection'
+
+class MiniTest::Unit::TestCase
+  def get_introspection_data namespace, name
+    gir = GObjectIntrospection::IRepository.default
+    gir.require namespace, nil
+    gir.find_by_name namespace, name
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -99,9 +99,10 @@ extensions: []
 extra_rdoc_files:
 - DESIGN.rdoc
 - History.txt
-- README.rdoc
+- README.md
 - TODO.rdoc
 files:
+- lib/gir_ffi-base.rb
 - lib/ffi-gobject_introspection.rb
 - lib/gir_ffi.rb
 - lib/gir_ffi/lib_c.rb
@@ -151,6 +152,9 @@ files:
 - lib/gir_ffi/info_ext/i_property_info.rb
 - lib/gir_ffi/module_base.rb
 - lib/gir_ffi/class_base.rb
+- lib/gir_ffi/object_base.rb
+- lib/gir_ffi-base/gobject/lib.rb
+- lib/gir_ffi-base/glib/strv.rb
 - lib/ffi-gobject/ruby_style.rb
 - lib/ffi-gobject/ruby_closure.rb
 - lib/ffi-gobject/base.rb
@@ -165,7 +169,6 @@ files:
 - lib/ffi-glib/list.rb
 - lib/ffi-glib/hash_table.rb
 - lib/ffi-glib/list_methods.rb
-- lib/ffi-glib/strv.rb
 - lib/ffi-glib/byte_array.rb
 - lib/ffi-glib/ptr_array.rb
 - lib/ffi-glib/s_list.rb
@@ -176,7 +179,6 @@ files:
 - lib/ffi-gobject_introspection/i_function_info.rb
 - lib/ffi-gobject_introspection/i_callable_info.rb
 - lib/ffi-gobject_introspection/i_field_info.rb
-- lib/ffi-gobject_introspection/gobject_lib.rb
 - lib/ffi-gobject_introspection/i_vfunc_info.rb
 - lib/ffi-gobject_introspection/i_interface_info.rb
 - lib/ffi-gobject_introspection/i_property_info.rb
@@ -193,70 +195,66 @@ files:
 - lib/ffi-gobject_introspection/i_registered_type_info.rb
 - lib/ffi-gobject_introspection/g_error.rb
 - lib/ffi-gobject.rb
-- test/test_helper.rb
-- test/unit/user_defined_registered_type_info_test.rb
-- test/unit/unintrospectable_type_builder_test.rb
-- test/unit/user_defined_type_builder_test.rb
-- test/unit/object_type_builder_test.rb
-- test/unit/user_defined_property_info_test.rb
-- test/unit/i_type_info_test.rb
-- test/unit/enum_builder_test.rb
-- test/unit/constant_builder_test.rb
-- test/unit/builder_test.rb
-- test/unit/in_pointer_test.rb
-- test/unit/in_out_pointer_test.rb
-- test/unit/arg_helper_test.rb
-- test/unit/function_builder_test.rb
-- test/unit/variable_name_generator_test.rb
-- test/unit/callback_helper_test.rb
-- test/unit/struct_builder_test.rb
-- test/unit/class_base_test.rb
-- test/unit/union_builder_test.rb
-- test/unit/callback_builder_test.rb
-- test/unit/argument_builder_test.rb
-- test/unit/interface_builder_test.rb
-- test/unit/hash_table_element_type_provider_test.rb
-- test/unit/i_field_info_test.rb
-- test/unit/user_defined_object_info_test.rb
-- test/unit/list_element_type_provider_test.rb
-- test/unit/module_builder_test.rb
-- test/unit/gir_ffi_test.rb
 - test/lib/configure.ac
 - test/lib/Makefile.am
 - test/lib/m4/jhflags.m4
 - test/lib/autogen.sh
-- test/builder_test.rb
 - test/gir_ffi_test_helper.rb
+- test/ffi-gobject_test.rb
 - test/integration/derived_classes_test.rb
 - test/integration/generated_regress_test.rb
 - test/integration/method_lookup_test.rb
 - test/integration/generated_gimarshallingtests_test.rb
 - test/integration/generated_gio_test.rb
 - test/integration/pretty_print_test.rb
-- test/integration/generated_pango_test.rb
 - test/integration/generated_gobject_test.rb
-- test/ffi-gobject/g_object_overrides_test.rb
+- test/gir_ffi/builder/type/user_defined_test.rb
+- test/gir_ffi/builder/type/enum_test.rb
+- test/gir_ffi/builder/type/constant_test.rb
+- test/gir_ffi/builder/type/object_test.rb
+- test/gir_ffi/builder/type/struct_test.rb
+- test/gir_ffi/builder/type/callback_test.rb
+- test/gir_ffi/builder/type/union_test.rb
+- test/gir_ffi/builder/type/unintrospectable_test.rb
+- test/gir_ffi/builder/type/interface_test.rb
+- test/gir_ffi/builder/module_test.rb
+- test/gir_ffi/builder/function_test.rb
+- test/gir_ffi/builder/argument/base_test.rb
+- test/gir_ffi/user_defined/i_registered_type_info_test.rb
+- test/gir_ffi/user_defined/i_object_info_test.rb
+- test/gir_ffi/user_defined/i_property_info_test.rb
+- test/gir_ffi/builder_test.rb
+- test/gir_ffi/in_pointer_test.rb
+- test/gir_ffi/in_out_pointer_test.rb
+- test/gir_ffi/arg_helper_test.rb
+- test/gir_ffi/variable_name_generator_test.rb
+- test/gir_ffi/callback_helper_test.rb
+- test/gir_ffi/class_base_test.rb
+- test/gir_ffi/info_ext/i_type_info_test.rb
+- test/gir_ffi/info_ext/i_field_info_test.rb
+- test/gir_ffi-base/glib/strv_test.rb
 - test/ffi-gobject/object_class_test.rb
 - test/ffi-gobject/object_test.rb
 - test/ffi-gobject/gobject_test.rb
 - test/ffi-gobject/value_test.rb
+- test/ffi-gobject/helper_test.rb
 - test/ffi-gobject/ruby_style_test.rb
+- test/base_test_helper.rb
 - test/ffi-glib/s_list_test.rb
 - test/ffi-glib/hash_table_test.rb
 - test/ffi-glib/list_test.rb
 - test/ffi-glib/array_test.rb
 - test/ffi-glib/ptr_array_test.rb
 - test/ffi-glib/byte_array_test.rb
-- test/ffi-glib/glib_overrides_test.rb
-- test/ffi-glib/strv_test.rb
+- test/ffi-glib/ruby_closure_test.rb
 - test/ffi-gobject_introspection/i_repository_test.rb
 - test/ffi-gobject_introspection/i_constant_info_test.rb
 - test/ffi-gobject_introspection/i_base_info_test.rb
 - test/ffi-gobject_introspection/i_object_info_test.rb
 - test/ffi-gobject_introspection/lib_test.rb
 - test/ffi-gobject_introspection/i_function_info_test.rb
-- test/type_builder_test.rb
-- test/girffi_test.rb
+- test/gir_ffi_test.rb
+- test/introspection_test_helper.rb
 - tasks/setup.rb
 - tasks/valgrind.rake
 - tasks/test.rake
@@ -266,7 +264,7 @@ files:
 - examples/demo_ffi_safe_inherited_layout.rb
 - examples/demo_ffi_inherited_layout.rb
 - examples/print_class.rb
-- README.rdoc
+- README.md
 - DESIGN.rdoc
 - TODO.rdoc
 - History.txt
@@ -277,7 +275,7 @@ licenses: []
 post_install_message: 
 rdoc_options:
 - --main
-- README.rdoc
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -299,17 +297,16 @@ signing_key:
 specification_version: 3
 summary: FFI-based GObject binding using the GObject Introspection Repository
 test_files:
-- test/builder_test.rb
+- test/base_test_helper.rb
 - test/ffi-glib/array_test.rb
 - test/ffi-glib/byte_array_test.rb
-- test/ffi-glib/glib_overrides_test.rb
 - test/ffi-glib/hash_table_test.rb
 - test/ffi-glib/list_test.rb
 - test/ffi-glib/ptr_array_test.rb
+- test/ffi-glib/ruby_closure_test.rb
 - test/ffi-glib/s_list_test.rb
-- test/ffi-glib/strv_test.rb
-- test/ffi-gobject/g_object_overrides_test.rb
 - test/ffi-gobject/gobject_test.rb
+- test/ffi-gobject/helper_test.rb
 - test/ffi-gobject/object_class_test.rb
 - test/ffi-gobject/object_test.rb
 - test/ffi-gobject/ruby_style_test.rb
@@ -320,47 +317,44 @@ test_files:
 - test/ffi-gobject_introspection/i_object_info_test.rb
 - test/ffi-gobject_introspection/i_repository_test.rb
 - test/ffi-gobject_introspection/lib_test.rb
+- test/ffi-gobject_test.rb
+- test/gir_ffi-base/glib/strv_test.rb
+- test/gir_ffi/arg_helper_test.rb
+- test/gir_ffi/builder/argument/base_test.rb
+- test/gir_ffi/builder/function_test.rb
+- test/gir_ffi/builder/module_test.rb
+- test/gir_ffi/builder/type/callback_test.rb
+- test/gir_ffi/builder/type/constant_test.rb
+- test/gir_ffi/builder/type/enum_test.rb
+- test/gir_ffi/builder/type/interface_test.rb
+- test/gir_ffi/builder/type/object_test.rb
+- test/gir_ffi/builder/type/struct_test.rb
+- test/gir_ffi/builder/type/unintrospectable_test.rb
+- test/gir_ffi/builder/type/union_test.rb
+- test/gir_ffi/builder/type/user_defined_test.rb
+- test/gir_ffi/builder_test.rb
+- test/gir_ffi/callback_helper_test.rb
+- test/gir_ffi/class_base_test.rb
+- test/gir_ffi/in_out_pointer_test.rb
+- test/gir_ffi/in_pointer_test.rb
+- test/gir_ffi/info_ext/i_field_info_test.rb
+- test/gir_ffi/info_ext/i_type_info_test.rb
+- test/gir_ffi/user_defined/i_object_info_test.rb
+- test/gir_ffi/user_defined/i_property_info_test.rb
+- test/gir_ffi/user_defined/i_registered_type_info_test.rb
+- test/gir_ffi/variable_name_generator_test.rb
+- test/gir_ffi_test.rb
 - test/gir_ffi_test_helper.rb
-- test/girffi_test.rb
 - test/integration/derived_classes_test.rb
 - test/integration/generated_gimarshallingtests_test.rb
 - test/integration/generated_gio_test.rb
 - test/integration/generated_gobject_test.rb
-- test/integration/generated_pango_test.rb
 - test/integration/generated_regress_test.rb
 - test/integration/method_lookup_test.rb
 - test/integration/pretty_print_test.rb
+- test/introspection_test_helper.rb
 - test/lib/Makefile.am
 - test/lib/autogen.sh
 - test/lib/configure.ac
 - test/lib/m4/jhflags.m4
-- test/test_helper.rb
-- test/type_builder_test.rb
-- test/unit/arg_helper_test.rb
-- test/unit/argument_builder_test.rb
-- test/unit/builder_test.rb
-- test/unit/callback_builder_test.rb
-- test/unit/callback_helper_test.rb
-- test/unit/class_base_test.rb
-- test/unit/constant_builder_test.rb
-- test/unit/enum_builder_test.rb
-- test/unit/function_builder_test.rb
-- test/unit/gir_ffi_test.rb
-- test/unit/hash_table_element_type_provider_test.rb
-- test/unit/i_field_info_test.rb
-- test/unit/i_type_info_test.rb
-- test/unit/in_out_pointer_test.rb
-- test/unit/in_pointer_test.rb
-- test/unit/interface_builder_test.rb
-- test/unit/list_element_type_provider_test.rb
-- test/unit/module_builder_test.rb
-- test/unit/object_type_builder_test.rb
-- test/unit/struct_builder_test.rb
-- test/unit/unintrospectable_type_builder_test.rb
-- test/unit/union_builder_test.rb
-- test/unit/user_defined_object_info_test.rb
-- test/unit/user_defined_property_info_test.rb
-- test/unit/user_defined_registered_type_info_test.rb
-- test/unit/user_defined_type_builder_test.rb
-- test/unit/variable_name_generator_test.rb
 has_rdoc: