pastel 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4843971da301b5bca7d4d9a6c69702859a3e9f9
-  data.tar.gz: d176a98f33737965a8ae4a710b19c27ad31fe021
+  metadata.gz: a3a74798586ce6f5429d3c76faad4e3445319463
+  data.tar.gz: c2b581122d3029f273f29d5c6fcb9cbca064cc64
 SHA512:
-  metadata.gz: 6c61ddb8e9be7aa678dde278f6229871f67ce53d60929367417fae521b35548e8cb7392bb029eb94bcceb141eca2705cb3fe214bcbc333162de591b4174b63f8
-  data.tar.gz: acea298f36654c11b706bf72574e3b08980212188e6e432a95dd4fb10ae169e3026e344c28b9858dc1c0daed53c05aa059281e9bfc6044f35a3bb9ccf5f3a0bc
+  metadata.gz: c47eac8d882f22e8dc9c1217497ce9f4a2aea4371d523801e8c37261aad1fc9f03d8f2e7f45c7ab168f22c68621331e9201d7363d5ae357a129596110a7fa27c
+  data.tar.gz: e7fdf3e1428864ad525fb50dfb3fe6f9f760ce7923d91af73b7f9df054f22e51dbc0db969cbd2def2bcce3b4d6b8337addbc0ac1b406395fb88bf106f5ae8434

data/.travis.yml

@@ -18,7 +18,6 @@ matrix:
     - rvm: jruby-head
     - rvm: jruby-20mode
     - rvm: jruby-21mode
-    - rvm: rbx-2
   fast_finish: true
 branches:
   only: master

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.3.0 (November 8, 2014)
+
+* Add ability to alias colors through alias_color method
+* Add ability to alias colors through the environment variable
+* Improve performance of Pastel::Color styles and lookup methods
+* Fix bug concerned with lack of escaping for nested styles
+
 0.2.1 (October 13, 2014)
 
 * Fix issue #1 with unitialize dependency

data/Gemfile

@@ -6,6 +6,7 @@ group :development do
   gem 'rake',  '~> 10.3.2'
   gem 'rspec', '~> 3.1.0'
   gem 'yard',  '~> 0.8.7'
+  gem 'benchmark-ips', '~> 2.0.0'
 end
 
 group :metrics do

data/README.md

@@ -13,6 +13,8 @@ Terminal output styling with intuitive and clean API that doesn't monkey patch S
 
 ![screenshot](https://github.com/peter-murach/pastel/raw/master/assets/screenshot.png)
 
+**Pastel** provides independent coloring component for [TTY](https://github.com/peter-murach/tty) toolkit.
+
 ## Features
 
 * Doesn't monkey patch `String`
@@ -45,7 +47,9 @@ Or install it yourself as:
   * [2.4 Styles](#24-styles)
   * [2.5 Valid?](#25-valid)
   * [2.6 Enabled?](#26-enabled)
-* [3. The available styles](#3-the-available-styles)
+  * [2.7 Alias Color](#27-alias-color)
+* [3. Supported Colors](#3-supported-colors)
+* [4. Environment](#4-environment)
 
 ## 1 Usage
 
@@ -91,7 +95,7 @@ You can pass variable number of styled strings like so:
 pastel.red('Unicorns ', pastel.bold.underline('everywhere'), '!')
 ```
 
-Please refer to [3. The available styles](#3-the-available-styles) section for full list of supported styles.
+Please refer to [3. Supported Colors](#3-supported-colors) section for full list of supported styles.
 
 ### 2.2 Decorate
 
@@ -101,9 +105,11 @@ This method is a lower level string styling call that takes as the first argumen
 pastel.decorate('Unicorn', :green, :on_blue, :bold)
 ```
 
+This method will be useful in situations where colors are provided as a list of parameters.
+
 ### 2.3 Strip
 
-Strip all color sequence characters:
+Strip all color sequence characters from the provided strings. The return value will be eithre array of modified strings or a single string. The arguments are not modified.
 
 ```ruby
 pastel.strip("\e[1m\e[34mbold blue text\e[0m"")  # => "bold blue text"
@@ -119,11 +125,11 @@ pastel.styles
 
 ### 2.5 Valid?
 
-Determine whether a color is valid:
+Determine whether a color or a list of colors are valid. `valid?` takes one or more attribute strings or symbols and returns true if all attributes are known and false otherwise.
 
 ```ruby
-pastel.valid?(:red)     # => true
-pastel.valid?(:unicorn) # => false
+pastel.valid?(:red, :blue) # => true
+pastel.valid?(:unicorn)    # => false
 ```
 
 ### 2.6 Enabled?
@@ -141,7 +147,27 @@ pastel = Pastel.new(enabled: true)
 pastel.enabled?   # => false
 ```
 
-## 3 The available styles
+### 2.7 Alias Color
+
+In order to setup an alias for the standard color do:
+
+```ruby
+pastel.alias_color(:funky, :red)
+```
+
+From that point forward, `:funky` alias can be passed to `decorate`, `valid?` with the same meaning as standard color:
+
+```ruby
+pastel.funky.on_green('unicorn')   # => will use :red color
+```
+
+This method allows you to give more meaningful names to existing colors.
+
+You can also use the `PASTEL_COLORS_ALIASES` environment variable (see [Environment](#4-environment)) to specify aliases.
+
+Note: Aliases are global and affect all callers in the same process.
+
+## 3 Supported Colors
 
 **Pastel** works with terminal emulators that support minimum sixteen colors. It provides `16` basic colors and `8` styles with further `16` bright color pairs. The corresponding bright color is obtained by prepending the `bright` to the normal color name. For example, color `red` will have `bright_red` as its pair.
 
@@ -196,9 +222,21 @@ Generic styles:
 * `hidden`
 * `strikethrough`
 
+## 4 Environment
+
+### 4.1 PASTEL_COLORS_ALIASES
+
+This environment variable allows you to specify custom color aliases at runtime that will be understood by **Pastel**. The environment variable is read and used when the instance of **Pastel** is created. You can also use `alias_color` to create aliases.
+
+Only alphanumeric and `_` are allowed in the alias names with the following format:
+
+```ruby
+PASTEL_COLORS_ALIASES='newcolor_1=red,newcolor_2=on_gree'
+```
+
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/pastel/fork )
+1. Fork it ( https://github.com/peter-murach/pastel/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/benchmarks/speed.rb

@@ -0,0 +1,16 @@
+require 'pastel'
+require 'benchmark/ips'
+
+pastel = Pastel.new
+
+Benchmark.ips do |bench|
+  bench.config(time: 5, warmup: 2)
+
+  bench.report('styles') do
+    pastel.styles
+  end
+
+  bench.report('decorate') do
+    pastel.decorate('string', :red, :on_green, :bold)
+  end
+end

data/lib/pastel.rb

@@ -4,6 +4,7 @@ require 'forwardable'
 require 'equatable'
 
 require 'pastel/ansi'
+require 'pastel/alias_importer'
 require 'pastel/color'
 require 'pastel/color_resolver'
 require 'pastel/delegator'
@@ -14,6 +15,9 @@ module Pastel
   # Raised when the style attribute is not supported
   InvalidAttributeNameError = Class.new(::ArgumentError)
 
+  # Raised when the color alias is not supported
+  InvalidAliasNameError = Class.new(::ArgumentError)
+
   # Create Pastel chainable API
   #
   # @example
@@ -24,6 +28,8 @@ module Pastel
   # @api public
   def new(options = {})
     color    = Color.new(options)
+    importer = AliasImporter.new(color)
+    importer.import
     resolver = ColorResolver.new(color)
     Delegator.for(resolver, DecoratorChain.empty)
   end

data/lib/pastel/alias_importer.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+module Pastel
+  # A class responsible for importing color aliases
+  class AliasImporter
+    # Create alias importer
+    #
+    # @example
+    #   importer = Pastel::AliasImporter.new(Pastel::Color.new)
+    #
+    # @api public
+    def initialize(color, output = $stderr)
+      @color  = color
+      @output = output
+    end
+
+    # Import aliases from the environment
+    #
+    # @example
+    #   importer = Pastel::AliasImporter.new(Pastel::Color.new)
+    #   importer.import
+    #
+    # @return [nil]
+    #
+    # @api public
+    def import
+      color_aliases = ENV['PASTEL_COLORS_ALIASES']
+      return unless color_aliases
+      color_aliases.split(',').each do |color_alias|
+        new_color, old_color = color_alias.split('=').map(&:to_sym)
+        if !new_color || !old_color
+          output.puts "Bad color mapping `#{color_alias}`"
+        else
+          color.alias_color(new_color, old_color)
+        end
+      end
+    end
+
+    protected
+
+    attr_reader :color, :output
+  end # AliasImporter
+end # Pastel

data/lib/pastel/ansi.rb

@@ -3,54 +3,54 @@
 module Pastel
   # Mixin that provides ANSI codes
   module ANSI
-    CLEAR         = "\e[0m"
+    ATTRIBUTES = {
+      clear:      0,
+      reset:      0,
+      bold:       1,
+      dark:       2,
+      dim:        2,
+      italic:     3,
+      underline:  4,
+      underscore: 4,
+      inverse:    7,
+      hidden:     8,
+      strikethrough: 9,
 
-    BOLD          = "\e[1m"
-    DIM           = "\e[2m"
-    ITALIC        = "\e[3m"
-    UNDERLINE     = "\e[4m"
-    INVERSE       = "\e[7m"
-    HIDDEN        = "\e[8m"
-    STRIKETHROUGH = "\e[9m"
+      black:   30,
+      red:     31,
+      green:   32,
+      yellow:  33,
+      blue:    34,
+      magenta: 35,
+      cyan:    36,
+      white:   37,
 
-    # Escape codes for text color.
-    BLACK         = "\e[30m"
-    RED           = "\e[31m"
-    GREEN         = "\e[32m"
-    YELLOW        = "\e[33m"
-    BLUE          = "\e[34m"
-    MAGENTA       = "\e[35m"
-    CYAN          = "\e[36m"
-    WHITE         = "\e[37m"
+      on_black:   40,
+      on_red:     41,
+      on_green:   42,
+      on_yellow:  43,
+      on_blue:    44,
+      on_magenta: 45,
+      on_cyan:    46,
+      on_white:   47,
 
-    BRIGHT_BLACK   = "\e[90m"
-    BRIGHT_RED     = "\e[91m"
-    BRIGHT_GREEN   = "\e[92m"
-    BRIGHT_YELLOW  = "\e[93m"
-    BRIGHT_BLUE    = "\e[94m"
-    BRIGHT_MAGENTA = "\e[95m"
-    BRIGHT_CYAN    = "\e[96m"
-    BRIGHT_WHITE   = "\e[97m"
+      bright_black:   90,
+      bright_red:     91,
+      bright_green:   92,
+      bright_yellow:  93,
+      bright_blue:    94,
+      bright_magenta: 95,
+      bright_cyan:    96,
+      bright_white:   97,
 
-    # Escape codes for background color.
-    ON_BLACK         = "\e[40m"
-    ON_RED           = "\e[41m"
-    ON_GREEN         = "\e[42m"
-    ON_YELLOW        = "\e[43m"
-    ON_BLUE          = "\e[44m"
-    ON_MAGENTA       = "\e[45m"
-    ON_CYAN          = "\e[46m"
-    ON_WHITE         = "\e[47m"
-
-    ON_BRIGHT_BLACK   = "\e[100m"
-    ON_BRIGHT_RED     = "\e[101m"
-    ON_BRIGHT_GREEN   = "\e[102m"
-    ON_BRIGHT_YELLOW  = "\e[103m"
-    ON_BRIGHT_BLUE    = "\e[104m"
-    ON_BRIGHT_MAGENTA = "\e[105m"
-    ON_BRIGHT_CYAN    = "\e[106m"
-    ON_BRIGHT_WHITE   = "\e[107m"
-
-    BACKGROUND_COLORS = constants.grep(/^ON_*/).freeze
+      on_bright_black:   100,
+      on_bright_red:     101,
+      on_bright_green:   102,
+      on_bright_yellow:  103,
+      on_bright_blue:    104,
+      on_bright_magenta: 105,
+      on_bright_cyan:    106,
+      on_bright_white:   107
+    }
   end # ANSI
 end # Pastel

data/lib/pastel/color.rb

@@ -6,6 +6,8 @@ module Pastel
     include Equatable
     include ANSI
 
+    ALIASES = {}
+
     attr_reader :enabled
     alias_method :enabled?, :enabled
 
@@ -45,27 +47,64 @@ module Pastel
     #   text to add ANSI strings
     #
     # @param [Array[Symbol]] colors
+    #   the color names
     #
     # @example
     #   color.decorate "text", :yellow, :on_green, :underline
     #
     # @return [String]
+    #   the colored string
     #
     # @api public
     def decorate(string, *colors)
       return string if string.empty? || !enabled
-      validate(*colors)
-      ansi_colors = colors.map { |color| lookup(color) }
-      ansi_string = "#{ansi_colors.join}#{string}#{ANSI::CLEAR}"
-      if ansi_string =~ /(#{Regexp.quote(ANSI::CLEAR)}){2,}/
-        ansi_string.gsub!(/(#{Regexp.quote(ANSI::CLEAR)}){2,}/, '')
+
+      ansi_colors = lookup(*colors)
+      ansi_string = "#{ansi_colors}#{string}#{clear}"
+      ansi_string = nest_color(collapse_reset(ansi_string), ansi_colors)
+      ansi_string
+    end
+
+    def clear
+      lookup(:clear)
+    end
+
+    # Collapse reset
+    #
+    # @param [String] string
+    #   the string to remove duplicates from
+    #
+    # @return [String]
+    #
+    # @api private
+    def collapse_reset(string)
+      ansi_string = string.dup
+      if ansi_string =~ /(#{Regexp.quote(clear)}){2,}/
+        ansi_string.gsub!(/(#{Regexp.quote(clear)}){2,}/, clear)
       end
-      matches = ansi_string.scan(/#{Regexp.quote(ANSI::CLEAR)}/)
-      if matches.length >= 2
-        ansi_string.sub!(/#{Regexp.quote(ANSI::CLEAR)}/, ansi_colors.join)
+      ansi_string
+    end
+
+    # Nest color
+    #
+    # @param [String] string
+    #   the string to decorate
+    #
+    # @param [String] ansi_colors
+    #   the ansi colors to apply
+    #
+    # @return [String]
+    #
+    # @api private
+    def nest_color(string, ansi_colors)
+      ansi_string = string.dup
+      matches = ansi_string.scan(/#{Regexp.quote(clear)}/)
+      if matches.length > 1
+        ansi_string.sub!(/#{Regexp.quote(clear)}/, ansi_colors)
       end
       ansi_string
     end
+    private :collapse_reset, :nest_color
 
     # Same as instance method.
     #
@@ -79,6 +118,7 @@ module Pastel
     # Strip ANSI color codes from a string.
     #
     # @param [String] string
+    #   the string to sanitize
     #
     # @return [String]
     #
@@ -94,21 +134,30 @@ module Pastel
     #
     # @api public
     def code(*colors)
-      validate(*colors)
-      colors.map { |color| lookup(color) }
+      attribute = []
+      colors.each do |color|
+        value = ANSI::ATTRIBUTES[color] || ALIASES[color]
+        if value
+          attribute << value
+        else
+          validate(color)
+        end
+      end
+      attribute
     end
 
     # Find color representation.
     #
-    # @param [Symbol,String] color
-    #   the color name to lookup by
+    # @param [Symbol,String] colors
+    #   the color name(s) to lookup
     #
     # @return [String]
-    #   the ANSI code
+    #   the ANSI code(s)
     #
     # @api private
-    def lookup(color)
-      self.class.const_get(color.to_s.upcase)
+    def lookup(*colors)
+      attribute = code(*colors)
+      "\e[#{attribute.join(';')}m"
     end
 
     # Expose all ANSI color names and their codes
@@ -117,10 +166,7 @@ module Pastel
     #
     # @api public
     def styles
-      ANSI.constants(false).each_with_object({}) do |col, acc|
-        acc[col.to_sym.downcase] = lookup(col)
-        acc
-      end
+      ANSI::ATTRIBUTES.merge(ALIASES)
     end
 
     # List all available style names
@@ -135,16 +181,42 @@ module Pastel
     # Check if provided colors are known colors
     #
     # @param [Array[Symbol,String]]
-    #   the colors to check
+    #   the list of colors to check
     #
     # @reutrn [Boolean]
+    #   true if all colors are valid, false otherwise
     #
     # @api public
     def valid?(*colors)
       colors.all? { |color| style_names.include?(color.to_sym) }
     end
 
-    protected
+    # Define a new color alias
+    #
+    # @param [String] alias_name
+    #   the color alias to define
+    # @param [String] color
+    #   the color the alias will correspond to
+    #
+    # @return [String]
+    #   the standard color value of the alias
+    #
+    # @api public
+    def alias_color(alias_name, color)
+      validate(color)
+
+      if !(alias_name.to_s =~ /^[\w]+$/)
+        fail InvalidAliasNameError, "Invalid alias name `#{alias_name}`"
+      elsif ANSI::ATTRIBUTES[alias_name]
+        fail InvalidAliasNameError,
+             "Cannot alias standard color `#{alias_name}`"
+      end
+
+      ALIASES[alias_name.to_sym] = ANSI::ATTRIBUTES[color]
+      color
+    end
+
+    private
 
     # @api private
     def validate(*colors)

data/lib/pastel/color_resolver.rb

@@ -18,11 +18,12 @@ module Pastel
       @color = color
     end
 
+    # Resolve uncolored string
+    #
+    # @api private
     def resolve(base, *args)
       unprocessed_string = args.join
-      base.reduce(unprocessed_string) do |component, decorator|
-        color.decorate(component, decorator)
-      end
+      color.decorate(unprocessed_string, *base)
     end
   end # ColorResolver
 end # Pastel

data/lib/pastel/delegator.rb

@@ -10,7 +10,7 @@ module Pastel
     include Equatable
 
     def_delegators '@resolver.color', :valid?, :styles, :strip, :decorate,
-                   :enabled?
+                   :enabled?, :alias_color
 
     # Create Delegator
     #
@@ -31,6 +31,13 @@ module Pastel
       new(resolver, base)
     end
 
+    # Object string representation
+    #
+    # @api
+    def inspect
+      "<##{self.class.name}>"
+    end
+
     protected
 
     attr_reader :base

data/lib/pastel/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Pastel
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/unit/alias_color_spec.rb

@@ -0,0 +1,26 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe Pastel, '.alias_color' do
+
+  subject(:pastel) { described_class.new(enabled: true) }
+
+  it "aliases color" do
+    pastel.alias_color(:funky, :red)
+    expect(pastel.funky('unicorn')).to eq("\e[31municorn\e[0m")
+  end
+
+  it "aliases color and combines with regular ones" do
+    pastel.alias_color(:funky, :red)
+    expect(pastel.funky.on_green('unicorn')).to eq("\e[31;42municorn\e[0m")
+  end
+
+  it "reads aliases from the environment" do
+    color_aliases = "funky=red"
+    allow(ENV).to receive(:[]).with('PASTEL_COLORS_ALIASES').
+      and_return(color_aliases)
+    described_class.new(enabled: true)
+    expect(pastel.valid?(:funky)).to eq(true)
+  end
+end

data/spec/unit/alias_importer_spec.rb

@@ -0,0 +1,28 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe Pastel::AliasImporter, '.import' do
+  let(:color) { double(:color, alias_color: true) }
+  let(:output) { StringIO.new }
+
+  subject(:importer) { described_class.new(color, output) }
+
+  it "imports aliases from environment" do
+    color_aliases = "funky=red,base=bright_yellow"
+    allow(ENV).to receive(:[]).with('PASTEL_COLORS_ALIASES').
+      and_return(color_aliases)
+    importer.import
+    expect(color).to have_received(:alias_color).twice
+  end
+
+  it "fails to import incorrectly formattd colors" do
+    color_aliases = "funky red,base=bright_yellow"
+    allow(ENV).to receive(:[]).with('PASTEL_COLORS_ALIASES').
+      and_return(color_aliases)
+    importer.import
+    output.rewind
+    expect(output.string).to eq("Bad color mapping `funky red`\n")
+    expect(color).to have_received(:alias_color).with(:base, :bright_yellow)
+  end
+end

data/spec/unit/color/alias_color_spec.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe Pastel::Color, '.alias_color' do
+
+  subject(:color) { described_class.new(enabled: true) }
+
+  it 'aliases non existent color' do
+    expect {
+      color.alias_color(:funky, :unknown)
+    }.to raise_error(Pastel::InvalidAttributeNameError)
+  end
+
+  it 'aliases color with invalid name' do
+    expect {
+      color.alias_color('some name', :red)
+    }.to raise_error(Pastel::InvalidAliasNameError, /Invalid alias name/)
+  end
+
+  it 'aliases standard color' do
+    expect {
+      color.alias_color(:red, :red)
+    }.to raise_error(Pastel::InvalidAliasNameError, /alias standard color/)
+  end
+
+  it 'aliases color :red to :funky' do
+    color.alias_color(:funky, :red)
+    expect(color.valid?(:funky)).to eq(true)
+    expect(color.code(:funky)).to eq([31])
+    expect(color.lookup(:funky)).to eq("\e[31m")
+  end
+
+  it "has global aliases" do
+    color_foo = described_class.new(enabled: true)
+    color_bar = described_class.new(enabled: true)
+    color_foo.alias_color(:foo, :red)
+    color_bar.alias_color(:bar, :red)
+    expect(color_foo.valid?(:foo)).to eq(true)
+    expect(color_foo.valid?(:bar)).to eq(true)
+  end
+end

data/spec/unit/color/code_spec.rb

@@ -8,11 +8,11 @@ RSpec.describe Pastel::Color, '.code' do
   subject(:color) { described_class.new(enabled: true) }
 
   it 'finds single code' do
-    expect(color.code(:black)).to eq(["\e[30m"])
+    expect(color.code(:black)).to eq([30])
   end
 
   it 'finds more than one code' do
-    expect(color.code(:black, :green)).to eq(["\e[30m", "\e[32m"])
+    expect(color.code(:black, :green)).to eq([30, 32])
   end
 
   it "doesn't find code" do

data/spec/unit/color/decorate_spec.rb

@@ -20,12 +20,12 @@ RSpec.describe Pastel::Color, '.decorate' do
   end
 
   it 'applies style and color to string' do
-    expect(color.decorate(string, :bold, :green)).to eq("\e[1m\e[32m#{string}\e[0m")
+    expect(color.decorate(string, :bold, :green)).to eq("\e[1;32m#{string}\e[0m")
   end
 
   it 'applies style, color and background to string' do
     text = color.decorate(string, :bold, :green, :on_blue)
-    expect(text).to eq("\e[1m\e[32m\e[44m#{string}\e[0m")
+    expect(text).to eq("\e[1;32;44m#{string}\e[0m")
   end
 
   it "applies styles to nested text" do

data/spec/unit/color/styles_spec.rb

@@ -7,6 +7,6 @@ RSpec.describe Pastel::Color do
   subject(:color) { described_class.new(enabled: true) }
 
   it "exposes all available style ANSI codes" do
-    expect(color.styles[:red]).to eq("\e[31m")
+    expect(color.styles[:red]).to eq(31)
   end
 end

data/spec/unit/color/supports_spec.rb

@@ -3,6 +3,9 @@
 require 'spec_helper'
 
 RSpec.describe Pastel::Color, '.supports?' do
+
+  before { allow(ENV).to receive(:[]).with('PASTEL_COLORS_ALIASES') }
+
   it "isn't enabled for non tty terminal" do
     allow($stdout).to receive(:tty?).and_return(false)
     color = described_class.new

data/spec/unit/new_spec.rb

@@ -24,14 +24,29 @@ RSpec.describe Pastel do
         to eq("\e[31mUnicorns\e[0m will rule \e[32mthe World!\e[0m")
     end
 
-    it "composes color strings" do
+    it "composes two color strings " do
+      expect(pastel.red.on_green("unicorn")).to eq("\e[31;42municorn\e[0m")
+    end
+
+    it "composes three color strings" do
       expect(pastel.red.on_green.underline("unicorn")).
-        to eq("\e[4m\e[42m\e[31municorn\e[0m")
+        to eq("\e[31;42;4municorn\e[0m")
+    end
+
+    it "combines colored composed strings with regular ones" do
+      expect(pastel.red.on_green("Unicorns") + ' will rule ' +
+        pastel.green.on_red('the World!')).
+      to eq("\e[31;42mUnicorns\e[0m will rule \e[32;41mthe World!\e[0m")
+    end
+
+    it "allows one level nesting" do
+      expect(pastel.red("Unicorn" + pastel.blue("rule!"))).
+        to eq("\e[31mUnicorn\e[34mrule!\e[0m")
     end
 
     it "allows to nest mixed styles" do
       expect(pastel.red("Unicorn" + pastel.green.on_yellow.underline('running') + '!')).
-        to eq("\e[31mUnicorn\e[4m\e[43m\e[32mrunning\e[31m!\e[0m")
+        to eq("\e[31mUnicorn\e[32;43;4mrunning\e[31m!\e[0m")
     end
 
     it "allows for deep nesting" do
@@ -44,9 +59,15 @@ RSpec.describe Pastel do
         to eq("\e[31mr\e[32mg\e[31mr\e[0m")
     end
 
+    it "raises error when chained with unrecognized color" do
+      expect {
+        pastel.unknown.on_red('unicorn')
+      }.to raise_error(Pastel::InvalidAttributeNameError)
+    end
+
     it "raises error when doesn't recognize color" do
       expect {
-        pastel.uknown('unicorn')
+        pastel.unknown('unicorn')
       }.to raise_error(Pastel::InvalidAttributeNameError)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pastel
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equatable
@@ -56,7 +56,9 @@ files:
 - README.md
 - Rakefile
 - assets/screenshot.png
+- benchmarks/speed.rb
 - lib/pastel.rb
+- lib/pastel/alias_importer.rb
 - lib/pastel/ansi.rb
 - lib/pastel/color.rb
 - lib/pastel/color_resolver.rb
@@ -65,6 +67,9 @@ files:
 - lib/pastel/version.rb
 - pastel.gemspec
 - spec/spec_helper.rb
+- spec/unit/alias_color_spec.rb
+- spec/unit/alias_importer_spec.rb
+- spec/unit/color/alias_color_spec.rb
 - spec/unit/color/code_spec.rb
 - spec/unit/color/decorate_spec.rb
 - spec/unit/color/strip_spec.rb
@@ -102,6 +107,9 @@ specification_version: 4
 summary: Terminal strings styling with intuitive and clean API.
 test_files:
 - spec/spec_helper.rb
+- spec/unit/alias_color_spec.rb
+- spec/unit/alias_importer_spec.rb
+- spec/unit/color/alias_color_spec.rb
 - spec/unit/color/code_spec.rb
 - spec/unit/color/decorate_spec.rb
 - spec/unit/color/strip_spec.rb