gir_ffi 0.7.10 → 0.8.0

data/test/gir_ffi/builders/callback_return_value_builder_test.rb

@@ -5,10 +5,10 @@ describe GirFFI::Builders::CallbackReturnValueBuilder do
   let(:return_value_info) { GirFFI::ReturnValueInfo.new(type_info, ownership_transfer, false) }
   let(:type_info) { callback_info.return_type }
   let(:ownership_transfer) { callback_info.caller_owns }
-  let(:builder) {
+  let(:builder) do
     GirFFI::Builders::CallbackReturnValueBuilder.new(var_gen,
                                                      return_value_info)
-  }
+  end
 
   before do
     skip unless callback_info
@@ -28,10 +28,10 @@ describe GirFFI::Builders::CallbackReturnValueBuilder do
   end
 
   describe 'for :void' do
-    let(:callback_info) {
+    let(:callback_info) do
       get_introspection_data('GIMarshallingTests',
                              'CallbackMultipleOutParameters')
-    }
+    end
 
     it 'has no statements in #post_conversion' do
       builder.post_conversion.must_equal []
@@ -44,11 +44,11 @@ describe GirFFI::Builders::CallbackReturnValueBuilder do
   end
 
   describe 'for :enum' do
-    let(:callback_info) {
+    let(:callback_info) do
       get_vfunc_introspection_data('GIMarshallingTests',
                                    'Object',
                                    'vfunc_return_enum')
-    }
+    end
 
     it 'converts the result' do
       # Ensure variable names are generated in order
@@ -63,11 +63,11 @@ describe GirFFI::Builders::CallbackReturnValueBuilder do
   end
 
   describe 'for :object with full transfer' do
-    let(:callback_info) {
+    let(:callback_info) do
       get_vfunc_introspection_data('GIMarshallingTests',
                                    'Object',
                                    'vfunc_return_object_transfer_full')
-    }
+    end
 
     it 'increases the refcount of the result and converts it to a pointer' do
       # Ensure variable names are generated in order

data/test/gir_ffi/builders/constructor_builder_test.rb

@@ -0,0 +1,34 @@
+require 'gir_ffi_test_helper'
+
+describe GirFFI::Builders::ConstructorBuilder do
+  describe '#method_definition' do
+    let(:builder) { GirFFI::Builders::ConstructorBuilder.new function_info }
+    let(:code) { builder.method_definition }
+
+    describe 'for constructors with the default name' do
+      let(:function_info) { get_method_introspection_data 'Regress', 'TestObj', 'new' }
+      it 'builds a constructor' do
+        code.must_equal <<-CODE.reset_indentation
+          def self.new(*args)
+            obj = allocate
+            obj.__send__ :initialize, *args
+            obj
+          end
+        CODE
+      end
+    end
+
+    describe 'for constructors with a custom name' do
+      let(:function_info) { get_method_introspection_data 'Regress', 'TestObj', 'new_from_file' }
+      it 'builds a custom constructor' do
+        code.must_equal <<-CODE.reset_indentation
+          def self.new_from_file(*args)
+            obj = allocate
+            obj.__send__ :initialize_from_file, *args
+            obj
+          end
+        CODE
+      end
+    end
+  end
+end

data/test/gir_ffi/builders/function_builder_test.rb

@@ -1,9 +1,9 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builders::FunctionBuilder do
-  describe '#generate' do
+  describe '#method_definition' do
     let(:builder) { GirFFI::Builders::FunctionBuilder.new function_info }
-    let(:code) { builder.generate }
+    let(:code) { builder.method_definition }
 
     describe 'for Regress:test_array_fixed_out_objects' do
       let(:function_info) { get_introspection_data 'Regress', 'test_array_fixed_out_objects' }
@@ -50,22 +50,6 @@ describe GirFFI::Builders::FunctionBuilder do
       end
     end
 
-    describe 'for constructors' do
-      let(:function_info) { get_method_introspection_data 'Regress', 'TestObj', 'new_from_file' }
-      it 'builds correct definition' do
-        code.must_equal <<-CODE.reset_indentation
-          def self.new_from_file(x)
-            _v1 = GirFFI::InPointer.from(:utf8, x)
-            _v2 = FFI::MemoryPointer.new(:pointer).write_pointer nil
-            _v3 = Regress::Lib.regress_test_obj_new_from_file _v1, _v2
-            GirFFI::ArgHelper.check_error(_v2)
-            _v4 = self.constructor_wrap(_v3)
-            return _v4
-          end
-        CODE
-      end
-    end
-
     describe 'for functions that take a GValue' do
       let(:function_info) { get_introspection_data 'GIMarshallingTests', 'gvalue_in' }
       it 'creates a call to GObject::Value#from' do
@@ -172,10 +156,10 @@ describe GirFFI::Builders::FunctionBuilder do
     end
 
     describe 'for GIMarshallingTests::Object#method_int8_arg_and_out_callee' do
-      let(:function_info) {
+      let(:function_info) do
         get_method_introspection_data('GIMarshallingTests', 'Object',
                                       'method_int8_arg_and_out_callee')
-      }
+      end
 
       it 'builds a correct definition' do
         skip unless function_info
@@ -192,10 +176,10 @@ describe GirFFI::Builders::FunctionBuilder do
     end
 
     describe 'for GIMarshallingTests::Object.full_inout' do
-      let(:function_info) {
+      let(:function_info) do
         get_method_introspection_data('GIMarshallingTests', 'Object',
                                       'full_inout')
-      }
+      end
 
       it 'builds a correct definition' do
         code.must_equal <<-CODE.reset_indentation
@@ -211,10 +195,10 @@ describe GirFFI::Builders::FunctionBuilder do
     end
 
     describe 'for Regress::TestObj#instance_method_full' do
-      let(:function_info) {
+      let(:function_info) do
         get_method_introspection_data('Regress', 'TestObj',
                                       'instance_method_full')
-      }
+      end
 
       it 'builds a correct definition including self.ref' do
         skip unless function_info

data/test/gir_ffi/builders/initializer_builder_test.rb

@@ -0,0 +1,36 @@
+require 'gir_ffi_test_helper'
+
+describe GirFFI::Builders::InitializerBuilder do
+  describe '#method_definition' do
+    let(:builder) { GirFFI::Builders::InitializerBuilder.new function_info }
+    let(:code) { builder.method_definition }
+
+    describe 'for constructors with the default name' do
+      let(:function_info) { get_method_introspection_data 'Regress', 'TestObj', 'new' }
+      it 'builds an initializer' do
+        code.must_equal <<-CODE.reset_indentation
+          def initialize(obj)
+            _v1 = Regress::TestObj.from(obj)
+            _v2 = Regress::Lib.regress_test_obj_new _v1
+            store_pointer(_v2)
+          end
+        CODE
+      end
+    end
+
+    describe 'for constructors with a custom name' do
+      let(:function_info) { get_method_introspection_data 'Regress', 'TestObj', 'new_from_file' }
+      it 'builds a custom initializer' do
+        code.must_equal <<-CODE.reset_indentation
+          def initialize_from_file(x)
+            _v1 = GirFFI::InPointer.from(:utf8, x)
+            _v2 = FFI::MemoryPointer.new(:pointer).write_pointer nil
+            _v3 = Regress::Lib.regress_test_obj_new_from_file _v1, _v2
+            GirFFI::ArgHelper.check_error(_v2)
+            store_pointer(_v3)
+          end
+        CODE
+      end
+    end
+  end
+end

data/test/gir_ffi/builders/interface_builder_test.rb

@@ -1,10 +1,10 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builders::InterfaceBuilder do
-  let(:interface_builder) {
+  let(:interface_builder) do
     GirFFI::Builders::InterfaceBuilder.new(
       get_introspection_data('Regress', 'TestInterface'))
-  }
+  end
 
   describe '#build_class' do
     before do

data/test/gir_ffi/builders/object_builder_test.rb

@@ -1,14 +1,14 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builders::ObjectBuilder do
-  let(:obj_builder) {
+  let(:obj_builder) do
     GirFFI::Builders::ObjectBuilder.new(
       get_introspection_data('Regress', 'TestObj'))
-  }
-  let(:sub_obj_builder) {
+  end
+  let(:sub_obj_builder) do
     GirFFI::Builders::ObjectBuilder.new(
       get_introspection_data('Regress', 'TestSubObj'))
-  }
+  end
 
   describe '#find_signal' do
     it 'finds the signal "test" for TestObj' do
@@ -50,21 +50,9 @@ describe GirFFI::Builders::ObjectBuilder do
     end
 
     it 'raises an error if the property is not found' do
-      proc {
+      proc do
         sub_obj_builder.find_property('this-property-does-not-exist')
-      }.must_raise RuntimeError
-    end
-  end
-
-  describe '#function_definition' do
-    let(:method_info) {
-      get_method_introspection_data 'Regress', 'TestObj', 'instance_method'
-    }
-
-    it 'delegates definition to FunctionBuilder' do
-      code = obj_builder.send :function_definition, method_info
-      expected = GirFFI::Builders::FunctionBuilder.new(method_info).generate
-      code.must_equal expected
+      end.must_raise RuntimeError
     end
   end
 

data/test/gir_ffi/builders/property_builder_test.rb

@@ -56,11 +56,11 @@ describe GirFFI::Builders::PropertyBuilder do
   end
 
   describe 'for a property of type :strv' do
-    let(:property_info) {
+    let(:property_info) do
       get_property_introspection_data('GIMarshallingTests',
                                       'PropertiesObject',
                                       'some-strv')
-    }
+    end
     before do
       skip unless property_info
     end

data/test/gir_ffi/builders/return_value_builder_test.rb

@@ -3,18 +3,15 @@ require 'gir_ffi_test_helper'
 describe GirFFI::Builders::ReturnValueBuilder do
   let(:var_gen) { GirFFI::VariableNameGenerator.new }
   let(:return_type_info) { GirFFI::ReturnValueInfo.new(type_info, :nothing, false) }
-  let(:for_constructor) { false }
-  let(:builder) {
-    GirFFI::Builders::ReturnValueBuilder.new(var_gen,
-                                             return_type_info,
-                                             for_constructor)
-  }
+  let(:builder) do
+    GirFFI::Builders::ReturnValueBuilder.new(var_gen, return_type_info)
+  end
 
   describe 'for :gint32' do
-    let(:type_info) {
+    let(:type_info) do
       get_introspection_data('GIMarshallingTests',
                              'int_return_min').return_type
-    }
+    end
 
     it 'has no statements in #post_conversion' do
       builder.post_conversion.must_equal []
@@ -27,11 +24,11 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :struct' do
-    let(:type_info) {
+    let(:type_info) do
       get_method_introspection_data('GIMarshallingTests',
                                     'BoxedStruct',
                                     'returnv').return_type
-    }
+    end
 
     it 'wraps the result in #post_conversion' do
       builder.capture_variable_name.must_equal '_v1'
@@ -45,11 +42,11 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :union' do
-    let(:type_info) {
+    let(:type_info) do
       get_method_introspection_data('GIMarshallingTests',
                                     'Union',
                                     'returnv').return_type
-    }
+    end
 
     it 'wraps the result in #post_conversion' do
       builder.capture_variable_name.must_equal '_v1'
@@ -63,11 +60,11 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :interface' do
-    let(:type_info) {
+    let(:type_info) do
       get_method_introspection_data('Gio',
                                     'File',
                                     'new_for_commandline_arg').return_type
-    }
+    end
 
     it 'wraps the result in #post_conversion' do
       builder.capture_variable_name.must_equal '_v1'
@@ -81,51 +78,29 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   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
-      }
-      let(:for_constructor) { false }
-
-      it 'wraps the result in #post_conversion' do
-        builder.capture_variable_name.must_equal '_v1'
-        builder.post_conversion.must_equal ['_v2 = GIMarshallingTests::Object.wrap(_v1)']
-      end
-
-      it 'returns the wrapped result' do
-        builder.capture_variable_name.must_equal '_v1'
-        builder.return_value_name.must_equal '_v2'
-      end
+    let(:type_info) do
+      get_method_introspection_data('GIMarshallingTests',
+                                    'Object',
+                                    'full_return').return_type
     end
 
-    describe 'when the method is a constructor' do
-      let(:type_info) {
-        get_method_introspection_data('GIMarshallingTests',
-                                      'Object',
-                                      'new').return_type
-      }
-      let(:for_constructor) { true }
-
-      it 'wraps the result in #post_conversion' do
-        builder.capture_variable_name.must_equal '_v1'
-        builder.post_conversion.must_equal ['_v2 = self.constructor_wrap(_v1)']
-      end
+    it 'wraps the result in #post_conversion' do
+      builder.capture_variable_name.must_equal '_v1'
+      builder.post_conversion.must_equal ['_v2 = GIMarshallingTests::Object.wrap(_v1)']
+    end
 
-      it 'returns the wrapped result' do
-        builder.capture_variable_name.must_equal '_v1'
-        builder.return_value_name.must_equal '_v2'
-      end
+    it 'returns the wrapped result' do
+      builder.capture_variable_name.must_equal '_v1'
+      builder.return_value_name.must_equal '_v2'
     end
   end
 
   describe 'for :strv' do
-    let(:type_info) {
+    let(:type_info) do
       get_method_introspection_data('GLib',
                                     'KeyFile',
                                     'get_locale_string_list').return_type
-    }
+    end
 
     it 'wraps the result in #post_conversion' do
       builder.capture_variable_name.must_equal '_v1'
@@ -139,11 +114,11 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :zero_terminated' do
-    let(:type_info) {
+    let(:type_info) do
       get_method_introspection_data('GLib',
                                     'Variant',
                                     'dup_bytestring').return_type
-    }
+    end
     before do
       skip unless type_info.zero_terminated?
     end
@@ -160,10 +135,10 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :byte_array' do
-    let(:type_info) {
+    let(:type_info) do
       get_introspection_data('GIMarshallingTests',
                              'bytearray_full_return').return_type
-    }
+    end
 
     it 'wraps the result in #post_conversion' do
       builder.capture_variable_name.must_equal '_v1'
@@ -177,10 +152,10 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :ptr_array' do
-    let(:type_info) {
+    let(:type_info) do
       get_introspection_data('GIMarshallingTests',
                              'gptrarray_utf8_none_return').return_type
-    }
+    end
 
     it 'wraps the result in #post_conversion' do
       builder.capture_variable_name.must_equal '_v1'
@@ -194,10 +169,10 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :glist' do
-    let(:type_info) {
+    let(:type_info) do
       get_introspection_data('GIMarshallingTests',
                              'glist_int_none_return').return_type
-    }
+    end
 
     it 'wraps the result in #post_conversion' do
       builder.capture_variable_name.must_equal '_v1'
@@ -211,10 +186,10 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :gslist' do
-    let(:type_info) {
+    let(:type_info) do
       get_introspection_data('GIMarshallingTests',
                              'gslist_int_none_return').return_type
-    }
+    end
 
     it 'wraps the result in #post_conversion' do
       builder.capture_variable_name.must_equal '_v1'
@@ -228,10 +203,10 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :ghash' do
-    let(:type_info) {
+    let(:type_info) do
       get_introspection_data('GIMarshallingTests',
                              'ghashtable_int_none_return').return_type
-    }
+    end
 
     it 'wraps the result in #post_conversion' do
       builder.capture_variable_name.must_equal '_v1'
@@ -245,10 +220,10 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :array' do
-    let(:type_info) {
+    let(:type_info) do
       get_introspection_data('GIMarshallingTests',
                              'garray_int_none_return').return_type
-    }
+    end
 
     it 'wraps the result in #post_conversion' do
       builder.capture_variable_name.must_equal '_v1'
@@ -262,10 +237,10 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :error' do
-    let(:type_info) {
+    let(:type_info) do
       get_introspection_data('GIMarshallingTests',
                              'gerror_return').return_type
-    }
+    end
 
     it 'wraps the result in #post_conversion' do
       builder.capture_variable_name.must_equal '_v1'
@@ -280,10 +255,10 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
   describe 'for :c' do
     describe 'with fixed size' do
-      let(:type_info) {
+      let(:type_info) do
         get_introspection_data('GIMarshallingTests',
                                'array_fixed_int_return').return_type
-      }
+      end
 
       it 'converts the result in #post_conversion' do
         builder.capture_variable_name.must_equal '_v1'
@@ -298,11 +273,11 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
     describe 'with separate size parameter' do
       let(:length_argument) { Object.new }
-      let(:type_info) {
+      let(:type_info) do
         get_method_introspection_data('GIMarshallingTests',
                                       'Object',
                                       'method_array_return').return_type
-      }
+      end
 
       before do
         allow(length_argument).to receive(:post_converted_name).and_return 'bar'
@@ -322,9 +297,9 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :utf8' do
-    let(:type_info) {
+    let(:type_info) do
       get_introspection_data('GIMarshallingTests', 'utf8_full_return').return_type
-    }
+    end
 
     it 'converts the result in #post_conversion' do
       builder.capture_variable_name.must_equal '_v1'
@@ -338,9 +313,9 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :void pointer' do
-    let(:callback_info) {
+    let(:callback_info) do
       get_introspection_data('GIMarshallingTests', 'CallbackIntInt')
-    }
+    end
     let(:type_info) { callback_info.args[1].argument_type }
 
     before do
@@ -358,9 +333,9 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for :void' do
-    let(:type_info) {
+    let(:type_info) do
       get_method_introspection_data('Regress', 'TestObj', 'null_out').return_type
-    }
+    end
 
     it 'has no statements in #post_conversion' do
       builder.post_conversion.must_equal []
@@ -376,9 +351,9 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for a closure argument' do
-    let(:type_info) {
+    let(:type_info) do
       get_introspection_data('Regress', 'TestCallbackUserData').args[0].argument_type
-    }
+    end
 
     before do
       builder.closure = true
@@ -396,9 +371,9 @@ describe GirFFI::Builders::ReturnValueBuilder do
   end
 
   describe 'for a skipped return value' do
-    let(:type_info) {
+    let(:type_info) do
       get_method_introspection_data('Regress', 'TestObj', 'skip_return_val').return_type
-    }
+    end
     let(:return_type_info) { GirFFI::ReturnValueInfo.new(type_info, :nothing, true) }
 
     it 'has no statements in #post_conversion' do