vedeu 0.6.56 → 0.6.57

data/lib/vedeu/geometry/dimension.rb

@@ -28,6 +28,7 @@ module Vedeu
       # Returns a new instance of Vedeu::Geometry::Dimension.
       #
       # @param attributes [Hash<Symbol => Fixnum, NilClass>]
+      # @option attributes alignment [Symbol]
       # @option attributes d [Fixnum|NilClass]
       #   The starting value (y or x).
       # @option attributes dn [Fixnum|NilClass]
@@ -36,7 +37,6 @@ module Vedeu
       # @option attributes default [Fixnum|NilClass]
       #   The terminal width or height.
       # @option attributes maximised [Boolean]
-      # @option attributes alignment [Symbol]
       # @return [Vedeu::Geometry::Dimension]
       def initialize(attributes = {})
         defaults.merge!(attributes).each do |key, value|
@@ -127,7 +127,7 @@ module Vedeu
       # @return [Fixnum|NilClass]
       def length
         if d && dn
-          (d..dn).size
+          (dn - d) + 1
 
         elsif d_dn
           d_dn

data/lib/vedeu/geometry/geometry.rb

@@ -16,20 +16,26 @@ module Vedeu
       include Vedeu::Repositories::Model
 
       def_delegators :area,
-                     :north,
+                     :bordered_height,
+                     :bordered_width,
+                     :bottom,
+                     :bx,
+                     :bxn,
+                     :by,
+                     :byn,
                      :east,
+                     :height,
+                     :left,
+                     :north,
+                     :right,
                      :south,
-                     :west,
                      :top,
-                     :right,
-                     :bottom,
-                     :left,
-                     :y,
-                     :xn,
-                     :yn,
+                     :west,
+                     :width,
                      :x,
-                     :height,
-                     :width
+                     :xn,
+                     :y,
+                     :yn
 
       # @!attribute [rw] horizontal_alignment
       # @return [Symbol]
@@ -40,7 +46,7 @@ module Vedeu
       attr_accessor :vertical_alignment
 
       # @!attribute [rw] name
-      # @return [String]
+      # @return [String|Symbol]
       attr_accessor :name
 
       # @!attribute [w] height
@@ -165,50 +171,47 @@ module Vedeu
 
       # Moves the geometry down by one row.
       #
-      # @todo Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_down
         return self if yn + 1 > Vedeu.height
 
-        move(y: y + 1, yn: yn + 1)
+        move(y: y + 1, yn: yn + 1) { Vedeu.trigger(:_cursor_down_, name) }
       end
 
       # Moves the geometry left by one column.
       #
-      # @todo Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_left
         return self if x - 1 < 1
 
-        move(x: x - 1, xn: xn - 1)
+        move(x: x - 1, xn: xn - 1) { Vedeu.trigger(:_cursor_left_, name) }
       end
 
       # Moves the geometry to the top left of the terminal.
       #
-      # @todo Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_origin
-        move(x: 1, xn: (xn - x + 1), y: 1, yn: (yn - y + 1))
+        move(x: 1, xn: (xn - x + 1), y: 1, yn: (yn - y + 1)) do
+          Vedeu.trigger(:_cursor_origin_, name)
+        end
       end
 
       # Moves the geometry right by one column.
       #
-      # @todo Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_right
         return self if xn + 1 > Vedeu.width
 
-        move(x: x + 1, xn: xn + 1)
+        move(x: x + 1, xn: xn + 1) { Vedeu.trigger(:_cursor_right_, name) }
       end
 
       # Moves the geometry up by one column.
       #
-      # @todo Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_up
         return self if y - 1 < 1
 
-        move(y: y - 1, yn: yn - 1)
+        move(y: y - 1, yn: yn - 1) { Vedeu.trigger(:_cursor_up_, name) }
       end
 
       # Will unmaximise the named interface geometry. Previously, when
@@ -245,6 +248,7 @@ module Vedeu
         {
           horizontal_alignment: @horizontal_alignment,
           maximised:            @maximised,
+          name:                 name,
           vertical_alignment:   @vertical_alignment,
           x:                    @x.is_a?(Proc)      ? @x.call      : @x,
           xn:                   @xn.is_a?(Proc)     ? @xn.call     : @xn,
@@ -255,11 +259,6 @@ module Vedeu
         }
       end
 
-      # @return [Vedeu::Borders::Border]
-      def border
-        @border = Vedeu.borders.by_name(name)
-      end
-
       # When moving an interface;
       # 1) Reset the alignment and maximised states to false;
       #    it wont be aligned to a side if moved, and cannot be moved
@@ -283,7 +282,11 @@ module Vedeu
                                   vertical_alignment:   :none)
                 .merge!(coordinates)
 
-        Vedeu::Geometry::Geometry.store(attrs)
+        geometry = Vedeu::Geometry::Geometry.store(attrs)
+
+        yield if block_given?
+
+        geometry
       end
 
       # Returns the default options/attributes for this class.

data/lib/vedeu/geometry/null.rb

@@ -11,27 +11,33 @@ module Vedeu
       extend Forwardable
 
       def_delegators :area,
-                     :north,
+                     :bordered_height,
+                     :bordered_width,
+                     :bottom,
+                     :bx,
+                     :bxn,
+                     :by,
+                     :byn,
                      :east,
+                     :height,
+                     :left,
+                     :north,
+                     :right,
                      :south,
-                     :west,
                      :top,
-                     :right,
-                     :bottom,
-                     :left,
-                     :y,
-                     :xn,
-                     :yn,
+                     :west,
+                     :width,
                      :x,
-                     :height,
-                     :width
+                     :xn,
+                     :y,
+                     :yn
 
       # @!attribute [rw] maximised
       # @return [Boolean]
       attr_accessor :maximised
 
       # @!attribute [r] name
-      # @return [String|NilClass]
+      # @return [NilClass|String|Symbol]
       attr_reader :name
 
       # Returns a new instance of Vedeu::Geometry::Null.

data/lib/vedeu/interfaces/clear.rb

@@ -76,18 +76,11 @@ module Vedeu
       protected
 
       # @!attribute [r] name
-      # @return [String]
+      # @return [String|Symbol]
       attr_reader :name
 
       private
 
-      # Returns the border for the interface.
-      #
-      # @return (see Vedeu::Borders::Repository#by_name)
-      def border
-        @border ||= Vedeu.borders.by_name(name)
-      end
-
       # @return [String] A string of blank characters.
       def chars
         @chars ||= (' ' * width).freeze
@@ -126,7 +119,7 @@ module Vedeu
       # @return [Fixnum]
       def height
         @height ||= if content_only?
-                      border.height
+                      geometry.bordered_height
 
                     else
                       geometry.height
@@ -188,7 +181,7 @@ module Vedeu
       # @return [Fixnum]
       def width
         @width ||= if content_only?
-                     border.width
+                     geometry.bordered_width
 
                    else
                      geometry.width
@@ -199,7 +192,7 @@ module Vedeu
       # @return [Fixnum]
       def y
         @y ||= if content_only?
-                 border.by
+                 geometry.by
 
                else
                  geometry.y
@@ -210,7 +203,7 @@ module Vedeu
       # @return [Fixnum]
       def x
         @x ||= if content_only?
-                 border.bx
+                 geometry.bx
 
                else
                  geometry.x

data/lib/vedeu/output/viewport.rb

@@ -20,9 +20,9 @@ module Vedeu
                      :name,
                      :visible?
 
-      def_delegators :border,
-                     :height,
-                     :width
+      def_delegators :geometry,
+                     :bordered_height,
+                     :bordered_width
 
       def_delegators :cursor,
                      :ox,
@@ -106,7 +106,7 @@ module Vedeu
       #
       # @return [Range]
       def rows
-        top...(top + height)
+        top...(top + bordered_height)
       end
 
       # Using the current cursor's x position, return a range of
@@ -121,17 +121,17 @@ module Vedeu
       #
       # @return [Range]
       def columns
-        left...(left + width)
+        left...(left + bordered_width)
       end
 
       # @return [Fixnum]
       def left
-        @left ||= content_offset(ox, width)
+        @left ||= content_offset(ox, bordered_width)
       end
 
       # @return [Fixnum]
       def top
-        @top ||= content_offset(oy, height)
+        @top ||= content_offset(oy, bordered_height)
       end
 
       # Returns the offset for the content (the number of rows or
@@ -147,21 +147,21 @@ module Vedeu
         offset - dimension
       end
 
-      # Returns the border for the interface.
+      # Returns the geometry for the interface.
       #
-      # @return (see Vedeu::Borders::Repository#by_name)
-      def border
-        @border ||= Vedeu.borders.by_name(name)
+      # @return (see Vedeu::Geometry::Repository#by_name)
+      def geometry
+        @geometry ||= Vedeu.geometries.by_name(name)
       end
 
       # @return [Fixnum]
       def bx
-        @bx ||= border.bx
+        @bx ||= geometry.bx
       end
 
       # @return [Fixnum]
       def by
-        @by ||= border.by
+        @by ||= geometry.by
       end
 
       # @return [Vedeu::Cursors::Cursor]

data/lib/vedeu/plugins/plugin.rb

@@ -5,7 +5,7 @@ module Vedeu
   class Plugin
 
     # @!attribute [r] name
-    # @return [String]
+    # @return [String|Symbol]
     attr_reader :name
 
     # @!attribute [r] gem

data/lib/vedeu/repositories/repository.rb

@@ -63,9 +63,7 @@ module Vedeu
       # @param name [String|Symbol] The name of the stored model.
       # @return [void]
       def by_name(name = Vedeu.focus)
-        name = present?(name) ? name : Vedeu.focus
-
-        return find(name) if registered?(name)
+        return find(name) if present?(name) && registered?(name)
 
         null_model.new(name: name)
       end

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.56'.freeze
+  VERSION = '0.6.57'.freeze
 
 end

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

@@ -55,6 +55,8 @@ module Vedeu
           instance.must_respond_to(:bottom_left=)
           instance.must_respond_to(:bottom_right)
           instance.must_respond_to(:bottom_right=)
+          instance.must_respond_to(:caption)
+          instance.must_respond_to(:caption=)
           instance.must_respond_to(:horizontal)
           instance.must_respond_to(:horizontal=)
           instance.must_respond_to(:show_bottom)
@@ -69,6 +71,8 @@ module Vedeu
           instance.must_respond_to(:show_top)
           instance.must_respond_to(:top?)
           instance.must_respond_to(:show_top=)
+          instance.must_respond_to(:title)
+          instance.must_respond_to(:title=)
           instance.must_respond_to(:top_left)
           instance.must_respond_to(:top_left=)
           instance.must_respond_to(:top_right)
@@ -82,128 +86,6 @@ module Vedeu
         }
       end
 
-      describe 'border offset methods; bx, bxn, by, byn' do
-        let(:attributes) {
-          {
-            bottom_left:  'C',
-            bottom_right: 'D',
-            enabled:      enabled,
-            horizontal:   'H',
-            name:         _name,
-            show_top:     top,
-            show_bottom:  bottom,
-            show_left:    left,
-            show_right:   right,
-            top_left:     'A',
-            top_right:    'B',
-            vertical:     'V'
-          }
-        }
-        let(:_name)   { 'Border#bxbxnbybyn' }
-        let(:enabled) { false }
-        let(:top)     { false }
-        let(:bottom)  { false }
-        let(:left)    { false }
-        let(:right)   { false }
-        let(:geometry) {
-          Vedeu::Geometry::Geometry.new(name: _name,
-                                        x:    2,
-                                        xn:   6,
-                                        y:    2,
-                                        yn:   6)
-        }
-
-        before { Vedeu.geometries.stubs(:by_name).returns(geometry) }
-
-        describe '#bx' do
-          subject { instance.bx }
-
-          context 'when enabled' do
-            let(:enabled) { true }
-
-            context 'with left' do
-              let(:left) { true }
-
-              it { subject.must_equal(3) }
-            end
-
-            context 'without left' do
-              it { subject.must_equal(2) }
-            end
-          end
-
-          context 'when not enabled' do
-            it { subject.must_equal(2) }
-          end
-        end
-
-        describe '#bxn' do
-          subject { instance.bxn }
-
-          context 'when enabled' do
-            let(:enabled) { true }
-
-            context 'with right' do
-              let(:right) { true }
-
-              it { subject.must_equal(5) }
-            end
-
-            context 'without right' do
-              it { subject.must_equal(6) }
-            end
-          end
-
-          context 'when not enabled' do
-            it { subject.must_equal(6) }
-          end
-        end
-
-        describe '#by' do
-          subject { instance.by }
-
-          context 'when enabled' do
-            let(:enabled) { true }
-
-            context 'with top' do
-              let(:top) { true }
-
-              it { subject.must_equal(3) }
-            end
-
-            context 'without top' do
-              it { subject.must_equal(2) }
-            end
-          end
-
-          context 'when not enabled' do
-            it { subject.must_equal(2) }
-          end
-        end
-
-        describe '#byn' do
-          subject { instance.byn }
-
-          context 'when enabled' do
-            let(:enabled) { true }
-
-            context 'with bottom' do
-              let(:bottom) { true }
-
-              it { subject.must_equal(5) }
-            end
-
-            context 'without bottom' do
-              it { subject.must_equal(6) }
-            end
-          end
-
-          context 'when not enabled' do
-            it { subject.must_equal(6) }
-          end
-        end
-      end
-
       describe '#deputy' do
         subject { instance.deputy }
 
@@ -212,114 +94,6 @@ module Vedeu
         end
       end
 
-      describe '#width' do
-        let(:geometry) {
-          Vedeu::Geometry::Geometry.new(name: _name, width: 8)
-        }
-
-        before { Vedeu.geometries.stubs(:by_name).returns(geometry) }
-
-        subject { instance.width }
-
-        context 'when the border is not enabled' do
-          it 'returns the interface width' do
-            subject.must_equal(8)
-          end
-        end
-
-        context 'when the border is enabled' do
-          context 'when both left and right borders are shown' do
-            let(:attributes) {
-              {
-                enabled: true,
-                name:    _name,
-              }
-            }
-
-            it { subject.must_equal(6) }
-          end
-
-          context 'when either the left or right border is shown' do
-            let(:attributes) {
-              {
-                enabled:   true,
-                name:      _name,
-                show_left: false
-              }
-            }
-
-            it { subject.must_equal(7) }
-          end
-
-          context 'when neither left nor right borders are shown' do
-            let(:attributes) {
-              {
-                enabled:    true,
-                name:       _name,
-                show_left:  false,
-                show_right: false
-              }
-            }
-
-            it { subject.must_equal(8) }
-          end
-        end
-      end
-
-      describe '#height' do
-        let(:geometry) {
-          Vedeu::Geometry::Geometry.new(name: _name, height: 5)
-        }
-
-        before { Vedeu.geometries.stubs(:by_name).returns(geometry) }
-
-        subject { instance.height }
-
-        context 'when the border is not enabled' do
-          it 'returns the interface height' do
-            subject.must_equal(5)
-          end
-        end
-
-        context 'when the border is enabled' do
-          context 'when both top and bottom borders are shown' do
-            let(:attributes) {
-              {
-                enabled: true,
-                name:    _name,
-              }
-            }
-
-            it { subject.must_equal(3) }
-          end
-
-          context 'when either the top or bottom border is shown' do
-            let(:attributes) {
-              {
-                enabled:  true,
-                name:     _name,
-                show_top: false
-              }
-            }
-
-            it { subject.must_equal(4) }
-          end
-
-          context 'when neither top nor bottom borders are shown' do
-            let(:attributes) {
-              {
-                enabled:     true,
-                name:        _name,
-                show_top:    false,
-                show_bottom: false
-              }
-            }
-
-            it { subject.must_equal(5) }
-          end
-        end
-      end
-
       describe '#enabled?' do
         subject { instance.enabled? }