vedeu 0.7.0 → 0.7.1

data/test/lib/vedeu/cells/borders/bottom_right_test.rb

@@ -9,20 +9,6 @@ module Vedeu
       let(:described) { Vedeu::Cells::BottomRight }
       let(:instance)  { described.new }
 
-      describe '#position' do
-        let(:geometry) {
-          Vedeu::Geometries::Geometry.new(x: 5, xn: 15, y: 3, yn: 9)
-        }
-
-        subject { instance.position }
-
-        before { Vedeu.geometries.stubs(:by_name).returns(geometry) }
-
-        it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
-        it { subject.x.must_equal(15) }
-        it { subject.y.must_equal(9) }
-      end
-
       describe '#type' do
         subject { instance.type }
 

data/test/lib/vedeu/cells/borders/corner_test.rb

@@ -0,0 +1,57 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Cells
+
+    describe Corner do
+
+      let(:described)  { Vedeu::Cells::Corner }
+
+      describe '#position' do
+        let(:geometry) {
+          Vedeu::Geometries::Geometry.new(x: 5, xn: 15, y: 3, yn: 9)
+        }
+
+        before { instance.stubs(:geometry).returns(geometry) }
+
+        subject { instance.position }
+
+        context 'when providing the position for the bottom left corner' do
+          let(:instance) { Vedeu::Cells::BottomLeft.new }
+
+          it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
+          it { subject.x.must_equal(5) }
+          it { subject.y.must_equal(9) }
+        end
+
+        context 'when providing the position for the bottom right corner' do
+          let(:instance) { Vedeu::Cells::BottomRight.new }
+
+          it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
+          it { subject.x.must_equal(15) }
+          it { subject.y.must_equal(9) }
+        end
+
+        context 'when providing the position for the top left corner' do
+          let(:instance) { Vedeu::Cells::TopLeft.new }
+
+          it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
+          it { subject.x.must_equal(5) }
+          it { subject.y.must_equal(3) }
+        end
+
+        context 'when providing the position for the top right corner' do
+          let(:instance) { Vedeu::Cells::TopRight.new }
+
+          it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
+          it { subject.x.must_equal(15) }
+          it { subject.y.must_equal(3) }
+        end
+      end
+
+    end # Corner
+
+  end # Cells
+
+end # Vedeu

data/test/lib/vedeu/cells/borders/top_left_test.rb

@@ -9,20 +9,6 @@ module Vedeu
       let(:described) { Vedeu::Cells::TopLeft }
       let(:instance)  { described.new }
 
-      describe '#position' do
-        let(:geometry) {
-          Vedeu::Geometries::Geometry.new(x: 5, xn: 15, y: 3, yn: 9)
-        }
-
-        subject { instance.position }
-
-        before { Vedeu.geometries.stubs(:by_name).returns(geometry) }
-
-        it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
-        it { subject.x.must_equal(5) }
-        it { subject.y.must_equal(3) }
-      end
-
       describe '#type' do
         subject { instance.type }
 

data/test/lib/vedeu/cells/borders/top_right_test.rb

@@ -9,20 +9,6 @@ module Vedeu
       let(:described) { Vedeu::Cells::TopRight }
       let(:instance)  { described.new }
 
-      describe '#position' do
-        let(:geometry) {
-          Vedeu::Geometries::Geometry.new(x: 5, xn: 15, y: 3, yn: 9)
-        }
-
-        subject { instance.position }
-
-        before { Vedeu.geometries.stubs(:by_name).returns(geometry) }
-
-        it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
-        it { subject.x.must_equal(15) }
-        it { subject.y.must_equal(3) }
-      end
-
       describe '#type' do
         subject { instance.type }
 

data/test/lib/vedeu/cells/empty_test.rb

@@ -48,6 +48,39 @@ module Vedeu
         end
       end
 
+      describe '#to_hash' do
+        let(:position) { [1, 1] }
+        let(:colour)   { Vedeu::Colours::Colour.new(background: '#000000') }
+        let(:expected) {
+          {
+            colour:   "\e[48;2;0;0;0m",
+            style:    '',
+            value:    '',
+            position: "\e[1;1H",
+          }
+        }
+
+        subject { instance.to_hash }
+
+        it { subject.must_be_instance_of(Hash) }
+        it { subject.must_equal(expected) }
+      end
+
+      describe '#to_html' do
+        subject { instance.to_html }
+
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal('') }
+      end
+
+      describe '#to_s' do
+        subject { instance.to_s }
+
+        it { instance.must_respond_to(:to_str) }
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal('') }
+      end
+
     end # Empty
 
   end # Cells

data/test/lib/vedeu/cells/escape_test.rb

@@ -6,6 +6,80 @@ module Vedeu
 
     describe Escape do
 
+      let(:described)  { Vedeu::Cells::Escape }
+      let(:instance)   { described.new(attributes) }
+      let(:attributes) {
+        {
+          position: position,
+          value:    _value,
+        }
+      }
+      let(:position)   { [2, 6] }
+      let(:_value)     { "\e[?25h" }
+
+      describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@position').must_equal(position) }
+        it { instance.instance_variable_get('@value').must_equal(_value) }
+      end
+
+      describe '#cell?' do
+        it { instance.cell?.must_equal(false) }
+      end
+
+      describe '#null' do
+        it { instance.null.must_equal(nil) }
+        it { instance.background.must_equal(nil) }
+        it { instance.colour.must_equal(nil) }
+        it { instance.foreground.must_equal(nil) }
+        it { instance.style.must_equal(nil) }
+      end
+
+      # describe '#eql?' do
+      #   let(:other) { instance }
+
+      #   subject { instance.eql?(other) }
+
+      #   it { subject.must_equal(true) }
+
+      #   context 'when different to other' do
+      #     let(:other) { described.new(value: 'b') }
+
+      #     it { subject.must_equal(false) }
+      #   end
+
+      #   it { instance.must_respond_to(:==) }
+      # end
+
+      describe '#value' do
+        subject { instance.value }
+
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal("\e[?25h") }
+      end
+
+      describe '#to_hash' do
+        subject { instance.to_hash }
+
+        it { subject.must_be_instance_of(Hash) }
+        it { subject.must_equal({}) }
+      end
+
+      describe '#to_html' do
+        subject { instance.to_html }
+
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal('') }
+      end
+
+      describe '#to_s' do
+        subject { instance.to_s }
+
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal("\e[2;6H\e[?25h") }
+        it { instance.must_respond_to(:to_str) }
+      end
+
     end # Escape
 
   end # Cells

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

@@ -102,19 +102,22 @@ module Vedeu
       end
 
       describe '#hide' do
-        let(:visible)     { true }
-        let(:hide_cursor) {
-          Vedeu::Models::Escape
-            .new(value: Vedeu::EscapeSequences::Esc.hide_cursor)
+        let(:visible) { true }
+        let(:escape)  {
+          Vedeu::Cells::Escape.
+            new(value: Vedeu::EscapeSequences::Esc.hide_cursor)
         }
 
         before do
-          Vedeu.stubs(:render_output).with(hide_cursor).returns(hide_cursor)
+          Vedeu::Cells::Escape.stubs(:new).returns(escape)
         end
 
         subject { instance.hide }
 
-        it { subject.must_be_instance_of(Vedeu::Models::Escape) }
+        it {
+          Vedeu.expects(:render_output).with(escape)
+          subject
+        }
       end
 
       describe '#inspect' do
@@ -241,18 +244,21 @@ module Vedeu
 
       describe '#show' do
         let(:visible) { false }
-        let(:show_cursor) {
-          Vedeu::Models::Escape
-            .new(value: Vedeu::EscapeSequences::Esc.show_cursor)
+        let(:escape)  {
+          Vedeu::Cells::Escape.
+            new(value: Vedeu::EscapeSequences::Esc.show_cursor)
         }
 
         before do
-          Vedeu.stubs(:render_output).with(show_cursor).returns(show_cursor)
+          Vedeu::Cells::Escape.stubs(:new).returns(escape)
         end
 
         subject { instance.show }
 
-        it { subject.must_be_instance_of(Vedeu::Models::Escape) }
+        it {
+          Vedeu.expects(:render_output).with(escape)
+          subject
+        }
       end
 
       describe '#to_a' do

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

@@ -13,6 +13,7 @@ module Vedeu
           {
             anchor: anchor,
             model:  model,
+            name:   model.name,
             client: nil,
           }
         }

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

@@ -11,7 +11,7 @@ module Vedeu
       let(:cells)     {
         [
           Vedeu::Views::Char.new(value: 'A'),
-          Vedeu::Models::Cell.new(value: 'B'),
+          Vedeu::Cells::Empty.new(value: 'B'),
           Vedeu::Views::Char.new(value: 'C'),
         ]
       }

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

@@ -91,7 +91,7 @@ module Vedeu
             let(:output) {
               Vedeu::Models::Page.coerce([
                 Vedeu::Views::Char.new(name: _name, value: 'N', position: [1, 1]),
-                Vedeu::Models::Escape.new(value: "\e[?25l"),
+                Vedeu::Cells::Escape.new(value: "\e[?25l"),
                 Vedeu::Views::Char.new(name: _name, value: 't', position: [1, 3]),
               ])
             }
@@ -164,7 +164,7 @@ module Vedeu
             let(:output) {
               Vedeu::Models::Page.coerce([
                 Vedeu::Views::Char.new(name: _name, value: 'N'),
-                Vedeu::Models::Escape.new(value: "\e[?25l"),
+                Vedeu::Cells::Escape.new(value: "\e[?25l"),
                 Vedeu::Views::Char.new(name: _name, value: 't'),
               ])
             }

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

@@ -42,7 +42,7 @@ module Vedeu
 
         context 'when the output is not empty' do
           let(:output) {
-            Vedeu::Models::Escape.new(value: "\e[?25h", position: [1, 1])
+            Vedeu::Cells::Escape.new(value: "\e[?25h", position: [1, 1])
           }
 
           it do
@@ -62,7 +62,7 @@ module Vedeu
         context 'when the output is not empty' do
           context 'and the output is an escape sequence' do
             let(:output) {
-              Vedeu::Models::Escape.new(value: "\e[?25h", position: [1, 1])
+              Vedeu::Cells::Escape.new(value: "\e[?25h", position: [1, 1])
             }
 
             it do

data/test/lib/vedeu/renderers/all_test.rb

@@ -78,7 +78,7 @@ module Vedeu
 
         context 'when there is content' do
           let(:output) {
-            Vedeu::Models::Escape
+            Vedeu::Cells::Escape
               .new(value: Vedeu::EscapeSequences::Esc.hide_cursor)
           }
 
@@ -93,7 +93,7 @@ module Vedeu
             subject
           end
 
-          it { subject.must_be_instance_of(Vedeu::Models::Escape) }
+          it { subject.must_be_instance_of(Vedeu::Cells::Escape) }
         end
 
         context 'when there is no content' do

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

@@ -13,17 +13,17 @@ module Vedeu
       let(:output)    {
         Vedeu::Models::Page.coerce([
           [
-            Vedeu::Models::Cell.new(position: [1, 1]),
+            Vedeu::Cells::Empty.new(position: [1, 1]),
             Vedeu::Views::Char.new(name: _name, value: 'a', position: [1, 2]),
-            Vedeu::Models::Cell.new(position: [1, 3]),
+            Vedeu::Cells::Empty.new(position: [1, 3]),
           ], [
-            Vedeu::Models::Cell.new(position: [2, 1]),
+            Vedeu::Cells::Empty.new(position: [2, 1]),
             Vedeu::Views::Char.new(name: _name, value: 'b', position: [2, 2]),
-            Vedeu::Models::Cell.new(position: [2, 3]),
+            Vedeu::Cells::Empty.new(position: [2, 3]),
           ], [
-            Vedeu::Models::Cell.new(position: [3, 1]),
+            Vedeu::Cells::Empty.new(position: [3, 1]),
             Vedeu::Views::Char.new(name: _name, value: 'c', position: [3, 2]),
-            Vedeu::Models::Cell.new(position: [3, 3]),
+            Vedeu::Cells::Empty.new(position: [3, 3]),
           ],
         ])
       }

data/test/support/examples/material_colours_app.rb

@@ -329,10 +329,10 @@ class VedeuMaterialColoursApp
 
   Vedeu.renders do
     view 'main_interface' do
-      line { centre 'Red',         width: 20, background: '#f44336' }
-      line { centre 'Pink',        width: 20, background: '#e91e63' }
-      line { centre 'Purple',      width: 20, background: '#9c27b0' }
-      line { centre 'Deep Purple', width: 20, background: '#673ab7' }
+      line { left   'Left',        background: '#f44336' }
+      line { centre 'Centre',      background: '#e91e63' }
+      line { center 'Center',      background: '#9c27b0' }
+      line { right  'Right',       background: '#673ab7' }
       line { centre 'Indigo',      width: 20, background: '#3f51b5' }
       line { centre 'Blue',        width: 20, background: '#2196f3' }
       line { centre 'Light Blue',  width: 20, background: '#03a9f4' }
@@ -516,10 +516,10 @@ class VedeuMaterialColoursApp
     view('custom_corners') do
       border do
         foreground   '#000000'
-        top_right    'B'
-        top_left     'A'
-        bottom_right 'D'
-        bottom_left  'C'
+        top_left     'A', colour: { background: '#ff5722' }
+        top_right    'B', colour: { background: '#0000ff', foreground: '#ffffff' }
+        bottom_left  'C', colour: { background: '#ffff00', foreground: '#000000' }
+        bottom_right 'D', colour: { background: '#ffffff' }
       end
       lines do
         line 'custom'
@@ -529,8 +529,11 @@ class VedeuMaterialColoursApp
     view('custom_sides') do
       border do
         background '#ff5722'
-        horizontal '*'
-        vertical   '$'
+
+        top_horizontal    '*', colour: { background: '#000000', foreground: '#ffffff' }
+        left_vertical     '$', colour: { background: '#0000ff', foreground: '#ffffff' }
+        right_vertical    '%', colour: { background: '#ffff00', foreground: '#000000' }
+        bottom_horizontal '&', colour: { background: '#ffffff' }
       end
       lines do
         line 'custom'