vedeu 0.4.8 → 0.4.9

data/lib/vedeu/geometry/position.rb

@@ -48,17 +48,12 @@ module Vedeu
       @x = (x.nil? || x < 1) ? 1 : x
     end
 
-    # @param other [Vedeu::Position]
-    # @return [Boolean]
-    def ==(other)
-      eql?(other)
-    end
-
     # @param other [Vedeu::Position]
     # @return [Boolean]
     def eql?(other)
       self.class == other.class && (x == other.x && y == other.y)
     end
+    alias_method :==, :eql?
 
     # Return the escape sequence required to position the cursor at a particular
     # point on the screen. When passed a block, will do the aforementioned,

data/lib/vedeu/models/cell.rb

@@ -45,12 +45,6 @@ module Vedeu
       @y          = attributes[:y]
     end
 
-    # @param other [Vedeu::Cell]
-    # @return [Boolean]
-    def ==(other)
-      eql?(other)
-    end
-
     # @param other [Vedeu::Cell]
     # @return [Boolean]
     def eql?(other)
@@ -62,6 +56,7 @@ module Vedeu
       x          == other.x          &&
       y          == other.y
     end
+    alias_method :==, :eql?
 
   end # Cell
 

data/lib/vedeu/models/char.rb

@@ -48,12 +48,6 @@ module Vedeu
       @value    = @attributes[:value]
     end
 
-    # @param other [Vedeu::Char]
-    # @return [Boolean]
-    def ==(other)
-      eql?(other)
-    end
-
     # When {Vedeu::Viewport#padded_lines} has less lines that required to fill
     # the visible area of the interface, it creates a line that contains a
     # single {Vedeu::Char} containing a space (0x20); later,
@@ -70,6 +64,7 @@ module Vedeu
     def eql?(other)
       self.class == other.class && value == other.value
     end
+    alias_method :==, :eql?
 
     # @return [String]
     def inspect

data/lib/vedeu/output/compositor.rb

@@ -30,9 +30,9 @@ module Vedeu
 
     # @return [Array<Interface>]
     def compose
-      buffer.map do |view|
-        view.colour   = interface.colour   unless view.colour
-        view.style    = interface.style    unless view.style
+      buffer.each do |view|
+        view.colour = interface.colour unless view.colour
+        view.style  = interface.style  unless view.style
 
         Vedeu::Output.render(view)
       end

data/lib/vedeu/output/viewport.rb

@@ -122,6 +122,9 @@ module Vedeu
     # Scrolls the content vertically when the stored cursor's y position for the
     # interface is outside of the visible area.
     #
+    # @note
+    #   The height is reduced by one as #rows is a range of Array elements.
+    #
     # @return [Range]
     def rows
       top..(top + (height - 1))
@@ -132,6 +135,9 @@ module Vedeu
     # Scrolls the content horizontally when the stored cursor's x position for
     # the interface is outside of the visible area.
     #
+    # @note
+    #   The width is reduced by one as #columns is a range of Array elements.
+    #
     # @return [Range]
     def columns
       left..(left + (width - 1))

data/test/lib/vedeu/distributed/server_test.rb

@@ -19,10 +19,14 @@ module Vedeu
         let(:data) {}
 
         subject { described.input(data) }
+
+        it { Vedeu.expects(:trigger); subject }
       end
 
       describe '.output' do
         subject { described.output }
+
+        it { Vedeu.expects(:trigger); subject }
       end
 
       describe '#pid' do

data/test/lib/vedeu/dsl/components/geometry_test.rb

@@ -206,12 +206,16 @@ module Vedeu
       end
 
       describe '#xn' do
+        before { Terminal.stubs(:size).returns([25, 80]) }
+
         subject { Vedeu::Geometry.build({}) { xn 15 } }
 
         it { subject.xn.must_equal(15) }
       end
 
       describe '#yn' do
+        before { Terminal.stubs(:size).returns([25, 80]) }
+
         subject { Vedeu::Geometry.build({}) { yn 8 } }
 
         it { subject.yn.must_equal(8) }

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

@@ -10,6 +10,7 @@ module Vedeu
     let(:yn)        { 9 }
     let(:x)         { 6 }
     let(:xn)        { 21 }
+    let(:offset)    { 1 }
 
     describe 'accessors and aliases' do
       it { instance.must_respond_to(:y) }
@@ -66,32 +67,119 @@ module Vedeu
       it { subject.instance_variable_get('@xn').must_equal(xn) }
     end
 
-    describe '#centre' do
-      subject { instance.centre }
+    describe '#eql?' do
+      let(:other) { described.new(y: 4, yn: 9, x: 6, xn: 21) }
 
-      it { subject.must_be_instance_of(Array) }
-      it { subject.must_equal([6, 13]) }
+      subject { instance.eql?(other) }
+
+      it { subject.must_equal(true) }
+
+      context 'when different to other' do
+        let(:other) { described.new(y: 1, yn: 25, x: 1, xn: 40) }
+
+        it { subject.must_equal(false) }
+      end
     end
 
     describe '#centre' do
       subject { instance.centre }
 
       it { subject.must_be_instance_of(Array) }
-      it { subject.must_equal([6, 13]) }
+      it { subject.must_equal([7, 14]) }
     end
 
     describe '#centre_y' do
       subject { instance.centre_y }
 
       it { subject.must_be_instance_of(Fixnum) }
-      it { subject.must_equal(6) }
+      it { subject.must_equal(7) }
     end
 
     describe '#centre_x' do
       subject { instance.centre_x }
 
       it { subject.must_be_instance_of(Fixnum) }
-      it { subject.must_equal(13) }
+      it { subject.must_equal(14) }
+    end
+
+    describe '#north' do
+      subject { instance.north(offset) }
+
+      context 'with the default offset' do
+        it { subject.must_equal(3) }
+      end
+
+      context 'with a negative offset' do
+        let(:offset) { -2 }
+
+        it { subject.must_equal(6) }
+      end
+
+      context 'with a positive offset' do
+        let(:offset) { 2 }
+
+        it { subject.must_equal(2) }
+      end
+    end
+
+    describe '#east' do
+      subject { instance.east(offset) }
+
+      context 'with the default offset' do
+        it { subject.must_equal(22) }
+      end
+
+      context 'with a negative offset' do
+        let(:offset) { -2 }
+
+        it { subject.must_equal(19) }
+      end
+
+      context 'with a positive offset' do
+        let(:offset) { 2 }
+
+        it { subject.must_equal(23) }
+      end
+    end
+
+    describe '#south' do
+      subject { instance.south(offset) }
+
+      context 'with the default offset' do
+        it { subject.must_equal(10) }
+      end
+
+      context 'with a negative offset' do
+        let(:offset) { -2 }
+
+        it { subject.must_equal(7) }
+      end
+
+      context 'with a positive offset' do
+        let(:offset) { 2 }
+
+        it { subject.must_equal(11) }
+      end
+    end
+
+    describe '#west' do
+      subject { instance.west(offset) }
+
+      context 'with the default offset' do
+        it { subject.must_equal(5) }
+      end
+
+      context 'with a negative offset' do
+        let(:offset) { -2 }
+
+        it { subject.must_equal(8) }
+      end
+
+      context 'with a positive offset' do
+        let(:offset) { 2 }
+
+        it { subject.must_equal(4) }
+      end
     end
 
   end # Area

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

@@ -20,7 +20,7 @@ module Vedeu
     end
 
     describe '#c' do
-      it { instance.c.must_equal([13, 40]) }
+      it { instance.c.must_equal([13, 41]) }
       it { instance.must_respond_to(:centre) }
     end
 
@@ -30,7 +30,7 @@ module Vedeu
     end
 
     describe '#cx' do
-      it { instance.cx.must_equal(40) }
+      it { instance.cx.must_equal(41) }
       it { instance.must_respond_to(:centre_x) }
     end
 
@@ -39,6 +39,14 @@ module Vedeu
       it { instance.must_respond_to(:origin) }
     end
 
+    describe '#height' do
+      it { instance.height.must_equal(25) }
+    end
+
+    describe '#width' do
+      it { instance.width.must_equal(80) }
+    end
+
     describe '#y' do
       it { instance.y.must_equal(1) }
       it { instance.must_respond_to(:top) }

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

@@ -11,13 +11,15 @@ module Vedeu
         d:       d,
         dn:      dn,
         d_dn:    d_dn,
-        default: default
+        default: default,
+        options: options,
       }
     }
     let(:d)       {}
     let(:dn)      {}
     let(:d_dn)    {}
     let(:default) {}
+    let(:options) { {} }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(Vedeu::Dimension) }
@@ -25,16 +27,39 @@ module Vedeu
       it { instance.instance_variable_get('@dn').must_equal(dn) }
       it { instance.instance_variable_get('@d_dn').must_equal(d_dn) }
       it { instance.instance_variable_get('@default').must_equal(default) }
+      it { instance.instance_variable_get('@options').must_equal(options) }
     end
 
     describe '.pair' do
-      let(:d)  { 5 }
-      let(:dn) { 8 }
+      let(:d)  { 15 }
+      let(:dn) { 38 }
 
       subject { described.pair(attributes) }
 
       it { subject.must_be_instance_of(Array) }
-      it { subject.must_equal([5, 8]) }
+      it { subject.must_equal([15, 38]) }
+
+      context 'when centred and a length can be determined' do
+        let(:options) { { centred: true } }
+        let(:default) { 80 }
+
+        context 'when d and dn are given' do
+          let(:d)  { 7 }
+          let(:dn) { 47 }
+
+          it { subject.must_equal([20, 60]) }
+        end
+
+        context 'when only a d_dn is given' do
+          let(:d_dn) { 30 }
+
+          it { subject.must_equal([28, 52]) }
+        end
+
+        context 'when only a default is given' do
+          it { subject.must_equal([28, 52]) }
+        end
+      end
     end
 
     describe '#d1' do
@@ -42,55 +67,109 @@ module Vedeu
 
       it { subject.must_be_instance_of(Fixnum) }
 
-      context 'when d is given' do
-        let(:d) { 5 }
+      context 'when not centred and/or a length cannot be determined' do
+        context 'when d is given' do
+          let(:d) { 5 }
 
-        it { subject.must_equal(5) }
+          it { subject.must_equal(5) }
+        end
+
+        context 'when d is not given' do
+          it { subject.must_equal(1) }
+        end
       end
 
-      context 'when d is not given' do
-        it { subject.must_equal(1) }
+      context 'when centred and a length can be determined' do
+        let(:options) { { centred: true } }
+        let(:default) { 80 }
+
+        context 'when d and dn are given' do
+          let(:d)  { 7 }
+          let(:dn) { 47 }
+
+          it { subject.must_equal(20) }
+        end
+
+        context 'when only a d_dn is given' do
+          let(:d_dn) { 30 }
+
+          it { subject.must_equal(25) }
+        end
+
+        context 'when only a default is given' do
+          it { subject.must_equal(1) }
+        end
       end
     end
 
     describe '#d2' do
       subject { instance.d2 }
 
-      context 'when d and dn is given' do
-        let(:d)  { 5 }
-        let(:dn) { 8 }
+      context 'when not centred and/or a length cannot be determined' do
+        context 'when d and dn are given' do
+          let(:d)  { 5 }
+          let(:dn) { 8 }
 
-        it { subject.must_equal(8) }
-      end
+          it { subject.must_equal(8) }
+        end
 
-      context 'when d and d_dn is given' do
-        let(:d)    { 5 }
-        let(:d_dn) { 2 }
+        context 'when d and d_dn are given' do
+          let(:d)    { 5 }
+          let(:d_dn) { 2 }
 
-        it { subject.must_equal(7) }
-      end
+          it { subject.must_equal(7) }
+        end
 
-      context 'when only d_dn is given' do
-        let(:d_dn) { 6 }
+        context 'when only d_dn is given' do
+          let(:d_dn) { 6 }
 
-        it { subject.must_equal(6) }
-      end
+          it { subject.must_equal(6) }
+        end
 
-      context 'when d and a default is given' do
-        let(:d)       { 1 }
-        let(:default) { 40 }
+        context 'when only dn is given' do
+          let(:dn) { 8 }
 
-        it { subject.must_equal(40) }
-      end
+          it { subject.must_equal(8) }
+        end
+
+        context 'when d and a default is given' do
+          let(:d)       { 1 }
+          let(:default) { 40 }
+
+          it { subject.must_equal(40) }
+        end
 
-      context 'when only a default is given' do
-        let(:default) { 25 }
+        context 'when only a default is given' do
+          let(:default) { 25 }
 
-        it { subject.must_equal(25) }
+          it { subject.must_equal(25) }
+        end
+
+        context 'when no default is given' do
+          it { subject.must_equal(nil) }
+        end
       end
 
-      context 'when no default is given' do
-        it { subject.must_equal(nil) }
+      context 'when centred and a length can be determined' do
+        let(:options) { { centred: true } }
+        let(:default) { 80 }
+
+        context 'when d and dn are given' do
+          let(:d)  { 7 }
+          let(:dn) { 47 }
+
+          it { subject.must_equal(60) }
+        end
+
+        context 'when only a d_dn is given' do
+          let(:d_dn) { 30 }
+
+          it { subject.must_equal(55) }
+        end
+
+        context 'when only a default is given' do
+          it { subject.must_equal(80) }
+        end
       end
     end