rice 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4360dde3fe16791058dff62fd81809f0daa0cde
-  data.tar.gz: 8ea71ea6558bb9a30fe6b15a89743cf26d4c3774
+  metadata.gz: d9e3777fb35b3ff2463c30d6ec4d799ca47dcc69
+  data.tar.gz: 477180b1c3be9f330c1cf9e8675e8d947d6ed549
 SHA512:
-  metadata.gz: 95bc93a747343ab4b2b62fa225d677487fd3c7206adca60d89e4ae64bc85bc6972325c0fad1c980b869d5049a73e900a95e67b607f55e3f7e82b3acb68f6c7f8
-  data.tar.gz: f09b5d790a7b2612bda7d86a232a3d7108b24e94fac6ba67783e55908a3341cb6dd13826169195bdad6fc662eb34bc659a2e5c976f2b7147b17e1de4b83b9cec
+  metadata.gz: 784a3e9d47f1aba190d3e8aa8637d1e681a5344d43834168ad9bee4ee078080dbf6aaffd51eac88579e49bee880261253f19def28d3419056e0976fe3fa00ebf
+  data.tar.gz: 86b4ba50634d38e6ab8a0b18a9a9b0ec8bc0d52a0670785b2a9a9f663c7ebde2fe43c057fb6d1e648b880641bc0c1dbb5ef533f225e85182a1204813d2fd7f44

data/Rakefile

@@ -1,33 +1,23 @@
 $: << File.expand_path(File.dirname(__FILE__))
 require 'rubygems'
 require 'rubygems/package_task'
-require 'rake/contrib/sshpublisher'
 require 'yaml'
 require 'ruby/lib/version'
 
-PROJECT_NAME = "rice"
-PROJECT_WEB_PATH = "/var/www/gforge-projects/rice"
-
 task :default => :test
 
-desc "Run unit tests" 
+desc "Run unit tests"
 task :test do
   cd "test" do
     ruby "test_rice.rb"
   end
 end
 
-desc "Build the documentation" 
+desc "Build the documentation"
 task :doc do
   sh "make doc"
 end
 
-desc "Upload documentation to the website. Requires rubyforge gem" 
-task :upload_web => [:doc] do
-  host = "jameskilton@rubyforge.org"
-  Rake::SshDirPublisher.new(host, PROJECT_WEB_PATH, "doc/html").upload
-end
-
 # Gemspec kept externally
 eval(File.read("rice.gemspec"))
 Gem::PackageTask.new($spec) do |pkg|

data/rice/Array.hpp

@@ -20,7 +20,7 @@ namespace Rice
  *  \endcode
  */
 class Array
-  : public Builtin_Object<RArray, T_ARRAY>
+  : public Builtin_Object<T_ARRAY>
 {
 public:
   //! Construct a new array

data/rice/Array.ipp

@@ -5,26 +5,26 @@
 
 inline Rice::Array::
 Array()
-  : Builtin_Object<RArray, T_ARRAY>(protect(rb_ary_new))
+  : Builtin_Object<T_ARRAY>(protect(rb_ary_new))
 {
 }
 
 inline Rice::Array::
 Array(Object v)
-  : Builtin_Object<RArray, T_ARRAY>(v)
+  : Builtin_Object<T_ARRAY>(v)
 {
 }
 
 inline Rice::Array::
 Array(VALUE v)
-  : Builtin_Object<RArray, T_ARRAY>(v)
+  : Builtin_Object<T_ARRAY>(v)
 {
 }
 
 template<typename Iter_T>
 inline Rice::Array::
 Array(Iter_T it, Iter_T end)
-  : Builtin_Object<RArray, T_ARRAY>(protect(rb_ary_new))
+  : Builtin_Object<T_ARRAY>(protect(rb_ary_new))
 {
   for(; it != end; ++it)
   {
@@ -35,7 +35,7 @@ Array(Iter_T it, Iter_T end)
 template<typename T, size_t n>
 inline Rice::Array::
 Array(T const (& a)[n])
-  : Builtin_Object<RArray, T_ARRAY>(protect(rb_ary_new))
+  : Builtin_Object<T_ARRAY>(protect(rb_ary_new))
 {
   for(size_t j = 0; j < n; ++j)
   {

data/rice/Builtin_Object.ipp

@@ -19,26 +19,26 @@ namespace detail
   }
 }
 
-template<typename T, int Builtin_Type>
-inline Builtin_Object<T, Builtin_Type>::
+template<int Builtin_Type>
+inline Builtin_Object<Builtin_Type>::
 Builtin_Object(Object value)
   : Object(value)
-  , obj_((T*)(value.value()))
+  , obj_((RObject*)(value.value()))
 {
   protect(detail::check_type, value, Builtin_Type);
 }
 
-template<typename T, int Builtin_Type>
-inline Builtin_Object<T, Builtin_Type>::
-Builtin_Object(Builtin_Object<T, Builtin_Type> const & other)
+template<int Builtin_Type>
+inline Builtin_Object<Builtin_Type>::
+Builtin_Object(Builtin_Object<Builtin_Type> const & other)
   : Object(other.value())
   , obj_(other.obj_)
 {
 }
 
-template<typename T, int Builtin_Type>
-inline void Builtin_Object<T, Builtin_Type>::
-swap(Builtin_Object<T, Builtin_Type> & ref)
+template<int Builtin_Type>
+inline void Builtin_Object<Builtin_Type>::
+swap(Builtin_Object<Builtin_Type> & ref)
 {
   std::swap(obj_, ref.obj_);
   Object::swap(ref);

data/rice/Builtin_Object_defn.hpp

@@ -14,7 +14,7 @@ namespace Rice
  *  class is a wrapper for those types of objects, primarily useful as a
  *  base class for other wrapper classes like Array and Hash.
  */
-template<typename T, int Builtin_Type>
+template<int Builtin_Type>
 class Builtin_Object
   : public Object
 {
@@ -31,17 +31,17 @@ public:
    */
   Builtin_Object(Builtin_Object const & other);
 
-  T & operator*() const { return *obj_; } //!< Return a reference to obj_
-  T * operator->() const { return obj_; } //!< Return a pointer to obj_
-  T * get() const { return obj_; }        //!< Return a pointer to obj_
+  RObject & operator*() const { return *obj_; } //!< Return a reference to obj_
+  RObject * operator->() const { return obj_; } //!< Return a pointer to obj_
+  RObject * get() const { return obj_; }        //!< Return a pointer to obj_
 
   //! Swap with another builtin object of the same type
   /*! \param ref the object with which to swap.
    */
-  void swap(Builtin_Object<T, Builtin_Type> & ref);
+  void swap(Builtin_Object<Builtin_Type> & ref);
 
 private:
-  T * obj_;
+  RObject * obj_;
 };
 
 } // namespace Rice

data/rice/Hash.hpp

@@ -22,7 +22,7 @@ namespace Rice
 //!   std::cout << String(h[42]) << std::endl;
 //! \endcode
 class Hash
-  : public Builtin_Object<RHash, T_HASH>
+  : public Builtin_Object<T_HASH>
 {
 public:
   //! Construct a new hash.

data/rice/Hash.ipp

@@ -10,13 +10,13 @@
 
 inline Rice::Hash::
 Hash()
-  : Builtin_Object<RHash, T_HASH>(protect(rb_hash_new))
+  : Builtin_Object<T_HASH>(protect(rb_hash_new))
 {
 }
 
 inline Rice::Hash::
 Hash(Object v)
-  : Builtin_Object<RHash, T_HASH>(v)
+  : Builtin_Object<T_HASH>(v)
 {
 }
 

data/rice/String.cpp

@@ -13,37 +13,37 @@
 
 Rice::String::
 String()
-  : Builtin_Object<RString, T_STRING>(protect(rb_str_new2, ""))
+  : Builtin_Object<T_STRING>(protect(rb_str_new2, ""))
 {
 }
 
 Rice::String::
 String(VALUE v)
-  : Builtin_Object<RString, T_STRING>(v)
+  : Builtin_Object<T_STRING>(v)
 {
 }
 
 Rice::String::
 String(Object v)
-  : Builtin_Object<RString, T_STRING>(v)
+  : Builtin_Object<T_STRING>(v)
 {
 }
 
 Rice::String::
 String(char const * s)
-  : Builtin_Object<RString, T_STRING>(protect(rb_str_new2, s))
+  : Builtin_Object<T_STRING>(protect(rb_str_new2, s))
 {
 }
 
 Rice::String::
 String(std::string const & s)
-  : Builtin_Object<RString, T_STRING>(protect(rb_str_new, s.data(), s.length()))
+  : Builtin_Object<T_STRING>(protect(rb_str_new, s.data(), s.length()))
 {
 }
 
 Rice::String::
 String(Identifier id)
-  : Builtin_Object<RString, T_STRING>(protect(rb_str_new2, id.c_str()))
+  : Builtin_Object<T_STRING>(protect(rb_str_new2, id.c_str()))
 {
 }
 

data/rice/String.hpp

@@ -21,7 +21,7 @@ namespace Rice
  *  \endcode
  */
 class String
-  : public Builtin_Object<RString, T_STRING>
+  : public Builtin_Object<T_STRING>
 {
 public:
   //! Construct a new string.

data/rice/Struct.cpp

@@ -88,7 +88,7 @@ Rice::Struct::Instance::
 Instance(
     Struct const & type,
     Array args)
-  : Builtin_Object<RStruct, T_STRUCT>(type.new_instance(args))
+  : Builtin_Object<T_STRUCT>(type.new_instance(args))
   , type_(type)
 {
 }
@@ -97,7 +97,7 @@ Rice::Struct::Instance::
 Instance(
     Struct const & type,
     Object s)
-  : Builtin_Object<RStruct, T_STRUCT>(s)
+  : Builtin_Object<T_STRUCT>(s)
   , type_(type)
 {
 }
@@ -106,7 +106,7 @@ void Rice::Struct::Instance::
 swap(Instance & other)
 {
   type_.swap(other.type_);
-  Builtin_Object<RStruct, T_STRUCT>::swap(other);
+  Builtin_Object<T_STRUCT>::swap(other);
 }
 
 Rice::Struct Rice::

data/rice/Struct.hpp

@@ -120,7 +120,7 @@ private:
 //! An instance of a Struct
 //! \sa Struct
 class Struct::Instance
-  : public Builtin_Object<RStruct, T_STRUCT>
+  : public Builtin_Object<T_STRUCT>
 {
 public:
   //! Create a new Instance of a Struct.

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 215
+#define RICE__RUBY_VERSION_CODE 220
 
 #endif // Rice__detail__ruby_version_code__hpp

data/ruby/lib/version.rb

@@ -1,3 +1,3 @@
 module Rice
-  VERSION = "1.6.3"
+  VERSION = "1.7.0"
 end

data/test/test_Builtin_Object.cpp

@@ -15,7 +15,7 @@ TESTCASE(construct_with_object)
 {
   Class c(rb_cObject);
   Object o(c.call("new"));
-  Builtin_Object<RObject, T_OBJECT> b(o);
+  Builtin_Object<T_OBJECT> b(o);
   ASSERT_EQUAL(o.value(), b.value());
   ASSERT_EQUAL(T_OBJECT, rb_type(b.value()));
   ASSERT_EQUAL(rb_cObject, b.class_of().value());
@@ -26,8 +26,8 @@ TESTCASE(copy_construct)
 {
   Class c(rb_cObject);
   Object o(c.call("new"));
-  Builtin_Object<RObject, T_OBJECT> b(o);
-  Builtin_Object<RObject, T_OBJECT> b2(b);
+  Builtin_Object<T_OBJECT> b(o);
+  Builtin_Object<T_OBJECT> b2(b);
   ASSERT_EQUAL(o.value(), b2.value());
   ASSERT_EQUAL(T_OBJECT, rb_type(b2.value()));
   ASSERT_EQUAL(rb_cObject, b2.class_of().value());
@@ -38,7 +38,7 @@ TESTCASE(dereference)
 {
   Class c(rb_cObject);
   Object o(c.call("new"));
-  Builtin_Object<RObject, T_OBJECT> b(o);
+  Builtin_Object<T_OBJECT> b(o);
   ASSERT_EQUAL(ROBJECT(o.value()), &*b);
 }
 
@@ -46,7 +46,7 @@ TESTCASE(arrow)
 {
   Class c(rb_cObject);
   Object o(c.call("new"));
-  Builtin_Object<RObject, T_OBJECT> b(o);
+  Builtin_Object<T_OBJECT> b(o);
   ASSERT_EQUAL(rb_cObject, b->basic.klass);
 }
 
@@ -54,7 +54,7 @@ TESTCASE(get)
 {
   Class c(rb_cObject);
   Object o(c.call("new"));
-  Builtin_Object<RObject, T_OBJECT> b(o);
+  Builtin_Object<T_OBJECT> b(o);
   ASSERT_EQUAL(ROBJECT(o.value()), b.get());
 }
 
@@ -62,9 +62,9 @@ TESTCASE(swap)
 {
   Class c(rb_cObject);
   Object o1(c.call("new"));
-  Builtin_Object<RObject, T_OBJECT> b1(o1);
+  Builtin_Object<T_OBJECT> b1(o1);
   Object o2(c.call("new"));
-  Builtin_Object<RObject, T_OBJECT> b2(o2);
+  Builtin_Object<T_OBJECT> b2(o2);
   b1.swap(b2);
   ASSERT_EQUAL(b1.value(), o2.value());
   ASSERT_EQUAL(b2.value(), o1.value());

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rice
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Paul Brannan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies: []
 description: |
   Rice is a C++ interface to Ruby's C API.  It provides a type-safe and
@@ -227,7 +227,7 @@ files:
 - test/test_rice.rb
 - test/unittest.cpp
 - test/unittest.hpp
-homepage: http://rice.rubyforge.org/
+homepage: https://github.com/jasonroelofs/rice
 licenses:
 - MIT
 metadata: {}
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rice
+rubyforge_project: 
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4