rice 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d302eb67c62576943948c960ff3fbd08b58488cd
-  data.tar.gz: 890eec0ab8be02d12ee4780d284c92c9c3f03a66
+  metadata.gz: bd0d5de4b2af1de7c8f7e812f7e3266b83a18054
+  data.tar.gz: 2a719d9807aac1bfe4207d39312adc9447aa1f8a
 SHA512:
-  metadata.gz: 365b2406ce20a999ebc98baa9d1da1847e278928ed498212b9f290e6a400e218b4dbd2f7c0be1da02fb68649e73a3a79d2da8914a39e9e9a5b9bb00b5c6f37ae
-  data.tar.gz: 5de69a6bf6ff0b4771f28c94fd399a141bddbd1a1b253ebede89468d4eb802708379c8c7ab85531d4842cff8c155dfc22856611b7e06c8e59d863bb64c338a47
+  metadata.gz: bca41abf092893dabf1ba768515e9287da6e1d3b617bbc866a9f8ace30ac509229cf5f033c183985db7821779e688dd7854b80a2c27fcd85d7877a9ca0c32c21
+  data.tar.gz: 7d47b281817209c3838a1c55b7be6c2984e851cf605ba91626fb73e84053e05b9c056c1fd714f28e66c12d69c962d2ac8c82acbfc7bf3707c2efb9bfc6f4ce59

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2014 Paul Brannan <pbrannan@atdesk.com>,
+Copyright (C) 2017 Paul Brannan <pbrannan@atdesk.com>,
   Jason Roelofs <jasongroelofs@gmail.com>
 
 Redistribution and use in source and binary forms, with or without

data/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "Rice"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.1.0
+PROJECT_NUMBER         = 2.1.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

data/rice/Enum.ipp

@@ -75,7 +75,7 @@ initialize(
     .define_method("to_i", to_i)
     .define_method("inspect", inspect)
     .define_method("<=>", compare)
-    //.define_method("hash", hash)
+    .define_method("hash", hash)
     .define_method("eql?", eql)
     .define_method("==", eql)
     .define_method("===", eql)

data/rice/Hash.ipp

@@ -292,13 +292,13 @@ begin() const
 inline Rice::Hash::iterator Rice::Hash::
 end()
 {
-  return iterator(*this, size());
+  return iterator(*this, (int)size());
 }
 
 inline Rice::Hash::const_iterator Rice::Hash::
 end() const
 {
-  return const_iterator(*this, size());
+  return const_iterator(*this, (int)size());
 }
 
 inline bool Rice::

data/rice/Module_impl.ipp

@@ -285,7 +285,7 @@ bool
 Rice::Module_impl<Base_T, Derived_T>::
 const_defined(Identifier name) const
 {
-  int result = protect(rb_const_defined, *this, name);
+  size_t result = protect(rb_const_defined, *this, name);
   return bool(result);
 }
 

data/rice/Object.cpp

@@ -117,7 +117,7 @@ vcall(
     a[i] = it->value();
   }
 
-  return protect(rb_funcall3, *this, id, args.size(), &a[0]);
+  return protect(rb_funcall3, *this, id, (int)args.size(), &a[0]);
 }
 
 void Rice::Object::

data/rice/detail/ruby_version_code.hpp

@@ -1,6 +1,6 @@
 #ifndef Rice__detail__ruby_version_code__hpp
 #define Rice__detail__ruby_version_code__hpp
 
-#define RICE__RUBY_VERSION_CODE 223
+#define RICE__RUBY_VERSION_CODE 231
 
 #endif // Rice__detail__ruby_version_code__hpp

data/ruby/lib/version.rb

@@ -1,3 +1,3 @@
 module Rice
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/test/test_Enum.cpp

@@ -3,6 +3,7 @@
 #include "rice/Array.hpp"
 #include "rice/String.hpp"
 #include "rice/Constructor.hpp"
+#include "rice/global_function.hpp"
 #include <iostream>
 
 using namespace Rice;
@@ -147,14 +148,12 @@ TESTCASE(different_objects_eql)
   ASSERT_EQUAL(true, red1 == red2);
 }
 
-/*
 TESTCASE(hash)
 {
   Enum<Color> rb_cColor = define_color_enum();
   Data_Object<Color> red(new Color(RED));
   ASSERT_EQUAL(to_ruby(int(RED)), red.call("hash"));
 }
-*/
 
 TESTCASE(from_int)
 {
@@ -193,3 +192,24 @@ TESTCASE(nested_enums)
   ASSERT_EQUAL(to_ruby(int(2)), Object(protect(rb_eval_string, "Inner::Props::VALUE3.to_i")));
 }
 
+namespace
+{
+  Color getEnum()
+  {
+    return GREEN;
+  }
+}
+
+TESTCASE(return_enum_value_to_ruby)
+{
+  Enum<Color> rb_cColor = define_color_enum();
+  define_global_function("get_enum", &getEnum);
+
+  ASSERT_EQUAL(
+    Data_Object<Color>(protect(rb_eval_string, "Color::GREEN")),
+    Data_Object<Color>(protect(rb_eval_string, "get_enum"))
+  );
+
+  ASSERT_EQUAL(String("GREEN"), String(protect(rb_eval_string, "get_enum.to_s")));
+  ASSERT_EQUAL(String("#<Color::GREEN>"), String(protect(rb_eval_string, "get_enum.inspect")));
+}

data/test/unittest.cpp

@@ -131,6 +131,6 @@ int main()
     }
   }
 
-  return result.errors().size() + result.failures().size();
+  return (int)result.errors().size() + (int)result.failures().size();
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rice
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Paul Brannan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies: []
 description: |
   Rice is a C++ interface to Ruby's C API.  It provides a type-safe and
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Ruby Interface for C++ Extensions