vedeu 0.4.13 → 0.4.14

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

@@ -43,6 +43,12 @@ module Vedeu
       it { instance.must_respond_to(:value) }
     end
 
+    describe '#chars' do
+      subject { instance.chars }
+
+      it { subject.must_be_instance_of(Array) }
+    end
+
     describe '#eql?' do
       let(:other) { instance }
 
@@ -51,15 +57,15 @@ module Vedeu
       it { subject.must_equal(true) }
 
       context 'when different to other' do
-        let(:other) { described.new({ value: 'b' }) }
+        let(:other) { described.new(value: 'b') }
 
         it { subject.must_equal(false) }
       end
     end
 
     describe '#inspect' do
-      let(:colour)   { Vedeu::Colour.new({ foreground: '#00ff00',
-                                           background: '#005500' }) }
+      let(:colour)   { Vedeu::Colour.new(foreground: '#00ff00',
+                                         background: '#005500') }
       let(:position) { Vedeu::Position.new(17, 2) }
       let(:style)    { Vedeu::Style.new('underline') }
 
@@ -67,7 +73,13 @@ module Vedeu
       subject { instance.inspect }
 
       it { subject.must_equal(
-        "<Vedeu::Char '\\e[17;2H\\e[38;2;0;255;0m\\e[48;2;0;85;0m\\e[4ma\\e[17;2H'>"
+        "<Vedeu::Char '"    \
+        "\\e[17;2H"         \
+        "\\e[38;2;0;255;0m" \
+        "\\e[48;2;0;85;0m"  \
+        "\\e[4ma"           \
+        "\\e[17;2H"         \
+        "'>"
       ) }
     end
 
@@ -76,18 +88,24 @@ module Vedeu
 
       it { subject.must_be_instance_of(Hash) }
 
-      it { subject.must_equal({ parent:     {
-                                  background: '',
-                                  foreground: '',
-                                  style:      '',
-                                },
-                                background: '',
-                                border:     '',
-                                foreground: '',
-                                style:      '',
-                                value:      value,
-                                x:          nil,
-                                y:          nil }) }
+      it { subject.must_equal(
+                  border: '',
+                  colour: {
+            background: '',
+            foreground: '',
+          },
+                  parent: {
+            background: '',
+            foreground: '',
+            style: '',
+          },
+                  position: {
+            y: nil,
+            x: nil
+          },
+                  style: '',
+                  value: 'a',
+      ) }
     end
 
     describe '#to_html' do
@@ -96,6 +114,12 @@ module Vedeu
       it { subject.must_be_instance_of(String) }
     end
 
+    describe '#to_json' do
+      subject { instance.to_json }
+
+      it { subject.must_be_instance_of(String) }
+    end
+
     describe '#to_s' do
       subject { instance.to_s }
 
@@ -110,21 +134,21 @@ module Vedeu
       context 'when a position is not specified' do
         let(:position) {}
 
-        it { subject.must_equal("a") }
+        it { subject.must_equal('a') }
       end
 
       context 'when a colour is specified' do
-        let(:colour) { Vedeu::Colour.new({ foreground: '#00ff00',
-                                           background: '#005500' }) }
+        let(:colour) { Vedeu::Colour.new(foreground: '#00ff00',
+                                         background: '#005500') }
 
-        context 'when a parent colour is specified' do
-          let(:parent_colour) { Vedeu::Colour.new({ foreground: '#ff0000',
-                                                    background: '#550000' }) }
+        context 'and a parent colour is specified' do
+          let(:parent_colour) { Vedeu::Colour.new(foreground: '#ff0000',
+                                                  background: '#550000') }
 
-          it { subject.must_equal("\e[38;2;0;255;0m\e[48;2;0;85;0ma\e[38;2;255;0;0m\e[48;2;85;0;0m") }
+          it { subject.must_equal("\e[38;2;0;255;0m\e[48;2;0;85;0ma") }
         end
 
-        context 'when a parent colour is not specified' do
+        context 'and a parent colour is not specified' do
           let(:parent_colour) {}
 
           it { subject.must_equal("\e[38;2;0;255;0m\e[48;2;0;85;0ma") }
@@ -134,7 +158,7 @@ module Vedeu
       context 'when a colour is not specified' do
         let(:colour) {}
 
-        it { subject.must_equal("a") }
+        it { subject.must_equal('a') }
       end
 
       context 'when a style is specified' do
@@ -143,7 +167,7 @@ module Vedeu
         context 'when a parent style is specified' do
           let(:parent_style) { Vedeu::Style.new('bold') }
 
-          it { subject.must_equal("\e[4ma\e[1m") }
+          it { subject.must_equal("\e[4ma") }
         end
 
         context 'when a parent style is not specified' do
@@ -156,13 +180,13 @@ module Vedeu
       context 'when a style is not specified' do
         let(:style) {}
 
-        it { subject.must_equal("a") }
+        it { subject.must_equal('a') }
       end
 
       context 'when the value is nil' do
         let(:value) {}
 
-        it { subject.must_equal("") }
+        it { subject.must_equal('') }
       end
     end
 

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

@@ -28,10 +28,32 @@ module Vedeu
     end
 
     describe '#initialize' do
-      it { instance.must_be_instance_of(described) }
-      it { instance.instance_variable_get('@interfaces').must_equal(interfaces) }
-      it { instance.instance_variable_get('@colour').must_equal(colour) }
-      it { instance.instance_variable_get('@style').must_equal(style) }
+      subject { instance }
+
+      it { subject.must_be_instance_of(described) }
+      it { subject.instance_variable_get('@interfaces').must_equal(interfaces) }
+      it { subject.instance_variable_get('@colour').must_equal(colour) }
+      it { subject.instance_variable_get('@style').must_equal(style) }
+    end
+
+    describe '#add' do
+      let(:child) { Vedeu::Interface.new }
+
+      subject { instance.add(child) }
+
+      it { subject.must_be_instance_of(Vedeu::Interfaces) }
+    end
+
+    describe '#interfaces' do
+      subject { instance.interfaces }
+
+      it { subject.must_be_instance_of(Vedeu::Interfaces) }
+    end
+
+    describe '#parent' do
+      subject { instance.parent }
+
+      it { subject.must_be_instance_of(NilClass) }
     end
 
   end # Composition

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

@@ -16,11 +16,17 @@ module Vedeu
     let(:members)    { ['carbon', 'nitrogen', 'oxygen'] }
 
     describe '#initialize' do
-      it { instance.must_be_instance_of(Group) }
-      it { instance.instance_variable_get('@attributes').must_be_instance_of(Hash) }
-      it { instance.instance_variable_get('@members').must_equal(members) }
-      it { instance.instance_variable_get('@name').must_equal(_name) }
-      it { instance.instance_variable_get('@repository').must_equal(Vedeu.groups) }
+      subject { instance }
+
+      it { subject.must_be_instance_of(Group) }
+      it {
+        subject.instance_variable_get('@attributes').must_be_instance_of(Hash)
+      }
+      it { subject.instance_variable_get('@members').must_equal(members) }
+      it { subject.instance_variable_get('@name').must_equal(_name) }
+      it {
+        subject.instance_variable_get('@repository').must_equal(Vedeu.groups)
+      }
     end
 
     describe '#add' do

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

@@ -13,6 +13,7 @@ module Vedeu
         parent: parent,
         colour: colour,
         style:  style,
+        visible: visible,
       }
     }
     let(:_name)      { 'hydrogen' }
@@ -20,18 +21,23 @@ module Vedeu
     let(:parent)     {}
     let(:colour)     {}
     let(:style)      {}
+    let(:visible)    {}
+    let(:repository) { Vedeu.interfaces }
 
     describe '#initialize' do
-      it { instance.instance_variable_get('@name').must_equal(_name) }
-      it { instance.instance_variable_get('@lines').must_equal(lines) }
-      it { instance.instance_variable_get('@parent').must_equal(parent) }
-      it { instance.instance_variable_get('@colour').must_equal(colour) }
-      it { instance.instance_variable_get('@style').must_equal(style) }
-      it { instance.instance_variable_get('@border').must_equal(nil) }
-      it { instance.instance_variable_get('@delay').must_equal(0.0) }
-      it { instance.instance_variable_get('@geometry').must_equal(nil) }
-      it { instance.instance_variable_get('@group').must_equal('') }
-      it { instance.instance_variable_get('@repository').must_equal(Vedeu.interfaces) }
+      subject { instance }
+
+      it { subject.instance_variable_get('@name').must_equal(_name) }
+      it { subject.instance_variable_get('@lines').must_equal(lines) }
+      it { subject.instance_variable_get('@parent').must_equal(parent) }
+      it { subject.instance_variable_get('@colour').must_equal(colour) }
+      it { subject.instance_variable_get('@style').must_equal(style) }
+      it { subject.instance_variable_get('@visible').must_equal(visible) }
+      it { subject.instance_variable_get('@border').must_equal(nil) }
+      it { subject.instance_variable_get('@delay').must_equal(0.0) }
+      it { subject.instance_variable_get('@geometry').must_equal(nil) }
+      it { subject.instance_variable_get('@group').must_equal('') }
+      it { subject.instance_variable_get('@repository').must_equal(repository) }
     end
 
     describe '#attributes' do
@@ -39,12 +45,13 @@ module Vedeu
 
       it { subject.must_be_instance_of(Hash) }
 
-      it { subject.must_equal({ colour: nil,
-                                delay:  0.0,
-                                group:  '',
-                                name:   'hydrogen',
-                                parent: nil,
-                                style:  nil }) }
+      it { subject.must_equal(colour: Vedeu::Colour.coerce(colour),
+                              delay:  0.0,
+                              group:  '',
+                              name:   'hydrogen',
+                              parent: nil,
+                              style:  Vedeu::Style.coerce(style),
+                              visible: true) }
     end
 
     describe '#border?' do
@@ -75,7 +82,13 @@ module Vedeu
       end
 
       context 'when the interface does not have a border' do
-        before { Vedeu.borders.reset }
+        before do
+          Vedeu.interface 'hydrogen' do
+          end
+
+          Vedeu.borders.reset
+        end
+        after { Vedeu.interfaces.reset }
 
         it { subject.must_be_instance_of(Vedeu::NullBorder) }
       end
@@ -85,7 +98,7 @@ module Vedeu
       subject { instance.clear }
 
       it {
-        Vedeu::Clear.expects(:render).with(instance)
+        Vedeu::Clear.expects(:new).with(instance)
         subject
       }
     end
@@ -128,7 +141,7 @@ module Vedeu
       subject { instance.viewport }
 
       it {
-        Vedeu::Viewport.expects(:render).with(instance)
+        Vedeu::Viewport.expects(:new).with(instance)
         subject
       }
     end

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

@@ -16,25 +16,27 @@ module Vedeu
     }
     let(:streams)   {
       [
-        Stream.new({ value: 'Something interesting ',
-          parent: streams_parent,
-          colour: Colour.new({ foreground: '#ffff00' }),
-          style:  Style.new('normal') }),
-        Stream.new({ value: 'on this line ',
-          parent: streams_parent,
-          colour: Colour.new({ foreground: '#00ff00' }),
-          style:  Style.new('normal') }),
-        Stream.new({ value: 'would be cool, eh?',
-          parent: streams_parent,
-          colour: Colour.new({ foreground: '#0000ff' }),
-          style:  Style.new('normal') })
+        Stream.new(value: 'Something interesting ',
+                   parent: streams_parent,
+                   colour: Colour.new(foreground: '#ffff00'),
+                   style:  Style.new('normal')),
+        Stream.new(value: 'on this line ',
+                   parent: streams_parent,
+                   colour: Colour.new(foreground: '#00ff00'),
+                   style:  Style.new('normal')),
+        Stream.new(value: 'would be cool, eh?',
+                   parent: streams_parent,
+                   colour: Colour.new(foreground: '#0000ff'),
+                   style:  Style.new('normal'))
       ]
     }
 
-    let(:streams_parent) { Line.new({ streams: nil, parent: parent, colour: colour, style: style }) }
+    let(:streams_parent) {
+      Line.new(streams: nil, parent: parent, colour: colour, style: style)
+    }
 
-    let(:parent)    { Vedeu::Interface.new({ name: 'Vedeu::Line' }) }
-    let(:colour)    { Colour.new({ foreground: '#ff0000', background: '#000000' }) }
+    let(:parent)    { Vedeu::Interface.new(name: 'Vedeu::Line') }
+    let(:colour)    { Colour.new(foreground: '#ff0000', background: '#000000') }
     let(:style)     { Style.new('normal') }
 
     before do
@@ -139,19 +141,13 @@ module Vedeu
           "\e[24m\e[22m\e[27m"              \
           "\e[38;2;255;255;0m"              \
           "\e[24m\e[22m\e[27m"              \
-          "Something interesting "          \
-          "\e[24m\e[22m\e[27m"              \
-          "\e[38;2;255;0;0m\e[48;2;0;0;0m"  \
+          'Something interesting '          \
           "\e[38;2;0;255;0m"                \
           "\e[24m\e[22m\e[27m"              \
-          "on this line "                   \
-          "\e[24m\e[22m\e[27m"              \
-          "\e[38;2;255;0;0m"                \
-          "\e[48;2;0;0;0m\e[38;2;0;0;255m"  \
-          "\e[24m\e[22m\e[27m"              \
-          "would be cool, eh?"              \
+          'on this line '                   \
+          "\e[38;2;0;0;255m"                \
           "\e[24m\e[22m\e[27m"              \
-          "\e[38;2;255;0;0m\e[48;2;0;0;0m"
+          'would be cool, eh?'
         )
       end
     end

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

@@ -38,12 +38,16 @@ module Vedeu
     end
 
     describe '#initialize' do
-      it { instance.must_be_instance_of(described) }
-      it { instance.instance_variable_get('@collection').must_equal(collection) }
-      it { instance.instance_variable_get('@name').must_equal('elements') }
-      it { instance.instance_variable_get('@current').must_equal(0) }
-      it { instance.instance_variable_get('@selected').must_equal(nil) }
-      it { instance.instance_variable_get('@repository').must_equal(Vedeu.menus) }
+      subject { instance }
+
+      it { subject.must_be_instance_of(described) }
+      it { subject.instance_variable_get('@collection').must_equal(collection) }
+      it { subject.instance_variable_get('@name').must_equal('elements') }
+      it { subject.instance_variable_get('@current').must_equal(0) }
+      it { subject.instance_variable_get('@selected').must_equal(nil) }
+      it do
+        subject.instance_variable_get('@repository').must_equal(Vedeu.menus)
+      end
     end
 
     describe '#current' do

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

@@ -0,0 +1,66 @@
+require 'test_helper'
+
+module Vedeu
+
+  describe Null do
+
+    let(:described) { Vedeu::Null }
+    let(:instance)  { described.new }
+
+    describe 'alias methods' do
+      it { instance.must_respond_to(:visible?) }
+    end
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(Vedeu::Null) }
+    end
+
+    describe '#add' do
+      subject { instance.add }
+
+      it { subject.must_be_instance_of(NilClass) }
+    end
+
+    describe '#colour' do
+      subject { instance.colour }
+
+      it { subject.must_be_instance_of(NilClass) }
+    end
+
+    describe '#parent' do
+      subject { instance.parent }
+
+      it { subject.must_be_instance_of(NilClass) }
+    end
+
+    describe '#store' do
+      subject { instance.store }
+
+      it { subject.must_be_instance_of(Vedeu::Null) }
+    end
+
+    describe '#style' do
+      subject { instance.style }
+
+      it { subject.must_be_instance_of(NilClass) }
+    end
+
+    describe '#visible' do
+      subject { instance.visible }
+
+      it { subject.must_be_instance_of(FalseClass) }
+    end
+
+    describe '#visible=' do
+      let(:value) { :ignored }
+
+      subject { instance.visible = (value) }
+
+      # This should be FalseClass, I'm explicitly returning false in the method.
+      it { subject.must_be_instance_of(Symbol) }
+    end
+
+
+  end # Null
+
+end # Vedeu

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

@@ -14,18 +14,21 @@ module Vedeu
         style:  style
       }
     }
-    let(:value)      { 'Some text' }
-    let(:parent)     {
-      Line.new({
-        streams: [],
-        parent:  line_parent,
-        colour:  Colour.new({ background: '#0000ff', foreground: '#ffff00' }),
-        style:   Style.new('normal')
-      })
+    let(:value)  { 'Some text' }
+    let(:parent) {
+      Line.new(streams: [],
+               parent:  line_parent,
+               colour:  parent_colour,
+               style:   Style.new('normal'))
+    }
+    let(:parent_colour) {
+      Colour.new(background: '#0000ff', foreground: '#ffff00')
+    }
+    let(:colour)      {
+      Colour.new(background: '#ff0000', foreground: '#000000')
     }
-    let(:colour)      { Colour.new({ background: '#ff0000', foreground: '#000000' }) }
     let(:style)       { Style.new('normal') }
-    let(:line_parent) { Vedeu::Interface.new({ name: 'Vedeu::Stream' }) }
+    let(:line_parent) { Vedeu::Interface.new(name: 'Vedeu::Stream') }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }

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

@@ -42,8 +42,7 @@ module Vedeu
     end
 
     describe '#initialize' do
-      it { instance.must_be_instance_of(described) }
-      it { instance.instance_variable_get('@attributes').must_equal(
+      let(:default_attributes) {
         {
           bottom_left:  'm',
           bottom_right: 'j',
@@ -61,11 +60,19 @@ module Vedeu
           top_left:     'l',
           top_right:    'k',
           vertical:     'x',
-        })
+        }
       }
+      it { instance.must_be_instance_of(described) }
+      it do
+        instance.instance_variable_get('@attributes').
+          must_equal(default_attributes)
+      end
       it { instance.instance_variable_get('@colour').must_equal({}) }
       it { instance.instance_variable_get('@name').must_equal('borders') }
-      it { instance.instance_variable_get('@repository').must_be_instance_of(Vedeu::Borders) }
+      it do
+        instance.instance_variable_get('@repository').
+          must_be_instance_of(Vedeu::Borders)
+      end
       it { instance.instance_variable_get('@style').must_equal([]) }
     end
 
@@ -294,17 +301,23 @@ module Vedeu
     describe '#colour=' do
       let(:value) { { foreground: '#00ff00' } }
 
-      subject { instance.colour=(value) }
+      subject { instance.colour = (value) }
 
-      it { subject; instance.instance_variable_get("@colour").must_be_instance_of(Colour) }
+      it do
+        subject
+        instance.instance_variable_get('@colour').must_be_instance_of(Colour)
+      end
     end
 
     describe '#style=' do
       let(:value) { 'normal' }
 
-      subject { instance.style=(value) }
+      subject { instance.style = (value) }
 
-      it { subject; instance.instance_variable_get("@style").must_be_instance_of(Style) }
+      it do
+        subject
+        instance.instance_variable_get('@style').must_be_instance_of(Style)
+      end
     end
 
     describe '#enabled?' do
@@ -418,6 +431,7 @@ module Vedeu
       let(:bottom)  { false }
       let(:left)    { false }
       let(:right)   { false }
+      let(:visibility) { true }
 
       before do
         Vedeu.interfaces.reset
@@ -430,6 +444,7 @@ module Vedeu
             y      1
             yn     4
           end
+          visible(visibility)
         end
       end
 
@@ -437,6 +452,12 @@ module Vedeu
 
       it { subject.must_be_instance_of(Array) }
 
+      context 'when the interface is not visible' do
+        let(:visibility) { false }
+
+        it { subject.must_equal([]) }
+      end
+
       context 'when the border is not enabled' do
         it { subject.must_equal([]) }
       end

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

@@ -5,15 +5,22 @@ module Vedeu
   describe Clear do
 
     let(:described) { Vedeu::Clear }
-    let(:instance)  { described.new(interface) }
-    let(:interface) { Vedeu::Interface.new({ name: 'xenon' }) }
-    let(:geometry)  { Vedeu::Geometry.new({ x: 1, y: 1, xn: 3, yn: 3 })}
+    let(:instance)  { described.new(interface, options) }
+    let(:interface) { Vedeu::Interface.new(name: 'xenon', visible: visible) }
+    let(:options)   {
+      {
+
+      }
+    }
+    let(:geometry)  { Vedeu::Geometry.new(x: 1, y: 1, xn: 3, yn: 3)}
+    let(:visible)   { true }
 
     before { interface.stubs(:geometry).returns(geometry) }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(Vedeu::Clear) }
       it { instance.instance_variable_get('@interface').must_equal(interface) }
+      it { instance.instance_variable_get('@options').must_equal(options) }
     end
 
     describe 'alias methods' do
@@ -21,7 +28,19 @@ module Vedeu
     end
 
     describe '.clear' do
-      subject { described.clear(interface) }
+      subject { described.clear(interface, options) }
+
+      context 'when the interface is visible' do
+
+      end
+
+      context 'when the interface is not visible' do
+        let(:visible) { false }
+
+        it { subject.must_be_instance_of(Array) }
+
+        it { subject.must_equal([]) }
+      end
     end
 
     describe '#clear' do