ffi 1.9.5 → 1.9.6

data/spec/ffi/typedef_spec.rb

@@ -4,8 +4,6 @@
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
-require 'ffi'
-
 describe "Custom type definitions" do
   it "attach_function with custom typedef" do
     module CustomTypedef
@@ -14,8 +12,9 @@ describe "Custom type definitions" do
       typedef :uint, :fubar_t
       attach_function :ret_u32, [ :fubar_t ], :fubar_t
     end
-    CustomTypedef.ret_u32(0x12345678).should == 0x12345678
+    expect(CustomTypedef.ret_u32(0x12345678)).to eq(0x12345678)
   end
+
   it "variadic invoker with custom typedef" do
     module VariadicCustomTypedef
       extend FFI::Library
@@ -25,8 +24,9 @@ describe "Custom type definitions" do
     end
     buf = FFI::Buffer.new :uint, 10
     VariadicCustomTypedef.pack_varargs(buf, "i", :fubar_t, 0x12345678)
-    buf.get_int64(0).should == 0x12345678
+    expect(buf.get_int64(0)).to eq(0x12345678)
   end
+
   it "Callback with custom typedef parameter" do
     module CallbackCustomTypedef
       extend FFI::Library
@@ -37,7 +37,7 @@ describe "Custom type definitions" do
     end
     i = 0
     CallbackCustomTypedef.testCallbackU32rV(0xdeadbeef) { |v| i = v }
-    i.should == 0xdeadbeef
+    expect(i).to eq(0xdeadbeef)
   end
     module StructCustomTypedef
       extend FFI::Library
@@ -47,14 +47,15 @@ describe "Custom type definitions" do
         layout :a, :fubar3_t
       end
     end
+
   it "Struct with custom typedef field" do
     s = StructCustomTypedef::S.new
     s[:a] = 0x12345678
-    s.pointer.get_uint(0).should == 0x12345678
+    expect(s.pointer.get_uint(0)).to eq(0x12345678)
   end
 
   it "attach_function after a typedef should not reject normal types" do
-    lambda do
+    expect do
       Module.new do
         extend FFI::Library
         # enum() will insert a custom typedef called :foo for the enum
@@ -69,11 +70,11 @@ describe "Custom type definitions" do
           attach_function :ptr_ret_int32_t, :ptr_ret___int32_t, [ :string, :foo ], :bar
         end
       end
-    end.should_not raise_error
+    end.not_to raise_error
   end
 
   it "detects the correct type for size_t" do
-    lambda do
+    expect do
       Module.new do
         extend FFI::Library
         ffi_lib "c"
@@ -85,6 +86,6 @@ describe "Custom type definitions" do
           attach_function :read, [:int, :pointer, :size_t], :ssize_t
         end
       end
-    end.should_not raise_error
+    end.not_to raise_error
   end
 end

data/spec/ffi/union_spec.rb

@@ -4,7 +4,6 @@
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
-require 'ffi'
 
 module LibTest
   Types = {
@@ -37,16 +36,17 @@ describe 'Union' do
   before do
     @u = LibTest::TestUnion.new
   end
+
   it 'should place all the fields at offset 0' do
-    LibTest::TestUnion.members.all? { |m| LibTest::TestUnion.offset_of(m) == 0 }.should be_true
+    expect(LibTest::TestUnion.members.all? { |m| LibTest::TestUnion.offset_of(m) == 0 }).to be true
   end
   LibTest::Types.each do |k, type|
     it "should correctly align/write a #{type[0]} value" do
       @u[type[1]] = type[2]
       if k == 'f32' or k == 'f64'
-        (@u[type[1]] - LibTest.send("union_align_#{k}", @u.to_ptr)).abs.should < 0.00001
+        expect((@u[type[1]] - LibTest.send("union_align_#{k}", @u.to_ptr)).abs).to be < 0.00001
       else
-        @u[type[1]].should == LibTest.send("union_align_#{k}", @u.to_ptr)
+        expect(@u[type[1]]).to eq(LibTest.send("union_align_#{k}", @u.to_ptr))
       end
     end
   end
@@ -54,13 +54,14 @@ describe 'Union' do
     it "should read a #{type[0]} value from memory" do
       @u = LibTest::TestUnion.new(LibTest.send("union_make_union_with_#{k}", type[2]))
       if k == 'f32' or k == 'f64'
-        (@u[type[1]] - type[2]).abs.should < 0.00001
+        expect((@u[type[1]] - type[2]).abs).to be < 0.00001
       else
-        @u[type[1]].should == type[2]
+        expect(@u[type[1]]).to eq(type[2])
       end
     end
   end
+
   it 'should return a size equals to the size of the biggest field' do
-    LibTest::TestUnion.size.should == LibTest.union_size
+    expect(LibTest::TestUnion.size).to eq(LibTest.union_size)
   end
 end

data/spec/ffi/variadic_spec.rb

@@ -4,7 +4,6 @@
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
-require 'ffi'
 
 describe "Function with variadic arguments" do
   module LibTest
@@ -19,41 +18,44 @@ describe "Function with variadic arguments" do
   it "takes enum arguments" do
     buf = FFI::Buffer.new :long_long, 2
     LibTest.pack_varargs(buf, "ii", :int, :c3, :int, :c4)
-    buf.get_int64(0).should == 42
-    buf.get_int64(8).should == 43
+    expect(buf.get_int64(0)).to eq(42)
+    expect(buf.get_int64(8)).to eq(43)
   end
 
   it "returns symbols for enums" do
     buf = FFI::Buffer.new :long_long, 2
-    LibTest.pack_varargs2(buf, :c1, "ii", :int, :c3, :int, :c4).should eql(:c2)
+    expect(LibTest.pack_varargs2(buf, :c1, "ii", :int, :c3, :int, :c4)).to eq(:c2)
   end
 
   [ 0, 127, -128, -1 ].each do |i|
     it "call variadic with (:char (#{i})) argument" do
       buf = FFI::Buffer.new :long_long
       LibTest.pack_varargs(buf, "c", :char, i)
-      buf.get_int64(0).should == i
+      expect(buf.get_int64(0)).to eq(i)
     end
   end
+
   [ 0, 0x7f, 0x80, 0xff ].each do |i|
     it "call variadic with (:uchar (#{i})) argument" do
       buf = FFI::Buffer.new :long_long
       LibTest.pack_varargs(buf, "C", :uchar, i)
-      buf.get_int64(0).should == i
+      expect(buf.get_int64(0)).to eq(i)
     end
   end
+
   [ 0, 1.234567, 9.87654321 ].each do |v|
     it "call variadic with (:float (#{v})) argument" do
       buf = FFI::Buffer.new :long_long
       LibTest.pack_varargs(buf, "f", :float, v.to_f)
-      buf.get_float64(0).should == v
+      expect(buf.get_float64(0)).to eq(v)
     end
   end
+
   [ 0, 1.234567, 9.87654321 ].each do |v|
     it "call variadic with (:double (#{v})) argument" do
       buf = FFI::Buffer.new :long_long
       LibTest.pack_varargs(buf, "f", :double, v.to_f)
-      buf.get_float64(0).should == v
+      expect(buf.get_float64(0)).to eq(v)
     end
   end
 
@@ -71,6 +73,7 @@ describe "Function with variadic arguments" do
       'f' => [ 1.23456789 ],
       'd' => [ 9.87654321 ]
     }
+
     TYPE_MAP = {
       'c' => :char, 'C' => :uchar, 's' => :short, 'S' => :ushort,
       'i' => :int, 'I' => :uint, 'j' => :long_long, 'J' => :ulong_long,
@@ -80,9 +83,9 @@ describe "Function with variadic arguments" do
 
   def verify(p, off, v)
     if v.kind_of?(Float)
-      p.get_float64(off).should == v
+      expect(p.get_float64(off)).to eq(v)
     else
-      p.get_int64(off).should == v
+      expect(p.get_int64(off)).to eq(v)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake