vedeu 0.4.14 → 0.4.15

data/lib/vedeu/output/clear.rb

@@ -4,6 +4,22 @@ module Vedeu
   #
   class Clear
 
+    extend Forwardable
+
+    def_delegators :border,
+                   :bx,
+                   :by
+
+    def_delegators :geometry,
+                   :x,
+                   :y
+
+    def_delegators :interface,
+                   :colour,
+                   :name,
+                   :style,
+                   :visible?
+
     class << self
 
       # Clears the area defined by the interface.
@@ -42,14 +58,14 @@ module Vedeu
     #
     # @return [Array<Array<Vedeu::Char>>]
     def clear
-      if interface.visible?
-        Vedeu.log(type: :output, message: "Clearing: '#{interface.name}'")
+      if visible?
+        Vedeu.log(type: :output, message: "Clearing: '#{name}'")
 
         @clear ||= Array.new(height) do |iy|
           Array.new(width) do |ix|
             Vedeu::Char.new(value:    ' ',
-                            colour:   colour,
-                            style:    interface.style,
+                            colour:   clear_colour,
+                            style:    style,
                             position: position(iy, ix))
           end
         end
@@ -80,6 +96,11 @@ module Vedeu
     # @return [Interface]
     attr_reader :interface
 
+    # @return (see Vedeu::Borders#by_name)
+    def border
+      @border ||= Vedeu.borders.by_name(name)
+    end
+
     # @return [Boolean] Indicates whether the area occupied by the border of the
     #   interface should be cleared also.
     def clear_border?
@@ -88,12 +109,12 @@ module Vedeu
 
     # @return [Vedeu::Colour] The default background and foreground colours for
     #   the terminal, or the colours of the interface.
-    def colour
+    def clear_colour
       if use_terminal_colours?
-        Colour.new(background: :default, foreground: :default)
+        Vedeu::Colour.new(background: :default, foreground: :default)
 
       else
-        interface.colour
+        colour
 
       end
     end
@@ -106,15 +127,20 @@ module Vedeu
       }
     end
 
+    # @return (see Vedeu::Geometries#by_name)
+    def geometry
+      @geometry ||= Vedeu.geometries.by_name(name)
+    end
+
     # Returns the height of the area to be cleared.
     #
     # @return [Fixnum]
     def height
       if clear_border?
-        interface.height
+        geometry.height
 
       else
-        interface.border.height
+        border.height
 
       end
     end
@@ -129,10 +155,10 @@ module Vedeu
     # @return [Vedeu::IndexPosition]
     def position(iy, ix)
       if clear_border?
-        Vedeu::IndexPosition[iy, ix, interface.y, interface.x]
+        Vedeu::IndexPosition[iy, ix, y, x]
 
       else
-        Vedeu::IndexPosition[iy, ix, interface.border.by, interface.border.bx]
+        Vedeu::IndexPosition[iy, ix, by, bx]
 
       end
     end
@@ -148,10 +174,10 @@ module Vedeu
     # @return [Fixnum]
     def width
       if clear_border?
-        interface.width
+        geometry.width
 
       else
-        interface.border.width
+        border.width
 
       end
     end
@@ -159,4 +185,3 @@ module Vedeu
   end # Clear
 
 end # Vedeu
-

data/lib/vedeu/output/colour.rb

@@ -23,21 +23,10 @@ module Vedeu
     # @return [Hash]
     attr_reader :attributes
 
-    # @!attribute [r] background
-    # @return [Background|String]
-    attr_reader :background
-
-    # @!attribute [r] foreground
-    # @return [Foreground|String]
-    attr_reader :foreground
-
     # @param value []
     # @return [Object]
     def self.coerce(value)
-      if value.nil?
-        new
-
-      elsif value.is_a?(self)
+      if value.is_a?(self)
         value
 
       elsif value.is_a?(Hash)
@@ -53,7 +42,7 @@ module Vedeu
         end
 
       else
-        new(value)
+        new
 
       end
     end
@@ -66,9 +55,13 @@ module Vedeu
     # @return [Colour]
     def initialize(attributes = {})
       @attributes = defaults.merge!(attributes)
+    end
 
-      @background = Vedeu::Background.coerce(@attributes[:background])
-      @foreground = Vedeu::Foreground.coerce(@attributes[:foreground])
+    # Returns the background colour as a Vedeu::Background.
+    #
+    # @return [Vedeu::Background]
+    def background
+      @background ||= Vedeu::Background.coerce(attributes[:background])
     end
 
     # Converts the value into a Vedeu::Background.
@@ -87,6 +80,13 @@ module Vedeu
     end
     alias_method :==, :eql?
 
+    # Returns the foreground colour as a Vedeu::Foreground.
+    #
+    # @return [Vedeu::Foreground]
+    def foreground
+      @foreground ||= Vedeu::Foreground.coerce(attributes[:foreground])
+    end
+
     # Converts the value into a Vedeu::Foreground.
     #
     # @param value [String]

data/lib/vedeu/output/esc.rb

@@ -118,7 +118,7 @@ module Vedeu
     #
     # @param block [Proc]
     # @return [String]
-    def border(&block)
+    def border
       return '' unless block_given?
 
       [border_on, yield, border_off].join

data/lib/vedeu/output/html_char.rb

@@ -54,7 +54,6 @@ module Vedeu
     # @return [String]
     def border_style
       case border
-      when nil                then ''
       when :top_horizontal    then border_css('top')
       when :left_vertical     then border_css('left')
       when :right_vertical    then border_css('right')
@@ -63,10 +62,7 @@ module Vedeu
       when :top_right    then [border_css('top'), border_css('right')].join
       when :bottom_left  then [border_css('bottom'), border_css('left')].join
       when :bottom_right then [border_css('bottom'), border_css('right')].join
-      when :horizontal   then ''
-      when :vertical     then ''
       else
-        # ... should not get here
         ''
       end
     end
@@ -78,41 +74,39 @@ module Vedeu
 
     # @return [String]
     def fg
-      @fg ||= colour_fg || parent_fg || '#222'
+      @fg ||= colour_fg
     end
 
     # @return [String]
     def bg
-      @bg ||= colour_bg || parent_bg || '#000'
+      @bg ||= colour_bg
     end
 
-    # @return [String|NilClass]
+    # @return [String]
     def colour_bg
-      if char.background && defined_value?(char.background.to_html)
+      if defined_value?(char.background.to_html)
         char.background.to_html
+
+      elsif defined_value?(char.parent_background.to_html)
+        char.parent_background.to_html
+
+      else
+        '#000'
+
       end
     end
 
-    # @return [String|NilClass]
+    # @return [String]
     def colour_fg
-      if char.foreground && defined_value?(char.foreground.to_html)
+      if defined_value?(char.foreground.to_html)
         char.foreground.to_html
-      end
-    end
-
-    # @return [String|NilClass]
-    def parent_bg
-      if char.parent_background &&
-         defined_value?(char.parent_background.to_html)
-        char.parent_background.to_html
-      end
-    end
 
-    # @return [String|NilClass]
-    def parent_fg
-      if char.parent_foreground &&
-         defined_value?(char.parent_foreground.to_html)
+      elsif defined_value?(char.parent_foreground.to_html)
         char.parent_foreground.to_html
+
+      else
+        '#222'
+
       end
     end
 

data/lib/vedeu/output/null_border.rb

@@ -5,33 +5,41 @@ module Vedeu
   #
   class NullBorder
 
+    # @!attribute [r] name
+    # @return [String|NilClass]
+    attr_reader :name
+
     # Returns a new instance of Vedeu::NullBorder.
     #
-    # @param interface [Vedeu::Interface]
-    # @return [Vedeu::NullBorder]
-    def initialize(interface)
-      @interface = interface
+    # @param name [String|NilClass]
+    # @return [Vedeu::NullBorder]S
+    def initialize(name = nil)
+      @name = name
     end
 
     # @return [Fixnum]
     def bx
       geometry.x
     end
+    alias_method :x, :bx
 
     # @return [Fixnum]
     def bxn
       geometry.xn
     end
+    alias_method :xn, :bxn
 
     # @return [Fixnum]
     def by
       geometry.y
     end
+    alias_method :y, :by
 
     # @return [Fixnum]
     def byn
       geometry.yn
     end
+    alias_method :yn, :byn
 
     # @return [FalseClass]
     def enabled?
@@ -55,15 +63,11 @@ module Vedeu
 
     private
 
-    # @!attribute [r] interface
-    # @return [Vedeu::Interface]
-    attr_reader :interface
-
     # Returns the geometry for the interface.
     #
-    # @return [Vedeu::Geometry]
+    # @return (see Vedeu::Geometries#by_name)
     def geometry
-      interface.geometry
+      @geometry ||= Vedeu.geometries.by_name(name)
     end
 
   end # NullBorder

data/lib/vedeu/output/presentation.rb

@@ -5,9 +5,15 @@ module Vedeu
   #
   module Presentation
 
-    # @return [Vedeu::Background|NilClass]
+    # @return [Vedeu::Background]
     def background
-      colour.background if colour
+      if colour
+        colour.background
+
+      else
+        Vedeu::Background.new
+
+      end
     end
 
     # @return [Vedeu::Colour]
@@ -29,14 +35,26 @@ module Vedeu
       @colour = Vedeu::Colour.coerce(value)
     end
 
-    # @return [Vedeu::Foreground|NilClass]
+    # @return [Vedeu::Foreground]
     def foreground
-      colour.foreground if colour
+      if colour
+        colour.foreground
+
+      else
+        Vedeu::Foreground.new
+
+      end
     end
 
-    # @return [Vedeu::Background|NilClass]
+    # @return [Vedeu::Background]
     def parent_background
-      parent_colour.background if parent_colour
+      if parent_colour
+        parent_colour.background
+
+      else
+        Vedeu::Background.new
+
+      end
     end
 
     # @return [String|NilClass]
@@ -44,9 +62,15 @@ module Vedeu
       parent.colour if parent
     end
 
-    # @return [Vedeu::Foreground|NilClass]
+    # @return [Vedeu::Foreground]
     def parent_foreground
-      parent_colour.foreground if parent_colour
+      if parent_colour
+        parent_colour.foreground
+
+      else
+        Vedeu::Foreground.new
+
+      end
     end
 
     # @return [String|NilClass]

data/lib/vedeu/output/renderers/all.rb

@@ -3,6 +3,7 @@ require_relative 'html_renderer'
 require_relative 'json_renderer'
 require_relative 'null_renderer'
 require_relative 'terminal_renderer'
+require_relative 'text_renderer'
 
 module Vedeu
 

data/lib/vedeu/output/renderers/text_renderer.rb

@@ -0,0 +1,40 @@
+module Vedeu
+
+  # Converts a grid of {Vedeu::Char} objects into a stream of escape sequences
+  # and content.
+  #
+  class TextRenderer
+
+    # @param output [Array<Array<Vedeu::Char>>]
+    # @return [String]
+    def self.render(*output)
+      new(*output).render
+    end
+
+    # Returns a new instance of Vedeu::TextRenderer.
+    #
+    # @param output [Array<Array<Vedeu::Char>>]
+    # @return [Vedeu::TextRenderer]
+    def initialize(*output)
+      @output  = output
+    end
+
+    # @return [String]
+    def render
+      parsed
+    end
+
+    private
+
+    # @!attribute [r] output
+    # @return [Array<Array<Vedeu::Char>>]
+    attr_reader :output
+
+    # @return [String]
+    def parsed
+      Vedeu::Compressor.new(output).render
+    end
+
+  end # TextRenderer
+
+end # Vedeu