gir_ffi 0.7.7 → 0.7.8

data/test/gir_ffi/zero_terminated_test.rb

@@ -1,21 +1,21 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::ZeroTerminated do
-  describe ".from" do
+  describe '.from' do
     let(:result) { GirFFI::ZeroTerminated.from :int32, [1, 2, 3] }
 
-    it "converts the passed array into a zero-terminated c array" do
+    it 'converts the passed array into a zero-terminated c array' do
       ptr = result.to_ptr
       ptr.read_array_of_int32(4).must_equal [1, 2, 3, 0]
     end
 
-    it "returns a GirFFI::ZeroTerminated object" do
+    it 'returns a GirFFI::ZeroTerminated object' do
       result.must_be_instance_of GirFFI::ZeroTerminated
     end
   end
 
-  describe ".wrap" do
-    it "wraps the given type and pointer" do
+  describe '.wrap' do
+    it 'wraps the given type and pointer' do
       ptr = GirFFI::InPointer.from_array :int32, [1, 2, 3, 0]
       zt = GirFFI::ZeroTerminated.wrap :foo, ptr
       zt.element_type.must_equal :foo
@@ -23,8 +23,8 @@ describe GirFFI::ZeroTerminated do
     end
   end
 
-  describe "#each" do
-    it "yields each element" do
+  describe '#each' do
+    it 'yields each element' do
       zt = GirFFI::ZeroTerminated.from :int32, [1, 2, 3]
       arr = []
       zt.each do |int|
@@ -33,14 +33,14 @@ describe GirFFI::ZeroTerminated do
       arr.must_equal [1, 2, 3]
     end
 
-    it "yields zero times for a ZeroTerminated wrapping a null pointer" do
+    it 'yields zero times for a ZeroTerminated wrapping a null pointer' do
       zt = GirFFI::ZeroTerminated.wrap :int32, FFI::Pointer.new(0)
-      zt.each do |str|
+      zt.each do |_str|
         flunk
       end
     end
 
-    it "works for :int8" do
+    it 'works for :int8' do
       zt = GirFFI::ZeroTerminated.from :int8, [1, 2, 3]
       arr = []
       zt.each do |int|
@@ -51,27 +51,27 @@ describe GirFFI::ZeroTerminated do
 
   end
 
-  describe "#==" do
-    it "returns true when comparing to an array with the same elements" do
+  describe '#==' do
+    it 'returns true when comparing to an array with the same elements' do
       zero_terminated = GirFFI::ZeroTerminated.from :int32, [1, 2, 3]
 
       (zero_terminated == [1, 2, 3]).must_equal true
     end
 
-    it "returns false when comparing to an array with different elements" do
+    it 'returns false when comparing to an array with different elements' do
       zero_terminated = GirFFI::ZeroTerminated.from :int32, [1, 2, 3]
 
       (zero_terminated == [1, 2]).must_equal false
     end
 
-    it "returns true when comparing to a zero-terminated array with the same elements" do
+    it 'returns true when comparing to a zero-terminated array with the same elements' do
       zero_terminated = GirFFI::ZeroTerminated.from :int32, [1, 2, 3]
       other = GirFFI::ZeroTerminated.from :int32, [1, 2, 3]
 
       (zero_terminated == other).must_equal true
     end
 
-    it "returns false when comparing to a zero-terminated array with different elements" do
+    it 'returns false when comparing to a zero-terminated array with different elements' do
       zero_terminated = GirFFI::ZeroTerminated.from :int32, [1, 2, 3]
       other = GirFFI::ZeroTerminated.from :int32, [1, 2]
 
@@ -79,8 +79,7 @@ describe GirFFI::ZeroTerminated do
     end
   end
 
-  it "includes Enumerable" do
+  it 'includes Enumerable' do
     GirFFI::ZeroTerminated.must_include Enumerable
   end
 end
-

data/test/gir_ffi-base/glib/boolean_test.rb

@@ -1,32 +1,32 @@
 require 'gir_ffi_test_helper'
 
 describe GLib::Boolean do
-  it "has the same native size as an int" do
+  it 'has the same native size as an int' do
     FFI.type_size(GLib::Boolean).must_equal FFI.type_size :int
   end
 
-  describe ".from_native" do
-    it "converts 0 to false" do
-      GLib::Boolean.from_native(0, "whatever").must_equal false
+  describe '.from_native' do
+    it 'converts 0 to false' do
+      GLib::Boolean.from_native(0, 'whatever').must_equal false
     end
 
-    it "converts 1 to true" do
-      GLib::Boolean.from_native(1, "whatever").must_equal true
+    it 'converts 1 to true' do
+      GLib::Boolean.from_native(1, 'whatever').must_equal true
     end
   end
 
-  describe ".to_native" do
-    it "converts false to 0" do
-      GLib::Boolean.to_native(false, "whatever").must_equal 0
+  describe '.to_native' do
+    it 'converts false to 0' do
+      GLib::Boolean.to_native(false, 'whatever').must_equal 0
     end
 
-    it "converts true to 1" do
-      GLib::Boolean.to_native(true, "whatever").must_equal 1
+    it 'converts true to 1' do
+      GLib::Boolean.to_native(true, 'whatever').must_equal 1
     end
   end
 
-  describe ".size" do
-    it "returns the correct type size" do
+  describe '.size' do
+    it 'returns the correct type size' do
       GLib::Boolean.size.must_equal FFI.type_size :int
     end
   end

data/test/gir_ffi-base/glib/strv_test.rb

@@ -1,23 +1,23 @@
 require 'base_test_helper'
 
 describe GLib::Strv do
-  it "wraps a pointer" do
+  it 'wraps a pointer' do
     strv = GLib::Strv.new :some_pointer
     assert_equal :some_pointer, strv.to_ptr
   end
 
-  describe "::wrap" do
-    it "takes a pointer and returns a GLib::Strv wrapping it" do
+  describe '::wrap' do
+    it 'takes a pointer and returns a GLib::Strv wrapping it' do
       strv = GLib::Strv.wrap :some_pointer
       assert_instance_of GLib::Strv, strv
       assert_equal :some_pointer, strv.to_ptr
     end
   end
 
-  describe "#each" do
-    it "yields each string element" do
-      ary = ["one", "two", "three"]
-      ptrs = ary.map {|a| FFI::MemoryPointer.from_string(a)}
+  describe '#each' do
+    it 'yields each string element' do
+      ary = %w(one two three)
+      ptrs = ary.map { |a| FFI::MemoryPointer.from_string(a) }
       ptrs << nil
       block = FFI::MemoryPointer.new(:pointer, ptrs.length)
       block.write_array_of_pointer ptrs
@@ -27,18 +27,18 @@ describe GLib::Strv do
       strv.each do |str|
         arr << str
       end
-      assert_equal ["one", "two", "three"], arr
+      assert_equal %w(one two three), arr
     end
 
-    it "yields zero times for a Strv wrapping a null pointer" do
+    it 'yields zero times for a Strv wrapping a null pointer' do
       strv = GLib::Strv.new FFI::Pointer.new(0)
-      strv.each do |str|
+      strv.each do |_str|
         flunk
       end
     end
   end
 
-  it "includes Enumerable" do
+  it 'includes Enumerable' do
     GLib::Strv.must_include Enumerable
   end
 end

data/test/gir_ffi_test.rb

@@ -3,19 +3,19 @@ require 'gir_ffi_test_helper'
 GirFFI.setup :GIMarshallingTests
 
 describe GirFFI do
-  it "sets up cairo as Cairo" do
+  it 'sets up cairo as Cairo' do
     GirFFI.setup :cairo
     assert Object.const_defined?(:Cairo)
   end
 
-  it "sets up xlib, which has no shared library" do
+  it 'sets up xlib, which has no shared library' do
     gir = GObjectIntrospection::IRepository.default
     gir.require 'xlib'
-    assert_nil gir.shared_library('xlib'), "Precondition for test failed"
+    assert_nil gir.shared_library('xlib'), 'Precondition for test failed'
     GirFFI.setup :xlib
   end
 
-  it "sets up dependencies" do
+  it 'sets up dependencies' do
     save_module :GObject
     save_module :Regress
     GirFFI.setup :Regress
@@ -24,67 +24,67 @@ describe GirFFI do
     restore_module :GObject
   end
 
-  describe "::define_type" do
-    describe "without a block" do
+  describe '::define_type' do
+    describe 'without a block' do
       before do
         @klass = Class.new GIMarshallingTests::OverridesObject
         Object.const_set "DerivedA#{Sequence.next}", @klass
         @gtype = GirFFI.define_type @klass
       end
 
-      it "returns a GType for the derived class" do
+      it 'returns a GType for the derived class' do
         parent_gtype = GIMarshallingTests::OverridesObject.get_gtype
         @gtype.wont_equal parent_gtype
         GObject.type_name(@gtype).must_equal @klass.name
       end
 
-      it "makes #get_gtype on the registered class return the new GType" do
+      it 'makes #get_gtype on the registered class return the new GType' do
         @klass.get_gtype.must_equal @gtype
       end
 
-      it "registers a type with the same size as the parent" do
+      it 'registers a type with the same size as the parent' do
         q = GObject.type_query @gtype
         q.instance_size.must_equal GIMarshallingTests::OverridesObject::Struct.size
       end
 
-      it "creates a struct class for the derived class with just one member" do
+      it 'creates a struct class for the derived class with just one member' do
         @klass::Struct.members.must_equal [:parent]
       end
 
-      it "allows the new class to be instantiated" do
+      it 'allows the new class to be instantiated' do
         obj = @klass.new
         type = GObject.type_from_instance obj
         type.must_equal @gtype
       end
 
-      it "makes GirFFI find the new class by GType" do
+      it 'makes GirFFI find the new class by GType' do
         klass = GirFFI::Builder.build_by_gtype @gtype
         klass.must_equal @klass
       end
     end
 
-    describe "with a block with a call to #install_property" do
+    describe 'with a block with a call to #install_property' do
       before do
         @klass = Class.new GIMarshallingTests::OverridesObject
         Object.const_set "DerivedB#{Sequence.next}", @klass
         @gtype = GirFFI.define_type @klass do |info|
-          info.install_property GObject.param_spec_int("foo", "foo bar",
-                                                       "The Foo Bar Property",
+          info.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
+      it 'registers a type that is bigger than the parent' do
         q = GObject.type_query @gtype
         q.instance_size.must_be :>, GIMarshallingTests::OverridesObject::Struct.size
       end
 
-      it "gives the types Struct the fields :parent and :foo" do
+      it 'gives the types Struct the fields :parent and :foo' do
         @klass::Struct.members.must_equal [:parent, :foo]
       end
 
-      it "creates accessor functions for the property" do
+      it 'creates accessor functions for the property' do
         obj = @klass.new
         obj.foo = 13
         obj.foo.must_equal 13

data/test/gir_ffi_test_helper.rb

@@ -4,17 +4,13 @@ require 'gir_ffi'
 
 # Global sequence provider. Needed to make unique class names.
 class Sequence
-  @@seq = 0
   def self.next
-    @@seq += 1
+    @seq ||= 0
+    @seq += + 1
   end
 end
 
-class Minitest::Test
-  def cws code
-    code.gsub(/(^\s*|\s*$)/, "")
-  end
-
+module GirFFITestExtensions
   def get_field_introspection_data namespace, klass, name
     get_introspection_data(namespace, klass).find_field name
   end
@@ -38,21 +34,19 @@ class Minitest::Test
   SAVED_MODULES = {}
 
   def save_module name
-    if Object.const_defined? name
-      puts "Saving #{name} over existing" if SAVED_MODULES.has_key? name
-      SAVED_MODULES[name] = Object.const_get name
-      Object.send(:remove_const, name)
-    end
+    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
     if Object.const_defined? name
       Object.send(:remove_const, name)
     end
-    if SAVED_MODULES.has_key? name
-      Object.const_set name, SAVED_MODULES[name]
-      SAVED_MODULES.delete name
-    end
+    return unless SAVED_MODULES.key? name
+    Object.const_set name, SAVED_MODULES[name]
+    SAVED_MODULES.delete name
   end
 
   def ref_count object
@@ -60,11 +54,11 @@ class Minitest::Test
   end
 
   def max_for_unsigned_type type
-    ( 1 << (FFI.type_size(type) * 8) ) - 1
+    (1 << (FFI.type_size(type) * 8)) - 1
   end
 
   def max_for_type type
-    ( 1 << (FFI.type_size(type) * 8 - 1) ) - 1
+    (1 << (FFI.type_size(type) * 8 - 1)) - 1
   end
 
   def min_for_type type
@@ -105,3 +99,4 @@ class Minitest::Test
   end
 end
 
+Minitest::Test.send :include, GirFFITestExtensions

data/test/integration/derived_classes_test.rb

@@ -3,24 +3,24 @@ require 'gir_ffi_test_helper'
 GirFFI.setup :Regress
 
 # Tests deriving Ruby classes from GObject classes.
-describe "For derived classes" do
-  describe "setting up methods when first called" do
+describe 'For derived classes' do
+  describe 'setting up methods when first called' do
     before do
       save_module :GIMarshallingTests
       GirFFI.setup :GIMarshallingTests
     end
 
-    describe "when an interface is mixed in" do
+    describe 'when an interface is mixed in' do
       before do
         @klass = Class.new GIMarshallingTests::OverridesObject
         @klass.send :include, GIMarshallingTests::Interface
       end
 
-      it "finds class methods in the superclass" do
+      it 'finds class methods in the superclass' do
         @klass.returnv
       end
 
-      it "finds instance methods in the superclass" do
+      it 'finds instance methods in the superclass' do
         obj = @klass.new
         result = obj.method
         result.must_equal 42
@@ -32,10 +32,10 @@ describe "For derived classes" do
     end
   end
 
-  describe "the initializer" do
-    it "does not have to call super" do
+  describe 'the initializer' do
+    it 'does not have to call super' do
       klass = Class.new Regress::TestSubObj do
-        def initialize *args
+        def initialize *_args
         end
       end