vedeu 0.6.1 → 0.6.2

data/test/lib/vedeu/models/focus_test.rb

@@ -69,7 +69,8 @@ module Vedeu
       end
 
       it 'raises an exception if the interface does not exist' do
-        proc { Vedeu::Focus.by_name('not_found') }.must_raise(Vedeu::ModelNotFound)
+        proc { Vedeu::Focus.by_name('not_found') }.
+          must_raise(Vedeu::Error::ModelNotFound)
       end
 
       context 'API methods' do
@@ -81,7 +82,8 @@ module Vedeu
         end
 
         it 'raises an exception if the interface does not exist' do
-          proc { Vedeu.focus_by_name('not_found') }.must_raise(Vedeu::ModelNotFound)
+          proc { Vedeu.focus_by_name('not_found') }.
+            must_raise(Vedeu::Error::ModelNotFound)
         end
       end
     end

data/test/lib/vedeu/models/menu_test.rb

@@ -31,7 +31,7 @@ module Vedeu
       context 'when the block is not given' do
         subject { described.menu }
 
-        it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
+        it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax) }
       end
     end
 

data/test/lib/vedeu/models/views/char_test.rb

@@ -130,12 +130,16 @@ module Vedeu
         end
 
         context 'when a colour is specified' do
-          let(:colour) { Vedeu::Colour.new(foreground: '#00ff00',
-                                           background: '#005500') }
+          let(:colour) {
+            Vedeu::Colours::Colour.new(foreground: '#00ff00',
+                                       background: '#005500')
+          }
 
           context 'and a parent colour is specified' do
-            let(:parent_colour) { Vedeu::Colour.new(foreground: '#ff0000',
-                                                    background: '#550000') }
+            let(:parent_colour) {
+              Vedeu::Colours::Colour.new(foreground: '#ff0000',
+                                         background: '#550000')
+            }
 
             it { subject.must_equal("\e[38;2;0;255;0m\e[48;2;0;85;0ma") }
           end

data/test/lib/vedeu/models/views/line_test.rb

@@ -20,15 +20,15 @@ module Vedeu
         [
           Vedeu::Views::Stream.new(value: 'Something interesting ',
                                    parent: streams_parent,
-                                   colour: Vedeu::Colour.new(foreground: '#ffff00'),
+                                   colour: Vedeu::Colours::Colour.new(foreground: '#ffff00'),
                                    style:  Vedeu::Style.new('normal')),
           Vedeu::Views::Stream.new(value: 'on this line ',
                                    parent: streams_parent,
-                                   colour: Vedeu::Colour.new(foreground: '#00ff00'),
+                                   colour: Vedeu::Colours::Colour.new(foreground: '#00ff00'),
                                    style:  Vedeu::Style.new('normal')),
           Vedeu::Views::Stream.new(value: 'would be cool, eh?',
                                    parent: streams_parent,
-                                   colour: Vedeu::Colour.new(foreground: '#0000ff'),
+                                   colour: Vedeu::Colours::Colour.new(foreground: '#0000ff'),
                                    style:  Vedeu::Style.new('normal'))
         ]
       }
@@ -42,7 +42,7 @@ module Vedeu
 
       let(:parent) { Vedeu::Views::View.new(name: 'Vedeu::Line') }
       let(:colour) {
-        Vedeu::Colour.new(foreground: '#ff0000', background: '#000000')
+        Vedeu::Colours::Colour.new(foreground: '#ff0000', background: '#000000')
       }
       let(:style)  { Vedeu::Style.new('normal') }
 

data/test/lib/vedeu/models/views/stream_test.rb

@@ -24,10 +24,10 @@ module Vedeu
                                style:  style)
       }
       let(:parent_colour) {
-        Vedeu::Colour.new(background: '#0000ff', foreground: '#ffff00')
+        Vedeu::Colours::Colour.new(background: '#0000ff', foreground: '#ffff00')
       }
       let(:colour)      {
-        Vedeu::Colour.new(background: '#ff0000', foreground: '#000000')
+        Vedeu::Colours::Colour.new(background: '#ff0000', foreground: '#000000')
       }
       let(:style)       { Vedeu::Style.new('normal') }
       let(:line_parent) { Vedeu::Views::View.new(name: 'Vedeu::Views::Stream') }
@@ -85,7 +85,7 @@ module Vedeu
 
         context 'when different to other' do
           let(:other) {
-            described.new(colour: Vedeu::Colour.coerce(background: '#ff0000'))
+            described.new(colour: Vedeu::Colours::Colour.coerce(background: '#ff0000'))
           }
 
           it { subject.must_equal(false) }

data/test/lib/vedeu/models/views/view_test.rb

@@ -78,7 +78,7 @@ module Vedeu
         context 'when the name is not defined' do
           let(:_name) {}
 
-          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
+          it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax) }
         end
       end
 

data/test/lib/vedeu/output/html_char_test.rb

@@ -43,7 +43,8 @@ module Vedeu
 
         context 'when there is a colour' do
           let(:colour) {
-            Vedeu::Colour.new(background: '#220022', foreground: '#aadd00')
+            Vedeu::Colours::Colour.new(background: '#220022',
+                                       foreground: '#aadd00')
           }
 
           it { subject.must_equal(
@@ -60,7 +61,8 @@ module Vedeu
         context 'when there is no colour' do
           context 'when there is a parent colour' do
             let(:parent_colour) {
-              Vedeu::Colour.new(background: '#002222', foreground: '#dd2200')
+              Vedeu::Colours::Colour.new(background: '#002222',
+                                         foreground: '#dd2200')
             }
 
             it { subject.must_equal(

data/test/lib/vedeu/output/presentation/colour_test.rb

@@ -54,7 +54,7 @@ module Vedeu
       describe '#background' do
         subject { includer.background }
 
-        it { subject.must_be_instance_of(Vedeu::Background) }
+        it { subject.must_be_instance_of(Vedeu::Colours::Background) }
 
         context 'when a colour is not set' do
           let(:colour) {}
@@ -90,7 +90,7 @@ module Vedeu
       describe '#foreground' do
         subject { includer.foreground }
 
-        it { subject.must_be_instance_of(Vedeu::Foreground) }
+        it { subject.must_be_instance_of(Vedeu::Colours::Foreground) }
         it { subject.colour.must_equal('#aadd00') }
 
         context 'when a colour is not set' do
@@ -127,7 +127,7 @@ module Vedeu
       describe '#colour' do
         subject { includer.colour }
 
-        it { subject.must_be_instance_of(Vedeu::Colour) }
+        it { subject.must_be_instance_of(Vedeu::Colours::Colour) }
 
         context 'when a colour is not set' do
           let(:colour) {}
@@ -153,12 +153,12 @@ module Vedeu
 
       describe '#colour=' do
         let(:colour) {
-          Vedeu::Colour.new(foreground: '#00ff00', background: '#000000')
+          Vedeu::Colours::Colour.new(foreground: '#00ff00', background: '#000000')
         }
 
         subject { includer.colour=(colour) }
 
-        it { subject.must_be_instance_of(Vedeu::Colour) }
+        it { subject.must_be_instance_of(Vedeu::Colours::Colour) }
       end
 
     end # Colour

data/test/lib/vedeu/output/presentation_test.rb

@@ -48,15 +48,15 @@ module Vedeu
       let(:line) {
         Vedeu::Views::Line.new(value:  [],
                                parent: Vedeu::Interface.new,
-                               colour: Vedeu::Colour.new(foreground: '#00ff00',
-                                                         background: '#000000'),
+                               colour: Vedeu::Colours::Colour.new(foreground: '#00ff00',
+                                                                  background: '#000000'),
                                style:  Vedeu::Style.new('normal'))
       }
       let(:stream) {
         Vedeu::Views::Stream.new(value:  stream_value,
                                  parent: line,
-                                 colour: Vedeu::Colour.new(foreground: '#ff0000',
-                                                           background: '#000000'),
+                                 colour: Vedeu::Colours::Colour.new(foreground: '#ff0000',
+                                                                    background: '#000000'),
                                  style:  stream_style)
       }
       let(:stream_value)  { 'Some text' }

data/test/lib/vedeu/output/renderers/json_test.rb

@@ -29,7 +29,8 @@ module Vedeu
 
         context 'when the output is not empty' do
           let(:colour) {
-            Vedeu::Colour.new(foreground: '#ff0000', background: '#ffffff')
+            Vedeu::Colours::Colour.new(foreground: '#ff0000',
+                                       background: '#ffffff')
           }
           let(:output) {
             [
@@ -69,7 +70,8 @@ module Vedeu
           context 'when a parent is available' do
             let(:parent) {
               Vedeu::Views::Stream.new(
-                colour: Vedeu::Colour.coerce(background: '', foreground: '')
+                colour: Vedeu::Colours::Colour.coerce(background: '',
+                                                      foreground: '')
               )
             }
 

data/test/lib/vedeu/plugins/plugin_test.rb

@@ -37,7 +37,7 @@ module Vedeu
           Kernel.stubs(:require).raises(LoadError)
         end
 
-        it { proc { subject }.must_raise(Vedeu::VedeuError) }
+        it { proc { subject }.must_raise(Vedeu::Error::Fatal) }
         it { instance.enabled.must_equal(false) }
       end
 

data/test/lib/vedeu/refresh/refresh_buffer_test.rb

@@ -19,7 +19,7 @@ module Vedeu
       context 'when the name is not present' do
         let(:_name) { '' }
 
-        it { proc { subject }.must_raise(Vedeu::MissingRequired) }
+        it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
       end
 
 # describe '.by_name' do

data/test/lib/vedeu/refresh/refresh_group_test.rb

@@ -19,7 +19,7 @@ module Vedeu
       context 'when the name is not present' do
         let(:_name) { '' }
 
-        it { proc { subject }.must_raise(Vedeu::MissingRequired) }
+        it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
       end
 
       context 'when the name is present' do

data/test/lib/vedeu/repositories/repository_test.rb

@@ -147,7 +147,7 @@ module Vedeu
       context 'when the model cannot be found' do
         let(:model_name) { 'not_found' }
 
-        it { proc { subject }.must_raise(Vedeu::ModelNotFound) }
+        it { proc { subject }.must_raise(Vedeu::Error::ModelNotFound) }
       end
 
       context 'when the model is found' do
@@ -247,7 +247,7 @@ module Vedeu
       context 'when a name attribute is empty or nil' do
         before { model_instance.name = '' }
 
-        it { proc { subject }.must_raise(Vedeu::MissingRequired) }
+        it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
       end
 
       context 'when a name attributes is provided' do

data/test/lib/vedeu/runtime/router_test.rb

@@ -26,7 +26,7 @@ module Vedeu
       subject { described.add_controller(controller, klass) }
 
       context 'when a name is not given' do
-        it { proc { subject }.must_raise(Vedeu::MissingRequired) }
+        it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
       end
 
       context 'when a name is given' do
@@ -71,13 +71,13 @@ module Vedeu
       context 'when the controller is not given' do
         let(:action) { :some_action }
 
-        it { proc { subject }.must_raise(Vedeu::MissingRequired) }
+        it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
       end
 
       context 'when the name is not given' do
         let(:controller) { :some_controller }
 
-        it { proc { subject }.must_raise(Vedeu::MissingRequired) }
+        it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
       end
 
       context 'when the controller and name is given' do
@@ -155,7 +155,7 @@ module Vedeu
             described.add_controller(controller, 'Vedeu::SomeController')
           end
 
-          it { proc { subject }.must_raise(Vedeu::ActionNotFound) }
+          it { proc { subject }.must_raise(Vedeu::Error::ActionNotFound) }
         end
 
         context 'when the controller klass is not defined' do
@@ -165,12 +165,12 @@ module Vedeu
           end
           after { described.reset! }
 
-          it { proc { subject }.must_raise(Vedeu::MissingRequired) }
+          it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
         end
       end
 
       context 'when the controller is not registered' do
-        it { proc { subject }.must_raise(Vedeu::ControllerNotFound) }
+        it { proc { subject }.must_raise(Vedeu::Error::ControllerNotFound) }
       end
     end
 

data/test/lib/vedeu/templating/decoder_test.rb

@@ -9,11 +9,10 @@ module Vedeu
       let(:described) { Vedeu::Templating::Decoder }
       let(:instance)  { described.new(data) }
       let(:data)      {
-        "eJxj4ci3EgpLTUkttbJyzs/JLy1itxJwSEpMzk4vyi/NS8m3EoPKOsHF2Kx4HJLBaj" \
-        "2VeJTT0gyAgM2KzTUEqDMtvygVXacbXIzNmgOkxcAApInNmjMEAAMcJsQ="
+        "{{eJxj4ci3kg5LTUkttbJyzs/JLy0qhjHYrQQckhKTs9OL8kvzUvKt5NGVOcEl2ax4HJLBwp5KPMppaQZAwGbF5hoCNCItvygVpxFucEk2aw6QXgMDkG42a84QAEnkMPA=}}"
       }
       let(:expected)  {
-        Vedeu::Colour.new(background: '#ff0000', foreground: '#00ff00')
+        Vedeu::Colours::Colour.new(background: '#ff0000', foreground: '#00ff00')
       }
 
       describe '#initialize' do

data/test/lib/vedeu/templating/encoder_test.rb

@@ -9,11 +9,10 @@ module Vedeu
       let(:described) { Vedeu::Templating::Encoder }
       let(:instance)  { described.new(data) }
       let(:data)      {
-        Vedeu::Colour.new(background: '#ff0000', foreground: '#00ff00')
+        Vedeu::Colours::Colour.new(background: '#ff0000', foreground: '#00ff00')
       }
       let(:expected)  {
-        "{{eJxj4ci3EgpLTUkttbJyzs/JLy1itxJwSEpMzk4vyi/NS8m3EoPKOsHF2Kx4HJLBaj" \
-        "2VeJTT0gyAgM2KzTUEqDMtvygVXacbXIzNmgOkxcAApInNmjMEAAMcJsQ=}}"
+        "{{eJxj4ci3kg5LTUkttbJyzs/JLy0qhjHYrQQckhKTs9OL8kvzUvKt5NGVOcEl2ax4HJLBwp5KPMppaQZAwGbF5hoCNCItvygVpxFucEk2aw6QXgMDkG42a84QAEnkMPA=}}"
       }
 
       describe '#initialize' do

data/test/lib/vedeu/templating/helpers_test.rb

@@ -17,7 +17,7 @@ module Vedeu
 
       describe '#background' do
         let(:expected) {
-          "{{eJxdj00LwjAMhj1Ip7aKXwjeZP4Bz9klKAo7K7t3GmU4V+laP/DPW+tUMJfkTfokb+sNBeOEdmQBkoyuJcDaaJInAV2UxugstYbKBwe+zTMqzMwVKldWK+hX3MLrwAGp3B4PWtlip2BUTeffHgOBbzYOxXTmgwFbbhy5V5r+ydW3xyIRhzUWtTfAz1J7G63S3HNS0Kter1+SAceLzC25uc9xOPyZmhi6Gb+lWcgTfVY6V++vRQIDpz4XOPoTKKIBtqGFLwY7T83nXwE=}}"
+          "{{eJx1j08PATEQxR2ki5YQLuJA1hdwnr1MCMmeiXvZIRtrK93Wn/jyqiyJRC+dl9f3m9dqTUF/TQlZgHVKlwJgaTTJo4A2SmN0urGGijsHvs1Sys3EDSpTVisYvHMzr4tyCFxyI7eHvVY2TxQMf59NPyYDgS9aHIrxxB8GbL5yiJ3S9Bex+JgsEnFYYVFzBfwktW/YKMwtIwWdd2z5lAw4nmVmyfn+jsPet+bI0NV4Sj2XRyqRrt7r15HAwKlyA0e/AkXUxSY08JnB1gP9j2kt}}"
         }
 
         subject { instance.background('#000000') { 'background text' } }
@@ -43,7 +43,7 @@ module Vedeu
             }
           }
           let(:expected) {
-            "{{eJxdj00LwjAMhj1I/WgVP0DwJvMPFI/ZJSgKOyveq0YZzlW61g/889ZuevCUvEmeN0m9qWG8pQM5gG1K9wJgbQ2pi4AeKmtNunOWihcHvs9Syq30ic60MxoGFbcIuuGBndqfT0a7/KBhVHXnvxoDgSWbRGIq5WwmJQO23HjyqA39k6tfjcUiiWos7myAX5UJZ7QL+8xIQ7+aXn8kA443lTny/RCTqFeunFh62ODQytWFvnb+ovKtWGDDq687x2CPIh5iB9r4YbD7BjXvXXU=}}"
+            "{{eJx1jzGPwjAMhRlQypEUcboJMYDKH4gY3cW6Eyd1BrGnYFBFaVCacKD784SUMiAx2U/P77Pd7WkYrWlLDmBd0F8NsLSG1FHAEJW1psidpfqfA9+UBVVW+kaX2hkN40fuJ+i6bSKfzNXmsDfaVVsNk9ex76fJQGBDyxIxk3I+l5IBW6w8YqcNvUX8Pk2WiizpsDReAT8pEy7s1/ZakobPR2x5lww4nlXpyPuhZsmw2T21dLGB8FGpI7U4f1rzcSow8qqlcwx4FOkXxtDHewYHNz0LZ6E=}}"
           }
 
           it { subject.must_equal(expected) }
@@ -56,7 +56,7 @@ module Vedeu
             }
           }
           let(:expected) {
-            "{{eJxdj8sKwjAQRV1IqiaKDxDcSf0B19PNoCh0rbiPdirF2kia+MCfN02rC2eTuTOcOzftjoLZgRKyAIeMHiXAzmiSVwFDlMbo7GgNlW8O/JRnVJila1SurFYwbri114EDjvJ0OWtli0TBtNmufjMGAms2DlsM2GbvkFRp+ke2vxmLRByKRZouXbGovwd+k9rH6JXmlZOCUQPtKsmA413mltzev3E4rE/ODT2Nd+gW8kpVgkq4RPW3IoGBU193jt4eRTTBPvSwYnDwAZI0Xd0=}}"
+            "{{eJx1j0sLwjAQhD1IfCQVxZN4UOof8Ly9LIpCz4r3qFspto2kiQ/886apehDMJTtMvtlJs61gtKMjWYBdSrcSYGM0yVxAH6UxOt1bQ+WTAz9kKRVm7gaVKasVjN/c0uvyM7QcuZeH80krWxwVTH6fLb4mA4F1Whw2GLDV1rGJ0vSXXX9NFok4FLMkmbvDomAL/CK1b9gtzSMjBYM3vakkA45XmVlyvr/jsF/vnhq6G5/QKWROVZVKuGr1jyOBLac+6Rx9PIpoiAF0sWKw9wKlIWgJ}}"
           }
 
           it { subject.must_equal(expected) }
@@ -70,7 +70,7 @@ module Vedeu
             }
           }
           let(:expected) {
-            "{{eJxdj8sKwjAQRV1IfCSKDxDcif5AcSNMN4Oi4FrpPupUirWRNPGBP2+aVhfOJnPvcO5M6k0F44hOZAGihB45wM5oklcBPZTG6ORgDeVvDvyYJpSZwDUqVVYrGFTcyuuGAw7yeDlrZbOTglE1Xf48BgJLdjsVs8DVfM6ArfeOjJWmf3Lz81goCiSOF4sgYGFnD/wmtb+mnZtXSgr6FbQrJAOOd5lacnP/bqe9cvPE0NP4hFYmr86veeEOK38XCmw49U3n6ONRhEPsQBsLBrsfqStfPg==}}"
+            "{{eJx1j0sLwjAQhD1IfCSK4kk8KPoHihdhe1kUBc8V71G3UqyNpIkP/POmqXoQzCU7O5mPSbWuoL+lA1mAbUK3HCAymuRZQAelMTrZWUP5kwPfpwllJnCDSpXVCgbv3MLr/DPUXHIn96ejVjY7KBj+Ppt/TQYCS9p6LCaBO9MpA7bcOESsNP1FrL4mC0WRjePZLAhY2NoAv0jtizZz80hJQfedjgrJgONVppac7+/1uFNWGBm6G09oZPLs9hUvXMPy46HAmlMfOkePRxH2sAVNLDLYfgH3e2lq}}"
           }
 
           it { subject.must_equal(expected) }
@@ -79,7 +79,7 @@ module Vedeu
 
       describe '#foreground' do
         let(:expected) {
-          "{{eJxdj8sKwjAQRV1IqiaKLwR3Un/A9XQzKApdK+6jHaVYG0kTH/jzprEqOJvMneHMvak3FIy3lJAF2KZ0KwDWRpM8C+iiNEanO2uoeHLg+yyl3MxcozJltYJ+xS28Dhywk/vTUSubJwpG1Xb+nTEQ+GbjsMaALTcOOShN/8jqO2ORiEMxnfliUXsD/CK1j9EqzCMjBb0KWpeSAcerzCy5vX/jcPhzmBi6G3+lmcszlSlK4VK9vxYJDJz6OHD0FiiiAbahhSWDnRf8A18c}}"
+          "{{eJx1j0sLwjAQhD1IqiaKohfxoNQ/4Hl7WRSFnhXv0a5SrI2kiQ/886bxBYK5ZIfJtzOp1hT015SQBVindCkAlkaTPApoozRGpxtrqLhz4NsspdxM3KAyZbWCwYubeV28h8CRG7k97LWyeaJg+Pts+jEZCHxui8MKAzZfOXanNP1lFx+TRSIOxXjiD4uaK+AnqX3DRmFuGSnovOhlKRlwPMvMkvP9HYe9b9TI0NX4LfVcHqmsUwpX7/nrSGDg1DuBo49AEXWxCQ0sGWw9ADevaUg=}}"
         }
 
         subject { instance.foreground('#000000') { 'foreground text' } }
@@ -91,7 +91,7 @@ module Vedeu
 
       describe '#style' do
         let(:expected) {
-          "{{eJxdj09PAjEQxT2YItuiqAkJN8In8Pz2MtFowhnCvcuOZkPZMd3WP/HL0y0LB2/zZt5v3sz1jWC+5ZojsG34uwPWwbM9GEzJhuCbKgbu/jT0zjXchqdUiJPoBQ8D95L1KAGV3e0/vMS2FsyG6fOlp2DoxK6WVwrqdZOQd/H8H3m79FRpem852UB/Wp/ziy78OhbcD+51LxU0fVkXGeNKXI0ii9XyLpsXgX9C3jJu7YHPK9M5p59KQ6OkzgmaMkWmfKQJCuoZuj0Cs8Jdcg==}}"
+          "{{eJx1j71OAzEQhCkiJzk7EESFKEB5Auq5ZgUKUupE6X25BZ1wbpHP5ke8PD4nlwIp3Yxmv9nd0URwu+WaI7Bt+KsD1sGz3RvMyYbgmyoG7n419M413IbHJMRJ9IK7I/ecfTeIcSIru3t/8xLbWnD/f+zpFCoYOrStFhcKarlJ7Kt4Psu+nEJVmh4qZxvoD+vzaUUXfhwLro/YurcKmj6ti4xpJa5Gkc1qcZWHHwJ/h9wybe2eh8p01+Hd0tA4uWGDpkyRKW9ohoJ6hi7/AKgrZ54=}}"
         }
 
         subject { instance.style(:bold) { 'style text' } }

data/test/lib/vedeu/templating/template_test.rb

@@ -23,7 +23,7 @@ module Vedeu
         context 'when the path is empty' do
           let(:path) { '' }
 
-          it { proc { subject }.must_raise(Vedeu::MissingRequired) }
+          it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
         end
 
         context 'when the path is does not exist' do
@@ -31,7 +31,7 @@ module Vedeu
 
           before { File.stubs(:exist?).returns(false) }
 
-          it { proc { subject }.must_raise(Vedeu::MissingRequired) }
+          it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
         end
 
         context 'when the path exists' do

data/test/lib/vedeu/templating/view_template_test.rb

@@ -60,9 +60,11 @@ module Vedeu
         end
 
         context 'with a background colour directive' do
-          let(:content) { "This is a <%= background('#ff0000') { 'test' } %>.\n" }
+          let(:content) {
+            "This is a <%= background('#ff0000') { 'test' } %>.\n"
+          }
           let(:colour) {
-            Vedeu::Colour.new(background: '#ff0000', foreground: '')
+            Vedeu::Colours::Colour.new(background: '#ff0000', foreground: '')
           }
 
           let(:expected) {
@@ -92,7 +94,7 @@ module Vedeu
             }
 
             let(:colour) {
-              Vedeu::Colour.new(background: '#ff0000', foreground: '')
+              Vedeu::Colours::Colour.new(background: '#ff0000', foreground: '')
             }
 
             let(:expected) {
@@ -124,9 +126,11 @@ module Vedeu
         end
 
         context 'with a foreground colour directive' do
-          let(:content) { "This is a <%= foreground('#00ff00') { 'test' } %>.\n" }
+          let(:content) {
+            "This is a <%= foreground('#00ff00') { 'test' } %>.\n"
+          }
           let(:colour) {
-            Vedeu::Colour.new(background: '', foreground: '#00ff00')
+            Vedeu::Colours::Colour.new(background: '', foreground: '#00ff00')
           }
 
           let(:expected) {
@@ -151,9 +155,11 @@ module Vedeu
         end
 
         context 'with a colour directive' do
-          let(:content) { "This is a <%= colour(background: '#003300', foreground: '#aadd00') { 'test' } %>.\n" }
+          let(:content) {
+            "This is a <%= colour(background: '#003300', foreground: '#aadd00') { 'test' } %>.\n"
+          }
           let(:colour) {
-            Vedeu::Colour.new(background: '#003300', foreground: '#aadd00')
+            Vedeu::Colours::Colour.new(background: '#003300', foreground: '#aadd00')
           }
 
           let(:expected) {