vedeu 0.4.8 → 0.4.9

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

@@ -4,267 +4,98 @@ module Vedeu
 
   describe Geometry do
 
-    let(:described)  { Geometry.new(attributes) }
-    let(:instance)   { Geometry.new(attributes) }
-    let(:attributes) { {} }
-
-    before do
-      IO.console.stubs(:winsize).returns([25, 80])
-    end
+    let(:described)  { Vedeu::Geometry }
+    let(:instance)   { described.new(attributes) }
+    let(:attributes) {
+      {
+        centred: centred,
+        height:  height,
+        name:    _name,
+        width:   width,
+        x:       x,
+        xn:      xn,
+        y:       y,
+        yn:      yn,
+      }
+    }
+    let(:centred) {}
+    let(:height)  {}
+    let(:_name)   {}
+    let(:width)   {}
+    let(:x)       {}
+    let(:xn)      {}
+    let(:y)       {}
+    let(:yn)      {}
+
+    before { Terminal.stubs(:size).returns([12, 40]) }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(Geometry) }
-
-      context 'with default attributes' do
-        it { instance.instance_variable_get('@attributes').must_equal({
-            centred: false,
-            client:  nil,
-            height:  25,
-            name:    '',
-            width:   80,
-            x:       1,
-            xn:      80,
-            y:       1,
-            yn:      25,
-          })
-        }
-        it { instance.instance_variable_get('@centred').must_equal(false) }
-        it { instance.instance_variable_get('@height').must_equal(25) }
-        it { instance.instance_variable_get('@name').must_equal('') }
-        it { instance.instance_variable_get('@width').must_equal(80) }
-        it { instance.instance_variable_get('@x').must_equal(1) }
-        it { instance.instance_variable_get('@xn').must_equal(80) }
-        it { instance.instance_variable_get('@y').must_equal(1) }
-        it { instance.instance_variable_get('@yn').must_equal(25) }
-        it { instance.instance_variable_get('@repository').must_equal(Vedeu.geometries) }
-      end
+      it { instance.instance_variable_get('@attributes').must_equal(attributes) }
+      it { instance.instance_variable_get('@centred').must_equal(centred) }
+      it { instance.instance_variable_get('@height').must_equal(height) }
+      it { instance.instance_variable_get('@name').must_equal(_name) }
+      it { instance.instance_variable_get('@width').must_equal(width) }
+      it { instance.instance_variable_get('@x').must_equal(x) }
+      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) }
     end
 
-    describe '#y' do
-      subject { instance.y }
-
-      context 'when it is a proc' do
-        let(:attributes) { { y: proc { 17 } } }
+    describe '#top, #right, #bottom, #left' do
+      context 'centred is true' do
+        let(:attributes) { { height: 6, width: 18, centred: true } }
 
-        it { subject.must_equal(17) }
+        it { instance.top.must_equal(3) }
+        it { instance.right.must_equal(29) }
+        it { instance.bottom.must_equal(9) }
+        it { instance.left.must_equal(11) }
       end
 
-      context 'when just an attribute' do
-        let(:attributes) { { y: 19 } }
+      context 'centred is true and y is set, y is ignored' do
+        let(:attributes) { { height: 6, width: 18, centred: true, y: 4 } }
 
-        it { subject.must_equal(19) }
+        it { instance.top.must_equal(3) }
+        it { instance.right.must_equal(29) }
+        it { instance.bottom.must_equal(9) }
+        it { instance.left.must_equal(11) }
       end
-    end
-
-    describe '#yn' do
-      subject { instance.yn }
 
-      context 'when it is a proc' do
-        let(:attributes) { { yn: proc { 17 } } }
+      context 'centred is true and x is set, x is ignored' do
+        let(:attributes) { { height: 6, width: 18, centred: true, x: 4 } }
 
-        it { subject.must_equal(17) }
+        it { instance.top.must_equal(3) }
+        it { instance.right.must_equal(29) }
+        it { instance.bottom.must_equal(9) }
+        it { instance.left.must_equal(11) }
       end
 
-      context 'when just an attribute' do
-        let(:attributes) { { yn: 19 } }
-
-        it { subject.must_equal(19) }
-      end
-    end
+      context 'centred is false' do
+        let(:attributes) { { height: 6, width: 18 } }
 
-    describe '#x' do
-      it 'returns the value of x when it is a proc' do
-        geometry = Geometry.new({ x: proc { 58 } })
-        geometry.x.must_equal(58)
+        it { instance.top.must_equal(1) }
+        it { instance.right.must_equal(18) }
+        it { instance.bottom.must_equal(6) }
+        it { instance.left.must_equal(1) }
       end
 
-      it 'returns the value of x when just an attribute' do
-        geometry = Geometry.new({ x: 64 })
-        geometry.x.must_equal(64)
-      end
-    end
-
-    describe '#xn' do
-      it 'returns the value of xn when it is a proc' do
-        geometry = Geometry.new({ xn: proc { 58 } })
-        geometry.xn.must_equal(58)
-      end
-
-      it 'returns the value of xn when just an attribute' do
-        geometry = Geometry.new({ xn: 64 })
-        geometry.xn.must_equal(64)
-      end
-    end
-
-    describe '#width' do
-      it 'returns the viewport width when the interface fits the terminal' do
-        geometry = Geometry.new({ width: 60, height: 1, x: 5, y: 1 })
-        geometry.width.must_equal(60)
-      end
+      context 'centred is false and y is set' do
+        let(:attributes) { { height: 6, width: 18, y: 4 } }
 
-      it 'returns the viewport width when the interface does not fit the ' \
-         'terminal' do
-        IO.console.stub(:winsize, [25, 60]) do
-          geometry = Geometry.new({ width: 60, height: 1, x: 5, y: 1 })
-          geometry.width.must_equal(55)
-        end
+        it { instance.top.must_equal(4) }
+        it { instance.right.must_equal(18) }
+        it { instance.bottom.must_equal(10) }
+        it { instance.left.must_equal(1) }
       end
 
-      it 'returns an unusable viewport width when the terminal is tiny' do
-        IO.console.stub(:winsize, [25, -10]) do
-          geometry = Geometry.new({ width: 60, height: 1, x: 5, y: 1 })
-          geometry.width.must_equal(1)
-        end
-      end
-    end
-
-    describe '#height' do
-      it 'returns the viewport height when the interface fits the terminal' do
-        geometry = Geometry.new({ width: 5, height: 20, x: 1, y: 5 })
-        geometry.height.must_equal(20)
-      end
-
-      it 'returns the viewport height when the interface does not fit the ' \
-         'terminal' do
-        IO.console.stub(:winsize, [15, 80]) do
-          geometry = Geometry.new({ width: 5, height: 20, x: 1, y: 5 })
-          geometry.height.must_equal(10)
-        end
-      end
-
-      it 'returns an unusable viewport height when the terminal is tiny' do
-        IO.console.stub(:winsize, [-10, 80]) do
-          geometry = Geometry.new({ width: 60, height: 20, x: 1, y: 5 })
-          geometry.height.must_equal(1)
-        end
-      end
-    end
-
-    describe '#top' do
-      it 'centred is true' do
-        console = IO.console
-        console.stub :winsize, [12, 80] do
-          geometry = Geometry.new({ height: 6, width: 18, centred: true })
-          geometry.top.must_equal(3)
-        end
-      end
-
-      it 'centred is false' do
-        geometry = Geometry.new({ height: 6, width: 18 })
-        geometry.top.must_equal(1)
-      end
-
-      it 'centred is false and y is set' do
-        geometry = Geometry.new({ height: 6, width: 18, y: 4 })
-        geometry.top.must_equal(4)
-      end
-    end
-
-    describe '#north' do
-      it 'returns the top minus the value when the value is provided' do
-        geometry = Geometry.new({ height: 6, width: 18, y: 4 })
-        geometry.north(2).must_equal(2)
-      end
-
-      it 'returns the top minus 1 without a value' do
-        geometry = Geometry.new({ height: 6, width: 18, y: 4 })
-        geometry.north.must_equal(3)
-      end
-    end
-
-    describe '#left' do
-      it 'centred is true' do
-        console = IO.console
-        console.stub :winsize, [25, 40] do
-          geometry = Geometry.new({ height: 6, width: 18, centred: true })
-          geometry.left.must_equal(11)
-        end
-      end
-
-      it 'centred is false' do
-        geometry = Geometry.new({ height: 6, width: 18 })
-        geometry.left.must_equal(1)
-      end
-
-      it 'centred is false and x is set' do
-        geometry = Geometry.new({ height: 6, width: 18, x: 5 })
-        geometry.left.must_equal(5)
-      end
-    end
-
-    describe '#west' do
-      it 'returns the left minus the value when the value is provided' do
-        geometry = Geometry.new({ height: 6, width: 18, x: 7 })
-        geometry.west(2).must_equal(5)
-      end
-
-      it 'returns the left minus 1 without a value' do
-        geometry = Geometry.new({ height: 6, width: 18, x: 7 })
-        geometry.west.must_equal(6)
-      end
-    end
-
-    describe '#bottom' do
-      it 'centred is true' do
-        console = IO.console
-        console.stub :winsize, [20, 40] do
-          geometry = Geometry.new({ height: 6, width: 18, centred: true })
-          geometry.bottom.must_equal(13)
-        end
-      end
-
-      it 'centred is false' do
-        geometry = Geometry.new({ height: 6, width: 18 })
-        geometry.bottom.must_equal(7)
-      end
-
-      it 'centred is false and y is set' do
-        geometry = Geometry.new({ height: 6, width: 18, y: 5 })
-        geometry.bottom.must_equal(11)
-      end
-    end
-
-    describe '#south' do
-      it 'returns the bottom plus the value when the value is provided' do
-        geometry = Geometry.new({ height: 6, width: 18, y: 3 })
-        geometry.south(2).must_equal(11)
-      end
-
-      it 'returns the bottom plus 1 without a value' do
-        geometry = Geometry.new({ height: 6, width: 18, y: 3 })
-        geometry.south.must_equal(10)
-      end
-    end
-
-    describe '#right' do
-      it 'centred is true' do
-        console = IO.console
-        console.stub :winsize, [25, 40] do
-          geometry = Geometry.new({ height: 6, width: 18, centred: true })
-          geometry.right.must_equal(29)
-        end
-      end
-
-      it 'centred is false' do
-        geometry = Geometry.new({ height: 6, width: 18 })
-        geometry.right.must_equal(19)
-      end
-
-      it 'centred is false and x is set' do
-        geometry = Geometry.new({ height: 6, width: 18, x: 5 })
-        geometry.right.must_equal(23)
-      end
-    end
-
-    describe '#east' do
-      it 'returns the right plus the value when the value is provided' do
-        geometry = Geometry.new({ height: 6, width: 18, x: 7 })
-        geometry.east(2).must_equal(27)
-      end
+      context 'centred is false and x is set' do
+        let(:attributes) { { height: 6, width: 18, x: 4 } }
 
-      it 'returns the right plus 1 without a value' do
-        geometry = Geometry.new({ height: 6, width: 18, x: 7 })
-        geometry.east.must_equal(26)
+        it { instance.top.must_equal(1) }
+        it { instance.right.must_equal(22) }
+        it { instance.bottom.must_equal(6) }
+        it { instance.left.must_equal(4) }
       end
     end
 

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

@@ -58,18 +58,14 @@ module Vedeu
       end
     end
 
-    describe '#==' do
-      let(:other) {}
+    describe '#eql?' do
+      let(:other) { described.new(12, 19) }
 
-      subject { instance == other }
+      subject { instance.eql?(other) }
 
-      context 'when they are equal' do
-        let(:other) { described.new(12, 19) }
+      it { subject.must_equal(true) }
 
-        it { subject.must_equal(true) }
-      end
-
-      context 'when they are not equal' do
+      context 'when different to other' do
         let(:other) { described.new(2, 9) }
 
         it { subject.must_equal(false) }

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

@@ -33,22 +33,8 @@ module Vedeu
       it { instance.instance_variable_get('@y').must_equal(y) }
     end
 
-    describe '#==' do
-      let(:other) { instance }
-
-      subject { instance.==(other) }
-
-      it { subject.must_equal(true) }
-
-      context 'when different to other' do
-        let(:other) { described.new({}) }
-
-        it { subject.must_equal(false) }
-      end
-    end
-
     describe '#eql?' do
-      let(:other) { instance }
+      let(:other) { described.new({ background: '#000000' }) }
 
       subject { instance.eql?(other) }
 

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

@@ -43,6 +43,20 @@ module Vedeu
       it { instance.must_respond_to(:value) }
     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
+    end
+
     describe '#inspect' do
       let(:colour)   { Vedeu::Colour.new({ foreground: '#00ff00',
                                            background: '#005500' }) }

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

@@ -42,6 +42,14 @@ module Vedeu
       end
     end
 
+    describe '#background=' do
+      let(:value) { '#000000' }
+
+      subject { instance.background=(value) }
+
+      it { subject.must_equal(value) }
+    end
+
     describe '#foreground' do
       subject { instance.foreground }
 
@@ -66,6 +74,14 @@ module Vedeu
       end
     end
 
+    describe '#foreground=' do
+      let(:value) { '#ff0000' }
+
+      subject { instance.foreground=(value) }
+
+      it { subject.must_equal(value) }
+    end
+
     describe '#to_s' do
       subject { instance.to_s }
 

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

@@ -32,13 +32,15 @@ module Vedeu
     end
 
     describe '#initialize' do
-      it { instance.must_be_instance_of(Compositor) }
+      it { instance.must_be_instance_of(described) }
       it { instance.instance_variable_get('@name').must_equal(_name) }
     end
 
     describe '.compose' do
       subject { described.compose(_name) }
 
+      it { subject.must_be_instance_of(Array) }
+      it { subject.first.must_be_instance_of(Vedeu::Interface) }
     end
 
   end # Compositor