vedeu 0.4.14 → 0.4.15

data/lib/vedeu/cursor/refresh_cursor.rb

@@ -5,6 +5,12 @@ module Vedeu
   #
   class RefreshCursor
 
+    extend Forwardable
+
+    def_delegators :border,
+                   :height,
+                   :width
+
     # @param (see #initialize)
     def self.render(name = Vedeu.focus)
       new(name).render
@@ -35,7 +41,7 @@ module Vedeu
 
     # @return [Boolean]
     def refresh_view?
-      new_cursor.ox >= interface_width || new_cursor.oy >= interface_height
+      new_cursor.ox >= width || new_cursor.oy >= height
     end
 
     # @return [Vedeu::Cursor]
@@ -53,29 +59,17 @@ module Vedeu
 
     # @return [Vedeu::PositionValidator]
     def validated_position
-      @position ||= Vedeu::PositionValidator.validate(interface.name,
-                                                      cursor.x,
-                                                      cursor.y)
+      @position ||= Vedeu::PositionValidator.validate(name, cursor.x, cursor.y)
     end
 
     # @return [Vedeu::Cursor]
     def cursor
-      @cursor ||= Vedeu.cursors.find(name)
-    end
-
-    # @return [Fixnum]
-    def interface_height
-      interface.border.height
-    end
-
-    # @return [Fixnum]
-    def interface_width
-      interface.border.width
+      @cursor ||= Vedeu.cursors.by_name(name)
     end
 
-    # @return [Vedeu::Interface]
-    def interface
-      @interface ||= Vedeu.interfaces.find(name)
+    # @return (see Vedeu::Borders#by_name)
+    def border
+      @border ||= Vedeu.borders.by_name(name)
     end
 
   end # RefreshCursor

data/lib/vedeu/debug.rb

@@ -6,7 +6,9 @@ module Vedeu
   #
   # @param filename [String]
   # @param block [Proc]
-  def self.debug(filename = 'profile.html', &block)
+  def self.debug(filename = 'profile.html')
+    return nil unless block_given?
+
     require 'ruby-prof'
 
     RubyProf.measure_mode = RubyProf::WALL_TIME

data/lib/vedeu/geometry/area.rb

@@ -168,8 +168,6 @@ module Vedeu
       Vedeu::Position[yn, xn]
     end
 
-    private
-
   end # Area
 
 end # Vedeu

data/lib/vedeu/geometry/coordinate.rb

@@ -244,6 +244,16 @@ module Vedeu
       (y...yn).to_a
     end
 
+    private
+
+    # @!attribute [r] name
+    # @return [String]
+    attr_reader :name
+
+    def border
+      @border ||= Vedeu.borders.by_name(name)
+    end
+
   end # Coordinate
 
 end # Vedeu

data/lib/vedeu/geometry/dimension.rb

@@ -63,26 +63,10 @@ module Vedeu
     # @return [Array<Fixnum>]
     def dimension
       @dimension ||= if centred? && length?
-                       [(default / 2) - (length / 2),
-                        (default / 2) + (length / 2)]
-
-                     elsif d && dn
-                       [d, dn]
-
-                     elsif d && d_dn
-                       [d, ((d + d_dn) - 1)]
-
-                     elsif d_dn
-                       [1, d_dn]
-
-                     elsif d
-                       [d, default]
-
-                     elsif dn
-                       [1, dn]
+                       [centred_d, centred_dn]
 
                      else
-                       [1, default]
+                       [_d, _dn]
 
                      end
     end
@@ -111,6 +95,38 @@ module Vedeu
       options[:centred]
     end
 
+    # @return [Fixnum]
+    def centred_d
+      (default / 2) - (length / 2)
+    end
+
+    # @return [Fixnum]
+    def centred_dn
+      (default / 2) + (length / 2)
+    end
+
+    # @return [Fixnum]
+    def _d
+      d || 1
+    end
+
+    # @return [Fixnum]
+    def _dn
+      if dn
+        dn
+
+      elsif d.nil? && d_dn
+        d_dn
+
+      elsif d && d_dn
+        (d + d_dn) - 1
+
+      else
+        default
+
+      end
+    end
+
     # @return [Hash<Symbol => Boolean>]
     def options
       defaults.merge!(@options)

data/lib/vedeu/geometry/null_geometry.rb

@@ -26,8 +26,17 @@ module Vedeu
                    :bottom_left,
                    :bottom_right
 
+    # @!attribute [r] name
+    # @return [String|NilClass]
+    attr_reader :name
+
+    # Returns a new instance of Vedeu::NullGeometry.
+    #
+    # @param name [String|NilClass]
     # @return [Vedeu::NullGeometry]
-    def initialize; end
+    def initialize(name = nil)
+      @name = name
+    end
 
     # @return [FalseClass]
     def centred

data/lib/vedeu/geometry/position.rb

@@ -58,7 +58,7 @@ module Vedeu
     #
     # @param block [Proc]
     # @return [String]
-    def to_s(&block)
+    def to_s
       if block_given?
         [sequence, yield, sequence].join
 

data/lib/vedeu/geometry/position_validator.rb

@@ -112,12 +112,12 @@ module Vedeu
       self
     end
 
-    # @return [Vedeu::Border|Vedeu::NullBorder|NilClass]
+    # @return (see Vedeu::Borders#by_name)
     def border
       @border ||= Vedeu.borders.by_name(name)
     end
 
-    # @return [Vedeu::Geometry|Vedeu::NullGeometry]
+    # @return (see Vedeu::Geometries#by_name)
     def geometry
       @geometry ||= Vedeu.geometries.by_name(name)
     end

data/lib/vedeu/input/mapper.rb

@@ -48,9 +48,9 @@ module Vedeu
 
       return true if key_defined? && keymap.use(key)
 
-      return true if global_key? && keymap(global).use(key)
+      return true if global_key? && keymap('_global_').use(key)
 
-      return true if system_key? && keymap(system).use(key)
+      return true if system_key? && keymap('_system_').use(key)
 
       false
     end
@@ -79,14 +79,14 @@ module Vedeu
     #
     # @return [Boolean]
     def global_key?
-      key_defined?(global)
+      key_defined?('_global_')
     end
 
     # Is the key a system key?
     #
     # @return [Boolean]
     def system_key?
-      key_defined?(system)
+      key_defined?('_system_')
     end
 
     # Is the key defined in the named keymap?
@@ -122,20 +122,6 @@ module Vedeu
     end
     alias_method :interface, :name
 
-    # Return the name of the global keymap.
-    #
-    # @return [String]
-    def global
-      '_global_'
-    end
-
-    # Return the name of the system keymap.
-    #
-    # @return [String]
-    def system
-      '_system_'
-    end
-
   end # Mapper
 
 end # Vedeu

data/lib/vedeu/main_loop.rb

@@ -17,7 +17,7 @@ module Vedeu
     #
     # @param block [Proc]
     # @return [void]
-    def self.start!(&block)
+    def self.start!
       @started = true
       @loop    = true
 
@@ -37,8 +37,6 @@ module Vedeu
       @loop = false
     end
 
-    private
-
     # Check the application has started and we wish to continue running.
     #
     # @raise [VedeuInterrupt] When we wish to terminate the running application.

data/lib/vedeu/models/cell.rb

@@ -4,13 +4,9 @@ module Vedeu
   #
   class Cell
 
-    # @!attribute [r] background
+    # @!attribute [r] colour
     # @return [NilClass|String]
-    attr_reader :background
-
-    # @!attribute [r] foreground
-    # @return [NilClass|String]
-    attr_reader :foreground
+    attr_reader :colour
 
     # @!attribute [r] style
     # @return [NilClass|Array<Symbol|String>|Symbol|String]
@@ -32,28 +28,26 @@ module Vedeu
     #
     # @param attributes [Hash<Symbol => Array<Symbol|String>,
     #                                   Fixnum, String, Symbol]
-    # @option attributes background [NilClass|String]
-    # @option attributes foreground [NilClass|String]
+    # @option attributes colour [NilClass|String]
     # @option attributes style [NilClass|Array<Symbol|String>|Symbol|String]
     # @option attributes value [NilClass|String]
     # @option attributes x [NilClass|Fixnum]
     # @option attributes y [NilClass|Fixnum]
     # @return [Vedeu::Cell]
     def initialize(attributes = {})
-      @background = attributes[:background]
-      @foreground = attributes[:foreground]
-      @style      = attributes[:style]
-      @value      = attributes[:value]
-      @x          = attributes[:x]
-      @y          = attributes[:y]
+      @colour = attributes[:colour]
+      @style  = attributes[:style]
+      @value  = attributes[:value]
+      @x      = attributes[:x]
+      @y      = attributes[:y]
     end
 
     # @param other [Vedeu::Cell]
     # @return [Boolean]
     def eql?(other)
-      self.class == other.class && background == other.background &&
-        foreground == other.foreground && style == other.style &&
-        value == other.value && x == other.x && y == other.y
+      self.class == other.class && colour == other.colour &&
+        style == other.style && value == other.value && x == other.x &&
+        y == other.y
     end
     alias_method :==, :eql?
 

data/lib/vedeu/models/interface.rb

@@ -114,13 +114,6 @@ module Vedeu
       }
     end
 
-    # Returns a boolean indicating whether the interface has a border.
-    #
-    # @return [Boolean]
-    def border?
-      Vedeu.borders.registered?(name)
-    end
-
     # Returns the border object belonging to the interface.
     #
     # @return [Vedeu::Border|NilClass]

data/lib/vedeu/output/border.rb

@@ -13,8 +13,18 @@ module Vedeu
   #
   class Border
 
+    extend Forwardable
     include Vedeu::Common
     include Vedeu::Model
+    include Vedeu::Presentation
+
+    def_delegators :geometry,
+                   :x,
+                   :xn,
+                   :y,
+                   :yn
+
+    def_delegators :interface, :visible?
 
     # @!attribute [rw] attributes
     # @return [Hash]
@@ -91,7 +101,7 @@ module Vedeu
     # @option attributes bottom_left [String] The bottom left border character.
     # @option attributes bottom_right [String] The bottom right border
     #   character.
-    # @option attributes colour []
+    # @option attributes colour [Hash]
     # @option attributes enabled [Boolean] Indicate whether the border is to be
     #   shown for this interface.
     # @option attributes horizontal [String] The horizontal border character.
@@ -127,37 +137,29 @@ module Vedeu
       @horizontal   = @attributes[:horizontal]
       @vertical     = @attributes[:vertical]
       @name         = @attributes[:name]
-      @colour       = @attributes[:colour]
       @repository   = Vedeu.borders
+      @colour       = @attributes[:colour]
       @style        = @attributes[:style]
     end
 
     # @return [Fixnum]
     def bx
-      bo = (enabled? && left?) ? 1 : 0
-
-      geometry.x + bo
+      (enabled? && left?) ? x + 1 : x
     end
 
     # @return [Fixnum]
     def bxn
-      bo = (enabled? && right?) ? 1 : 0
-
-      geometry.xn - bo
+      (enabled? && right?) ? xn - 1 : xn
     end
 
     # @return [Fixnum]
     def by
-      bo = (enabled? && top?) ? 1 : 0
-
-      geometry.y + bo
+      (enabled? && top?) ? y + 1 : y
     end
 
     # @return [Fixnum]
     def byn
-      bo = (enabled? && bottom?) ? 1 : 0
-
-      geometry.yn - bo
+      (enabled? && bottom?) ? yn - 1 : yn
     end
 
     # Returns the width of the interface determined by whether a left, right,
@@ -176,21 +178,9 @@ module Vedeu
       (by..byn).size
     end
 
-    # @return [Vedeu::Colour]
-    def colour
-      Vedeu::Colour.coerce(@colour)
-    end
-
-    # Set the border colour.
-    #
-    # @return [Vedeu::Colour]
-    def colour=(value)
-      @colour = Vedeu::Colour.coerce(value)
-    end
-
     # @return [Array<Array<Vedeu::Char>>]
     def render
-      return [] unless interface.visible?
+      return [] unless visible?
       return [] unless enabled?
 
       out = [top, bottom]
@@ -202,16 +192,9 @@ module Vedeu
       out.flatten
     end
 
-    # @return [Vedeu::Style]
-    def style
-      Vedeu::Style.coerce(@style)
-    end
-
-    # Set the border style.
-    #
-    # @return [Vedeu::Style]
-    def style=(value)
-      @style = Vedeu::Style.coerce(value)
+    # @return [String]
+    def to_s
+      Vedeu::TextRenderer.render(render)
     end
 
     # Renders the bottom border for the interface.
@@ -267,9 +250,7 @@ module Vedeu
         out << titlebar
 
       else
-        width.times do |ix|
-          out << border(horizontal, prefix_horizontal, nil, ix)
-        end
+        out << horizontal_border(prefix_horizontal)
 
       end
 
@@ -277,10 +258,11 @@ module Vedeu
       out
     end
 
+    # @param position [Symbol] Either :top_horizontal, or :bottom_horizontal.
     # @return [Array<Vedeu::Char>]
-    def horizontal_border
+    def horizontal_border(position)
       width.times.inject([]) do |a, ix|
-        a << border(horizontal, :top_horizontal, nil, ix)
+        a << border(horizontal, position, nil, ix)
         a
       end
     end
@@ -290,7 +272,7 @@ module Vedeu
     #
     # @return [Array<Vedeu::Char>]
     def titlebar
-      horizontal_border.each_with_index do |char, index|
+      horizontal_border(:top_horizontal).each_with_index do |char, index|
         if index >= 1 && index <= title_characters.size
           char.border = nil
           char.value  = title_characters[(index - 1)]
@@ -359,8 +341,7 @@ module Vedeu
 
     # @return [Vedeu::Geometry]
     def geometry
-      # @geometry ||= Vedeu.geometry.find(name)
-      interface.geometry
+      @geometry ||= Vedeu.geometries.by_name(name)
     end
 
     # @return [Vedeu::Interface]
@@ -402,22 +383,14 @@ module Vedeu
     # @return [Vedeu::Position]
     def position(name, iy = 0, ix = 0)
       case name
-      when :top_horizontal
-        Vedeu::Position[geometry.y, (bx + ix)]
-
-      when :bottom_horizontal
-        Vedeu::Position[geometry.yn, (bx + ix)]
-
-      when :left_vertical
-        Vedeu::Position[(by + iy), geometry.x]
-
-      when :right_vertical
-        Vedeu::Position[(by + iy), geometry.xn]
-
-      when :bottom_left  then geometry.bottom_left
-      when :bottom_right then geometry.bottom_right
-      when :top_left     then geometry.top_left
-      when :top_right    then geometry.top_right
+      when :top_horizontal    then Vedeu::Position[y, (bx + ix)]
+      when :bottom_horizontal then Vedeu::Position[yn, (bx + ix)]
+      when :left_vertical     then Vedeu::Position[(by + iy), x]
+      when :right_vertical    then Vedeu::Position[(by + iy), xn]
+      when :bottom_left       then geometry.bottom_left
+      when :bottom_right      then geometry.bottom_right
+      when :top_left          then geometry.top_left
+      when :top_right         then geometry.top_right
       end
     end