gir_ffi 0.6.7 → 0.7.0

data/test/gir_ffi/builders/base_argument_builder_test.rb

@@ -1,5 +1,5 @@
 require 'gir_ffi_test_helper'
 
-describe GirFFI::BaseArgumentBuilder do
+describe GirFFI::Builders::BaseArgumentBuilder do
 end
 

data/test/gir_ffi/builders/callback_builder_test.rb

@@ -8,10 +8,12 @@ describe GirFFI::Builders::CallbackBuilder do
       let(:callback_info) { get_introspection_data "Regress", "TestCallbackFull" }
       it "returns a valid mapping method" do
         expected = <<-CODE.reset_indentation
-        def self.call_with_argument_mapping(_proc, _v1, _v2, _v3)
-          _v4 = _v3.to_utf8
-          _v5 = _proc.call(_v1, _v2, _v4)
-          return _v5
+        def self.call_with_argument_mapping(_proc, foo, bar, path)
+          _v1 = foo
+          _v2 = bar
+          _v3 = path.to_utf8
+          _v4 = _proc.call(_v1, _v2, _v3)
+          return _v4
         end
         CODE
 
@@ -36,10 +38,26 @@ describe GirFFI::Builders::CallbackBuilder do
       let(:callback_info) { get_introspection_data "Regress", "TestCallbackUserData" }
       it "returns a valid mapping method" do
         expected = <<-CODE.reset_indentation
-        def self.call_with_argument_mapping(_proc, _v1)
-          _v2 = GirFFI::ArgHelper::OBJECT_STORE[_v1.address]
-          _v3 = _proc.call(_v2)
-          return _v3
+        def self.call_with_argument_mapping(_proc, user_data)
+          _v1 = GirFFI::ArgHelper::OBJECT_STORE[user_data.address]
+          _v2 = _proc.call(_v1)
+          return _v2
+        end
+        CODE
+
+        builder.mapping_method_definition.must_equal expected
+      end
+    end
+
+    describe "for a callback with one out argument" do
+      let(:callback_info) { get_introspection_data("GIMarshallingTests",
+                                                   "CallbackOneOutParameter") }
+      it "returns a valid mapping method" do
+        expected = <<-CODE.reset_indentation
+        def self.call_with_argument_mapping(_proc, a)
+          _v1 = GirFFI::InOutPointer.new(:gfloat, a)
+          _v2 = _proc.call()
+          _v1.set_value _v2
         end
         CODE
 

data/test/gir_ffi/builders/field_builder_test.rb

@@ -39,7 +39,7 @@ describe GirFFI::Builders::FieldBuilder do
           _v1 = @struct.to_ptr + #{field_info.offset}
           _v2 = GirFFI::InOutPointer.new(Regress::TestSimpleBoxedA, _v1)
           _v3 = _v2.to_value
-          _v4 = ::Regress::TestSimpleBoxedA.wrap(_v3)
+          _v4 = Regress::TestSimpleBoxedA.wrap(_v3)
           _v4
         end
       CODE
@@ -71,7 +71,7 @@ describe GirFFI::Builders::FieldBuilder do
           _v1 = @struct.to_ptr + #{field_info.offset}
           _v2 = GirFFI::InOutPointer.new(:c, _v1)
           _v3 = _v2.to_value
-          _v4 = GLib::SizedArray.wrap(Regress::TestStructE__some_union__union, 2, _v3)
+          _v4 = GirFFI::SizedArray.wrap(Regress::TestStructE__some_union__union, 2, _v3)
           _v4
         end
       CODE
@@ -84,7 +84,22 @@ describe GirFFI::Builders::FieldBuilder do
           _v1 = @struct.to_ptr + #{field_info.offset}
           _v2 = GirFFI::InOutPointer.new(:c, _v1)
           GirFFI::ArgHelper.check_fixed_array_size 2, value, \"value\"
-          _v3 = GLib::SizedArray.from(Regress::TestStructE__some_union__union, 2, value)
+          _v3 = GirFFI::SizedArray.from(Regress::TestStructE__some_union__union, 2, value)
+          _v2.set_value _v3
+        end
+      CODE
+      instance.setter_def.must_equal expected
+    end
+  end
+
+  describe "for a field of type :callback" do
+    let(:field_info) { get_field_introspection_data "GObject", "TypeInfo", "class_init" }
+    it "creates the right setter method" do
+      expected = <<-CODE.reset_indentation
+        def class_init= value
+          _v1 = @struct.to_ptr + #{field_info.offset}
+          _v2 = GirFFI::InOutPointer.new(GObject::ClassInitFunc, _v1)
+          _v3 = GObject::ClassInitFunc.from(value)
           _v2.set_value _v3
         end
       CODE

data/test/gir_ffi/builders/function_builder_test.rb

@@ -11,7 +11,7 @@ describe GirFFI::Builders::FunctionBuilder do
       def self.test_array_fixed_out_objects 
         _v1 = GirFFI::InOutPointer.for [:pointer, :c]
         Regress::Lib.regress_test_array_fixed_out_objects _v1
-        _v2 = GLib::SizedArray.wrap([:pointer, Regress::TestObj], 2, _v1.to_value)
+        _v2 = GirFFI::SizedArray.wrap([:pointer, Regress::TestObj], 2, _v1.to_value)
         return _v2
       end
     CODE
@@ -28,7 +28,7 @@ describe GirFFI::Builders::FunctionBuilder do
       def self.test_array_gint16_in ints
         n_ints = ints.nil? ? 0 : ints.length
         _v1 = n_ints
-        _v2 = GLib::SizedArray.from(:gint16, -1, ints)
+        _v2 = GirFFI::SizedArray.from(:gint16, -1, ints)
         _v3 = Regress::Lib.regress_test_array_gint16_in _v1, _v2
         return _v3
       end
@@ -44,9 +44,9 @@ describe GirFFI::Builders::FunctionBuilder do
 
     expected = <<-CODE
       def self.test_callback_destroy_notify callback, user_data, notify
-        _v1 = ::Regress::TestCallbackUserData.from(callback)
-        _v2 = GirFFI::InPointer.from(:void, user_data)
-        _v3 = ::GLib::DestroyNotify.from(notify)
+        _v1 = Regress::TestCallbackUserData.from(callback)
+        _v2 = GirFFI::InPointer.from_closure_data(user_data)
+        _v3 = GLib::DestroyNotify.from(notify)
         _v4 = Regress::Lib.regress_test_callback_destroy_notify _v1, _v2, _v3
         return _v4
       end
@@ -81,7 +81,7 @@ describe GirFFI::Builders::FunctionBuilder do
 
     expected = <<-CODE
       def self.gvalue_in value
-        _v1 = ::GObject::Value.from(value)
+        _v1 = GObject::Value.from(value)
         GIMarshallingTests::Lib.gi_marshalling_tests_gvalue_in _v1
       end
     CODE
@@ -96,7 +96,7 @@ describe GirFFI::Builders::FunctionBuilder do
 
     expected = <<-CODE
       def self.test_array_int_null_in arr
-        _v1 = GLib::SizedArray.from(:gint32, -1, arr)
+        _v1 = GirFFI::SizedArray.from(:gint32, -1, arr)
         len = arr.nil? ? 0 : arr.length
         _v2 = len
         Regress::Lib.regress_test_array_int_null_in _v1, _v2
@@ -117,7 +117,7 @@ describe GirFFI::Builders::FunctionBuilder do
         _v2 = GirFFI::InOutPointer.for :gint32
         Regress::Lib.regress_test_array_int_null_out _v1, _v2
         _v3 = _v2.to_value
-        _v4 = GLib::SizedArray.wrap(:gint32, _v3, _v1.to_value)
+        _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v1.to_value)
         return _v4
       end
     CODE
@@ -132,12 +132,14 @@ describe GirFFI::Builders::FunctionBuilder do
 
     expected = <<-CODE
       def method_array_inout ints
-        _v1 = GirFFI::InOutPointer.from [:pointer, :c], GLib::SizedArray.from(:gint32, -1, ints)
+        _v1 = GirFFI::InOutPointer.for [:pointer, :c]
+        _v1.set_value GirFFI::SizedArray.from(:gint32, -1, ints)
         length = ints.nil? ? 0 : ints.length
-        _v2 = GirFFI::InOutPointer.from :gint32, length
+        _v2 = GirFFI::InOutPointer.for :gint32
+        _v2.set_value length
         GIMarshallingTests::Lib.gi_marshalling_tests_object_method_array_inout self, _v1, _v2
         _v3 = _v2.to_value
-        _v4 = GLib::SizedArray.wrap(:gint32, _v3, _v1.to_value)
+        _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v1.to_value)
         return _v4
       end
     CODE
@@ -169,7 +171,7 @@ describe GirFFI::Builders::FunctionBuilder do
       it "builds a correct definition" do
         code.must_equal <<-CODE.reset_indentation
           def get_strv 
-            _v1 = nil
+            _v1 = GirFFI::InOutPointer.for :guint64
             _v2 = GLib::Lib.g_variant_get_strv self, _v1
             _v3 = GLib::Strv.wrap(_v2)
             return _v3
@@ -177,5 +179,21 @@ describe GirFFI::Builders::FunctionBuilder do
         CODE
       end
     end
+
+    describe "for Regress.has_parameter_named_attrs" do
+      let(:function_info) {get_introspection_data 'Regress', 'has_parameter_named_attrs' }
+
+      it "builds a correct definition" do
+        skip unless function_info
+        code.must_equal <<-CODE.reset_indentation
+          def self.has_parameter_named_attrs foo, attributes
+            _v1 = foo
+            GirFFI::ArgHelper.check_fixed_array_size 32, attributes, \"attributes\"
+            _v2 = GirFFI::SizedArray.from([:pointer, :guint32], 32, attributes)
+            Regress::Lib.regress_has_parameter_named_attrs _v1, _v2
+          end
+        CODE
+      end
+    end
   end
 end

data/test/gir_ffi/builders/interface_builder_test.rb

@@ -1,6 +1,9 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builders::InterfaceBuilder do
+  let(:interface_builder) { GirFFI::Builders::InterfaceBuilder.new(
+    get_introspection_data('Regress', 'TestInterface')) }
+
   describe "#build_class" do
     before do
       info = get_introspection_data 'GObject', 'TypePlugin'
@@ -16,4 +19,10 @@ describe GirFFI::Builders::InterfaceBuilder do
       assert_defines_instance_method @iface, :complete_interface_info
     end
   end
+
+  describe "#interface_struct" do
+    it "returns the interface struct type" do
+      interface_builder.interface_struct.must_equal Regress::TestInterfaceIface
+    end
+  end
 end

data/test/gir_ffi/builders/module_builder_test.rb

@@ -1,45 +1,6 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builders::ModuleBuilder do
-  describe "#function_definition" do
-    it "delegates to GirFFI::Builders::FunctionBuilder#generate" do
-      builder = GirFFI::Builders::ModuleBuilder.new "Foo"
-
-      mock(fb = Object.new).generate { "function body" }
-      mock(GirFFI::Builders::FunctionBuilder).new("info") { fb }
-
-      result = builder.send :function_definition, "info"
-
-      assert_equal "function body", result
-    end
-  end
-
-  describe "#sub_builder" do
-    describe "for a :function argument" do
-      it "creates a GirFFI::Builders::FunctionBuilder object" do
-        builder = GirFFI::Builders::ModuleBuilder.new "Foo"
-
-        stub(info = Object.new).info_type { :function }
-
-        result = builder.send :sub_builder, info
-        assert_instance_of GirFFI::Builders::FunctionBuilder, result
-      end
-    end
-
-    describe "for an :object argument" do
-      it "creates a GirFFI::Builders::ObjectBuilder object" do
-        builder = GirFFI::Builders::ModuleBuilder.new "Foo"
-
-        stub(info = Object.new).info_type { :object }
-        stub(info).namespace { "Foo" }
-        stub(info).safe_name { "FooClass" }
-
-        result = builder.send :sub_builder, info
-        assert_instance_of GirFFI::Builders::ObjectBuilder, result
-      end
-    end
-  end
-
   describe "#build_namespaced_class" do
     it "raises a clear error if the named class does not exist" do
       gir = GObjectIntrospection::IRepository.default

data/test/gir_ffi/builders/object_builder_test.rb

@@ -1,61 +1,61 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builders::ObjectBuilder do
+  let(:obj_builder) { GirFFI::Builders::ObjectBuilder.new(
+    get_introspection_data('Regress', 'TestObj')) }
+  let(:sub_obj_builder) { GirFFI::Builders::ObjectBuilder.new(
+    get_introspection_data('Regress', 'TestSubObj')) }
+
   describe '#find_signal' do
     it 'finds the signal "test" for TestObj' do
-      builder = GirFFI::Builders::ObjectBuilder.new get_introspection_data('Regress', 'TestObj')
-      sig = builder.find_signal 'test'
-      assert_equal 'test', sig.name
+      sig = obj_builder.find_signal 'test'
+      sig.name.must_equal 'test'
     end
 
     it 'finds the signal "test" for TestSubObj' do
-      builder = GirFFI::Builders::ObjectBuilder.new get_introspection_data('Regress', 'TestSubObj')
-      sig = builder.find_signal 'test'
-      assert_equal 'test', sig.name
+      sig = sub_obj_builder.find_signal 'test'
+      sig.name.must_equal 'test'
     end
 
     it 'finds the signal "changed" for Gtk::Entry' do
       builder = GirFFI::Builders::ObjectBuilder.new get_introspection_data('Gtk', 'Entry')
       sig = builder.find_signal 'changed'
-      assert_equal 'changed', sig.name
+      sig.name.must_equal 'changed'
     end
   end
 
   describe "#find_property" do
     it "finds a property specified on the class itself" do
-      builder = GirFFI::Builders::ObjectBuilder.new(
-        get_introspection_data('Regress', 'TestObj'))
-      prop = builder.find_property("int")
-      assert_equal "int", prop.name
+      prop = obj_builder.find_property("int")
+      prop.name.must_equal "int"
     end
 
     it "finds a property specified on the parent class" do
-      builder = GirFFI::Builders::ObjectBuilder.new(
-        get_introspection_data('Regress', 'TestSubObj'))
-      prop = builder.find_property("int")
-      assert_equal "int", prop.name
+      prop = sub_obj_builder.find_property("int")
+      prop.name.must_equal "int"
     end
 
     it "raises an error if the property is not found" do
-      builder = GirFFI::Builders::ObjectBuilder.new(
-        get_introspection_data('Regress', 'TestSubObj'))
-      assert_raises RuntimeError do
-        builder.find_property("this-property-does-not-exist")
-      end
+      proc {
+        sub_obj_builder.find_property("this-property-does-not-exist")
+      }.must_raise RuntimeError 
     end
   end
 
   describe "#function_definition" do
-    before do
-      @cbuilder = GirFFI::Builders::ObjectBuilder.new get_introspection_data('Regress', 'TestObj')
-      @go = get_method_introspection_data 'Regress', 'TestObj', 'instance_method'
-    end
+    let(:method_info) {
+      get_method_introspection_data 'Regress', 'TestObj', 'instance_method' }
 
     it "delegates definition to FunctionBuilder" do
-      code = @cbuilder.send :function_definition, @go
-      expected = GirFFI::Builders::FunctionBuilder.new(@go).generate
-      assert_equal cws(expected), cws(code)
+      code = obj_builder.send :function_definition, method_info
+      expected = GirFFI::Builders::FunctionBuilder.new(method_info).generate
+      code.must_equal expected
     end
+  end
 
+  describe "#object_class_struct" do
+    it "returns the class struct type" do
+      obj_builder.object_class_struct.must_equal Regress::TestObjClass
+    end
   end
 end

data/test/gir_ffi/builders/property_builder_test.rb

@@ -0,0 +1,110 @@
+require 'gir_ffi_test_helper'
+
+describe GirFFI::Builders::PropertyBuilder do
+  let(:builder) { GirFFI::Builders::PropertyBuilder.new property_info }
+
+  describe "for a property of type :glist" do
+    let(:property_info) { get_property_introspection_data("Regress", "TestObj", "list") }
+    it "generates the correct getter definition" do
+      expected = <<-CODE.reset_indentation
+      def list
+        _v1 = get_property("list").get_value_plain
+        _v2 = GLib::List.wrap(:utf8, _v1)
+        _v2
+      end
+      CODE
+
+      builder.getter_def.must_equal expected
+    end
+
+    it "generates the correct setter definition" do
+      expected = <<-CODE.reset_indentation
+      def list= value
+        _v1 = GLib::List.from(:utf8, value)
+        set_property("list", _v1)
+      end
+      CODE
+
+      builder.setter_def.must_equal expected
+    end
+  end
+
+  describe "for a property of type :ghash" do
+    let(:property_info) { get_property_introspection_data("Regress", "TestObj", "hash-table") }
+    it "generates the correct getter definition" do
+      expected = <<-CODE.reset_indentation
+      def hash_table
+        _v1 = get_property("hash-table").get_value_plain
+        _v2 = GLib::HashTable.wrap([:utf8, :gint8], _v1)
+        _v2
+      end
+      CODE
+
+      builder.getter_def.must_equal expected
+    end
+
+    it "generates the correct setter definition" do
+      expected = <<-CODE.reset_indentation
+      def hash_table= value
+        _v1 = GLib::HashTable.from([:utf8, :gint8], value)
+        set_property("hash-table", _v1)
+      end
+      CODE
+
+      builder.setter_def.must_equal expected
+    end
+  end
+
+  describe "for a property of type :strv" do
+    let(:property_info) { get_property_introspection_data("GIMarshallingTests",
+                                                          "PropertiesObject",
+                                                          "some-strv") }
+    before do
+      skip unless property_info
+    end
+
+    it "generates the correct getter definition" do
+      expected = <<-CODE.reset_indentation
+      def some_strv
+        get_property("some-strv").get_value
+      end
+      CODE
+
+      builder.getter_def.must_equal expected
+    end
+
+    it "generates the correct setter definition" do
+      expected = <<-CODE.reset_indentation
+      def some_strv= value
+        _v1 = GLib::Strv.from(value)
+        set_property("some-strv", _v1)
+      end
+      CODE
+
+      builder.setter_def.must_equal expected
+    end
+  end
+
+  describe "for a property of type :utf8" do
+    let(:property_info) { get_property_introspection_data("Regress", "TestObj", "string") }
+    it "generates the correct getter definition" do
+      expected = <<-CODE.reset_indentation
+      def string
+        get_property("string").get_value
+      end
+      CODE
+
+      builder.getter_def.must_equal expected
+    end
+
+    it "generates the correct setter definition" do
+      expected = <<-CODE.reset_indentation
+      def string= value
+        set_property("string", value)
+      end
+      CODE
+
+      builder.setter_def.must_equal expected
+    end
+  end
+end