gir_ffi 0.7.7 → 0.7.8

data/test/gir_ffi/class_base_test.rb

@@ -1,7 +1,7 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::ClassBase do
-  describe "a simple descendant" do
+  describe 'a simple descendant' do
     let(:klass) {
       Class.new(GirFFI::ClassBase) do
         self::Struct = Class.new(FFI::Struct) do
@@ -11,20 +11,20 @@ describe GirFFI::ClassBase do
     }
     let(:object) { klass.wrap FFI::MemoryPointer.new(:int32) }
 
-    it "has #from as a pass-through method" do
+    it 'has #from as a pass-through method' do
       result = klass.from :foo
       result.must_equal :foo
     end
 
-    describe "#==" do
-      it "returns true when comparing to an object of the same class and pointer" do
+    describe '#==' do
+      it 'returns true when comparing to an object of the same class and pointer' do
         other = klass.wrap object.to_ptr
 
         object.must_be :==, other
         other.must_be :==, object
       end
 
-      it "returns true when comparing to an object of the same class and a pointer with the same address" do
+      it 'returns true when comparing to an object of the same class and a pointer with the same address' do
         ptr = FFI::Pointer.new object.to_ptr
         other = klass.wrap ptr
 
@@ -32,7 +32,7 @@ describe GirFFI::ClassBase do
         other.must_be :==, object
       end
 
-      it "returns false when comparing to an object of a sub/superclass and the same pointer" do
+      it 'returns false when comparing to an object of a sub/superclass and the same pointer' do
         subclass = Class.new(klass)
         other = subclass.wrap object.to_ptr
 
@@ -40,7 +40,7 @@ describe GirFFI::ClassBase do
         other.wont_be :==, object
       end
 
-      it "returns false when comparing to an object of the same class and different pointer" do
+      it 'returns false when comparing to an object of the same class and different pointer' do
         other = klass.wrap FFI::MemoryPointer.new(:int32)
 
         object.wont_be :==, other
@@ -54,14 +54,14 @@ describe GirFFI::ClassBase do
         other.wont_be :==, object
       end
 
-      it "returns false when comparing to an object of a different class and same pointer" do
+      it 'returns false when comparing to an object of a different class and same pointer' do
         stub(other = Object.new).to_ptr { object.to_ptr }
 
         object.wont_be :==, other
         other.wont_be :==, object
       end
 
-      it "returns false when comparing to an object of a different class and different pointer" do
+      it 'returns false when comparing to an object of a different class and different pointer' do
         stub(other = Object.new).to_ptr { FFI::MemoryPointer.new(:int32) }
 
         object.wont_be :==, other
@@ -70,13 +70,13 @@ describe GirFFI::ClassBase do
     end
   end
 
-  describe ".setup_and_call" do
-    it "looks up class methods in all builders" do
-      mock(builder = Object.new).setup_method("foo") { "foo" }
+  describe '.setup_and_call' do
+    it 'looks up class methods in all builders' do
+      mock(builder = Object.new).setup_method('foo') { 'foo' }
       klass = Class.new GirFFI::ClassBase
       klass.const_set :GIR_FFI_BUILDER, builder
 
-      mock(sub_builder = Object.new).setup_method("foo") { nil }
+      mock(sub_builder = Object.new).setup_method('foo') { nil }
       sub_klass = Class.new klass do
         def self.foo; end
       end
@@ -85,32 +85,37 @@ describe GirFFI::ClassBase do
       sub_klass.setup_and_call :foo, []
     end
 
-    it "calls the method given by the result of .setup_method" do
-      mock(builder = Object.new).setup_method("foo") { "bar" }
+    it 'calls the method given by the result of .setup_method' do
+      mock(builder = Object.new).setup_method('foo') { 'bar' }
       klass = Class.new GirFFI::ClassBase do
         def self.bar
-          "correct-result"
+          'correct-result'
+        end
+        def self.new
+          _real_new
         end
-        def self.new; self._real_new; end
       end
       klass.const_set :GIR_FFI_BUILDER, builder
 
       result = klass.setup_and_call :foo, []
-      result.must_equal "correct-result"
+      result.must_equal 'correct-result'
     end
   end
 
-  describe "#setup_and_call" do
-    it "looks up instance methods in all builders" do
-      mock(builder = Object.new).setup_instance_method("foo") { "foo" }
+  describe '#setup_and_call' do
+    it 'looks up instance methods in all builders' do
+      mock(builder = Object.new).setup_instance_method('foo') { 'foo' }
       klass = Class.new GirFFI::ClassBase
       klass.const_set :GIR_FFI_BUILDER, builder
 
-      mock(sub_builder = Object.new).setup_instance_method("foo") { nil }
+      mock(sub_builder = Object.new).setup_instance_method('foo') { nil }
       sub_klass = Class.new klass do
         def foo; end
+
         def initialize; end
-        def self.new; self._real_new; end
+        def self.new
+          _real_new
+        end
       end
       sub_klass.const_set :GIR_FFI_BUILDER, sub_builder
 
@@ -119,20 +124,22 @@ describe GirFFI::ClassBase do
       obj.setup_and_call :foo, []
     end
 
-    it "calls the method given by the result of .setup_instance_method" do
-      mock(builder = Object.new).setup_instance_method("foo") { "bar" }
+    it 'calls the method given by the result of .setup_instance_method' do
+      mock(builder = Object.new).setup_instance_method('foo') { 'bar' }
       klass = Class.new GirFFI::ClassBase do
         def bar
-          "correct-result"
+          'correct-result'
+        end
+        def self.new
+          _real_new
         end
-        def self.new; self._real_new; end
       end
       klass.const_set :GIR_FFI_BUILDER, builder
 
       obj = klass.new
 
       result = obj.setup_and_call :foo, []
-      result.must_equal "correct-result"
+      result.must_equal 'correct-result'
     end
   end
 end

data/test/gir_ffi/error_type_info_test.rb

@@ -4,44 +4,44 @@ require 'gir_ffi/error_type_info'
 describe GirFFI::ErrorTypeInfo do
   let(:instance) { GirFFI::ErrorTypeInfo.new }
 
-  describe "#array_length" do
-    it "returns the correct value" do
+  describe '#array_length' do
+    it 'returns the correct value' do
       instance.array_length.must_equal(-1)
     end
   end
 
-  describe "#tag_or_class" do
-    it "returns the correct value" do
+  describe '#tag_or_class' do
+    it 'returns the correct value' do
       instance.tag_or_class.must_equal [:pointer, :error]
     end
   end
 
-  describe "#pointer?" do
-    it "returns the correct value" do
+  describe '#pointer?' do
+    it 'returns the correct value' do
       instance.pointer?.must_equal true
     end
   end
 
-  describe "#flattened_tag" do
-    it "returns the correct value" do
+  describe '#flattened_tag' do
+    it 'returns the correct value' do
       instance.flattened_tag.must_equal :error
     end
   end
 
-  describe "#extra_conversion_arguments" do
-    it "returns the correct value" do
+  describe '#extra_conversion_arguments' do
+    it 'returns the correct value' do
       instance.extra_conversion_arguments.must_equal []
     end
   end
 
-  describe "#argument_class_name" do
-    it "returns the correct value" do
+  describe '#argument_class_name' do
+    it 'returns the correct value' do
       instance.argument_class_name.must_equal 'GLib::Error'
     end
   end
 
-  describe "#needs_ruby_to_c_conversion_for_callbacks?" do
-    it "returns the correct value" do
+  describe '#needs_ruby_to_c_conversion_for_callbacks?' do
+    it 'returns the correct value' do
       instance.needs_ruby_to_c_conversion_for_callbacks?.must_equal true
     end
   end

data/test/gir_ffi/ffi_ext/pointer_test.rb

@@ -2,17 +2,17 @@ require 'gir_ffi_test_helper'
 
 describe GirFFI::FFIExt::Pointer do
   let(:klass) { Class.new { include GirFFI::FFIExt::Pointer } }
-  describe "#to_object" do
-    it "finds the wrapping class by gtype and wraps the pointer in it" do
+  describe '#to_object' do
+    it 'finds the wrapping class by gtype and wraps the pointer in it' do
       ptr = klass.new
       mock(ptr).null? { false }
       object_class = Class.new
 
       mock(GObject).type_from_instance_pointer(ptr) { 0xdeadbeef }
       mock(GirFFI::Builder).build_by_gtype(0xdeadbeef) { object_class }
-      mock(object_class).direct_wrap(ptr) { "good-result" }
+      mock(object_class).direct_wrap(ptr) { 'good-result' }
 
-      ptr.to_object.must_equal "good-result"
+      ptr.to_object.must_equal 'good-result'
     end
   end
 end

data/test/gir_ffi/g_type_test.rb

@@ -6,22 +6,22 @@ describe GirFFI::GType do
   let(:gobject_gtype) { GObject::Object.get_gtype }
   let(:gobject_type_query) { GObject.type_query gobject_gtype }
 
-  describe "#to_i" do
-    it "returns the integer gtype" do
+  describe '#to_i' do
+    it 'returns the integer gtype' do
       gt = GirFFI::GType.new(gobject_gtype)
       gt.to_i.must_equal gobject_gtype
     end
   end
 
-  describe "#class_size" do
-    it "returns the class size for object types" do
+  describe '#class_size' do
+    it 'returns the class size for object types' do
       gt = GirFFI::GType.new(gobject_gtype)
       gt.class_size.must_equal gobject_type_query.class_size
     end
   end
 
-  describe "#instance_size" do
-    it "returns the instance size for object types" do
+  describe '#instance_size' do
+    it 'returns the instance size for object types' do
       gt = GirFFI::GType.new(gobject_gtype)
       gt.instance_size.must_equal gobject_type_query.instance_size
     end

data/test/gir_ffi/in_out_pointer_test.rb

@@ -1,8 +1,8 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InOutPointer do
-  describe ".new" do
-    it "wraps an existing pointer and a type" do
+  describe '.new' do
+    it 'wraps an existing pointer and a type' do
       ptr = GirFFI::AllocationHelper.safe_malloc(FFI.type_size(:int32))
       ptr.put_int32 0, 42
       instance = GirFFI::InOutPointer.new :gint32, ptr
@@ -10,89 +10,89 @@ describe GirFFI::InOutPointer do
     end
   end
 
-  describe "an instance created with .from" do
+  describe 'an instance created with .from' do
     before do
       @result = GirFFI::InOutPointer.from :gint32, 23
     end
 
-    it "holds a pointer to the given value" do
+    it 'holds a pointer to the given value' do
       assert_equal 23, @result.get_int32(0)
     end
 
-    it "is an instance of GirFFI::InOutPointer" do
+    it 'is an instance of GirFFI::InOutPointer' do
       assert_instance_of GirFFI::InOutPointer, @result
     end
   end
 
-  describe ".from" do
-    it "handles :gboolean false" do
+  describe '.from' do
+    it 'handles :gboolean false' do
       ptr = GirFFI::InOutPointer.from :gboolean, false
       ptr.read_int.must_equal 0
     end
 
-    it "handles :gboolean true" do
+    it 'handles :gboolean true' do
       ptr = GirFFI::InOutPointer.from :gboolean, true
       ptr.read_int.must_equal(1)
     end
 
-    it "handles :utf8 pointers" do
-      str_ptr = GirFFI::InPointer.from :utf8, "Hello"
+    it 'handles :utf8 pointers' do
+      str_ptr = GirFFI::InPointer.from :utf8, 'Hello'
       GirFFI::InOutPointer.from :utf8, str_ptr
     end
   end
 
-  describe "in instance created with .for" do
+  describe 'in instance created with .for' do
     before do
       @result = GirFFI::InOutPointer.for :gint32
     end
 
-    it "holds a pointer to a null value" do
+    it 'holds a pointer to a null value' do
       assert_equal 0, @result.get_int32(0)
     end
 
-    it "is an instance of GirFFI::InOutPointer" do
+    it 'is an instance of GirFFI::InOutPointer' do
       assert_instance_of GirFFI::InOutPointer, @result
     end
   end
 
-  describe ".for" do
-    it "handles :gboolean" do
+  describe '.for' do
+    it 'handles :gboolean' do
       GirFFI::InOutPointer.for :gboolean
     end
 
-    it "handles :utf8" do
+    it 'handles :utf8' do
       GirFFI::InOutPointer.for :utf8
     end
   end
 
-  describe "#to_value" do
-    it "returns the held value" do
+  describe '#to_value' do
+    it 'returns the held value' do
       ptr = GirFFI::InOutPointer.from :gint32, 123
       assert_equal 123, ptr.to_value
     end
 
-    describe "for :gboolean values" do
-      it "works when the value is false" do
+    describe 'for :gboolean values' do
+      it 'works when the value is false' do
         ptr = GirFFI::InOutPointer.from :gboolean, false
         ptr.to_value.must_equal false
       end
 
-      it "works when the value is true" do
+      it 'works when the value is true' do
         ptr = GirFFI::InOutPointer.from :gboolean, true
         ptr.to_value.must_equal true
       end
     end
 
-    describe "for :utf8 values" do
-      it "returns a pointer to the held value" do
-        str_ptr = GirFFI::InPointer.from :utf8, "Some value"
+    describe 'for :utf8 values' do
+      it 'returns a pointer to the held value' do
+        str_ptr = GirFFI::InPointer.from :utf8, 'Some value'
         ptr = GirFFI::InOutPointer.from :utf8, str_ptr
-        assert_equal "Some value", ptr.to_value.read_string
+        assert_equal 'Some value', ptr.to_value.read_string
       end
     end
 
-    describe "for struct values" do
-      it "returns a pointer to the held value" do
+    describe 'for struct values' do
+      it 'returns a pointer to the held value' do
         val = GObject::EnumValue.new
         val.value = 3
         ptr = GirFFI::InOutPointer.from GObject::EnumValue, val

data/test/gir_ffi/in_pointer_test.rb

@@ -3,17 +3,17 @@ require 'gir_ffi_test_helper'
 require 'gir_ffi/in_pointer'
 
 describe GirFFI::InPointer do
-  describe ".from_array" do
-    it "returns nil when passed nil" do
+  describe '.from_array' do
+    it 'returns nil when passed nil' do
       result = GirFFI::InPointer.from_array :gint32, nil
       assert_nil result
     end
 
-    it "handles type tag :GType" do
+    it 'handles type tag :GType' do
       GirFFI::InPointer.from_array :GType, [2]
     end
 
-    it "handles enum types" do
+    it 'handles enum types' do
       e = Module.new do
         extend GirFFI::EnumBase
         self::Enum = FFI::Enum.new [:foo, :bar, :baz]
@@ -22,7 +22,7 @@ describe GirFFI::InPointer do
       ptr.read_array_of_int32(3).must_equal [1, 0, 2]
     end
 
-    it "handles struct types" do
+    it 'handles struct types' do
       e = Class.new(GirFFI::StructBase) do
         self::Struct = Class.new(FFI::Struct) do
           layout :foo, :int32, :bar, :int32
@@ -38,7 +38,7 @@ describe GirFFI::InPointer do
       new_struct[:bar].must_equal 24
     end
 
-    it "handles typed pointers" do
+    it 'handles typed pointers' do
       p1 = GirFFI::InPointer.from :gint32, 42
       p2 = GirFFI::InPointer.from :gint32, 24
 
@@ -47,94 +47,94 @@ describe GirFFI::InPointer do
       ptr.read_array_of_pointer(2).must_equal [p1, p2]
     end
 
-    it "handles pointer casting" do
+    it 'handles pointer casting' do
       ptr = GirFFI::InPointer.from_array [:pointer, :gint32], [42, 24]
 
       ptr.read_array_of_pointer(2).map(&:address).must_equal [42, 24]
     end
   end
 
-  describe "an instance created with .from_array :gint32" do
+  describe 'an instance created with .from_array :gint32' do
     before do
       @result = GirFFI::InPointer.from_array :gint32, [24, 13]
     end
 
-    it "holds a pointer to the correct input values" do
+    it 'holds a pointer to the correct input values' do
       assert_equal 24, @result.get_int(0)
       assert_equal 13, @result.get_int(4)
     end
 
-    it "is an instance of GirFFI::InPointer" do
+    it 'is an instance of GirFFI::InPointer' do
       assert_instance_of GirFFI::InPointer, @result
     end
 
-    it "is zero-terminated" do
+    it 'is zero-terminated' do
       assert_equal 0, @result.get_int(8)
     end
   end
 
-  describe "an instance created with .from_array :utf8" do
+  describe 'an instance created with .from_array :utf8' do
     before do
-      @result = GirFFI::InPointer.from_array :utf8, ["foo", "bar", "baz"]
+      @result = GirFFI::InPointer.from_array :utf8, %w(foo bar baz)
     end
 
-    it "returns an array of pointers to strings" do
+    it 'returns an array of pointers to strings' do
       ary = @result.read_array_of_pointer(3)
-      assert_equal ["foo", "bar", "baz"], ary.map {|p| p.read_string}
+      assert_equal %w(foo bar baz), ary.map(&:read_string)
     end
   end
 
-  describe "an instance created with .from_array :filename" do
+  describe 'an instance created with .from_array :filename' do
     before do
-      @result = GirFFI::InPointer.from_array :filename, ["foo", "bar", "baz"]
+      @result = GirFFI::InPointer.from_array :filename, %w(foo bar baz)
     end
 
-    it "returns an array of pointers to strings" do
+    it 'returns an array of pointers to strings' do
       ary = @result.read_array_of_pointer(3)
-      assert_equal ["foo", "bar", "baz"], ary.map {|p| p.read_string}
+      assert_equal %w(foo bar baz), ary.map(&:read_string)
     end
   end
 
-  describe "an instance created with .from :utf8" do
+  describe 'an instance created with .from :utf8' do
     before do
-      @result = GirFFI::InPointer.from :utf8, "foo"
+      @result = GirFFI::InPointer.from :utf8, 'foo'
     end
 
-    it "returns a pointer to the given string" do
-      assert_equal "foo", @result.read_string
+    it 'returns a pointer to the given string' do
+      assert_equal 'foo', @result.read_string
     end
 
-    it "is an instance of GirFFI::InPointer" do
+    it 'is an instance of GirFFI::InPointer' do
       assert_instance_of GirFFI::InPointer, @result
     end
   end
 
-  describe "an instance created with .from :guint32" do
+  describe 'an instance created with .from :guint32' do
     before do
-      @result = GirFFI::InPointer.from :guint32, 12345
+      @result = GirFFI::InPointer.from :guint32, 12_345
     end
 
-    it "returns a pointer with an address equal to the given value" do
-      assert_equal 12345, @result.address
+    it 'returns a pointer with an address equal to the given value' do
+      assert_equal 12_345, @result.address
     end
 
-    it "is an instance of GirFFI::InPointer" do
+    it 'is an instance of GirFFI::InPointer' do
       assert_instance_of GirFFI::InPointer, @result
     end
   end
 
-  describe "an instance created with .from :filename" do
+  describe 'an instance created with .from :filename' do
     before do
-      @result = GirFFI::InPointer.from :filename, "foo"
+      @result = GirFFI::InPointer.from :filename, 'foo'
     end
 
-    it "returns a pointer to the given string" do
-      assert_equal "foo", @result.read_string
+    it 'returns a pointer to the given string' do
+      assert_equal 'foo', @result.read_string
     end
   end
 
-  describe ".from" do
-    it "returns nil when passed nil" do
+  describe '.from' do
+    it 'returns nil when passed nil' do
       result = GirFFI::InPointer.from :foo, nil
       assert_nil result
     end
@@ -144,10 +144,10 @@ describe GirFFI::InPointer do
       assert_equal 23, result.address
     end
 
-    it "handles enum types" do
+    it 'handles enum types' do
       e = Module.new do
         self::Enum = FFI::Enum.new [:foo, :bar, :baz]
-        def self.[](val)
+        def self.[] val
           self::Enum[val]
         end
       end
@@ -155,38 +155,42 @@ describe GirFFI::InPointer do
       ptr.address.must_equal 1
     end
 
-    describe "for type :void" do
-      it "returns the result of to_ptr" do
+    describe 'for type :void' do
+      it 'returns the result of to_ptr' do
         obj = Object.new
-        def obj.to_ptr; :test_value; end
+        def obj.to_ptr
+          :test_value
+        end
         GirFFI::InPointer.from(:void, obj).must_equal :test_value
       end
 
-      it "returns nil when passed nil" do
+      it 'returns nil when passed nil' do
         GirFFI::InPointer.from(:void, nil).must_equal nil
       end
     end
 
-    describe "for types that are classes" do
-      it "returns the result of to_ptr" do
+    describe 'for types that are classes' do
+      it 'returns the result of to_ptr' do
         klass = Class.new
         obj = klass.new
-        def obj.to_ptr; :test_value; end
+        def obj.to_ptr
+          :test_value
+        end
         GirFFI::InPointer.from(klass, obj).must_equal :test_value
       end
     end
   end
 
-  describe ".from_closure_data" do
-    describe "when called with nil" do
-      it "returns a pointer pointing to nil.object_id" do
+  describe '.from_closure_data' do
+    describe 'when called with nil' do
+      it 'returns a pointer pointing to nil.object_id' do
         GirFFI::InPointer.from_closure_data(nil).address.must_equal nil.object_id
       end
     end
 
-    describe "when called with a string" do
-      it "stores the string in GirFFI::ArgHelper::OBJECT_STORE" do
-        str = "Foo"
+    describe 'when called with a string' do
+      it 'stores the string in GirFFI::ArgHelper::OBJECT_STORE' do
+        str = 'Foo'
         ptr = GirFFI::InPointer.from_closure_data(str)
         result = GirFFI::ArgHelper::OBJECT_STORE.fetch(ptr)
         result.must_equal str

data/test/gir_ffi/info_ext/i_callable_info_test.rb

@@ -1,23 +1,24 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::ICallableInfo do
-  let(:klass) { Class.new do
-    include GirFFI::InfoExt::ICallableInfo
-  end }
+  let(:klass) {
+    Class.new do
+      include GirFFI::InfoExt::ICallableInfo
+    end
+  }
   let(:callable_info) { klass.new }
 
-  describe "#argument_ffi_types" do
-    describe "for a simple callable with several arguments" do
+  describe '#argument_ffi_types' do
+    describe 'for a simple callable with several arguments' do
       before do
         stub(arg_info1 = Object.new).to_ffitype { :type1 }
         stub(arg_info2 = Object.new).to_ffitype { :type2 }
         stub(callable_info).args { [arg_info1, arg_info2] }
       end
 
-      it "returns the ffi types of the arguments" do
+      it 'returns the ffi types of the arguments' do
         callable_info.argument_ffi_types.must_equal [:type1, :type2]
       end
     end
   end
 end
-