rice 1.0.1 → 1.0.2

data/rice/detail/demangle.cpp

@@ -0,0 +1,56 @@
+#include "demangle.hpp"
+
+#ifdef __GNUC__
+#include <cxxabi.h>
+#include <cstdlib>
+#include <cstring>
+#endif
+
+std::string
+Rice::detail::
+demangle(char const * mangled_name)
+{
+#ifdef __GNUC__
+    struct Helper
+  {
+    Helper(
+        char const * mangled_name)
+      : name_(0)
+    {
+      int status = 0;
+      name_ = abi::__cxa_demangle(mangled_name, 0, 0, &status);
+    }
+
+    ~Helper()
+    {
+      std::free(name_);
+    }
+
+    char * name_;
+
+  private:
+    Helper(Helper const &);
+    void operator=(Helper const &);
+  };
+
+  Helper helper(mangled_name);
+  if(helper.name_)
+  {
+    return helper.name_;
+  }
+  else
+  {
+    return mangled_name;
+  }
+#else
+  return mangled_name;
+#endif
+}
+
+
+std::string
+Rice::detail::
+demangle(std::string const & mangled_name)
+{
+  return demangle(mangled_name.c_str());
+}

data/rice/detail/demangle.hpp

@@ -0,0 +1,19 @@
+#ifndef Rice__detail__demangle__hpp_
+#define Rice__detail__demangle__hpp_
+
+#include <string>
+
+namespace Rice
+{
+
+namespace detail
+{
+
+std::string demangle(char const * mangled_name);
+std::string demangle(std::string const & mangled_name);
+
+} // detail
+
+} // Rice
+
+#endif // Rice__detail__demangle__hpp_

data/rice/detail/env.hpp

@@ -1,13 +1,15 @@
-#ifndef Rice__detail__env__hpp_
-#define Rice__detail__env__hpp_
-
-/**
- * Helper header for the env.h ruby include file, which does
- * not have extern "C"
- */
-
-extern "C" {
-  #include "env.h"
-}
-
-#endif
+#ifndef Rice__detail__env__hpp_
+#define Rice__detail__env__hpp_
+
+/**
+ * Helper header for the env.h ruby include file, which does
+ * not have extern "C"
+ */
+
+// TODO: Won't work on ruby 1.9
+
+extern "C" {
+  #include "env.h"
+}
+
+#endif

data/rice/detail/from_ruby.ipp

@@ -2,28 +2,10 @@
 #define Rice__detail__from_ruby__ipp_
 
 #include "../Data_Type.hpp"
+#include "../String.hpp"
+#include "demangle.hpp"
 #include <typeinfo>
 
-#if 0
-namespace Rice
-{
-  namespace detail
-  {
-    template<typename T>
-    struct unpointer
-    {
-      // can't unpointer a non-pointer
-    };
-
-    template<typename T>
-    struct unpointer<T *>
-    {
-      typedef T type;
-    };
-  }
-}
-#endif
-
 template<typename T>
 T Rice::detail::from_ruby_<T>::
 convert(Rice::Object x)
@@ -34,9 +16,11 @@ convert(Rice::Object x)
   }
   else
   {
-    std::string s("No conversion defined for ");
-    s += typeid(T).name();
-    throw std::runtime_error(s.c_str());
+    std::string s("Unable to convert ");
+    s += x.class_of().name().c_str();
+    s += " to ";
+    s += demangle(typeid(T).name());
+    throw std::invalid_argument(s.c_str());
   }
 }
 
@@ -50,9 +34,11 @@ convert(Rice::Object x)
   }
   else
   {
-    std::string s("No conversion defined for ");
-    s += typeid(T).name();
-    throw std::runtime_error(s.c_str());
+    std::string s("Unable to convert ");
+    s += x.class_of().name().c_str();
+    s += " to ";
+    s += demangle(typeid(T *).name());
+    throw std::invalid_argument(s.c_str());
   }
 }
 

data/rice/detail/ruby.hpp

@@ -14,11 +14,21 @@
 #define HAVE_ISINF
 #endif
 
-#include <ruby.h>
-
 // TODO: Is there a way to ensure that this is Ruby's version.h?
+#define RUBY_EXTERN extern "C"
 #include <version.h>
 
+// workaround for ruby 1.8.4, which defines eaccess and shouldn't
+#if RUBY_VERSION_CODE <= 184
+#define eaccess ruby_eaccess
+#endif
+
+#include <ruby.h>
+
+#if RUBY_VERSION_CODE <= 184
+#undef eaccess
+#endif
+
 #ifdef WIN32
 #include "win32.hpp"
 #endif

data/rice/detail/to_ruby.hpp

@@ -8,7 +8,13 @@ namespace Rice
     template<typename T>
     struct to_ruby_
     {
-      static Rice::Object convert(T const & x);
+      static Rice::Object convert(T & x);
+    };
+
+    template<typename T>
+    struct to_ruby_<T *>
+    {
+      static Rice::Object convert(T * x);
     };
   } // detail
 } // Rice

data/rice/detail/to_ruby.ipp

@@ -1,10 +1,37 @@
+#include "../Data_Object.hpp"
+
 template<typename T>
-Rice::Object Rice::detail::to_ruby_<T>::
-convert(T const & x)
+Rice::Object
+Rice::detail::to_ruby_<T>::
+convert(T & x)
 {
-  // Should produce a compile-time error
-  enum { no_to_ruby_conversion_defined = -1 };
-  char x_[no_to_ruby_conversion_defined];
-  return Qnil;
-}
+  if(Data_Type<T>::is_bound())
+  {
+    Data_Object<T> obj(&x);
+    return obj;
+  }
+  else
+  {
+    std::string s("Unable to convert ");
+    s += demangle(typeid(T *).name());
+    throw std::invalid_argument(s.c_str());
+  }
+}   
 
+template<typename T>
+Rice::Object
+Rice::detail::to_ruby_<T *>::
+convert(T * x)
+{
+  if(Data_Type<T>::is_bound())
+  {
+    Data_Object<T> obj(x);
+    return obj;
+  }
+  else
+  {
+    std::string s("Unable to convert ");
+    s += demangle(typeid(T *).name());
+    throw std::invalid_argument(s.c_str());
+  }
+}

data/ruby/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -292,8 +292,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -318,8 +318,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -329,13 +329,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

data/ruby/lib/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

data/ruby/lib/mkmf-rice.rb.in

@@ -31,6 +31,9 @@ def init_mkmf_rice(config = CONFIG)
   # Ruby < 1.8.6 does not have $DEFLIBPATH
   $DEFLIBPATH ||= []
 
+  # Ruby 1.8.6 uses $preload without setting it
+  $preload ||= nil
+
   $CPPFLAGS << " #{$RICE_CPPFLAGS} -I#{$RICE_PREFIX}/include"
   $LDFLAGS << " #{$RICE_LDFLAGS} -L#{$RICE_PREFIX}/lib"
 
@@ -176,6 +179,10 @@ class RiceMakefileCreator
       @file.printf(format, *args)
     end
 
+    def puts(*strings)
+      print strings.map { |s| "#{s}\n" }
+    end
+
     def close
       @file.close
     end

data/ruby.ac

@@ -29,14 +29,15 @@ RUBY_CONFIG_DLDLIBS=`RUBY_CONFIG(DLDLIBS)`
 RUBY_CONFIG_LDFLAGS=`RUBY_CONFIG(LDFLAGS)`
 RUBY_CONFIG_LIBRUBYARG=`RUBY_CONFIG(LIBRUBYARG)`
 RUBY_CONFIG_LIBRUBYARG_STATIC=`RUBY_CONFIG(LIBRUBYARG_STATIC)`
+RUBY_CONFIG_CCDLFLAGS=`RUBY_CONFIG(CCDLFLAGS)`
 
 RUBY_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}"
 AC_SUBST(RUBY_CPPFLAGS)
 
-RUBY_CFLAGS="${RUBY_CONFIG_CFLAGS}"
+RUBY_CFLAGS="${RUBY_CONFIG_CFLAGS} ${RUBY_CONFIG_CCDLFLAGS}"
 AC_SUBST(RUBY_CFLAGS)
 
-RUBY_CXXFLAGS="${RUBY_CONFIG_CFLAGS}"
+RUBY_CXXFLAGS="${RUBY_CONFIG_CFLAGS} ${RUBY_CONFIG_CCDLFLAGS}"
 AC_SUBST(RUBY_CXXFLAGS)
 
 RUBY_LDFLAGS="-L${RUBY_ARCHDIR} -L${RUBY_CONFIG_LIBDIR} ${RUBY_LDFLAGS}"
@@ -73,6 +74,7 @@ dnl The fourth parameter to AC_CHECK_HEADER keeps autoconf from
 dnl searching for standard header files as a side-effect (which we want)
 CPPFLAGS_save="${CPPFLAGS}"
 CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS}"
+CXXFLAGS="${CPPFLAGS}"
 AC_CHECK_HEADER(ruby.h,,AC_MSG_ERROR(
                 could not find ruby.h (check config.log)),[ ])
 AC_CHECK_HEADER(node.h,,AC_MSG_ERROR(

data/sample/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

data/test/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -61,7 +61,7 @@ unittest_LDADD = $(LDADD)
 am_vm_unittest_OBJECTS = unittest.$(OBJEXT) test_VM.$(OBJEXT)
 vm_unittest_OBJECTS = $(am_vm_unittest_OBJECTS)
 vm_unittest_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/rice@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/rice
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -332,8 +332,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +345,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,13 +356,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

data/test/test_Class.cpp

@@ -1,5 +1,6 @@
 #include "unittest.hpp"
 #include "rice/Class.hpp"
+#include "rice/Constructor.hpp"
 #include "rice/protect.hpp"
 #include "rice/Exception.hpp"
 #include "rice/Array.hpp"
@@ -348,3 +349,25 @@ TESTCASE(module_define_class)
   ASSERT_EQUAL(c, math.const_get("Foo"));
   ASSERT(!object.const_defined("Foo"));
 }
+
+namespace {
+  class BaseClass {
+    public:
+      BaseClass() { }
+  };
+}
+
+TESTCASE(subclassing)
+{
+  Module m = define_module("Testing");
+  define_class_under<BaseClass>(m, "BaseClass").
+    define_constructor(Constructor<BaseClass>());
+
+  // Not sure how to make this a true failure case. If the subclassing
+  // doesn't work, Ruby will throw an error:
+  // 
+  //    in `new': wrong instance allocation
+  //
+  m.instance_eval("class NewClass < Testing::BaseClass; end;");
+  m.instance_eval("n = NewClass.new");
+}

data/test/test_Constructor.cpp

@@ -28,3 +28,36 @@ TESTCASE(default_constructor)
   ASSERT_EQUAL(rb_cDefault_Constructible, o.class_of());
 }
 
+
+namespace
+{
+  class Non_Default_Constructible
+  {
+  public:
+    Non_Default_Constructible(int i)
+      : i_(i)
+    {
+    }
+
+    int i() const
+    {
+      return i_;
+    }
+
+  private:
+    int i_;
+  };
+}
+
+TESTCASE(non_default_constructor)
+{
+  Data_Type<Non_Default_Constructible> rb_cNon_Default_Constructible(
+      anonymous_class());
+  rb_cNon_Default_Constructible
+    .define_constructor(Constructor<Non_Default_Constructible, int>());
+  Data_Object<Non_Default_Constructible> o =
+    rb_cNon_Default_Constructible.call("new", 42);
+  ASSERT_EQUAL(rb_cNon_Default_Constructible, o.class_of());
+  ASSERT_EQUAL(42, o->i());
+}
+

data/test/test_Module.cpp

@@ -248,6 +248,6 @@ TESTCASE(remove_const)
 TESTCASE(mod_name_anonymous)
 {
   Module m(anonymous_module());
-  ASSERT_EQUAL(String(""), m.mod_name());
+  ASSERT_EQUAL(String(""), m.name());
 }
 

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: rice
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2008-02-18 00:00:00 -05:00
-summary: Ruby Interface for C++ Extensions
-require_paths: 
-- ruby/lib
-email: curlypaul924@gmail.com
-homepage: http://rice.rubyforge.org/
-rubyforge_project: rice
-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.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.0.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Paul Brannan
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-07-22 00:00:00 -04:00
+default_executable: 
+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 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: curlypaul924@gmail.com
+executables: []
+
+extensions: 
+- configure
+extra_rdoc_files: 
+- README
 files: 
 - COPYING
 - README
@@ -158,6 +151,8 @@ files:
 - rice/detail/Auto_Member_Function_Wrapper.ipp
 - rice/detail/st.hpp
 - rice/detail/Wrapped_Function.hpp
+- rice/detail/demangle.cpp
+- rice/detail/demangle.hpp
 - rice/detail/Auto_Function_Wrapper.hpp
 - rice/detail/Auto_Function_Wrapper.ipp
 - rice/detail/node.hpp
@@ -195,17 +190,31 @@ files:
 - test/test_Exception.cpp
 - test/test_Struct.cpp
 - test/test_Address_Registration_Guard.cpp
-test_files: 
-- test/test_rice.rb
+has_rdoc: false
+homepage: http://rice.rubyforge.org/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: 
-- configure
+require_paths: 
+- ruby/lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: rice
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: Ruby Interface for C++ Extensions
+test_files: 
+- test/test_rice.rb