vedeu 0.7.0 → 0.7.1

data/lib/vedeu/cells/escape.rb

@@ -17,6 +17,53 @@ module Vedeu
     #
     class Escape < Vedeu::Cells::Empty
 
+      include Vedeu::Geometries::Positionable
+
+      # @return [Boolean]
+      def cell?
+        false
+      end
+
+      # @return [NilClass]
+      def null
+        nil
+      end
+      alias_method :background, :null
+      alias_method :colour,     :null
+      alias_method :foreground, :null
+      alias_method :style,      :null
+
+      # Return an empty hash as most escape sequences won't make
+      # sense as JSON.
+      #
+      # @return [Hash<void>]
+      def to_h
+        {}
+      end
+      alias_method :to_hash, :to_h
+
+      # Return an empty string as most escape sequences won't make
+      # sense as HTML.
+      #
+      # @param _options [Hash] Ignored.
+      # @return [String]
+      def to_html(_options = {})
+        ''.freeze
+      end
+
+      # @return [String]
+      def to_s
+        "#{position}#{value}".freeze
+      end
+      alias_method :to_str, :to_s
+
+      private
+
+      # @return [Hash]
+      def defaults
+        super.merge!(position: [1, 1], value: '')
+      end
+
     end # Escape
 
   end # Cells

data/lib/vedeu/cursors/cursor.rb

@@ -88,7 +88,7 @@ module Vedeu
       # @return [String]
       def inspect
         "<#{self.class.name} name:'#{name}', x:#{x}, y:#{y}, ox:#{ox}, " \
-        "oy:#{oy}, visible:#{visible}>"
+        "oy:#{oy}, visible:#{visible}>".freeze
       end
 
       # Moves the cursor down by one row.
@@ -160,7 +160,7 @@ module Vedeu
 
       # Renders the cursor.
       #
-      # @return [Array<Vedeu::Models::Escape>]
+      # @return [Array<Vedeu::Cells::Escape>]
       def render
         Vedeu.render_output(escape_sequence)
       end
@@ -193,7 +193,7 @@ module Vedeu
       #   Vedeu.hide_cursor(Vedeu.focus)
       #   Vedeu.hide_cursor
       #
-      # @return [Vedeu::Models::Escape]
+      # @return [Vedeu::Cells::Escape]
       def hide
         super
 
@@ -230,7 +230,7 @@ module Vedeu
       #   Vedeu.show_cursor(Vedeu.focus)
       #   Vedeu.show_cursor
       #
-      # @return [Vedeu::Models::Escape]
+      # @return [Vedeu::Cells::Escape]
       def show
         super
 
@@ -287,9 +287,9 @@ module Vedeu
         }
       end
 
-      # @return [Vedeu::Models::Escape]
+      # @return [Vedeu::Cells::Escape]
       def escape_sequence
-        Vedeu::Models::Escape.new(position: position, value: visibility)
+        Vedeu::Cells::Escape.new(position: position, value: visibility)
       end
 
       # @return [Hash<Symbol => Fixnum>]

data/lib/vedeu/dsl/text.rb

@@ -64,7 +64,7 @@ module Vedeu
       #   string is shorter than the specified width.
       # @return [String]
       def text(value = '', options = {})
-        options.merge!(anchor: __callee__, model: model, client: client)
+        options.merge!(text_options).merge!(anchor: __callee__)
 
         Vedeu::Output::Text.add(value, options)
       end
@@ -80,6 +80,17 @@ module Vedeu
       alias_method :left=,   :text
       alias_method :right=,  :text
 
+      private
+
+      # @return [Hash<Symbol => void>]
+      def text_options
+        {
+          client: client,
+          model:  model,
+          name:   model.name,
+        }
+      end
+
     end # Text
 
   end # DSL

data/lib/vedeu/events/trigger.rb

@@ -38,8 +38,10 @@ module Vedeu
       #
       # @return [Array]
       def trigger
-        Vedeu.log(type:    :event,
-                  message: "No action for: '#{name.inspect}'") if results.empty?
+        if results.empty?
+          Vedeu.log(type:    :event,
+                    message: "No action for: '#{name.inspect}'".freeze)
+        end
 
         return results[0] if results.one?
 

data/lib/vedeu/input/capture.rb

@@ -111,7 +111,7 @@ module Vedeu
       def click?(input)
         return false if input.nil? || input.is_a?(Symbol)
 
-        input.is_a?(Vedeu::Cursors::Cursor) || input.start_with?("\e[M")
+        input.is_a?(Vedeu::Cursors::Cursor) || input.start_with?("\e[M".freeze)
       end
 
       # @return [IO]

data/lib/vedeu/input/mouse.rb

@@ -27,7 +27,8 @@ module Vedeu
       # @return [void]
       def click
         Vedeu.log(type:    :input,
-                  message: "Mouse pressed: '#{button}' (x: #{x}, y: #{y})")
+                  message: "Mouse pressed: '#{button}' " \
+                           "(x: #{x}, y: #{y})".freeze)
 
         Vedeu.trigger(:_mouse_event_, input)
 
@@ -43,7 +44,7 @@ module Vedeu
         else
           Vedeu.log(type:    :input,
                     message: 'Vedeu does not support mouse button ' \
-                             "'#{button}' yet.")
+                             "'#{button}' yet.".freeze)
 
         end
       end

data/lib/vedeu/models/all.rb

@@ -9,8 +9,6 @@ module Vedeu
 end # Vedeu
 
 require 'vedeu/models/toggleable'
-require 'vedeu/models/cell'
-require 'vedeu/models/escape'
 require 'vedeu/models/focus'
 require 'vedeu/models/row'
 require 'vedeu/models/page'

data/lib/vedeu/models/row.rb

@@ -2,7 +2,7 @@ module Vedeu
 
   module Models
 
-    # A Row represents an array of Vedeu::Models::Cell objects.
+    # A Row represents an array of Vedeu::Cells::Empty objects.
     #
     class Row
 

data/lib/vedeu/output/output.rb

@@ -10,7 +10,7 @@ module Vedeu
     class Output
 
       # @param output [Array<Array<Vedeu::Views::Char>>|
-      #   NilClass|Vedeu::Models::Escape]
+      #   NilClass|Vedeu::Cells::Escape]
       # @return [Array]
       def self.buffer_update(output)
         return nil if output.nil?
@@ -19,7 +19,7 @@ module Vedeu
       end
 
       # @param output [Array<Array<Vedeu::Views::Char>>|
-      #   NilClass|Vedeu::Models::Escape]
+      #   NilClass|Vedeu::Cells::Escape]
       # @return [Array]
       def self.buffer_write(output)
         return nil if output.nil?
@@ -28,7 +28,7 @@ module Vedeu
       end
 
       # @param output [Array<Array<Vedeu::Views::Char>>|
-      #   NilClass|Vedeu::Models::Escape]
+      #   NilClass|Vedeu::Cells::Escape]
       # @return [Array<String>]
       def self.direct_write(output)
         return nil if output.nil?
@@ -39,7 +39,7 @@ module Vedeu
       # Writes output to the defined renderers.
       #
       # @param output [Array<Array<Vedeu::Views::Char>>|
-      #   NilClass|Vedeu::Models::Escape]
+      #   NilClass|Vedeu::Cells::Escape]
       # @return [Array|NilClass|String]
       def self.render_output(output)
         return nil if output.nil?
@@ -50,7 +50,7 @@ module Vedeu
       # Return a new instance of Vedeu::Output::Output.
       #
       # @param output [Array<Array<Vedeu::Views::Char>>|
-      #   NilClass|Vedeu::Models::Escape]
+      #   NilClass|Vedeu::Cells::Escape]
       # @return [Vedeu::Output::Output]
       def initialize(output)
         @output = output
@@ -72,7 +72,7 @@ module Vedeu
       end
 
       # Send the view to the renderers. If the output is a
-      # {Vedeu::Models::Escape} object (typical when showing or
+      # {Vedeu::Cells::Escape} object (typical when showing or
       # hiding the cursor) then we bypass the
       # {Vedeu::Buffers::Terminal} and write directly to the terminal
       # because escape sequences only make sense to the terminal and
@@ -93,7 +93,7 @@ module Vedeu
 
       # @!attribute [r] output
       # @return [Array<Array<Vedeu::Views::Char>>|
-      #   NilClass|Vedeu::Models::Escape]
+      #   NilClass|Vedeu::Cells::Escape]
       attr_reader :output
 
       private
@@ -115,7 +115,7 @@ module Vedeu
 
       # @return [Boolean]
       def escape_sequence?
-        output.is_a?(Vedeu::Models::Escape)
+        output.is_a?(Vedeu::Cells::Escape)
       end
 
     end # Output

data/lib/vedeu/output/text.rb

@@ -6,6 +6,8 @@ module Vedeu
     #
     class Text
 
+      include Vedeu::Common
+
       # @see Vedeu::DSL::Text#text
       def self.add(value = '', options = {})
         new(value, options).add
@@ -27,6 +29,7 @@ module Vedeu
       # @option options model
       #   [Vedeu::Views::View|Vedeu::Views::Line|Vedeu::Views::Stream]
       # @option options mode (see Vedeu::Output::Wordwrap#mode)
+      # @option options name [String|Symbol]
       # @option options pad [String]
       # @option options width [Integer]
       # @return [Vedeu::Output::Text]
@@ -131,11 +134,17 @@ module Vedeu
           colour: nil,
           model:  nil,
           mode:   :default,
+          name:   '',
           pad:    ' ',
           width:  nil,
         }
       end
 
+      # @return [NilClass|Vedeu::Geometries::Geometry]
+      def geometry
+        Vedeu.geometries.by_name(name)
+      end
+
       # The string padded to width, left justified.
       #
       # @return [String]
@@ -164,6 +173,11 @@ module Vedeu
         options[:mode]
       end
 
+      # @return [String|Symbol]
+      def name
+        options[:name]
+      end
+
       # The character to use for padding the string.
       #
       # @return [String]
@@ -225,11 +239,18 @@ module Vedeu
         string.slice(0, width)
       end
 
-      # Return the width.
+      # Return the width of the interface when a name is given,
+      # otherwise use the given width.
       #
       # @return [Fixnum]
       def width
-        options[:width]
+        if present?(options[:name])
+          geometry.bordered_width
+
+        elsif present?(options[:width])
+          options[:width]
+
+        end
       end
 
       # Return a boolean indicating whether the string should be

data/lib/vedeu/renderers/html.rb

@@ -34,7 +34,7 @@ module Vedeu
       #
       # @return [String]
       def clear
-        @output = Vedeu::Models::Escape.new
+        @output = Vedeu::Cells::Escape.new
 
         ''
       end
@@ -49,7 +49,7 @@ module Vedeu
 
       # @return [String]
       def html_body
-        return '' if output.is_a?(Vedeu::Models::Escape)
+        return '' if output.is_a?(Vedeu::Cells::Escape)
 
         out = ''
 
@@ -65,12 +65,12 @@ module Vedeu
       private
 
       # Returns a boolean indicating whether the output is a
-      # {Vedeu::Models::Escape}. If it is, it won't be rendered in
+      # {Vedeu::Cells::Escape}. If it is, it won't be rendered in
       # HTML.
       #
       # @return [Boolean]
       def escape?
-        output.is_a?(Vedeu::Models::Escape)
+        output.is_a?(Vedeu::Cells::Escape)
       end
 
       # @return [Array<Array<Vedeu::Views::Char>>]

data/lib/vedeu/runtime/launcher.rb

@@ -70,7 +70,7 @@ module Vedeu
 
     rescue StandardError => uncaught_exception
       output = if Vedeu::Configuration.debug?
-                 uncaught_exception.message + "\n" +
+                 uncaught_exception.message + "\n".freeze +
                  uncaught_exception.backtrace.join("\n".freeze)
                else
                  uncaught_exception.message

data/lib/vedeu/version.rb

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

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

@@ -68,6 +68,26 @@ module Vedeu
         it { subject.must_be_instance_of(TrueClass) }
       end
 
+      describe '#top_horizontal' do
+        let(:char)    { 'T' }
+        let(:options) { {} }
+
+        subject { instance.top_horizontal(char, options) }
+
+        it { subject.must_be_instance_of(Vedeu::Cells::TopHorizontal) }
+        it { instance.must_respond_to(:top_horizontal=) }
+      end
+
+      describe '#bottom_horizontal' do
+        let(:char)    { 'B' }
+        let(:options) { {} }
+
+        subject { instance.bottom_horizontal(char, options) }
+
+        it { subject.must_be_instance_of(Vedeu::Cells::BottomHorizontal) }
+        it { instance.must_respond_to(:bottom_horizontal=) }
+      end
+
       describe '#horizontal' do
         let(:char)    { 'H' }
         let(:options) { {} }
@@ -246,6 +266,26 @@ module Vedeu
         end
       end
 
+      describe '#left_vertical' do
+        let(:char)    { 'V' }
+        let(:options) { {} }
+
+        subject { instance.left_vertical(char, options) }
+
+        it { subject.must_be_instance_of(Vedeu::Cells::LeftVertical) }
+        it { instance.must_respond_to(:left_vertical=) }
+      end
+
+      describe '#right_vertical' do
+        let(:char)    { 'V' }
+        let(:options) { {} }
+
+        subject { instance.right_vertical(char, options) }
+
+        it { subject.must_be_instance_of(Vedeu::Cells::RightVertical) }
+        it { instance.must_respond_to(:right_vertical=) }
+      end
+
       describe '#vertical' do
         let(:char)    { 'V' }
         let(:options) { {} }

data/test/lib/vedeu/buffers/empty_test.rb

@@ -61,7 +61,7 @@ module Vedeu
 
         it { subject.must_be_instance_of(Array) }
         it { subject.first.must_be_instance_of(Array) }
-        it { subject.first.first.must_be_instance_of(Vedeu::Models::Cell) }
+        it { subject.first.first.must_be_instance_of(Vedeu::Cells::Empty) }
 
         it { subject.size.must_equal(3) }
         it { subject.first.size.must_equal(9) }

data/test/lib/vedeu/cells/borders/bottom_left_test.rb

@@ -9,20 +9,6 @@ module Vedeu
       let(:described) { Vedeu::Cells::BottomLeft }
       let(:instance)  { described.new }
 
-      describe '#position' do
-        let(:geometry) {
-          Vedeu::Geometries::Geometry.new(x: 5, xn: 15, y: 3, yn: 9)
-        }
-
-        subject { instance.position }
-
-        before { Vedeu.geometries.stubs(:by_name).returns(geometry) }
-
-        it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
-        it { subject.x.must_equal(5) }
-        it { subject.y.must_equal(9) }
-      end
-
       describe '#type' do
         subject { instance.type }