rice-jdguyot 1.4.0 → 1.4.3p1

data/Doxyfile

@@ -23,7 +23,7 @@ PROJECT_NAME           = Rice
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.4.0
+PROJECT_NUMBER         = 1.4.3
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

data/extconf.rb

@@ -14,25 +14,26 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
 
 require 'rbconfig'
-require 'rubygems'
 require 'ruby/lib/version.rb'
 
-gem_name = "rice-#{Rice::VERSION}"
-
-gem_base_dir = File.writable?(Gem.default_dir) ? Gem.default_dir : Gem.user_dir
-prefix_dir = File.join(gem_base_dir, "gems", gem_name, "ruby", "lib")
+prefix_dir = File.join(File.dirname(File.expand_path(__FILE__)), "ruby", "lib")
 with_ruby = File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])
 
 other_opts = ""
 env = ""
 
-arch = 'x86_64'
+if RUBY_PLATFORM =~ /darwin10/ || RUBY_PLATFORM =~ /darwin11/
+  arch = Config::CONFIG["arch"].split("-")[0]
+
+  if arch == "universal"
+    arch = `uname -m`.strip
+  end
 
-if RUBY_PLATFORM =~ /darwin10/
   other_opts = "--disable-dependency-tracking"
-  env = "ARCHFLAGS='-arch #{arch}'"
+  env = "ARCHFLAGS='-arch #{arch}' CPPFLAGS='-arch #{arch}'"
 elsif RUBY_PLATFORM =~ /darwin9/
-  env = "ARCHFLAGS='-arch #{`uname -p`.chomp}'"
+  arch = `uname -p`.chomp
+  env = "ARCHFLAGS='-arch #{arch}' CPPFLAGS='-arch #{arch}'"
 end
 
 system "#{env} sh configure --with-ruby=#{with_ruby} --prefix=#{prefix_dir} #{other_opts}"

data/rice/Address_Registration_Guard.cpp

@@ -0,0 +1,22 @@
+#include "Address_Registration_Guard.hpp"
+
+bool Rice::Address_Registration_Guard::enabled = true;
+bool Rice::Address_Registration_Guard::exit_handler_registered = false;
+
+static void disable_all_guards(VALUE)
+{
+    Rice::Address_Registration_Guard::disable();
+}
+
+void Rice::Address_Registration_Guard::registerExitHandler()
+{
+    if (exit_handler_registered) return;
+    rb_set_end_proc(&disable_all_guards, Qnil);
+    exit_handler_registered = true;
+}
+
+void Rice::Address_Registration_Guard::disable()
+{
+    enabled = false;
+}
+

data/rice/Address_Registration_Guard.ipp

@@ -5,6 +5,7 @@ inline Rice::Address_Registration_Guard::
 Address_Registration_Guard(VALUE * address)
   : address_(address)
 {
+  registerExitHandler();
   rb_gc_register_address(address);
 }
 
@@ -12,13 +13,15 @@ inline Rice::Address_Registration_Guard::
 Address_Registration_Guard(Object * object)
   : address_(const_cast<VALUE *>(&object->value()))
 {
+  registerExitHandler();
   rb_gc_register_address(address_);
 }
 
 inline Rice::Address_Registration_Guard::
 ~Address_Registration_Guard()
 {
-  rb_gc_unregister_address(address_);
+  if (enabled)
+    rb_gc_unregister_address(address_);
 }
 
 inline VALUE * Rice::Address_Registration_Guard::

data/rice/Address_Registration_Guard_defn.hpp

@@ -56,7 +56,17 @@ public:
   //! Swap with another Address_Registration_Guard.
   void swap(Address_Registration_Guard & other);
 
+  /** Called during Ruby's exit process since we should not call
+   * rb_gc unregister_address there
+   */
+  static void disable();
+
 private:
+  static bool enabled;
+  static bool exit_handler_registered;
+
+  static void registerExitHandler();
+
   VALUE * address_;
 };
 

data/rice/Data_Type.ipp

@@ -130,8 +130,8 @@ define_constructor(
   rb_define_alloc_func(
       static_cast<VALUE>(*this),
       detail::default_allocation_func<T>);
-  define_method(
-      "initialize", 
+  this->define_method(
+      "initialize",
       &Constructor_T::construct,
       arguments
       );

data/rice/Hash.hpp

@@ -204,6 +204,20 @@ private:
 
 } // namespace Rice
 
+template<>
+inline
+Rice::Hash from_ruby<Rice::Hash>(Rice::Object x)
+{
+  return Rice::Hash(x);
+}
+
+template<>
+inline
+Rice::Object to_ruby<Rice::Hash>(Rice::Hash const & x)
+{
+  return x;
+}
+
 #include "Hash.ipp"
 
 #endif // Rice__Hash__hpp_

data/rice/Makefile.am

@@ -13,6 +13,7 @@ Struct.cpp \
 Symbol.cpp \
 VM.cpp \
 Arg_operators.cpp \
+Address_Registration_Guard.cpp \
 detail/check_ruby_type.cpp \
 detail/demangle.cpp \
 detail/method_data.cpp \

data/rice/Makefile.in

@@ -61,8 +61,9 @@ am_librice_a_OBJECTS = Class.$(OBJEXT) Data_Type.$(OBJEXT) \
 	Director.$(OBJEXT) Exception.$(OBJEXT) Identifier.$(OBJEXT) \
 	Module.$(OBJEXT) Object.$(OBJEXT) String.$(OBJEXT) \
 	Struct.$(OBJEXT) Symbol.$(OBJEXT) VM.$(OBJEXT) \
-	Arg_operators.$(OBJEXT) check_ruby_type.$(OBJEXT) \
-	demangle.$(OBJEXT) method_data.$(OBJEXT) protect.$(OBJEXT)
+	Arg_operators.$(OBJEXT) Address_Registration_Guard.$(OBJEXT) \
+	check_ruby_type.$(OBJEXT) demangle.$(OBJEXT) \
+	method_data.$(OBJEXT) protect.$(OBJEXT)
 librice_a_OBJECTS = $(am_librice_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -222,6 +223,7 @@ Struct.cpp \
 Symbol.cpp \
 VM.cpp \
 Arg_operators.cpp \
+Address_Registration_Guard.cpp \
 detail/check_ruby_type.cpp \
 detail/demangle.cpp \
 detail/method_data.cpp \
@@ -423,6 +425,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Address_Registration_Guard.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Arg_operators.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Class.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Data_Type.Po@am__quote@
@@ -585,8 +588,8 @@ distdir: $(DISTFILES)
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
-	  */*) eval $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|"$(distdir)"/|;s,/[^/]*$$,,' | \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
@@ -594,12 +597,12 @@ distdir: $(DISTFILES)
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file "$(distdir)"$$dir || exit 1; \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
-	    cp -pR $$d/$$file "$(distdir)"$$dir || exit 1; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
-	    test -f "$(distdir)"/$$file \
-	    || cp -p $$d/$$file "$(distdir)"/$$file \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
 	    || exit 1; \
 	  fi; \
 	done

data/rice/Module_impl.ipp

@@ -298,7 +298,7 @@ void
 Rice::Module_impl<Base_T, Derived_T>::
 remove_const(Identifier name)
 {
-  protect(rb_mod_remove_const, *this, Symbol(name));
+  protect(rb_mod_remove_const, *this, name.to_sym());
 }
 
 template<typename Base_T, typename Derived_T>

data/rice/String.cpp

@@ -37,7 +37,7 @@ String(char const * s)
 
 Rice::String::
 String(std::string const & s)
-  : Builtin_Object<RString, T_STRING>(protect(rb_str_new, s.c_str(), s.length()))
+  : Builtin_Object<RString, T_STRING>(protect(rb_str_new, s.data(), s.length()))
 {
 }
 
@@ -83,7 +83,7 @@ c_str() const
 std::string Rice::String::
 str() const
 {
-  return RSTRING_PTR(value());
+  return std::string(RSTRING_PTR(value()), length());
 }
 
 Rice::Identifier Rice::String::

data/rice/config.hpp

@@ -0,0 +1,41 @@
+/* rice/config.hpp.  Generated from config.hpp.in by configure.  */
+/* rice/config.hpp.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <env.h> header file. */
+/* #undef HAVE_ENV_H */
+
+/* Define to 1 if you have the <node.h> header file. */
+/* #undef HAVE_NODE_H */
+
+/* Define to 1 if you have the <ruby.h> header file. */
+#define HAVE_RUBY_H 1
+
+/* Define to 1 if you have the <ruby/node.h> header file. */
+/* #undef HAVE_RUBY_NODE_H */
+
+/* Define to 1 if you have the <version.h> header file. */
+/* #undef HAVE_VERSION_H */
+
+/* Name of package */
+#define PACKAGE "rice"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "rice"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "rice 1.1"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "rice"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.1"
+
+/* Define this macro to use ruby/node.h */
+/* #undef REALLY_HAVE_RUBY_NODE_H */
+
+/* Version number of package */
+#define VERSION "1.1"

data/rice/detail/ruby_version_code.hpp

@@ -0,0 +1,6 @@
+#ifndef Rice__detail__ruby_version_code__hpp
+#define Rice__detail__ruby_version_code__hpp
+
+#define RICE__RUBY_VERSION_CODE 192
+
+#endif // Rice__detail__ruby_version_code__hpp

data/rice/to_from_ruby.ipp

@@ -261,10 +261,7 @@ template<>
 inline
 char const * from_ruby<char const *>(Rice::Object x)
 {
-  // TODO: Maybe not the right way to do this conversion (what happens
-  // if the object gets GC'd?)
-  VALUE v(x.value());
-  return (char const *)Rice::protect<char const *>(rb_string_value_cstr, &v);
+  return Rice::String(x).str().data();
 }
 
 template<>
@@ -279,19 +276,19 @@ template<>
 inline
 std::string from_ruby<std::string>(Rice::Object x)
 {
-  return std::string(from_ruby<char const *>(x));
+  return Rice::String(x).str();
 }
 
 template<>
 inline
 Rice::Object to_ruby<std::string>(std::string const & x)
 {
-  return to_ruby(x.c_str());
+  return Rice::protect(rb_str_new, x.data(), x.size());
 }
 
 template<>
 inline
 std::string* from_ruby<std::string* >(Rice::Object x)
 {
-  return new std::string(from_ruby<char const *>(x));
+  return new std::string(Rice::String(x).str());
 }

data/ruby/lib/version.rb

@@ -1,3 +1,3 @@
 module Rice
-  VERSION = "1.4.0"
+  VERSION = "1.4.3p1"
 end

data/test/test_Director.cpp

@@ -71,6 +71,7 @@ namespace {
 
       int default_process(int num) {
         raisePureVirtual();
+        return 0;
       }
 
       virtual int doSomething(int num) {
@@ -201,6 +202,7 @@ namespace {
 
       int default_doItImpl(int in) {
         raisePureVirtual();
+        return 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>
 
@@ -261,3 +263,41 @@ TESTCASE(std_string_from_ruby)
   ASSERT_EQUAL(std::string("foo"), from_ruby<std::string>(rb_str_new2("foo")));
 }
 
+TESTCASE(std_string_to_ruby_with_binary)
+{
+  Rice::String got = to_ruby(std::string("\000test", 5));
+
+  ASSERT_EQUAL(String(std::string("\000test", 5)), got);
+  ASSERT_EQUAL(5, got.length());
+}
+
+TESTCASE(std_string_from_ruby_with_binary)
+{
+  std::string got = from_ruby<std::string>(rb_str_new("\000test", 5));
+  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/unittest.hpp

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

metadata

@@ -1,55 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rice-jdguyot
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 1
-  - 4
-  - 0
-  version: 1.4.0
+version: !ruby/object:Gem::Version
+  version: 1.4.3p1
+  prerelease: 5
 platform: ruby
-authors: 
+authors:
 - Paul Brannan
 - Jason Roelofs
 autorequire: 
 bindir: bin
 cert_chain: []
+date: 2012-04-27 00:00:00.000000000 Z
+dependencies: []
+description: ! 'Rice is a C++ interface to Ruby''s C API.  It provides a type-safe
+  and
 
-date: 2010-09-16 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-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
 executables: []
-
-extensions: 
+extensions:
 - extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - COPYING
 - README
 - README.mingw
@@ -82,6 +65,7 @@ files:
 - sample/Makefile.in
 - test/Makefile.am
 - test/Makefile.in
+- rice/Address_Registration_Guard.cpp
 - rice/Address_Registration_Guard.hpp
 - rice/Address_Registration_Guard.ipp
 - rice/Address_Registration_Guard_defn.hpp
@@ -99,6 +83,7 @@ files:
 - rice/Class.hpp
 - rice/Class.ipp
 - rice/Class_defn.hpp
+- rice/config.hpp
 - rice/Constructor.hpp
 - rice/Critical_Guard.hpp
 - rice/Critical_Guard.ipp
@@ -194,6 +179,7 @@ files:
 - rice/detail/protect.cpp
 - rice/detail/protect.hpp
 - rice/detail/ruby.hpp
+- rice/detail/ruby_version_code.hpp
 - rice/detail/rubysig.hpp
 - rice/detail/st.hpp
 - rice/detail/to_ruby.hpp
@@ -249,39 +235,29 @@ files:
 - test/ext/t2/extconf.rb
 - test/ext/t2/t2.cpp
 - test/test_rice.rb
-has_rdoc: true
 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: 1.3.1
 requirements: []
-
 rubyforge_project: rice
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby Interface for C++ Extensions
-test_files: 
+test_files:
 - test/test_rice.rb