rice 2.2.0 → 3.0.0

data/test/test_Builtin_Object.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Builtin_Object.hpp"
 #include "rice/Class.hpp"
 
@@ -8,7 +9,7 @@ TESTSUITE(Builtin_Object);
 
 SETUP(Builtin_Object)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(construct_with_object)

data/test/test_Class.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Class.hpp"
 #include "rice/Constructor.hpp"
 #include "rice/protect.hpp"
@@ -15,7 +16,7 @@ TESTSUITE(Class);
 
 SETUP(Class)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(construct)

data/test/test_Data_Object.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Data_Object.hpp"
 #include "rice/Data_Type.hpp"
 #include "rice/Exception.hpp"
@@ -22,7 +23,7 @@ void ruby_mark(Foo * foo)
 
 SETUP(Data_Object)
 {
-  ruby_init();
+  embed_ruby();
 
   if(!Data_Type<Foo>::is_bound())
   {

data/test/test_Data_Type.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Data_Type.hpp"
 #include "rice/Exception.hpp"
 #include "rice/Constructor.hpp"
@@ -63,7 +64,7 @@ namespace {
 
 SETUP(Data_Type)
 {
-  ruby_init();
+  embed_ruby();
 
   define_class<Listener>("Listener")
     .define_constructor(Constructor<Listener>())

data/test/test_Director.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Exception.hpp"
 #include "rice/Director.hpp"
 #include "rice/Constructor.hpp"
@@ -87,7 +88,7 @@ namespace {
 
 SETUP(Director)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(exposes_worker_as_instantiatable_class)

data/test/test_Enum.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Enum.hpp"
 #include "rice/Array.hpp"
 #include "rice/String.hpp"
@@ -26,7 +27,7 @@ namespace
 
 SETUP(Enum)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(copy_construct)

data/test/test_Exception.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Exception.hpp"
 #include "rice/String.hpp"
 
@@ -8,7 +9,7 @@ TESTSUITE(Exception);
 
 SETUP(Exception)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(construct_from_exception_object)

data/test/test_Hash.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Hash.hpp"
 #include "rice/global_function.hpp"
 #include <vector>
@@ -11,7 +12,7 @@ TESTSUITE(Hash);
 
 SETUP(Hash)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(default_construct)

data/test/test_Identifier.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Identifier.hpp"
 #include "rice/Symbol.hpp"
 
@@ -8,7 +9,7 @@ TESTSUITE(Identifier);
 
 SETUP(Identifier)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(construct_from_id)

data/test/test_Memory_Management.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/String.hpp"
 #include "rice/Class.hpp"
 #include "rice/global_function.hpp"
@@ -9,7 +10,7 @@ TESTSUITE(Memory_Management);
 
 SETUP(Memory_Management)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 namespace

data/test/test_Module.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Module.hpp"
 #include "rice/Exception.hpp"
 #include "rice/Array.hpp"
@@ -12,7 +13,7 @@ TESTSUITE(Module);
 
 SETUP(Object)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(construct_from_value)

data/test/test_Object.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Object.hpp"
 #include "rice/Class.hpp"
 #include "rice/String.hpp"
@@ -10,7 +11,7 @@ TESTSUITE(Object);
 
 SETUP(Object)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(default_construct)
@@ -146,3 +147,14 @@ TESTCASE(rb_type)
   ASSERT_EQUAL(T_UNDEF, Object(Qundef).rb_type());
 }
 
+TESTCASE(call_no_arguments)
+{
+  Object three = to_ruby(3).call("to_s");
+  ASSERT_EQUAL(String("3"), three);
+}
+
+TESTCASE(call_return_rice_object)
+{
+  Object three = to_ruby(1).call("+", 2);
+  ASSERT_EQUAL(to_ruby(3), three);
+}

data/test/test_String.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/String.hpp"
 #include "rice/global_function.hpp"
 
@@ -8,7 +9,7 @@ TESTSUITE(String);
 
 SETUP(String)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(default_construct)

data/test/test_Struct.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Struct.hpp"
 #include "rice/Symbol.hpp"
 #include "rice/global_function.hpp"
@@ -22,7 +23,7 @@ namespace
 
 SETUP(Struct)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(default_construct)

data/test/test_Symbol.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Symbol.hpp"
 #include "rice/Identifier.hpp"
 
@@ -8,7 +9,7 @@ TESTSUITE(Symbol);
 
 SETUP(Symbol)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(construct_from_symbol)

data/test/test_To_From_Ruby.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/to_from_ruby.hpp"
 #include "rice/String.hpp"
 #include "rice/Array.hpp"
@@ -12,7 +13,7 @@ TESTSUITE(To_From_Ruby);
 
 SETUP(To_From_Ruby)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(object_to_ruby)

data/test/test_global_functions.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/global_function.hpp"
 
 using namespace Rice;
@@ -7,7 +8,7 @@ TESTSUITE(GlobalFunction);
 
 SETUP(GlobalFunction)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 namespace {

data/test/test_rice.rb

@@ -26,6 +26,10 @@ class RiceTest < Minitest::Test
     run_external_test("#{RUBY} test_multiple_extensions_same_class.rb")
   end
 
+  def test_callbacks_sample
+    run_external_test("#{RUBY} test_callbacks_sample.rb")
+  end
+
   def run_external_test(executable)
     if VERBOSE then
       system(executable)

data/test/unittest.cpp

@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <iostream>
 #include <map>
 #include "unittest.hpp"
@@ -85,18 +86,43 @@ run(Test_Result & result)
   }
 }
 
-int main()
+char* findOption(char** begin, char** end, const std::string& option)
 {
+  char** itr = std::find(begin, end, option);
+  if (itr != end && ++itr != end)
+  {
+    return *itr;
+  }
+  return nullptr;
+}
+
+int main(int argc, char** argv)
+{
+  std::vector<Test_Suite> suites;
+
+  char* moduleName = findOption(argv, argv + argc, "--suite");
+  if (moduleName)
+  {
+    Test_Suite suite = test_suites()[moduleName];
+    suites.push_back(suite);
+  }
+  else
+  {
+    std::transform(test_suites().begin(), test_suites().end(),
+      std::back_inserter(suites),
+      [](auto& pair)
+      {
+        return pair.second;
+      });
+  }
+
   Test_Result result;
   size_t num_tests = 0;
-
-  for(Test_Suites::iterator it = test_suites().begin(),
-      end = test_suites().end();
-      it != end;
-      ++it)
+  
+  for (Test_Suite& suite : suites)
   {
-    it->second.run(result);
-    num_tests += it->second.size();
+    suite.run(result);
+    num_tests += suite.size();
   }
 
   std::cout << std::endl;

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rice
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Paul Brannan
 - Jason Roelofs
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Rice is a C++ interface to Ruby's C API.  It provides a type-safe and
   exception-safe interface in order to make embedding Ruby and writing
@@ -76,8 +90,8 @@ files:
 - README.mingw
 - Rakefile
 - aclocal.m4
+- ax_cxx_compile_stdcxx.m4
 - bootstrap
-- check_stdcxx_11.ac
 - config.guess
 - config.sub
 - configure
@@ -185,8 +199,6 @@ files:
 - rice/detail/method_data.cpp
 - rice/detail/method_data.hpp
 - rice/detail/node.hpp
-- rice/detail/object_call.hpp
-- rice/detail/object_call.ipp
 - rice/detail/protect.cpp
 - rice/detail/protect.hpp
 - rice/detail/ruby.hpp
@@ -195,10 +207,8 @@ files:
 - rice/detail/st.hpp
 - rice/detail/to_ruby.hpp
 - rice/detail/to_ruby.ipp
-- rice/detail/traits.hpp
 - rice/detail/win32.hpp
 - rice/detail/wrap_function.hpp
-- rice/detail/wrap_function.ipp
 - rice/global_function.hpp
 - rice/global_function.ipp
 - rice/protect.hpp
@@ -218,6 +228,9 @@ files:
 - ruby/lib/version.rb
 - sample/Makefile.am
 - sample/Makefile.in
+- sample/callbacks/extconf.rb
+- sample/callbacks/sample_callbacks.cpp
+- sample/callbacks/test.rb
 - sample/enum/extconf.rb
 - sample/enum/sample_enum.cpp
 - sample/enum/test.rb
@@ -229,6 +242,8 @@ files:
 - sample/map/test.rb
 - test/Makefile.am
 - test/Makefile.in
+- test/embed_ruby.cpp
+- test/embed_ruby.hpp
 - test/ext/Makefile.am
 - test/ext/Makefile.in
 - test/ext/t1/Foo.hpp
@@ -264,7 +279,7 @@ homepage: https://github.com/jasonroelofs/rice
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - ruby/lib
@@ -279,8 +294,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Ruby Interface for C++ Extensions
 test_files: