rice 1.0.2 → 1.1.0

data/test/test_Critical_Guard.cpp

@@ -2,6 +2,8 @@
 #include "rice/Critical_Guard.hpp"
 #include <stdexcept>
 
+#if RICE__RUBY_VERSION_CODE < 190
+
 using namespace Rice;
 
 TESTSUITE(Critical_Guard);
@@ -45,3 +47,5 @@ TESTCASE(exception)
   ASSERT(!rb_thread_critical);
 }
 
+#endif
+

data/test/test_Data_Object.cpp

@@ -10,6 +10,14 @@ TESTSUITE(Data_Object);
 namespace
 {
   struct Foo { Foo() : x_(42) { } int x_; };
+
+  bool test_ruby_mark__marked = false;
+}
+
+template<>
+void ruby_mark(Foo * foo)
+{
+  test_ruby_mark__marked = true;
 }
 
 SETUP(Data_Object)
@@ -35,7 +43,13 @@ TESTCASE(construct_from_pointer_with_defaults)
   Data_Object<Foo> wrapped_foo(foo);
   ASSERT_EQUAL(foo, wrapped_foo.get());
   ASSERT_EQUAL(Data_Type<Foo>::klass(), wrapped_foo.class_of());
-  ASSERT_EQUAL(RUBY_DATA_FUNC(0), RDATA(wrapped_foo.value())->dmark);
+  typedef void (*Mark_Func)(void *);
+  typedef void (*Mark_Func_Foo)(Foo *);
+  Mark_Func expected_mark_func =
+    Mark_Func(Mark_Func_Foo(ruby_mark<Foo>));
+  ASSERT_EQUAL(
+      expected_mark_func,
+      RDATA(wrapped_foo.value())->dmark);
   ASSERT_EQUAL(
       RUBY_DATA_FUNC(Default_Allocation_Strategy<Foo>::free),
       RUBY_DATA_FUNC(RDATA(wrapped_foo.value())->dfree));
@@ -49,7 +63,13 @@ TESTCASE(construct_from_pointer_and_klass)
   Data_Object<Foo> wrapped_foo(foo, Data_Type<Foo>::klass());
   ASSERT_EQUAL(foo, wrapped_foo.get());
   ASSERT_EQUAL(Data_Type<Foo>::klass(), wrapped_foo.class_of());
-  ASSERT_EQUAL(RUBY_DATA_FUNC(0), RDATA(wrapped_foo.value())->dmark);
+  typedef void (*Mark_Func)(void *);
+  typedef void (*Mark_Func_Foo)(Foo *);
+  Mark_Func expected_mark_func =
+    Mark_Func(Mark_Func_Foo(ruby_mark<Foo>));
+  ASSERT_EQUAL(
+      expected_mark_func,
+      RDATA(wrapped_foo.value())->dmark);
   ASSERT_EQUAL(
       RUBY_DATA_FUNC(Default_Allocation_Strategy<Foo>::free),
       RUBY_DATA_FUNC(RDATA(wrapped_foo.value())->dfree));
@@ -63,7 +83,13 @@ TESTCASE(construct_from_pointer_and_alternate_klass)
   Data_Object<Foo> wrapped_foo(foo, rb_cObject);
   ASSERT_EQUAL(foo, wrapped_foo.get());
   ASSERT_EQUAL(rb_cObject, CLASS_OF(wrapped_foo.value()));
-  ASSERT_EQUAL(RUBY_DATA_FUNC(0), RDATA(wrapped_foo.value())->dmark);
+  typedef void (*Mark_Func)(void *);
+  typedef void (*Mark_Func_Foo)(Foo *);
+  Mark_Func expected_mark_func =
+    Mark_Func(Mark_Func_Foo(ruby_mark<Foo>));
+  ASSERT_EQUAL(
+      expected_mark_func,
+      RDATA(wrapped_foo.value())->dmark);
   ASSERT_EQUAL(
       RUBY_DATA_FUNC(Default_Allocation_Strategy<Foo>::free),
       RUBY_DATA_FUNC(RDATA(wrapped_foo.value())->dfree));
@@ -233,3 +259,17 @@ TESTCASE(from_ruby_copy)
   Data_Object<Foo> wrapped_foo(foo);
   ASSERT_EQUAL(foo->x_, from_ruby<Foo>(wrapped_foo).x_);
 }
+
+TESTCASE(ruby_mark)
+{
+  Data_Type<Foo> rb_cFoo;
+  Foo * foo = new Foo;
+  Data_Object<Foo> wrapped_foo(foo);
+
+  test_ruby_mark__marked = false;
+
+  rb_gc_start();
+
+  ASSERT_EQUAL(true, test_ruby_mark__marked);
+}
+

data/test/test_Hash.cpp

@@ -17,7 +17,7 @@ TESTCASE(default_construct)
 {
   Hash h;
   ASSERT_EQUAL(T_HASH, rb_type(h));
-  ASSERT_EQUAL(0, RHASH(h.value())->tbl->num_entries);
+  ASSERT_EQUAL(0, RHASH_TBL(h.value())->num_entries);
 }
 
 TESTCASE(construct_from_object)
@@ -25,7 +25,7 @@ TESTCASE(construct_from_object)
   Object o(rb_hash_new());
   Hash h(o);
   ASSERT_EQUAL(T_HASH, rb_type(h));
-  ASSERT_EQUAL(0, RHASH(h.value())->tbl->num_entries);
+  ASSERT_EQUAL(0, RHASH_TBL(h.value())->num_entries);
 }
 
 TESTCASE(construct_from_value)
@@ -33,7 +33,7 @@ TESTCASE(construct_from_value)
   VALUE v(rb_hash_new());
   Hash h(v);
   ASSERT_EQUAL(T_HASH, rb_type(h));
-  ASSERT_EQUAL(0, RHASH(h.value())->tbl->num_entries);
+  ASSERT_EQUAL(0, RHASH_TBL(h.value())->num_entries);
 }
 
 TESTCASE(copy_construct)

data/test/test_String.cpp

@@ -14,14 +14,14 @@ TESTCASE(default_construct)
 {
   String s;
   ASSERT_EQUAL(T_STRING, rb_type(s));
-  ASSERT_EQUAL("", RSTRING(s.value())->ptr);
+  ASSERT_EQUAL("", RSTRING_PTR(s.value()));
 }
 
 TESTCASE(construct_from_value)
 {
   String s(rb_str_new2("foo"));
   ASSERT_EQUAL(T_STRING, rb_type(s));
-  ASSERT_EQUAL("foo", RSTRING(s.value())->ptr);
+  ASSERT_EQUAL("foo", RSTRING_PTR(s.value()));
 }
 
 TESTCASE(construct_from_object)
@@ -29,35 +29,35 @@ TESTCASE(construct_from_object)
   Object o(rb_str_new2("foo"));
   String s(o);
   ASSERT_EQUAL(T_STRING, rb_type(s));
-  ASSERT_EQUAL("foo", RSTRING(s.value())->ptr);
+  ASSERT_EQUAL("foo", RSTRING_PTR(s.value()));
 }
 
 TESTCASE(construct_from_identifier)
 {
   String s(Identifier("foo"));
   ASSERT_EQUAL(T_STRING, rb_type(s));
-  ASSERT_EQUAL("foo", RSTRING(s.value())->ptr);
+  ASSERT_EQUAL("foo", RSTRING_PTR(s.value()));
 }
 
 TESTCASE(construct_from_c_string)
 {
   String s("foo");
   ASSERT_EQUAL(T_STRING, rb_type(s));
-  ASSERT_EQUAL("foo", RSTRING(s.value())->ptr);
+  ASSERT_EQUAL("foo", RSTRING_PTR(s.value()));
 }
 
 TESTCASE(construct_from_std_string)
 {
   String s(std::string("foo"));
   ASSERT_EQUAL(T_STRING, rb_type(s));
-  ASSERT_EQUAL("foo", RSTRING(s.value())->ptr);
+  ASSERT_EQUAL("foo", RSTRING_PTR(s.value()));
 }
 
 TESTCASE(format)
 {
   String s(String::format("%s %d", "foo", 42));
   ASSERT_EQUAL(T_STRING, rb_type(s));
-  ASSERT_EQUAL("foo 42", RSTRING(s.value())->ptr);
+  ASSERT_EQUAL("foo 42", RSTRING_PTR(s.value()));
 }
 
 TESTCASE(length)
@@ -77,7 +77,7 @@ TESTCASE(bracket)
 TESTCASE(c_str)
 {
   String s("foo");
-  ASSERT_EQUAL(RSTRING(s.value())->ptr, s.c_str());
+  ASSERT_EQUAL(RSTRING_PTR(s.value()), s.c_str());
 }
 
 TESTCASE(str)

data/test/test_VM.cpp

@@ -11,7 +11,7 @@ TESTSUITE(VM);
 
 SETUP(VM)
 {
-  std::vector<char *> args;
+  std::vector<const char *> args;
   args.push_back("test_VM");
   args.push_back("-e");
   args.push_back("puts \"HELLO\"");

data/test/test_global_functions.cpp

@@ -0,0 +1,45 @@
+#include "unittest.hpp"
+#include "rice/global_function.hpp"
+
+using namespace Rice;
+
+TESTSUITE(GlobalFunction);
+
+SETUP(GlobalFunction)
+{
+  ruby_init();
+}
+
+namespace {
+
+  bool method_to_wrap_called = false;
+  void method_to_wrap(Object self) {
+    method_to_wrap_called = true;
+  }
+
+  int method_with_args_arg0;
+
+  void method_with_args(Object self, int arg) {
+    method_with_args_arg0 = arg;
+  } 
+
+}
+
+TESTCASE(exposes_global_functions)
+{
+  define_global_function("method_to_wrap", &method_to_wrap);
+  Module m = Module(rb_mKernel);
+  m.call("method_to_wrap");
+
+  ASSERT(method_to_wrap_called);
+}
+
+TESTCASE(exposes_global_functions_with_arguments)
+{
+  define_global_function("method_with_args", &method_with_args);
+  Module m = Module(rb_mKernel);
+  m.call("method_with_args", 10);
+
+  ASSERT_EQUAL(10, method_with_args_arg0);
+}
+

data/test/test_rice.rb

@@ -6,6 +6,7 @@ class RiceTest < Test::Unit::TestCase
   VERBOSE = ARGV.include?('-v')
 
   EXEEXT = Config::CONFIG['EXEEXT']
+  RUBY = Config::CONFIG['RUBY_INSTALL_NAME']
 
   def test_unittest
     run_external_test("./unittest#{EXEEXT}")
@@ -15,6 +16,10 @@ class RiceTest < Test::Unit::TestCase
     run_external_test("./vm_unittest#{EXEEXT}")
   end
 
+  def test_vm_unittest
+    run_external_test("#{RUBY} test_multiple_extensions.rb")
+  end
+
   def run_external_test(executable)
     if VERBOSE then
       system(executable)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rice
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Paul Brannan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-22 00:00:00 -04:00
+date: 2009-04-27 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -18,7 +18,7 @@ email: curlypaul924@gmail.com
 executables: []
 
 extensions: 
-- configure
+- extconf.rb
 extra_rdoc_files: 
 - README
 files: 
@@ -28,6 +28,7 @@ files:
 - Doxyfile
 - doxygen.ac
 - doxygen.am
+- extconf.rb
 - bootstrap
 - configure.ac
 - configure
@@ -53,112 +54,127 @@ files:
 - sample/Makefile.in
 - test/Makefile.am
 - test/Makefile.in
-- rice/Module.cpp
+- rice/Exception_Base.hpp
+- rice/Constructor.hpp
+- rice/Object_defn.hpp
+- rice/VM.cpp
+- rice/VM.hpp
 - rice/Module.hpp
-- rice/Module.ipp
-- rice/Symbol.cpp
-- rice/Symbol.hpp
-- rice/Symbol.ipp
-- rice/to_from_ruby.hpp
-- rice/to_from_ruby.ipp
+- rice/Critical_Guard.ipp
+- rice/Identifier.ipp
+- rice/Exception_defn.hpp
+- rice/Data_Type_fwd.hpp
+- rice/config.hpp
 - rice/Builtin_Object.hpp
-- rice/Builtin_Object.ipp
-- rice/Data_Object.hpp
-- rice/Data_Object.ipp
+- rice/Exception_Base.ipp
+- rice/Symbol.cpp
+- rice/Class.cpp
 - rice/Array.hpp
-- rice/Array.ipp
-- rice/Hash.hpp
+- rice/Module_defn.hpp
 - rice/Hash.ipp
-- rice/Data_Type_fwd.hpp
-- rice/global_function.hpp
-- rice/global_function.ipp
-- rice/VM.cpp
-- rice/VM.hpp
-- rice/Jump_Tag.hpp
-- rice/String.cpp
-- rice/String.hpp
-- rice/Object.cpp
+- rice/Exception.hpp
+- rice/Struct.ipp
+- rice/protect.hpp
+- rice/Data_Object.hpp
+- rice/Class.ipp
+- rice/Module.cpp
+- rice/Hash.hpp
+- rice/Symbol.ipp
+- rice/Class_defn.hpp
 - rice/Object.hpp
-- rice/Object.ipp
-- rice/Enum.hpp
+- rice/Allocation_Strategies.hpp
 - rice/Enum.ipp
-- rice/protect.hpp
+- rice/Object.cpp
+- rice/Address_Registration_Guard_defn.hpp
+- rice/Builtin_Object.ipp
+- rice/String.hpp
 - rice/protect.ipp
-- rice/Class.cpp
-- rice/Class.hpp
-- rice/Class.ipp
-- rice/ruby_try_catch.hpp
-- rice/to_from_ruby_defn.hpp
-- rice/config.hpp
-- rice/Exception.cpp
-- rice/Exception.hpp
-- rice/Module_defn.hpp
-- rice/Address_Registration_Guard.hpp
-- rice/Address_Registration_Guard.ipp
-- rice/Data_Type_defn.hpp
-- rice/Object_defn.hpp
-- rice/Constructor.hpp
+- rice/Exception_Base_defn.hpp
+- rice/Array.ipp
 - rice/Require_Guard.hpp
+- rice/Module_impl.ipp
+- rice/Identifier.cpp
+- rice/Data_Object.ipp
+- rice/Exception.cpp
+- rice/Data_Type.ipp
+- rice/Symbol.hpp
 - rice/Builtin_Object_defn.hpp
+- rice/Struct.cpp
 - rice/Data_Type.cpp
+- rice/ruby_try_catch.hpp
 - rice/Data_Type.hpp
-- rice/Data_Type.ipp
-- rice/Module_impl.hpp
-- rice/Module_impl.ipp
-- rice/Address_Registration_Guard_defn.hpp
-- rice/Class_defn.hpp
+- rice/String.cpp
+- rice/Object.ipp
+- rice/Data_Type_defn.hpp
 - rice/Critical_Guard.hpp
-- rice/Critical_Guard.ipp
-- rice/Struct.cpp
+- rice/Jump_Tag.hpp
+- rice/to_from_ruby.ipp
+- rice/to_from_ruby.hpp
+- rice/Module_impl.hpp
 - rice/Struct.hpp
-- rice/Struct.ipp
-- rice/Exception_Base.hpp
-- rice/Exception_Base.ipp
-- rice/Allocation_Strategies.hpp
-- rice/Identifier.cpp
 - rice/Identifier.hpp
-- rice/Identifier.ipp
+- rice/global_function.hpp
+- rice/ruby_mark.hpp
+- rice/Data_Object_defn.hpp
+- rice/Address_Registration_Guard.hpp
+- rice/Class.hpp
+- rice/global_function.ipp
+- rice/to_from_ruby_defn.hpp
+- rice/Address_Registration_Guard.ipp
+- rice/Enum.hpp
+- rice/Module.ipp
 - rice/generate_code.rb
+- rice/rubypp.rb
 - rice/config.hpp.in
-- rice/detail/Not_Copyable.hpp
-- rice/detail/wrap_function.hpp
+- rice/detail/creation_funcs.hpp
 - rice/detail/wrap_function.ipp
-- rice/detail/object_call.hpp
-- rice/detail/object_call.ipp
 - rice/detail/check_ruby_type.cpp
+- rice/detail/demangle.cpp
 - rice/detail/check_ruby_type.hpp
-- rice/detail/creation_funcs.hpp
-- rice/detail/creation_funcs.ipp
-- rice/detail/from_ruby.hpp
-- rice/detail/from_ruby.ipp
-- rice/detail/method_data.cpp
-- rice/detail/method_data.hpp
-- rice/detail/default_allocation_func.hpp
-- rice/detail/default_allocation_func.ipp
-- rice/detail/rubysig.hpp
-- rice/detail/ruby.hpp
+- rice/detail/Auto_Member_Function_Wrapper.ipp
+- rice/detail/mininode.cpp
+- rice/detail/Auto_Member_Function_Wrapper.hpp
 - rice/detail/protect.cpp
+- rice/detail/node.hpp
+- rice/detail/Wrapped_Function.hpp
 - rice/detail/protect.hpp
-- rice/detail/env.hpp
+- rice/detail/mininode.cpp.rpp
+- rice/detail/demangle.hpp
+- rice/detail/define_method_and_auto_wrap.hpp
+- rice/detail/default_allocation_func.ipp
+- rice/detail/wrap_function.hpp
+- rice/detail/Caster.hpp
+- rice/detail/object_call.hpp
+- rice/detail/from_ruby.ipp
+- rice/detail/ruby.hpp
+- rice/detail/st.hpp
+- rice/detail/from_ruby.hpp
 - rice/detail/win32.hpp
+- rice/detail/mininode.hpp.rpp
+- rice/detail/creation_funcs.ipp
 - rice/detail/to_ruby.hpp
-- rice/detail/to_ruby.ipp
-- rice/detail/Caster.hpp
-- rice/detail/Iterator_Definer.hpp
 - rice/detail/remove_const.hpp
-- rice/detail/Exception_Handler.hpp
-- rice/detail/Auto_Member_Function_Wrapper.hpp
-- rice/detail/Auto_Member_Function_Wrapper.ipp
-- rice/detail/st.hpp
-- rice/detail/Wrapped_Function.hpp
-- rice/detail/demangle.cpp
-- rice/detail/demangle.hpp
 - rice/detail/Auto_Function_Wrapper.hpp
-- rice/detail/Auto_Function_Wrapper.ipp
-- rice/detail/node.hpp
-- rice/detail/define_method_and_auto_wrap.hpp
+- rice/detail/env.hpp
+- rice/detail/method_data.cpp.rpp
+- rice/detail/to_ruby.ipp
+- rice/detail/method_data.hpp
+- rice/detail/Exception_Handler.hpp
+- rice/detail/object_call.ipp
+- rice/detail/mininode.hpp
+- rice/detail/rubysig.hpp
+- rice/detail/ruby_version_code.hpp
+- rice/detail/method_data.cpp
+- rice/detail/Iterator.hpp
+- rice/detail/Not_Copyable.hpp
+- rice/detail/Exception_Handler_defn.hpp
 - rice/detail/define_method_and_auto_wrap.ipp
+- rice/detail/Auto_Function_Wrapper.ipp
+- rice/detail/Exception_Handler.ipp
+- rice/detail/default_allocation_func.hpp
+- rice/detail/ruby_version_code.hpp.in
 - ruby/lib/mkmf-rice.rb.in
+- ruby/lib/version.rb
 - sample/enum/extconf.rb
 - sample/enum/sample_enum.cpp
 - sample/enum/test.rb
@@ -168,27 +184,28 @@ files:
 - sample/inheritance/extconf.rb
 - sample/inheritance/animals.cpp
 - sample/inheritance/test.rb
+- test/test_Exception.cpp
+- test/test_To_From_Ruby.cpp
+- test/test_String.cpp
+- test/test_Data_Object.cpp
+- test/test_Critical_Guard.cpp
+- test/test_VM.cpp
 - test/test_Array.cpp
+- test/test_global_functions.cpp
+- test/test_Struct.cpp
+- test/test_Builtin_Object.cpp
 - test/test_Module.cpp
-- test/test_Symbol.cpp
+- test/test_Allocation_Strategies.cpp
 - test/test_Identifier.cpp
-- test/test_Hash.cpp
-- test/test_Data_Object.cpp
-- test/unittest.cpp
 - test/unittest.hpp
-- test/test_VM.cpp
-- test/test_Allocation_Strategies.cpp
-- test/test_Class.cpp
-- test/test_Critical_Guard.cpp
-- test/test_Enum.cpp
-- test/test_String.cpp
-- test/test_Object.cpp
-- test/test_Builtin_Object.cpp
 - test/test_Constructor.cpp
 - test/test_Jump_Tag.cpp
-- test/test_To_From_Ruby.cpp
-- test/test_Exception.cpp
-- test/test_Struct.cpp
+- test/test_Class.cpp
+- test/test_Object.cpp
+- test/test_Hash.cpp
+- test/test_Symbol.cpp
+- test/unittest.cpp
+- test/test_Enum.cpp
 - test/test_Address_Registration_Guard.cpp
 has_rdoc: false
 homepage: http://rice.rubyforge.org/
@@ -212,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rice
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Ruby Interface for C++ Extensions