rucy 0.1.6 → 0.1.7

data/task/doc.rake

@@ -1,6 +1,11 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
+File.expand_path('../../bin', __FILE__).tap do |path|
+  ENV['PATH'] += ":#{path}" unless ENV['PATH'].split(':').include?(path)
+end
+
+
 task :doc => 'doc:build'
 
 %w[clean rdoc].each do |t|

data/test/helper.rb

@@ -1,9 +1,13 @@
 # -*- coding: utf-8 -*-
 
 
-require 'xot/load_path'
-Xot::LoadPath.unshift File.expand_path('../../lib', __FILE__)
+%w[../xot .]
+  .map  {|s| File.expand_path "../../#{s}/lib", __FILE__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'test/unit'
+require 'xot/test'
 require 'rucy'
 require 'rucy/tester'
+
+include Xot::Test

data/test/test_class.rb

@@ -45,6 +45,12 @@ class TestClass < Test::Unit::TestCase
     Sub.new_raw *args
   end
 
+  def last_log (pattern = nil)
+    logs = Rucy::Tester.all_logs
+    logs.select! {|o| o =~ pattern} if pattern
+    logs.last
+  end
+
   def test_is_kind_of_base ()
     assert_kind_of Base, base
     assert_kind_of Base, base_raw
@@ -58,13 +64,13 @@ class TestClass < Test::Unit::TestCase
     assert_kind_of Sub,  temp
     assert_kind_of Temp, temp
 
-    assert !base     .kind_of?(Sub)
-    assert !base_raw .kind_of?(Sub)
-    assert !base     .kind_of?(Temp)
-    assert !base_raw .kind_of?(Temp)
+    assert_not base     .kind_of?(Sub)
+    assert_not base_raw .kind_of?(Sub)
+    assert_not base     .kind_of?(Temp)
+    assert_not base_raw .kind_of?(Temp)
 
-    assert !sub    .kind_of?(Temp)
-    assert !sub_raw.kind_of?(Temp)
+    assert_not sub    .kind_of?(Temp)
+    assert_not sub_raw.kind_of?(Temp)
   end
 
   def test_name ()
@@ -128,34 +134,35 @@ class TestClass < Test::Unit::TestCase
   end
 
   def test_gc ()
-    def gc () 10.times {GC.start} end
+    def simple_objs (name, n = 10) ([nil] * n).map {SimpleObj.new name} end
+    def gc (n = 10) n.times {GC.start}; print '' end
     rt = Rucy::Tester
 
     gc
     rt.clear_logs
 
-    o = RubyObj.new
-    assert_equal 'RubyObj()', last_log
+    objs = simple_objs 1
+    assert_equal 'SimpleObj(1)', last_log(/1/)
     gc
-    assert_equal 'RubyObj()', last_log
-    o = nil
+    assert_equal 'SimpleObj(1)', last_log(/1/)
+    objs = nil
     gc
-    assert_equal '~RubyObj()', last_log
+    assert_equal '~SimpleObj(1)', last_log(/1/)
 
     gc
     rt.clear_logs
 
-    o = RubyObj.new
-    assert_equal 'RubyObj()', last_log
-    RubyObj.set_ref o
+    objs = simple_objs 2
+    assert_equal 'SimpleObj(2)', last_log(/2/)
+    SimpleObj.set_refs objs
     gc
-    assert_equal 'RubyObj()', last_log
-    o = nil
+    assert_equal 'SimpleObj(2)', last_log(/2/)
+    objs = nil
     gc
-    assert_equal 'RubyObj()', last_log
-    RubyObj.clear_ref
+    assert_equal 'SimpleObj(2)', last_log(/2/)
+    SimpleObj.clear_refs
     gc
-    assert_equal '~RubyObj()', last_log
+    assert_equal '~SimpleObj(2)', last_log(/2/)
   end
 
 end# TestClass

data/test/test_function.rb

@@ -28,4 +28,10 @@ class TestFunction < Test::Unit::TestCase
     assert_kind_of String, return_string
   end
 
+  def test_check_arg_count ()
+    assert_equal :ok, arg_count_must_1(:arg1)
+    assert_raise(ArgumentError) {arg_count_must_1}
+    assert_raises(ArgumentError) {arg_count_must_1 :arg1, :arg2}
+  end
+
 end# TestFunction

data/test/test_value.rb

@@ -13,6 +13,10 @@ class TestFunction < Test::Unit::TestCase
     assert_equal false, false_to_value
     assert_equal nil, null_to_value
     assert_equal nil, nil_value
+    assert_equal [1], array_value(1)
+    assert_equal [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], array_value(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+    assert_raise(ArgumentError) {array_value}
+    assert_raise(ArgumentError) {array_value 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
   end
 
 end# TestFunction

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rucy
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - snori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xot
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This library helps you to develop Ruby Extension by C++.
@@ -66,17 +59,14 @@ executables:
 extensions:
 - Rakefile
 extra_rdoc_files:
-- README
-- .doc/ext/rucy/class.cpp
-- .doc/ext/rucy/exception.cpp
-- .doc/ext/rucy/function.cpp
-- .doc/ext/rucy/struct.cpp
-- .doc/ext/rucy/tester.cpp
-- .doc/ext/rucy/value.cpp
+- ".doc/ext/rucy/class.cpp"
+- ".doc/ext/rucy/exception.cpp"
+- ".doc/ext/rucy/function.cpp"
+- ".doc/ext/rucy/struct.cpp"
+- ".doc/ext/rucy/tester.cpp"
+- ".doc/ext/rucy/value.cpp"
 files:
-- .gitignore
-- ChangeLog
-- README
+- README.md
 - Rakefile
 - VERSION
 - bin/rucy2rdoc
@@ -91,11 +81,11 @@ files:
 - ext/rucy/value.cpp
 - include/rucy.h
 - include/rucy/class.h
-- include/rucy/defs.h.erb
 - include/rucy/exception.h
-- include/rucy/extension.h
+- include/rucy/extension.h.erb
 - include/rucy/function.h.erb
 - include/rucy/module.h.erb
+- include/rucy/ruby.h
 - include/rucy/rucy.h
 - include/rucy/symbol.h
 - include/rucy/value.h.erb
@@ -104,6 +94,7 @@ files:
 - rucy.gemspec
 - src/class.cpp
 - src/exception.cpp
+- src/extension.cpp
 - src/function.cpp.erb
 - src/module.cpp.erb
 - src/rucy.cpp
@@ -116,35 +107,34 @@ files:
 - test/test_function.rb
 - test/test_struct.rb
 - test/test_value.rb
-- .doc/ext/rucy/class.cpp
-- .doc/ext/rucy/exception.cpp
-- .doc/ext/rucy/function.cpp
-- .doc/ext/rucy/struct.cpp
-- .doc/ext/rucy/tester.cpp
-- .doc/ext/rucy/value.cpp
+- ".doc/ext/rucy/class.cpp"
+- ".doc/ext/rucy/exception.cpp"
+- ".doc/ext/rucy/function.cpp"
+- ".doc/ext/rucy/struct.cpp"
+- ".doc/ext/rucy/tester.cpp"
+- ".doc/ext/rucy/value.cpp"
 homepage: http://github.com/xord/rucy/wiki
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby C++ Extension Helper Library.
 test_files:
 - test/helper.rb

data/.gitignore

@@ -1,22 +0,0 @@
-*.o
-*.so
-*.bundle
-*.dll.a
-*.gem
-*.log
-*.rdoc.cpp
-*~
-lib/*.a
-.doc
-.yardoc
-.DS_Store
-Makefile
-depend.mf
-
-include/rucy/defs.h
-include/rucy/function.h
-include/rucy/module.h
-include/rucy/value.h
-src/function.cpp
-src/module.cpp
-src/value.cpp

data/ChangeLog

@@ -1,13 +0,0 @@
-2011-09-2 snori <snori@xord.org>
-
-	* add bin/rucy2rdoc.
-
-
-2011-08-28 snori <snori@xord.org>
-
-	* v0.1.1
-
-	
-2011-06-03 snori <snori@xord.org>
-
-	* delete Gemfile.

data/include/rucy/defs.h.erb

@@ -1,76 +0,0 @@
-// -*- c++ -*-
-#pragma once
-#ifndef __RUCY_DEFS_H__
-#define __RUCY_DEFS_H__
-
-
-#include <ruby.h>
-#include <xot/string.h>
-
-
-namespace Rucy
-{
-
-
-	using Xot::String;
-
-
-	class Value;
-
-
-	typedef VALUE (*RubyFunctionN) (int argc, const Value* argv, Value self);
-%	NTIMES.each do |n|
-	typedef VALUE (*RubyFunction<%= n %>) (Value self<%= params(n) {|i| ", Value v#{i}"} %>);
-%	end
-
-
-}// Rucy
-
-
-#define RUBY_DEF_ALLOC(name, klass) \
-	VALUE name (Value klass) \
-	{ \
-		RUBY_TRY
-#define RUBY_DEFN(name) \
-	VALUE name (int argc, const Value* argv, Value self) \
-	{ \
-		RUBY_TRY
-%	NTIMES.each do |n|
-#define RUBY_DEF<%= n %>(name<%= params(n) {|i| ", v#{i}"} %>) \
-	VALUE name (Value self<%= params(n) {|i| ", Value v#{i}"} %>) \
-	{ \
-		RUBY_TRY
-%	end
-
-#define RUBY_END \
-		RUBY_CATCH \
-		return Qnil; \
-	}
-
-#ifdef RUCY_USE_DEF
-	#define DEFN RUBY_DEFN
-%	NTIMES.each do |n|
-	#define DEF<%= n %> RUBY_DEF<%= n %>
-%	end
-	#define END RUBY_END
-#endif
-
-
-#define RUCY_CHECK_OBJ(obj, type, klass) \
-	do \
-	{ \
-		type* p = Rucy::get_type_ptr<type>(obj, klass); \
-		if (!p) Rucy::invalid_object_error(); \
-	} \
-	while(0)
-
-#define RUCY_CHECK_OBJECT(obj, type, klass) \
-	do \
-	{ \
-		type* p = Rucy::get_type_ptr<type>(obj, klass); \
-		if (!p || !*p) Rucy::invalid_object_error(); \
-	} \
-	while(0)
-
-
-#endif//EOH

data/include/rucy/extension.h

@@ -1,206 +0,0 @@
-// -*- c++ -*-
-#pragma once
-#ifndef __RUCY_EXTENSION_H__
-#define __RUCY_EXTENSION_H__
-
-
-#include <boost/dynamic_bitset.hpp>
-#include <xot/ref.h>
-#include <rucy/module.h>
-
-
-namespace Rucy
-{
-
-
-	template <typename T>
-	class ClassWrapper : public T
-	{
-
-		typedef ClassWrapper This;
-
-		public:
-
-			typedef T Super;
-
-			GlobalValue value;
-
-			ClassWrapper ()
-			:	value(Qnil, true)
-			{
-			}
-
-			virtual void retain ()
-			{
-				value.gc(false);
-				Super::retain();
-			}
-
-			virtual void release ()
-			{
-				Super::release();
-				value.gc(true);
-			}
-
-			virtual void clear_override_flags ()
-			{
-				override_flags.reset();
-			}
-
-			virtual bool is_overridden (const Value& klass, const Symbol& name, uint id) const
-			{
-				if (id <= OVERRIDE_ID_UNKNOWN)
-					return false;
-
-				bool checked = false, overridden = false;
-				get_override_flag(&checked, &overridden, id);
-				if (checked) return overridden;
-
-				overridden = check_overridden(klass, name);
-				if (!const_cast<This*>(this)->set_override_flag(id, true, overridden))
-					return false;
-
-				return overridden;
-			}
-
-		protected:
-
-			enum
-			{
-
-				OVERRIDE_ID_UNKNOWN = 0,
-
-				OVERRIDE_ID_LAST,
-
-				OVERRIDE_ID_MAX = 256
-
-			};
-
-		private:
-
-			boost::dynamic_bitset<> override_flags;
-
-			bool check_overridden (const Value& klass, const Symbol& name) const
-			{
-				SYM(method);
-				SYM(owner);
-				return this->value.call(method, name.value()).call(owner) != klass;
-			}
-
-			void get_override_flag (bool* checked, bool* overridden, uint id) const
-			{
-				assert(checked || overridden);
-
-				int checked_pos    = id2index(id);
-				int overridden_pos = checked_pos + 1;
-				bool valid = 0 <= checked_pos && overridden_pos < (int) override_flags.size();
-				if (checked)    *checked    = valid ? override_flags[checked_pos]    : false;
-				if (overridden) *overridden = valid ? override_flags[overridden_pos] : false;
-			}
-
-			bool set_override_flag (uint id, bool checked, bool overridden)
-			{
-				assert(id < OVERRIDE_ID_MAX);
-
-				int checked_pos = id2index(id);
-				if (checked_pos < 0) return true;
-
-				int overridden_pos = checked_pos + 1;
-				if (overridden_pos >= (int) override_flags.size())
-					override_flags.resize(overridden_pos + 1);
-
-				override_flags[checked_pos]    = checked;
-				override_flags[overridden_pos] = overridden;
-				return true;
-			}
-
-			int id2index (uint id) const
-			{
-				return (id - 1) * 2;
-			}
-
-	};// ClassWrapper
-
-
-	template <typename T> inline void release_wrapper (void* p)
-	{
-		if (p) ((T*) p)->Xot::template RefCountable<>::release();
-	}
-
-	template <typename T> inline Value new_wrapper (
-		Value klass, T* ptr,
-		RUBY_DATA_FUNC mark = NULL,
-		RUBY_DATA_FUNC free = release_wrapper<T>)
-	{
-		if (ptr) ptr->Xot::template RefCountable<>::retain();
-		return new_type(klass, ptr, mark, free);
-	}
-
-	template <typename T> inline Value new_wrapper (
-		Value klass,
-		RUBY_DATA_FUNC mark = NULL,
-		RUBY_DATA_FUNC free = release_wrapper<T>)
-	{
-		return new_wrapper(klass, new T, mark, free);
-	}
-
-
-}// Rucy
-
-
-#define RUCY_WRAPPER_VALUE_FROM(wrapped_class, ruby_class) \
-	namespace Rucy \
-	{ \
-		inline Value \
-		value (wrapped_class* obj, Value klass = ruby_class) \
-		{ \
-			if (!obj) return Qnil; \
-			ClassWrapper<wrapped_class>* p = dynamic_cast<ClassWrapper<wrapped_class>*>(obj); \
-			if (!p) return new_ref(klass, obj); \
-			if (p->value.is_nil()) p->value = new_wrapper(klass, obj); \
-			return p->value; \
-		} \
-	}
-
-#define RUCY_WRAPPER_VALUE_TO(wrapped_class, ruby_class) \
-	namespace Rucy \
-	{ \
-		template <> inline wrapped_class* \
-		value_to<wrapped_class*> (Value value, bool convert) \
-		{ \
-			return get_type_ptr<wrapped_class>(value, ruby_class); \
-		} \
-	}
-
-#define RUCY_WRAPPER_VALUE_FROM_TO(wrapped_class, ruby_class) \
-	RUCY_WRAPPER_VALUE_FROM(wrapped_class, ruby_class) \
-	RUCY_WRAPPER_VALUE_TO(wrapped_class, ruby_class)
-
-
-#define RUCY_WRAPPER_CALL(wrapper_class, obj, fun) \
-	(dynamic_cast<wrapper_class*>(obj) \
-		? reinterpret_cast<wrapper_class*>(obj)->Super::fun \
-		: (obj)->fun)
-
-
-#define RUCY_OVERRIDE_ID_START(name) enum { OID_##name = Super::OVERRIDE_ID_LAST,
-#define RUCY_OVERRIDE_ID(name)              OID_##name,
-#define RUCY_OVERRIDE_ID_LAST               OVERRIDE_ID_LAST };
-
-
-#define RUCY_IS_OVERRIDDEN(name, ruby_class) \
-	this->is_overridden(ruby_class, name, OID_##name)
-
-#define RUCY_OVERRIDABLE_METHOD(name, ruby_class, suffix) \
-	SYM(name); \
-	return this->value.call(name) suffix ;
-
-#define RUCY_OVERRIDABLE_METHOD_FAST(name, ruby_class, suffix) \
-	SYM(name); \
-	if (RUCY_IS_OVERRIDDEN(name, ruby_class)) \
-		return this->value.call(name) suffix ; \
-	else \
-		return this->Super::name();
-
-
-#endif//EOH