rice 1.4.3 → 1.5.0

data/test/test_To_From_Ruby.cpp

@@ -1,6 +1,8 @@
 #include "unittest.hpp"
 #include "rice/to_from_ruby.hpp"
 #include "rice/String.hpp"
+#include "rice/Array.hpp"
+#include "rice/Hash.hpp"
 #include <limits>
 #include <cmath>
 
@@ -249,6 +251,24 @@ TESTCASE(char_const_ptr_from_ruby)
   ASSERT_EQUAL("foo", from_ruby<char const *>(rb_str_new2("foo")));
 }
 
+TESTCASE(char_from_ruby_single_character_string)
+{
+  ASSERT_EQUAL('x', from_ruby<char>(rb_str_new2("x")));
+}
+
+TESTCASE(char_from_ruby_longer_string)
+{
+  ASSERT_EXCEPTION(
+    std::invalid_argument,
+    from_ruby<char>(rb_str_new2("xy"))
+  );
+}
+
+TESTCASE(char_from_ruby_fixnum)
+{
+  ASSERT_EQUAL('1', from_ruby<char>(INT2NUM(49)));
+}
+
 TESTCASE(std_string_to_ruby)
 {
   ASSERT_EQUAL(String(""), to_ruby(std::string("")));
@@ -275,3 +295,27 @@ TESTCASE(std_string_from_ruby_with_binary)
   ASSERT_EQUAL(5, got.length());
   ASSERT_EQUAL(std::string("\000test", 5), got);
 }
+
+TESTCASE(array_to_ruby)
+{
+  Array a(rb_ary_new());
+  ASSERT_EQUAL(a.value(), to_ruby(a).value());
+}
+
+TESTCASE(array_from_ruby)
+{
+  Array a(rb_ary_new());
+  ASSERT_EQUAL(a.value(), from_ruby<Array>(a).value());
+}
+
+TESTCASE(hash_to_ruby)
+{
+  Hash h(rb_hash_new());
+  ASSERT_EQUAL(h.value(), to_ruby(h).value());
+}
+
+TESTCASE(hash_from_ruby)
+{
+  Hash h(rb_hash_new());
+  ASSERT_EQUAL(h.value(), from_ruby<Hash>(h).value());
+}

data/test/test_rice.rb

@@ -5,8 +5,8 @@ class RiceTest < Test::Unit::TestCase
   # TODO: probably a better way to find this out...
   VERBOSE = ARGV.include?('-v')
 
-  EXEEXT = Config::CONFIG['EXEEXT']
-  RUBY = Config::CONFIG['RUBY_INSTALL_NAME']
+  EXEEXT = RbConfig::CONFIG['EXEEXT']
+  RUBY = RbConfig::CONFIG['RUBY_INSTALL_NAME']
 
   def test_unittest
     run_external_test("./unittest#{EXEEXT}")

metadata

@@ -1,41 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rice
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 1.5.0
   prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 3
-  version: 1.4.3
 platform: ruby
-authors: 
+authors:
 - Paul Brannan
 - Jason Roelofs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-09 00:00:00 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies: []
+description: ! 'Rice is a C++ interface to Ruby''s C API.  It provides a type-safe
+  and
 
-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
+
   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.
 
-email: 
+'
+email:
 - curlypaul924@gmail.com
-- jameskilton@gmail.com
+- jasonroelofs@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - COPYING
 - README
 - README.mingw
@@ -72,7 +69,6 @@ files:
 - rice/Address_Registration_Guard.hpp
 - rice/Address_Registration_Guard.ipp
 - rice/Address_Registration_Guard_defn.hpp
-- rice/Allocation_Strategies.hpp
 - rice/Arg.hpp
 - rice/Arg_impl.hpp
 - rice/Arg_operators.cpp
@@ -205,7 +201,6 @@ files:
 - sample/inheritance/animals.cpp
 - sample/inheritance/test.rb
 - test/test_Address_Registration_Guard.cpp
-- test/test_Allocation_Strategies.cpp
 - test/test_Array.cpp
 - test/test_Builtin_Object.cpp
 - test/test_Class.cpp
@@ -240,36 +235,27 @@ files:
 - test/test_rice.rb
 homepage: http://rice.rubyforge.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - ruby/lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rice
-rubygems_version: 1.8.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby Interface for C++ Extensions
-test_files: 
+test_files:
 - test/test_rice.rb

data/rice/Allocation_Strategies.hpp

@@ -1,37 +0,0 @@
-#ifndef Rice__Default_Allocation_Strategy__hpp_
-#define Rice__Default_Allocation_Strategy__hpp_
-
-#include "detail/ruby.hpp"
-
-/*! \file
- *  \brief Strategies for allocation/deallocation of objects.
- */
-
-namespace Rice
-{
-
-template<typename T>
-struct Default_Allocation_Strategy
-{
-  //! Allocate an object using operator new.
-  static T * allocate() { return new T; }
-
-  //! Delete obj using the delete operator.
-  static void free(T * obj) { delete obj; }
-};
-
-template<typename T>
-struct Xmalloc_Allocation_Strategy
-{
-  //! Allocate an array of objects using operator new and xmalloc.
-  static T * allocate() { T * obj = static_cast<T *>(::xmalloc(sizeof(T))); new(obj) T; return obj; }
-
-  //! Delete obj by calling the destructor explicitly and calling xfree.
-  static void free(T * obj) { obj->~T(); ::xfree(obj); }
-};
-
-// TODO: array allocation
-
-} // namespace Rice
-
-#endif // Rice__Default_Allocation_Strategy__hpp_

data/test/test_Allocation_Strategies.cpp

@@ -1,77 +0,0 @@
-#include "unittest.hpp"
-#include "rice/Allocation_Strategies.hpp"
-
-using namespace Rice;
-
-namespace
-{
-
-bool constructor_called = false;
-bool destructor_called = false;
-
-class Foo
-{
-public:
-  Foo()
-  {
-    constructor_called = true;
-  }
-
-  ~Foo()
-  {
-    destructor_called = true;
-  }
-};
-
-} // namespace
-
-TESTSUITE(Allocation_Strategies);
-
-SETUP(Allocation_Strategies)
-{
-  ruby_init();
-  constructor_called = false;
-  destructor_called = false;
-}
-
-TESTCASE(default_allocation_strategy_allocate)
-{
-  Foo * t = Default_Allocation_Strategy<Foo>::allocate();
-  ASSERT(constructor_called);
-  ASSERT(!destructor_called);
-  delete t;
-  ASSERT(constructor_called);
-  ASSERT(destructor_called);
-}
-
-TESTCASE(default_allocation_strategy_free)
-{
-  Foo * t = new Foo;
-  ASSERT(constructor_called);
-  ASSERT(!destructor_called);
-  Default_Allocation_Strategy<Foo>::free(t);
-  ASSERT(constructor_called);
-  ASSERT(destructor_called);
-}
-
-TESTCASE(xmalloc_allocation_strategy_allocate)
-{
-  Foo * t = Xmalloc_Allocation_Strategy<Foo>::allocate();
-  ASSERT(constructor_called);
-  ASSERT(!destructor_called);
-  t->~Foo();
-  xfree(t);
-  ASSERT(constructor_called);
-  ASSERT(destructor_called);
-}
-
-TESTCASE(xmalloc_allocation_strategy_free)
-{
-  Foo * t = Xmalloc_Allocation_Strategy<Foo>::allocate();
-  ASSERT(constructor_called);
-  ASSERT(!destructor_called);
-  Xmalloc_Allocation_Strategy<Foo>::free(t);
-  ASSERT(constructor_called);
-  ASSERT(destructor_called);
-}
-