1 files changed, 292 insertions, 161 deletions

diff --git a/spec/ruby/optional/capi/object_spec.rb b/spec/ruby/optional/capi/object_spec.rb
index 30abe715e7..8e907a5a8c 100644
--- a/spec/ruby/optional/capi/object_spec.rb
+++ b/spec/ruby/optional/capi/object_spec.rb
@@ -1,4 +1,5 @@
 require_relative 'spec_helper'
+require_relative 'fixtures/object'
 
 load_extension("object")
 
@@ -30,6 +31,7 @@ describe "CApiObject" do
   class ObjectTest
     def initialize
       @foo = 7
+      yield if block_given?
     end
 
     def foo
@@ -62,7 +64,7 @@ describe "CApiObject" do
     it "allocates a new uninitialized object" do
       o = @o.rb_obj_alloc(CApiObjectSpecs::Alloc)
       o.class.should == CApiObjectSpecs::Alloc
-      o.initialized.should be_nil
+      o.initialized.should == nil
     end
   end
 
@@ -75,19 +77,28 @@ describe "CApiObject" do
 
       obj2.foo.should == obj1.foo
 
-      obj2.should_not equal(obj1)
+      obj2.should_not.equal?(obj1)
     end
   end
 
   describe "rb_obj_call_init" do
     it "sends #initialize" do
       o = @o.rb_obj_alloc(CApiObjectSpecs::Alloc)
-      o.initialized.should be_nil
+      o.initialized.should == nil
 
       @o.rb_obj_call_init(o, 2, [:one, :two])
-      o.initialized.should be_true
+      o.initialized.should == true
       o.arguments.should == [:one, :two]
     end
+
+    it "passes the block to #initialize" do
+      v = nil
+      o = @o.rb_obj_alloc(ObjectTest)
+      @o.rb_obj_call_init(o, 0, []) do
+        v = :foo
+      end
+      v.should == :foo
+    end
   end
 
   describe "rb_is_instance_of" do
@@ -110,6 +121,16 @@ describe "CApiObject" do
       @o.rb_respond_to(ObjectTest.new, :foo).should == true
       @o.rb_respond_to(ObjectTest.new, :bar).should == false
     end
+
+    it "can be used with primitives" do
+      @o.rb_respond_to(true, :object_id).should == true
+      @o.rb_respond_to(14, :succ).should == true
+    end
+
+    it "returns 0 if the method has been defined as rb_f_notimplement" do
+      @o.respond_to?(:not_implemented_method).should == false
+      @o.rb_respond_to(@o, :not_implemented_method).should == false
+    end
   end
 
   describe "rb_obj_respond_to" do
@@ -151,6 +172,20 @@ describe "CApiObject" do
     end
   end
 
+  describe "rb_obj_method" do
+    it "returns the method object for a symbol" do
+      method = @o.rb_obj_method("test", :size)
+      method.owner.should == String
+      method.name.to_sym.should == :size
+    end
+
+    it "returns the method object for a string" do
+      method = @o.rb_obj_method("test", "size")
+      method.owner.should == String
+      method.name.to_sym.should == :size
+    end
+  end
+
   describe "rb_method_boundp" do
     it "returns true when the given method is bound" do
       @o.rb_method_boundp(Object, :class, true).should == true
@@ -184,7 +219,7 @@ describe "CApiObject" do
     end
 
     it "requires a ruby file" do
-      $:.unshift File.dirname(__FILE__)
+      $:.unshift __dir__
       @o.rb_require()
       $foo.should == 7
     end
@@ -200,7 +235,7 @@ describe "CApiObject" do
   describe "rb_obj_instance_variables" do
     it "returns an array with instance variable names as symbols" do
       o = ObjectTest.new
-      @o.rb_obj_instance_variables(o).should include(:@foo)
+      @o.rb_obj_instance_variables(o).should.include?(:@foo)
     end
   end
 
@@ -209,21 +244,21 @@ describe "CApiObject" do
       ary = [1, 2]
       ary.should_not_receive(:to_ary)
 
-      @o.rb_check_convert_type(ary, "Array", "to_ary").should equal(ary)
+      @o.rb_check_convert_type(ary, "Array", "to_ary").should.equal?(ary)
     end
 
     it "returns the passed object and does not call the converting method if the object is a subclass of the specified type" do
       obj = CApiObjectSpecs::SubArray.new
       obj.should_not_receive(:to_array)
 
-      @o.rb_check_convert_type(obj, "Array", "to_array").should equal(obj)
+      @o.rb_check_convert_type(obj, "Array", "to_array").should.equal?(obj)
     end
 
     it "returns nil if the converting method returns nil" do
       obj = mock("rb_check_convert_type")
       obj.should_receive(:to_array).and_return(nil)
 
-      @o.rb_check_convert_type(obj, "Array", "to_array").should be_nil
+      @o.rb_check_convert_type(obj, "Array", "to_array").should == nil
     end
 
     it "raises a TypeError if the converting method returns an object that is not the specified type" do
@@ -232,7 +267,7 @@ describe "CApiObject" do
 
       -> do
         @o.rb_check_convert_type(obj, "Array", "to_array")
-      end.should raise_error(TypeError)
+      end.should.raise(TypeError)
     end
   end
 
@@ -241,14 +276,14 @@ describe "CApiObject" do
       ary = [1, 2]
       ary.should_not_receive(:to_ary)
 
-      @o.rb_convert_type(ary, "Array", "to_ary").should equal(ary)
+      @o.rb_convert_type(ary, "Array", "to_ary").should.equal?(ary)
     end
 
     it "returns the passed object and does not call the converting method if the object is a subclass of the specified type" do
       obj = CApiObjectSpecs::SubArray.new
       obj.should_not_receive(:to_array)
 
-      @o.rb_convert_type(obj, "Array", "to_array").should equal(obj)
+      @o.rb_convert_type(obj, "Array", "to_array").should.equal?(obj)
     end
 
     it "raises a TypeError if the converting method returns nil" do
@@ -257,7 +292,7 @@ describe "CApiObject" do
 
       -> do
         @o.rb_convert_type(obj, "Array", "to_array")
-      end.should raise_error(TypeError)
+      end.should.raise(TypeError)
     end
 
     it "raises a TypeError if the converting method returns an object that is not the specified type" do
@@ -266,109 +301,109 @@ describe "CApiObject" do
 
       -> do
         @o.rb_convert_type(obj, "Array", "to_array")
-      end.should raise_error(TypeError)
+      end.should.raise(TypeError)
     end
   end
 
   describe "rb_check_array_type" do
     it "returns the argument if it's an Array" do
       x = Array.new
-      @o.rb_check_array_type(x).should equal(x)
+      @o.rb_check_array_type(x).should.equal?(x)
     end
 
     it "returns the argument if it's a kind of Array" do
       x = AryChild.new
-      @o.rb_check_array_type(x).should equal(x)
+      @o.rb_check_array_type(x).should.equal?(x)
     end
 
     it "returns nil when the argument does not respond to #to_ary" do
-      @o.rb_check_array_type(Object.new).should be_nil
+      @o.rb_check_array_type(Object.new).should == nil
     end
 
     it "sends #to_ary to the argument and returns the result if it's nil" do
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_return(nil)
-      @o.rb_check_array_type(obj).should be_nil
+      @o.rb_check_array_type(obj).should == nil
     end
 
     it "sends #to_ary to the argument and returns the result if it's an Array" do
       x = Array.new
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_return(x)
-      @o.rb_check_array_type(obj).should equal(x)
+      @o.rb_check_array_type(obj).should.equal?(x)
     end
 
     it "sends #to_ary to the argument and returns the result if it's a kind of Array" do
       x = AryChild.new
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_return(x)
-      @o.rb_check_array_type(obj).should equal(x)
+      @o.rb_check_array_type(obj).should.equal?(x)
     end
 
     it "sends #to_ary to the argument and raises TypeError if it's not a kind of Array" do
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_return(Object.new)
-      -> { @o.rb_check_array_type obj }.should raise_error(TypeError)
+      -> { @o.rb_check_array_type obj }.should.raise(TypeError)
     end
 
     it "does not rescue exceptions raised by #to_ary" do
       obj = mock("to_ary")
-      obj.should_receive(:to_ary).and_raise(frozen_error_class)
-      -> { @o.rb_check_array_type obj }.should raise_error(frozen_error_class)
+      obj.should_receive(:to_ary).and_raise(FrozenError)
+      -> { @o.rb_check_array_type obj }.should.raise(FrozenError)
     end
   end
 
   describe "rb_check_string_type" do
     it "returns the argument if it's a String" do
       x = String.new
-      @o.rb_check_string_type(x).should equal(x)
+      @o.rb_check_string_type(x).should.equal?(x)
     end
 
     it "returns the argument if it's a kind of String" do
       x = StrChild.new
-      @o.rb_check_string_type(x).should equal(x)
+      @o.rb_check_string_type(x).should.equal?(x)
     end
 
     it "returns nil when the argument does not respond to #to_str" do
-      @o.rb_check_string_type(Object.new).should be_nil
+      @o.rb_check_string_type(Object.new).should == nil
     end
 
     it "sends #to_str to the argument and returns the result if it's nil" do
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(nil)
-      @o.rb_check_string_type(obj).should be_nil
+      @o.rb_check_string_type(obj).should == nil
     end
 
     it "sends #to_str to the argument and returns the result if it's a String" do
       x = String.new
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(x)
-      @o.rb_check_string_type(obj).should equal(x)
+      @o.rb_check_string_type(obj).should.equal?(x)
     end
 
     it "sends #to_str to the argument and returns the result if it's a kind of String" do
       x = StrChild.new
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(x)
-      @o.rb_check_string_type(obj).should equal(x)
+      @o.rb_check_string_type(obj).should.equal?(x)
     end
 
     it "sends #to_str to the argument and raises TypeError if it's not a kind of String" do
       obj = mock("to_str")
       obj.should_receive(:to_str).and_return(Object.new)
-      -> { @o.rb_check_string_type obj }.should raise_error(TypeError)
+      -> { @o.rb_check_string_type obj }.should.raise(TypeError)
     end
 
     it "does not rescue exceptions raised by #to_str" do
       obj = mock("to_str")
       obj.should_receive(:to_str).and_raise(RuntimeError)
-      -> { @o.rb_check_string_type obj }.should raise_error(RuntimeError)
+      -> { @o.rb_check_string_type obj }.should.raise(RuntimeError)
     end
   end
 
   describe "rb_check_to_integer" do
     it "returns the object when passed a Fixnum" do
-      @o.rb_check_to_integer(5, "to_int").should equal(5)
+      @o.rb_check_to_integer(5, "to_int").should.equal?(5)
     end
 
     it "returns the object when passed a Bignum" do
@@ -379,7 +414,7 @@ describe "CApiObject" do
       obj = mock("rb_check_to_integer")
       obj.should_receive(:to_integer).and_return(10)
 
-      @o.rb_check_to_integer(obj, "to_integer").should equal(10)
+      @o.rb_check_to_integer(obj, "to_integer").should.equal?(10)
     end
 
     it "calls the converting method and returns a Bignum value" do
@@ -393,36 +428,27 @@ describe "CApiObject" do
       obj = mock("rb_check_to_integer")
       obj.should_receive(:to_integer).and_return(nil)
 
-      @o.rb_check_to_integer(obj, "to_integer").should be_nil
+      @o.rb_check_to_integer(obj, "to_integer").should == nil
     end
 
     it "returns nil when the converting method does not return an Integer" do
       obj = mock("rb_check_to_integer")
       obj.should_receive(:to_integer).and_return("string")
 
-      @o.rb_check_to_integer(obj, "to_integer").should be_nil
+      @o.rb_check_to_integer(obj, "to_integer").should == nil
     end
   end
 
   describe "FL_ABLE" do
     it "returns correct boolean for type" do
-      @o.FL_ABLE(Object.new).should be_true
-      @o.FL_ABLE(true).should be_false
-      @o.FL_ABLE(nil).should be_false
-      @o.FL_ABLE(1).should be_false
+      @o.FL_ABLE(Object.new).should == true
+      @o.FL_ABLE(true).should == false
+      @o.FL_ABLE(nil).should == false
+      @o.FL_ABLE(1).should == false
     end
   end
 
   describe "FL_TEST" do
-    ruby_version_is ''...'2.7' do
-      it "returns correct status for FL_TAINT" do
-        obj = Object.new
-        @o.FL_TEST(obj, "FL_TAINT").should == 0
-        obj.taint
-        @o.FL_TEST(obj, "FL_TAINT").should_not == 0
-      end
-    end
-
     it "returns correct status for FL_FREEZE" do
       obj = Object.new
       @o.FL_TEST(obj, "FL_FREEZE").should == 0
@@ -443,25 +469,44 @@ describe "CApiObject" do
   describe "rb_class_of" do
     it "returns the class of an object" do
       @o.rb_class_of(nil).should == NilClass
-      @o.rb_class_of(0).should == Fixnum
+      @o.rb_class_of(0).should == Integer
       @o.rb_class_of(0.1).should == Float
       @o.rb_class_of(ObjectTest.new).should == ObjectTest
     end
 
     it "returns the singleton class if it exists" do
       o = ObjectTest.new
-      @o.rb_class_of(o).should equal ObjectTest
+      @o.rb_class_of(o).should.equal? ObjectTest
       s = o.singleton_class
-      @o.rb_class_of(o).should equal s
+      @o.rb_class_of(o).should.equal? s
+    end
+  end
+
+  describe "rb_obj_class" do
+    it "returns the class of an object" do
+      @o.rb_obj_class(nil).should == NilClass
+      @o.rb_obj_class(0).should == Integer
+      @o.rb_obj_class(0.1).should == Float
+      @o.rb_obj_class(ObjectTest.new).should == ObjectTest
+    end
+
+    it "does not return the singleton class if it exists" do
+      o = ObjectTest.new
+      o.singleton_class
+      @o.rb_obj_class(o).should.equal? ObjectTest
     end
   end
 
   describe "rb_obj_classname" do
     it "returns the class name of an object" do
       @o.rb_obj_classname(nil).should == 'NilClass'
-      @o.rb_obj_classname(0).should == Fixnum.to_s
+      @o.rb_obj_classname(0).should == 'Integer'
       @o.rb_obj_classname(0.1).should == 'Float'
       @o.rb_obj_classname(ObjectTest.new).should == 'ObjectTest'
+
+      o = ObjectTest.new
+      o.singleton_class
+      @o.rb_obj_classname(o).should == 'ObjectTest'
     end
   end
 
@@ -475,20 +520,58 @@ describe "CApiObject" do
       @o.rb_is_type_array([]).should == true
       @o.rb_is_type_array(DescArray.new).should == true
       @o.rb_is_type_module(ObjectTest).should == false
+      @o.rb_is_type_module(Module.new).should == true
       @o.rb_is_type_class(ObjectTest).should == true
       @o.rb_is_type_data(Time.now).should == true
     end
+
+    it "returns T_FILE for instances of IO and subclasses" do
+      STDERR.class.should == IO
+      @o.rb_is_rb_type_p_file(STDERR).should == true
+
+      File.open(__FILE__) do |f|
+        f.class.should == File
+        @o.rb_is_rb_type_p_file(f).should == true
+      end
+
+      require 'socket'
+      TCPServer.open(0) do |s|
+        @o.rb_is_rb_type_p_file(s).should == true
+      end
+    end
+  end
+
+  describe "rb_check_type" do
+    it "checks if the object is of the given type" do
+      @o.rb_check_type(nil, nil).should == true
+      @o.rb_check_type(ObjectTest.new, Object.new).should == true
+      @o.rb_check_type([], []).should == true
+      @o.rb_check_type(Class.new(Array).new, []).should == true
+      @o.rb_check_type(ObjectTest, Object).should == true
+    end
+
+    it "raises an exception if the object is not of the expected type" do
+      -> {
+        @o.rb_check_type([], Object.new)
+      }.should.raise(TypeError, 'wrong argument type Array (expected Object)')
+
+      -> {
+        @o.rb_check_type(ObjectTest, Module.new)
+      }.should.raise(TypeError, 'wrong argument type Class (expected Module)')
+
+      -> {
+        @o.rb_check_type(nil, "string")
+      }.should.raise(TypeError, 'wrong argument type nil (expected String)')
+    end
   end
 
   describe "rb_type_p" do
     it "returns whether object is of the given type" do
-      class DescArray < Array
-      end
       @o.rb_is_rb_type_p_nil(nil).should == true
       @o.rb_is_rb_type_p_object([]).should == false
       @o.rb_is_rb_type_p_object(ObjectTest.new).should == true
       @o.rb_is_rb_type_p_array([]).should == true
-      @o.rb_is_rb_type_p_array(DescArray.new).should == true
+      @o.rb_is_rb_type_p_array(Class.new(Array).new).should == true
       @o.rb_is_rb_type_p_module(ObjectTest).should == false
       @o.rb_is_rb_type_p_class(ObjectTest).should == true
       @o.rb_is_rb_type_p_data(Time.now).should == true
@@ -497,12 +580,10 @@ describe "CApiObject" do
 
   describe "BUILTIN_TYPE" do
     it "returns the type constant for the object" do
-      class DescArray < Array
-      end
       @o.rb_is_builtin_type_object([]).should == false
       @o.rb_is_builtin_type_object(ObjectTest.new).should == true
       @o.rb_is_builtin_type_array([]).should == true
-      @o.rb_is_builtin_type_array(DescArray.new).should == true
+      @o.rb_is_builtin_type_array(Class.new(Array).new).should == true
       @o.rb_is_builtin_type_module(ObjectTest).should == false
       @o.rb_is_builtin_type_class(ObjectTest).should == true
       @o.rb_is_builtin_type_data(Time.now).should == true
@@ -511,49 +592,49 @@ describe "CApiObject" do
 
   describe "RTEST" do
     it "returns C false if passed Qfalse" do
-      @o.RTEST(false).should be_false
+      @o.RTEST(false).should == false
     end
 
     it "returns C false if passed Qnil" do
-      @o.RTEST(nil).should be_false
+      @o.RTEST(nil).should == false
     end
 
     it "returns C true if passed Qtrue" do
-      @o.RTEST(true).should be_true
+      @o.RTEST(true).should == true
     end
 
     it "returns C true if passed a Symbol" do
-      @o.RTEST(:test).should be_true
+      @o.RTEST(:test).should == true
     end
 
     it "returns C true if passed an Object" do
-      @o.RTEST(Object.new).should be_true
+      @o.RTEST(Object.new).should == true
     end
   end
 
   describe "rb_special_const_p" do
     it "returns true if passed Qfalse" do
-      @o.rb_special_const_p(false).should be_true
+      @o.rb_special_const_p(false).should == true
     end
 
     it "returns true if passed Qtrue" do
-      @o.rb_special_const_p(true).should be_true
+      @o.rb_special_const_p(true).should == true
     end
 
     it "returns true if passed Qnil" do
-      @o.rb_special_const_p(nil).should be_true
+      @o.rb_special_const_p(nil).should == true
     end
 
     it "returns true if passed a Symbol" do
-      @o.rb_special_const_p(:test).should be_true
+      @o.rb_special_const_p(:test).should == true
     end
 
     it "returns true if passed a Fixnum" do
-      @o.rb_special_const_p(10).should be_true
+      @o.rb_special_const_p(10).should == true
     end
 
     it "returns false if passed an Object" do
-      @o.rb_special_const_p(Object.new).should be_false
+      @o.rb_special_const_p(Object.new).should == false
     end
   end
 
@@ -572,75 +653,19 @@ describe "CApiObject" do
   end
 
   describe "OBJ_TAINT" do
-    ruby_version_is ''...'2.7' do
-      it "taints the object" do
-        obj = mock("tainted")
-        @o.OBJ_TAINT(obj)
-        obj.tainted?.should be_true
-      end
-    end
   end
 
   describe "OBJ_TAINTED" do
-    ruby_version_is ''...'2.7' do
-      it "returns C true if the object is tainted" do
-        obj = mock("tainted")
-        obj.taint
-        @o.OBJ_TAINTED(obj).should be_true
-      end
-
-      it "returns C false if the object is not tainted" do
-        obj = mock("untainted")
-        @o.OBJ_TAINTED(obj).should be_false
-      end
-    end
   end
 
   describe "OBJ_INFECT" do
-    ruby_version_is ''...'2.7' do
-      it "does not taint the first argument if the second argument is not tainted" do
-        host   = mock("host")
-        source = mock("source")
-        @o.OBJ_INFECT(host, source)
-        host.tainted?.should be_false
-      end
-
-      it "taints the first argument if the second argument is tainted" do
-        host   = mock("host")
-        source = mock("source").taint
-        @o.OBJ_INFECT(host, source)
-        host.tainted?.should be_true
-      end
-
-      it "does not untrust the first argument if the second argument is trusted" do
-        host   = mock("host")
-        source = mock("source")
-        @o.OBJ_INFECT(host, source)
-        host.untrusted?.should be_false
-      end
-
-      it "untrusts the first argument if the second argument is untrusted" do
-        host   = mock("host")
-        source = mock("source").untrust
-        @o.OBJ_INFECT(host, source)
-        host.untrusted?.should be_true
-      end
-
-      it "propagates both taint and distrust" do
-        host   = mock("host")
-        source = mock("source").taint.untrust
-        @o.OBJ_INFECT(host, source)
-        host.tainted?.should be_true
-        host.untrusted?.should be_true
-      end
-    end
   end
 
   describe "rb_obj_freeze" do
     it "freezes the object passed to it" do
       obj = ""
       @o.rb_obj_freeze(obj).should == obj
-      obj.frozen?.should be_true
+      obj.frozen?.should == true
     end
   end
 
@@ -649,7 +674,7 @@ describe "CApiObject" do
       obj = ObjectTest
       -> do
         @o.rb_obj_instance_eval(obj) { include Kernel }
-      end.should_not raise_error(NoMethodError)
+      end.should_not.raise(NoMethodError)
     end
   end
 
@@ -661,34 +686,32 @@ describe "CApiObject" do
     end
 
     it "returns false if object passed to it is not frozen" do
-      obj = ""
+      obj = +""
       @o.rb_obj_frozen_p(obj).should == false
     end
   end
 
-  describe "rb_obj_taint" do
-    ruby_version_is ''...'2.7' do
-      it "marks the object passed as tainted" do
-        obj = ""
-        obj.tainted?.should == false
-        @o.rb_obj_taint(obj)
-        obj.tainted?.should == true
-      end
+  describe "redefining frozen? works" do
+    it "allows an object to override frozen?" do
+      obj = CApiObjectRedefinitionSpecs.new
 
-      it "raises a #{frozen_error_class} if the object passed is frozen" do
-        -> { @o.rb_obj_taint("".freeze) }.should raise_error(frozen_error_class)
-      end
+      obj.frozen?.should == false
+      obj.freeze
+      obj.frozen?.should == true
     end
   end
 
+  describe "rb_obj_taint" do
+  end
+
   describe "rb_check_frozen" do
-    it "raises a #{frozen_error_class} if the obj is frozen" do
-      -> { @o.rb_check_frozen("".freeze) }.should raise_error(frozen_error_class)
+    it "raises a FrozenError if the obj is frozen" do
+      -> { @o.rb_check_frozen("".freeze) }.should.raise(FrozenError)
     end
 
     it "does nothing when object isn't frozen" do
-      obj = ""
-      -> { @o.rb_check_frozen(obj) }.should_not raise_error(TypeError)
+      obj = +""
+      -> { @o.rb_check_frozen(obj) }.should_not.raise(TypeError)
     end
   end
 
@@ -696,13 +719,13 @@ describe "CApiObject" do
     it "converts an Integer to string" do
       obj = 1
       i = @o.rb_any_to_s(obj)
-      i.should be_kind_of(String)
+      i.should.is_a?(String)
     end
 
     it "converts an Object to string" do
       obj = Object.new
       i = @o.rb_any_to_s(obj)
-      i.should be_kind_of(String)
+      i.should.is_a?(String)
     end
   end
 
@@ -728,61 +751,61 @@ describe "CApiObject" do
     it "raises a TypeError if #to_int does not return an Integer" do
       x = mock("to_int")
       x.should_receive(:to_int).and_return("5")
-      -> { @o.rb_to_int(x) }.should raise_error(TypeError)
+      -> { @o.rb_to_int(x) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if called with nil" do
-      -> { @o.rb_to_int(nil) }.should raise_error(TypeError)
+      -> { @o.rb_to_int(nil) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if called with true" do
-      -> { @o.rb_to_int(true) }.should raise_error(TypeError)
+      -> { @o.rb_to_int(true) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if called with false" do
-      -> { @o.rb_to_int(false) }.should raise_error(TypeError)
+      -> { @o.rb_to_int(false) }.should.raise(TypeError)
     end
 
     it "raises a TypeError if called with a String" do
-      -> { @o.rb_to_int("1") }.should raise_error(TypeError)
+      -> { @o.rb_to_int("1") }.should.raise(TypeError)
     end
   end
 
   describe "rb_equal" do
     it "returns true if the arguments are the same exact object" do
       s = "hello"
-      @o.rb_equal(s, s).should be_true
+      @o.rb_equal(s, s).should == true
     end
 
     it "calls == to check equality and coerces to true/false" do
       m = mock("string")
       m.should_receive(:==).and_return(8)
-      @o.rb_equal(m, "hello").should be_true
+      @o.rb_equal(m, "hello").should == true
 
       m2 = mock("string")
       m2.should_receive(:==).and_return(nil)
-      @o.rb_equal(m2, "hello").should be_false
+      @o.rb_equal(m2, "hello").should == false
     end
   end
 
   describe "rb_class_inherited_p" do
 
     it "returns true if mod equals arg" do
-      @o.rb_class_inherited_p(Array, Array).should be_true
+      @o.rb_class_inherited_p(Array, Array).should == true
     end
 
     it "returns true if mod is a subclass of arg" do
-      @o.rb_class_inherited_p(Array, Object).should be_true
+      @o.rb_class_inherited_p(Array, Object).should == true
     end
 
     it "returns nil if mod is not a subclass of arg" do
-      @o.rb_class_inherited_p(Array, Hash).should be_nil
+      @o.rb_class_inherited_p(Array, Hash).should == nil
     end
 
     it "raises a TypeError if arg is no class or module" do
       ->{
         @o.rb_class_inherited_p(1, 2)
-      }.should raise_error(TypeError)
+      }.should.raise(TypeError)
     end
 
   end
@@ -815,6 +838,15 @@ describe "CApiObject" do
       end
     end
 
+    describe "rb_ivar_count" do
+      it "returns the number of instance variables" do
+        obj = Object.new
+        @o.rb_ivar_count(obj).should == 0
+        obj.instance_variable_set(:@foo, 42)
+        @o.rb_ivar_count(obj).should == 1
+      end
+    end
+
     describe "rb_ivar_get" do
       it "returns the instance variable on an object" do
         @o.rb_ivar_get(@test, :@foo).should == @test.instance_eval { @foo }
@@ -826,6 +858,7 @@ describe "CApiObject" do
 
       it "returns nil if the instance variable has not been initialized and is not a valid Ruby name" do
         @o.rb_ivar_get(@test, :bar).should == nil
+        @o.rb_ivar_get(@test, :mesg).should == nil
       end
 
       it 'returns the instance variable when it is not a valid Ruby name' do
@@ -861,18 +894,19 @@ describe "CApiObject" do
 
       it "does not throw an error if the instance variable is not a valid Ruby name" do
         @o.rb_ivar_defined(@test, :bar).should == false
+        @o.rb_ivar_defined(@test, :mesg).should == false
       end
     end
 
-    # The `generic_iv_tbl` table and `*_generic_ivar` functions are for mutable
+    # The `generic_fields_tbl` table and `*_generic_ivar` functions are for mutable
     # objects which do not store ivars directly in MRI such as RString, because
     # there is no member iv_index_tbl (ivar table) such as in RObject and RClass.
 
     describe "rb_copy_generic_ivar for objects which do not store ivars directly" do
       it "copies the instance variables from one object to another" do
-        original = "abc"
+        original = +"abc"
         original.instance_variable_set(:@foo, :bar)
-        clone = "def"
+        clone = +"def"
         @o.rb_copy_generic_ivar(clone, original)
         clone.instance_variable_get(:@foo).should == :bar
       end
@@ -880,11 +914,108 @@ describe "CApiObject" do
 
     describe "rb_free_generic_ivar for objects which do not store ivars directly" do
       it "removes the instance variables from an object" do
-        o = "abc"
+        o = +"abc"
         o.instance_variable_set(:@baz, :flibble)
         @o.rb_free_generic_ivar(o)
         o.instance_variables.should == []
       end
     end
   end
+
+  describe "allocator accessors" do
+    describe "rb_define_alloc_func" do
+      it "sets up the allocator" do
+        klass = Class.new
+        @o.rb_define_alloc_func(klass)
+        obj = klass.allocate
+        obj.class.should.equal?(klass)
+        obj.should.instance_variable_defined?(:@from_custom_allocator)
+      end
+
+      it "sets up the allocator for a subclass of String" do
+        klass = Class.new(String)
+        @o.rb_define_alloc_func(klass)
+        obj = klass.allocate
+        obj.class.should.equal?(klass)
+        obj.should.instance_variable_defined?(:@from_custom_allocator)
+        obj.should == ""
+      end
+
+      it "sets up the allocator for a subclass of Array" do
+        klass = Class.new(Array)
+        @o.rb_define_alloc_func(klass)
+        obj = klass.allocate
+        obj.class.should.equal?(klass)
+        obj.should.instance_variable_defined?(:@from_custom_allocator)
+        obj.should == []
+      end
+    end
+
+    describe "rb_get_alloc_func" do
+      it "gets the allocator that is defined directly on a class" do
+        klass = Class.new
+        @o.rb_define_alloc_func(klass)
+        @o.speced_allocator?(Object).should == false
+        @o.speced_allocator?(klass).should == true
+      end
+
+      it "gets the allocator that is inherited" do
+        parent = Class.new
+        @o.rb_define_alloc_func(parent)
+        klass = Class.new(parent)
+        @o.speced_allocator?(Object).should == false
+        @o.speced_allocator?(klass).should == true
+      end
+    end
+
+    describe "rb_undef_alloc_func" do
+      it "makes rb_get_alloc_func() return NULL for a class without a custom allocator" do
+        klass = Class.new
+        @o.rb_undef_alloc_func(klass)
+        @o.custom_alloc_func?(klass).should == false
+      end
+
+      it "undefs the allocator for the class" do
+        klass = Class.new
+        @o.rb_define_alloc_func(klass)
+        @o.speced_allocator?(klass).should == true
+        @o.rb_undef_alloc_func(klass)
+        @o.custom_alloc_func?(klass).should == false
+      end
+
+      it "undefs the allocator for a class that inherits a allocator" do
+        parent = Class.new
+        @o.rb_define_alloc_func(parent)
+        klass = Class.new(parent)
+        @o.speced_allocator?(klass).should == true
+        @o.rb_undef_alloc_func(klass)
+        @o.custom_alloc_func?(klass).should == false
+
+        @o.speced_allocator?(parent).should == true
+      end
+    end
+
+    describe "rb_ivar_foreach" do
+      it "calls the callback function for each instance variable on an object" do
+        o = CApiObjectSpecs::IVars.new
+        ary = @o.rb_ivar_foreach(o)
+        ary.should == [:@a, 3, :@b, 7, :@c, 4]
+      end
+
+      it "calls the callback function for each cvar and ivar on a class" do
+        exp = [:@@cvar, :foo, :@@cvar2, :bar, :@ivar, :baz]
+
+        ary = @o.rb_ivar_foreach(CApiObjectSpecs::CVars)
+        ary.should == exp
+      end
+
+      it "calls the callback function for each cvar and ivar on a module" do
+        exp = [:@@mvar, :foo, :@@mvar2, :bar, :@ivar, :baz]
+
+        ary = @o.rb_ivar_foreach(CApiObjectSpecs::MVars)
+        ary.should == exp
+      end
+
+    end
+  end
 end