rcade_colors 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8b06b95be9406ea868917182679a37d0d55a87b
-  data.tar.gz: d73c0f063b504f73c167a69dd0945b3dfa0c45b8
+  metadata.gz: d21ad581309ec030e0493349400ef654b7d9a5ca
+  data.tar.gz: 7093a8ee0f53e4f446a104ebb31a70fe1f2fd554
 SHA512:
-  metadata.gz: 5d95345efbff43c3e189f6e713a8436e0269709ef9e1bfe424b6acc4e4bc889b47d8094686ae5b47ee4e4f7240bdf6df5b42f633711efcde49843a209561d029
-  data.tar.gz: 8542f950afcb43c3ce9fb68ab38c511f0d391ff2489a215198ee729ae39291f576d70c3c3278a39986a964644c02652cc6f17650a0a4a70160946454af8d5771
+  metadata.gz: 77df3348ea9d3964df22ebe78cd359d538e4b25dce9046dc16a6aa2bc62eb95f94c664976746699c3fd544d3999318f374b7a3d33b06d0c79becae26b0545003
+  data.tar.gz: 3a2126aa128f65d62ecf50b6b873f272c9e98022c8b15f82d61c2e1ebd76d82e9e255168c3a50026eb570ab41fb0eba0a220b967f052326dc9c1d375651985f9

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 
 Using this gem, you can create a Gosu::Color object using CSS hex values:
 
-    Rcade::Color.from_css('#ff0')
+    Rcade::Color.from_hex('#ff0')
 
 ### CSS color names
 

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end

data/lib/rcade_colors.rb

@@ -1,6 +1,14 @@
 require 'gosu'
-require 'color'
-require 'color/css'
+
+class Gosu::Color
+  # Provides the ability to adjust the opacity (alpha).
+  # The opacity argument should be a float 0.0..1.0
+  def opacity(opacity)
+    a = alpha * opacity
+    hex_string = "0x%02x%02x%02x%02x" % [(alpha * opacity), red, green, blue]
+    self.class.argb(hex_string.to_i(16))
+  end
+end
 
 module Rcade
   class Color < Gosu::Color
@@ -12,22 +20,21 @@ module Rcade
     #   "#fed"
     #   "cabbed"
     #   "#cabbed"
-    def self.from_hex(hex)
-      color = ::Color::RGB.from_html(hex).to_hsl
-      self.from_hsv(color.hue.to_i, color.s, color.l) # 255, 1.0, 1.0
+    def self.from_hex(string)
+      h = string.scan(/\h/)
+      if h.size == 3
+        h.map! {|v| (v * 2) } # expand to 6 character format
+      end
+      hex_string = "0xff" + h.join # fully opaque
+      self.argb(hex_string.to_i(16))
     end
 
     def self.named(color_name)
+      require 'color/css'
       color = ::Color::CSS[color_name]
       raise 'Invalid color name' unless color
       self.from_hex(color.html)
     end
 
-    # opacity should be a float 0.0..1.0
-    def opacity(opacity)
-      a = alpha * opacity
-      self.from_ahsv(a, hue, saturation, value)
-    end
-
   end
-end
+end

data/rcade_colors.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "rcade_colors"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["Andrew Havens"]
   spec.email         = ["email@andrewhavens.com"]
   spec.description   = %q{Provides additional CSS Hex value and opacity support for Gosu.}

data/test/rcade_colors_test.rb

@@ -0,0 +1,52 @@
+require "minitest/spec"
+require "minitest/autorun"
+require 'rcade_colors'
+
+describe Rcade::Color do
+
+  it 'can create black from hex' do
+    c = Rcade::Color.from_hex('000000')
+    [c.red, c.green, c.blue, c.alpha].must_equal [0,0,0,255]
+    c = Rcade::Color.from_hex('000')
+    [c.red, c.green, c.blue, c.alpha].must_equal [0,0,0,255]
+    c = Rcade::Color.from_hex('#000000')
+    [c.red, c.green, c.blue, c.alpha].must_equal [0,0,0,255]
+    c = Rcade::Color.from_hex('#000')
+    [c.red, c.green, c.blue, c.alpha].must_equal [0,0,0,255]
+  end
+
+  it 'can create white from hex' do
+    c = Rcade::Color.from_hex('ffffff')
+    [c.red, c.green, c.blue, c.alpha].must_equal [255,255,255,255]
+    c = Rcade::Color.from_hex('fff')
+    [c.red, c.green, c.blue, c.alpha].must_equal [255,255,255,255]
+    c = Rcade::Color.from_hex('#ffffff')
+    [c.red, c.green, c.blue, c.alpha].must_equal [255,255,255,255]
+    c = Rcade::Color.from_hex('#fff')
+    [c.red, c.green, c.blue, c.alpha].must_equal [255,255,255,255]
+    c = Rcade::Color.from_hex('fFf') # case shouldnt matter
+    [c.red, c.green, c.blue, c.alpha].must_equal [255,255,255,255]
+  end
+
+  it 'can create red from hex' do
+    c = Rcade::Color.from_hex('ff0000')
+    [c.red, c.green, c.blue, c.alpha].must_equal [255,0,0,255]
+    c = Rcade::Color.from_hex('f00')
+    [c.red, c.green, c.blue, c.alpha].must_equal [255,0,0,255]
+    c = Rcade::Color.from_hex('#ff0000')
+    [c.red, c.green, c.blue, c.alpha].must_equal [255,0,0,255]
+    c = Rcade::Color.from_hex('#f00')
+    [c.red, c.green, c.blue, c.alpha].must_equal [255,0,0,255]
+  end
+
+  it 'can modify opacity' do
+    c = Rcade::Color.from_hex('#f00').opacity(0)
+    [c.red, c.green, c.blue, c.alpha].must_equal [255,0,0,0]
+
+    color = Rcade::Color.from_hex('#f00').opacity(1)
+    color.alpha.must_equal(255)
+
+    color = Rcade::Color.from_hex('#f00').opacity(0.5)
+    color.alpha.must_equal(127)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rcade_colors
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Andrew Havens
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - lib/rcade_colors.rb
 - rcade_colors.gemspec
+- test/rcade_colors_test.rb
 homepage: https://github.com/ruby-rcade/rcade_colors
 licenses:
 - MIT
@@ -105,4 +106,5 @@ rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Provides additional CSS Hex value and opacity support for Gosu.
-test_files: []
+test_files:
+- test/rcade_colors_test.rb