rucy 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e17e711a8ae802303c387e10b9718fc4399be80c87fbf25badd9b518d6f4a2b
-  data.tar.gz: f7ffb9c06acdf4ecb9e2e0011e956365d558f6509a6c158e00894bba2b4de052
+  metadata.gz: 56529aaf0f2ed74b9dd36e7d9e95897b7bd9267bae66b633e106ea482bb2459a
+  data.tar.gz: 91c637b05fe1fd957a44ec5e668f171601d25421d867392ffdd9fbf91b0f8cb0
 SHA512:
-  metadata.gz: 121368e5fa7d2246451dae710fc0eb993b700eb1842a36dd0ecf0243b92aaf0f1a278adbe30bf16176b3656bbba137b4e5cb1e5265b2746cf1d69ad85a658a3c
-  data.tar.gz: 6363492ca08f9a2a7c03b444263d3b6a723453205335ac4c831ab32a6e92a1d9b9f85e3ca7d49421e8384e82b40da26da1de29d72bd185996b938a7f817b3171
+  metadata.gz: 61b4117c22f4eb8a10b18c6471a57f4570598d4d1d51f590e903a90dbbe9ceb53e9207c47714ee07ce8abb5ce2db9b4d6c652b07dfbcb6591dccc6d9a7848ed7
+  data.tar.gz: dc448333935c1171108fbb6a40ee5b5521f6686fcfbd1fa5607e427e10d4ff03d853f50b2d8690531e076a0a2bd8b3c4cc13282aaef0805ae027b2d89e020812

data/.doc/ext/rucy/class.cpp

@@ -22,9 +22,9 @@ namespace Rucy
 }// Rucy
 
 
-RUCY_WRAPPER_VALUE_FROM_TO(Base)
-RUCY_WRAPPER_VALUE_FROM_TO(Sub)
-RUCY_WRAPPER_VALUE_FROM_TO(SimpleObj)
+RUCY_WRAPPER_VALUE_FROM_TO(RUCY_EXPORT, Base)
+RUCY_WRAPPER_VALUE_FROM_TO(RUCY_EXPORT, Sub)
+RUCY_WRAPPER_VALUE_FROM_TO(RUCY_EXPORT, SimpleObj)
 
 
 template <typename T>

data/.doc/ext/rucy/struct.cpp

@@ -23,7 +23,7 @@ namespace Rucy
 
 }// Rucy
 
-RUCY_VALUE_FROM_TO(Struct)
+RUCY_VALUE_FROM_TO(RUCY_EXPORT, Struct)
 
 
 /*

data/.github/workflows/release-gem.yml

@@ -24,7 +24,7 @@ jobs:
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
       - name: test
-        run: bundle exec rake quiet test
+        run: bundle exec rake quiet packages test
 
       - name: create gem
         id: gem

data/.github/workflows/test.yml

@@ -24,6 +24,9 @@ jobs:
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
+      - name: packages
+        run: bundle exec rake packages
+
       - name: lib
         run: bundle exec rake lib
 

data/ChangeLog.md

@@ -1,6 +1,17 @@
 # rucy ChangeLog
 
 
+## [v0.3.1] - 2025-01-13
+
+- Update LICENSE
+- is_kind_of() -> is_a()
+
+
+## [v0.3] - 2024-07-06
+
+- Support Windows
+
+
 ## [v0.2.1] - 2024-07-05
 
 - Value() can take encoding parameter

data/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
-  arm64-darwin-22
+  arm64-darwin-23
 
 DEPENDENCIES
   rake

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 xord.org
+Copyright (c) 2011 xord.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -1,6 +1,5 @@
 # -*- mode: ruby -*-
 
-
 %w[../xot .]
   .map  {|s| File.expand_path "#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.1

data/ext/rucy/class.cpp

@@ -22,9 +22,9 @@ namespace Rucy
 }// Rucy
 
 
-RUCY_WRAPPER_VALUE_FROM_TO(Base)
-RUCY_WRAPPER_VALUE_FROM_TO(Sub)
-RUCY_WRAPPER_VALUE_FROM_TO(SimpleObj)
+RUCY_WRAPPER_VALUE_FROM_TO(RUCY_EXPORT, Base)
+RUCY_WRAPPER_VALUE_FROM_TO(RUCY_EXPORT, Sub)
+RUCY_WRAPPER_VALUE_FROM_TO(RUCY_EXPORT, SimpleObj)
 
 
 template <typename T>

data/ext/rucy/struct.cpp

@@ -23,7 +23,7 @@ namespace Rucy
 
 }// Rucy
 
-RUCY_VALUE_FROM_TO(Struct)
+RUCY_VALUE_FROM_TO(RUCY_EXPORT, Struct)
 
 
 /*

data/include/rucy/defs.h

@@ -0,0 +1,14 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RUCY_DEFS_H__
+#define __RUCY_DEFS_H__
+
+
+#if defined(WIN32) && defined(GCC) && defined(RUCY)
+	#define RUCY_EXPORT __declspec(dllexport)
+#else
+	#define RUCY_EXPORT
+#endif
+
+
+#endif//EOH

data/include/rucy/extension.h.erb

@@ -6,84 +6,85 @@
 
 #include <xot/ref.h>
 #include <xot/string.h>
+#include <rucy/defs.h>
 #include <rucy/rucy.h>
 #include <rucy/value.h>
 #include <rucy/exception.h>
 
 
-#define RUCY_DECLARE_VALUE_FROM(native_class) \
+#define RUCY_DECLARE_VALUE_FROM(export, native_class) \
 	namespace Rucy \
 	{ \
-		Value value (const native_class& obj); \
-		Value value (const native_class* obj); \
+		export Value value (const native_class& obj); \
+		export Value value (const native_class* obj); \
 	}
 
-#define RUCY_DECLARE_VALUE_TO(native_class) \
+#define RUCY_DECLARE_VALUE_TO(export, native_class) \
 	namespace Rucy \
 	{ \
-		template <>       native_class* value_to<      native_class*> (Value value, bool); \
-		template <> const native_class* value_to<const native_class*> (Value value, bool); \
-		template <>       native_class& value_to<      native_class&> (Value value, bool convert); \
-		template <> const native_class& value_to<const native_class&> (Value value, bool convert); \
+		template <> export       native_class* value_to<      native_class*> (Value value, bool); \
+		template <> export const native_class* value_to<const native_class*> (Value value, bool); \
+		template <> export       native_class& value_to<      native_class&> (Value value, bool convert); \
+		template <> export const native_class& value_to<const native_class&> (Value value, bool convert); \
 	}
 
-#define RUCY_DECLARE_ARRAY_TO(native_class) \
+#define RUCY_DECLARE_ARRAY_TO(export, native_class) \
 	namespace Rucy \
 	{ \
-		template <> native_class value_to<native_class> (Value value, bool convert); \
-		template <> native_class value_to<native_class> (int argc, const Value* argv, bool convert); \
+		template <> export native_class value_to<native_class> (Value value, bool convert); \
+		template <> export native_class value_to<native_class> (int argc, const Value* argv, bool convert); \
 	}
 
-#define RUCY_DECLARE_CONVERT_TO(native_type) \
-	RUCY_DECLARE_ARRAY_TO(native_type)
+#define RUCY_DECLARE_CONVERT_TO(export, native_type) \
+	RUCY_DECLARE_ARRAY_TO(export, native_type)
 
-#define RUCY_DECLARE_VALUE_OR_ARRAY_TO(native_class) \
-	RUCY_DECLARE_VALUE_TO(native_class) \
-	RUCY_DECLARE_ARRAY_TO(native_class)
+#define RUCY_DECLARE_VALUE_OR_ARRAY_TO(export, native_class) \
+	RUCY_DECLARE_VALUE_TO(export, native_class) \
+	RUCY_DECLARE_ARRAY_TO(export, native_class)
 
-#define RUCY_DECLARE_WRAPPER_VALUE_FROM(native_class) \
+#define RUCY_DECLARE_WRAPPER_VALUE_FROM(export, native_class) \
 	namespace Rucy \
 	{ \
-		Value value (native_class* obj); \
-		Value value (native_class* obj, Value klass); \
+		export Value value (native_class* obj); \
+		export Value value (native_class* obj, Value klass); \
 	}
 
-#define RUCY_DECLARE_WRAPPER_VALUE_TO(native_class) \
+#define RUCY_DECLARE_WRAPPER_VALUE_TO(export, native_class) \
 	namespace Rucy \
 	{ \
-		template <>       native_class* value_to<      native_class*> (Value value, bool convert); \
-		template <> const native_class* value_to<const native_class*> (Value value, bool convert); \
+		template <> export       native_class* value_to<      native_class*> (Value value, bool convert); \
+		template <> export const native_class* value_to<const native_class*> (Value value, bool convert); \
 	}
 
-#define RUCY_DEFINE_VALUE_FROM(native_class) \
+#define RUCY_DEFINE_VALUE_FROM(export, native_class) \
 	namespace Rucy \
 	{ \
-		Value \
+		export Value \
 		value (const native_class& obj) \
 		{ \
 			return new_type(get_ruby_class<native_class>(), new native_class(obj)); \
 		} \
-		Value \
+		export Value \
 		value (const native_class* obj) \
 		{ \
 			return obj ? value(*obj) : nil(); \
 		} \
 	}
 
-#define RUCY_DEFINE_VALUE_TO(native_class) \
+#define RUCY_DEFINE_VALUE_TO(export, native_class) \
 	namespace Rucy \
 	{ \
-		template <> native_class* \
+		template <> export native_class* \
 		value_to<native_class*> (Value value, bool) \
 		{ \
 			return get_type_ptr<native_class>(value, get_ruby_class<native_class>()); \
 		} \
-		template <> const native_class* \
+		template <> export const native_class* \
 		value_to<const native_class*> (Value value, bool convert) \
 		{ \
 			return (const native_class*) value_to<native_class*>(value, convert); \
 		} \
-		template <> native_class& \
+		template <> export native_class& \
 		value_to<native_class&> (Value value, bool convert) \
 		{ \
 			native_class* obj = value_to<native_class*>(value, convert); \
@@ -91,17 +92,17 @@
 				rucy_error(__FILE__, __LINE__, "failed to convert from/to %s.", #native_class); \
 			return *obj; \
 		} \
-		template <> const native_class& \
+		template <> export const native_class& \
 		value_to<const native_class&> (Value value, bool convert) \
 		{ \
 			return (const native_class&) value_to<native_class&>(value, convert); \
 		} \
 	}
 
-#define RUCY_DEFINE_ARRAY_TO(native_class) \
+#define RUCY_DEFINE_ARRAY_TO(export, native_class) \
 	namespace Rucy \
 	{ \
-		template <> native_class \
+		template <> export native_class \
 		value_to<native_class> (Value value, bool convert) \
 		{ \
 			if (value.is_array()) \
@@ -111,22 +112,22 @@
 		} \
 	}
 
-#define RUCY_DEFINE_CONVERT_TO(native_type) \
-	RUCY_DEFINE_ARRAY_TO(native_type)
+#define RUCY_DEFINE_CONVERT_TO(export, native_type) \
+	RUCY_DEFINE_ARRAY_TO(export, native_type)
 
-#define RUCY_DEFINE_VALUE_OR_ARRAY_TO(native_class) \
-	RUCY_DEFINE_VALUE_TO(native_class) \
-	RUCY_DEFINE_ARRAY_TO(native_class)
+#define RUCY_DEFINE_VALUE_OR_ARRAY_TO(export, native_class) \
+	RUCY_DEFINE_VALUE_TO(export, native_class) \
+	RUCY_DEFINE_ARRAY_TO(export, native_class)
 
-#define RUCY_DEFINE_WRAPPER_VALUE_FROM(native_class) \
+#define RUCY_DEFINE_WRAPPER_VALUE_FROM(export, native_class) \
 	namespace Rucy \
 	{ \
-		Value \
+		export Value \
 		value (native_class* obj) \
 		{ \
 			return value(obj, get_ruby_class<native_class>()); \
 		} \
-		Value \
+		export Value \
 		value (native_class* obj, Value klass) \
 		{ \
 			if (!obj) return nil(); \
@@ -137,56 +138,56 @@
 		} \
 	}
 
-#define RUCY_DEFINE_WRAPPER_VALUE_TO(native_class) \
+#define RUCY_DEFINE_WRAPPER_VALUE_TO(export, native_class) \
 	namespace Rucy \
 	{ \
-		template <> native_class* \
+		template <> export native_class* \
 		value_to<native_class*> (Value value, bool) \
 		{ \
 			return get_type_ptr<native_class>(value, get_ruby_class<native_class>()); \
 		} \
-		template <> const native_class* \
+		template <> export const native_class* \
 		value_to<const native_class*> (Value value, bool convert) \
 		{ \
 			return (const native_class*) value_to<native_class*>(value, convert); \
 		} \
 	}
 
-#define RUCY_DECLARE_VALUE_FROM_TO(native_class) \
-	RUCY_DECLARE_VALUE_FROM(native_class) \
-	RUCY_DECLARE_VALUE_TO(native_class)
+#define RUCY_DECLARE_VALUE_FROM_TO(export, native_class) \
+	RUCY_DECLARE_VALUE_FROM(export, native_class) \
+	RUCY_DECLARE_VALUE_TO(export, native_class)
 
-#define RUCY_DEFINE_VALUE_FROM_TO(native_class) \
-	RUCY_DEFINE_VALUE_FROM(native_class) \
-	RUCY_DEFINE_VALUE_TO(native_class)
+#define RUCY_DEFINE_VALUE_FROM_TO(export, native_class) \
+	RUCY_DEFINE_VALUE_FROM(export, native_class) \
+	RUCY_DEFINE_VALUE_TO(export, native_class)
 
-#define RUCY_VALUE_FROM_TO(native_class) \
-	RUCY_DECLARE_VALUE_FROM_TO(native_class) \
-	RUCY_DEFINE_VALUE_FROM_TO(native_class)
+#define RUCY_VALUE_FROM_TO(export, native_class) \
+	RUCY_DECLARE_VALUE_FROM_TO(export, native_class) \
+	RUCY_DEFINE_VALUE_FROM_TO(export, native_class)
 
-#define RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(native_class) \
-	RUCY_DECLARE_VALUE_FROM(native_class) \
-	RUCY_DECLARE_VALUE_OR_ARRAY_TO(native_class)
+#define RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(export, native_class) \
+	RUCY_DECLARE_VALUE_FROM(export, native_class) \
+	RUCY_DECLARE_VALUE_OR_ARRAY_TO(export, native_class)
 
-#define RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(native_class) \
-	RUCY_DEFINE_VALUE_FROM(native_class) \
-	RUCY_DEFINE_VALUE_OR_ARRAY_TO(native_class)
+#define RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(export, native_class) \
+	RUCY_DEFINE_VALUE_FROM(export, native_class) \
+	RUCY_DEFINE_VALUE_OR_ARRAY_TO(export, native_class)
 
-#define RUCY_VALUE_OR_ARRAY_FROM_TO(native_class) \
-	RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(native_class) \
-	RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(native_class)
+#define RUCY_VALUE_OR_ARRAY_FROM_TO(export, native_class) \
+	RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(export, native_class) \
+	RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(export, native_class)
 
-#define RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(native_class) \
-	RUCY_DECLARE_WRAPPER_VALUE_FROM(native_class) \
-	RUCY_DECLARE_WRAPPER_VALUE_TO(native_class)
+#define RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(export, native_class) \
+	RUCY_DECLARE_WRAPPER_VALUE_FROM(export, native_class) \
+	RUCY_DECLARE_WRAPPER_VALUE_TO(export, native_class)
 
-#define RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(native_class) \
-	RUCY_DEFINE_WRAPPER_VALUE_FROM(native_class) \
-	RUCY_DEFINE_WRAPPER_VALUE_TO(native_class)
+#define RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(export, native_class) \
+	RUCY_DEFINE_WRAPPER_VALUE_FROM(export, native_class) \
+	RUCY_DEFINE_WRAPPER_VALUE_TO(export, native_class)
 
-#define RUCY_WRAPPER_VALUE_FROM_TO(native_class) \
-	RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(native_class) \
-	RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(native_class)
+#define RUCY_WRAPPER_VALUE_FROM_TO(export, native_class) \
+	RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(export, native_class) \
+	RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(export, native_class)
 
 
 #define RUCY_TRY \

data/include/rucy/ruby.h

@@ -15,6 +15,10 @@
 #undef memcpy // avoid defining ruby_nonempty_memcpy
 #endif
 
+#ifdef THIS
+#undef THIS // defined by <combaseapi.h>
+#endif
+
 
 namespace Rucy
 {

data/include/rucy/value.h.erb

@@ -108,7 +108,7 @@ namespace Rucy
 
 			Value klass () const;
 
-			bool is_kind_of (Value klass) const;
+			bool is_a (Value klass) const;
 
 			Value inspect () const;
 

data/include/rucy.h

@@ -5,6 +5,7 @@
 
 
 #include <rucy/ruby.h>
+#include <rucy/defs.h>
 #include <rucy/rucy.h>
 #include <rucy/exception.h>
 #include <rucy/debug.h>

data/rucy.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_runtime_dependency 'xot', '~> 0.2.1'
+  s.add_runtime_dependency 'xot', '~> 0.3.1'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/extension.cpp

@@ -15,7 +15,7 @@ namespace Rucy
 		if (!klass)
 			argument_error(__FILE__, __LINE__);
 
-		if (!obj.is_kind_of(klass))
+		if (!obj.is_a(klass))
 		{
 			RUCY_SYMBOL(clas, "class");
 			RUCY_SYM(name);
@@ -33,7 +33,9 @@ namespace Rucy
 		int n1, int n2, int n3, int n4, int n5,
 		int n6, int n7, int n8, int n9, int n10)
 	{
-		if (nargs < 0 || nargs_expected_n0 < 0)
+		if (nargs < 0)
+			argument_error(__FILE__, __LINE__);
+		if (nargs_expected_n0 < 0)
 			argument_error(__FILE__, __LINE__);
 
 		if (

data/src/value.cpp.erb

@@ -106,13 +106,13 @@ namespace Rucy
 	bool
 	Value::is_i () const
 	{
-		return FIXNUM_P(val) || type() == RUBY_T_BIGNUM || is_kind_of(rb_cInteger);
+		return FIXNUM_P(val) || type() == RUBY_T_BIGNUM || is_a(rb_cInteger);
 	}
 
 	bool
 	Value::is_f () const
 	{
-		return RB_FLOAT_TYPE_P(val) || is_kind_of(rb_cFloat);
+		return RB_FLOAT_TYPE_P(val) || is_a(rb_cFloat);
 	}
 
 	bool
@@ -124,25 +124,25 @@ namespace Rucy
 	bool
 	Value::is_s () const
 	{
-		return type() == RUBY_T_STRING || is_kind_of(rb_cString);
+		return type() == RUBY_T_STRING || is_a(rb_cString);
 	}
 
 	bool
 	Value::is_sym () const
 	{
-		return SYMBOL_P(val) || is_kind_of(rb_cSymbol);
+		return SYMBOL_P(val) || is_a(rb_cSymbol);
 	}
 
 	bool
 	Value::is_array () const
 	{
-		return type() == RUBY_T_ARRAY || is_kind_of(rb_cArray);
+		return type() == RUBY_T_ARRAY || is_a(rb_cArray);
 	}
 
 	bool
 	Value::is_hash () const
 	{
-		return type() == RUBY_T_HASH || is_kind_of(rb_cHash);
+		return type() == RUBY_T_HASH || is_a(rb_cHash);
 	}
 
 	bool
@@ -308,7 +308,7 @@ namespace Rucy
 	}
 
 	bool
-	Value::is_kind_of (Value klass) const
+	Value::is_a (Value klass) const
 	{
 		return rb_obj_is_kind_of(val, klass);
 	}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2025-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 description: This library helps you to develop Ruby Extension by C++.
 email: xordog@gmail.com
 executables:
@@ -69,6 +69,7 @@ files:
 - include/rucy.h
 - include/rucy/class.h
 - include/rucy/debug.h
+- include/rucy/defs.h
 - include/rucy/exception.h
 - include/rucy/extension.h.erb
 - include/rucy/function.h.erb