pastel 0.5.3 → 0.6.0

data/spec/unit/decorate_dsl_spec.rb

@@ -0,0 +1,85 @@
+# encoding: utf-8
+
+RSpec.describe Pastel, 'coloring dsl' do
+  subject(:pastel) { described_class.new(enabled: true) }
+
+  it "doesn't apply styles to empty string" do
+    expect(pastel.red('')).to eq('')
+  end
+
+  it "colors string" do
+    expect(pastel.red("unicorn")).to eq("\e[31municorn\e[0m")
+  end
+
+  it "allows to specify variable number of arguments" do
+    expect(pastel.red("unicorn", "running")).to eq("\e[31municornrunning\e[0m")
+  end
+
+  it "combines colored strings with regular ones" do
+    expect(pastel.red("Unicorns") + ' will rule ' + pastel.green('the World!')).
+      to eq("\e[31mUnicorns\e[0m will rule \e[32mthe World!\e[0m")
+  end
+
+  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[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\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[32;43;4mrunning\e[0m\e[31m!\e[0m")
+  end
+
+  it "allows for deep nesting" do
+    expect(pastel.red('r' + pastel.green('g' + pastel.yellow('y') + 'g') + 'r')).
+      to eq("\e[31mr\e[32mg\e[33my\e[0m\e[32mg\e[0m\e[31mr\e[0m")
+  end
+
+  it "allows for variable nested arguments" do
+    expect(pastel.red('r', pastel.green('g'), 'r')).
+      to eq("\e[31mr\e[32mg\e[0m\e[31mr\e[0m")
+  end
+
+  it "nests color foreground & background" do
+    expect(pastel.on_red('foo', pastel.green('bar'), 'foo')).
+      to eq("\e[41mfoo\e[32mbar\e[0m\e[41mfoo\e[0m")
+  end
+
+  it "allows to nest styles within block" do
+    string = pastel.red.on_green('Unicorns' +
+      pastel.green.on_red('will ', 'dominate' + pastel.yellow('the world!')))
+
+    expect(pastel.red.on_green('Unicorns') do
+      green.on_red('will ', 'dominate') do
+        yellow('the world!')
+      end
+    end).to eq(string)
+  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.unknown('unicorn')
+    }.to raise_error(Pastel::InvalidAttributeNameError)
+  end
+end

data/spec/unit/decorator_chain_spec.rb

@@ -1,7 +1,5 @@
 # coding: utf-8
 
-require 'spec_helper'
-
 RSpec.describe Pastel::DecoratorChain do
   it "is enumerable" do
     expect(described_class.new).to be_a(Enumerable)

data/spec/unit/delegator_spec.rb

@@ -1,7 +1,5 @@
 # coding: utf-8
 
-require 'spec_helper'
-
 RSpec.describe Pastel::Delegator do
 
   it "returns delegator for color without argument" do

data/spec/unit/detach_spec.rb

@@ -1,7 +1,5 @@
 # coding: utf-8
 
-require 'spec_helper'
-
 RSpec.describe Pastel, '.detach' do
 
   subject(:pastel) { described_class.new(enabled: true) }

data/spec/unit/new_spec.rb

@@ -1,89 +1,18 @@
-# coding: utf-8
+# encoding: utf-8
 
-require 'spec_helper'
-
-RSpec.describe Pastel do
+RSpec.describe Pastel, '#new' do
 
   subject(:pastel) { described_class.new(enabled: true) }
 
-  describe 'coloring string' do
-    it "doesn't apply styles to empty string" do
-      expect(pastel.red('')).to eq('')
-    end
-
-    it "colors string" do
-      expect(pastel.red("unicorn")).to eq("\e[31municorn\e[0m")
-    end
-
-    it "allows to specify variable number of arguments" do
-      expect(pastel.red("unicorn", "running")).to eq("\e[31municornrunning\e[0m")
-    end
-
-    it "combines colored strings with regular ones" do
-      expect(pastel.red("Unicorns") + ' will rule ' + pastel.green('the World!')).
-        to eq("\e[31mUnicorns\e[0m will rule \e[32mthe World!\e[0m")
-    end
-
-    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[31;42;4municorn\e[0m")
-    end
+  it { is_expected.to respond_to(:lookup) }
 
-    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 { is_expected.to respond_to(:decorate) }
 
-    it "allows one level nesting" do
-      expect(pastel.red("Unicorn" + pastel.blue("rule!"))).
-        to eq("\e[31mUnicorn\e[34mrule!\e[0m")
-    end
+  it { is_expected.to respond_to(:undecorate) }
 
-    it "allows to nest mixed styles" do
-      expect(pastel.red("Unicorn" + pastel.green.on_yellow.underline('running') + '!')).
-        to eq("\e[31mUnicorn\e[32;43;4mrunning\e[31m!\e[0m")
-    end
+  it { is_expected.to respond_to(:strip) }
 
-    it "allows for deep nesting" do
-      expect(pastel.red('r' + pastel.green('g' + pastel.yellow('y') + 'g') + 'r')).
-        to eq("\e[31mr\e[32mg\e[33my\e[32mg\e[31mr\e[0m")
-    end
-
-    it "allows for variable nested arguments" do
-      expect(pastel.red('r', pastel.green('g'), 'r')).
-        to eq("\e[31mr\e[32mg\e[31mr\e[0m")
-    end
-
-    it "allows to nest styles within block" do
-      string = pastel.red.on_green('Unicorns' +
-        pastel.green.on_red('will ', 'dominate' + pastel.yellow('the world!')))
-
-      expect(pastel.red.on_green('Unicorns') do
-        green.on_red('will ', 'dominate') do
-          yellow('the world!')
-        end
-      end).to eq(string)
-    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.unknown('unicorn')
-      }.to raise_error(Pastel::InvalidAttributeNameError)
-    end
-  end
-
-  describe '.valid?' do
+  describe '#valid?' do
     it "when valid returns true" do
       expect(pastel.valid?(:red)).to eq(true)
     end
@@ -93,14 +22,23 @@ RSpec.describe Pastel do
     end
   end
 
-  describe '.colored?' do
+  describe '#colored?' do
     it "checks if string is colored" do
       expect(pastel.colored?("\e[31mfoo\e[0m")).to eq(true)
     end
   end
 
   describe 'options passed in' do
-    it "receives enabled option" do
+    it 'defaults enabled to color detection' do
+      allow(TTY::Color).to receive(:color?).and_return(true)
+
+      pastel = described_class.new
+
+      expect(pastel.enabled?).to eq(true)
+      expect(TTY::Color).to have_received(:color?)
+    end
+
+    it "sets enabled option" do
       pastel = described_class.new(enabled: false)
       expect(pastel.enabled?).to eq(false)
       expect(pastel.red('Unicorn', pastel.green('!'))).to eq('Unicorn!')

data/spec/unit/respond_to_spec.rb

@@ -1,7 +1,5 @@
 # coding: utf-8
 
-require 'spec_helper'
-
 RSpec.describe Pastel, '.respond_to?' do
   subject(:pastel) { described_class.new(enabled: true) }
 

data/spec/unit/undecorate_spec.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+RSpec.describe Pastel, '#undecorate' do
+  subject(:pastel) { described_class.new(enabled: true) }
+
+  it "undecorates string detecting color escape codes" do
+    string = pastel.red.on_green('foo')
+    expect(pastel.undecorate(string)).to eq([
+      {foreground: :red, background: :on_green, text: 'foo'}
+    ])
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pastel
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equatable
@@ -25,33 +25,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: tty-screen
+  name: tty-color
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 description: Terminal strings styling with intuitive and clean API.
 email:
 - ''
@@ -61,7 +81,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .ruby-gemset
 - .ruby-version
 - .travis.yml
 - CHANGELOG.md
@@ -78,6 +97,7 @@ files:
 - lib/pastel/alias_importer.rb
 - lib/pastel/ansi.rb
 - lib/pastel/color.rb
+- lib/pastel/color_parser.rb
 - lib/pastel/color_resolver.rb
 - lib/pastel/decorator_chain.rb
 - lib/pastel/delegator.rb
@@ -92,15 +112,19 @@ files:
 - spec/unit/color/colored_spec.rb
 - spec/unit/color/decorate_spec.rb
 - spec/unit/color/equal_spec.rb
+- spec/unit/color/lookup_spec.rb
 - spec/unit/color/new_spec.rb
 - spec/unit/color/strip_spec.rb
 - spec/unit/color/styles_spec.rb
 - spec/unit/color/valid_spec.rb
+- spec/unit/color_parser_spec.rb
+- spec/unit/decorate_dsl_spec.rb
 - spec/unit/decorator_chain_spec.rb
 - spec/unit/delegator_spec.rb
 - spec/unit/detach_spec.rb
 - spec/unit/new_spec.rb
 - spec/unit/respond_to_spec.rb
+- spec/unit/undecorate_spec.rb
 - tasks/console.rake
 - tasks/coverage.rake
 - tasks/spec.rake
@@ -137,13 +161,17 @@ test_files:
 - spec/unit/color/colored_spec.rb
 - spec/unit/color/decorate_spec.rb
 - spec/unit/color/equal_spec.rb
+- spec/unit/color/lookup_spec.rb
 - spec/unit/color/new_spec.rb
 - spec/unit/color/strip_spec.rb
 - spec/unit/color/styles_spec.rb
 - spec/unit/color/valid_spec.rb
+- spec/unit/color_parser_spec.rb
+- spec/unit/decorate_dsl_spec.rb
 - spec/unit/decorator_chain_spec.rb
 - spec/unit/delegator_spec.rb
 - spec/unit/detach_spec.rb
 - spec/unit/new_spec.rb
 - spec/unit/respond_to_spec.rb
+- spec/unit/undecorate_spec.rb
 has_rdoc: 

data/.ruby-gemset

@@ -1 +0,0 @@
-pastel