gir_ffi 0.4.3 → 0.5.0

data/test/gir_ffi/base_argument_builder_test.rb

@@ -0,0 +1,13 @@
+require 'gir_ffi_test_helper'
+
+describe GirFFI::BaseArgumentBuilder do
+  describe "#subtype_tag_or_class_name" do
+    it "delegates to the type" do
+      mock(info = Object.new).subtype_tag_or_class_name { 'foo' }
+
+      builder = GirFFI::BaseArgumentBuilder.new nil, 'bar', info, :direction
+      assert_equal "foo", builder.subtype_tag_or_class_name
+    end
+  end
+end
+

data/test/gir_ffi/builder/module_test.rb

@@ -1,48 +1,12 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Module do
-  describe "#pretty_print" do
-    describe "for a module with no members" do
-      it "returns just a module block" do
-        gir = GObjectIntrospection::IRepository.default
-        stub(gir).require("Foo", nil) { }
-        mock(gir).infos("Foo") { [] }
-
-        builder = GirFFI::Builder::Module.new "Foo"
-        res = builder.pretty_print
-        expected = "module Foo\nend"
-
-        assert_equal expected, res
-      end
-    end
-
-    describe "for a module with a function member" do
-      it "returns a module block with pretty printed function inside" do
-        stub(info = Object.new).info_type { :function }
-        mock(subbuilder = Object.new).pretty_print { "def foo\n  function_body\nend" }
-
-        gir = GObjectIntrospection::IRepository.default
-        stub(gir).require("Foo", nil) { }
-        mock(gir).infos("Foo") { [info] }
-
-        builder = GirFFI::Builder::Module.new "Foo"
-        stub(builder).libmodule { :bla }
-        mock(GirFFI::Builder::Function).new(info, :bla) { subbuilder }
-
-        res = builder.pretty_print
-        expected = "module Foo\n  def foo\n    function_body\n  end\nend"
-
-        assert_equal expected, res
-      end
-    end
-  end
-
   describe "#function_definition" do
-    it "delegates to GirFFI::Builder::Function#generate" do
+    it "delegates to GirFFI::FunctionBuilder#generate" do
       builder = GirFFI::Builder::Module.new "Foo"
 
       mock(fb = Object.new).generate { "function body" }
-      mock(GirFFI::Builder::Function).new("info", "lib") { fb }
+      mock(GirFFI::FunctionBuilder).new("info", "lib") { fb }
 
       result = builder.send :function_definition, "info", "lib"
 
@@ -52,14 +16,14 @@ describe GirFFI::Builder::Module do
 
   describe "#sub_builder" do
     describe "for a :function argument" do
-      it "creates a GirFFI::Builder::Function object" do
+      it "creates a GirFFI::FunctionBuilder object" do
         builder = GirFFI::Builder::Module.new "Foo"
         mock(builder).libmodule { DummyLib }
 
         stub(info = Object.new).info_type { :function }
 
         result = builder.send :sub_builder, info
-        assert_instance_of GirFFI::Builder::Function, result
+        assert_instance_of GirFFI::FunctionBuilder, result
       end
     end
 

data/test/gir_ffi/builder/type/callback_test.rb

@@ -1,33 +1,6 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Type::Callback do
-  describe "#pretty_print" do
-    it "returns a statement assigning the callback to a constant" do
-      mock(info = Object.new).safe_name { "TheCallback" }
-      stub(info).namespace { "Foo" }
-      mock(GirFFI::Builder).ffi_function_return_type(info) { :ret_type }
-      mock(GirFFI::Builder).ffi_function_argument_types(info) { [ :baz, :qux ] }
-
-      builder = GirFFI::Builder::Type::Callback.new(info)
-
-      assert_equal "TheCallback = Lib.callback :TheCallback, [:baz, :qux], :ret_type",
-        builder.pretty_print
-    end
-
-    it "renders enum argument types by their tags" do
-      stub(enum = FFI::Enum.new([])).tag { :EnumTag }
-
-      mock(info = Object.new).safe_name { "TheCallback" }
-      stub(info).namespace { "Foo" }
-      mock(GirFFI::Builder).ffi_function_return_type(info) { :ret_type }
-      mock(GirFFI::Builder).ffi_function_argument_types(info) { [ enum ] }
-
-      builder = GirFFI::Builder::Type::Callback.new(info)
-
-      assert_equal "TheCallback = Lib.callback :TheCallback, [EnumTag], :ret_type",
-        builder.pretty_print
-    end
-  end
 end
 
 

data/test/gir_ffi/builder/type/constant_test.rb

@@ -1,16 +1,4 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Type::Constant do
-  describe "#pretty_print" do
-    it "returns the correct assignment statement" do
-      mock(info = Object.new).value { "bar" }
-      mock(info).safe_name { "FOO_CONSTANT" }
-      stub(info).namespace { "Foo" }
-
-      builder = GirFFI::Builder::Type::Constant.new(info)
-
-      assert_equal "FOO_CONSTANT = \"bar\"", builder.pretty_print
-    end
-  end
 end
-

data/test/gir_ffi/builder/type/enum_test.rb

@@ -1,25 +1,5 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Type::Enum do
-  describe "#pretty_print" do
-    it "returns a statement assigning the enum to a constant" do
-      mock(info = Object.new).safe_name { "TheEnum" }
-      stub(info).namespace { "Foo" }
-
-      mock(val1 = Object.new).name { "value1" }
-      mock(val1).value { 1 }
-      mock(val2 = Object.new).name { "value2" }
-      mock(val2).value { 2 }
-
-      mock(info).values { [val1, val2] }
-
-      builder = GirFFI::Builder::Type::Enum.new(info)
-
-      assert_equal "TheEnum = Lib.enum :TheEnum, [:value1, 1, :value2, 2]",
-        builder.pretty_print
-    end
-  end
 end
 
-
-

data/test/gir_ffi/builder/type/interface_test.rb

@@ -1,17 +1,6 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Type::Interface do
-  describe "#pretty_print" do
-    it "returns a module block, extending InterfaceBase" do
-      mock(info = Object.new).safe_name { "Bar" }
-      stub(info).namespace { "Foo" }
-
-      builder = GirFFI::Builder::Type::Interface.new(info)
-
-      assert_equal "module Bar\n  extend InterfaceBase\nend", builder.pretty_print
-    end
-  end
-
   describe "#build_class" do
     before do
       info = get_introspection_data 'GObject', 'TypePlugin'

data/test/gir_ffi/builder/type/object_test.rb

@@ -51,9 +51,9 @@ describe GirFFI::Builder::Type::Object do
       @go = get_method_introspection_data 'Regress', 'TestObj', 'instance_method'
     end
 
-    it "delegates definition to Builder::Function" do
+    it "delegates definition to FunctionBuilder" do
       code = @cbuilder.send :function_definition, @go
-      expected = GirFFI::Builder::Function.new(@go, Regress::Lib).generate
+      expected = GirFFI::FunctionBuilder.new(@go, Regress::Lib).generate
       assert_equal cws(expected), cws(code)
     end
 

data/test/gir_ffi/builder/type/struct_test.rb

@@ -2,45 +2,6 @@ require 'gir_ffi_test_helper'
 
 # FIXME: Test WithLayout directly, rather than through Struct.
 describe GirFFI::Builder::Type::Struct do
-  describe "#pretty_print" do
-    describe "for a struct with no methods" do
-      it "returns a class block" do
-        mock(info = Object.new).safe_name { "Bar" }
-        stub(info).namespace { "Foo" }
-        stub(info).get_methods { [] }
-
-        builder = GirFFI::Builder::Type::Struct.new(info)
-
-        assert_equal "class Bar\nend", builder.pretty_print
-      end
-    end
-
-    describe "for a struct with a method" do
-      it "returns a class block with the pretty printed method inside" do
-        # FIXME: Loads of mocks.
-
-        # Function info and its builder
-        stub(func_info = Object.new).info_type { :function }
-        mock(func_builder = Object.new).pretty_print { "def foo\n  function_body\nend" }
-        mock(GirFFI::Builder::Function).new(func_info, :bla) { func_builder }
-
-        # Struct info
-        mock(info = Object.new).safe_name { "Bar" }
-        stub(info).namespace { "Foo" }
-        mock(info).get_methods { [func_info] }
-
-        # Struct builder
-        builder = GirFFI::Builder::Type::Struct.new(info)
-        stub(builder).lib { :bla }
-
-        res = builder.pretty_print
-        expected = "class Bar\n  def foo\n    function_body\n  end\nend"
-
-        assert_equal expected, res
-      end
-    end
-  end
-
   describe "for a struct with a simple layout" do
     before do
       @field = Object.new

data/test/gir_ffi/builder/type/unintrospectable_test.rb

@@ -6,7 +6,7 @@ describe GirFFI::Builder::Type::Unintrospectable do
       # Ensure existence of GLocalFile type
       GirFFI.setup :Gio
       unless Gio::Lib.respond_to? :g_file_new_for_path
-        Gio._setup_method "file_new_for_path"
+        Gio.setup_method "file_new_for_path"
       end
       ptr = GirFFI::InPointer.from :utf8, '/'
       Gio::Lib.g_file_new_for_path(ptr)

data/test/gir_ffi/builder/type/union_test.rb

@@ -8,16 +8,5 @@ describe GirFFI::Builder::Type::Union do
   it "returns false looking for a method that doesn't exist" do
     assert_equal false, @cbuilder.setup_instance_method('blub')
   end
-
-  describe "#pretty_print" do
-    it "returns a class block" do
-      mock(info = Object.new).safe_name { "Bar" }
-      stub(info).namespace { "Foo" }
-
-      builder = GirFFI::Builder::Type::Union.new(info)
-
-      assert_equal "class Bar\nend", builder.pretty_print
-    end
-  end
 end
 

data/test/gir_ffi/builder_test.rb

@@ -43,10 +43,6 @@ describe GirFFI::Builder do
       assert_equal [expected], GObject::Lib.ffi_libraries.map(&:name)
     end
 
-    should "create an array CALLBACKS inside the GObject::Lib module" do
-      assert_equal [], GObject::Lib::CALLBACKS
-    end
-
     should "not replace existing classes" do
       oldclass = GObject::Object
       GirFFI::Builder.build_class get_introspection_data('GObject', 'Object')
@@ -74,7 +70,7 @@ describe GirFFI::Builder do
     end
 
     should "define ffi callback types :Callback and :ClosureNotify" do
-      Regress._setup_method 'test_callback_destroy_notify'
+      Regress.setup_method 'test_callback_destroy_notify'
       tcud = Regress::Lib.find_type :TestCallbackUserData
       dn = GLib::Lib.find_type :DestroyNotify
 
@@ -180,7 +176,7 @@ describe GirFFI::Builder do
     end
 
     should "know its own module builder" do
-      assert GirFFI::Builder::Module === Regress._builder
+      assert GirFFI::Builder::Module === Regress.gir_ffi_builder
     end
 
     after do
@@ -215,7 +211,7 @@ describe GirFFI::Builder do
     end
 
     should "know its own class builder" do
-      assert GirFFI::Builder::Type::Base === Regress::TestObj._builder
+      assert GirFFI::Builder::Type::Base === Regress::TestObj.gir_ffi_builder
     end
 
     describe "its #torture_signature_0 method" do
@@ -333,10 +329,6 @@ describe GirFFI::Builder do
       assert_equal expected, Regress::Lib.ffi_libraries.map(&:name)
     end
 
-    it "creates an array CALLBACKS inside the Regress::Lib module" do
-      assert_equal [], Regress::Lib::CALLBACKS
-    end
-
     it "does not replace existing module" do
       oldmodule = Regress
       GirFFI::Builder.build_module 'Regress'

data/test/gir_ffi/callback_helper_test.rb

@@ -47,4 +47,11 @@ describe GirFFI::CallbackHelper do
       assert_equal "good-result", r
     end
   end
+
+  describe ".store_callback" do
+    it "stores the passed in proc in GirFFI::CallbackHelper::CALLBACKS" do
+      GirFFI::CallbackHelper.store_callback "some-callback"
+      GirFFI::CallbackHelper::CALLBACKS.last.must_equal "some-callback"
+    end
+  end
 end

data/test/gir_ffi/{builder/function_test.rb → function_builder_test.rb}

@@ -1,25 +1,15 @@
 require 'gir_ffi_test_helper'
 
-describe GirFFI::Builder::Function do
-  describe "#pretty_print" do
-    it "delegates to #generate" do
-      builder = GirFFI::Builder::Function.new(:info, :libmodule)
-
-      mock(builder).generate { 'result_from_generate' }
-
-      assert_equal "result_from_generate", builder.pretty_print
-    end
-  end
-
+describe GirFFI::FunctionBuilder do
   it "builds a correct definition of Regress:test_array_fixed_out_objects" do
     go = get_introspection_data 'Regress', 'test_array_fixed_out_objects'
     skip unless go
-    fbuilder = GirFFI::Builder::Function.new go, DummyLib
+    fbuilder = GirFFI::FunctionBuilder.new go, DummyLib
     code = fbuilder.generate
 
     expected = <<-CODE
       def self.test_array_fixed_out_objects 
-        _v1 = GirFFI::InOutPointer.for_array [:pointer, ::Regress::TestObj]
+        _v1 = GirFFI::InOutPointer.for [:c, [:pointer, ::Regress::TestObj]]
         DummyLib.regress_test_array_fixed_out_objects _v1
         _v2 = _v1.to_sized_array_value 2
         return _v2
@@ -31,7 +21,7 @@ describe GirFFI::Builder::Function do
 
   it "builds a correct definition for functions having a linked length argument" do
     go = get_introspection_data 'Regress', 'test_array_gint16_in'
-    fbuilder = GirFFI::Builder::Function.new go, DummyLib
+    fbuilder = GirFFI::FunctionBuilder.new go, DummyLib
     code = fbuilder.generate
 
     expected = <<-CODE
@@ -49,16 +39,14 @@ describe GirFFI::Builder::Function do
 
   it "builds a correct definition for functions with callbacks" do
     go = get_introspection_data 'Regress', 'test_callback_destroy_notify'
-    fbuilder = GirFFI::Builder::Function.new go, DummyLib
+    fbuilder = GirFFI::FunctionBuilder.new go, DummyLib
     code = fbuilder.generate
 
     expected = <<-CODE
       def self.test_callback_destroy_notify callback, user_data, notify
-        _v1 = GirFFI::CallbackHelper.wrap_in_callback_args_mapper \"Regress\", \"TestCallbackUserData\", callback
-        DummyLib::CALLBACKS << _v1
+        _v1 = GirFFI::Callback.from(\"Regress\", \"TestCallbackUserData\", callback)
         _v2 = GirFFI::InPointer.from(:void, user_data)
-        _v3 = GirFFI::CallbackHelper.wrap_in_callback_args_mapper \"GLib\", \"DestroyNotify\", notify
-        DummyLib::CALLBACKS << _v3
+        _v3 = GirFFI::Callback.from(\"GLib\", \"DestroyNotify\", notify)
         _v4 = DummyLib.regress_test_callback_destroy_notify _v1, _v2, _v3
         return _v4
       end
@@ -69,7 +57,7 @@ describe GirFFI::Builder::Function do
 
   it "builds correct definition for constructors" do
     go = get_method_introspection_data 'Regress', 'TestObj', 'new_from_file'
-    fbuilder = GirFFI::Builder::Function.new go, DummyLib
+    fbuilder = GirFFI::FunctionBuilder.new go, DummyLib
     code = fbuilder.generate
 
     expected = <<-CODE
@@ -88,7 +76,7 @@ describe GirFFI::Builder::Function do
 
   it "creates a call to GObject::Value#from for functions that take a GValue" do
     go = get_introspection_data 'GIMarshallingTests', 'gvalue_in'
-    fbuilder = GirFFI::Builder::Function.new go, DummyLib
+    fbuilder = GirFFI::FunctionBuilder.new go, DummyLib
     code = fbuilder.generate
 
     expected = <<-CODE
@@ -104,7 +92,7 @@ describe GirFFI::Builder::Function do
 
   it "builds correct definition for functions with a nullable input array" do
     go = get_introspection_data 'Regress', 'test_array_int_null_in'
-    fbuilder = GirFFI::Builder::Function.new go, DummyLib
+    fbuilder = GirFFI::FunctionBuilder.new go, DummyLib
     code = fbuilder.generate
 
     expected = <<-CODE
@@ -122,12 +110,12 @@ describe GirFFI::Builder::Function do
 
   it "builds correct definition for functions with a nullable output array" do
     go = get_introspection_data 'Regress', 'test_array_int_null_out'
-    fbuilder = GirFFI::Builder::Function.new go, DummyLib
+    fbuilder = GirFFI::FunctionBuilder.new go, DummyLib
     code = fbuilder.generate
 
     expected = <<-CODE
       def self.test_array_int_null_out 
-        _v1 = GirFFI::InOutPointer.for_array :gint32
+        _v1 = GirFFI::InOutPointer.for [:c, :gint32]
         _v2 = GirFFI::InOutPointer.for :gint32
         DummyLib.regress_test_array_int_null_out _v1, _v2
         _v3 = _v2.to_value
@@ -141,13 +129,13 @@ describe GirFFI::Builder::Function do
 
   it "builds the correct definition for a method with an inout array with size argument" do
     go = get_method_introspection_data 'GIMarshallingTests', 'Object', 'method_array_inout'
-    fbuilder = GirFFI::Builder::Function.new go, DummyLib
+    fbuilder = GirFFI::FunctionBuilder.new go, DummyLib
     code = fbuilder.generate
 
     expected = <<-CODE
       def method_array_inout ints
-        _v1 = GirFFI::InOutPointer.from_array :gint32, ints
-        length = ints.length
+        _v1 = GirFFI::InOutPointer.from [:c, :gint32], ints
+        length = ints.nil? ? 0 : ints.length
         _v2 = GirFFI::InOutPointer.from :gint32, length
         DummyLib.gi_marshalling_tests_object_method_array_inout self, _v1, _v2
         _v3 = _v2.to_value
@@ -161,7 +149,7 @@ describe GirFFI::Builder::Function do
 
   it "builds a correct definition for a simple method" do
     go = get_method_introspection_data 'Regress', 'TestObj', 'instance_method'
-    fbuilder = GirFFI::Builder::Function.new go, DummyLib
+    fbuilder = GirFFI::FunctionBuilder.new go, DummyLib
     code = fbuilder.generate
 
     expected = <<-CODE