rice 1.4.0 → 1.4.2

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.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

data/Rakefile

@@ -23,9 +23,7 @@ end
 
 desc "Upload documentation to the website. Requires rubyforge gem" 
 task :upload_web => [:doc] do
-  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
-  host = "#{config["username"]}@rubyforge.org"
-
+  host = "jameskilton@rubyforge.org"
   Rake::SshDirPublisher.new(host, PROJECT_WEB_PATH, "doc/html").upload
 end
 

data/extconf.rb

@@ -14,13 +14,9 @@
 $:.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 = ""
@@ -30,9 +26,10 @@ arch = Config::CONFIG["arch"].split("-")[0]
 
 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/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@

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/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.2"
 end

data/sample/enum/test.rb

@@ -1,4 +1,3 @@
-$: << "."
 require 'sample_enum'
 
 Sample_Enum.each { |x| p x }

data/test/test_To_From_Ruby.cpp

@@ -261,3 +261,17 @@ 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);
+}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - Paul Brannan
@@ -15,22 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 -04:00
+date: 2010-12-27 00:00:00 -05: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 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
+dependencies: []
+
 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
@@ -80,6 +68,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