wasko 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wasko (0.2.0)
+    wasko (0.2.1)
       color
       thor
       thor (~> 0.15.4)

data/bin/wasko

@@ -39,7 +39,11 @@ module Wasko
       if color_name.empty?
         say Wasko.background_color
       else
-        Wasko.set_background_color color_name
+        if Wasko::Color.color_from_string(color_name)
+          Wasko.set_background_color color_name
+        else
+          error "#{color_name} is not a color."
+        end
       end
     end
 

data/lib/wasko/color.rb

@@ -43,9 +43,15 @@ module Wasko
     # At the moment support all named css-colors (like `red`, `aliceblue`, etc.)
     # and all hex-colors.
     def self.color_from_string(color_string)
-      return ::Color::RGB.from_html(color_string)             if hex_color?(color_string)
-      return ::Color::RGB.from_html(names_hash[color_string]) if named_color?(color_string)
-      false
+      color_string = color_string.downcase
+
+      if hex_color?(color_string)
+        return ::Color::RGB.from_html(color_string)
+      end
+
+      if named_color?(color_string)
+        return ::Color::RGB.from_html(names_hash[color_string])
+      end
     end
 
     # Looks through all the named css colors

data/lib/wasko/version.rb

@@ -1,3 +1,3 @@
 module Wasko
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/test_color.rb

@@ -21,4 +21,12 @@ class TestWaskoColor < Test::Unit::TestCase
   should "convert aliceblue to Color" do
     assert_equal ::Color::RGB.from_html("#f0f8ff"), Wasko::Color.color_from_string("aliceblue")
   end
+
+  should "handle upcased css names to Color" do
+    assert_equal ::Color::RGB.from_html("#ff0000"), Wasko::Color.color_from_string("RED")
+  end
+
+  should "gracefully handle bogus input names" do
+    assert_nil Wasko::Color.color_from_string("poppycock")
+  end
 end

data/test/test_wasko.rb

@@ -2,6 +2,14 @@ require 'helper'
 
 class TestWasko < Test::Unit::TestCase
 
+  should "set background color to tint" do
+    ata = mock()
+    ata.expects(:startup_background_color).returns("{0,0,0}")
+    ata.expects(:set_background_color).with("{16962, 0, 0}").returns(nil)
+    Wasko.stubs(:advanced_typing_apparatus).returns(ata)
+    Wasko.set_background_color("red")
+  end
+
   context "setting palette" do
     setup do
       @color = Wasko::Color.color_from_string("white")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wasko
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1096904852995831411
+      hash: -2167249535749031942
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1096904852995831411
+      hash: -2167249535749031942
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24