rice 2.1.3 → 4.0.2

data/test/test_global_functions.cpp

@@ -1,5 +1,6 @@
 #include "unittest.hpp"
-#include "rice/global_function.hpp"
+#include "embed_ruby.hpp"
+#include <rice/rice.hpp>
 
 using namespace Rice;
 
@@ -7,40 +8,60 @@ TESTSUITE(GlobalFunction);
 
 SETUP(GlobalFunction)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 namespace {
 
-  bool method_to_wrap_called = false;
-  void method_to_wrap(Object self) {
-    method_to_wrap_called = true;
+  bool no_args()
+  {
+    return true;
   }
 
-  int method_with_args_arg0;
-
-  void method_with_args(Object self, int arg) {
-    method_with_args_arg0 = arg;
+  int int_arg(int arg)
+  {
+    return 2 * arg;
   }
-
 }
 
-TESTCASE(exposes_global_functions)
+TESTCASE(no_args)
 {
-  define_global_function("method_to_wrap", &method_to_wrap);
+  define_global_function("no_args", &no_args);
   Module m = Module(rb_mKernel);
-  m.call("method_to_wrap");
+  Object result = m.call("no_args");
+  ASSERT_EQUAL(Qtrue, result.value());
+}
+
+TESTCASE(no_args_lambda)
+{
+  define_global_function("no_args", []()
+    {
+      return no_args();
+    });
 
-  ASSERT(method_to_wrap_called);
+  Module m = Module(rb_mKernel);
+  Object result = m.call("no_args");
+  ASSERT_EQUAL(Qtrue, result.value());
 }
 
-TESTCASE(exposes_global_functions_with_arguments)
+TESTCASE(int_arg)
 {
-  define_global_function("method_with_args", &method_with_args);
+  define_global_function("method_with_args", &int_arg);
   Module m = Module(rb_mKernel);
-  m.call("method_with_args", 10);
+  Object result = m.call("method_with_args", 10);
+  ASSERT_EQUAL(20, detail::From_Ruby<int>().convert(result));
+}
 
-  ASSERT_EQUAL(10, method_with_args_arg0);
+TESTCASE(int_arg_lambda)
+{
+  define_global_function("method_with_args", [](int value)
+    {
+      return int_arg(value);
+    });
+
+  Module m = Module(rb_mKernel);
+  Object result = m.call("method_with_args", 10);
+  ASSERT_EQUAL(20, detail::From_Ruby<int>().convert(result));
 }
 
 namespace
@@ -64,7 +85,7 @@ namespace
 
 TESTCASE(default_arguments_for_define_global_function)
 {
-  define_global_function("foo", &defaults_method_one, (Arg("arg1"), Arg("arg2") = (int)3, Arg("arg3") = (bool)true));
+  define_global_function("foo", &defaults_method_one, Arg("arg1"), Arg("arg2") = (int)3, Arg("arg3") = (bool)true);
   Module m(rb_mKernel);
 
   m.call("foo", 2);
@@ -88,7 +109,7 @@ TESTCASE(default_arguments_for_define_global_function)
 
 TESTCASE(default_arguments_for_define_global_function_and_returning)
 {
-  define_global_function("foo_ret", &defaults_returns, (Arg("arg1"), Arg("arg2") = (int)3));
+  define_global_function("foo_ret", &defaults_returns, Arg("arg1"), Arg("arg2") = (int)3);
   Module m(rb_mKernel);
 
   Object o = m.call("foo_ret", 2);

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;

data/test/unittest.hpp

@@ -15,10 +15,6 @@
 #include <sstream>
 #include <iostream>
 
-#if !defined(_MSC_VER)
-using namespace std;
-#endif
-
 class Failure
 {
 public:

metadata

@@ -1,181 +1,147 @@
 --- !ruby/object:Gem::Specification
 name: rice
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 4.0.2
 platform: ruby
 authors:
 - Paul Brannan
 - Jason Roelofs
-autorequire: 
+- Charlie Savage
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
-dependencies: []
+date: 2021-05-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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
+  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
-  Ruby extensions with C++ easier.  It is similar to Boost.Python in many
-  ways, but also attempts to provide an object-oriented interface to all
-  of the Ruby C API.
+  Ruby extensions with C++ easier.
 email:
 - curlypaul924@gmail.com
 - jasonroelofs@gmail.com
+- cfis@savagexi.com
 executables: []
-extensions:
-- extconf.rb
+extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- CHANGELOG.md
+- CONTRIBUTORS.md
 - COPYING
-- Doxyfile
-- Makefile.am
-- Makefile.in
+- Gemfile
 - README.md
-- README.mingw
 - Rakefile
-- aclocal.m4
-- bootstrap
-- check_stdcxx_11.ac
-- config.guess
-- config.sub
-- configure
-- configure.ac
-- depcomp
-- doxygen.ac
-- doxygen.am
-- extconf.rb
-- install-sh
-- missing
-- post-autoconf.rb
-- post-automake.rb
-- rice/Address_Registration_Guard.cpp
+- include/rice/rice.hpp
+- include/rice/stl.hpp
+- lib/mkmf-rice.rb
+- lib/version.rb
 - rice/Address_Registration_Guard.hpp
 - rice/Address_Registration_Guard.ipp
 - rice/Address_Registration_Guard_defn.hpp
 - rice/Arg.hpp
-- rice/Arg_impl.hpp
-- rice/Arg_operators.cpp
-- rice/Arg_operators.hpp
-- rice/Array.hpp
-- rice/Array.ipp
-- rice/Builtin_Object.hpp
-- rice/Builtin_Object.ipp
-- rice/Builtin_Object_defn.hpp
-- rice/Class.cpp
-- rice/Class.hpp
-- rice/Class.ipp
-- rice/Class_defn.hpp
+- rice/Arg.ipp
 - rice/Constructor.hpp
 - rice/Data_Object.hpp
 - rice/Data_Object.ipp
 - rice/Data_Object_defn.hpp
-- rice/Data_Type.cpp
 - rice/Data_Type.hpp
 - rice/Data_Type.ipp
 - rice/Data_Type_defn.hpp
-- rice/Data_Type_fwd.hpp
-- rice/Director.cpp
 - rice/Director.hpp
 - rice/Enum.hpp
 - rice/Enum.ipp
-- rice/Exception.cpp
 - rice/Exception.hpp
-- rice/Exception_Base.hpp
-- rice/Exception_Base.ipp
-- rice/Exception_Base_defn.hpp
+- rice/Exception.ipp
 - rice/Exception_defn.hpp
-- rice/Hash.hpp
-- rice/Hash.ipp
-- rice/Identifier.cpp
 - rice/Identifier.hpp
 - rice/Identifier.ipp
-- rice/Jump_Tag.hpp
-- rice/Makefile.am
-- rice/Makefile.in
-- rice/Module.cpp
-- rice/Module.hpp
-- rice/Module.ipp
-- rice/Module_defn.hpp
-- rice/Module_impl.hpp
-- rice/Module_impl.ipp
-- rice/Object.cpp
-- rice/Object.hpp
-- rice/Object.ipp
-- rice/Object_defn.hpp
-- rice/Require_Guard.hpp
-- rice/String.cpp
-- rice/String.hpp
-- rice/Struct.cpp
-- rice/Struct.hpp
-- rice/Struct.ipp
-- rice/Symbol.cpp
-- rice/Symbol.hpp
-- rice/Symbol.ipp
-- rice/config.hpp
-- rice/config.hpp.in
-- rice/detail/Arguments.hpp
-- rice/detail/Auto_Function_Wrapper.hpp
-- rice/detail/Auto_Function_Wrapper.ipp
-- rice/detail/Auto_Member_Function_Wrapper.hpp
-- rice/detail/Auto_Member_Function_Wrapper.ipp
-- rice/detail/Caster.hpp
+- rice/Return.hpp
+- rice/Return.ipp
 - rice/detail/Exception_Handler.hpp
 - rice/detail/Exception_Handler.ipp
 - rice/detail/Exception_Handler_defn.hpp
 - rice/detail/Iterator.hpp
-- rice/detail/Not_Copyable.hpp
-- rice/detail/Wrapped_Function.hpp
-- rice/detail/cfp.hpp
-- rice/detail/cfp.ipp
-- rice/detail/check_ruby_type.cpp
-- rice/detail/check_ruby_type.hpp
-- rice/detail/creation_funcs.hpp
-- rice/detail/creation_funcs.ipp
+- rice/detail/Iterator.ipp
+- rice/detail/Jump_Tag.hpp
+- rice/detail/MethodInfo.hpp
+- rice/detail/MethodInfo.ipp
+- rice/detail/NativeAttribute.hpp
+- rice/detail/NativeAttribute.ipp
+- rice/detail/NativeFunction.hpp
+- rice/detail/NativeFunction.ipp
+- rice/detail/RubyFunction.hpp
+- rice/detail/RubyFunction.ipp
+- rice/detail/Type.hpp
+- rice/detail/Type.ipp
+- rice/detail/TypeRegistry.hpp
+- rice/detail/TypeRegistry.ipp
+- rice/detail/Wrapper.hpp
+- rice/detail/Wrapper.ipp
 - rice/detail/default_allocation_func.hpp
 - rice/detail/default_allocation_func.ipp
-- rice/detail/define_method_and_auto_wrap.hpp
-- rice/detail/define_method_and_auto_wrap.ipp
-- rice/detail/demangle.cpp
-- rice/detail/demangle.hpp
-- rice/detail/env.hpp
 - rice/detail/from_ruby.hpp
 - rice/detail/from_ruby.ipp
-- rice/detail/method_data.cpp
+- rice/detail/from_ruby_defn.hpp
+- rice/detail/function_traits.hpp
 - 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/method_data.ipp
+- rice/detail/rice_traits.hpp
 - rice/detail/ruby.hpp
-- rice/detail/ruby_version_code.hpp
-- rice/detail/ruby_version_code.hpp.in
-- 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/detail/to_ruby_defn.hpp
+- rice/forward_declares.ipp
 - rice/global_function.hpp
 - rice/global_function.ipp
-- rice/protect.hpp
-- rice/protect.ipp
+- rice/rice.hpp
 - rice/ruby_mark.hpp
 - rice/ruby_try_catch.hpp
-- rice/rubypp.rb
-- rice/to_from_ruby.hpp
-- rice/to_from_ruby.ipp
-- rice/to_from_ruby_defn.hpp
-- ruby.ac
-- ruby/Makefile.am
-- ruby/Makefile.in
-- ruby/lib/Makefile.am
-- ruby/lib/Makefile.in
-- ruby/lib/mkmf-rice.rb.in
-- ruby/lib/version.rb
-- sample/Makefile.am
-- sample/Makefile.in
+- rice/stl.hpp
+- 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
@@ -185,17 +151,21 @@ files:
 - sample/map/extconf.rb
 - sample/map/map.cpp
 - sample/map/test.rb
-- test/Makefile.am
-- test/Makefile.in
-- test/ext/Makefile.am
-- test/ext/Makefile.in
+- test/embed_ruby.cpp
+- test/embed_ruby.hpp
 - test/ext/t1/Foo.hpp
 - test/ext/t1/extconf.rb
 - test/ext/t1/t1.cpp
 - test/ext/t2/extconf.rb
 - test/ext/t2/t2.cpp
+- test/extconf.rb
+- test/ruby/test_callbacks_sample.rb
+- test/ruby/test_multiple_extensions.rb
+- test/ruby/test_multiple_extensions_same_class.rb
+- test/ruby/test_multiple_extensions_with_inheritance.rb
 - test/test_Address_Registration_Guard.cpp
 - test/test_Array.cpp
+- test/test_Attribute.cpp
 - test/test_Builtin_Object.cpp
 - test/test_Class.cpp
 - test/test_Constructor.cpp
@@ -206,41 +176,56 @@ files:
 - test/test_Exception.cpp
 - test/test_Hash.cpp
 - test/test_Identifier.cpp
+- test/test_Inheritance.cpp
+- test/test_Iterator.cpp
 - test/test_Jump_Tag.cpp
+- test/test_Keep_Alive.cpp
 - test/test_Memory_Management.cpp
 - test/test_Module.cpp
 - test/test_Object.cpp
+- test/test_Ownership.cpp
+- test/test_Self.cpp
+- test/test_Stl_Optional.cpp
+- test/test_Stl_Pair.cpp
+- test/test_Stl_SmartPointer.cpp
+- test/test_Stl_String.cpp
+- test/test_Stl_Vector.cpp
 - test/test_String.cpp
 - test/test_Struct.cpp
 - test/test_Symbol.cpp
 - test/test_To_From_Ruby.cpp
 - test/test_global_functions.cpp
-- test/test_rice.rb
 - test/unittest.cpp
 - test/unittest.hpp
 homepage: https://github.com/jasonroelofs/rice
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/jasonroelofs/rice/issues
+  changelog_uri: https://github.com/jasonroelofs/rice/blob/master/CHANGELOG.md
+  documentation_uri: https://jasonroelofs.com/rice
+  source_code_uri: https://github.com/jasonroelofs/rice
+post_install_message:
 rdoc_options: []
 require_paths:
-- ruby/lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Ruby Interface for C++ Extensions
 test_files:
-- test/test_rice.rb
+- test/ruby/test_callbacks_sample.rb
+- test/ruby/test_multiple_extensions.rb
+- test/ruby/test_multiple_extensions_same_class.rb
+- test/ruby/test_multiple_extensions_with_inheritance.rb