vedeu 0.6.1 → 0.6.2

data/test/lib/vedeu/colours/backgrounds_test.rb

@@ -2,16 +2,20 @@ require 'test_helper'
 
 module Vedeu
 
-  describe Backgrounds do
+  module Colours
 
-    let(:described) { Vedeu::Backgrounds }
+    describe Backgrounds do
 
-    describe '.background_colours' do
-      subject { described.background_colours }
+      let(:described) { Vedeu::Colours::Backgrounds }
 
-      it { subject.must_be_instance_of(described) }
-    end
+      describe '.background_colours' do
+        subject { described.background_colours }
 
-  end # Backgrounds
+        it { subject.must_be_instance_of(described) }
+      end
+
+    end # Backgrounds
+
+  end # Colours
 
 end # Vedeu

data/test/lib/vedeu/colours/colour_test.rb

@@ -2,37 +2,12 @@ require 'test_helper'
 
 module Vedeu
 
-  describe Colour do
-
-    let(:described)  { Vedeu::Colour }
-    let(:instance)   { described.new(attributes) }
-    let(:attributes) {
-      {
-        background: background,
-        foreground: foreground,
-      }
-    }
-    let(:background) {}
-    let(:foreground) {}
-
-    describe '#initialize' do
-      it { instance.must_be_instance_of(described) }
-      it {
-        instance.instance_variable_get('@background').
-          must_be_instance_of(Vedeu::Background)
-      }
-      it {
-        instance.instance_variable_get('@foreground').
-          must_be_instance_of(Vedeu::Foreground)
-      }
-    end
+  module Colours
 
-    describe 'accessors' do
-      it { instance.must_respond_to(:background) }
-      it { instance.must_respond_to(:foreground) }
-    end
+    describe Colour do
 
-    describe '.coerce' do
+      let(:described)  { Vedeu::Colours::Colour }
+      let(:instance)   { described.new(attributes) }
       let(:attributes) {
         {
           background: background,
@@ -41,80 +16,146 @@ module Vedeu
       }
       let(:background) {}
       let(:foreground) {}
-      let(:_value) {}
-
-      subject { described.coerce(_value) }
 
-      it { subject.must_be_instance_of(Vedeu::Colour) }
+      describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
+        it {
+          instance.instance_variable_get('@background').
+            must_be_instance_of(Vedeu::Colours::Background)
+        }
+        it {
+          instance.instance_variable_get('@foreground').
+            must_be_instance_of(Vedeu::Colours::Foreground)
+        }
+      end
 
-      context 'when the value is nil' do
-        it { subject.foreground.colour.must_equal('') }
-        it { subject.background.colour.must_equal('') }
+      describe 'accessors' do
+        it { instance.must_respond_to(:background) }
+        it { instance.must_respond_to(:foreground) }
       end
 
-      context 'when the value is a Vedeu::Colour' do
-        let(:background) { '#ff00ff' }
-        let(:foreground) { '#220022' }
-        let(:_value)     { Vedeu::Colour.new(attributes) }
+      describe '.coerce' do
+        let(:attributes) {
+          {
+            background: background,
+            foreground: foreground,
+          }
+        }
+        let(:background) {}
+        let(:foreground) {}
+        let(:_value) {}
 
-        it { subject.foreground.colour.must_equal('#220022') }
-        it { subject.background.colour.must_equal('#ff00ff') }
-        it { subject.to_s.must_equal("\e[38;2;34;0;34m\e[48;2;255;0;255m") }
-      end
+        subject { described.coerce(_value) }
+
+        it { subject.must_be_instance_of(described) }
+
+        context 'when the value is nil' do
+          it { subject.foreground.colour.must_equal('') }
+          it { subject.background.colour.must_equal('') }
+        end
+
+        context 'when the value is a Vedeu::Colour' do
+          let(:background) { '#ff00ff' }
+          let(:foreground) { '#220022' }
+          let(:_value)     { Vedeu::Colours::Colour.new(attributes) }
+
+          it { subject.foreground.colour.must_equal('#220022') }
+          it { subject.background.colour.must_equal('#ff00ff') }
+          it { subject.to_s.must_equal("\e[38;2;34;0;34m\e[48;2;255;0;255m") }
+        end
 
-      context 'when the value is a Hash' do
-        context 'when the hash has a :colour defined' do
-          context 'when the value of :colour is a Vedeu::Colour' do
-            let(:background) { '#002200' }
-            let(:foreground) { '#00ff00' }
-            let(:_value) {
-              {
-                colour: Vedeu::Colour.new(attributes),
+        context 'when the value is a Hash' do
+          context 'when the hash has a :colour defined' do
+            context 'when the value of :colour is a Vedeu::Colours::Colour' do
+              let(:background) { '#002200' }
+              let(:foreground) { '#00ff00' }
+              let(:_value) {
+                {
+                  colour: Vedeu::Colours::Colour.new(attributes),
+                }
               }
-            }
 
-            it { subject.foreground.colour.must_equal('#00ff00') }
-            it { subject.background.colour.must_equal('#002200') }
-            it { subject.to_s.must_equal("\e[38;2;0;255;0m\e[48;2;0;34;0m") }
+              it { subject.foreground.colour.must_equal('#00ff00') }
+              it { subject.background.colour.must_equal('#002200') }
+              it { subject.to_s.must_equal("\e[38;2;0;255;0m\e[48;2;0;34;0m") }
+            end
+
+            context 'when the value of :colour is a Hash' do
+              context 'and a :background is defined' do
+                let(:_value) {
+                  {
+                    colour: {
+                      background: '#7700ff'
+                    }
+                  }
+                }
+
+                it { subject.foreground.colour.must_equal('') }
+                it { subject.background.colour.must_equal('#7700ff') }
+                it {
+                  subject.to_s.must_equal("\e[48;2;119;0;255m")
+                }
+              end
+
+              context 'and a :foreground is defined' do
+                let(:_value) {
+                  {
+                    colour: {
+                      foreground: '#220077'
+                    }
+                  }
+                }
+
+                it { subject.foreground.colour.must_equal('#220077') }
+                it { subject.background.colour.must_equal('') }
+                it {
+                  subject.to_s.must_equal("\e[38;2;34;0;119m")
+                }
+              end
+
+              context 'and neither a :background or :foreground is defined' do
+                let(:_value) {
+                  {
+                    colour: 'wrong'
+                  }
+                }
+
+                it { subject.foreground.colour.must_equal('') }
+                it { subject.background.colour.must_equal('') }
+                it { subject.to_s.must_equal('') }
+              end
+            end
           end
 
-          context 'when the value of :colour is a Hash' do
-            context 'and a :background is defined' do
+          context 'when the hash does not have a :colour defined' do
+            context 'when the hash has a :background defined' do
               let(:_value) {
                 {
-                  colour: {
-                    background: '#7700ff'
-                  }
+                  background: '#000022'
                 }
               }
 
               it { subject.foreground.colour.must_equal('') }
-              it { subject.background.colour.must_equal('#7700ff') }
-              it {
-                subject.to_s.must_equal("\e[48;2;119;0;255m")
-              }
+              it { subject.background.colour.must_equal('#000022') }
+              it { subject.to_s.must_equal("\e[48;2;0;0;34m") }
             end
 
-            context 'and a :foreground is defined' do
+            context 'when the hash has a :foreground defined' do
               let(:_value) {
                 {
-                  colour: {
-                    foreground: '#220077'
-                  }
+                  foreground: '#aadd00'
                 }
               }
 
-              it { subject.foreground.colour.must_equal('#220077') }
+              it { subject.foreground.colour.must_equal('#aadd00') }
               it { subject.background.colour.must_equal('') }
-              it {
-                subject.to_s.must_equal("\e[38;2;34;0;119m")
-              }
+              it { subject.to_s.must_equal("\e[38;2;170;221;0m") }
             end
 
-            context 'and neither a :background or :foreground is defined' do
+            context 'when neither a :background or :foreground is defined' do
               let(:_value) {
                 {
-                  colour: 'wrong'
+                  irrelevant: true
                 }
               }
 
@@ -124,106 +165,69 @@ module Vedeu
             end
           end
         end
+      end
 
-        context 'when the hash does not have a :colour defined' do
-          context 'when the hash has a :background defined' do
-            let(:_value) {
-              {
-                background: '#000022'
-              }
-            }
-
-            it { subject.foreground.colour.must_equal('') }
-            it { subject.background.colour.must_equal('#000022') }
-            it { subject.to_s.must_equal("\e[48;2;0;0;34m") }
-          end
+      describe '#background=' do
+        let(:_value) { '#000000' }
 
-          context 'when the hash has a :foreground defined' do
-            let(:_value) {
-              {
-                foreground: '#aadd00'
-              }
-            }
+        subject { instance.background = (_value) }
 
-            it { subject.foreground.colour.must_equal('#aadd00') }
-            it { subject.background.colour.must_equal('') }
-            it { subject.to_s.must_equal("\e[38;2;170;221;0m") }
-          end
-
-          context 'when neither a :background or :foreground is defined' do
-            let(:_value) {
-              {
-                irrelevant: true
-              }
-            }
-
-            it { subject.foreground.colour.must_equal('') }
-            it { subject.background.colour.must_equal('') }
-            it { subject.to_s.must_equal('') }
-          end
-        end
+        it { subject.must_equal(_value) }
       end
-    end
 
-    describe '#background=' do
-      let(:_value) { '#000000' }
+      describe '#eql?' do
+        let(:other) { instance }
 
-      subject { instance.background = (_value) }
+        subject { instance.eql?(other) }
 
-      it { subject.must_equal(_value) }
-    end
+        it { subject.must_equal(true) }
 
-    describe '#eql?' do
-      let(:other) { instance }
+        context 'when different to other' do
+          let(:other) { described.new(background: '#ff0000') }
 
-      subject { instance.eql?(other) }
+          it { subject.must_equal(false) }
+        end
+      end
 
-      it { subject.must_equal(true) }
+      describe '#foreground=' do
+        let(:_value) { '#ff0000' }
 
-      context 'when different to other' do
-        let(:other) { described.new(background: '#ff0000') }
+        subject { instance.foreground = (_value) }
 
-        it { subject.must_equal(false) }
+        it { subject.must_equal(_value) }
       end
-    end
-
-    describe '#foreground=' do
-      let(:_value) { '#ff0000' }
-
-      subject { instance.foreground = (_value) }
 
-      it { subject.must_equal(_value) }
-    end
+      describe '#to_s' do
+        subject { instance.to_s }
 
-    describe '#to_s' do
-      subject { instance.to_s }
+        it { subject.must_be_instance_of(String) }
 
-      it { subject.must_be_instance_of(String) }
+        context 'with both background and foreground' do
+          let(:background) { '#000000' }
+          let(:foreground) { '#ff0000' }
 
-      context 'with both background and foreground' do
-        let(:background) { '#000000' }
-        let(:foreground) { '#ff0000' }
+          it { subject.must_equal("\e[38;2;255;0;0m\e[48;2;0;0;0m") }
+        end
 
-        it { subject.must_equal("\e[38;2;255;0;0m\e[48;2;0;0;0m") }
-      end
+        context 'when the foreground is missing' do
+          let(:background) { '#000000' }
 
-      context 'when the foreground is missing' do
-        let(:background) { '#000000' }
+          it { subject.must_equal("\e[48;2;0;0;0m") }
+        end
 
-        it { subject.must_equal("\e[48;2;0;0;0m") }
-      end
+        context 'when the background is missing' do
+          let(:foreground) { '#ff0000' }
 
-      context 'when the background is missing' do
-        let(:foreground) { '#ff0000' }
+          it { subject.must_equal("\e[38;2;255;0;0m") }
+        end
 
-        it { subject.must_equal("\e[38;2;255;0;0m") }
+        context 'when both are missing' do
+          it { subject.must_equal('') }
+        end
       end
 
-      context 'when both are missing' do
-        it { subject.must_equal('') }
-      end
-    end
+    end # Colour
 
-  end # Colour
+  end # Colours
 
 end # Vedeu

data/test/lib/vedeu/colours/foreground_test.rb

@@ -2,124 +2,128 @@ require 'test_helper'
 
 module Vedeu
 
-  describe Foreground do
+  module Colours
 
-    let(:described) { Vedeu::Foreground }
-    let(:instance)  { described.new(colour) }
-    let(:colour)    {}
+    describe Foreground do
 
-    before { Vedeu.foreground_colours.reset! }
+      let(:described) { Vedeu::Colours::Foreground }
+      let(:instance)  { described.new(colour) }
+      let(:colour)    {}
 
-    describe '#escape_sequence' do
-      subject { instance.escape_sequence }
+      before { Vedeu.foreground_colours.reset! }
 
-      context 'when the colour is empty' do
-        let(:colour) { '' }
+      describe '#escape_sequence' do
+        subject { instance.escape_sequence }
 
-        it { subject.must_equal('') }
-      end
+        context 'when the colour is empty' do
+          let(:colour) { '' }
+
+          it { subject.must_equal('') }
+        end
 
-      context 'when the colour is named (3-bit / 8 colours)' do
-        {
-          red:     "\e[31m",
-          yellow:  "\e[33m",
-          magenta: "\e[35m",
-          white:   "\e[97m",
-          default: "\e[39m",
-          unknown: '',
-        }.map do |colour, result|
-          it "returns the correct escape sequence for #{colour}" do
-            described.new(colour).escape_sequence.must_equal(result)
+        context 'when the colour is named (3-bit / 8 colours)' do
+          {
+            red:     "\e[31m",
+            yellow:  "\e[33m",
+            magenta: "\e[35m",
+            white:   "\e[97m",
+            default: "\e[39m",
+            unknown: '',
+          }.map do |colour, result|
+            it "returns the correct escape sequence for #{colour}" do
+              described.new(colour).escape_sequence.must_equal(result)
+            end
           end
         end
-      end
 
-      context 'when the colour is numbered (8-bit / 256 colours)' do
-        {
-          24  => "\e[38;5;24m",
-          56  => "\e[38;5;56m",
-          82  => "\e[38;5;82m",
-          118 => "\e[38;5;118m",
-          143 => "\e[38;5;143m",
-          219 => "\e[38;5;219m",
-          -2  => '',
-          442 => ''
-        }.map do |colour, result|
-          it "returns the correct escape sequence for #{colour}" do
-            described.new(colour).escape_sequence.must_equal(result)
+        context 'when the colour is numbered (8-bit / 256 colours)' do
+          {
+            24  => "\e[38;5;24m",
+            56  => "\e[38;5;56m",
+            82  => "\e[38;5;82m",
+            118 => "\e[38;5;118m",
+            143 => "\e[38;5;143m",
+            219 => "\e[38;5;219m",
+            -2  => '',
+            442 => ''
+          }.map do |colour, result|
+            it "returns the correct escape sequence for #{colour}" do
+              described.new(colour).escape_sequence.must_equal(result)
+            end
           end
         end
-      end
 
-      context 'when the colour is a CSS value (8-bit / 256 colours)' do
-        before { Configuration.stubs(:colour_mode).returns(8) }
-
-        {
-          '#5f0000' => "\e[38;5;52m",
-          '#008700' => "\e[38;5;28m",
-          '#0000d7' => "\e[38;5;20m",
-          '#afafaf' => "\e[38;5;145m",
-          '#afd700' => "\e[38;5;148m",
-          '#af005f' => "\e[38;5;125m",
-          '999999'  => '',
-          '#12121'  => '',
-          '#h11111' => '',
-        }.map do |colour, result|
-          it "returns the correct escape sequence for #{colour}" do
-            described.new(colour).escape_sequence.must_equal(result)
+        context 'when the colour is a CSS value (8-bit / 256 colours)' do
+          before { Configuration.stubs(:colour_mode).returns(8) }
+
+          {
+            '#5f0000' => "\e[38;5;52m",
+            '#008700' => "\e[38;5;28m",
+            '#0000d7' => "\e[38;5;20m",
+            '#afafaf' => "\e[38;5;145m",
+            '#afd700' => "\e[38;5;148m",
+            '#af005f' => "\e[38;5;125m",
+            '999999'  => '',
+            '#12121'  => '',
+            '#h11111' => '',
+          }.map do |colour, result|
+            it "returns the correct escape sequence for #{colour}" do
+              described.new(colour).escape_sequence.must_equal(result)
+            end
           end
         end
-      end
 
-      context 'when the colour is a CSS value (24-bit / 16.8mil colours)' do
-        {
-          '#5f0000' => "\e[38;2;95;0;0m",
-          '#008700' => "\e[38;2;0;135;0m",
-          '#0000d7' => "\e[38;2;0;0;215m",
-          '#afafaf' => "\e[38;2;175;175;175m",
-          '#afd700' => "\e[38;2;175;215;0m",
-          '#af005f' => "\e[38;2;175;0;95m",
-          '999999'  => '',
-          '#12121'  => '',
-          '#h11111' => '',
-        }.map do |colour, result|
-          it "returns the correct escape sequence for #{colour}" do
-            described.new(colour).escape_sequence.must_equal(result)
+        context 'when the colour is a CSS value (24-bit / 16.8mil colours)' do
+          {
+            '#5f0000' => "\e[38;2;95;0;0m",
+            '#008700' => "\e[38;2;0;135;0m",
+            '#0000d7' => "\e[38;2;0;0;215m",
+            '#afafaf' => "\e[38;2;175;175;175m",
+            '#afd700' => "\e[38;2;175;215;0m",
+            '#af005f' => "\e[38;2;175;0;95m",
+            '999999'  => '',
+            '#12121'  => '',
+            '#h11111' => '',
+          }.map do |colour, result|
+            it "returns the correct escape sequence for #{colour}" do
+              described.new(colour).escape_sequence.must_equal(result)
+            end
           end
         end
       end
-    end
 
-    describe '.to_html' do
-      subject { instance.to_html }
+      describe '.to_html' do
+        subject { instance.to_html }
 
-      context 'when the colour is empty' do
-        let(:colour) {}
+        context 'when the colour is empty' do
+          let(:colour) {}
 
-        it { subject.must_equal('') }
-      end
+          it { subject.must_equal('') }
+        end
 
-      context 'when the colour is named (3-bit / 8 colours)' do
-        let(:colour) { :red }
+        context 'when the colour is named (3-bit / 8 colours)' do
+          let(:colour) { :red }
 
-        it { subject.must_equal('') }
-      end
+          it { subject.must_equal('') }
+        end
 
-      context 'when the colour is numbered (8-bit / 256 colours)' do
-        let(:colour) { 118 }
+        context 'when the colour is numbered (8-bit / 256 colours)' do
+          let(:colour) { 118 }
 
-        it { subject.must_equal('') }
-      end
+          it { subject.must_equal('') }
+        end
 
-      context 'when the colour is a CSS value' do
-        let(:colour) { '#afd700' }
+        context 'when the colour is a CSS value' do
+          let(:colour) { '#afd700' }
 
-        it 'returns the colour as a CSS value' do
-          subject.must_equal('#afd700')
+          it 'returns the colour as a CSS value' do
+            subject.must_equal('#afd700')
+          end
         end
       end
-    end
 
-  end # Foreground
+    end # Foreground
+
+  end # Colours
 
 end # Vedeu