kmandrup-colorist 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/kmandrup-colorist.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kmandrup-colorist}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh", "oleg dashevskii", "Slippy Douglas", "Kristian Mandrup"]
-  s.date = %q{2010-05-27}
+  s.date = %q{2010-05-29}
   s.description = %q{Colorist is a library built to handle the easy conversion and manipulation of colors with a special emphasis on W3C standards and CSS-style hex color notation.}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [

data/lib/colorist/color_names.rb

@@ -374,17 +374,24 @@ module Colorist
     }
     
     def self.color(name, *options)     
-      name = hexify(name.to_s)
+      name = hexify(name.to_s) if hex?(name)
       options.flatten!
       col = name
-      col = COLORS[name.downcase.strip] if !hex? name
+      puts "name: #{name}"
+      col = COLORS[name.downcase.strip] if !hex?(name)
       raise ArgumentError, "The color name '#{name}' cannot be coerced into a color." if !col           
       res = if options.include?(:hex)
         col.sub /#/, '0x'
       else
         col
       end                         
-      options.include?(:lower) ? res.downcase : res
+      res = options.include?(:lower) ? res.downcase : res      
+      res = options.include?(:simple) ? remove(res, '#', '0x') : res
+    end
+
+    def self.remove(txt, *args)
+      args.each{|a| txt.gsub! a, '' }
+      txt
     end
     
     def self.to_color(hex_number)

data/test/colorist_test.rb

@@ -1,4 +1,7 @@
+require '../lib/kmandrup-colorist'
+
 # puts Colorist::ColorNames.color('0xfff', :lower)                                                              
+# puts Colorist::ColorNames.color('blue', :lower, :simple)
 # puts x = Colorist::ColorNames.color(:'#FFFFAA', :lower)                                                              
 # puts x = Colorist::ColorNames.color('0xFFFFAA', [:hex, :lower])                                                              
 # puts x = Colorist::ColorNames.color(:red, :hex, :lower)                                                              

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -04:00
+date: 2010-05-29 00:00:00 -04:00
 default_executable: 
 dependencies: []