vedeu 0.4.22 → 0.4.23

data/lib/vedeu/models/line.rb

@@ -51,7 +51,7 @@ module Vedeu
     def chars
       return [] if empty?
 
-      streams.map(&:chars).flatten
+      streams.flat_map(&:chars)
     end
 
     # Returns a boolean indicating whether the line has content.

data/lib/vedeu/output/clear.rb

@@ -65,7 +65,7 @@ module Vedeu
             Vedeu::Char.new(value:    ' ',
                             colour:   clear_colour,
                             style:    style,
-                            position: position(iy, ix))
+                            position: Vedeu::IndexPosition[iy, ix, *position])
           end
         end
       else
@@ -105,9 +105,9 @@ module Vedeu
     # @return [Vedeu::Colour] The default background and foreground colours for
     #   the terminal, or the colours of the interface.
     def clear_colour
-      if use_terminal_colours?
-        @colour ||= Vedeu::Colour.new(background: :default,
-                                      foreground: :default)
+      @colour ||= if use_terminal_colours?
+        Vedeu::Colour.new(background: :default,
+                          foreground: :default)
 
       else
         colour
@@ -149,12 +149,12 @@ module Vedeu
     # @param iy [Fixnum]
     # @param ix [Fixnum]
     # @return [Vedeu::IndexPosition]
-    def position(iy, ix)
-      if clear_border?
-        Vedeu::IndexPosition[iy, ix, y, x]
+    def position
+      @position ||= if clear_border?
+        [y, x]
 
       else
-        Vedeu::IndexPosition[iy, ix, by, bx]
+        [by, bx]
 
       end
     end

data/lib/vedeu/output/compressor.rb

@@ -13,6 +13,7 @@ module Vedeu
       @style  = ''
     end
 
+    # @note Takes approximately ~70ms for 2100 chars. (2015-05-24)
     # @return [String]
     def render
       Array(output).flatten.map do |char|

data/lib/vedeu/output/esc.rb

@@ -22,23 +22,9 @@ module Vedeu
     #   Esc.on_blue { 'some text' } # => "\e[44msome text\e[49m"
     #
     #   # Valid names:
-    #   :black
-    #   :red
-    #   :green
-    #   :yellow
-    #   :blue
-    #   :magenta
-    #   :cyan
-    #   :light_grey
-    #   :default
-    #   :dark_grey
-    #   :light_red
-    #   :light_green
-    #   :light_yellow
-    #   :light_blue
-    #   :light_magenta
-    #   :light_cyan
-    #   :white
+    #   :black, :red, :green, :yellow, :blue, :magenta, :cyan, :light_grey,
+    #   :default, :dark_grey, :light_red, :light_green, :light_yellow,
+    #   :light_blue, :light_magenta, :light_cyan, :white
     #
     # @return [Hash<Symbol => Fixnum>]
     def codes
@@ -88,6 +74,32 @@ module Vedeu
       end
     end
 
+    # @return [Hash<Symbol => String>]
+    def actions
+      {
+        hide_cursor:   "\e[?25l",
+        show_cursor:   "\e[?25h",
+        bg_reset:      "\e[49m",
+        blink:         "\e[5m",
+        blink_off:     "\e[25m",
+        bold:          "\e[1m",
+        bold_off:      "\e[22m",
+        border_on:     "\e(0",
+        border_off:    "\e(B",
+        dim:           "\e[2m",
+        fg_reset:      "\e[39m",
+        negative:      "\e[7m",
+        positive:      "\e[27m",
+        reset:         "\e[0m",
+        underline:     "\e[4m",
+        underline_off: "\e[24m",
+      }
+    end
+
+    actions.each do |key, code|
+      define_method(key) { code }
+    end
+
     # Return the stream with the escape sequences escaped so that they can be
     # printed to the terminal instead of being interpreted by the terminal which
     # will render them. This way we can see what escape sequences are being sent
@@ -101,16 +113,6 @@ 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.
     #
@@ -140,45 +142,6 @@ module Vedeu
 
     private
 
-    # @return [String]
-    def bg_reset
-      "\e[49m"
-    end
-
-    # @return [String]
-    def blink
-      "\e[5m"
-    end
-
-    # @return [String]
-    def blink_off
-      "\e[25m"
-    end
-
-    # @return [String]
-    def bold
-      "\e[1m"
-    end
-
-    # @return [String]
-    def bold_off
-      "\e[22m"
-    end
-
-    # Returns the escape sequence to start a border.
-    #
-    # @return [String]
-    def border_on
-      "\e(0"
-    end
-
-    # Returns the escape sequence to end a border.
-    #
-    # @return [String]
-    def border_off
-      "\e(B"
-    end
-
     # @return [String]
     def clear
       [colour_reset, "\e[2J"].join
@@ -199,36 +162,11 @@ module Vedeu
       [fg_reset, bg_reset].join
     end
 
-    # @return [String]
-    def dim
-      "\e[2m"
-    end
-
-    # @return [String]
-    def fg_reset
-      "\e[39m"
-    end
-
-    # @return [String]
-    def negative
-      "\e[7m"
-    end
-
     # @return [String]
     def normal
       [underline_off, bold_off, positive].join
     end
 
-    # @return [String]
-    def positive
-      "\e[27m"
-    end
-
-    # @return [String]
-    def reset
-      "\e[0m"
-    end
-
     # @return [String]
     def screen_init
       [reset, clear, hide_cursor].join
@@ -239,16 +177,6 @@ module Vedeu
       [show_cursor, colour_reset, reset].join
     end
 
-    # @return [String]
-    def underline
-      "\e[4m"
-    end
-
-    # @return [String]
-    def underline_off
-      "\e[24m"
-    end
-
   end # Esc
 
 end # Vedeu

data/lib/vedeu/output/html_char.rb

@@ -55,21 +55,21 @@ module Vedeu
     # @return [String]
     def border_style
       case border
-      when :top_horizontal    then border_css('top')
-      when :left_vertical     then border_css('left')
-      when :right_vertical    then border_css('right')
-      when :bottom_horizontal then border_css('bottom')
-      when :top_left     then [border_css('top'), border_css('left')].join
-      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 :top_horizontal    then css('top')
+      when :left_vertical     then css('left')
+      when :right_vertical    then css('right')
+      when :bottom_horizontal then css('bottom')
+      when :top_left     then [css('top'), css('left')].join
+      when :top_right    then [css('top'), css('right')].join
+      when :bottom_left  then [css('bottom'), css('left')].join
+      when :bottom_right then [css('bottom'), css('right')].join
       else
         ''
       end
     end
 
     # @return [String]
-    def border_css(direction = '')
+    def css(direction = '')
       "border-#{direction}:1px #{fg} solid;"
     end
 

data/lib/vedeu/output/refresh.rb

@@ -10,7 +10,13 @@ module Vedeu
     #
     # @return [Array]
     def all
-      Vedeu.interfaces.registered.each { |name| by_name(name) }
+      message = "Refreshing all interfaces"
+
+      Vedeu.log(type: :info, message: message)
+
+      Vedeu::Timer.for(message) do
+        Vedeu.interfaces.registered.each { |name| by_name(name) }
+      end
     end
 
     # Refresh the interface which is currently focussed.
@@ -26,9 +32,13 @@ module Vedeu
     # @return [Array|ModelNotFound] A collection of the names of interfaces
     #   refreshed, or an exception if the group was not found.
     def by_group(group_name)
-      Vedeu.log(type: :info, message: "Refreshing group: '#{group_name}'")
+      message = "Refreshing group: '#{group_name}'"
 
-      Vedeu.groups.find!(group_name).members.each { |name| by_name(name) }
+      Vedeu.log(type: :info, message: message)
+
+      Vedeu::Timer.for(message) do
+        Vedeu.groups.find!(group_name).members.each { |name| by_name(name) }
+      end
     end
 
     # Refresh an interface by name.
@@ -37,9 +47,11 @@ module Vedeu
     #   named buffer.
     # @return [Array|ModelNotFound]
     def by_name(name)
-      Vedeu.log(type: :info, message: "Refreshing interface: '#{name}'")
+      message = "Refreshing interface: '#{name}'"
+
+      Vedeu.log(type: :info, message: message)
 
-      Vedeu.buffers.by_name(name).render
+      Vedeu::Timer.for(message) { Vedeu.buffers.by_name(name).render }
     end
 
   end # Refresh

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

@@ -23,24 +23,16 @@ module Vedeu
 
     # @return [Array<void>]
     def render(*args)
-      # acc = []
       threads = storage.map do |renderer|
         Thread.new(renderer) do
           mutex.synchronize do
             Vedeu.log(type: :debug,
-                      message: "Sending to renderer: '#{renderer}'")
-            # acc << renderer.render(*args)
+              message: "Rendering with: '#{renderer}' (#{storage.size} defined)")
             renderer.render(*args)
           end
         end
       end
       threads.each(&:join)
-      # acc
-
-      # storage.inject([]) do |acc, renderer|
-      #   acc << renderer.render(*args)
-      #   acc
-      # end
     end
 
     # Adds the given renderer class(es) to the list of renderers.

data/lib/vedeu/output/translator.rb

@@ -33,7 +33,7 @@ module Vedeu
     # @return [Object]
     def self.coerce(value)
       if value.nil?
-        new
+        ''
 
       elsif value.is_a?(self)
         value

data/lib/vedeu/output/viewport.rb

@@ -57,7 +57,7 @@ module Vedeu
       out = []
       show[0...height].each_with_index do |line, iy|
         line[0...width].each_with_index do |column, ix|
-          column.position = IndexPosition[iy, ix, by, bx]
+          column.position = Vedeu::IndexPosition[iy, ix, by, bx]
           out << column
         end
       end

data/lib/vedeu/repositories/repositories/colours.rb

@@ -24,8 +24,11 @@ module Vedeu
 
     # Returns a boolean indicating whether the colour has been registered.
     #
+    # @param colour [String]
     # @return [Boolean]
     def registered?(colour)
+      return false unless colour
+
       storage.key?(colour)
     end
 
@@ -36,15 +39,15 @@ module Vedeu
       storage.clear
     end
 
-    # Retrieves a registered colour.
+    # Retrieves the escape sequence of a registered colour.
     #
     # @return [String]
     def retrieve(colour)
       storage.fetch(colour, '')
     end
 
-    # Retrieves a registered colour, or registers the colour with its respective
-    # escape sequence.
+    # Retrieves the escape sequence of a registered colour, or registers the
+    # colour with its respective escape sequence.
     #
     # @return [String]
     def retrieve_or_register(colour, escape_sequence)

data/lib/vedeu/support/all.rb

@@ -2,5 +2,6 @@ require_relative 'common'
 require_relative 'options'
 require_relative 'template'
 require_relative 'terminal'
+require_relative 'timer'
 require_relative 'trace'
 require_relative 'visibility'

data/lib/vedeu/support/template.rb

@@ -16,7 +16,8 @@ module Vedeu
     # @param path [String]
     # @return [Template]
     def initialize(object, path)
-      @object, @path = object, path.to_s
+      @object = object
+      @path   = path.to_s
     end
 
     # @return [void]

data/lib/vedeu/support/terminal.rb

@@ -37,6 +37,8 @@ module Vedeu
     #
     # @return [String]
     def input
+      Vedeu.log(type: :debug, message: "--- Waiting for user input")
+
       keys_or_cmd = if raw_mode?
                       keys = console.getch
 

data/lib/vedeu/support/timer.rb

@@ -0,0 +1,44 @@
+module Vedeu
+
+  # Measure the duration. Used for debugging.
+  class Timer
+
+    # @param message [String]
+    # @param block [Proc]
+    # @return [void]
+    def self.for(message = '', &block)
+      new(message).measure(&block)
+    end
+
+    # @param message [String]
+    # @return [Vedeu::Timer]
+    def initialize(message = '')
+      @message = message
+      @started = Time.now.to_f
+    end
+
+    # @param block [Proc]
+    # @return [void]
+    def measure(&block)
+      work = yield
+
+      elapsed = ((Time.now.to_f - started) * 1000).to_i
+
+      Vedeu.log(type: :debug, message: "#{message} took #{elapsed}ms.")
+
+      work
+    end
+
+    protected
+
+    # @!attribute [r] started
+    # @return [Time]
+    attr_reader :started
+
+    # @!attribute [r] message
+    # @return [String]
+    attr_reader :message
+
+  end # Timer
+
+end # Vedeu