vedeu 0.4.16 → 0.4.17

data/lib/vedeu/dsl/stream.rb

@@ -11,8 +11,7 @@ module Vedeu
     class Stream
 
       include Vedeu::DSL
-      include Vedeu::DSL::Colour
-      include Vedeu::DSL::Style
+      include Vedeu::DSL::Presentation
       include Vedeu::DSL::Text
 
       # Returns an instance of DSL::Stream.

data/lib/vedeu/geometry/geometry.rb

@@ -94,23 +94,19 @@ module Vedeu
     # @option attributes centred [Boolean]
     # @option attributes height [Fixnum]
     # @option attributes name [String]
+    # @option attributes repository [Vedeu::Geometries]
     # @option attributes width [Fixnum]
     # @option attributes x [Fixnum]
     # @option attributes xn [Fixnum]
     # @option attributes y [Fixnum]
     # @option attributes yn [Fixnum]
-    # @return [Geometry]
+    # @return [Vedeu::Geometry]
     def initialize(attributes = {})
-      @attributes = attributes
-      @centred    = @attributes[:centred]
-      @height     = @attributes[:height]
-      @name       = @attributes[:name]
-      @width      = @attributes[:width]
-      @x          = @attributes[:x]
-      @xn         = @attributes[:xn]
-      @y          = @attributes[:y]
-      @yn         = @attributes[:yn]
-      @repository = Vedeu.geometries
+      @attributes = defaults.merge!(attributes)
+
+      @attributes.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
     end
 
     private
@@ -166,6 +162,21 @@ module Vedeu
       @xn.is_a?(Proc) ? @xn.call : @xn
     end
 
+    # @return [Hash]
+    def defaults
+      {
+        centred:    nil,
+        height:     nil,
+        name:       nil,
+        repository: Vedeu.geometries,
+        width:      nil,
+        x:          nil,
+        xn:         nil,
+        y:          nil,
+        yn:         nil,
+      }
+    end
+
   end # Geometry
 
 end # Vedeu

data/lib/vedeu/geometry/index_position.rb

@@ -13,25 +13,6 @@ module Vedeu
       new(iy, ix, oy, ox).[]
     end
 
-    # @param name [String] The name of the interface.
-    # @param iy [Fixnum]
-    # @param ix [Fixnum]
-    # @return [Vedeu::Position]
-    def self.from_interface(name, iy, ix)
-      if Vedeu.interfaces.registered?(name)
-        interface = Vedeu.interfaces.find(name)
-        oy        = interface.border.by
-        ox        = interface.border.bx
-
-      else
-        oy = 1
-        ox = 1
-
-      end
-
-      new(iy, ix, oy, ox).[]
-    end
-
     # Returns a new instance of Vedeu::IndexPosition.
     #
     # @param iy [Fixnum]

data/lib/vedeu/geometry/position_validator.rb

@@ -17,10 +17,10 @@ module Vedeu
 
     def_delegators :border,
                    :enabled?,
-                   :left?,
-                   :right?,
-                   :top?,
-                   :bottom?
+                   :bx,
+                   :bxn,
+                   :by,
+                   :byn
 
     def_delegators :geometry,
                    :left,
@@ -104,10 +104,10 @@ module Vedeu
     #
     # @return [PositionValidator]
     def border_validation
-      @x = left + 1   if left? && x < (left + 1)
-      @x = right - 2  if right? && x > (right - 1)
-      @y = top + 1    if top? && y < (top + 1)
-      @y = bottom - 2 if bottom? && y > (bottom - 1)
+      @x = bx  if x < bx
+      @x = bxn if x > bxn
+      @y = by  if y < by
+      @y = byn if y > byn
 
       self
     end

data/lib/vedeu/models/interface.rb

@@ -21,6 +21,10 @@ module Vedeu
     collection Vedeu::Lines
     member     Vedeu::Line
 
+    # @!attribute [rw] client
+    # @return [Fixnum|Float]
+    attr_accessor :client
+
     # @!attribute [rw] delay
     # @return [Fixnum|Float]
     attr_accessor :delay
@@ -50,81 +54,39 @@ module Vedeu
     # @return [Array<Vedeu::Line>]
     attr_writer :lines
 
-    def_delegators :geometry,
-                   :north,
-                   :east,
-                   :south,
-                   :west,
-                   :top,
-                   :right,
-                   :bottom,
-                   :left,
-                   :y,
-                   :yn,
-                   :x,
-                   :xn,
-                   :width,
-                   :height,
-                   :top_left,
-                   :top_right,
-                   :bottom_left,
-                   :bottom_right
-
     # Return a new instance of Vedeu::Interface.
     #
     # @param attributes [Hash]
+    # @option attributes client [Vedeu::Client]
     # @option attributes colour [Vedeu::Colour]
     # @option attributes delay [Float]
     # @option attributes group [String]
     # @option attributes lines [Vedeu::Lines]
     # @option attributes name [String]
     # @option attributes parent [Vedeu::Composition]
+    # @option attributes repository [Vedeu::InterfacesRepository]
     # @option attributes style [Vedeu::Style]
     # @option attributes visible [Boolean]
     # @return [Vedeu::Interface]
     def initialize(attributes = {})
       @attributes = defaults.merge!(attributes)
 
+      @client     = @attributes[:client]
       @delay      = @attributes[:delay]
       @group      = @attributes[:group]
       @lines      = @attributes[:lines]
       @name       = @attributes[:name]
       @parent     = @attributes[:parent]
-      @repository = Vedeu.interfaces
+      @repository = @attributes[:repository]
       @visible    = @attributes[:visible]
     end
 
-    # @param child []
+    # @param child [Vedeu::Line]
     # @return [void]
     def add(child)
       @lines = lines.add(child)
     end
 
-    # Returns the border object belonging to the interface.
-    #
-    # @return [Vedeu::Border|NilClass]
-    def border
-      @border ||= Vedeu.borders.by_name(name)
-    end
-
-    # @return [Array<Array<Vedeu::Char>>]
-    def clear
-      Vedeu::Clear.new(self)
-    end
-
-    # Fetch the cursor belonging to this interface (by name), if one does not
-    # exist, it will be created, stored and returned.
-    #
-    # @return [Vedeu::Cursor]
-    def cursor
-      Vedeu.cursors.by_name(name)
-    end
-
-    # @return [Vedeu::Geometry]
-    def geometry
-      @geometry ||= Vedeu.geometries.by_name(name)
-    end
-
     # @return [Vedeu::Lines]
     def lines
       collection.coerce(@lines, self)
@@ -143,19 +105,15 @@ module Vedeu
 
     # @return [Array<Array<Vedeu::Char>>]
     def render
-      if visible?
-        [
-          hide_cursor,
-          clear.render,
-          border.render,
-          viewport.render,
-          show_cursor,
-        ]
-
-      else
-        []
-
-      end
+      return [] unless visible?
+
+      [
+        hide_cursor,
+        Vedeu::Clear.new(self).render,
+        Vedeu.borders.by_name(name).render,
+        Vedeu::Viewport.new(self).render,
+        show_cursor,
+      ]
     end
 
     # @return [Interface]
@@ -168,40 +126,40 @@ module Vedeu
       store_group
     end
 
-    # @return [Array<Array<Vedeu::Char>>]
-    def viewport
-      Vedeu::Viewport.new(self)
-    end
-
     private
 
+    def cursor
+      @cursor ||= Vedeu.cursors.by_name(name)
+    end
+
     # The default values for a new instance of this class.
     #
     # @return [Hash]
     def defaults
       {
-        client: nil,
-        colour: nil,
-        delay:  0.0,
-        group:  '',
-        lines:  [],
-        name:   '',
-        parent: nil,
-        style:  nil,
-        visible: true,
+        client:     nil,
+        colour:     nil,
+        delay:      0.0,
+        group:      '',
+        lines:      [],
+        name:       '',
+        parent:     nil,
+        repository: Vedeu.interfaces,
+        style:      nil,
+        visible:    true,
       }
     end
 
     # @return [String]
     def hide_cursor
-      return Vedeu::Esc.string(:hide_cursor) if cursor.visible?
+      return cursor.hide_cursor if cursor.visible?
 
       ''
     end
 
     # @return [String]
     def show_cursor
-      return Vedeu::Esc.string(:show_cursor) if cursor.visible?
+      return cursor.show_cursor if cursor.visible?
 
       ''
     end

data/lib/vedeu/models/null_interface.rb

@@ -1,11 +1,16 @@
 module Vedeu
 
+  # Provides a non-existent Vedeu::Interface that acts like the real thing, but
+  # does nothing.
+  #
   class NullInterface
 
     # @!attribute [r] attributes
     # @return [Hash]
     attr_reader :attributes
 
+    # @param attributes [Hash]
+    # @return [Vedeu::NullInterface]
     def initialize(attributes = {})
       @attributes = attributes
     end

data/lib/vedeu/models/stream.rb

@@ -57,7 +57,7 @@ module Vedeu
     #
     # @return [Array]
     def chars
-      return [] if value.empty?
+      return [] if empty?
 
       value.chars.map do |char|
         member.new(value:    char,

data/lib/vedeu/output/border.rb

@@ -116,20 +116,10 @@ module Vedeu
     # @return [Border]
     def initialize(attributes = {})
       @attributes   = defaults.merge!(attributes)
-      @enabled      = @attributes[:enabled]
-      @bottom_left  = @attributes[:bottom_left]
-      @bottom_right = @attributes[:bottom_right]
-      @show_bottom  = @attributes[:show_bottom]
-      @show_left    = @attributes[:show_left]
-      @show_right   = @attributes[:show_right]
-      @show_top     = @attributes[:show_top]
-      @title        = @attributes[:title]
-      @top_left     = @attributes[:top_left]
-      @top_right    = @attributes[:top_right]
-      @horizontal   = @attributes[:horizontal]
-      @vertical     = @attributes[:vertical]
-      @name         = @attributes[:name]
-      @repository   = Vedeu.borders
+
+      @attributes.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
     end
 
     # @return [Fixnum]
@@ -191,7 +181,13 @@ module Vedeu
     #
     # @return [String]
     def bottom
-      top_or_bottom('bottom')
+      return [] unless bottom?
+
+      out = []
+      out << border(bottom_left, :bottom_left) if left?
+      out << horizontal_border(:bottom_horizontal)
+      out << border(bottom_right, :bottom_right) if right?
+      out
     end
 
     # Renders the left border for the interface.
@@ -218,7 +214,19 @@ module Vedeu
     #
     # @return [String]
     def top
-      top_or_bottom('top')
+      return [] unless top?
+
+      out = []
+      out << border(top_left, :top_left) if left?
+      if title?
+        out << titlebar
+
+      else
+        out << horizontal_border(:top_horizontal)
+
+      end
+      out << border(top_right, :top_right) if right?
+      out
     end
 
     # The parent of a border is always an interface.
@@ -230,31 +238,6 @@ module Vedeu
 
     private
 
-    # @param prefix [String]
-    # @return [String]
-    def top_or_bottom(prefix)
-      predicate         = (prefix + '?').to_sym
-      prefix_left       = (prefix + '_left').to_sym
-      prefix_right      = (prefix + '_right').to_sym
-      prefix_horizontal = (prefix + '_horizontal').to_sym
-
-      return [] unless send(predicate)
-
-      out = []
-      out << border(send(prefix_left), prefix_left) if left?
-
-      if prefix == 'top' && title?
-        out << titlebar
-
-      else
-        out << horizontal_border(prefix_horizontal)
-
-      end
-
-      out << border(send(prefix_right), prefix_right) if right?
-      out
-    end
-
     # @param position [Symbol] Either :top_horizontal, or :bottom_horizontal.
     # @return [Array<Vedeu::Char>]
     def horizontal_border(position)
@@ -362,6 +345,7 @@ module Vedeu
         enabled:      false,
         horizontal:   "\x71", # ─ # \u2500
         name:         '',
+        repository:   Vedeu.borders,
         show_bottom:  true,
         show_left:    true,
         show_right:   true,

data/lib/vedeu/output/clear.rb

@@ -81,13 +81,7 @@ module Vedeu
     #
     # @return [Array]
     def write
-      if Vedeu::Configuration.drb?
-        Vedeu.trigger(:_drb_store_output_, rendered)
-
-        Vedeu::HTMLRenderer.to_file(Vedeu::VirtualBuffer.retrieve)
-      end
-
-      Vedeu.renderers.render(rendered)
+      Vedeu::Output.render(rendered)
     end
 
     private

data/lib/vedeu/output/esc.rb

@@ -101,6 +101,16 @@ module Vedeu
       stream.gsub(/\e/, '\\e')
     end
 
+    # @return [String]
+    def hide_cursor
+      "\e[?25l"
+    end
+
+    # @return [String]
+    def show_cursor
+      "\e[?25h"
+    end
+
     # Return the escape sequence string from the list of recognised sequence
     # 'commands', or an empty string if the 'command' cannot be found.
     #
@@ -196,11 +206,6 @@ module Vedeu
       "\e[39m"
     end
 
-    # @return [String]
-    def hide_cursor
-      "\e[?25l"
-    end
-
     # @return [String]
     def negative
       "\e[7m"
@@ -231,11 +236,6 @@ module Vedeu
       [show_cursor, colour_reset, reset].join
     end
 
-    # @return [String]
-    def show_cursor
-      "\e[?25h"
-    end
-
     # @return [String]
     def underline
       "\e[4m"