rice 1.3.0 → 1.3.1

data/test/test_Module.cpp

@@ -4,6 +4,7 @@
 #include "rice/Array.hpp"
 #include "rice/Arg.hpp"
 #include "rice/global_function.hpp"
+#include "rice/Constructor.hpp"
 
 using namespace Rice;
 
@@ -256,13 +257,13 @@ TESTCASE(mod_name_anonymous)
 /**
  * Tests for default arguments
  */
-namespace 
+namespace
 {
   int defaults_method_one_arg1;
   int defaults_method_one_arg2;
   bool defaults_method_one_arg3 = false;
 
-  void defaults_method_one(int arg1, int arg2 = 3, bool arg3 = true) 
+  void defaults_method_one(int arg1, int arg2 = 3, bool arg3 = true)
   {
     defaults_method_one_arg1 = arg1;
     defaults_method_one_arg2 = arg2;
@@ -410,15 +411,10 @@ namespace {
   }
 }
 
-template<>
-std::string* from_ruby<std::string*>(Rice::Object x) {
-  return new std::string(from_ruby<char const*>(x));
-}
-
-TESTCASE(define_method_works_with_reference_arguments) 
+TESTCASE(define_method_works_with_reference_arguments)
 {
   Module m(anonymous_module());
-  m.define_module_function("foo", &with_defaults_and_references, 
+  m.define_module_function("foo", &with_defaults_and_references,
       (Arg("x"), Arg("doIt") = false));
 
   m.call("foo", "test");
@@ -427,6 +423,38 @@ TESTCASE(define_method_works_with_reference_arguments)
   ASSERT(!with_defaults_and_references_doIt);
 }
 
+namespace {
+  class ReturnTest { };
+
+  class Factory {
+    public:
+      Factory() { returnTest_ = new ReturnTest(); }
+
+      const ReturnTest& getReturnTest() const {
+        return *returnTest_;
+      }
+
+     private:
+      const ReturnTest* returnTest_;
+  };
+}
+
+TESTCASE(define_method_works_with_const_reference_return)
+{
+  define_class<ReturnTest>("ReturnTest")
+    .define_constructor(Constructor<ReturnTest>());
+
+  define_class<Factory>("Factory")
+    .define_constructor(Constructor<Factory>())
+    .define_method("get_return_test", &Factory::getReturnTest);
+
+  Module m(anonymous_module());
+
+  Object result = m.instance_eval("Factory.new.get_return_test");
+
+  ASSERT_EQUAL("ReturnTest", result.class_of().name().c_str());
+}
+
 /*
 namespace {
   float with_reference_defaults_x;
@@ -439,10 +467,10 @@ namespace {
   }
 }
 
-TESTCASE(define_method_works_with_reference_const_default_values) 
+TESTCASE(define_method_works_with_reference_const_default_values)
 {
   Module m(anonymous_module());
-  m.define_module_function("bar", &with_reference_defaults, 
+  m.define_module_function("bar", &with_reference_defaults,
       (Arg("x"), Arg("str") = std::string("testing")));
 
   m.call("bar", 3);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rice
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Paul Brannan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -05:00
+date: 2010-01-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency