gir_ffi 0.7.10 → 0.8.0

data/test/gir_ffi/builders/signal_closure_builder_test.rb

@@ -4,9 +4,9 @@ describe GirFFI::Builders::SignalClosureBuilder do
   let(:builder) { GirFFI::Builders::SignalClosureBuilder.new signal_info }
 
   describe '#build_class' do
-    let(:signal_info) {
+    let(:signal_info) do
       get_signal_introspection_data 'Regress', 'TestObj', 'test'
-    }
+    end
 
     it 'builds a descendant of RubyClosure' do
       klass = builder.build_class
@@ -16,9 +16,9 @@ describe GirFFI::Builders::SignalClosureBuilder do
 
   describe '#marshaller_definition' do
     describe 'for a signal with no arguments or return value' do
-      let(:signal_info) {
+      let(:signal_info) do
         get_signal_introspection_data 'Regress', 'TestObj', 'test'
-      }
+      end
 
       it 'returns a valid marshaller converting only the receiver' do
         expected = <<-CODE.reset_indentation
@@ -34,9 +34,9 @@ describe GirFFI::Builders::SignalClosureBuilder do
     end
 
     describe 'for a signal with an argument and a return value' do
-      let(:signal_info) {
+      let(:signal_info) do
         get_signal_introspection_data 'Regress', 'TestObj', 'sig-with-int64-prop'
-      }
+      end
 
       it 'returns a valid mapping method' do
         skip unless signal_info
@@ -56,9 +56,9 @@ describe GirFFI::Builders::SignalClosureBuilder do
     end
 
     describe 'for a signal with an enum argument' do
-      let(:signal_info) {
+      let(:signal_info) do
         get_signal_introspection_data 'Gio', 'MountOperation', 'reply'
-      }
+      end
 
       it 'returns a valid mapping method' do
         expected = <<-CODE.reset_indentation
@@ -75,9 +75,9 @@ describe GirFFI::Builders::SignalClosureBuilder do
     end
 
     describe 'for a signal with a array plus length arguments' do
-      let(:signal_info) {
+      let(:signal_info) do
         get_signal_introspection_data 'Regress', 'TestObj', 'sig-with-array-len-prop'
-      }
+      end
 
       it 'returns a valid mapping method' do
         skip unless signal_info
@@ -97,9 +97,9 @@ describe GirFFI::Builders::SignalClosureBuilder do
     end
 
     describe 'for a signal with a struct argument' do
-      let(:signal_info) {
+      let(:signal_info) do
         get_signal_introspection_data 'Regress', 'TestObj', 'test-with-static-scope-arg'
-      }
+      end
 
       it 'returns a valid mapping method' do
         skip unless signal_info
@@ -118,9 +118,9 @@ describe GirFFI::Builders::SignalClosureBuilder do
     end
 
     describe 'for a signal returning an array of integers' do
-      let(:signal_info) {
+      let(:signal_info) do
         get_signal_introspection_data 'Regress', 'TestObj', 'sig-with-intarray-ret'
-      }
+      end
 
       it 'returns a valid mapping method' do
         skip unless signal_info

data/test/gir_ffi/builders/user_defined_builder_test.rb

@@ -3,10 +3,10 @@ require 'gir_ffi_test_helper'
 GirFFI.setup :GIMarshallingTests
 
 describe GirFFI::Builders::UserDefinedBuilder do
-  let(:klass) {
+  let(:klass) do
     Object.const_set("DerivedClass#{Sequence.next}",
                      Class.new(GIMarshallingTests::Object))
-  }
+  end
   let(:builder) { GirFFI::Builders::UserDefinedBuilder.new info }
   let(:info) { GirFFI::UserDefinedTypeInfo.new klass }
 
@@ -16,14 +16,14 @@ describe GirFFI::Builders::UserDefinedBuilder do
     end
 
     describe 'with type info containing one property' do
-      let(:info) {
+      let(:info) do
         GirFFI::UserDefinedTypeInfo.new klass do |it|
           it.install_property GObject.param_spec_int('foo', 'foo bar',
                                                      'The Foo Bar Property',
                                                      10, 20, 15,
                                                      3)
         end
-      }
+      end
 
       it 'registers a type that is bigger than the parent' do
         gtype = klass.gtype
@@ -55,11 +55,11 @@ describe GirFFI::Builders::UserDefinedBuilder do
     end
 
     describe 'with type info containing an overridden g_name' do
-      let(:info) {
+      let(:info) do
         GirFFI::UserDefinedTypeInfo.new klass do |it|
           it.g_name = "OtherName#{Sequence.next}"
         end
-      }
+      end
 
       it 'registers a type under the overridden name' do
         registered_name = GObject.type_name(klass.gtype)
@@ -69,13 +69,13 @@ describe GirFFI::Builders::UserDefinedBuilder do
     end
 
     describe 'with type info containing a vfunc' do
-      let(:info) {
+      let(:info) do
         GirFFI::UserDefinedTypeInfo.new klass do |it|
           it.install_vfunc_implementation :method_int8_in, proc {|instance, in_|
             instance.int = in_
           }
         end
-      }
+      end
 
       it 'allows the vfunc to be called through its invoker' do
         obj = klass.new

data/test/gir_ffi/builders/vfunc_builder_test.rb

@@ -11,9 +11,9 @@ describe GirFFI::Builders::VFuncBuilder do
     end
 
     describe 'for a vfunc with only one argument' do
-      let(:vfunc_info) {
+      let(:vfunc_info) do
         get_vfunc_introspection_data 'GIMarshallingTests', 'Object', 'method_int8_in'
-      }
+      end
 
       it 'returns a valid mapping method including receiver' do
         expected = <<-CODE.reset_indentation
@@ -29,9 +29,9 @@ describe GirFFI::Builders::VFuncBuilder do
     end
 
     describe 'for a vfunc returning an enum' do
-      let(:vfunc_info) {
+      let(:vfunc_info) do
         get_vfunc_introspection_data 'GIMarshallingTests', 'Object', 'vfunc_return_enum'
-      }
+      end
 
       it 'returns a valid mapping method including receiver' do
         expected = <<-CODE.reset_indentation
@@ -48,9 +48,9 @@ describe GirFFI::Builders::VFuncBuilder do
     end
 
     describe 'for a vfunc with a callback argument' do
-      let(:vfunc_info) {
+      let(:vfunc_info) do
         get_vfunc_introspection_data 'GIMarshallingTests', 'Object', 'vfunc_with_callback'
-      }
+      end
 
       it 'returns a valid mapping method including receiver' do
         expected = <<-CODE.reset_indentation
@@ -67,10 +67,10 @@ describe GirFFI::Builders::VFuncBuilder do
     end
 
     describe 'for a vfunc with an out argument allocated by them, the caller' do
-      let(:vfunc_info) {
+      let(:vfunc_info) do
         get_vfunc_introspection_data('GIMarshallingTests', 'Object',
                                      'method_int8_arg_and_out_caller')
-      }
+      end
 
       it 'returns a valid mapping method including receiver' do
         expected = <<-CODE.reset_indentation
@@ -88,10 +88,10 @@ describe GirFFI::Builders::VFuncBuilder do
     end
 
     describe 'for a vfunc with an out argument allocated by us, the callee' do
-      let(:vfunc_info) {
+      let(:vfunc_info) do
         get_vfunc_introspection_data('GIMarshallingTests', 'Object',
                                      'method_int8_arg_and_out_callee')
-      }
+      end
 
       it 'returns a valid mapping method including receiver' do
         expected = <<-CODE.reset_indentation
@@ -109,10 +109,10 @@ describe GirFFI::Builders::VFuncBuilder do
     end
 
     describe 'for a vfunc with an error argument' do
-      let(:vfunc_info) {
+      let(:vfunc_info) do
         get_vfunc_introspection_data('GIMarshallingTests', 'Object',
                                      'vfunc_meth_with_err')
-      }
+      end
 
       it 'returns a valid mapping method including receiver' do
         expected = <<-CODE.reset_indentation
@@ -134,9 +134,9 @@ describe GirFFI::Builders::VFuncBuilder do
     end
 
     describe 'for a vfunc with a full-transfer return value' do
-      let(:vfunc_info) {
+      let(:vfunc_info) do
         get_vfunc_introspection_data 'GIMarshallingTests', 'Object', 'vfunc_return_object_transfer_full'
-      }
+      end
 
       it 'returns a valid mapping method' do
         expected = <<-CODE.reset_indentation
@@ -153,9 +153,9 @@ describe GirFFI::Builders::VFuncBuilder do
     end
 
     describe 'for a vfunc with a transfer-none in argument' do
-      let(:vfunc_info) {
+      let(:vfunc_info) do
         get_vfunc_introspection_data 'GIMarshallingTests', 'Object', 'vfunc_in_object_transfer_none'
-      }
+      end
 
       it 'returns a valid mapping method' do
         expected = <<-CODE.reset_indentation
@@ -172,9 +172,9 @@ describe GirFFI::Builders::VFuncBuilder do
     end
 
     describe 'for a vfunc with a full-transfer outgoing argument' do
-      let(:vfunc_info) {
+      let(:vfunc_info) do
         get_vfunc_introspection_data 'GIMarshallingTests', 'Object', 'vfunc_out_object_transfer_full'
-      }
+      end
 
       it 'returns a valid mapping method' do
         expected = <<-CODE.reset_indentation
@@ -199,9 +199,9 @@ describe GirFFI::Builders::VFuncBuilder do
     end
 
     describe 'for a vfunc with only one argument' do
-      let(:vfunc_info) {
+      let(:vfunc_info) do
         get_vfunc_introspection_data 'GIMarshallingTests', 'Object', 'method_int8_in'
-      }
+      end
 
       it 'returns the correct FFI types including :pointer for the receiver' do
         result.must_equal [:pointer, :int8]
@@ -217,9 +217,9 @@ describe GirFFI::Builders::VFuncBuilder do
     end
 
     describe 'for a vfunc returning an object' do
-      let(:vfunc_info) {
+      let(:vfunc_info) do
         get_vfunc_introspection_data 'GIMarshallingTests', 'Object', 'vfunc_return_object_transfer_full'
-      }
+      end
 
       it 'returns :pointer' do
         result.must_equal :pointer

data/test/gir_ffi/class_base_test.rb

@@ -2,13 +2,13 @@ require 'gir_ffi_test_helper'
 
 describe GirFFI::ClassBase do
   describe 'a simple descendant' do
-    let(:klass) {
+    let(:klass) do
       Class.new(GirFFI::ClassBase) do
         self::Struct = Class.new(FFI::Struct) do
           layout :foo, :int32
         end
       end
-    }
+    end
     let(:object) { klass.wrap FFI::MemoryPointer.new(:int32) }
 
     it 'has #from as a pass-through method' do
@@ -91,8 +91,9 @@ describe GirFFI::ClassBase do
         def self.bar
           'correct-result'
         end
+
         def self.new
-          _real_new
+          allocate
         end
       end
       klass.const_set :GIR_FFI_BUILDER, builder
@@ -110,11 +111,11 @@ describe GirFFI::ClassBase do
 
       expect(sub_builder = Object.new).to receive(:setup_instance_method).with('foo').and_return nil
       sub_klass = Class.new klass do
-        def foo; end
+        def foo
+        end
 
-        def initialize; end
         def self.new
-          _real_new
+          allocate
         end
       end
       sub_klass.const_set :GIR_FFI_BUILDER, sub_builder
@@ -130,8 +131,9 @@ describe GirFFI::ClassBase do
         def bar
           'correct-result'
         end
+
         def self.new
-          _real_new
+          allocate
         end
       end
       klass.const_set :GIR_FFI_BUILDER, builder

data/test/gir_ffi/in_pointer_test.rb

@@ -147,7 +147,7 @@ describe GirFFI::InPointer do
     it 'handles enum types' do
       e = Module.new do
         self::Enum = FFI::Enum.new [:foo, :bar, :baz], :qux
-        def self.[] val
+        def self.[](val)
           self::Enum[val]
         end
       end

data/test/gir_ffi/info_ext/i_callable_info_test.rb

@@ -1,11 +1,11 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::ICallableInfo do
-  let(:klass) {
+  let(:klass) do
     Class.new do
       include GirFFI::InfoExt::ICallableInfo
     end
-  }
+  end
   let(:callable_info) { klass.new }
 
   describe '#argument_ffi_types' do

data/test/gir_ffi/info_ext/i_callback_info_test.rb

@@ -1,11 +1,11 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::ICallbackInfo do
-  let(:klass) {
+  let(:klass) do
     Class.new do
       include GirFFI::InfoExt::ICallbackInfo
     end
-  }
+  end
   let(:callback_info) { klass.new }
 
   describe '#return_ffi_type' do

data/test/gir_ffi/info_ext/i_field_info_test.rb

@@ -1,11 +1,11 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::IFieldInfo do
-  let(:klass) {
+  let(:klass) do
     Class.new do
       include GirFFI::InfoExt::IFieldInfo
     end
-  }
+  end
   let(:field_info) { klass.new }
   describe '#layout_specification' do
     it 'returns an array of name, typespec and offset' do

data/test/gir_ffi/info_ext/i_function_info_test.rb

@@ -1,12 +1,12 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::IFunctionInfo do
-  let(:klass) {
+  let(:klass) do
     Class.new do
       include GirFFI::InfoExt::ICallableInfo
       include GirFFI::InfoExt::IFunctionInfo
     end
-  }
+  end
   let(:function_info) { klass.new }
 
   describe '#argument_ffi_types' do

data/test/gir_ffi/info_ext/i_signal_info_test.rb

@@ -3,12 +3,12 @@ require 'gir_ffi_test_helper'
 GirFFI.setup :Regress
 
 describe GirFFI::InfoExt::ISignalInfo do
-  let(:klass) {
+  let(:klass) do
     Class.new do
       include GirFFI::InfoExt::ICallableInfo
       include GirFFI::InfoExt::ISignalInfo
     end
-  }
+  end
   let(:signal_info) { klass.new }
 
   describe '#arguments_to_gvalues' do

data/test/gir_ffi/info_ext/i_type_info_test.rb

@@ -1,11 +1,11 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::ITypeInfo do
-  let(:klass) {
+  let(:klass) do
     Class.new do
       include GirFFI::InfoExt::ITypeInfo
     end
-  }
+  end
 
   let(:type_info) { klass.new }
   let(:elmtype_info) { klass.new }
@@ -13,13 +13,13 @@ describe GirFFI::InfoExt::ITypeInfo do
   let(:valtype_info) { klass.new }
   let(:iface_info) { Object.new }
 
-  let(:callback_type_info) {
+  let(:callback_type_info) do
     get_introspection_data('Regress', 'test_callback').args[0].argument_type
-  }
-  let(:ghash_type_info) {
+  end
+  let(:ghash_type_info) do
     get_introspection_data('Regress',
                            'test_ghash_nested_everything_return').return_type
-  }
+  end
 
   describe '#to_ffi_type' do
     it 'returns an array with elements subtype and size for type :array' do
@@ -569,7 +569,7 @@ describe GirFFI::InfoExt::ITypeInfo do
     end
   end
 
-  describe '#g_type' do
+  describe '#gtype' do
     before do
       allow(type_info).to receive(:tag).and_return tag
       allow(type_info).to receive(:pointer?).and_return pointer?
@@ -580,7 +580,7 @@ describe GirFFI::InfoExt::ITypeInfo do
       let(:pointer?) { false }
 
       it 'equals the none type' do
-        GObject.type_name(type_info.g_type).must_equal 'void'
+        GObject.type_name(type_info.gtype).must_equal 'void'
       end
     end
 
@@ -589,7 +589,7 @@ describe GirFFI::InfoExt::ITypeInfo do
       let(:pointer?) { false }
 
       it 'equals the gboolean type' do
-        GObject.type_name(type_info.g_type).must_equal 'gboolean'
+        GObject.type_name(type_info.gtype).must_equal 'gboolean'
       end
     end
 
@@ -598,7 +598,7 @@ describe GirFFI::InfoExt::ITypeInfo do
       let(:pointer?) { false }
 
       it 'equals the gint type' do
-        GObject.type_name(type_info.g_type).must_equal 'gint'
+        GObject.type_name(type_info.gtype).must_equal 'gint'
       end
     end
 
@@ -607,7 +607,7 @@ describe GirFFI::InfoExt::ITypeInfo do
       let(:pointer?) { false }
 
       it 'equals the gint64 type' do
-        GObject.type_name(type_info.g_type).must_equal 'gint64'
+        GObject.type_name(type_info.gtype).must_equal 'gint64'
       end
     end
 
@@ -616,7 +616,7 @@ describe GirFFI::InfoExt::ITypeInfo do
       let(:pointer?) { false }
 
       it 'equals the guint64 type' do
-        GObject.type_name(type_info.g_type).must_equal 'guint64'
+        GObject.type_name(type_info.gtype).must_equal 'guint64'
       end
     end
 
@@ -625,7 +625,7 @@ describe GirFFI::InfoExt::ITypeInfo do
       let(:pointer?) { true }
 
       it 'equals the gchararray type' do
-        GObject.type_name(type_info.g_type).must_equal 'gchararray'
+        GObject.type_name(type_info.gtype).must_equal 'gchararray'
       end
     end
 
@@ -634,7 +634,7 @@ describe GirFFI::InfoExt::ITypeInfo do
       let(:pointer?) { true }
 
       it 'equals the GHashTable type' do
-        GObject.type_name(type_info.g_type).must_equal 'GHashTable'
+        GObject.type_name(type_info.gtype).must_equal 'GHashTable'
       end
     end
 
@@ -649,7 +649,7 @@ describe GirFFI::InfoExt::ITypeInfo do
         end
 
         it 'equals the GArray type' do
-          GObject.type_name(type_info.g_type).must_equal 'GArray'
+          GObject.type_name(type_info.gtype).must_equal 'GArray'
         end
       end
 
@@ -660,7 +660,7 @@ describe GirFFI::InfoExt::ITypeInfo do
         end
 
         it 'equals the gpointer type' do
-          GObject.type_name(type_info.g_type).must_equal 'gpointer'
+          GObject.type_name(type_info.gtype).must_equal 'gpointer'
         end
       end
 
@@ -675,7 +675,7 @@ describe GirFFI::InfoExt::ITypeInfo do
             allow(elmtype_info).to receive(:tag).and_return :utf8
             allow(elmtype_info).to receive(:pointer?).and_return true
 
-            GObject.type_name(type_info.g_type).must_equal 'GStrv'
+            GObject.type_name(type_info.gtype).must_equal 'GStrv'
           end
         end
 
@@ -684,7 +684,7 @@ describe GirFFI::InfoExt::ITypeInfo do
             allow(elmtype_info).to receive(:tag).and_return :filename
             allow(elmtype_info).to receive(:pointer?).and_return true
 
-            GObject.type_name(type_info.g_type).must_equal 'GStrv'
+            GObject.type_name(type_info.gtype).must_equal 'GStrv'
           end
         end
       end