rice 1.5.3 → 1.6.0.pre

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1fade81ed5022f898e556d016667ce935181a446
+  data.tar.gz: f95a76367b0d6062b0521073bdcecc44e40be2c9
+SHA512:
+  metadata.gz: 3baabdf3094320d857599b3ed2b09015e3ac0ab1b9851f6f1a2c1a5b9f81d65d0c307661db97a8b67a14c40e5f6037140fa08ca648f65175e68d1a978af83570
+  data.tar.gz: 6496d5a96365b6cdbac504001c01f9093ade6d6023595eb52c22f5739980720748e14dd5595d28ea2593d3f4ab46a616a90c971b3b0ad2c3685786bdf71c0e5c

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         = 1.5.3
+PROJECT_NUMBER         = 1.6.0
 
 # 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/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -672,9 +672,10 @@ distcheck: dist
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) "$(distdir)"/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \

data/aclocal.m4

@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

data/rice/Exception.cpp

@@ -54,6 +54,6 @@ char const * Rice::Exception::
 what() const throw()
 {
   message_ = message();
-  return from_ruby<char const *>(message_);
+  return from_ruby<std::string>(message_).c_str();
 }
 

data/rice/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

data/rice/detail/method_data.cpp

@@ -8,67 +8,49 @@
 #undef PACKAGE_VERSION
 #include "../config.hpp"
 
-#ifndef RUBY_VM
-/* pre-YARV */
-#include <node.h>
-#include "env.hpp"
-#endif
-
 /* 1.8.6 compatibility */
 #ifndef RCLASS_M_TBL
 #define RCLASS_M_TBL(x) (RCLASS(x)->m_tbl)
 #endif
 
-namespace
-{
 
-VALUE DATA_MAGIC = rb_fix_new(0xDA7A);
+#ifndef RUBY_VM 
+/* pre-YARV */
+#include <node.h>
+#include "env.hpp"
 
-} // namespace
+namespace {
+int rb_frame_method_id_and_class(ID *idp, VALUE *klassp) {
+  *klassp = ruby_frame->last_class;
+  *idp = ruby_frame->last_func;
+  return 1;
+}
+}
+#endif
 
-#ifdef RUBY_VM
+#define RICE_ID rb_intern("__rice__")
 
 VALUE
 Rice::detail::
 method_data()
 {
   ID id;
-  VALUE origin;
-  if (!rb_frame_method_id_and_class(&id, &origin))
+  VALUE klass;
+  if (!rb_frame_method_id_and_class(&id, &klass))
   {
     rb_raise(
         rb_eRuntimeError,
         "Cannot get method id and class for function");
   }
 
-  VALUE memo = rb_ivar_get(origin, 0);
-
-  if(rb_type(memo) != T_ARRAY && RARRAY_PTR(memo)[0] != DATA_MAGIC)
-  {
-    /* This can happen for module functions that are created after
-     * the stub function */
-    rb_raise(
-        rb_eRuntimeError,
-        "Cannot find method data for module function");
+  if (rb_type(klass) == T_ICLASS) {
+    klass = rb_class_of(klass);
   }
 
-  return RARRAY_PTR(memo)[1];
+  VALUE store = rb_ivar_get(klass, RICE_ID);
+  return (store == Qnil) ? Qnil : rb_ivar_get(store, id);
 }
 
-#else
-
-/* pre-YARV */
-
-VALUE
-Rice::detail::
-method_data()
-{
-  VALUE origin = ruby_frame->last_class;
-  VALUE memo = rb_ivar_get(origin, 0);
-  return RARRAY_PTR(memo)[1];
-}
-
-#endif
 
 // Define a method and attach data to it.
 // The method looks to ruby like a normal aliased CFUNC, with a modified
@@ -85,75 +67,40 @@ method_data()
 // version to ruby version, but the concept is the same across all of
 // them.
 // 
-// In Rice, we make use of this by defining a method on a dummy class,
-// then attaching that method to our real class.  The method is a real
-// method in our class, but its origin class is our dummy class.
+// In Rice, we make use of this by attach the data to a dummy object 
+// (store) in the class variables table.
 // 
-// When Ruby makes a method call, it stores the origin class in the
-// current stack frame.  When Ruby calls into Rice, we grab the origin
-// class from the stack frame, then pull the data out of the origin
-// class.  The data item is then used to determine how to convert
+// When Ruby makes a method call, it stores the class Object and method
+// ID in the current stack frame.  When Ruby calls into Rice, we grab
+// the class and method ID from the stack frame, then pull the data out
+// of the class. The data item is then used to determine how to convert
 // arguments and return type, how to handle exceptions, etc.
 //
-// It used to be the case that Rice would "fix" the call frame so that
-// the modified origin class was not visible to the called function (it
-// would appear to the callee that the origin class was the same as the
-// class it was defined on).  However, this required modifying the call
-// frame directly, and the layout of that frame varies from version to
-// version.  To keep things simple (and as a side effect improve
-// performance), Rice no longer hides the modified origin class this way.
-//
-// Functions that make use of "last_class" (1.8) or
-// "rb_frame_method_id_and_class" (1.9) will therefore not get the
-// results they expect.
 VALUE
 Rice::detail::
 define_method_with_data(
     VALUE klass, ID id, VALUE (*cfunc)(ANYARGS), int arity, VALUE data)
 {
-  VALUE origin = rb_class_boot(klass);
-
-  // Create the memo object with a magic number so we can detect if
-  // we're getting the origin class we expect (this can happen if the
-  // module_function method is called on a Rice function on ruby 1.9).
-  VALUE memo = rb_assoc_new(DATA_MAGIC, data);
-
-  // Set the class name of our modified origin class to something
-  // obvious in case someone tries to inspect it.
-  VALUE real_class_name = rb_class_name(klass);
-  VALUE origin_class_name = rb_str_plus(
-      real_class_name,
-      rb_str_new2("<data wrapper>"));
-
-  // Create the modified origin class
-  FL_SET(origin, FL_SINGLETON);
-  rb_singleton_class_attached(origin, klass);
-  rb_name_class(origin, SYM2ID(rb_str_intern(origin_class_name)));
+  VALUE store = rb_attr_get(klass, RICE_ID);
+
+  if (store == Qnil) {
+    store = rb_obj_alloc(rb_cObject);
+    // store is stored in the instance variables table with
+    // name "__rice__".
+    // since "__rice__" does not have the @ prefix,
+    // so it can never be read at the Ruby level.
+    rb_ivar_set(klass, RICE_ID, store);
+  }
 
-  // Attach our "memo" to the origin class
-  rb_ivar_set(origin, 0, memo);
+  rb_ivar_set(store, id, data);
 
   // Create the aliased method on the origin class
   rb_define_method(
-      origin,
+      klass,
       rb_id2name(id),
       cfunc,
       arity);
 
-  // Alias the method in the origin class so we can copy it to another
-  // class with the origin class intact as part of the method entry
-  rb_alias(
-      origin,
-      rb_intern("dummy"),
-      id);
-
-  // Copy the method entry to the real class
-  st_data_t dummy_entry;
-  st_lookup(RCLASS_M_TBL(origin), rb_intern("dummy"), &dummy_entry);
-  st_insert(RCLASS_M_TBL(klass), id, dummy_entry);
-
-  // Clear the table so we don't try to double-free the method entry
-  RCLASS_M_TBL(origin) = st_init_numtable();
-
   return Qnil;
 }
+

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 200
+#define RICE__RUBY_VERSION_CODE 193
 
 #endif // Rice__detail__ruby_version_code__hpp

data/rice/to_from_ruby.ipp

@@ -39,7 +39,7 @@ template<>
 inline
 int from_ruby<int>(Rice::Object x)
 {
-  return Rice::protect(Rice::detail::num2int, x);
+  return Rice::detail::num2int(x);
 }
 
 template<>
@@ -101,7 +101,7 @@ template<>
 inline
 unsigned int from_ruby<unsigned int>(Rice::Object x)
 {
-  return Rice::protect(Rice::detail::num2uint, x);
+  return Rice::detail::num2uint(x);
 }
 
 template<>

data/ruby/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

data/ruby/lib/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

data/ruby/lib/version.rb

@@ -1,3 +1,3 @@
 module Rice
-  VERSION = "1.5.3"
+  VERSION = "1.6.0.pre"
 end

data/sample/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

data/test/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

data/test/ext/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

data/test/test_Data_Type.cpp

@@ -46,7 +46,7 @@ namespace {
 
       int process() {
         std::vector<Listener*>::iterator i = mListeners.begin();
-        int accum = 0; 
+        int accum = 0;
         for(; i != mListeners.end(); i++) {
           accum += (*i)->getValue();
         }
@@ -54,7 +54,7 @@ namespace {
         return accum;
       }
 
-      int listenerCount() { return mListeners.size(); }
+      size_t listenerCount() { return mListeners.size(); }
 
     private:
       std::vector<Listener*> mListeners;
@@ -100,7 +100,7 @@ TESTCASE(can_send_ruby_instance_back_into_rice)
  * The following test SEGFAULTs right now
  */
 /*
-TESTCASE(no_super_in_constructor_still_works) 
+TESTCASE(no_super_in_constructor_still_works)
 {
   Module m = define_module("TestingModule");
   Object handler = m.instance_eval("@handler = ListenerHandler.new");
@@ -127,14 +127,14 @@ TESTCASE(no_super_in_constructor_still_works)
  * Two ways of defining if types are implicitly castable
  *
  * 1) operator
- * 2) constructor 
+ * 2) constructor
  */
 
 /**
  * Examples here taken from Ogre's Math library.
  * This uses the constructor method of casting types.
  */
-namespace 
+namespace
 {
   const int degree2Radians = (3.14 / 180.0);
   const int radian2Degrees = (180.0 / 3.14);
@@ -157,7 +157,7 @@ namespace
   class Radian
   {
     public:
-      explicit Radian(float r) : val_(r) {} 
+      explicit Radian(float r) : val_(r) {}
       Radian(const Degree& d) : val_(d.valueRadians()) {}
 
       float valueRadians() const { return val_; }

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rice
 version: !ruby/object:Gem::Version
-  version: 1.5.3
-  prerelease: 
+  version: 1.6.0.pre
 platform: ruby
 authors:
 - Paul Brannan
@@ -10,20 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2014-01-31 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:
 - curlypaul924@gmail.com
 - jasonroelofs@gmail.com
@@ -235,27 +228,26 @@ files:
 - test/test_rice.rb
 homepage: http://rice.rubyforge.org/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - ruby/lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rice
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby Interface for C++ Extensions
 test_files:
 - test/test_rice.rb