vedeu 0.4.13 → 0.4.14

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

@@ -35,13 +35,31 @@ module Vedeu
           end
         }
 
-        it { subject.must_be_instance_of(Vedeu::Border) }
-
         context 'when the block is not given' do
           subject { instance.border }
 
           it { proc { subject }.must_raise(InvalidSyntax) }
         end
+
+        context 'when the block is given' do
+          subject { instance.border { } }
+
+          it { subject.must_be_instance_of(Vedeu::Border) }
+
+          context 'when the name is not given' do
+            it 'uses the interface name for storing the border' do
+              subject.name.must_equal('actinium')
+            end
+          end
+
+          context 'when the name is given' do
+            subject { instance.border('magnesium') { } }
+
+            it 'uses the name for storing the border' do
+              subject.name.must_equal('magnesium')
+            end
+          end
+        end
       end
 
       describe '#border!' do
@@ -59,7 +77,7 @@ module Vedeu
 
         it {
           subject
-          Vedeu.cursors.find('actinium').state.visible?.must_equal(false)
+          Vedeu.cursors.find('actinium').visible?.must_equal(false)
         }
 
         context 'when the value is false' do
@@ -67,16 +85,16 @@ module Vedeu
 
           it {
             subject
-            Vedeu.cursors.find('actinium').state.visible?.must_equal(false)
+            Vedeu.cursors.find('actinium').visible?.must_equal(false)
           }
         end
 
-        context 'when the value is :hide' do
-          let(:value) { :hide }
+        context 'when the value is nil' do
+          let(:value) {}
 
           it {
             subject
-            Vedeu.cursors.find('actinium').state.visible?.must_equal(false)
+            Vedeu.cursors.find('actinium').visible?.must_equal(false)
           }
         end
 
@@ -85,7 +103,7 @@ module Vedeu
 
           it {
             subject
-            Vedeu.cursors.find('actinium').state.visible?.must_equal(true)
+            Vedeu.cursors.find('actinium').visible?.must_equal(true)
           }
         end
 
@@ -94,7 +112,7 @@ module Vedeu
 
           it {
             subject
-            Vedeu.cursors.find('actinium').state.visible?.must_equal(true)
+            Vedeu.cursors.find('actinium').visible?.must_equal(true)
           }
         end
 
@@ -103,7 +121,7 @@ module Vedeu
 
           it {
             subject
-            Vedeu.cursors.find('actinium').state.visible?.must_equal(true)
+            Vedeu.cursors.find('actinium').visible?.must_equal(true)
           }
         end
       end
@@ -113,7 +131,7 @@ module Vedeu
 
         it {
           subject
-          Vedeu.cursors.find('actinium').state.visible?.must_equal(true)
+          Vedeu.cursors.find('actinium').visible?.must_equal(true)
         }
       end
 
@@ -159,13 +177,31 @@ module Vedeu
           end
         }
 
-        it { subject.must_be_instance_of(Vedeu::Geometry) }
-
-        context 'when the require block is not provided' do
+        context 'when the required block is not provided' do
           subject { instance.geometry }
 
           it { proc { subject }.must_raise(InvalidSyntax) }
         end
+
+        context 'when the block is given' do
+          subject { instance.geometry { } }
+
+          it { subject.must_be_instance_of(Vedeu::Geometry) }
+
+          context 'when the name is not given' do
+            it 'uses the interface name for storing the geometry' do
+              subject.name.must_equal('actinium')
+            end
+          end
+
+          context 'when the name is given' do
+            subject { instance.geometry('magnesium') { } }
+
+            it 'uses the name for storing the geometry' do
+              subject.name.must_equal('magnesium')
+            end
+          end
+        end
       end
 
       describe '#group' do
@@ -184,13 +220,15 @@ module Vedeu
         end
 
         context 'when the named group exists' do
+          let(:members) { Set['actinium', 'lanthanum'] }
+
           before do
-            Vedeu::Group.new({ name: 'elements', members: ['lanthanum'] }).store
+            Vedeu::Group.new(name: 'elements', members: ['lanthanum']).store
           end
 
           it {
             subject
-            Vedeu.groups.find('elements').members.must_equal(Set['actinium', 'lanthanum'])
+            Vedeu.groups.find('elements').members.must_equal(members)
           }
         end
 
@@ -238,6 +276,33 @@ module Vedeu
         end
       end
 
+      describe '#show!' do
+        subject {
+          Vedeu.interface 'xenon' do
+            show!
+          end
+        }
+
+        it { subject.visible.must_equal(true) }
+      end
+
+      describe '#hide!' do
+        subject {
+          Vedeu.interface 'xenon' do
+            hide!
+          end
+        }
+
+        it { subject.visible.must_equal(false) }
+      end
+
+      describe '#visible' do
+        it { instance.visible(false).must_equal(false) }
+        it { instance.visible(true).must_equal(true) }
+        it { instance.visible(nil).must_equal(false) }
+        it { instance.visible(:show).must_equal(true) }
+      end
+
     end # Interface
 
   end # DSL

data/test/lib/vedeu/dsl/shared/colour_test.rb

@@ -26,7 +26,7 @@ module Vedeu
 
         it 'sets the background' do
           subject.attributes.must_equal(
-            { background: '#00ff00', foreground: '' }
+            background: '#00ff00', foreground: ''
           )
         end
       end
@@ -38,7 +38,7 @@ module Vedeu
 
         it 'sets the foreground' do
           subject.attributes.must_equal(
-            { background: '', foreground: '#ff00ff' }
+            background: '', foreground: '#ff00ff'
           )
         end
       end
@@ -55,7 +55,7 @@ module Vedeu
 
           it 'sets only the valid attributes' do
             subject.attributes.must_equal(
-              { background: '', foreground: '#ff00ff' }
+              background: '', foreground: '#ff00ff'
             )
           end
         end
@@ -65,7 +65,7 @@ module Vedeu
 
           it 'sets only the valid attributes' do
             subject.attributes.must_equal(
-              { background: '#00ff00', foreground: '' }
+              background: '#00ff00', foreground: ''
             )
           end
         end

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

@@ -4,27 +4,105 @@ module Vedeu
 
   module DSL
 
-    class TextTestClass
-      include Vedeu::DSL::Text
-
-    end
-
     describe Text do
 
-      let(:instance) { Vedeu::DSL::TextTestClass.new }
-      let(:value)    {}
-      let(:options)  { {} }
-
       describe '#text' do
+        let(:value)   {}
+        let(:options) { {} }
+        let(:modified_options) {
+          {
+            anchor: anchor,
+            model:  model,
+          }
+        }
+        let(:anchor)   { :text }
+        let(:model)    { Vedeu::Line.new }
+        let(:instance) { Vedeu::DSL::Line.new(model) }
+
         subject { instance.text(value, options) }
 
         context 'when the model is a Vedeu::Interface' do
+          let(:model)    { Vedeu::Interface.new }
+          let(:instance) { Vedeu::DSL::Interface.new(model) }
+
+          it { subject.must_be_instance_of(Vedeu::Lines) }
+
+          it 'adds the text to the model' do
+            Vedeu::Text.expects(:add).with(value, modified_options)
+            subject
+          end
         end
 
         context 'when the model is a Vedeu::Line' do
+          let(:model)    { Vedeu::Line.new }
+          let(:instance) { Vedeu::DSL::Line.new(model) }
+
+          it { subject.must_be_instance_of(Vedeu::Streams) }
+
+          it 'adds the text to the model' do
+            Vedeu::Text.expects(:add).with(value, modified_options)
+            subject
+          end
         end
 
         context 'when the model is a Vedeu::Stream' do
+          let(:parent)   { Vedeu::Line.new }
+          let(:model)    { Vedeu::Stream.new(parent: parent) }
+          let(:instance) { Vedeu::DSL::Stream.new(model) }
+
+          it { subject.must_be_instance_of(Vedeu::Streams) }
+
+          it 'adds the text to the model' do
+            Vedeu::Text.expects(:add).with(value, modified_options)
+            subject
+          end
+        end
+
+        context 'alias methods' do
+          context '#align' do
+            let(:anchor) { :align }
+
+            it 'adds the text to the model' do
+              Vedeu::Text.expects(:add).with(value, modified_options)
+              instance.align(value, options)
+            end
+          end
+
+          context '#center' do
+            let(:anchor) { :center }
+
+            it 'adds the text to the model' do
+              Vedeu::Text.expects(:add).with(value, modified_options)
+              instance.center(value, options)
+            end
+          end
+
+          context '#centre' do
+            let(:anchor) { :centre }
+
+            it 'adds the text to the model' do
+              Vedeu::Text.expects(:add).with(value, modified_options)
+              instance.centre(value, options)
+            end
+          end
+
+          context '#left' do
+            let(:anchor) { :left }
+
+            it 'adds the text to the model' do
+              Vedeu::Text.expects(:add).with(value, modified_options)
+              instance.left(value, options)
+            end
+          end
+
+          context '#right' do
+            let(:anchor) { :right }
+
+            it 'adds the text to the model' do
+              Vedeu::Text.expects(:add).with(value, modified_options)
+              instance.right(value, options)
+            end
+          end
         end
       end
 

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

@@ -8,7 +8,7 @@ module Vedeu
 
       let(:described) { Vedeu::DSL::Stream }
       let(:instance)  { described.new(model) }
-      let(:model)     { Vedeu::Stream.new({ parent: parent }) }
+      let(:model)     { Vedeu::Stream.new(parent: parent) }
       let(:client)    {}
       let(:parent)    { Vedeu::Line.new }
 

data/test/lib/vedeu/events/event_test.rb

@@ -29,7 +29,9 @@ module Vedeu
       it { instance.instance_variable_get('@deadline').must_equal(0) }
       it { instance.instance_variable_get('@executed_at').must_equal(0) }
       it { instance.instance_variable_get('@now').must_equal(0) }
-      it { instance.instance_variable_get('@repository').must_equal(Vedeu.events) }
+      it do
+        instance.instance_variable_get('@repository').must_equal(Vedeu.events)
+      end
     end
 
     describe '#bind' do

data/test/lib/vedeu/events/trigger_test.rb

@@ -18,10 +18,14 @@ module Vedeu
     end
 
     describe '#initialize' do
-      it { instance.must_be_instance_of(Vedeu::Trigger) }
-      it { instance.instance_variable_get('@name').must_equal(event_name) }
-      it { instance.instance_variable_get('@args').must_equal([args]) }
-      it { instance.instance_variable_get('@repository').must_equal(Vedeu.events) }
+      subject { instance }
+
+      it { subject.must_be_instance_of(Vedeu::Trigger) }
+      it { subject.instance_variable_get('@name').must_equal(event_name) }
+      it { subject.instance_variable_get('@args').must_equal([args]) }
+      it do
+        subject.instance_variable_get('@repository').must_equal(Vedeu.events)
+      end
     end
 
     describe '#trigger' do

data/test/lib/vedeu/geometry/dimension_test.rb

@@ -117,7 +117,7 @@ module Vedeu
           let(:d)    { 5 }
           let(:d_dn) { 2 }
 
-          it { subject.must_equal(7) }
+          it { subject.must_equal(6) }
         end
 
         context 'when only d_dn is given' do

data/test/lib/vedeu/geometry/geometry_test.rb

@@ -40,7 +40,9 @@ module Vedeu
       it { instance.instance_variable_get('@xn').must_equal(xn) }
       it { instance.instance_variable_get('@y').must_equal(y) }
       it { instance.instance_variable_get('@yn').must_equal(yn) }
-      it { instance.instance_variable_get('@repository').must_equal(Vedeu.geometries) }
+      it do
+        instance.instance_variable_get('@repository').must_equal(Vedeu.geometries)
+      end
     end
 
     describe '#top, #right, #bottom, #left' do
@@ -85,7 +87,7 @@ module Vedeu
 
         it { instance.top.must_equal(4) }
         it { instance.right.must_equal(18) }
-        it { instance.bottom.must_equal(10) }
+        it { instance.bottom.must_equal(9) }
         it { instance.left.must_equal(1) }
       end
 
@@ -93,7 +95,7 @@ module Vedeu
         let(:attributes) { { height: 6, width: 18, x: 4 } }
 
         it { instance.top.must_equal(1) }
-        it { instance.right.must_equal(22) }
+        it { instance.right.must_equal(21) }
         it { instance.bottom.must_equal(6) }
         it { instance.left.must_equal(4) }
       end

data/test/lib/vedeu/geometry/index_position_test.rb

@@ -53,16 +53,25 @@ module Vedeu
 
       it { subject.must_be_instance_of(Vedeu::Position) }
 
-      context 'when the interface has a border' do
-        before { Vedeu.border('IndexPosition.from_interface') {} }
+      context 'when the interface is registered' do
+        context 'when the interface has a border' do
+          before { Vedeu.border('IndexPosition.from_interface') {} }
 
-        it { subject.x.must_equal(8) }
-        it { subject.y.must_equal(10) }
+          it { subject.x.must_equal(8) }
+          it { subject.y.must_equal(10) }
+        end
+
+        context 'when the interface does not have a border' do
+          it { subject.x.must_equal(7) }
+          it { subject.y.must_equal(9) }
+        end
       end
 
-      context 'when the interface does not have a border' do
-        it { subject.x.must_equal(7) }
-        it { subject.y.must_equal(9) }
+      context 'when the interface is not registered' do
+        before { Vedeu.interfaces.reset }
+
+        it { subject.x.must_equal(4) }
+        it { subject.y.must_equal(4) }
       end
     end
 
@@ -74,6 +83,20 @@ module Vedeu
       it { subject.x.must_equal(22) }
     end
 
+    describe '#eql?' do
+      let(:other) { described.new(8, 21) }
+
+      subject { instance.eql?(other) }
+
+      it { subject.must_equal(true) }
+
+      context 'when different to other' do
+        let(:other) { described.new(2, 9) }
+
+        it { subject.must_equal(false) }
+      end
+    end
+
     describe '#y' do
       subject { instance.y }
 

data/test/lib/vedeu/geometry/null_geometry_test.rb

@@ -0,0 +1,57 @@
+require 'test_helper'
+
+module Vedeu
+
+  describe NullGeometry do
+
+    let(:described) { Vedeu::NullGeometry }
+    let(:instance)  { described.new }
+
+    before do
+      Vedeu::Terminal.stubs(:height).returns(25)
+      Vedeu::Terminal.stubs(:width).returns(40)
+    end
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(described) }
+    end
+
+    describe '#centred' do
+      subject { instance.centred }
+
+      it { subject.must_equal(false) }
+    end
+
+    describe '#store' do
+      subject { instance.store }
+
+      it { subject.must_be_instance_of(described) }
+    end
+
+    describe '#height' do
+      it { instance.height.must_equal(25) }
+    end
+
+    describe '#width' do
+      it { instance.width.must_equal(40) }
+    end
+
+    describe '#x' do
+      it { instance.x.must_equal(1) }
+    end
+
+    describe '#xn' do
+      it { instance.xn.must_equal(40) }
+    end
+
+    describe '#y' do
+      it { instance.y.must_equal(1) }
+    end
+
+    describe '#yn' do
+      it { instance.yn.must_equal(25) }
+    end
+
+  end # NullGeometry
+
+end # Vedeu

data/test/lib/vedeu/geometry/position_index_test.rb

@@ -41,6 +41,20 @@ module Vedeu
       it { subject.must_equal([5, 16]) }
     end
 
+    describe '#eql?' do
+      let(:other) { described.new(6, 17) }
+
+      subject { instance.eql?(other) }
+
+      it { subject.must_equal(true) }
+
+      context 'when different to other' do
+        let(:other) { described.new(2, 9) }
+
+        it { subject.must_equal(false) }
+      end
+    end
+
     describe '#to_position' do
       subject { instance.to_position }
 

data/test/lib/vedeu/geometry/position_validator_test.rb

@@ -5,18 +5,32 @@ module Vedeu
   describe PositionValidator do
 
     let(:described) { Vedeu::PositionValidator }
-    let(:instance)  { described.new(interface, x, y) }
-    let(:interface) {}
+    let(:instance)  { described.new(_name, x, y) }
+    let(:_name)     {}
     let(:x)         {}
     let(:y)         {}
 
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
-      it { instance.instance_variable_get('@interface').must_equal(interface) }
+      it { instance.instance_variable_get('@name').must_equal(_name) }
       it { instance.instance_variable_get('@x').must_equal(x) }
       it { instance.instance_variable_get('@y').must_equal(y) }
     end
 
+    describe '.validate' do
+      subject { described.validate(_name, x, y) }
+
+      it { instance.must_be_instance_of(described) }
+    end
+
+    describe '#y' do
+      subject { described.validate(_name, x, y).y }
+    end
+
+    describe '#x' do
+      subject { described.validate(_name, x, y).x }
+    end
+
   end # PositionValidator
 
 end # Vedeu

data/test/lib/vedeu/input/keymap_test.rb

@@ -20,7 +20,9 @@ module Vedeu
       it { instance.must_be_instance_of(Keymap) }
       it { instance.instance_variable_get('@name').must_equal(map_name) }
       it { instance.instance_variable_get('@keys').must_be_instance_of(Array) }
-      it { instance.instance_variable_get('@repository').must_equal(Vedeu.keymaps) }
+      it do
+        instance.instance_variable_get('@repository').must_equal(Vedeu.keymaps)
+      end
     end
 
     describe '#add' do

data/test/lib/vedeu/input/mapper_test.rb

@@ -18,12 +18,16 @@ module Vedeu
       it { instance.must_be_instance_of(described) }
       it { instance.instance_variable_get('@key').must_equal(key) }
       it { instance.instance_variable_get('@name').must_equal(keymap) }
-      it { instance.instance_variable_get('@repository').must_equal(Vedeu.keymaps) }
+      it do
+        instance.instance_variable_get('@repository').must_equal(Vedeu.keymaps)
+      end
 
       context 'when the repository is provided' do
         let(:repository) { Vedeu::Repository.new }
 
-        it { instance.instance_variable_get('@repository').must_equal(repository) }
+        it do
+          instance.instance_variable_get('@repository').must_equal(repository)
+        end
       end
     end
 
@@ -41,7 +45,7 @@ module Vedeu
 
         context 'and the key is defined' do
           let(:key_test) { Key.new('a') { :do_something } }
-          let(:keymap_test) { Keymap.new({ name: 'test', keys: [key_test] }) }
+          let(:keymap_test) { Keymap.new(name: 'test', keys: [key_test]) }
 
           before do
             Vedeu.keymaps.reset
@@ -71,7 +75,7 @@ module Vedeu
 
         context 'and the key is defined' do
           let(:key_test) { Key.new('a') { :do_something } }
-          let(:keymap_test) { Keymap.new({ name: 'test', keys: [key_test] }) }
+          let(:keymap_test) { Keymap.new(name: 'test', keys: [key_test]) }
 
           before do
             Vedeu.keymaps.reset

data/test/lib/vedeu/launcher_test.rb

@@ -8,7 +8,7 @@ module Vedeu
     let(:instance)  { described.new }
 
     before do
-      Configuration.stubs(:configure)#.returns(test_configuration)
+      Configuration.stubs(:configure)# .returns(test_configuration)
       Application.stubs(:start)
       Kernel.stubs(:exit)
       Kernel.stubs(:puts)

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

@@ -24,17 +24,19 @@ module Vedeu
     let(:y)          {}
 
     describe '#initialize' do
-      it { instance.must_be_instance_of(Vedeu::Cell) }
-      it { instance.instance_variable_get('@background').must_equal(background) }
-      it { instance.instance_variable_get('@foreground').must_equal(foreground) }
-      it { instance.instance_variable_get('@style').must_equal(style) }
-      it { instance.instance_variable_get('@value').must_equal(value) }
-      it { instance.instance_variable_get('@x').must_equal(x) }
-      it { instance.instance_variable_get('@y').must_equal(y) }
+      subject { instance }
+
+      it { subject.must_be_instance_of(described) }
+      it { subject.instance_variable_get('@background').must_equal(background) }
+      it { subject.instance_variable_get('@foreground').must_equal(foreground) }
+      it { subject.instance_variable_get('@style').must_equal(style) }
+      it { subject.instance_variable_get('@value').must_equal(value) }
+      it { subject.instance_variable_get('@x').must_equal(x) }
+      it { subject.instance_variable_get('@y').must_equal(y) }
     end
 
     describe '#eql?' do
-      let(:other) { described.new({ background: '#000000' }) }
+      let(:other) { described.new(background: '#000000') }
 
       subject { instance.eql?(other) }