gir_ffi 0.0.14 → 0.1.0

data/test/integration/generated_gimarshallingtests_test.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+require 'gir_ffi'
 
 # Tests generated methods and functions in the GIMarshallingTests namespace.
 describe "GIMarshallingTests" do
@@ -457,9 +459,9 @@ describe "GIMarshallingTests" do
   it "has a working function #array_gvariant_in" do
     v1 = GLib::Variant.new_int32(27)
     v2 = GLib::Variant.new_string("Hello")
-    res = GIMarshallingTests.array_gvariant_in [v1, v2]
+    GIMarshallingTests.array_gvariant_in [v1, v2]
     pass
-    # TODO: Can we determine that res should be an array?
+    # TODO: Can we determine that result should be an array?
     # assert_equal 27, res[0].get_int32
     # assert_equal "Hello", res[1].get_string
   end
@@ -566,12 +568,15 @@ describe "GIMarshallingTests" do
   it "has a working function #bytearray_full_return" do
     ret = GIMarshallingTests.bytearray_full_return
     assert_instance_of GLib::ByteArray, ret
-    assert_equal "0123", ret.to_string
+    assert_includes(
+	["0123".bytes.to_a, "\x001\xFF3".bytes.to_a],
+	ret.to_string.bytes.to_a)
   end
 
   it "has a working function #bytearray_none_in" do
+    val = GIMarshallingTests.bytearray_full_return.to_string
     ba = GLib.byte_array_new
-    GLib.byte_array_append ba, "0123"
+    GLib.byte_array_append ba, val
     GIMarshallingTests.bytearray_none_in ba
     pass
   end

data/test/integration/generated_gio_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 # 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('../test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 describe "The generated GObject module" do
   before do

data/test/integration/generated_gtk_test.rb

@@ -1,7 +1,7 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 # Since the tests will call Gtk+ functions, Gtk+ must be initialized.
-GirFFI.setup :Gtk, '2.0'
+require 'ffi-gtk2'
 Gtk.init
 
 # Tests generated methods and functions in the Gtk namespace.
@@ -83,7 +83,7 @@ class GeneratedGtkTest < MiniTest::Spec
           assert_nothing_raised {
             btn = Gtk::RadioButton.new nil
             grp = btn.get_group
-            btn2 = Gtk::RadioButton.new grp
+            Gtk::RadioButton.new grp
           }
         end
       end

data/test/integration/generated_regress_test.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 # Tests generated methods and functions in the Regress namespace.
 class GeneratedRegressTest < MiniTest::Spec
@@ -159,6 +159,14 @@ class GeneratedRegressTest < MiniTest::Spec
 	  @o = Regress::TestObj.new_from_file("foo")
 	end
 
+        describe "its gtype" do
+          it "can be found through get_gtype and GObject.type_from_instance" do
+            gtype = Regress::TestObj.get_gtype
+            r = GObject.type_from_instance @o
+            assert_equal gtype, r
+          end
+        end
+
 	should "have a reference count of 1" do
 	  assert_equal 1, ref_count(@o)
 	end
@@ -174,7 +182,7 @@ class GeneratedRegressTest < MiniTest::Spec
 
 	should "have a working #set_bare method" do
 	  obj = Regress::TestObj.new_from_file("bar")
-	  rv = @o.set_bare obj
+	  @o.set_bare obj
 	  # TODO: What is the correct value to retrieve from the fields?
 	  assert_equal obj.to_ptr, @o[:bare]
 	end
@@ -575,7 +583,7 @@ class GeneratedRegressTest < MiniTest::Spec
 
       should "handle boolean user_data" do
 	a = false
-	result = Regress.test_callback_user_data Proc.new {|u|
+	Regress.test_callback_user_data Proc.new {|u|
 	  a = u
 	  5
 	}, true

data/test/interface_type_builder_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 describe GirFFI::Builder::Type::Interface do
   before do

data/test/module_builder_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 class ModuleBuilderTest < MiniTest::Spec
   context "The Builder::Module object" do

data/test/test_helper.rb

@@ -13,81 +13,17 @@ Thread.abort_on_exception = true
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'gir_ffi'
-
-GirFFI::IRepository.prepend_search_path File.join(File.dirname(__FILE__), 'lib')
-module GirFFI
-  class IRepository
-    def shared_library_with_regress namespace
-      case namespace
-      when "Regress"
-	return File.join(File.dirname(__FILE__), 'lib', 'libregress.so')
-      when "GIMarshallingTests"
-	return File.join(File.dirname(__FILE__), 'lib', 'libgimarshallingtests.so')
-      else
-	return shared_library_without_regress namespace
-      end
-    end
-
-    alias shared_library_without_regress shared_library
-    alias shared_library shared_library_with_regress
-  end
-end
-
-# Preload data for Gtk+ version 2.0.
-gir = GirFFI::IRepository.default
-gir.require "Gtk", "2.0"
-
-# Need a dummy module for some tests.
-module Lib
-end
+require 'ffi-gobject_introspection'
 
 class MiniTest::Unit::TestCase
   include RR::Adapters::TestUnit
-  def cws code
-    code.gsub(/(^\s*|\s*$)/, "")
-  end
 
   def get_introspection_data namespace, name
-    gir = GirFFI::IRepository.default
+    gir = GObjectIntrospection::IRepository.default
     gir.require namespace, nil
     gir.find_by_name namespace, name
   end
 
-  def get_method_introspection_data namespace, klass, name
-    gir = GirFFI::IRepository.default
-    gir.require namespace, nil
-    gir.find_by_name(namespace, klass).find_method name
-  end
-
-  SAVED_MODULES = {}
-
-  def save_module name
-    if Object.const_defined? name
-      puts "Saving #{name} over existing" if SAVED_MODULES.has_key? name
-      SAVED_MODULES[name] = Object.const_get name
-      Object.send(:remove_const, name)
-    end
-  end
-
-  def restore_module name
-    if SAVED_MODULES.has_key? name
-      if Object.const_defined? name
-        Object.send(:remove_const, name)
-      end
-      Object.const_set name, SAVED_MODULES[name]
-      SAVED_MODULES.delete name
-    end
-  end
-
-  def ref_count object
-    GObject::Object::Struct.new(object.to_ptr)[:ref_count]
-  end
-
-  def is_floating? object
-    (GObject::Object::Struct.new(object.to_ptr)[:qdata].address & 2) == 2
-  end
-
   def assert_nothing_raised
     yield
     assert true
@@ -96,51 +32,6 @@ class MiniTest::Unit::TestCase
   def assert_not_nil it
     refute_nil it
   end
-
-  def max_for_unsigned_type type
-    ( 1 << (FFI.type_size(type) * 8) ) - 1
-  end
-
-  def max_for_type type
-    ( 1 << (FFI.type_size(type) * 8 - 1) ) - 1
-  end
-
-  def min_for_type type
-    ~max_for_type(type)
-  end
-
-  def max_long
-    max_for_type :long
-  end
-
-  def min_long
-    min_for_type :long
-  end
-
-  def max_size_t
-    max_for_unsigned_type :size_t
-  end
-
-  def max_ssize_t
-    # FFI has no :ssize_t, but it's the same number of bits as :size_t
-    max_for_type :size_t
-  end
-
-  def min_ssize_t
-    min_for_type :size_t
-  end
-
-  def max_ushort
-    max_for_unsigned_type :ushort
-  end
-
-  def max_uint
-    max_for_unsigned_type :uint
-  end
-
-  def max_ulong
-    max_for_unsigned_type :ulong
-  end
 end
 
 class MiniTest::Spec

data/test/type_builder_test.rb

@@ -1,9 +1,9 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 class TypeBuilderTest < MiniTest::Spec
   context "The Builder::Type class" do
     should "use parent struct as default layout" do
-      @gir = GirFFI::IRepository.default
+      @gir = GObjectIntrospection::IRepository.default
       @gir.require 'GObject', nil
 
       stub(info = Object.new).parent { @gir.find_by_name 'GObject', 'Object' }

data/test/unintrospectable_type_builder_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 describe GirFFI::Builder::Type::Unintrospectable do
   describe "building the GLocalFile type" do

data/test/unit/builder_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 describe GirFFI::Builder do
   describe ".itypeinfo_to_callback_ffitype" do

data/test/unit/callback_helper_test.rb

@@ -1,19 +1,22 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require "gir_ffi/callback_helper"
 
 describe GirFFI::CallbackHelper do
-  describe ".map_single_callback_arg" do
-    it "correctly maps a :struct type" do
-      GirFFI.setup :GObject
+  describe "::map_single_callback_arg" do
+    it "maps a :struct type by building the type and wrapping the argument in it" do
+      cinfo = get_introspection_data 'GObject', 'ClosureMarshal'
+      ainfo = cinfo.args[0]
+      ifinfo = ainfo.argument_type.interface
 
-      cl = GObject::Closure.new_simple GObject::Closure::Struct.size, nil
+      assert_equal :struct, ifinfo.info_type
 
-      cinfo = GirFFI::IRepository.default.find_by_name 'GObject', 'ClosureMarshal'
-      ainfo = cinfo.args[0]
+      struct_class = Class.new
+      mock(GirFFI::Builder).build_class(ifinfo) { struct_class }
+      mock(struct_class).wrap("dummy") { "good-result" }
 
-      r = GirFFI::CallbackHelper.map_single_callback_arg cl.to_ptr, ainfo
+      r = GirFFI::CallbackHelper.map_single_callback_arg "dummy", ainfo.argument_type
 
-      assert_instance_of GObject::Closure, r
-      assert_equal r.to_ptr, cl.to_ptr
+      assert_equal "good-result", r
     end
   end
 end

data/test/unit/constant_builder_test.rb

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

data/test/unit/in_out_pointer_test.rb

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

data/test/unit/in_pointer_test.rb

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

data/test/unit/object_type_builder_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 describe GirFFI::Builder::Type::Object do
   before do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gir_ffi
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 14
-  version: 0.0.14
+  version: 0.1.0
 platform: ruby
 authors: 
 - Matijs van Zuijlen
@@ -78,13 +78,44 @@ extra_rdoc_files:
 - README.rdoc
 - TODO.rdoc
 files: 
+- lib/ffi-gtk3.rb
 - lib/gir_ffi.rb
+- lib/ffi-gtk/base.rb
+- lib/ffi-gtk2.rb
+- lib/ffi-gobject_introspection/i_field_info.rb
+- lib/ffi-gobject_introspection/i_flags_info.rb
+- lib/ffi-gobject_introspection/g_error.rb
+- lib/ffi-gobject_introspection/i_object_info.rb
+- lib/ffi-gobject_introspection/i_enum_info.rb
+- lib/ffi-gobject_introspection/i_value_info.rb
+- lib/ffi-gobject_introspection/i_signal_info.rb
+- lib/ffi-gobject_introspection/i_callback_info.rb
+- lib/ffi-gobject_introspection/lib.rb
+- lib/ffi-gobject_introspection/i_property_info.rb
+- lib/ffi-gobject_introspection/i_registered_type_info.rb
+- lib/ffi-gobject_introspection/i_repository.rb
+- lib/ffi-gobject_introspection/i_vfunc_info.rb
+- lib/ffi-gobject_introspection/i_constant_info.rb
+- lib/ffi-gobject_introspection/i_struct_info.rb
+- lib/ffi-gobject_introspection/i_callable_info.rb
+- lib/ffi-gobject_introspection/i_function_info.rb
+- lib/ffi-gobject_introspection/i_base_info.rb
+- lib/ffi-gobject_introspection/i_union_info.rb
+- lib/ffi-gobject_introspection/gobject_lib.rb
+- lib/ffi-gobject_introspection/i_interface_info.rb
+- lib/ffi-gobject_introspection/i_arg_info.rb
+- lib/ffi-gobject_introspection/i_type_info.rb
+- lib/ffi-gobject_introspection.rb
+- lib/ffi-glib.rb
+- lib/ffi-gobject.rb
+- lib/ffi-glib/array.rb
+- lib/ffi-glib/list.rb
+- lib/ffi-glib/list_methods.rb
+- lib/ffi-glib/hash_table.rb
+- lib/ffi-glib/byte_array.rb
+- lib/ffi-glib/s_list.rb
 - lib/gir_ffi/lib_c.rb
 - lib/gir_ffi/builder_helper.rb
-- lib/gir_ffi/i_field_info.rb
-- lib/gir_ffi/i_flags_info.rb
-- lib/gir_ffi/g_error.rb
-- lib/gir_ffi/i_object_info.rb
 - lib/gir_ffi/builder.rb
 - lib/gir_ffi/in_out_pointer.rb
 - lib/gir_ffi/builder/argument/list_base.rb
@@ -110,69 +141,55 @@ files:
 - 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
-- lib/gir_ffi/lib.rb
-- lib/gir_ffi/i_property_info.rb
-- lib/gir_ffi/i_registered_type_info.rb
-- lib/gir_ffi/i_repository.rb
-- 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/version.rb
-- lib/gir_ffi/overrides/glib.rb
-- lib/gir_ffi/overrides/gtk.rb
-- lib/gir_ffi/overrides/gobject.rb
 - lib/gir_ffi/allocation_helper.rb
-- lib/gir_ffi/i_base_info.rb
 - lib/gir_ffi/arg_helper.rb
-- lib/gir_ffi/g_object.rb
-- lib/gir_ffi/i_union_info.rb
-- lib/gir_ffi/i_interface_info.rb
-- lib/gir_ffi/i_arg_info.rb
-- lib/gir_ffi/i_type_info.rb
+- lib/gir_ffi/type_map.rb
+- lib/ffi-gobject/ruby_closure.rb
+- lib/ffi-gobject/value.rb
+- lib/ffi-gobject/closure.rb
+- lib/ffi-gobject/initially_unowned.rb
+- lib/ffi-gobject/helper.rb
 - test/unintrospectable_type_builder_test.rb
 - test/function_definition_builder_test.rb
-- test/g_object_test.rb
+- test/gir_ffi_test_helper.rb
 - test/arg_helper_test.rb
 - test/lib/Makefile.am
 - test/lib/autogen.sh
 - test/lib/configure.ac
 - test/lib/m4/jhflags.m4
 - test/class_base_test.rb
+- test/ffi-gobject_introspection/i_repository_test.rb
+- test/ffi-gobject_introspection/i_object_info_test.rb
+- test/ffi-gobject_introspection/i_base_info_test.rb
+- test/ffi-gobject_introspection/i_constant_info_test.rb
 - test/test_helper.rb
 - test/girffi_test.rb
 - test/interface_type_builder_test.rb
 - test/module_builder_test.rb
-- test/i_object_info_test.rb
-- test/g_object_overrides_test.rb
-- 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
 - 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/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
+- test/ffi-glib/glib_overrides_test.rb
+- test/ffi-gobject/gobject_test.rb
+- test/ffi-gobject/g_object_overrides_test.rb
+- test/ffi-gobject/value_test.rb
 - tasks/yardoc.rake
 - tasks/rdoc.rake
 - tasks/test.rake
@@ -231,13 +248,18 @@ test_files:
 - test/arg_helper_test.rb
 - test/builder_test.rb
 - test/class_base_test.rb
+- test/ffi-glib/glib_overrides_test.rb
+- test/ffi-gobject/g_object_overrides_test.rb
+- test/ffi-gobject/gobject_test.rb
+- test/ffi-gobject/value_test.rb
+- test/ffi-gobject_introspection/i_base_info_test.rb
+- test/ffi-gobject_introspection/i_constant_info_test.rb
+- test/ffi-gobject_introspection/i_object_info_test.rb
+- test/ffi-gobject_introspection/i_repository_test.rb
 - test/function_definition_builder_test.rb
-- test/g_object_overrides_test.rb
-- test/g_object_test.rb
+- test/gir_ffi_test_helper.rb
 - test/girffi_test.rb
-- test/glib_overrides_test.rb
 - test/gtk_overrides_test.rb
-- test/i_object_info_test.rb
 - test/integration/generated_gimarshallingtests_test.rb
 - test/integration/generated_gio_test.rb
 - test/integration/generated_gobject_test.rb
@@ -255,9 +277,6 @@ 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