Merge pull request #286 from ruby-rice/dev

Dev

Author: cfis

FindRuby.cmake

@@ -378,7 +378,7 @@ set(_Ruby_POSSIBLE_LIB_NAMES
 )
 
 if (WIN32 OR MSYS)
-  set(_Ruby_POSSIBLE_RUNTIMES "ucrt;msvcrt;vcruntime140;vcruntime140_1;msvcr${MSVC_TOOLSET_VERSION}")
+  set(_Ruby_POSSIBLE_RUNTIMES "ucrt;msvcrt;vcruntime140;vcruntime140_1;vcruntime${MSVC_TOOLSET_VERSION}")
   set(_Ruby_POSSIBLE_VERSION_SUFFIXES "${_Ruby_VERSION_NODOT};${_Ruby_VERSION_NODOT_ZERO_PATCH}")
   # Under MSYS CMAKE_SIZEOF_VOID_P is unset so add prefixes for 32 and 64 architectures
   set(_Ruby_POSSIBLE_ARCH_PREFIXES "lib;libx64-;x64-")

test/test_Attribute.cpp

@@ -53,6 +53,21 @@ namespace
   bool globalBool = true;
   const DataStruct* globalStruct = new DataStruct();
 
+  class VecStruct
+  {
+  public:
+    std::vector<double> vector;
+
+    VecStruct(std::vector<double> aVector) : vector(aVector)
+    {
+    }
+
+    size_t vecSize()
+    {
+      return this->vector.size();
+    }
+  };
+
 } // namespace
 
 TESTCASE(attributes)
@@ -102,6 +117,25 @@ TESTCASE(attributes)
   ASSERT_EQUAL("Set a string", detail::From_Ruby<std::string>().convert(result.value()));
 }
 
+TESTCASE(vector)
+{
+  // See https ://github.com/ruby-rice/rice/issues/283
+  Module m = define_module("Testing");
+
+  define_class<VecStruct>("VecStruct")
+    .define_constructor(Constructor<VecStruct, std::vector<double>>())
+    .define_attr("vector", &VecStruct::vector, Rice::AttrAccess::Read)
+    .define_method("vector_size", &VecStruct::vecSize);
+
+  std::string code = R"(struct = VecStruct.new([1, 2])
+                        # Access the attribute
+                        array =  struct.vector.to_a
+                        struct.vector_size)";
+
+  Object result = m.module_eval(code);
+  ASSERT_EQUAL(2, detail::From_Ruby<size_t>().convert(result));
+}
+
 TESTCASE(const_attribute)
 {
   Class c = define_class<DataStruct>("DataStruct")