refactor color_group

Author: monkstone

Rakefile

@@ -31,6 +31,7 @@ task :test do
   sh 'jruby test/helper_methods_test.rb'
   sh 'jruby test/aabb_spec_test.rb'
   sh 'jruby test/create_test.rb'
+  sh 'jruby test/color_group_test.rb'
   home = File.expand_path('~')
   config = File.exist?(format('%s/.jruby_art/config.yml', home))
   if config

library/color_group/color_group.rb

@@ -1,14 +1,15 @@
 java_import Java::Monkstone::ColorUtil
 
-# class for manipulating color
+# class wraps a java color array, supports shuffle!, last and ruby_string
+# as well as ability to initialize with an array of "web" color string
 class ColorGroup
   attr_reader :pcolors
-  def initialize(web)
-    @pcolors = ColorUtil.web_array(web)
+  def initialize(p5cols)
+    @pcolors = p5cols
   end
 
-  def self.from_p5cols(p5cols)
-    return ColorGroup.new(p5cols)
+  def self.from_web_array(web)
+    ColorGroup.new(ColorUtil.web_array(web))
   end
 
   def shuffle!
@@ -18,4 +19,8 @@ def shuffle!
   def ruby_string
     ColorUtil.rubyString(pcolors)
   end
+
+  def last
+    pcolors[0]
+  end
 end

test/color_group_test.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+require_relative 'test_helper'
+require_relative '../lib/rpextras'
+require_relative '../library/color_group/color_group'
+
+Java::Monkstone::JRLibrary.load(JRuby.runtime)
+java_import Java::Monkstone::ColorUtil
+
+Dir.chdir(File.dirname(__FILE__))
+
+PALETTE = %w[#FFFFFF #FF0000 #0000FF].freeze
+COLORS = [16777215, 16711680, 255].to_java(:int)
+
+class ColorGroupTest < Minitest::Test
+  def test_new
+    group = ColorGroup.new(COLORS)
+    assert group.kind_of? ColorGroup
+  end
+
+  def test_web_array
+    group = ColorGroup.from_web_array(PALETTE)
+    assert group.kind_of? ColorGroup
+  end
+
+  def test_ruby_string
+    p5array = [16777215, 16711680, 255]
+    group = ColorGroup.new(COLORS)
+    ruby_string = "%w[#FFFFFF #FF0000 #0000FF]\n"
+    result = group.ruby_string
+    assert_equal(result, ruby_string)
+  end
+end

test/helper_methods_test.rb

@@ -27,13 +27,6 @@ def test_hex_color
     end
   end
 
-  def test_p52ruby
-    p5array = [16777215, 16711680, 255]
-    ruby_string = "%w[#FFFFFF #FF0000 #0000FF]\n"
-    result = p52ruby(p5array)
-    assert_equal(result, ruby_string)
-  end
-
   def test_dist
     ax, ay, bx, by = 0, 0, 1.0, 1.0
     assert_in_epsilon(dist(ax, ay, bx, by), Math.sqrt(2), epsilon = 0.0001, msg = '2D distance')