vedeu 0.6.60 → 0.6.61

data/lib/vedeu/models/escape.rb

@@ -16,7 +16,7 @@ module Vedeu
       #
       # @param attributes [String]
       # @option attributes position
-      #   [Vedeu::Geometry::Position|Array<Fixnum>]
+      #   [Vedeu::Geometries::Position|Array<Fixnum>]
       # @option attributes value [String]
       # @return [Vedeu::Models::Escape]
       def initialize(attributes = {})
@@ -50,7 +50,7 @@ module Vedeu
 
       # @return [String]
       def position
-        Vedeu::Geometry::Position.coerce(@position)
+        Vedeu::Geometries::Position.coerce(@position)
       end
 
       # Return an empty hash as most escape sequences won't make

data/lib/vedeu/models/focus.rb

@@ -193,9 +193,10 @@ module Vedeu
       # Reset the repository.
       #
       # @return [Array|Hash|Set]
-      def reset
+      def reset!
         @storage = in_memory
       end
+      alias_method :reset, :reset!
 
       private
 

data/lib/vedeu/models/page.rb

@@ -25,14 +25,15 @@ module Vedeu
         elsif value.is_a?(Array) && value.empty?
           Vedeu::Models::Page.new([Vedeu::Models::Row.coerce(value)])
 
-        elsif value.is_a?(Array)
+        elsif value.is_a?(Array) || value.is_a?(Vedeu::Buffers::View)
           values = value.map { |v| Vedeu::Models::Row.coerce(v) }
 
           Vedeu::Models::Page.new(values)
 
         else
           fail Vedeu::Error::InvalidSyntax,
-               'Cannot coerce as value is not an Array.'.freeze
+               'Cannot coerce as value is not an Array, Vedeu::Models::Page ' \
+               "or Vedeu::Models::Row. Is a '#{value.class.name}'.".freeze
 
         end
       end

data/lib/vedeu/models/row.rb

@@ -48,7 +48,7 @@ module Vedeu
 
       # @return [Array<void>]
       def content
-        cells.flatten
+        cells.flatten << reset_character
       end
 
       # Provides iteration over the collection.
@@ -73,6 +73,15 @@ module Vedeu
       end
       alias_method :==, :eql?
 
+      # Provides the reset escape sequence at the end of a row to
+      # reset colour and style information to prevent colour bleed on
+      # the next line.
+      #
+      # @return [Vedeu::Views::Char]
+      def reset_character
+        Vedeu::Views::Char.new(value: Vedeu::EscapeSequences::Esc.reset)
+      end
+
     end # Row
 
   end # Models

data/lib/vedeu/models/views/char.rb

@@ -51,7 +51,7 @@ module Vedeu
       # @option attributes colour [Vedeu::Colours::Colour]
       # @option attributes name [String|Symbol]
       # @option attributes parent [Vedeu::Views::Line]
-      # @option attributes position [Vedeu::Geometry::Position]
+      # @option attributes position [Vedeu::Geometries::Position]
       # @option attributes style [Vedeu::Presentation::Style]
       # @option attributes value [String]
       # @return [Vedeu::Views::Char]
@@ -94,17 +94,17 @@ module Vedeu
         @interface ||= Vedeu.interfaces.by_name(name)
       end
 
-      # @return [Vedeu::Geometry::Position]
+      # @return [Vedeu::Geometries::Position]
       def position
-        @position = Vedeu::Geometry::Position.coerce(@attributes[:position])
+        @position = Vedeu::Geometries::Position.coerce(@attributes[:position])
       end
 
       # Sets the position of the Vedeu::Views::Char.
       #
-      # @param value [Vedeu::Geometry::Position]
-      # @return [Vedeu::Geometry::Position]
+      # @param value [Vedeu::Geometries::Position]
+      # @return [Vedeu::Geometries::Position]
       def position=(value)
-        @position = @attributes[:position] = Vedeu::Geometry::Position
+        @position = @attributes[:position] = Vedeu::Geometries::Position
                                              .coerce(value)
       end
 

data/lib/vedeu/models/views/line.rb

@@ -12,7 +12,7 @@ module Vedeu
 
     # Represents a single row of the terminal. It is a container for
     # {Vedeu::Views::Stream} objects. A line's width is determined by
-    # the {Vedeu::Geometry::Geometry} it belongs to.
+    # the {Vedeu::Geometries::Geometry} it belongs to.
     #
     class Line
 

data/lib/vedeu/output/compressor.rb

@@ -59,16 +59,15 @@ module Vedeu
       # @return [String]
       def compress
         Vedeu.timer("Compression for #{content.size} objects".freeze) do
-          out = ''
-
-          content.each do |cell|
-            # out << position_for(cell)
-
-            out << cell.position.to_s
-            out << colour_for(cell)
-            out << style_for(cell)
-            out << cell.value
-          end
+          out = content.map do |cell|
+            [
+              # position_for(cell),
+              cell.position.to_s,
+              colour_for(cell),
+              style_for(cell),
+              cell.value,
+            ].join
+          end.join
 
           Vedeu.log(type:    :output,
                     message: "Compression: #{content.size} objects -> " \
@@ -80,11 +79,7 @@ module Vedeu
 
       # @return [String]
       def uncompress
-        out = ''
-
-        content.each do |cell|
-          out << cell.to_s
-        end
+        out = content.map(&:to_s).join
 
         Vedeu.log(type:    :output,
                   message: "No compression: #{content.size} objects -> " \

data/lib/vedeu/output/presentation/presentation.rb

@@ -22,7 +22,7 @@ module Vedeu
     #
     # @return [Boolean]
     def position?
-      self.respond_to?(:position) && position.is_a?(Vedeu::Geometry::Position)
+      self.respond_to?(:position) && position.is_a?(Vedeu::Geometries::Position)
     end
 
     # Renders the colour attributes of the receiver and yields (to

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

@@ -17,7 +17,7 @@ module Vedeu
     #
     # @return [Array<void>]
     def clear
-      threads = storage.map do |renderer|
+      storage.map do |renderer|
         Vedeu.log(type:    :output,
                   message: "Clearing via #{renderer.class.name}".freeze)
 
@@ -26,8 +26,7 @@ module Vedeu
             toggle_cursor { renderer.clear }
           end
         end
-      end
-      threads.each(&:join)
+      end.each(&:join) if Vedeu.ready?
 
       ''
     end
@@ -51,7 +50,7 @@ module Vedeu
     # @param output [void]
     # @return [Array<void>]
     def render(output)
-      threads = storage.map do |renderer|
+      storage.map do |renderer|
         Vedeu.log(type:    :output,
                   message: "Rendering via #{renderer.class.name}".freeze)
 
@@ -60,8 +59,7 @@ module Vedeu
             toggle_cursor { renderer.render(output) }
           end
         end
-      end
-      threads.each(&:join)
+      end.each(&:join) if Vedeu.ready?
 
       output
     end
@@ -83,12 +81,13 @@ module Vedeu
     end
 
     # @example
-    #   Vedeu.renderers.reset
+    #   Vedeu.renderers.reset!
     #
     # @return [Set]
-    def reset
+    def reset!
       @storage = in_memory
     end
+    alias_method :reset, :reset!
 
     private
 

data/lib/vedeu/output/viewport.rb

@@ -149,7 +149,7 @@ module Vedeu
 
       # Returns the geometry for the interface.
       #
-      # @return (see Vedeu::Geometry::Repository#by_name)
+      # @return (see Vedeu::Geometries::Repository#by_name)
       def geometry
         @geometry ||= Vedeu.geometries.by_name(name)
       end

data/lib/vedeu/repositories/store.rb

@@ -51,13 +51,13 @@ module Vedeu
       # Remove all currently stored data.
       #
       # @return [Array|Hash|Set]
-      def reset
+      def reset!
         Vedeu.log(type:    :reset,
                   message: "(#{self.class.name}) #{registered.inspect}".freeze)
 
         @storage = in_memory
       end
-      alias_method :reset!, :reset
+      alias_method :reset, :reset!
       alias_method :clear, :reset
 
       # Return the number of entries stored.

data/lib/vedeu/terminal/buffer.rb

@@ -15,146 +15,90 @@ module Vedeu
 
       extend self
 
-      # Return a grid of {Vedeu::Models::Cell} objects defined by the
-      # height and width of this virtual terminal.
-      #
-      # @return [Array<Array<Vedeu::Models::Cell>>]
-      def buffer
-        @output ||= Array.new(Vedeu.height + 1) do |y|
-          Array.new(Vedeu.width + 1) do |x|
-            Vedeu::Models::Cell.new(position: [y, x])
-          end
-        end
-      end
-      alias_method :cells, :buffer
-
-      # Clear the output.
+      # Clears the whole terminal space.
       #
       # @example
       #   Vedeu.clear
       #
+      #   # or...
+      #
+      #   Vedeu.trigger(:_clear_)
+      #
       # @return [String|void] Most likely to be a String.
       def clear
-        reset
+        reset!
 
-        Vedeu.renderers.clear if Vedeu.ready?
+        Vedeu.renderers.clear
       end
 
+      # Returns the buffer content.
+      #
+      # @example
+      #   Vedeu.trigger(:_drb_retrieve_output_)
+      #
       # @return [Vedeu::Models::Page]
       def output
         Vedeu::Models::Page.coerce(buffer)
       end
 
-      # Read a single cell from the virtual terminal.
-      #
-      # @note
-      #   Given two actual coordinates (y, x) e.g. (1, 1)
-      #   Convert to coordinate indices (cy, cx) e.g. (0, 0)
-      #   Fetch the row at cy and return the cell from cx
-      #
-      # @param y [Fixnum] The row/line coordinate.
-      # @param x [Fixnum] The column/character coordinate.
-      # @return [Vedeu::Views::Char]
-      def read(y, x)
-        cy, cx = Vedeu::Geometry::Position[y, x].as_indices
-
-        row  = fetch(cells, cy)
-        cell = fetch(row, cx)
-
-        cell
-      end
-
       # Send the cells to the renderer and return the rendered result.
       #
+      # @example
+      #   Vedeu.refresh
+      #
       # @return [String|void] Most likely to be a String.
-      def render
-        Vedeu.renderers.render(output) if Vedeu.ready?
+      def refresh
+        Vedeu.renderers.render(output)
       end
-      alias_method :refresh, :render
 
       # Removes all content from the virtual terminal; effectively
       # clearing it.
       #
-      # @return [Array<Array<Vedeu::Models::Cell>>]
-      def reset
-        @output = Array.new(Vedeu.height + 1) do |y|
-          Array.new(Vedeu.width + 1) do |x|
-            Vedeu::Models::Cell.new(position: [y, x])
-          end
-        end
-      end
-
-      # Write a collection of cells to the virtual terminal, will
-      # then send written content to be rendered by a renderer.
-      #
-      # @param value [Array<Array<Vedeu::Views::Char>>]
-      # @return [Array<Array<Vedeu::Views::Char>>]
-      def write(value)
-        update_buffer(value)
-
-        render
-
-        self
+      # @return [Vedeu::Buffers::View]
+      def reset!
+        @buffer = buffer.reset!
       end
 
       # Write a collection of cells to the virtual terminal, but do
       # not send to a renderer.
       #
-      # @param value [Array<Array<Vedeu::Views::Char>>]
+      # @param value_or_values [Array<Array<Vedeu::Views::Char>>]
       # @return [Array<Array<Vedeu::Views::Char>>]
-      def update(value)
-        update_buffer(value)
+      def update(value_or_values)
+        buffer.update(value_or_values)
 
         self
       end
 
-      private
-
-      # @param from [Array] An Array of rows, or an Array of cells.
-      # @param which [Fixnum] A Fixnum representing the index; the row
-      #   number or the cell number for a row.
-      # @return [Array<Vedeu::Views::Char>|Array]
-      def fetch(from, which)
-        from[which] || []
-      end
-
-      # Returns a boolean indicating the value has a position
-      # attribute.
+      # Write a collection of cells to the virtual terminal, will
+      # then send written content to be rendered by a renderer. This
+      # method is used internally by Vedeu, but can be triggered in
+      # DRb mode pushing the given data in to the virtual buffer of
+      # the running client application as per the example.
+      #
+      # @example
+      #   Vedeu.trigger(:_drb_store_output_, value_or_values)
       #
-      # @param value [void]
-      # @return [Boolean]
-      def position?(value)
-        value.respond_to?(:position) &&
-          value.position.is_a?(Vedeu::Geometry::Position)
-      end
-
       # @param value [Array<Array<Vedeu::Views::Char>>]
       # @return [Array<Array<Vedeu::Views::Char>>]
-      def update_buffer(value)
-        values = Array(value).flatten
+      def write(value_or_values)
+        buffer.update(value_or_values)
 
-        values.each do |v|
-          buffer[v.position.y][v.position.x] = v if valid_position?(v)
-        end
-      end
+        refresh
 
-      # Returns a boolean indicating the value has a position
-      # attribute and is within the terminal boundary.
-      #
-      # @param value [void]
-      # @return [Boolean]
-      def valid_position?(value)
-        position?(value) && within_terminal_boundary?(value)
+        self
       end
 
-      # Returns a boolean indicating the position of the value object
-      # is valid for this terminal.
+      private
+
+      # Return a grid of {Vedeu::Models::Cell} objects defined by the
+      # height and width of this virtual terminal.
       #
-      # @param value [void]
-      # @return [Boolean]
-      def within_terminal_boundary?(value)
-        buffer[value.position.y] && buffer[value.position.y][value.position.x]
+      # @return [Vedeu::Buffers::View]
+      def buffer
+        @buffer ||= Vedeu::Buffers::View.new(name: name)
       end
+      alias_method :cells, :buffer
 
     end # Buffer
 
@@ -168,13 +112,13 @@ module Vedeu
 
   # :nocov:
 
-  # See {file:docs/events/visibility.md#\_clear_}
+  # @see Vedeu::Terminal::Buffer#clear
   Vedeu.bind(:_clear_) { Vedeu.clear }
 
-  # See {file:docs/events/drb.md#\_drb_retrieve_output_}
+  # @see Vedeu::Terminal::Buffer#output
   Vedeu.bind(:_drb_retrieve_output_) { Vedeu::Terminal::Buffer.output }
 
-  # See {file:docs/events/drb.md#\_drb_store_output_}
+  # @see Vedeu::Terminal::Buffer#write
   Vedeu.bind(:_drb_store_output_) { |data| Vedeu::Terminal::Buffer.write(data) }
 
   # :nocov: