rays 0.1.31 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 958a334c5a26f773a1b99706103f104d1196d5e808721b89f8aa887641f65f00
-  data.tar.gz: 4f63633edea9768657373a2b59323b11f2b3ab07632bf192a60ab83db42fd480
+  metadata.gz: 38c6d27f95affd2e2d8aa8126c4f5349eba44837eb4833a3ffa47de647edf1c5
+  data.tar.gz: d2aad318e705ba6e21dd3770b06d08d0eaacc63f65e148add39fd36866911348
 SHA512:
-  metadata.gz: 749bf2ccb3d4b142e2ac4ef2531716f63632680cc44014b4e880abad0ed93ce6b9ce764bce040b53f10b4957927777ed009d9d2043e7d92b5d91bd939df975bf
-  data.tar.gz: 150864fbee3311eec9c0c023cb1b6054af1cbadaabd5a5ffc6b867d72c5b628f4803dee02bbbd9e61e1f5df8e9785c0cb5d090e967b24f5e66405b53452a6ad1
+  metadata.gz: a8961d3744c161d2aed4d4277745c330acfd9d3295fda8723b9d88cb5778467f00a842e15425af33318e3ad5801e02da5691099ff87cb3701e7f7d599a685ae2
+  data.tar.gz: 2c627cb61a4bbe4a825ad648f7a512667e502b533b7809e4cad33ee43e98af3093d24c104e3bf9f81c5119687faa350e7ac57313e17f01d8c3c2e28e42096228

data/.doc/ext/rays/camera.cpp

@@ -24,7 +24,7 @@ VALUE setup(VALUE self, VALUE device_name, VALUE min_width, VALUE min_height, VA
 	RUCY_CHECK_OBJ(Rays::Camera, self);
 
 	*THIS = Rays::Camera(
-		device_name ? to<const char*>(device_name) : NULL,
+		device_name ? device_name.c_str() : NULL,
 		to<int>(min_width), to<int>(min_height),
 		to<bool>(resize), to<bool>(crop));
 	return self;

data/.doc/ext/rays/image.cpp

@@ -60,6 +60,14 @@ VALUE initialize_copy(VALUE self, VALUE obj)
 	return self;
 }
 
+static
+VALUE save(VALUE self, VALUE path)
+{
+	CHECK;
+	THIS->save(path.c_str());
+	return self;
+}
+
 static
 VALUE width(VALUE self)
 {
@@ -103,20 +111,9 @@ VALUE bitmap(VALUE self)
 }
 
 static
-VALUE save(VALUE self, VALUE path)
-{
-	CHECK;
-	Rays::save_image(*THIS, path.c_str());
-	return self;
-}
-
-
-static
-VALUE load(VALUE self)
+VALUE load(VALUE self, VALUE path)
 {
-	check_arg_count(__FILE__, __LINE__, "Image.load", argc, 1);
-
-	return value(Rays::load_image(argv[0].c_str()));
+	return value(Rays::load_image(path.c_str()));
 }
 
 
@@ -131,14 +128,14 @@ Init_rays_image ()
 	rb_define_alloc_func(cImage, alloc);
 	rb_define_private_method(cImage, "initialize", RUBY_METHOD_FUNC(initialize), -1);
 	rb_define_private_method(cImage, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
+	rb_define_method(cImage, "save", RUBY_METHOD_FUNC(save), 1);
 	rb_define_method(cImage, "width", RUBY_METHOD_FUNC(width), 0);
 	rb_define_method(cImage, "height", RUBY_METHOD_FUNC(height), 0);
 	rb_define_method(cImage, "color_space", RUBY_METHOD_FUNC(color_space), 0);
 	rb_define_method(cImage, "pixel_density", RUBY_METHOD_FUNC(pixel_density), 0);
 	rb_define_method(cImage, "painter", RUBY_METHOD_FUNC(painter), 0);
 	rb_define_method(cImage, "bitmap", RUBY_METHOD_FUNC(bitmap), 0);
-	rb_define_method(cImage, "save", RUBY_METHOD_FUNC(save), 1);
-	rb_define_module_function(cImage, "load", RUBY_METHOD_FUNC(load), -1);
+	rb_define_module_function(cImage, "load", RUBY_METHOD_FUNC(load), 1);
 }
 
 

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

@@ -0,0 +1,62 @@
+name: Release Gem
+
+on:
+  push:
+    tags: ['v[0-9]*']
+
+jobs:
+  release:
+    runs-on: macos-latest
+
+    steps:
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
+
+      - name: install gems
+        run: gem install yard
+
+      - name: test
+        run: rake quiet test
+
+      - name: create gem
+        id: gem
+        run: |
+          rake gem
+          echo path=$(ruby -e 'print Dir.glob("*.gem").first') >> $GITHUB_OUTPUT
+
+      - name: create github release
+        id: release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+
+      - name: upload to github release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.release.outputs.upload_url }}
+          asset_path: ./${{ steps.gem.outputs.path }}
+          asset_name:   ${{ steps.gem.outputs.path }}
+          asset_content_type: application/zip
+
+      - name: upload to rubygems
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          rake upload

data/.github/workflows/test.yml

@@ -22,11 +22,5 @@ jobs:
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
-      - name: lib
-        run: rake lib
-
-      - name: ext
-        run: rake ext
-
       - name: test
         run: rake test

data/.github/workflows/utils.rb

@@ -1,3 +1,5 @@
+RENAMES = {reflex: 'reflexion'}
+
 def sh(cmd)
   puts cmd
   system cmd
@@ -5,8 +7,10 @@ end
 
 def setup_dependencies(build: true, only: nil)
   gemspec_path = `git ls-files`.lines(chomp: true).find {|l| l =~ /\.gemspec$/}
-  gemspec      = File.read gemspec_path
-  name         = File.basename gemspec_path, '.gemspec'
+  return unless gemspec_path
+
+  gemspec = File.read gemspec_path
+  name    = File.basename gemspec_path, '.gemspec'
 
   exts = File.readlines('Rakefile')
     .map {|l| l[%r|^\s*require\W+(\w+)/extension\W+$|, 1]}
@@ -15,9 +19,13 @@ def setup_dependencies(build: true, only: nil)
   exts = exts & [only].flatten.map(&:to_s) if only
 
   exts.each do |ext|
-    ver = gemspec[/add_runtime_dependency.*'#{ext}'.*'\s*~>\s*([\d\.]+)\s*'/, 1]
-    url = "https://github.com/xord/#{ext}.git"
-    sh %( git clone --depth 1 --branch v#{ver} #{url} ../#{ext} )
+    gem   = RENAMES[ext.to_sym].then {|s| s || ext}
+    clone = "git clone --depth 1 https://github.com/xord/#{ext}.git ../#{ext}"
+    ver   = gemspec[/add_runtime_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
+
+    # 'rake subtree:push' pushes all subrepos, so cloning by new tag
+    # often fails before tagging each new tag
+    sh %( #{clone} --branch v#{ver} || #{clone} )
     sh %( cd ../#{ext} && rake ext )
   end
 end

data/ChangeLog.md

@@ -1,6 +1,17 @@
 # rays ChangeLog
 
 
+## [v0.1.33] - 2023-04-22
+
+- Update external libraries
+- save_image(image, path) -> Image::save(path)
+
+
+## [v0.1.32] - 2023-03-01
+
+- fix bugs
+
+
 ## [v0.1.31] - 2023-02-27
 
 - add ChangeLog.md file

data/Rakefile

@@ -13,29 +13,30 @@ require 'rays/extension'
 
 
 EXTENSIONS  = [Xot, Rucy, Rays]
-TESTS_ALONE = ['test/test_rays.rb']
+TESTS_ALONE = ['test/test_rays_init.rb']
 
 use_external_library 'https://github.com/g-truc/glm',
-  tag: '0.9.8.5',
-  srcdir: 'NOSRC'
+  tag:     '0.9.9.8',
+  srcdirs: 'NOSRC'
 
 use_external_library 'https://github.com/skyrpex/clipper',
-  tag: '6.4.2',
-  incdir: 'cpp',
-  srcdir: 'cpp',
+  tag:      '6.4.2',
+  incdirs:  'cpp',
+  srcdirs:  'cpp',
   excludes: 'clipper/cpp/cpp_'
 
 use_external_library 'https://github.com/greenm01/poly2tri',
-  incdir: 'poly2tri',
-  srcdir: 'poly2tri'
+  commit:  '88de49021b6d9bef6faa1bc94ceb3fbd85c3c204',
+  incdirs: 'poly2tri',
+  srcdirs: 'poly2tri'
 
-use_external_library 'https://github.com/andrewwillmott/splines-lib.git',
+use_external_library 'https://github.com/andrewwillmott/splines-lib',
+  commit:   '11e7240d57b0d22871aec3308186a5fcf915ba77',
   excludes: 'Test\.cpp'
 
+default_tasks :ext
 build_native_library
 build_ruby_extension
 test_ruby_extension
 generate_documents
 build_ruby_gem
-
-task :default => :ext

data/VERSION

@@ -1 +1 @@
-0.1.31
+0.1.33

data/ext/rays/camera.cpp

@@ -25,7 +25,7 @@ RUCY_DEF5(setup, device_name, min_width, min_height, resize, crop)
 	RUCY_CHECK_OBJ(Rays::Camera, self);
 
 	*THIS = Rays::Camera(
-		device_name ? to<const char*>(device_name) : NULL,
+		device_name ? device_name.c_str() : NULL,
 		to<int>(min_width), to<int>(min_height),
 		to<bool>(resize), to<bool>(crop));
 	return self;

data/ext/rays/extconf.rb

@@ -15,7 +15,6 @@ require 'rays/extension'
 Xot::ExtConf.new Xot, Rucy, Rays do
   setup do
     headers    << 'ruby.h'
-    local_libs << 'rucy'
     libs.unshift 'gdi21', 'opengl32' if win32?
     frameworks << 'AppKit' << 'OpenGL' << 'AVFoundation' if osx?
     $LDFLAGS   << ' -Wl,--out-implib=native.dll.a' if cygwin?

data/ext/rays/image.cpp

@@ -63,6 +63,15 @@ RUCY_DEF1(initialize_copy, obj)
 }
 RUCY_END
 
+static
+RUCY_DEF1(save, path)
+{
+	CHECK;
+	THIS->save(path.c_str());
+	return self;
+}
+RUCY_END
+
 static
 RUCY_DEF0(width)
 {
@@ -112,21 +121,9 @@ RUCY_DEF0(bitmap)
 RUCY_END
 
 static
-RUCY_DEF1(save, path)
-{
-	CHECK;
-	Rays::save_image(*THIS, path.c_str());
-	return self;
-}
-RUCY_END
-
-
-static
-RUCY_DEFN(load)
+RUCY_DEF1(load, path)
 {
-	check_arg_count(__FILE__, __LINE__, "Image.load", argc, 1);
-
-	return value(Rays::load_image(argv[0].c_str()));
+	return value(Rays::load_image(path.c_str()));
 }
 RUCY_END
 
@@ -142,13 +139,13 @@ Init_rays_image ()
 	cImage.define_alloc_func(alloc);
 	cImage.define_private_method("initialize",      initialize);
 	cImage.define_private_method("initialize_copy", initialize_copy);
+	cImage.define_method("save", save);
 	cImage.define_method("width",  width);
 	cImage.define_method("height", height);
 	cImage.define_method("color_space", color_space);
 	cImage.define_method("pixel_density", pixel_density);
 	cImage.define_method("painter", painter);
 	cImage.define_method("bitmap", bitmap);
-	cImage.define_method("save", save);
 	cImage.define_module_function("load", load);
 }
 

data/include/rays/image.h

@@ -35,6 +35,8 @@ namespace Rays
 
 			Image dup () const;
 
+			void save (const char* path);
+
 			coord width () const;
 
 			coord height () const;
@@ -60,8 +62,6 @@ namespace Rays
 	};// Image
 
 
-	void save_image (const Image& image, const char* path);
-
 	Image load_image (const char* path);
 
 

data/include/rays/ruby/bitmap.h

@@ -9,6 +9,9 @@
 #include <rays/bitmap.h>
 
 
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Bitmap)
+
+
 namespace Rays
 {
 
@@ -20,9 +23,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::Bitmap)
-
-
 namespace Rucy
 {
 

data/include/rays/ruby/bounds.h

@@ -10,6 +10,9 @@
 #include <rays/ruby/point.h>
 
 
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Bounds)
+
+
 namespace Rays
 {
 
@@ -21,9 +24,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Bounds)
-
-
 namespace Rucy
 {
 

data/include/rays/ruby/camera.h

@@ -9,6 +9,9 @@
 #include <rays/camera.h>
 
 
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Camera)
+
+
 namespace Rays
 {
 
@@ -20,9 +23,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::Camera)
-
-
 namespace Rucy
 {
 

data/include/rays/ruby/color.h

@@ -9,6 +9,9 @@
 #include <rays/color.h>
 
 
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Color)
+
+
 namespace Rays
 {
 
@@ -20,9 +23,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Color)
-
-
 namespace Rucy
 {
 

data/include/rays/ruby/color_space.h

@@ -9,6 +9,9 @@
 #include <rays/color_space.h>
 
 
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::ColorSpace)
+
+
 namespace Rays
 {
 
@@ -20,9 +23,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::ColorSpace)
-
-
 namespace Rucy
 {
 

data/include/rays/ruby/font.h

@@ -9,6 +9,9 @@
 #include <rays/font.h>
 
 
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Font)
+
+
 namespace Rays
 {
 
@@ -20,9 +23,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Font)
-
-
 namespace Rucy
 {
 

data/include/rays/ruby/image.h

@@ -9,6 +9,9 @@
 #include <rays/image.h>
 
 
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Image)
+
+
 namespace Rays
 {
 
@@ -20,9 +23,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::Image)
-
-
 namespace Rucy
 {
 

data/include/rays/ruby/matrix.h

@@ -9,6 +9,9 @@
 #include <rays/matrix.h>
 
 
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Matrix)
+
+
 namespace Rays
 {
 
@@ -20,9 +23,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Matrix)
-
-
 namespace Rucy
 {
 

data/include/rays/ruby/painter.h

@@ -9,6 +9,9 @@
 #include <rays/painter.h>
 
 
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Painter)
+
+
 namespace Rays
 {
 
@@ -20,9 +23,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::Painter)
-
-
 namespace Rucy
 {
 

data/include/rays/ruby/point.h

@@ -9,6 +9,9 @@
 #include <rays/point.h>
 
 
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Point)
+
+
 namespace Rays
 {
 
@@ -20,9 +23,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Point)
-
-
 namespace Rucy
 {
 

data/include/rays/ruby/polygon.h

@@ -9,6 +9,11 @@
 #include <rays/polygon.h>
 
 
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polygon)
+
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polygon::Line)
+
+
 namespace Rays
 {
 
@@ -23,11 +28,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polygon)
-
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polygon::Line)
-
-
 namespace Rucy
 {
 

data/include/rays/ruby/polyline.h

@@ -9,6 +9,9 @@
 #include <rays/polyline.h>
 
 
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polyline)
+
+
 namespace Rays
 {
 
@@ -20,9 +23,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polyline)
-
-
 namespace Rucy
 {
 

data/include/rays/ruby/rays.h

@@ -9,6 +9,13 @@
 #include <rays/rays.h>
 
 
+RUCY_DECLARE_CONVERT_TO(Rays::CapType)
+
+RUCY_DECLARE_CONVERT_TO(Rays::JoinType)
+
+RUCY_DECLARE_CONVERT_TO(Rays::BlendMode)
+
+
 namespace Rays
 {
 
@@ -20,11 +27,4 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_CONVERT_TO(Rays::CapType)
-
-RUCY_DECLARE_CONVERT_TO(Rays::JoinType)
-
-RUCY_DECLARE_CONVERT_TO(Rays::BlendMode)
-
-
 #endif//EOH

data/include/rays/ruby/shader.h

@@ -9,6 +9,9 @@
 #include <rays/shader.h>
 
 
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Shader)
+
+
 namespace Rays
 {
 
@@ -20,9 +23,6 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Shader)
-
-
 namespace Rucy
 {
 

data/rays.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'xot',  '~> 0.1.31'
-  s.add_runtime_dependency 'rucy', '~> 0.1.31'
+  s.add_runtime_dependency 'xot',  '~> 0.1.33'
+  s.add_runtime_dependency 'rucy', '~> 0.1.33'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/src/image.cpp

@@ -138,15 +138,6 @@ namespace Rays
 		return Image_get_texture(const_cast<Image&>(image));
 	}
 
-	void
-	save_image (const Image& image, const char* path)
-	{
-		if (!image)
-			argument_error(__FILE__, __LINE__);
-
-		return Bitmap_save(image.bitmap(), path);
-	}
-
 	Image
 	load_image (const char* path)
 	{
@@ -197,6 +188,15 @@ namespace Rays
 		return Image(bitmap().dup(), pixel_density());
 	}
 
+	void
+	Image::save (const char* path)
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		Bitmap_save(bitmap(), path);
+	}
+
 	coord
 	Image::width () const
 	{

data/src/painter.cpp

@@ -1092,7 +1092,7 @@ namespace Rays
 		coord x, coord y, coord str_width, coord str_height)
 	{
 #if 0
-		save_image(painter->self->text_image, "/tmp/font.png");
+		painter->self->text_image.save("/tmp/font.png");
 
 		painter->push_state();
 		{

data/src/win32/bitmap.cpp

@@ -98,7 +98,7 @@ namespace Rays
 	static void
 	setup_bitmap (Bitmap* this_, const Texture& tex)
 	{
-		not_implement_error(__FILE__, __LINE__);
+		not_implemented_error(__FILE__, __LINE__);
 	}
 
 	Bitmap

data/test/helper.rb

@@ -5,13 +5,22 @@
   .map  {|s| File.expand_path "../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'test/unit'
 require 'xot/test'
 require 'rays'
 
+require 'test/unit'
+
 include Xot::Test
 
 
 unless defined?($RAYS_NOAUTOINIT) && $RAYS_NOAUTOINIT
   def Rays.fin!() end
 end
+
+
+def assert_equal_color(c1, c2, delta = 0.000001)
+  assert_in_delta c1.r, c2.r, delta
+  assert_in_delta c1.g, c2.g, delta
+  assert_in_delta c1.b, c2.b, delta
+  assert_in_delta c1.a, c2.a, delta
+end

data/test/test_color.rb

@@ -19,25 +19,25 @@ class TestColor < Test::Unit::TestCase
   end
 
   def test_initialize()
-    assert_equal color(0, 0, 0, 1), color()
-    assert_equal color(1, 1, 1, 1), color(1)
-    assert_equal color(1, 1, 1, 2), color(1, 2)
-    assert_equal color(1, 2, 3, 1), color(1, 2, 3)
-    assert_equal color(1, 2, 3, 4), color(1, 2, 3, 4)
-    assert_equal color8(1, 2, 3, 4), color('#01020304')
+    assert_equal_color color(0, 0, 0, 1), color()
+    assert_equal_color color(1, 1, 1, 1), color(1)
+    assert_equal_color color(1, 1, 1, 2), color(1, 2)
+    assert_equal_color color(1, 2, 3, 1), color(1, 2, 3)
+    assert_equal_color color(1, 2, 3, 4), color(1, 2, 3, 4)
+    assert_equal_color color8(1, 2, 3, 4), color('#01020304')
     assert_raise(ArgumentError) {color(1, 2, 3, 4, 5)}
   end
 
   def test_initialize_with_string()
-    assert_equal color(0, 0, 0, 1), color('#000')
-    assert_equal color(0, 0, 0, 1), color('#000000')
-    assert_equal color(0, 0, 0, 0), color('#0000')
-    assert_equal color(0, 0, 0, 0), color('#00000000')
-    assert_equal color8(0x01, 0x23, 0x45, 0x67), color('#01234567')
-    assert_equal color8(0x89, 0xab, 0xcd, 0xef), color('#89abcdef')
-    assert_equal color8(0x0, 0x2, 0x4, 0x6, 15), color('#0246')
-    assert_equal color8(0x9, 0xb, 0xd, 0xf, 15), color('#9bdf')
-    assert_equal color(0, 0, 0, 1), color(' #000 ')
+    assert_equal_color color(0, 0, 0, 1), color('#000')
+    assert_equal_color color(0, 0, 0, 1), color('#000000')
+    assert_equal_color color(0, 0, 0, 0), color('#0000')
+    assert_equal_color color(0, 0, 0, 0), color('#00000000')
+    assert_equal_color color8(0x01, 0x23, 0x45, 0x67), color('#01234567')
+    assert_equal_color color8(0x89, 0xab, 0xcd, 0xef), color('#89abcdef')
+    assert_equal_color color8(0x0, 0x2, 0x4, 0x6, 15), color('#0246')
+    assert_equal_color color8(0x9, 0xb, 0xd, 0xf, 15), color('#9bdf')
+    assert_equal_color color(0, 0, 0, 1), color(' #000 ')
     assert_raise(ArgumentError) {color '#'}
     assert_raise(ArgumentError) {color '000'}
     assert_raise(ArgumentError) {color '#0'}
@@ -48,14 +48,14 @@ class TestColor < Test::Unit::TestCase
 
   def test_dup()
     o     = color
-    assert_equal color(0, 0, 0), o
+    assert_equal_color color(0, 0, 0), o
     o.red = 1
-    assert_equal color(1, 0, 0), o
+    assert_equal_color color(1, 0, 0), o
     x     = o.dup
-    assert_equal color(1, 0, 0), x
+    assert_equal_color color(1, 0, 0), x
     x.red = 2
-    assert_equal color(2, 0, 0), x
-    assert_equal color(1, 0, 0), o
+    assert_equal_color color(2, 0, 0), x
+    assert_equal_color color(1, 0, 0), o
   end
 
   def test_get_rgb()
@@ -125,31 +125,31 @@ class TestColor < Test::Unit::TestCase
   end
 
   def test_hsv_hue()
-    assert_equal color(0.5, 0, 1), hsv(-0.25, 1, 1)
-    assert_equal color(1,   0, 0), hsv( 0,    1, 1)
-    assert_equal color(0.5, 1, 0), hsv( 0.25, 1, 1)
-    assert_equal color(0,   1, 1), hsv( 0.5,  1, 1)
-    assert_equal color(0.5, 0, 1), hsv( 0.75, 1, 1)
-    assert_equal color(1,   0, 0), hsv( 1,    1, 1)
-    assert_equal color(0.5, 1, 0), hsv( 1.25, 1, 1)
+    assert_equal_color color(0.5, 0, 1), hsv(-0.25, 1, 1)
+    assert_equal_color color(1,   0, 0), hsv( 0,    1, 1)
+    assert_equal_color color(0.5, 1, 0), hsv( 0.25, 1, 1)
+    assert_equal_color color(0,   1, 1), hsv( 0.5,  1, 1)
+    assert_equal_color color(0.5, 0, 1), hsv( 0.75, 1, 1)
+    assert_equal_color color(1,   0, 0), hsv( 1,    1, 1)
+    assert_equal_color color(0.5, 1, 0), hsv( 1.25, 1, 1)
   end
 
   def test_hsv_saturation()
-    assert_equal color(1, 1,   1),   hsv(1, 0,   1)
-    assert_equal color(1, 0.5, 0.5), hsv(1, 0.5, 1)
-    assert_equal color(1, 0,   0),   hsv(1, 1,   1)
+    assert_equal_color color(1, 1,   1),   hsv(1, 0,   1)
+    assert_equal_color color(1, 0.5, 0.5), hsv(1, 0.5, 1)
+    assert_equal_color color(1, 0,   0),   hsv(1, 1,   1)
   end
 
   def test_hsv_value()
-    assert_equal color(0,   0,   0), hsv(1, 1, 0)
-    assert_equal color(0.5, 0,   0), hsv(1, 1, 0.5)
-    assert_equal color(1,   0,   0), hsv(1, 1, 1)
+    assert_equal_color color(0,   0,   0), hsv(1, 1, 0)
+    assert_equal_color color(0.5, 0,   0), hsv(1, 1, 0.5)
+    assert_equal_color color(1,   0,   0), hsv(1, 1, 1)
   end
 
   def test_hsv_alpha()
-    assert_equal color(1, 0, 0, 0),   hsv(1, 1, 1, 0)
-    assert_equal color(1, 0, 0, 0.5), hsv(1, 1, 1, 0.5)
-    assert_equal color(1, 0, 0, 1),   hsv(1, 1, 1, 1)
+    assert_equal_color color(1, 0, 0, 0),   hsv(1, 1, 1, 0)
+    assert_equal_color color(1, 0, 0, 0.5), hsv(1, 1, 1, 0.5)
+    assert_equal_color color(1, 0, 0, 1),   hsv(1, 1, 1, 1)
   end
 
 end# TestColor

data/test/{test_rays.rb → test_rays_init.rb}

@@ -6,7 +6,7 @@ $RAYS_NOAUTOINIT = true
 require_relative 'helper'
 
 
-class TestRays < Test::Unit::TestCase
+class TestRaysInit < Test::Unit::TestCase
 
   def test_init!()
     assert_raise(Rays::RaysError) {Rays.fin!}
@@ -15,4 +15,4 @@ class TestRays < Test::Unit::TestCase
     assert Rays.fin!
   end
 
-end# TestRays
+end# TestRaysInit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.33
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-26 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.31
+        version: 0.1.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.31
+        version: 0.1.33
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.31
+        version: 0.1.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.31
+        version: 0.1.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ files:
 - ".doc/ext/rays/polyline.cpp"
 - ".doc/ext/rays/rays.cpp"
 - ".doc/ext/rays/shader.cpp"
-- ".github/workflows/release.yml"
+- ".github/workflows/release-gem.yml"
 - ".github/workflows/tag.yml"
 - ".github/workflows/test.yml"
 - ".github/workflows/utils.rb"
@@ -270,7 +270,7 @@ files:
 - test/test_polygon.rb
 - test/test_polygon_line.rb
 - test/test_polyline.rb
-- test/test_rays.rb
+- test/test_rays_init.rb
 - test/test_shader.rb
 homepage: https://github.com/xord/rays
 licenses: []
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A Drawing Engine using OpenGL.
@@ -309,5 +309,5 @@ test_files:
 - test/test_polygon.rb
 - test/test_polygon_line.rb
 - test/test_polyline.rb
-- test/test_rays.rb
+- test/test_rays_init.rb
 - test/test_shader.rb

data/.github/workflows/release.yml

@@ -1,34 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags: ['v[0-9]*']
-
-jobs:
-  release:
-    runs-on: macos-latest
-
-    steps:
-      - name: ruby 3.2
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.2
-
-      - name: checkout
-        uses: actions/checkout@v2
-
-      - name: setup dependencies
-        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
-
-      - name: test
-        run: rake test
-
-      - name: upload to rubygems
-        env:
-          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}
-        run: |
-          mkdir -p $HOME/.gem
-          touch $HOME/.gem/credentials
-          chmod 0600 $HOME/.gem/credentials
-          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-          rake upload