vedeu 0.5.5 → 0.5.6

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

@@ -40,14 +40,6 @@ module Vedeu
       it { instance.must_respond_to(:==) }
     end
 
-    describe '#inspect' do
-      it { instance.inspect.must_equal(
-        "<Vedeu::Escape '" \
-        "\\e[2;6H\\e[?25h"       \
-        "'>"
-      ) }
-    end
-
     describe '#position' do
       it { instance.position.must_be_instance_of(Vedeu::Position) }
     end

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

@@ -76,18 +76,6 @@ module Vedeu
       }
     end
 
-    describe '#inspect' do
-      subject { instance.inspect }
-
-      it { subject.must_be_instance_of(String) }
-
-      it { subject.must_equal(
-        "<Vedeu::Interface name: 'hydrogen', group: '', visible: 'true', " \
-        "zindex: '1'>"
-        )
-      }
-    end
-
     describe '#show' do
       let(:buffer) { Vedeu::Buffer.new }
 

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

@@ -22,10 +22,10 @@ module Vedeu
       let(:parent)            { Vedeu::Views::Line.new(parent_attributes) }
       let(:parent_attributes) {
         {
-          streams: [],
-          parent:  nil,
-          colour:  parent_colour,
-          style:   parent_style,
+          value:  [],
+          parent: nil,
+          colour: parent_colour,
+          style:  parent_style,
         }
       }
       let(:border)        { nil }
@@ -73,25 +73,6 @@ module Vedeu
         end
       end
 
-      describe '#inspect' do
-        let(:colour)   { Vedeu::Colour.new(foreground: '#00ff00',
-                                           background: '#005500') }
-        let(:position) { Vedeu::Position[17, 2] }
-        let(:style)    { Vedeu::Style.new('underline') }
-
-
-        subject { instance.inspect }
-
-        it { subject.must_equal(
-          "<Vedeu::Views::Char '" \
-          "\\e[17;2H" \
-          "\\e[38;2;0;255;0m" \
-          "\\e[48;2;0;85;0m" \
-          "\\e[4ma" \
-          "'>"
-        ) }
-      end
-
       describe '#position' do
         subject { instance.position }
       end

data/test/lib/vedeu/models/views/collections/view_collection_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Views
+
+  	describe ViewCollection do
+
+      let(:described) { Vedeu::Views::ViewCollection }
+      let(:instance)  { described.new }
+
+      it { described.superclass.must_equal(Vedeu::Collection) }
+
+      describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
+      end
+
+  	end # ViewCollection
+
+  end # Views
+
+end # Vedeu

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

@@ -10,14 +10,18 @@ module Vedeu
       let(:instance)   { described.new(attributes) }
       let(:attributes) {
         {
-          views: views,
-          colour:     colour,
-          style:      style,
+          client: client,
+          colour: colour,
+          parent: parent,
+          style:  style,
+          value:  _value,
         }
       }
-      let(:views) { [] }
-      let(:colour)     {}
-      let(:style)      {}
+      let(:client) {}
+      let(:colour) {}
+      let(:parent) {}
+      let(:style)  {}
+      let(:_value) {}
 
       describe '.build' do
         subject {
@@ -31,7 +35,18 @@ module Vedeu
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@views').must_equal(views) }
+        it { instance.instance_variable_get('@client').must_equal(client) }
+        it { instance.instance_variable_get('@colour').must_equal(colour) }
+        it { instance.instance_variable_get('@parent').must_equal(parent) }
+        it { instance.instance_variable_get('@style').must_equal(style) }
+        it { instance.instance_variable_get('@value').must_equal(_value) }
+      end
+
+      describe 'accessors' do
+        it { instance.must_respond_to(:attributes) }
+        it { instance.must_respond_to(:parent) }
+        it { instance.must_respond_to(:value) }
+        it { instance.must_respond_to(:views) }
       end
 
       describe '#add' do
@@ -39,20 +54,11 @@ module Vedeu
 
         subject { instance.add(child) }
 
-        it { subject.must_be_instance_of(Vedeu::Views::ViewCollection) }
-      end
-
-      describe '#views' do
-        subject { instance.views }
+        it { instance.must_respond_to(:<<) }
 
         it { subject.must_be_instance_of(Vedeu::Views::ViewCollection) }
       end
 
-      describe '#parent' do
-        subject { instance.parent }
-
-        it { subject.must_be_instance_of(NilClass) }
-      end
 
     end # Composition
 

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

@@ -10,13 +10,13 @@ module Vedeu
       let(:instance)   { described.new(attributes) }
       let(:attributes) {
         {
-          streams: streams,
-          parent:  parent,
-          colour:  colour,
-          style:   style,
+          value:  _value,
+          parent: parent,
+          colour: colour,
+          style:  style,
         }
       }
-      let(:streams)   {
+      let(:_value)   {
         [
           Vedeu::Views::Stream.new(value: 'Something interesting ',
                                    parent: streams_parent,
@@ -34,10 +34,10 @@ module Vedeu
       }
 
       let(:streams_parent) {
-        Vedeu::Views::Line.new(streams: nil,
-                               parent:  parent,
-                               colour:  colour,
-                               style:   style)
+        Vedeu::Views::Line.new(value:  nil,
+                               parent: parent,
+                               colour: colour,
+                               style:  style)
       }
 
       let(:parent) { Vedeu::Views::View.new(name: 'Vedeu::Line') }
@@ -48,21 +48,20 @@ module Vedeu
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@streams').must_equal(streams) }
+        it { instance.instance_variable_get('@value').must_equal(_value) }
         it { instance.instance_variable_get('@parent').must_equal(parent) }
       end
 
       describe 'accessors' do
+        it { instance.must_respond_to(:attributes) }
         it { instance.must_respond_to(:parent) }
         it { instance.must_respond_to(:parent=) }
-        it { instance.must_respond_to(:attributes) }
       end
 
       describe '#add' do
         subject { instance.add(child) }
 
         it { instance.must_respond_to(:add) }
-
         it { instance.must_respond_to(:<<) }
       end
 
@@ -72,7 +71,7 @@ module Vedeu
         it { subject.must_be_instance_of(Array) }
 
         context 'when there is no content' do
-          let(:streams) { [] }
+          let(:_value) { [] }
 
           it { subject.must_equal([]) }
         end
@@ -82,20 +81,6 @@ module Vedeu
         end
       end
 
-      describe '#empty?' do
-        subject { instance.empty? }
-
-        context 'when there is no content' do
-          let(:streams) { [] }
-
-          it { subject.must_be_instance_of(TrueClass) }
-        end
-
-        context 'when there is content' do
-          it { subject.must_be_instance_of(FalseClass) }
-        end
-      end
-
       describe '#eql?' do
         let(:other) { instance }
 
@@ -104,26 +89,12 @@ module Vedeu
         it { subject.must_equal(true) }
 
         context 'when different to other' do
-          let(:other) { described.new(streams: [:other]) }
+          let(:other) { described.new(value: [:other]) }
 
           it { subject.must_equal(false) }
         end
       end
 
-      describe '#name' do
-        subject { instance.name }
-
-        context 'when a parent is defined' do
-          it { subject.must_be_instance_of(String) }
-        end
-
-        context 'when a parent is not defined' do
-          before { instance.stubs(:parent) }
-
-          it { subject.must_be_instance_of(NilClass) }
-        end
-      end
-
       describe '#size' do
         subject { instance.size }
 

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

@@ -18,10 +18,10 @@ module Vedeu
       }
       let(:_value)  { 'Some text' }
       let(:parent) {
-        Vedeu::Views::Line.new(streams: [],
-                               parent:  line_parent,
-                               colour:  parent_colour,
-                               style:   style)
+        Vedeu::Views::Line.new(value:  [],
+                               parent: line_parent,
+                               colour: parent_colour,
+                               style:  style)
       }
       let(:parent_colour) {
         Vedeu::Colour.new(background: '#0000ff', foreground: '#ffff00')
@@ -43,7 +43,6 @@ module Vedeu
         it { instance.must_respond_to(:parent=) }
         it { instance.must_respond_to(:value) }
         it { instance.must_respond_to(:content) }
-        it { instance.must_respond_to(:data) }
         it { instance.must_respond_to(:text) }
         it { instance.must_respond_to(:value=) }
         it { instance.must_respond_to(:attributes) }
@@ -77,20 +76,6 @@ module Vedeu
         end
       end
 
-      describe '#empty?' do
-        subject { instance.empty? }
-
-        context 'when there is no content' do
-          let(:_value) { '' }
-
-          it { subject.must_equal(true) }
-        end
-
-        context 'when there is content' do
-          it { subject.must_equal(false) }
-        end
-      end
-
       describe '#eql?' do
         let(:other) { described.new(attributes) }
 
@@ -107,20 +92,6 @@ module Vedeu
         end
       end
 
-      describe '#name' do
-        subject { instance.name }
-
-        context 'when a parent is defined' do
-          it { subject.must_be_instance_of(String) }
-        end
-
-        context 'when a parent is not defined' do
-          before { instance.stubs(:parent) }
-
-          it { subject.must_be_instance_of(NilClass) }
-        end
-      end
-
       describe '#size' do
         subject { instance.size }
 

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

@@ -47,9 +47,13 @@ module Vedeu
           }
 
           it { subject.must_equal(
-            "<td style='background:#220022;color:#aadd00;"           \
-            "border:1px #220022 solid;border-top:1px #aadd00 solid;" \
-            "border-left:1px #aadd00 solid;'>&nbsp;</td>"
+            "<td style='" \
+            "border:1px #220022 solid;" \
+            "background:#220022;" \
+            "color:#aadd00;"      \
+            "border-top:1px #aadd00 solid;" \
+            "border-left:1px #aadd00 solid;" \
+            "'>&nbsp;</td>"
           ) }
         end
 
@@ -60,46 +64,22 @@ module Vedeu
             }
 
             it { subject.must_equal(
-              "<td style='background:#002222;color:#dd2200;"           \
-              "border:1px #002222 solid;border-top:1px #dd2200 solid;" \
-              "border-left:1px #dd2200 solid;'>&nbsp;</td>"
+              "<td style='" \
+              "border:1px #002222 solid;" \
+              "background:#002222;" \
+              "color:#dd2200;"      \
+              "border-top:1px #dd2200 solid;" \
+              "border-left:1px #dd2200 solid;" \
+              "'>&nbsp;</td>"
             ) }
           end
 
           context 'when there is no parent colour' do
-            it { subject.must_equal(
-              "<td style='background:#000;color:#222;border:1px #000 solid;" \
-              "border-top:1px #222 solid;border-left:1px #222 solid;'>"      \
-              "&nbsp;</td>"
-            ) }
+            it { subject.must_equal("<td style=''>&nbsp;</td>") }
           end
         end
       end
 
-      grey = '1px #222 solid'
-      {
-        top_horizontal:    "border-top:#{grey};",
-        left_vertical:     "border-left:#{grey};",
-        right_vertical:    "border-right:#{grey};",
-        bottom_horizontal: "border-bottom:#{grey};",
-        top_left:     "border-top:#{grey};border-left:#{grey};",
-        top_right:    "border-top:#{grey};border-right:#{grey};",
-        bottom_left:  "border-bottom:#{grey};border-left:#{grey};",
-        bottom_right: "border-bottom:#{grey};border-right:#{grey};",
-        horizontal:        '',
-        vertical:          ''
-      }.each do |border_style, result|
-        context "when there is a border (#{border_style.inspect})" do
-          let(:border) { border_style }
-
-          it { subject.must_equal(
-            "<td style='background:#000;color:#222;border:1px #000 solid;" +
-            result +
-            "'>&nbsp;</td>"
-          ) }
-        end
-      end
-
       context 'when there is no border' do
         context 'when there is no value' do
           it { subject.must_equal('<td>&nbsp;</td>') }
@@ -114,10 +94,7 @@ module Vedeu
         context 'when there is a value' do
           let(:_value) { 'a' }
 
-          it { subject.must_equal(
-            "<td style='background:#000;color:#222;" \
-            "border:1px #000 solid;'>a</td>"
-          ) }
+          it { subject.must_equal("<td style=''>a</td>") }
         end
       end
     end

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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Vedeu
 
-  class ParentPresentationTestClass
+  class ParentPresentationColourTestClass
     include Vedeu::Presentation
 
     def parent
@@ -12,22 +12,20 @@ module Vedeu
     def attributes
       {
         colour: { background: '#330000', foreground: '#00aadd' },
-        style:  ['bold']
       }
     end
   end
 
-  class PresentationTestClass
+  class PresentationColourTestClass
+
     include Vedeu::Presentation
 
     attr_reader :attributes
+    attr_reader :parent
 
     def initialize(attributes = {})
       @attributes = attributes
-    end
-
-    def parent
-      Vedeu::ParentPresentationTestClass.new
+      @parent     = @attributes[:parent]
     end
 
   end # PresentationTestClass
@@ -36,28 +34,44 @@ module Vedeu
 
     describe Colour do
 
-      let(:includer) { Vedeu::PresentationTestClass.new(attributes) }
+      let(:includer) { Vedeu::PresentationColourTestClass.new(attributes) }
       let(:attributes) {
         {
-          colour: { background: background, foreground: foreground },
-          style:  ['bold']
+          colour: colour,
+          parent: parent
+        }
+      }
+      let(:colour)     {
+        {
+          background: background,
+          foreground: foreground
         }
       }
       let(:background) { '#000033' }
       let(:foreground) { '#aadd00' }
+      let(:parent)     { Vedeu::ParentPresentationColourTestClass.new }
 
       describe '#background' do
         subject { includer.background }
 
         it { subject.must_be_instance_of(Vedeu::Background) }
-        it { subject.colour.must_equal('#000033') }
 
-        context 'no background value' do
-          let(:attributes) { {} }
-          let(:background) {}
+        context 'when a colour is not set' do
+          let(:colour) {}
+
+          context 'when a parent is not available' do
+            let(:parent) {}
+
+            it { subject.colour.must_equal('') }
+          end
 
-          it { subject.must_be_instance_of(Vedeu::Background) }
-          it { subject.colour.must_equal('#330000') }
+          context 'when a parent is available' do
+            it { subject.colour.must_equal('#330000') }
+          end
+        end
+
+        context 'when a colour is set' do
+          it { subject.colour.must_equal('#000033') }
         end
       end
 
@@ -79,12 +93,22 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Foreground) }
         it { subject.colour.must_equal('#aadd00') }
 
-        context 'no foreground value' do
-          let(:attributes) { {} }
-          let(:foreground) {}
+        context 'when a colour is not set' do
+          let(:colour) {}
+
+          context 'when a parent is not available' do
+            let(:parent) {}
 
-          it { subject.must_be_instance_of(Vedeu::Foreground) }
-          it { subject.colour.must_equal('#00aadd') }
+            it { subject.colour.must_equal('') }
+          end
+
+          context 'when a parent is available' do
+            it { subject.colour.must_equal('#00aadd') }
+          end
+        end
+
+        context 'when a colour is set' do
+          it { subject.colour.must_equal('#aadd00') }
         end
       end
 
@@ -100,60 +124,39 @@ module Vedeu
         it { subject.must_equal('#123456') }
       end
 
-      describe '#parent_background' do
-        subject { includer.parent_background }
-
-        it { subject.must_be_instance_of(Vedeu::Background) }
-        it { subject.colour.must_equal('#330000') }
-
-        context 'when no parent colour is set' do
-          before { includer.stubs(:parent).returns(nil) }
+      describe '#colour' do
+        subject { includer.colour }
 
-          it { subject.colour.must_equal('') }
-        end
-      end
+        it { subject.must_be_instance_of(Vedeu::Colour) }
 
-      describe '#parent_colour' do
-        subject { includer.parent_colour }
+        context 'when a colour is not set' do
+          let(:colour) {}
 
-        context 'when a parent is available' do
-          it { subject.must_be_instance_of(Vedeu::Colour) }
-          it { subject.background.must_be_instance_of(Vedeu::Background) }
-          it { subject.foreground.must_be_instance_of(Vedeu::Foreground) }
-        end
+          context 'when a parent is not available' do
+            let(:parent) {}
 
-        context 'when a parent is not available' do
-          before { includer.stubs(:parent).returns(nil) }
+            it { subject.background.colour.must_equal('') }
+            it { subject.foreground.colour.must_equal('') }
+          end
 
-          it { subject.must_equal(nil) }
+          context 'when a parent is available' do
+            it { subject.background.colour.must_equal('#330000') }
+            it { subject.foreground.colour.must_equal('#00aadd') }
+          end
         end
-      end
 
-      describe '#parent_foreground' do
-        subject { includer.parent_foreground }
-
-        it { subject.must_be_instance_of(Vedeu::Foreground) }
-        it { subject.colour.must_equal('#00aadd') }
-
-        context 'when no parent colour is set' do
-          before { includer.stubs(:parent).returns(nil) }
-
-          it { subject.colour.must_equal('') }
+        context 'when a colour is set' do
+          it { subject.background.colour.must_equal('#000033') }
+          it { subject.foreground.colour.must_equal('#aadd00') }
         end
       end
 
-      describe '#colour' do
-        subject { includer.colour }
-
-        it { subject.must_be_instance_of(Vedeu::Colour) }
-      end
-
       describe '#colour=' do
         let(:colour) {
           Vedeu::Colour.new(foreground: '#00ff00', background: '#000000')
         }
 
-        subject { includer.colour = (colour) }
+        subject { includer.colour=(colour) }
 
         it { subject.must_be_instance_of(Vedeu::Colour) }
       end