colorer 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/colorer.rb

@@ -55,20 +55,13 @@ module Colorer
   end
 
   def define_styles(styles, force=false)
+    styles = Colorer::BASIC_SGR.merge(styles) if styles.delete(:basic)
     styles.each_pair do |meth, style|
+      style = [style] unless style.is_a?(Array)
       String.class_eval do
-        if meth == :basic && style
-          Colorer::BASIC_SGR.each_pair do |m, sgr|
-            raise AlreadyDefinedMethod.new(m, self) if !force && method_defined?(m)
-            define_method(m) do
-              Colorer.add_sgr(self, sgr)
-            end
-          end
-        else
-          raise AlreadyDefinedMethod.new(meth, self) if !force && method_defined?(meth)
-          define_method(meth) do
-            style.inject(self) { |str, sgr| Colorer.add_sgr(str, sgr) }
-          end
+        raise AlreadyDefinedMethod.new(meth, self) if !force && method_defined?(meth)
+        define_method(meth) do
+          style.inject(self) { |str, sgr| Colorer.add_sgr(str, sgr) }
         end
       end
     end

data/test/sgr.irt

@@ -9,9 +9,9 @@ puts _
 test_value_eql? "\e[0;1;7mMixed SGR parameters\e[0m"
 
 desc "Basic and custom definition"
-Colorer.define_styles({:basic => true, :goo => [7]}, 1)
-"Basic and custom definition".green.goo
+Colorer.define_styles({:basic => true, :goo => [7], :guu => 4}, 1)
+"Basic and custom definition".green.goo.guu
 puts _
-test_value_eql? "\e[0;32;7mBasic and custom definition\e[0m"
+test_value_eql? "\e[0;32;7;4mBasic and custom definition\e[0m"
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: colorer
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -04:00
+date: 2010-10-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency