gir_ffi 0.5.2 → 0.6.0

data/test/gir_ffi/user_defined_type_info_test.rb

@@ -0,0 +1,34 @@
+require 'gir_ffi_test_helper'
+require 'gir_ffi/user_defined_type_info'
+
+describe GirFFI::UserDefinedTypeInfo do
+  describe "#described_class" do
+    it "returns the class passed to #initialize" do
+      info = GirFFI::UserDefinedTypeInfo.new :some_class
+      info.described_class.must_equal :some_class
+    end
+  end
+
+  describe "#install_property" do
+    it "adds the passed in property to the list of properties" do
+      mock(foo_spec = Object.new).get_name { :foo }
+
+      info = GirFFI::UserDefinedTypeInfo.new :some_class
+      info.install_property foo_spec
+      info.properties.map(&:name).must_equal [:foo]
+    end
+  end
+
+  describe "#initialize" do
+    it "takes a block that is evaluated in the context of the instance" do
+      mock(foo_spec = Object.new).get_name { :foo }
+      mock(bar_spec = Object.new).get_name { :bar }
+
+      info = GirFFI::UserDefinedTypeInfo.new :some_class do
+        install_property foo_spec
+        install_property bar_spec
+      end
+      info.properties.map(&:name).must_equal [:foo, :bar]
+    end
+  end
+end

data/test/integration/generated_gimarshallingtests_test.rb

@@ -301,17 +301,17 @@ describe GIMarshallingTests do
 
     it "has a working method #method_array_inout" do
       res = instance.method_array_inout [-1, 0, 1, 2]
-      assert_equal [-2, -1, 0, 1, 2], res
+      assert_equal [-2, -1, 0, 1, 2], res.to_a
     end
 
     it "has a working method #method_array_out" do
       res = instance.method_array_out
-      assert_equal [-1, 0, 1, 2], res
+      assert_equal [-1, 0, 1, 2], res.to_a
     end
 
     it "has a working method #method_array_return" do
       res = instance.method_array_return
-      assert_equal [-1, 0, 1, 2], res
+      assert_equal [-1, 0, 1, 2], res.to_a
     end
 
     it "has a working method #method_int8_in" do
@@ -609,7 +609,7 @@ describe GIMarshallingTests do
 
   it "has a working function #array_fixed_inout" do
     res = GIMarshallingTests.array_fixed_inout [-1, 0, 1, 2]
-    assert_equal [2, 1, 0, -1], res
+    assert_equal [2, 1, 0, -1], res.to_a
   end
 
   it "has a working function #array_fixed_int_in" do
@@ -619,12 +619,12 @@ describe GIMarshallingTests do
 
   it "has a working function #array_fixed_int_return" do
     res = GIMarshallingTests.array_fixed_int_return
-    assert_equal [-1, 0, 1, 2], res
+    assert_equal [-1, 0, 1, 2], res.to_a
   end
 
   it "has a working function #array_fixed_out" do
     res = GIMarshallingTests.array_fixed_out
-    assert_equal [-1, 0, 1, 2], res
+    assert_equal [-1, 0, 1, 2], res.to_a
   end
 
   it "has a working function #array_fixed_out_struct" do
@@ -639,7 +639,7 @@ describe GIMarshallingTests do
 
   it "has a working function #array_fixed_short_return" do
     res = GIMarshallingTests.array_fixed_short_return
-    assert_equal [-1, 0, 1, 2], res
+    assert_equal [-1, 0, 1, 2], res.to_a
   end
 
   it "has a working function #array_gvariant_container_in" do
@@ -684,7 +684,7 @@ describe GIMarshallingTests do
 
   it "has a working function #array_inout" do
     res = GIMarshallingTests.array_inout [-1, 0, 1, 2]
-    assert_equal [-2, -1, 0, 1, 2], res
+    assert_equal [-2, -1, 0, 1, 2], res.to_a
   end
 
   it "has a working function #array_inout_etc" do
@@ -693,7 +693,7 @@ describe GIMarshallingTests do
 
   it "has a working function #array_out" do
     res = GIMarshallingTests.array_out
-    assert_equal  [-1, 0, 1, 2], res
+    assert_equal  [-1, 0, 1, 2], res.to_a
   end
 
   it "has a working function #array_out_etc" do
@@ -702,7 +702,7 @@ describe GIMarshallingTests do
 
   it "has a working function #array_return" do
     res = GIMarshallingTests.array_return
-    assert_equal  [-1, 0, 1, 2], res
+    assert_equal  [-1, 0, 1, 2], res.to_a
   end
 
   it "has a working function #array_return_etc" do

data/test/integration/generated_regress_test.rb

@@ -885,9 +885,9 @@ describe Regress do
 
     it "has a working method #set_testbool" do
       instance.set_testbool true
-      assert_equal 1, get_field_value(instance, :testbool)
+      assert_equal true, get_field_value(instance, :testbool)
       instance.set_testbool false
-      assert_equal 0, get_field_value(instance, :testbool)
+      assert_equal false, get_field_value(instance, :testbool)
     end
 
     describe "an instance" do
@@ -953,7 +953,7 @@ describe Regress do
   end
 
   it "has a working function #test_array_fixed_out_objects" do
-    result = Regress.test_array_fixed_out_objects
+    result = Regress.test_array_fixed_out_objects.to_a
 
     assert_equal 2, result.length
 
@@ -980,11 +980,11 @@ describe Regress do
   end
 
   it "has a working function #test_array_fixed_size_int_out" do
-    assert_equal [0, 1, 2, 3, 4], Regress.test_array_fixed_size_int_out
+    assert_equal [0, 1, 2, 3, 4], Regress.test_array_fixed_size_int_out.to_a
   end
 
   it "has a working function #test_array_fixed_size_int_return" do
-    assert_equal [0, 1, 2, 3, 4], Regress.test_array_fixed_size_int_return
+    assert_equal [0, 1, 2, 3, 4], Regress.test_array_fixed_size_int_return.to_a
   end
 
   it "has a working function #test_array_gint16_in" do
@@ -1010,7 +1010,7 @@ describe Regress do
   end
 
   it "has a working function #test_array_int_full_out" do
-    assert_equal [0, 1, 2, 3, 4], Regress.test_array_int_full_out
+    assert_equal [0, 1, 2, 3, 4], Regress.test_array_int_full_out.to_a
   end
 
   it "has a working function #test_array_int_in" do
@@ -1018,11 +1018,11 @@ describe Regress do
   end
 
   it "has a working function #test_array_int_inout" do
-    assert_equal [3, 4], Regress.test_array_int_inout([5, 2, 3])
+    assert_equal [3, 4], Regress.test_array_int_inout([5, 2, 3]).to_a
   end
 
   it "has a working function #test_array_int_none_out" do
-    assert_equal [1, 2, 3, 4, 5], Regress.test_array_int_none_out
+    assert_equal [1, 2, 3, 4, 5], Regress.test_array_int_none_out.to_a
   end
 
   it "has a working function #test_array_int_null_in" do
@@ -1034,7 +1034,7 @@ describe Regress do
   end
 
   it "has a working function #test_array_int_out" do
-    assert_equal [0, 1, 2, 3, 4], Regress.test_array_int_out
+    assert_equal [0, 1, 2, 3, 4], Regress.test_array_int_out.to_a
   end
 
   it "has a working function #test_async_ready_callback" do
@@ -1664,7 +1664,7 @@ describe Regress do
     begin
       Regress.this_method_does_not_exist
     rescue => e
-      assert_equal "undefined method `this_method_does_not_exist' for Regress:Module", e.message
+      e.message.must_match(/^undefined method `this_method_does_not_exist' (for Regress:Module|on Regress \(Module\))$/)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: indentation
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,6 @@ files:
 - lib/gir_ffi/builder/type/object.rb
 - lib/gir_ffi/builder/type/with_methods.rb
 - lib/gir_ffi/builder/type/with_layout.rb
-- lib/gir_ffi/builder/type/struct_based.rb
 - lib/gir_ffi/builder/type/enum.rb
 - lib/gir_ffi/builder/type/interface.rb
 - lib/gir_ffi/builder/type/registered_type.rb
@@ -129,12 +128,10 @@ files:
 - lib/gir_ffi/info_ext.rb
 - lib/gir_ffi/allocation_helper.rb
 - lib/gir_ffi/type_map.rb
-- lib/gir_ffi/user_defined/i_property_info.rb
-- lib/gir_ffi/user_defined/i_base_info.rb
-- lib/gir_ffi/user_defined/i_object_info.rb
-- lib/gir_ffi/user_defined/i_registered_type_info.rb
 - lib/gir_ffi/zero_terminated.rb
+- lib/gir_ffi/unintrospectable_type_info.rb
 - lib/gir_ffi/callback.rb
+- lib/gir_ffi/user_defined_property_info.rb
 - lib/gir_ffi/argument_builder.rb
 - lib/gir_ffi/error_argument_builder.rb
 - lib/gir_ffi/ffi_ext/pointer.rb
@@ -151,6 +148,8 @@ files:
 - lib/gir_ffi/interface_base.rb
 - lib/gir_ffi/info_ext/i_arg_info.rb
 - lib/gir_ffi/info_ext/i_type_info.rb
+- lib/gir_ffi/info_ext/i_function_info.rb
+- lib/gir_ffi/info_ext/i_callable_info.rb
 - lib/gir_ffi/info_ext/i_field_info.rb
 - lib/gir_ffi/info_ext/safe_constant_name.rb
 - lib/gir_ffi/info_ext/i_property_info.rb
@@ -159,6 +158,7 @@ files:
 - lib/gir_ffi/info_ext/i_registered_type_info.rb
 - lib/gir_ffi/module_base.rb
 - lib/gir_ffi/base_argument_builder.rb
+- lib/gir_ffi/user_defined_type_info.rb
 - lib/gir_ffi/class_base.rb
 - lib/gir_ffi/object_base.rb
 - lib/gir_ffi/function_builder.rb
@@ -180,6 +180,7 @@ files:
 - lib/ffi-glib/strv.rb
 - lib/ffi-glib/byte_array.rb
 - lib/ffi-glib/ptr_array.rb
+- lib/ffi-glib/sized_array.rb
 - lib/ffi-glib/s_list.rb
 - lib/ffi-gobject_introspection/i_struct_info.rb
 - lib/ffi-gobject_introspection/i_callback_info.rb
@@ -226,11 +227,9 @@ files:
 - 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/user_defined_property_info_test.rb
 - test/gir_ffi/zero_terminated_test.rb
 - test/gir_ffi/object_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
@@ -238,16 +237,21 @@ files:
 - test/gir_ffi/function_builder_test.rb
 - test/gir_ffi/variable_name_generator_test.rb
 - test/gir_ffi/callback_helper_test.rb
+- test/gir_ffi/callback_test.rb
 - test/gir_ffi/base_argument_builder_test.rb
 - test/gir_ffi/class_base_test.rb
 - test/gir_ffi/argument_builder_test.rb
 - test/gir_ffi/return_value_builder_test.rb
+- test/gir_ffi/user_defined_type_info_test.rb
+- test/gir_ffi/unintrospectable_type_info_test.rb
+- test/gir_ffi/info_ext/i_callable_info_test.rb
 - test/gir_ffi/info_ext/i_type_info_test.rb
 - test/gir_ffi/info_ext/i_arg_info_test.rb
 - test/gir_ffi/info_ext/i_signal_info_test.rb
 - test/gir_ffi/info_ext/safe_constant_name_test.rb
 - test/gir_ffi/info_ext/safe_function_name_test.rb
 - test/gir_ffi/info_ext/i_field_info_test.rb
+- test/gir_ffi/info_ext/i_function_info_test.rb
 - test/gir_ffi/interface_base_test.rb
 - test/gir_ffi-base/glib/strv_test.rb
 - test/ffi-gobject/object_class_test.rb
@@ -263,6 +267,7 @@ files:
 - test/ffi-glib/ptr_array_test.rb
 - test/ffi-glib/byte_array_test.rb
 - test/ffi-glib/ruby_closure_test.rb
+- test/ffi-glib/sized_array_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
@@ -321,6 +326,7 @@ test_files:
 - test/ffi-glib/ptr_array_test.rb
 - test/ffi-glib/ruby_closure_test.rb
 - test/ffi-glib/s_list_test.rb
+- test/ffi-glib/sized_array_test.rb
 - test/ffi-gobject/gobject_test.rb
 - test/ffi-gobject/object_class_test.rb
 - test/ffi-gobject/object_test.rb
@@ -349,12 +355,15 @@ test_files:
 - 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/callback_test.rb
 - test/gir_ffi/class_base_test.rb
 - test/gir_ffi/function_builder_test.rb
 - test/gir_ffi/in_out_pointer_test.rb
 - test/gir_ffi/in_pointer_test.rb
 - test/gir_ffi/info_ext/i_arg_info_test.rb
+- test/gir_ffi/info_ext/i_callable_info_test.rb
 - test/gir_ffi/info_ext/i_field_info_test.rb
+- test/gir_ffi/info_ext/i_function_info_test.rb
 - test/gir_ffi/info_ext/i_signal_info_test.rb
 - test/gir_ffi/info_ext/i_type_info_test.rb
 - test/gir_ffi/info_ext/safe_constant_name_test.rb
@@ -362,9 +371,9 @@ test_files:
 - test/gir_ffi/interface_base_test.rb
 - test/gir_ffi/object_base_test.rb
 - test/gir_ffi/return_value_builder_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/unintrospectable_type_info_test.rb
+- test/gir_ffi/user_defined_property_info_test.rb
+- test/gir_ffi/user_defined_type_info_test.rb
 - test/gir_ffi/variable_name_generator_test.rb
 - test/gir_ffi/zero_terminated_test.rb
 - test/gir_ffi_test.rb

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

@@ -1,31 +0,0 @@
-require 'gir_ffi/builder/type/registered_type'
-require 'gir_ffi/builder/type/with_layout'
-require 'gir_ffi/builder/type/with_methods'
-
-module GirFFI
-  module Builder
-    module Type
-
-      # Implements the creation of a class representing one of the types
-      # whose C representation is a struct, i.e., :object and :struct.
-      class StructBased < RegisteredType
-        include WithMethods
-        include WithLayout
-
-        private
-
-        def setup_class
-          setup_layout
-          setup_constants
-          stub_methods
-          setup_gtype_getter
-          setup_field_accessors
-        end
-
-        def layout_superclass
-          FFI::Struct
-        end
-      end
-    end
-  end
-end

data/lib/gir_ffi/user_defined/i_base_info.rb

@@ -1,7 +0,0 @@
-module GirFFI
-  module UserDefined
-    class IBaseInfo
-      attr_accessor :name
-    end
-  end
-end

data/lib/gir_ffi/user_defined/i_object_info.rb

@@ -1,13 +0,0 @@
-require 'gir_ffi/user_defined/i_registered_type_info'
-
-module GirFFI
-  module UserDefined
-    class IObjectInfo < IRegisteredTypeInfo
-      attr_accessor :properties
-      def initialize
-        @properties = []
-      end
-    end
-  end
-end
-

data/lib/gir_ffi/user_defined/i_property_info.rb

@@ -1,9 +0,0 @@
-require 'gir_ffi/user_defined/i_base_info'
-
-module GirFFI
-  module UserDefined
-    class IPropertyInfo < IBaseInfo
-      attr_accessor :property_type
-    end
-  end
-end

data/lib/gir_ffi/user_defined/i_registered_type_info.rb

@@ -1,10 +0,0 @@
-require 'gir_ffi/user_defined/i_base_info'
-
-module GirFFI
-  module UserDefined
-    class IRegisteredTypeInfo < IBaseInfo
-    end
-  end
-end
-
-

data/test/gir_ffi/user_defined/i_object_info_test.rb

@@ -1,18 +0,0 @@
-require 'gir_ffi_test_helper'
-
-describe GirFFI::UserDefined::IObjectInfo do
-  it "has the attribute #properties" do
-    inf = GirFFI::UserDefined::IObjectInfo.new
-    inf.properties.must_equal []
-    inf.properties << :foo
-    inf.properties.must_equal [:foo]
-    inf.properties = [:bar, :baz]
-    inf.properties.must_equal [:bar, :baz]
-  end
-
-  it "derives from GirFFI::UserDefined::IRegisteredTypeInfo" do
-    inf = GirFFI::UserDefined::IObjectInfo.new
-    inf.must_be_kind_of GirFFI::UserDefined::IRegisteredTypeInfo
-  end
-end
-

data/test/gir_ffi/user_defined/i_property_info_test.rb

@@ -1,14 +0,0 @@
-require 'gir_ffi_test_helper'
-
-describe GirFFI::UserDefined::IPropertyInfo do
-  it "has the attribute #property_type" do
-    inf = GirFFI::UserDefined::IPropertyInfo.new
-    inf.property_type = :foo
-    inf.property_type.must_equal :foo
-  end
-
-  it "derives from GirFFI::UserDefined::IBaseInfo" do
-    inf = GirFFI::UserDefined::IPropertyInfo.new
-    inf.must_be_kind_of GirFFI::UserDefined::IBaseInfo
-  end
-end

data/test/gir_ffi/user_defined/i_registered_type_info_test.rb

@@ -1,10 +0,0 @@
-require 'gir_ffi_test_helper'
-
-describe GirFFI::UserDefined::IRegisteredTypeInfo do
-  it "derives from GirFFI::UserDefined::IBaseInfo" do
-    inf = GirFFI::UserDefined::IRegisteredTypeInfo.new
-    inf.must_be_kind_of GirFFI::UserDefined::IBaseInfo
-  end
-end
-
-