gir_ffi 0.7.3 → 0.7.4

data/test/base_test_helper.rb

@@ -23,6 +23,7 @@ require 'gir_ffi-base'
 require 'ffi-gobject_introspection'
 
 GObjectIntrospection::IRepository.prepend_search_path File.join(File.dirname(__FILE__), 'lib')
+
 module GObjectIntrospection
   class IRepository
     def shared_library_with_regress namespace

data/test/ffi-glib/array_test.rb

@@ -149,8 +149,8 @@ describe GLib::Array do
 
     it "raises an error if the index is out of bounds" do
       arr = GLib::Array.from :gint32, [1, 2, 3]
-      lambda { arr.index(16) }.must_raise IndexError
-      lambda { arr.index(-1) }.must_raise IndexError
+      proc { arr.index(16) }.must_raise IndexError
+      proc { arr.index(-1) }.must_raise IndexError
     end
   end
 end

data/test/ffi-glib/bytes_test.rb

@@ -0,0 +1,54 @@
+require 'gir_ffi_test_helper'
+
+describe GLib::Bytes do
+  it "can succesfully be created with Glib::Bytes.new" do
+    bytes = GLib::Bytes.new [1, 2, 3]
+    bytes.must_be_instance_of GLib::Bytes
+  end
+
+  it "has a working #get_size method" do
+    bytes = GLib::Bytes.new [1, 2, 3]
+    bytes.get_size.must_equal 3
+  end
+
+  it "has a working #get_data method" do
+    bytes = GLib::Bytes.new [1, 2, 3]
+    bytes.get_data.to_a.must_equal [1, 2, 3]
+  end
+
+  it "has a working #each method" do
+    a = []
+    bytes = GLib::Bytes.new [1, 2, 3]
+    bytes.each do |v|
+      a.unshift v
+    end
+    a.must_equal [3, 2, 1]
+  end
+
+  it "has a working #to_a method" do
+    bytes = GLib::Bytes.new [1, 2, 3]
+    bytes.to_a.must_equal [1, 2, 3]
+  end
+
+  describe ".from" do
+    it "creates a GLib::Bytes object form an array of small integers" do
+      bytes = GLib::Bytes.from [1, 2, 3]
+      bytes.must_be_instance_of GLib::Bytes
+      bytes.to_a.must_equal [1, 2, 3]
+    end
+
+    it "returns its argument if given a GLib::Bytes object" do
+      bytes = GLib::Bytes.new [1, 2, 3]
+      result = GLib::Bytes.from bytes
+      assert result.equal?(bytes)
+    end
+
+    it "wraps its argument if given a pointer" do
+      bytes = GLib::Bytes.new [1, 2, 3]
+      ptr = bytes.to_ptr
+      result = GLib::Bytes.from ptr
+      result.to_a.must_equal [1, 2, 3]
+      result.to_ptr.must_equal ptr
+    end
+  end
+end

data/test/ffi-glib/ptr_array_test.rb

@@ -103,8 +103,8 @@ describe GLib::PtrArray do
 
     it "raises an error if the index is out of bounds" do
       arr = GLib::PtrArray.from :utf8, ["1", "2", "3"]
-      lambda { arr.index(16) }.must_raise IndexError
-      lambda { arr.index(-1) }.must_raise IndexError
+      proc { arr.index(16) }.must_raise IndexError
+      proc { arr.index(-1) }.must_raise IndexError
     end
   end
 end

data/test/ffi-gobject/value_test.rb

@@ -65,7 +65,7 @@ describe GObject::Value do
     end
 
     it "handles long values" do
-      value = 0x1234_5678_9012_3456
+      value = FFI.type_size(:long) == 8 ? 0x1234_5678_9012_3456 : 0x1234_5678
       gv = GObject::Value.for_g_type GObject::TYPE_LONG
       gv.set_value value
       gv.get_long.must_equal value
@@ -93,7 +93,7 @@ describe GObject::Value do
     end
 
     it "handles ulong values" do
-      value = 0x1234_5678_9012_3456
+      value = FFI.type_size(:long) == 8 ? 0x1234_5678_9012_3456 : 0x1234_5678
       gv = GObject::Value.for_g_type GObject::TYPE_ULONG
       gv.set_value value
       gv.get_ulong.must_equal value
@@ -157,7 +157,7 @@ describe GObject::Value do
     end
 
     it "unwraps a long" do
-      value = 0x1234_5678_9012_3456
+      value = FFI.type_size(:long) == 8 ? 0x1234_5678_9012_3456 : 0x1234_5678
       gv = GObject::Value.for_g_type GObject::TYPE_LONG
       gv.set_long value
       gv.get_value.must_equal value
@@ -185,7 +185,7 @@ describe GObject::Value do
     end
 
     it "unwraps a ulong" do
-      value = 0x1234_5678_9012_3456
+      value = FFI.type_size(:long) == 8 ? 0x1234_5678_9012_3456 : 0x1234_5678
       gv = GObject::Value.for_g_type GObject::TYPE_ULONG
       gv.set_ulong value
       gv.get_value.must_equal value

data/test/ffi-gobject_introspection/i_repository_test.rb

@@ -42,7 +42,7 @@ describe GObjectIntrospection::IRepository do
 
   describe "#find_by_gtype" do
     it "raises an error if 0 is passed as the gtype" do
-      lambda { gir.find_by_gtype 0 }.must_raise ArgumentError
+      proc { gir.find_by_gtype 0 }.must_raise ArgumentError
     end
   end
 

data/test/gir_ffi/builders/callback_argument_builder_test.rb

@@ -0,0 +1,44 @@
+require 'gir_ffi_test_helper'
+
+describe GirFFI::Builders::CallbackArgumentBuilder do
+  let(:var_gen) { GirFFI::VariableNameGenerator.new }
+  let(:builder) { GirFFI::Builders::CallbackArgumentBuilder.new(var_gen, arg_info) }
+
+  describe "for an argument with direction :out" do
+    describe "for :zero_terminated" do
+      let(:vfunc_info) {
+        get_vfunc_introspection_data('GIMarshallingTests', 'Object',
+                                     'vfunc_array_out_parameter') }
+      let(:arg_info) { vfunc_info.args[0] }
+
+      before { skip unless vfunc_info }
+
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.new([:pointer, :zero_terminated], a)" ]
+      end
+
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v1.set_value GirFFI::ZeroTerminated.from(:gfloat, _v2)" ]
+      end
+    end
+  end
+
+  describe "for an argument with direction :error" do
+    let(:arg_info) { GirFFI::ErrorArgumentInfo.new }
+
+    it "sets up a rescueing block in #pre_conversion" do
+      builder.pre_conversion.must_equal [
+        "_v1 = GirFFI::InOutPointer.new([:pointer, :error], _error)",
+        "begin"
+      ]
+    end
+
+    it "converts any exceptions to GLib::Error in #post_conversion" do
+      builder.post_conversion.must_equal [
+        "rescue => _v1",
+        "_v2.set_value GLib::Error.from(_v1)",
+        "end"
+      ]
+    end
+  end
+end

data/test/gir_ffi/builders/callback_builder_test.rb

@@ -39,7 +39,7 @@ describe GirFFI::Builders::CallbackBuilder do
       it "returns a valid mapping method" do
         expected = <<-CODE.reset_indentation
         def self.call_with_argument_mapping(_proc, user_data)
-          _v1 = GirFFI::ArgHelper::OBJECT_STORE[user_data.address]
+          _v1 = GirFFI::ArgHelper::OBJECT_STORE.fetch(user_data)
           _v2 = _proc.call(_v1)
           return _v2
         end

data/test/gir_ffi/builders/callback_return_value_builder_test.rb

@@ -0,0 +1,74 @@
+require 'gir_ffi_test_helper'
+
+describe GirFFI::Builders::CallbackReturnValueBuilder do
+  let(:var_gen) { GirFFI::VariableNameGenerator.new }
+  let(:return_value_info) { GirFFI::ReturnValueInfo.new(type_info) }
+  let(:type_info) { callback_info.return_type }
+  let(:builder) { GirFFI::Builders::CallbackReturnValueBuilder.new(var_gen,
+                                                                   return_value_info) }
+
+  before do
+    skip unless callback_info
+  end
+
+  describe "for :gint32" do
+    let(:callback_info) { get_introspection_data("GIMarshallingTests", "CallbackIntInt") }
+
+    it "has no statements in #post_conversion" do
+      builder.post_conversion.must_equal []
+    end
+
+    it "returns the result of the callback directly" do
+      builder.capture_variable_name.must_equal "_v1"
+      builder.return_value_name.must_equal "_v1"
+    end
+  end
+
+  describe "for :void" do
+    let(:callback_info) { get_introspection_data("GIMarshallingTests",
+                                                 "CallbackMultipleOutParameters") }
+
+    it "has no statements in #post_conversion" do
+      builder.post_conversion.must_equal []
+    end
+
+    it "returns nothing" do
+      builder.capture_variable_name.must_be_nil
+      builder.return_value_name.must_be_nil
+    end
+  end
+
+  describe "for :enum" do
+    let(:callback_info) { get_vfunc_introspection_data("GIMarshallingTests",
+                                                       "Object",
+                                                       "vfunc_return_enum") }
+
+    it "converts the result" do
+      # Ensure variable names are generated in order
+      builder.capture_variable_name.must_equal "_v1"
+      builder.post_conversion.must_equal [ "_v2 = GIMarshallingTests::Enum.from(_v1)"]
+    end
+
+    it "returns the result of the conversion" do
+      builder.capture_variable_name.must_equal "_v1"
+      builder.return_value_name.must_equal "_v2"
+    end
+  end
+
+  describe "for :object" do
+    let(:callback_info) { get_vfunc_introspection_data("GIMarshallingTests",
+                                                       "Object",
+                                                       "vfunc_return_object_transfer_full") }
+
+    it "converts the result to a pointer" do
+      # Ensure variable names are generated in order
+      builder.capture_variable_name.must_equal "_v1"
+      builder.post_conversion.must_equal [ "_v2 = GObject::Object.from(_v1).to_ptr"]
+    end
+
+    it "returns the result of the conversion" do
+      builder.capture_variable_name.must_equal "_v1"
+      builder.return_value_name.must_equal "_v2"
+    end
+  end
+end

data/test/gir_ffi/builders/function_builder_test.rb

@@ -169,9 +169,10 @@ describe GirFFI::Builders::FunctionBuilder do
     describe "for GLib::Variant.get_strv" do
       let(:function_info) { get_method_introspection_data 'GLib', 'Variant', 'get_strv' }
       it "builds a correct definition" do
+        size_type = ":guint#{FFI.type_size(:size_t) * 8}"
         code.must_equal <<-CODE.reset_indentation
           def get_strv 
-            _v1 = GirFFI::InOutPointer.for :guint64
+            _v1 = GirFFI::InOutPointer.for #{size_type}
             _v2 = GLib::Lib.g_variant_get_strv self, _v1
             _v3 = GLib::Strv.wrap(_v2)
             return _v3
@@ -181,7 +182,7 @@ describe GirFFI::Builders::FunctionBuilder do
     end
 
     describe "for Regress.has_parameter_named_attrs" do
-      let(:function_info) {get_introspection_data 'Regress', 'has_parameter_named_attrs' }
+      let(:function_info) { get_introspection_data 'Regress', 'has_parameter_named_attrs' }
 
       it "builds a correct definition" do
         skip unless function_info
@@ -195,5 +196,25 @@ describe GirFFI::Builders::FunctionBuilder do
         CODE
       end
     end
+
+    describe "for GIMarshallingTests::Object.method_int8_arg_and_out_callee" do
+      let(:function_info) {
+        get_method_introspection_data('GIMarshallingTests', 'Object',
+                                      'method_int8_arg_and_out_callee')
+      }
+
+      it "builds a correct definition" do
+        skip unless function_info
+        code.must_equal <<-CODE.reset_indentation
+          def method_int8_arg_and_out_callee arg
+            _v1 = arg
+            _v2 = GirFFI::InOutPointer.for [:pointer, :gint8]
+            GIMarshallingTests::Lib.gi_marshalling_tests_object_method_int8_arg_and_out_callee self, _v1, _v2
+            _v3 = GirFFI::InOutPointer.new(:gint8, _v2.to_value).to_value
+            return _v3
+          end
+        CODE
+      end
+    end
   end
 end

data/test/gir_ffi/builders/property_builder_test.rb

@@ -107,4 +107,19 @@ describe GirFFI::Builders::PropertyBuilder do
       builder.setter_def.must_equal expected
     end
   end
+
+  describe "#container_defines_getter_method?" do
+    let(:property_info) { Object.new.tap {|o| o.extend GirFFI::InfoExt::IPropertyInfo } }
+    let(:container_info) { Object.new }
+
+    before do
+      stub(property_info).container { container_info }
+      stub(property_info).name { "foo-bar" }
+      stub(container_info).find_instance_method("foo_bar") { true }
+    end
+
+    it "finds methods with underscores for properties with dashes" do
+      builder.container_defines_getter_method?.must_equal true
+    end
+  end
 end

data/test/gir_ffi/builders/return_value_builder_test.rb

@@ -10,7 +10,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :gint32" do
     let(:type_info) { get_introspection_data("GIMarshallingTests",
-                                           "int_return_min").return_type }
+                                             "int_return_min").return_type }
 
     it "has no statements in #post_conversion" do
       builder.post_conversion.must_equal []
@@ -24,8 +24,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :struct" do
     let(:type_info) { get_method_introspection_data("GIMarshallingTests",
-                                                  "BoxedStruct",
-                                                  "returnv").return_type }
+                                                    "BoxedStruct",
+                                                    "returnv").return_type }
 
     it "wraps the result in #post_conversion" do
       builder.capture_variable_name.must_equal "_v1"
@@ -40,8 +40,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :union" do
     let(:type_info) { get_method_introspection_data("GIMarshallingTests",
-                                                  "Union",
-                                                  "returnv").return_type }
+                                                    "Union",
+                                                    "returnv").return_type }
 
     it "wraps the result in #post_conversion" do
       builder.capture_variable_name.must_equal "_v1"
@@ -56,8 +56,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :interface" do
     let(:type_info) { get_method_introspection_data("Gio",
-                                                  "File",
-                                                  "new_for_commandline_arg").return_type }
+                                                    "File",
+                                                    "new_for_commandline_arg").return_type }
 
     it "wraps the result in #post_conversion" do
       builder.capture_variable_name.must_equal "_v1"
@@ -73,8 +73,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe "for :object" do
     describe "when the method is not a constructor" do
       let(:type_info) { get_method_introspection_data("GIMarshallingTests",
-                                                    "Object",
-                                                    "full_return").return_type }
+                                                      "Object",
+                                                      "full_return").return_type }
       let(:for_constructor) { false }
 
       it "wraps the result in #post_conversion" do
@@ -90,8 +90,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
     describe "when the method is a constructor" do
       let(:type_info) { get_method_introspection_data("GIMarshallingTests",
-                                                    "Object",
-                                                    "new").return_type }
+                                                      "Object",
+                                                      "new").return_type }
       let(:for_constructor) { true }
 
       it "wraps the result in #post_conversion" do
@@ -108,8 +108,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :strv" do
     let(:type_info) { get_method_introspection_data("GLib",
-                                                  "KeyFile",
-                                                  "get_locale_string_list").return_type }
+                                                    "KeyFile",
+                                                    "get_locale_string_list").return_type }
 
     it "wraps the result in #post_conversion" do
       builder.capture_variable_name.must_equal "_v1"
@@ -124,8 +124,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :zero_terminated" do
     let(:type_info) { get_method_introspection_data("GLib",
-                                                  "Variant",
-                                                  "dup_bytestring").return_type }
+                                                    "Variant",
+                                                    "dup_bytestring").return_type }
     before do
       skip unless type_info.zero_terminated?
     end
@@ -143,7 +143,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :byte_array" do
     let(:type_info) { get_introspection_data("GIMarshallingTests",
-                                           "bytearray_full_return").return_type }
+                                             "bytearray_full_return").return_type }
 
     it "wraps the result in #post_conversion" do
       builder.capture_variable_name.must_equal "_v1"
@@ -158,7 +158,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :ptr_array" do
     let(:type_info) { get_introspection_data("GIMarshallingTests",
-                                           "gptrarray_utf8_none_return").return_type }
+                                             "gptrarray_utf8_none_return").return_type }
 
     it "wraps the result in #post_conversion" do
       builder.capture_variable_name.must_equal "_v1"
@@ -173,7 +173,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :glist" do
     let(:type_info) { get_introspection_data("GIMarshallingTests",
-                                           "glist_int_none_return").return_type }
+                                             "glist_int_none_return").return_type }
 
     it "wraps the result in #post_conversion" do
       builder.capture_variable_name.must_equal "_v1"
@@ -188,7 +188,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :gslist" do
     let(:type_info) { get_introspection_data("GIMarshallingTests",
-                                           "gslist_int_none_return").return_type }
+                                             "gslist_int_none_return").return_type }
 
     it "wraps the result in #post_conversion" do
       builder.capture_variable_name.must_equal "_v1"
@@ -203,7 +203,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :ghash" do
     let(:type_info) { get_introspection_data("GIMarshallingTests",
-                                           "ghashtable_int_none_return").return_type }
+                                             "ghashtable_int_none_return").return_type }
 
     it "wraps the result in #post_conversion" do
       builder.capture_variable_name.must_equal "_v1"
@@ -218,7 +218,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :array" do
     let(:type_info) { get_introspection_data("GIMarshallingTests",
-                                           "garray_int_none_return").return_type }
+                                             "garray_int_none_return").return_type }
 
 
     it "wraps the result in #post_conversion" do
@@ -234,7 +234,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe "for :error" do
     let(:type_info) { get_introspection_data("GIMarshallingTests",
-                                           "gerror_return").return_type }
+                                             "gerror_return").return_type }
 
     it "wraps the result in #post_conversion" do
       builder.capture_variable_name.must_equal "_v1"
@@ -250,7 +250,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe "for :c" do
     describe "with fixed size" do
       let(:type_info) { get_introspection_data("GIMarshallingTests",
-                                             "array_fixed_int_return").return_type }
+                                               "array_fixed_int_return").return_type }
 
       it "converts the result in #post_conversion" do
         builder.capture_variable_name.must_equal "_v1"
@@ -266,8 +266,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
     describe "with separate size parameter" do
       let(:length_argument) { Object.new }
       let(:type_info) { get_method_introspection_data("GIMarshallingTests",
-                                                    "Object",
-                                                    "method_array_return").return_type }
+                                                      "Object",
+                                                      "method_array_return").return_type }
 
       before do
         stub(length_argument).post_converted_name { "bar" }
@@ -347,7 +347,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
     it "fetches the stored object in #post_conversion" do
       builder.capture_variable_name.must_equal "_v1"
-      builder.post_conversion.must_equal [ "_v2 = GirFFI::ArgHelper::OBJECT_STORE[_v1.address]" ]
+      builder.post_conversion.must_equal [ "_v2 = GirFFI::ArgHelper::OBJECT_STORE.fetch(_v1)" ]
     end
 
     it "returns the stored object" do