vedeu 0.8.2 → 0.8.3

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

@@ -64,7 +64,7 @@ module Vedeu
         end
 
         context 'when the colour is a CSS value (8-bit / 256 colours)' do
-          before { Vedeu.config.stubs(:colour_mode).returns(8) }
+          before { Vedeu.config.stubs(:colour_mode).returns(256) }
 
           {
             '#0000d7' => "\e[48;5;20m",
@@ -92,6 +92,38 @@ module Vedeu
         end
       end
 
+      describe '#to_h' do
+        subject { instance.to_h }
+
+        it { subject.must_be_instance_of(Hash) }
+
+        context 'when the colour is empty' do
+          let(:colour) {}
+          let(:expected) {
+            {
+              background: ''
+            }
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'when the colour is not empty' do
+          let(:colour) { '#af00d7' }
+          let(:expected) {
+            {
+              background: '#af00d7'
+            }
+          }
+
+          it { subject.must_equal(expected) }
+        end
+      end
+
+      describe '#to_hash' do
+        it { instance.must_respond_to(:to_hash) }
+      end
+
       describe '#to_html' do
         subject { instance.to_html }
 
@@ -116,8 +148,8 @@ module Vedeu
         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 property' do
+            subject.must_equal('background-color:#afd700;')
           end
         end
       end

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

@@ -284,6 +284,72 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Colours::Foreground) }
       end
 
+      describe '#to_h' do
+        subject { instance.to_h }
+
+        it { subject.must_be_instance_of(Hash) }
+
+        context 'with both background and foreground' do
+          let(:background) { '#000000' }
+          let(:foreground) { '#ff0000' }
+          let(:expected)   {
+            {
+              colour: {
+                background: '#000000',
+                foreground: '#ff0000',
+              }
+            }
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'when the foreground is missing' do
+          let(:background) { '#000000' }
+          let(:expected)   {
+            {
+              colour: {
+                background: '#000000',
+                foreground: '',
+              }
+            }
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'when the background is missing' do
+          let(:foreground) { '#ff0000' }
+          let(:expected)   {
+            {
+              colour: {
+                background: '',
+                foreground: '#ff0000',
+              }
+            }
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'when both are missing' do
+          let(:expected)   {
+            {
+              colour: {
+                background: '',
+                foreground: '',
+              }
+            }
+          }
+
+          it { subject.must_equal(expected) }
+        end
+      end
+
+      describe '#to_hash' do
+        it { instance.must_respond_to(:to_hash) }
+      end
+
       describe '#to_s' do
         subject { instance.to_s }
 

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

@@ -48,7 +48,7 @@ module Vedeu
         end
 
         context 'when the colour is a CSS value (8-bit / 256 colours)' do
-          before { Configuration.stubs(:colour_mode).returns(8) }
+          before { Configuration.stubs(:colour_mode).returns(256) }
 
           {
             '#afd700' => "\e[38;5;148m",
@@ -92,6 +92,38 @@ module Vedeu
         end
       end
 
+      describe '#to_h' do
+        subject { instance.to_h }
+
+        it { subject.must_be_instance_of(Hash) }
+
+        context 'when the colour is empty' do
+          let(:colour) {}
+          let(:expected) {
+            {
+              foreground: ''
+            }
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'when the colour is not empty' do
+          let(:colour) { '#afd700' }
+          let(:expected) {
+            {
+              foreground: '#afd700'
+            }
+          }
+
+          it { subject.must_equal(expected) }
+        end
+      end
+
+      describe '#to_hash' do
+        it { instance.must_respond_to(:to_hash) }
+      end
+
       describe '#to_html' do
         subject { instance.to_html }
 
@@ -116,8 +148,8 @@ module Vedeu
         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 property' do
+            subject.must_equal('color:#afd700;')
           end
         end
       end

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

@@ -141,40 +141,6 @@ module Vedeu
         end
       end
 
-      describe '#to_html' do
-        subject { instance.to_html }
-
-        context 'when no colour is given' do
-          let(:colour) {}
-
-          it { subject.must_equal('') }
-        end
-
-        context 'when the colour is a terminal named colour; e.g. :red' do
-          let(:colour) { :red }
-
-          it { subject.must_equal('') }
-        end
-
-        context 'when the colour is a terminal numbered colour; e.g. 122' do
-          let(:colour) { 122 }
-
-          it { subject.must_equal('') }
-        end
-
-        context 'when the colour is a HTML/CSS colour (RGB specified)' do
-          let(:colour) { '#ff0000' }
-
-          it { subject.must_equal('#ff0000') }
-        end
-
-        context 'when the colour is not supported' do
-          let(:colour) { [:not_supported] }
-
-          it { subject.must_equal('') }
-        end
-      end
-
     end # Translator
 
   end # Colours

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

@@ -17,15 +17,63 @@ module Vedeu
         it { instance.instance_variable_get('@value').must_equal(_value) }
       end
 
-      describe '.valid?' do
-        subject { described.valid?(_value) }
+      describe '#named?' do
+        subject { instance.named? }
 
-        context 'when the value is a HTML/CSS formatted hexidecimal string' do
+        context 'when the value is a valid name' do
+          let(:_value) { :blue }
+
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the value is an invalid name' do
+          let(:_value) { :invalid }
+
+          it { subject.must_equal(false) }
+        end
+      end
+
+      describe '#numbered?' do
+        subject { instance.numbered? }
+
+        context 'when the value is a valid number' do
+          let(:_value) { 136 }
+
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the value is an invalid number' do
+          let(:_value) { -1 }
+
+          it { subject.must_equal(false) }
+        end
+
+        context 'when the value is an invalid number' do
+          let(:_value) { 256 }
+
+          it { subject.must_equal(false) }
+        end
+      end
+
+      describe '#rgb?' do
+        subject { instance.rgb? }
+
+        context 'when the value is a HTML/CSS formatted hexadecimal string' do
           let(:_value) { '#654321' }
 
           it { subject.must_equal(true) }
         end
 
+        context 'but the value is an invalid HTML/CSS formatted hexadecimal' do
+          let(:_value) { '#123' }
+
+          it { subject.must_equal(false) }
+        end
+      end
+
+      describe '.valid?' do
+        subject { described.valid?(_value) }
+
         context 'when the value is a Vedeu::Colours::Background' do
           let(:_value) { Vedeu::Colours::Background.new('#654321') }
 
@@ -44,10 +92,40 @@ module Vedeu
           it { subject.must_equal(true) }
         end
 
-        context 'when the value is invalid' do
-          let(:_value) { '#123' }
+        context 'when the value is a HTML/CSS formatted hexidecimal string' do
+          let(:_value) { '#654321' }
 
-          it { subject.must_equal(false) }
+          it { subject.must_equal(true) }
+
+          context 'but the value is invalid' do
+            let(:_value) { '#123' }
+
+            it { subject.must_equal(false) }
+          end
+        end
+
+        context 'when the value is a named symbol' do
+          let(:_value) { :red }
+
+          it { subject.must_equal(true) }
+
+          context 'but the value is invalid' do
+            let(:_value) { :invalid }
+
+            it { subject.must_equal(false) }
+          end
+        end
+
+        context 'when the value is a number' do
+          let(:_value) { 38 }
+
+          it { subject.must_equal(true) }
+
+          context 'but the value is invalid' do
+            let(:_value) { 280 }
+
+            it { subject.must_equal(false) }
+          end
         end
       end
 

data/test/lib/vedeu/cursors/cursor_test.rb

@@ -131,10 +131,10 @@ module Vedeu
 
       describe '#hide' do
         let(:visible) { true }
-        let(:escape)  { Vedeu::Cells::Escape.new(value: Vedeu.esc.hide_cursor) }
+        let(:escape)  { Vedeu::Cells::Cursor.new(value: Vedeu.esc.hide_cursor) }
 
         before do
-          Vedeu::Cells::Escape.stubs(:new).returns(escape)
+          Vedeu::Cells::Cursor.stubs(:new).returns(escape)
         end
 
         subject { instance.hide }
@@ -270,12 +270,12 @@ module Vedeu
       describe '#show' do
         let(:visible) { false }
         let(:escape)  {
-          Vedeu::Cells::Escape.
+          Vedeu::Cells::Cursor.
             new(value: Vedeu.esc.show_cursor)
         }
 
         before do
-          Vedeu::Cells::Escape.stubs(:new).returns(escape)
+          Vedeu::Cells::Cursor.stubs(:new).returns(escape)
         end
 
         subject { instance.show }

data/test/lib/vedeu/cursors/refresh_test.rb

@@ -33,8 +33,11 @@ module Vedeu
 
       describe '.by_name' do
         before do
+          Vedeu.stubs(:trigger).with(:_hide_cursor_)
+          Vedeu.stubs(:trigger).with(:_show_cursor_)
+          Vedeu.stubs(:trigger).with(:_refresh_view_content_, _name)
           Vedeu.stubs(:log)
-          Vedeu.geometry 'refresh_cursor' do
+          Vedeu.geometry(_name) do
             x  1
             xn 3
             y  1

data/test/lib/vedeu/dsl/string/text_test.rb

@@ -86,8 +86,8 @@ module Vedeu
             context 'when a width option is set' do
               let(:expected) {
                 [
-                  Vedeu::Views::Char.new(name: _name, value: 'a'),
-                  Vedeu::Views::Char.new(name: _name, value: 'b'),
+                  Vedeu::Cells::Char.new(name: _name, value: 'a'),
+                  Vedeu::Cells::Char.new(name: _name, value: 'b'),
                 ]
               }
 
@@ -100,10 +100,10 @@ module Vedeu
               context 'when a name option is set' do
                 let(:expected) {
                   [
-                    Vedeu::Views::Char.new(name: _name, value: 'a'),
-                    Vedeu::Views::Char.new(name: _name, value: 'b'),
-                    Vedeu::Views::Char.new(name: _name, value: 'c'),
-                    Vedeu::Views::Char.new(name: _name, value: 'd'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'a'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'b'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'c'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'd'),
                   ]
                 }
 
@@ -114,11 +114,11 @@ module Vedeu
                 let(:_name) {}
                 let(:expected) {
                   [
-                    Vedeu::Views::Char.new(name: _name, value: 'a'),
-                    Vedeu::Views::Char.new(name: _name, value: 'b'),
-                    Vedeu::Views::Char.new(name: _name, value: 'c'),
-                    Vedeu::Views::Char.new(name: _name, value: 'd'),
-                    Vedeu::Views::Char.new(name: _name, value: 'e'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'a'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'b'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'c'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'd'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'e'),
                   ]
                 }
 
@@ -130,11 +130,11 @@ module Vedeu
           context 'when the truncate option is not set' do
             let(:expected) {
               [
-                Vedeu::Views::Char.new(name: _name, value: 'a'),
-                Vedeu::Views::Char.new(name: _name, value: 'b'),
-                Vedeu::Views::Char.new(name: _name, value: 'c'),
-                Vedeu::Views::Char.new(name: _name, value: 'd'),
-                Vedeu::Views::Char.new(name: _name, value: 'e'),
+                Vedeu::Cells::Char.new(name: _name, value: 'a'),
+                Vedeu::Cells::Char.new(name: _name, value: 'b'),
+                Vedeu::Cells::Char.new(name: _name, value: 'c'),
+                Vedeu::Cells::Char.new(name: _name, value: 'd'),
+                Vedeu::Cells::Char.new(name: _name, value: 'e'),
               ]
             }
 
@@ -147,11 +147,11 @@ module Vedeu
             context 'when a width option is set' do
               let(:expected) {
                 [
-                  Vedeu::Views::Char.new(name: _name, value: 'a'),
-                  Vedeu::Views::Char.new(name: _name, value: 'b'),
-                  Vedeu::Views::Char.new(name: _name, value: 'c'),
-                  Vedeu::Views::Char.new(name: _name, value: 'd'),
-                  Vedeu::Views::Char.new(name: _name, value: 'e'),
+                  Vedeu::Cells::Char.new(name: _name, value: 'a'),
+                  Vedeu::Cells::Char.new(name: _name, value: 'b'),
+                  Vedeu::Cells::Char.new(name: _name, value: 'c'),
+                  Vedeu::Cells::Char.new(name: _name, value: 'd'),
+                  Vedeu::Cells::Char.new(name: _name, value: 'e'),
                 ]
               }
 
@@ -164,11 +164,11 @@ module Vedeu
               context 'when a name option is set' do
                 let(:expected) {
                   [
-                    Vedeu::Views::Char.new(name: _name, value: 'a'),
-                    Vedeu::Views::Char.new(name: _name, value: 'b'),
-                    Vedeu::Views::Char.new(name: _name, value: 'c'),
-                    Vedeu::Views::Char.new(name: _name, value: 'd'),
-                    Vedeu::Views::Char.new(name: _name, value: 'e'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'a'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'b'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'c'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'd'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'e'),
                   ]
                 }
 
@@ -179,11 +179,11 @@ module Vedeu
                 let(:_name) {}
                 let(:expected) {
                   [
-                    Vedeu::Views::Char.new(name: _name, value: 'a'),
-                    Vedeu::Views::Char.new(name: _name, value: 'b'),
-                    Vedeu::Views::Char.new(name: _name, value: 'c'),
-                    Vedeu::Views::Char.new(name: _name, value: 'd'),
-                    Vedeu::Views::Char.new(name: _name, value: 'e'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'a'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'b'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'c'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'd'),
+                    Vedeu::Cells::Char.new(name: _name, value: 'e'),
                   ]
                 }
 
@@ -195,11 +195,11 @@ module Vedeu
           context 'when the align option is not set' do
             let(:expected) {
               [
-                Vedeu::Views::Char.new(name: _name, value: 'a'),
-                Vedeu::Views::Char.new(name: _name, value: 'b'),
-                Vedeu::Views::Char.new(name: _name, value: 'c'),
-                Vedeu::Views::Char.new(name: _name, value: 'd'),
-                Vedeu::Views::Char.new(name: _name, value: 'e'),
+                Vedeu::Cells::Char.new(name: _name, value: 'a'),
+                Vedeu::Cells::Char.new(name: _name, value: 'b'),
+                Vedeu::Cells::Char.new(name: _name, value: 'c'),
+                Vedeu::Cells::Char.new(name: _name, value: 'd'),
+                Vedeu::Cells::Char.new(name: _name, value: 'e'),
               ]
             }