vedeu 0.3.4 → 0.3.5

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

@@ -2,12 +2,15 @@ require 'test_helper'
 
 module Vedeu
 
+  class FakeRenderer; end
+
   describe VirtualTerminal do
 
     let(:described) { Vedeu::VirtualTerminal }
-    let(:instance)  { described.new(height, width) }
+    let(:instance)  { described.new(height, width, renderer) }
     let(:height)    { 5 }
     let(:width)     { 10 }
+    let(:renderer)  { Vedeu::HTMLRenderer }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(Vedeu::VirtualTerminal) }
@@ -15,8 +18,21 @@ module Vedeu
       it { instance.instance_variable_get('@cell_width').must_equal(9) }
       it { instance.instance_variable_get('@height').must_equal(5) }
       it { instance.instance_variable_get('@width').must_equal(10) }
+      it { instance.instance_variable_get('@renderer').must_equal(Vedeu::HTMLRenderer) }
     end
 
+    describe 'attr_accessor' do
+      context '#renderer' do
+        subject { instance.renderer }
+
+        it { subject.must_equal(Vedeu::HTMLRenderer) }
+      end
+      context '#renderer=' do
+        subject { instance.renderer=(Vedeu::FakeRenderer) }
+
+        it { subject.must_equal(Vedeu::FakeRenderer) }
+      end
+    end
     describe 'attr_reader' do
       context '#cell_height' do
         subject { instance.cell_height }
@@ -81,8 +97,22 @@ module Vedeu
       end
     end
 
+    describe '#output' do
+      let(:data) {}
+
+      subject { instance.output(data) }
+
+      it { subject.must_be_instance_of(Array) }
+    end
+
+    describe '#reset' do
+      subject { instance.reset }
+
+      it { subject.must_be_instance_of(Array) }
+    end
+
     describe '#write' do
-      let(:data) { Vedeu::Char.new('a') }
+      let(:data) { Vedeu::Char.new({ value: 'a' }) }
 
       subject { instance.write(y, x, data) }
 

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

@@ -4,6 +4,10 @@ module Vedeu
 
   describe Background do
 
+    let(:described) { Vedeu::Background }
+    let(:instance) { described.new(colour) }
+    let(:colour) {}
+
     describe '.escape_sequence' do
       describe 'when the colour is empty' do
         it 'returns an empty String' do
@@ -16,7 +20,7 @@ module Vedeu
           red:     "\e[41m",
           yellow:  "\e[43m",
           magenta: "\e[45m",
-          white:   "\e[47m",
+          white:   "\e[107m",
           default: "\e[49m",
           unknown: '',
         }.map do |colour, result|
@@ -82,6 +86,42 @@ module Vedeu
       end
     end
 
+    describe '.to_html' do
+      subject { instance.to_html }
+
+      context 'when the colour is empty' do
+        let(:colour) {}
+
+        it 'returns an empty String' do
+          subject.must_equal('')
+        end
+      end
+
+      context 'when the colour is named (3-bit / 8 colours)' do
+        let(:colour) { :red }
+
+        it 'returns an empty String' do
+          subject.must_equal('')
+        end
+      end
+
+      context 'when the colour is numbered (8-bit / 256 colours)' do
+        let(:colour) { 118 }
+
+        it 'returns an empty String' do
+          subject.must_equal('')
+        end
+      end
+
+      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')
+        end
+      end
+    end
+
   end # Background
 
 end # Vedeu

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

@@ -21,7 +21,7 @@ module Vedeu
     describe '#background' do
       subject { instance.background }
 
-      it { subject.must_be_instance_of(String) }
+      it { subject.must_be_instance_of(Vedeu::Background) }
 
       context 'with a background' do
         let(:attributes) {
@@ -30,20 +30,22 @@ module Vedeu
           }
         }
 
-        it { subject.must_equal("\e[48;2;0;0;0m") }
+        it { subject.to_s.must_equal("\e[48;2;0;0;0m") }
+        it { subject.to_html.must_equal('#000000') }
       end
 
       context 'without a background' do
         let(:attributes) { {} }
 
-        it { subject.must_equal('') }
+        it { subject.to_s.must_equal('') }
+        it { subject.to_html.must_equal('') }
       end
     end
 
     describe '#foreground' do
       subject { instance.foreground }
 
-      it { subject.must_be_instance_of(String) }
+      it { subject.must_be_instance_of(Vedeu::Foreground) }
 
       context 'with a foreground' do
         let(:attributes) {
@@ -52,13 +54,15 @@ module Vedeu
           }
         }
 
-        it { subject.must_equal("\e[38;2;255;0;0m") }
+        it { subject.to_s.must_equal("\e[38;2;255;0;0m") }
+        it { subject.to_html.must_equal('#ff0000') }
       end
 
       context 'without a foreground' do
         let(:attributes) { {} }
 
-        it { subject.must_equal('') }
+        it { subject.to_s.must_equal('') }
+        it { subject.to_html.must_equal('') }
       end
     end
 

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

@@ -4,19 +4,23 @@ module Vedeu
 
   describe Foreground do
 
+    let(:described) { Vedeu::Foreground }
+    let(:instance) { described.new(colour) }
+    let(:colour) {}
+
     describe '.escape_sequence' do
-      describe 'when the colour is empty' do
+      context 'when the colour is empty' do
         it 'returns an empty String' do
           Foreground.escape_sequence('').must_equal('')
         end
       end
 
-      describe 'when the colour is named (3-bit / 8 colours)' do
+      context 'when the colour is named (3-bit / 8 colours)' do
         {
           red:     "\e[31m",
           yellow:  "\e[33m",
           magenta: "\e[35m",
-          white:   "\e[37m",
+          white:   "\e[97m",
           default: "\e[39m",
           unknown: '',
         }.map do |colour, result|
@@ -26,7 +30,7 @@ module Vedeu
         end
       end
 
-      describe 'when the colour is numbered (8-bit / 256 colours)' do
+      context 'when the colour is numbered (8-bit / 256 colours)' do
         {
           24  => "\e[38;5;24m",
           56  => "\e[38;5;56m",
@@ -43,7 +47,7 @@ module Vedeu
         end
       end
 
-      describe 'when the colour is a CSS value (8-bit / 256 colours)' do
+      context 'when the colour is a CSS value (8-bit / 256 colours)' do
         before { Configuration.stubs(:colour_mode).returns(8) }
 
         {
@@ -63,7 +67,7 @@ module Vedeu
         end
       end
 
-      describe 'when the colour is a CSS value (24-bit / 16.8mil colours)' do
+      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",
@@ -82,6 +86,42 @@ module Vedeu
       end
     end
 
+    describe '.to_html' do
+      subject { instance.to_html }
+
+      context 'when the colour is empty' do
+        let(:colour) {}
+
+        it 'returns an empty String' do
+          subject.must_equal('')
+        end
+      end
+
+      context 'when the colour is named (3-bit / 8 colours)' do
+        let(:colour) { :red }
+
+        it 'returns an empty String' do
+          subject.must_equal('')
+        end
+      end
+
+      context 'when the colour is numbered (8-bit / 256 colours)' do
+        let(:colour) { 118 }
+
+        it 'returns an empty String' do
+          subject.must_equal('')
+        end
+      end
+
+      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')
+        end
+      end
+    end
+
   end # Foreground
 
 end # Vedeu

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

@@ -2,10 +2,47 @@ require 'test_helper'
 
 module Vedeu
 
+  class PresentationTestClass
+    include Presentation
+
+    def attributes
+      {
+        colour: { background: '#000033', foreground: '#aadd00' },
+        style:  ['bold']
+      }
+    end
+  end # PresentationTestClass
+
   describe Presentation do
 
     let(:receiver) { PresentationTestClass.new }
 
+    describe '#background' do
+      subject { receiver.background }
+
+      it { subject.must_be_instance_of(Vedeu::Background) }
+    end
+
+    describe '#foreground' do
+      subject { receiver.foreground }
+
+      it { subject.must_be_instance_of(Vedeu::Foreground) }
+    end
+
+    describe '#parent_background' do
+      subject { receiver.parent_background }
+    end
+
+    describe '#parent_foreground' do
+      subject { receiver.parent_foreground }
+    end
+
+    describe '#colour' do
+      subject { receiver.colour }
+
+      it { subject.must_be_instance_of(Vedeu::Colour) }
+    end
+
     describe '#colour=' do
       let(:colour) { Colour.new({ foreground: '#00ff00', background: '#000000' }) }
 
@@ -14,6 +51,12 @@ module Vedeu
       it { subject.must_be_instance_of(Colour) }
     end
 
+    describe '#style' do
+      subject { receiver.style }
+
+      it { subject.must_be_instance_of(Vedeu::Style) }
+    end
+
     describe '#style=' do
       let(:style) { Style.new('normal') }
 
@@ -26,7 +69,7 @@ module Vedeu
       let(:line) {
         Vedeu::Line.new({
           streams: [],
-          parent:  mock('Interface'),
+          parent:  Vedeu::Interface.new,
           colour:  Colour.new({ foreground: '#00ff00', background: '#000000' }),
           style:   Style.new('normal')
         })

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

@@ -56,6 +56,40 @@ 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 # Vedeu

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

@@ -83,7 +83,7 @@ module Vedeu
       end
 
       context 'when the storage is not empty' do
-        let(:storage) { [mock] }
+        let(:storage) { [:item] }
 
         it { subject.must_equal(false) }
       end

data/test/lib/vedeu/support/bounding_area_test.rb

@@ -47,9 +47,7 @@ module Vedeu
         it { described.top.must_equal(1) }
       end
 
-      context 'alias_method #y' do
-        it { described.y.must_equal(1) }
-      end
+      it { described.must_respond_to(:y) }
     end
 
     describe '#bottom' do
@@ -71,9 +69,7 @@ module Vedeu
         it { described.bottom.must_equal(15) }
       end
 
-      context 'alias_method #yn' do
-        it { described.yn.must_equal(15) }
-      end
+      it { described.must_respond_to(:yn) }
     end
 
     describe '#left' do
@@ -97,9 +93,7 @@ module Vedeu
         it { described.left.must_equal(1) }
       end
 
-      context 'alias_method #x' do
-        it { described.x.must_equal(1) }
-      end
+      it { described.must_respond_to(:x) }
     end
 
     describe '#right' do
@@ -121,9 +115,7 @@ module Vedeu
         it { described.right.must_equal(40) }
       end
 
-      context 'alias_method #xn' do
-        it { described.xn.must_equal(40) }
-      end
+      it { described.must_respond_to(:xn) }
     end
 
   end # BoundingArea

data/test/lib/vedeu/support/console_test.rb

@@ -77,17 +77,8 @@ module Vedeu
 
       it { subject.must_be_instance_of(Fixnum) }
 
-      context 'alias method #tyn' do
-        subject { instance.tyn }
-
-        it { subject.must_be_instance_of(Fixnum) }
-      end
-
-      context 'alias method #yn' do
-        subject { instance.yn }
-
-        it { subject.must_be_instance_of(Fixnum) }
-      end
+      it { instance.must_respond_to(:tyn) }
+      it { instance.must_respond_to(:yn) }
     end
 
     describe '#origin' do
@@ -96,29 +87,10 @@ module Vedeu
       it { subject.must_be_instance_of(Fixnum) }
       it { subject.must_equal(1) }
 
-      context 'alias method #x' do
-        subject { instance.x }
-
-        it { subject.must_be_instance_of(Fixnum) }
-      end
-
-      context 'alias method #y' do
-        subject { instance.y }
-
-        it { subject.must_be_instance_of(Fixnum) }
-      end
-
-      context 'alias method #tx' do
-        subject { instance.tx }
-
-        it { subject.must_be_instance_of(Fixnum) }
-      end
-
-      context 'alias method #ty' do
-        subject { instance.ty }
-
-        it { subject.must_be_instance_of(Fixnum) }
-      end
+      it { instance.must_respond_to(:x) }
+      it { instance.must_respond_to(:y) }
+      it { instance.must_respond_to(:tx) }
+      it { instance.must_respond_to(:ty) }
     end
 
     describe '#raw' do
@@ -135,11 +107,7 @@ module Vedeu
       it { subject.must_be_instance_of(Array) }
       it { subject.must_equal([24, 32]) }
 
-      context 'alias method #winsize' do
-        subject { instance.winsize }
-
-        it { subject.must_be_instance_of(Array) }
-      end
+      it { instance.must_respond_to(:winsize) }
     end
 
     describe '#width' do
@@ -147,17 +115,8 @@ module Vedeu
 
       it { subject.must_be_instance_of(Fixnum) }
 
-      context 'alias method #txn' do
-        subject { instance.txn }
-
-        it { subject.must_be_instance_of(Fixnum) }
-      end
-
-      context 'alias method #xn' do
-        subject { instance.xn }
-
-        it { subject.must_be_instance_of(Fixnum) }
-      end
+      it { instance.must_respond_to(:txn) }
+      it { instance.must_respond_to(:xn) }
     end
 
   end # Console

data/test/lib/vedeu/support/esc_test.rb

@@ -52,7 +52,7 @@ module Vedeu
       end
 
       it 'returns an escape sequence when the style is bg_reset' do
-        Esc.string('bg_reset').must_equal("\e[48;2;49m")
+        Esc.string('bg_reset').must_equal("\e[49m")
       end
 
       it 'returns an escape sequence when the style is blink' do
@@ -72,19 +72,19 @@ module Vedeu
       end
 
       it 'returns an escape sequence when the style is clear' do
-        Esc.string('clear').must_equal("\e[38;2;39m\e[48;2;49m\e[2J")
+        Esc.string('clear').must_equal("\e[39m\e[49m\e[2J")
       end
 
       it 'returns an escape sequence when the style is clear_line' do
-        Esc.string('clear_line').must_equal("\e[38;2;39m\e[48;2;49m\e[2K")
+        Esc.string('clear_line').must_equal("\e[39m\e[49m\e[2K")
       end
 
       it 'returns an escape sequence when the style is colour_reset' do
-        Esc.string('colour_reset').must_equal("\e[38;2;39m\e[48;2;49m")
+        Esc.string('colour_reset').must_equal("\e[39m\e[49m")
       end
 
       it 'returns an escape sequence when the style is fg_reset' do
-        Esc.string('fg_reset').must_equal("\e[38;2;39m")
+        Esc.string('fg_reset').must_equal("\e[39m")
       end
 
       it 'returns an escape sequence when the style is hide_cursor' do
@@ -92,11 +92,11 @@ module Vedeu
       end
 
       it 'returns an escape sequence when the style is screen_init' do
-        Esc.string('screen_init').must_equal("\e[0m\e[38;2;39m\e[48;2;49m\e[2J\e[?25l")
+        Esc.string('screen_init').must_equal("\e[0m\e[39m\e[49m\e[2J\e[?25l")
       end
 
       it 'returns an escape sequence when the style is screen_exit' do
-        Esc.string('screen_exit').must_equal("\e[?25h\e[38;2;39m\e[48;2;49m\e[0m")
+        Esc.string('screen_exit').must_equal("\e[?25h\e[39m\e[49m\e[0m")
       end
 
       it 'returns an escape sequence when the style is negative' do

data/test/lib/vedeu/support/position_test.rb

@@ -15,12 +15,54 @@ module Vedeu
       it { instance.instance_variable_get('@x').must_equal(x) }
     end
 
+    describe '.coerce' do
+      let(:value) {}
+
+      subject { described.coerce(value) }
+
+      context 'when the value is already a Position' do
+        let(:value) { instance }
+
+        it { subject.must_equal(instance) }
+      end
+
+      context 'when the value is an Array' do
+        let(:value) { [2, 8] }
+
+        it { subject.must_be_instance_of(described) }
+        it { subject.y.must_equal(2) }
+        it { subject.x.must_equal(8) }
+      end
+
+      context 'when the value is something unhandled' do
+        it { subject.must_be_instance_of(NilClass) }
+      end
+    end
+
     describe '#inspect' do
       subject { instance.inspect }
 
       it { subject.must_equal("<Vedeu::Position (y:12 x:19)>") }
     end
 
+    describe '#==' do
+      let(:other) {}
+
+      subject { instance == other }
+
+      context 'when they are equal' do
+        let(:other) { described.new(12, 19) }
+
+        it { subject.must_equal(true) }
+      end
+
+      context 'when they are not equal' do
+        let(:other) { described.new(2, 9) }
+
+        it { subject.must_equal(false) }
+      end
+    end
+
     describe '#to_s' do
       # subject { described.new.to_s }
 

data/test/lib/vedeu/support/terminal_test.rb

@@ -98,7 +98,7 @@ module Vedeu
       subject { Terminal.clear }
 
       it 'clears the screen' do
-        subject.must_equal(["\e[38;2;39m\e[48;2;49m\e[2J"])
+        subject.must_equal(["\e[39m\e[49m\e[2J"])
       end
     end
 
@@ -193,15 +193,8 @@ module Vedeu
         Terminal.origin.must_equal(1)
       end
 
-      context 'alias_methods' do
-        it 'returns 1' do
-          Terminal.x.must_equal(1)
-        end
-
-        it 'returns 1' do
-          Terminal.y.must_equal(1)
-        end
-      end
+      it { Terminal.must_respond_to(:x) }
+      it { Terminal.must_respond_to(:y) }
     end
 
     describe '.width' do
@@ -218,11 +211,7 @@ module Vedeu
         end
       end
 
-      context 'alias_methods' do
-        it 'returns the xn coordinate of the terminal' do
-          Terminal.xn.must_equal(80)
-        end
-      end
+      it { Terminal.must_respond_to(:xn) }
     end
 
     describe '.height' do
@@ -239,11 +228,7 @@ module Vedeu
         end
       end
 
-      context 'alias_methods' do
-        it 'returns the yn coordinate of the terminal' do
-          Terminal.yn.must_equal(25)
-        end
-      end
+      it { Terminal.must_respond_to(:yn) }
     end
 
     describe '.size' do