gir_ffi 0.7.10 → 0.8.0

data/test/gir_ffi/info_ext/i_unresolved_info_test.rb

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

data/test/gir_ffi/info_ext/safe_constant_name_test.rb

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

data/test/gir_ffi/info_ext/safe_function_name_test.rb

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

data/test/gir_ffi/method_stubber_test.rb

@@ -6,9 +6,9 @@ describe GirFFI::MethodStubber do
     let(:result) { stubber.method_stub }
 
     describe 'for a regular method' do
-      let(:method_info) {
+      let(:method_info) do
         get_method_introspection_data('Regress', 'TestObj', 'instance_method')
-      }
+      end
 
       it 'creates a method stub' do
         result.must_equal <<-STUB.reset_indentation
@@ -20,9 +20,9 @@ describe GirFFI::MethodStubber do
     end
 
     describe 'for a static method' do
-      let(:method_info) {
+      let(:method_info) do
         get_method_introspection_data('Regress', 'TestObj', 'static_method')
-      }
+      end
 
       it 'creates a class method stub' do
         result.must_equal <<-STUB.reset_indentation
@@ -34,9 +34,9 @@ describe GirFFI::MethodStubber do
     end
 
     describe 'for a module function' do
-      let(:method_info) {
+      let(:method_info) do
         get_introspection_data('Regress', 'test_int')
-      }
+      end
 
       it 'creates a module method stub' do
         result.must_equal <<-STUB.reset_indentation

data/test/gir_ffi/user_defined_type_info_test.rb

@@ -34,7 +34,7 @@ describe GirFFI::UserDefinedTypeInfo do
 
     it 'stores the passed-in implementation in the implementation object' do
       info.install_vfunc_implementation :foo, implementation
-      impl =  info.vfunc_implementations.first
+      impl = info.vfunc_implementations.first
       impl.implementation.must_equal implementation
     end
   end
@@ -42,12 +42,12 @@ describe GirFFI::UserDefinedTypeInfo do
   describe '#initialize' do
     let(:foo_spec) { Object.new }
     let(:bar_spec) { Object.new }
-    let(:info) {
+    let(:info) do
       GirFFI::UserDefinedTypeInfo.new :some_class do |inf|
         inf.install_property foo_spec
         inf.install_property bar_spec
       end
-    }
+    end
 
     before do
       expect(foo_spec).to receive(:get_name).and_return :foo

data/test/gir_ffi_test_helper.rb

@@ -11,36 +11,36 @@ class Sequence
 end
 
 module GirFFITestExtensions
-  def get_field_introspection_data namespace, klass, name
+  def get_field_introspection_data(namespace, klass, name)
     get_introspection_data(namespace, klass).find_field name
   end
 
-  def get_method_introspection_data namespace, klass, name
+  def get_method_introspection_data(namespace, klass, name)
     get_introspection_data(namespace, klass).find_method name
   end
 
-  def get_property_introspection_data namespace, klass, name
+  def get_property_introspection_data(namespace, klass, name)
     get_introspection_data(namespace, klass).find_property name
   end
 
-  def get_signal_introspection_data namespace, klass, name
+  def get_signal_introspection_data(namespace, klass, name)
     get_introspection_data(namespace, klass).find_signal name
   end
 
-  def get_vfunc_introspection_data namespace, klass, name
+  def get_vfunc_introspection_data(namespace, klass, name)
     get_introspection_data(namespace, klass).find_vfunc name
   end
 
   SAVED_MODULES = {}
 
-  def save_module name
+  def save_module(name)
     return unless Object.const_defined? name
     puts "Saving #{name} over existing" if SAVED_MODULES.key? name
     SAVED_MODULES[name] = Object.const_get name
     Object.send(:remove_const, name)
   end
 
-  def restore_module name
+  def restore_module(name)
     if Object.const_defined? name
       Object.send(:remove_const, name)
     end
@@ -49,23 +49,23 @@ module GirFFITestExtensions
     SAVED_MODULES.delete name
   end
 
-  def ref_count object
+  def ref_count(object)
     GObject::Object::Struct.new(object.to_ptr)[:ref_count]
   end
 
-  def ref object
+  def ref(object)
     object.ref
   end
 
-  def max_for_unsigned_type type
+  def max_for_unsigned_type(type)
     (1 << (FFI.type_size(type) * 8)) - 1
   end
 
-  def max_for_type type
+  def max_for_type(type)
     (1 << (FFI.type_size(type) * 8 - 1)) - 1
   end
 
-  def min_for_type type
+  def min_for_type(type)
     ~max_for_type(type)
   end
 

data/test/integration/derived_classes_test.rb

@@ -33,15 +33,19 @@ describe 'For derived classes' do
   end
 
   describe 'the initializer' do
-    it 'does not have to call super' do
+    it 'works if it calls super' do
       klass = Class.new Regress::TestSubObj do
-        def initialize *_args
+        attr_reader :animal
+        def initialize(animal)
+          super()
+          @animal = animal
         end
       end
 
-      obj = klass.new
+      obj = klass.new 'dog'
       obj.must_be_instance_of klass
       obj.to_ptr.wont_be_nil
+      obj.animal.must_equal 'dog'
     end
   end
 end

data/test/integration/generated_gimarshallingtests_test.rb

@@ -7,10 +7,10 @@ GirFFI.setup :GIMarshallingTests
 
 # Tests generated methods and functions in the GIMarshallingTests namespace.
 describe GIMarshallingTests do
-  let(:derived_klass) {
+  let(:derived_klass) do
     Object.const_set("DerivedClass#{Sequence.next}",
                      Class.new(GIMarshallingTests::Object))
-  }
+  end
 
   def make_derived_instance
     GirFFI.define_type derived_klass do |info|
@@ -1411,9 +1411,9 @@ describe GIMarshallingTests do
   end
 
   it 'has a working function #array_simple_struct_in' do
-    arr = [1, 2, 3].map { |val|
+    arr = [1, 2, 3].map do |val|
       GIMarshallingTests::SimpleStruct.new.tap { |struct| struct.long_ = val }
-    }
+    end
     GIMarshallingTests.array_simple_struct_in arr
   end
 
@@ -1423,25 +1423,25 @@ describe GIMarshallingTests do
   end
 
   it 'has a working function #array_struct_in' do
-    arr = [1, 2, 3].map { |val|
+    arr = [1, 2, 3].map do |val|
       GIMarshallingTests::BoxedStruct.new.tap { |struct| struct.long_ = val }
-    }
+    end
     GIMarshallingTests.array_struct_in arr
   end
 
   # NOTE: Should be run with valgrind. See gimarhallingtests.c.
   it 'has a working function #array_struct_take_in' do
-    arr = [1, 2, 3].map { |val|
+    arr = [1, 2, 3].map do |val|
       GIMarshallingTests::BoxedStruct.new.tap { |struct| struct.long_ = val }
-    }
+    end
     GIMarshallingTests.array_struct_take_in arr
   end
 
   it 'has a working function #array_struct_value_in' do
     skip unless get_introspection_data 'GIMarshallingTests', 'array_struct_value_in'
-    arr = [1, 2, 3].map { |val|
+    arr = [1, 2, 3].map do |val|
       GIMarshallingTests::BoxedStruct.new.tap { |struct| struct.long_ = val }
-    }
+    end
     GIMarshallingTests.array_struct_value_in arr
   end
 

data/test/integration/generated_regress_test.rb

@@ -1764,10 +1764,10 @@ describe Regress do
 
     result.size.must_equal 2
 
-    result.each {|o|
+    result.each do|o|
       assert_instance_of Regress::TestObj, o
       assert_equal gtype, GObject.type_from_instance(o)
-    }
+    end
   end
 
   it 'has a working function #test_array_fixed_size_int_in' do
@@ -1928,10 +1928,8 @@ describe Regress do
 
   it 'has a working function #test_callback_async' do
     a = 1
-    Regress.test_callback_async proc {|b|
-      a = 2
-      b
-    }, 44
+    Regress.test_callback_async(proc { |b| a = 2; b },
+                                44)
     r = Regress.test_callback_thaw_async
     assert_equal 44, r
     assert_equal 2, a
@@ -1939,10 +1937,9 @@ describe Regress do
 
   it 'has a working function #test_callback_destroy_notify' do
     a = 1
-    r1 = Regress.test_callback_destroy_notify proc {|b|
-      a = 2
-      b
-    }, 42, proc { a = 3 }
+    r1 = Regress.test_callback_destroy_notify(proc { |b| a = 2; b },
+                                              42,
+                                              proc { a = 3 })
     assert_equal 2, a
     assert_equal 42, r1
     r2 = Regress.test_callback_thaw_notifications
@@ -1957,11 +1954,11 @@ describe Regress do
     notify_times_called = 0
     b = :not_nil
 
-    callback = proc {|user_data|
+    callback = proc do|user_data|
       callback_times_called += 1
       b = user_data
       callback_times_called * 5
-    }
+    end
 
     notify = proc { notify_times_called += 1 }
 
@@ -2001,10 +1998,7 @@ describe Regress do
 
   it 'has a working function #test_callback_user_data' do
     a = 'old-value'
-    result = Regress.test_callback_user_data proc {|u|
-      a = u
-      5
-    }, 'new-value'
+    result = Regress.test_callback_user_data proc { |u| a = u; 5 }, 'new-value'
     a.must_equal 'new-value'
     result.must_equal 5
   end
@@ -2012,10 +2006,7 @@ describe Regress do
   describe 'the #test_callback_user_data function' do
     it 'handles boolean user_data' do
       a = false
-      Regress.test_callback_user_data proc {|u|
-        a = u
-        5
-      }, true
+      Regress.test_callback_user_data proc { |u| a = u; 5 }, true
       assert_equal true, a
     end
   end

data/test/introspection_test_helper.rb

@@ -3,7 +3,7 @@ require 'base_test_helper'
 require 'ffi-gobject_introspection'
 
 module IntrospectionTestExtensions
-  def get_introspection_data namespace, name
+  def get_introspection_data(namespace, name)
     gir = GObjectIntrospection::IRepository.default
     gir.require namespace, nil
     gir.find_by_name namespace, name

data/test/minitest/stats_plugin.rb

@@ -1,6 +1,6 @@
 module Minitest
   class StatsReporter < AbstractReporter
-    def initialize _options
+    def initialize(_options)
       @results = []
     end
 
@@ -8,7 +8,7 @@ module Minitest
       @current_time = Time.now
     end
 
-    def record result
+    def record(result)
       @results << result
     end
 
@@ -20,7 +20,7 @@ module Minitest
     end
   end
 
-  def self.plugin_stats_init options
+  def self.plugin_stats_init(options)
     reporter << StatsReporter.new(options)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.8.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -165,6 +165,7 @@ files:
 - lib/gir_ffi/builders/argument_builder.rb
 - lib/gir_ffi/builders/argument_builder_collection.rb
 - lib/gir_ffi/builders/base_argument_builder.rb
+- lib/gir_ffi/builders/base_method_builder.rb
 - lib/gir_ffi/builders/base_type_builder.rb
 - lib/gir_ffi/builders/boxed_builder.rb
 - lib/gir_ffi/builders/c_to_ruby_convertor.rb
@@ -175,17 +176,20 @@ files:
 - lib/gir_ffi/builders/closure_convertor.rb
 - lib/gir_ffi/builders/closure_to_pointer_convertor.rb
 - lib/gir_ffi/builders/constant_builder.rb
-- lib/gir_ffi/builders/constructor_result_convertor.rb
+- lib/gir_ffi/builders/constructor_builder.rb
 - lib/gir_ffi/builders/enum_builder.rb
 - lib/gir_ffi/builders/error_argument_builder.rb
 - lib/gir_ffi/builders/field_builder.rb
 - lib/gir_ffi/builders/function_builder.rb
+- lib/gir_ffi/builders/initializer_builder.rb
+- lib/gir_ffi/builders/initializer_return_value_builder.rb
 - lib/gir_ffi/builders/interface_builder.rb
 - lib/gir_ffi/builders/mapping_method_builder.rb
 - lib/gir_ffi/builders/marshalling_method_builder.rb
 - lib/gir_ffi/builders/method_template.rb
 - lib/gir_ffi/builders/module_builder.rb
 - lib/gir_ffi/builders/null_convertor.rb
+- lib/gir_ffi/builders/null_return_value_builder.rb
 - lib/gir_ffi/builders/object_builder.rb
 - lib/gir_ffi/builders/property_builder.rb
 - lib/gir_ffi/builders/registered_type_builder.rb
@@ -289,9 +293,11 @@ files:
 - test/gir_ffi/builders/callback_builder_test.rb
 - test/gir_ffi/builders/callback_return_value_builder_test.rb
 - test/gir_ffi/builders/constant_builder_test.rb
+- test/gir_ffi/builders/constructor_builder_test.rb
 - test/gir_ffi/builders/enum_builder_test.rb
 - test/gir_ffi/builders/field_builder_test.rb
 - test/gir_ffi/builders/function_builder_test.rb
+- test/gir_ffi/builders/initializer_builder_test.rb
 - test/gir_ffi/builders/interface_builder_test.rb
 - test/gir_ffi/builders/module_builder_test.rb
 - test/gir_ffi/builders/object_builder_test.rb

data/lib/gir_ffi/builders/constructor_result_convertor.rb

@@ -1,14 +0,0 @@
-module GirFFI
-  module Builders
-    # Builds conversion code for the result of a GObject constructor method.
-    class ConstructorResultConvertor
-      def initialize argument_name
-        @argument_name = argument_name
-      end
-
-      def conversion
-        "self.constructor_wrap(#{@argument_name})"
-      end
-    end
-  end
-end