vedeu 0.8.4 → 0.8.5

data/test/lib/vedeu/geometries/dsl/dsl_test.rb

@@ -39,129 +39,6 @@ module Vedeu
         end
       end
 
-      describe '#align' do
-        let(:vertical)   { :top }
-        let(:horizontal) { :left }
-        let(:width)      { 20 }
-        let(:height)     { 20 }
-
-        subject { instance.align(vertical, horizontal, width, height) }
-
-        context 'when the vertical argument is not given' do
-          let(:vertical) {}
-
-          it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax).
-                                message.must_match(/No vertical alignment/)
-          }
-        end
-
-        context 'when the vertical argument is given' do
-          context 'when the height is not given' do
-            let(:height) {}
-
-            it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax).
-                                  message.must_equal('No height given.')
-            }
-          end
-
-          context 'when the height is given' do
-            it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
-            it { subject.vertical_alignment.
-              must_be_instance_of(Vedeu::Coercers::VerticalAlignment) }
-            it { subject.horizontal_alignment.
-              must_be_instance_of(Vedeu::Coercers::HorizontalAlignment) }
-            it { subject.height.must_equal(20) }
-            it { subject.width.must_equal(20) }
-          end
-        end
-
-        context 'when the horizontal argument is not given' do
-          let(:horizontal) {}
-
-          it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax).
-                                message.must_match(/No horizontal alignment/)
-          }
-        end
-
-        context 'when the horizontal argument is given' do
-          context 'when the width is not given' do
-            let(:width) {}
-
-            it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax).
-                                  message.must_equal('No width given.')
-            }
-          end
-
-          context 'when the width is given' do
-            it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
-            it { subject.vertical_alignment.
-              must_be_instance_of(Vedeu::Coercers::VerticalAlignment) }
-            it { subject.horizontal_alignment.
-              must_be_instance_of(Vedeu::Coercers::HorizontalAlignment) }
-            it { subject.height.must_equal(20) }
-            it { subject.width.must_equal(20) }
-          end
-        end
-      end
-
-      describe '#horizontal_alignment' do
-        let(:_value) {}
-        let(:width)  {}
-
-        subject { instance.horizontal_alignment(_value, width) }
-
-        context 'when the value is not given' do
-          it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax).
-                                message.must_match(/No horizontal alignment/)
-          }
-        end
-
-        context 'when the value is given' do
-          let(:_value) { :right }
-
-          context 'when a width is not given' do
-            it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax).
-                                  message.must_equal('No width given.')
-            }
-          end
-
-          context 'when a width is given' do
-            let(:width) { 20 }
-
-            it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
-          end
-        end
-      end
-
-      describe '#vertical_alignment' do
-        let(:_value) {}
-        let(:height) {}
-
-        subject { instance.vertical_alignment(_value, height) }
-
-        context 'when the value is not given' do
-          it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax).
-                                message.must_match(/No vertical alignment/)
-          }
-        end
-
-        context 'when the value is given' do
-          let(:_value) { :bottom }
-
-          context 'when a height is not given' do
-            it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax).
-                                  message.must_equal('No height given.')
-            }
-          end
-
-          context 'when a height is given' do
-            let(:height) { 20 }
-
-            it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
-          end
-        end
-      end
-
       describe '#align_bottom' do
         let(:height) { 20 }
 
@@ -170,12 +47,6 @@ module Vedeu
         context 'when a height is given' do
           it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
         end
-
-        context 'when a height is not given' do
-          let(:height) {}
-
-          it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax) }
-        end
       end
 
       describe '#align_centre' do
@@ -186,12 +57,6 @@ module Vedeu
         context 'when a width is given' do
           it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
         end
-
-        context 'when a width is not given' do
-          let(:width) {}
-
-          it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax) }
-        end
       end
 
       describe '#align_center' do
@@ -204,12 +69,7 @@ module Vedeu
         subject { instance.align_left(width) }
 
         context 'when a width is given' do
-        end
-
-        context 'when a width is not given' do
-          let(:width) {}
-
-          it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax) }
+          it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
         end
       end
 
@@ -221,12 +81,6 @@ module Vedeu
         context 'when a height is given' do
           it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
         end
-
-        context 'when a height is not given' do
-          let(:height) {}
-
-          it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax) }
-        end
       end
 
       describe '#align_right' do
@@ -235,12 +89,7 @@ module Vedeu
         subject { instance.align_right(width) }
 
         context 'when a width is given' do
-        end
-
-        context 'when a width is not given' do
-          let(:width) {}
-
-          it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax) }
+          it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
         end
       end
 
@@ -252,12 +101,6 @@ module Vedeu
         context 'when a height is given' do
           it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
         end
-
-        context 'when a height is not given' do
-          let(:height) {}
-
-          it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax) }
-        end
       end
 
       describe '#columns' do

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

@@ -13,26 +13,48 @@ module Vedeu
       let(:y)         { 12 }
       let(:x)         { 19 }
 
-      describe '#y' do
-        it { instance.must_respond_to(:y) }
-      end
-
-      describe '#first' do
-        it { instance.must_respond_to(:first) }
-      end
+      let(:term_height) { 15 }
+      let(:term_width)  { 20 }
 
-      describe '#x' do
-        it { instance.must_respond_to(:x) }
-      end
-
-      describe '#last' do
-        it { instance.must_respond_to(:last) }
+      before do
+        Vedeu.stubs(:height).returns(term_height)
+        Vedeu.stubs(:width).returns(term_width)
       end
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@y').must_equal(y) }
-        it { instance.instance_variable_get('@x').must_equal(x) }
+
+        context 'when y < 1' do
+          let(:y) { -3 }
+
+          it { instance.instance_variable_get('@y').must_equal(1) }
+        end
+
+        context 'when y > Vedeu.height' do
+          let(:y) { 17 }
+
+          it { instance.instance_variable_get('@y').must_equal(term_height) }
+        end
+
+        context 'when y >= 1 and y <= Vedeu.height' do
+          it { instance.instance_variable_get('@y').must_equal(y) }
+        end
+
+        context 'when x < 1' do
+          let(:x) { -2 }
+
+          it { instance.instance_variable_get('@x').must_equal(1) }
+        end
+
+        context 'when x > Vedeu.width' do
+          let(:x) { 23 }
+
+          it { instance.instance_variable_get('@x').must_equal(term_width) }
+        end
+
+        context 'when x >= 1 and x <= Vedeu.height' do
+          it { instance.instance_variable_get('@x').must_equal(x) }
+        end
       end
 
       describe '.[]' do
@@ -68,30 +90,6 @@ module Vedeu
         end
       end
 
-      describe '#<=>' do
-        subject { instance.<=>(other) }
-
-        context 'when y is the same as other.y' do
-          context 'when x is the same as other.x' do
-            let(:other) { described.new(12, 19) }
-
-            it { subject.must_equal(0) }
-          end
-
-          context 'when x is different to other.x' do
-            let(:other) { described.new(12, 21) }
-
-            it { subject.must_equal(-1) }
-          end
-        end
-
-        context 'when y is different to other.y' do
-          let(:other) { described.new(14, 19) }
-
-          it { subject.must_equal(-1) }
-        end
-      end
-
       describe '.coerce' do
         let(:_value) {}
 
@@ -127,6 +125,12 @@ module Vedeu
           it { subject.x.must_equal(9) }
         end
 
+        context 'when the value is a NilClass' do
+          let(:_value) {}
+
+          it { subject.must_be_instance_of(NilClass) }
+        end
+
         context 'when the value is something unhandled' do
           let(:_value) { :invalid }
 
@@ -134,6 +138,30 @@ module Vedeu
         end
       end
 
+      describe '#<=>' do
+        subject { instance.<=>(other) }
+
+        context 'when y is the same as other.y' do
+          context 'when x is the same as other.x' do
+            let(:other) { described.new(12, 19) }
+
+            it { subject.must_equal(0) }
+          end
+
+          context 'when x is different to other.x' do
+            let(:other) { described.new(12, 21) }
+
+            it { subject.must_equal(-1) }
+          end
+        end
+
+        context 'when y is different to other.y' do
+          let(:other) { described.new(14, 19) }
+
+          it { subject.must_equal(-1) }
+        end
+      end
+
       describe '#eql?' do
         let(:other) { described.new(12, 19) }
 
@@ -148,6 +176,14 @@ module Vedeu
         end
       end
 
+      describe '#first' do
+        it { instance.must_respond_to(:first) }
+      end
+
+      describe '#last' do
+        it { instance.must_respond_to(:last) }
+      end
+
       describe '#to_a' do
         subject { instance.to_a }
 
@@ -226,6 +262,14 @@ module Vedeu
         end
       end
 
+      describe '#x' do
+        it { instance.must_respond_to(:x) }
+      end
+
+      describe '#y' do
+        it { instance.must_respond_to(:y) }
+      end
+
       describe '#as_indices' do
         subject { instance.as_indices }
 
@@ -247,27 +291,33 @@ module Vedeu
       describe '#down' do
         subject { instance.down }
 
-        it { subject.must_be_instance_of(described) }
-        it { subject.y.must_equal(13) }
-        it { subject.x.must_equal(19) }
+        context 'when moving down is inside the terminal boundary' do
+          it { subject.must_be_instance_of(described) }
+          it { subject.wont_equal(instance) }
+          it { subject.y.must_equal(13) }
+        end
 
-        context 'when y is 0' do
-          let(:y) { 0 }
+        context 'when moving down is not inside the terminal boundary' do
+          let(:y) { 15 }
 
-          it { subject.y.must_equal(2) }
+          it { subject.must_equal(instance) }
+          it { subject.y.must_equal(15) }
         end
       end
 
       describe '#left' do
         subject { instance.left }
 
-        it { subject.must_be_instance_of(described) }
-        it { subject.y.must_equal(12) }
-        it { subject.x.must_equal(18) }
+        context 'when moving left is inside the terminal boundary' do
+          it { subject.must_be_instance_of(described) }
+          it { subject.wont_equal(instance) }
+          it { subject.x.must_equal(18) }
+        end
 
-        context 'when x is 0' do
-          let(:x) { 0 }
+        context 'when moving left is not inside the terminal boundary' do
+          let(:x) { 1 }
 
+          it { subject.must_equal(instance) }
           it { subject.x.must_equal(1) }
         end
       end
@@ -275,27 +325,35 @@ module Vedeu
       describe '#right' do
         subject { instance.right }
 
-        it { subject.must_be_instance_of(described) }
-        it { subject.y.must_equal(12) }
         it { subject.x.must_equal(20) }
 
-        context 'when x is 0' do
-          let(:x) { 0 }
+        context 'when moving right is inside the terminal boundary' do
+          it { subject.must_be_instance_of(described) }
+          it { subject.wont_equal(instance) }
+          it { subject.x.must_equal(20) }
+        end
 
-          it { subject.x.must_equal(2) }
+        context 'when moving right is not inside the terminal boundary' do
+          let(:x) { 20 }
+
+          it { subject.must_equal(instance) }
+          it { subject.x.must_equal(20) }
         end
       end
 
       describe '#up' do
         subject { instance.up }
 
-        it { subject.must_be_instance_of(described) }
-        it { subject.y.must_equal(11) }
-        it { subject.x.must_equal(19) }
+        context 'when moving up is inside the terminal boundary' do
+          it { subject.must_be_instance_of(described) }
+          it { subject.wont_equal(instance) }
+          it { subject.y.must_equal(11) }
+        end
 
-        context 'when y is 0' do
-          let(:y) { 0 }
+        context 'when moving up is not inside the terminal boundary' do
+          let(:y) { 1 }
 
+          it { subject.must_equal(instance) }
           it { subject.y.must_equal(1) }
         end
       end