vedeu 0.4.24 → 0.4.25

data/lib/vedeu/debug.rb

@@ -12,9 +12,9 @@ module Vedeu
 
     require 'ruby-prof'
 
-    RubyProf.measure_mode = RubyProf::WALL_TIME
+    # RubyProf.measure_mode = RubyProf::WALL_TIME
     # RubyProf.measure_mode = RubyProf::PROCESS_TIME
-    # RubyProf.measure_mode = RubyProf::CPU_TIME
+    RubyProf.measure_mode = RubyProf::CPU_TIME
     # RubyProf.measure_mode = RubyProf::ALLOCATIONS
     # RubyProf.measure_mode = RubyProf::MEMORY
     # RubyProf.measure_mode = RubyProf::GC_TIME
@@ -28,9 +28,12 @@ module Vedeu
     result.eliminate_methods!([
       /^Array/,
       /^Hash/,
+      /^String/,
+      /^Fixnum/,
     ])
 
     File.open('/tmp/' + filename, 'w') do |file|
+      # - Creates a HTML visualization of the Ruby stack
       RubyProf::CallStackPrinter.new(result).print(file)
 
       # Used with QTCacheGrind to analyse performance.
@@ -55,9 +58,6 @@ module Vedeu
       # - Creates a call tree report compatible with KCachegrind.
       # RubyProf::CallTreePrinter
 
-      # - Creates a HTML visualization of the Ruby stack
-      # RubyProf::CallStackPrinter
-
       # - Uses the other printers to create several reports in one profiling run
       # RubyProf::MultiPrinter
     end

data/lib/vedeu/distributed/uri.rb

@@ -31,6 +31,7 @@ module Vedeu
       def to_s
         ['druby://', host, ':', port].join
       end
+      alias_method :to_str, :to_s
 
     end # Uri
 

data/lib/vedeu/geometry/geometry.rb

@@ -142,28 +142,6 @@ module Vedeu
       work
     end
 
-    # @param dy [Fixnum]
-    # @param dx [Fixnum]
-    # @return [Vedeu::Geometry]
-    def move(dy = 0, dx = 0)
-      new_attrs = {
-        centred:    false,
-        maximised:  false,
-        name:       name,
-        x:          (area.x + dx),
-        y:          (area.y + dy),
-        xn:         (area.xn + dx),
-        yn:         (area.yn + dy),
-      }
-
-      work = Vedeu::Geometry.new(new_attrs).store
-
-      Vedeu.trigger(:_clear_)
-      Vedeu.trigger(:_refresh_, name)
-
-      work
-    end
-
     private
 
     # @return [Vedeu::Area]

data/lib/vedeu/geometry/position.rb

@@ -74,6 +74,7 @@ module Vedeu
 
       [sequence, yield, sequence].join
     end
+    alias_method :to_str, :to_s
 
     private
 

data/lib/vedeu/models/all.rb

@@ -2,6 +2,7 @@ require 'vedeu/repositories/all'
 
 require_relative 'cell'
 require_relative 'char'
+require_relative 'escape_char'
 require_relative 'stream'
 require_relative 'line'
 require_relative 'interface'

data/lib/vedeu/models/char.rb

@@ -84,7 +84,13 @@ module Vedeu
     # @param value [Vedeu::Position]
     # @return [Vedeu::Position]
     def position=(value)
-      @position = @attributes[:position] = Vedeu::Position.coerce(value)
+      if value.is_a?(Vedeu::Position)
+        @position = @attributes[:position] = value
+
+      else
+        @position = @attributes[:position] = Vedeu::Position.coerce(value)
+
+      end
     end
 
     # @return [String]

data/lib/vedeu/models/escape_char.rb

@@ -0,0 +1,49 @@
+module Vedeu
+
+  class EscapeChar
+
+    # @param value [String]
+    # @return [Vedeu::EscapeChar]
+    def initialize(value)
+      @value = value
+    end
+
+    # @return [String]
+    def colour
+      ''
+    end
+
+    # An object is equal when its values are the same.
+    #
+    # @param other [Vedeu::Char]
+    # @return [Boolean]
+    def eql?(other)
+      self.class == other.class && value == other.value
+    end
+    alias_method :==, :eql?
+
+    # @return [String]
+    def inspect
+      "<Vedeu::EscapeChar '#{Vedeu::Esc.escape(to_s)}'>"
+    end
+
+    # @return [String]
+    def position
+      ''
+    end
+
+    # @return [String]
+    def style
+      ''
+    end
+
+    # @return [String]
+    def value
+      @value
+    end
+    alias_method :to_s, :value
+    alias_method :to_str, :value
+
+  end # EscapeChar
+
+end # Vedeu

data/lib/vedeu/output/border.rb

@@ -174,6 +174,7 @@ module Vedeu
     def to_s
       Vedeu::Renderers::Text.render(render)
     end
+    alias_method :to_str, :to_s
 
     # Renders the bottom border for the interface.
     #
@@ -361,14 +362,14 @@ module Vedeu
     # @return [Vedeu::Position]
     def position(name, iy = 0, ix = 0)
       case name
-      when :top_horizontal    then [y, (bx + ix)]
-      when :bottom_horizontal then [yn, (bx + ix)]
-      when :left_vertical     then [(by + iy), x]
-      when :right_vertical    then [(by + iy), xn]
-      when :bottom_left       then [yn, x]
-      when :bottom_right      then [yn, xn]
-      when :top_left          then [y, x]
-      when :top_right         then [y, xn]
+      when :top_horizontal    then Vedeu::Position.coerce([y, (bx + ix)])
+      when :bottom_horizontal then Vedeu::Position.coerce([yn, (bx + ix)])
+      when :left_vertical     then Vedeu::Position.coerce([(by + iy), x])
+      when :right_vertical    then Vedeu::Position.coerce([(by + iy), xn])
+      when :bottom_left       then Vedeu::Position.coerce([yn, x])
+      when :bottom_right      then Vedeu::Position.coerce([yn, xn])
+      when :top_left          then Vedeu::Position.coerce([y, x])
+      when :top_right         then Vedeu::Position.coerce([y, xn])
       end
     end
 

data/lib/vedeu/output/clear.rb

@@ -59,12 +59,14 @@ module Vedeu
     def clear
       if visible?
         Vedeu::Timer.for(:debug, "Clearing: #{name}") do
+          y, x = *position
+
           @clear ||= Array.new(height) do |iy|
             Array.new(width) do |ix|
               Vedeu::Char.new(value:    ' ',
                               colour:   clear_colour,
                               style:    style,
-                              position: Vedeu::IndexPosition[iy, ix, *position])
+                              position: [y + iy, x + ix])
             end
           end
         end

data/lib/vedeu/output/colour.rb

@@ -114,6 +114,7 @@ module Vedeu
     def to_s
       foreground.to_s + background.to_s
     end
+    alias_method :to_str, :to_s
 
     private
 

data/lib/vedeu/output/compressor.rb

@@ -17,18 +17,12 @@ module Vedeu
     # @return [String]
     def render
       Array(output).flatten.map do |char|
-        if char.is_a?(Vedeu::Char)
-          out = ''
-          out << char.position.to_s
-          out << colour_for(char)
-          out << style_for(char)
-          out << char.value
-          out
-
-        else
-          char.to_s
-
-        end
+        out =  ''
+        out << char.position.to_s
+        out << colour_for(char)
+        out << style_for(char)
+        out << char.value
+        out
       end.join
     end
 

data/lib/vedeu/output/presentation.rb

@@ -7,7 +7,7 @@ module Vedeu
 
     # @return [Vedeu::Background]
     def background
-      if colour
+      @background ||= if colour
         colour.background
 
       else
@@ -20,7 +20,7 @@ module Vedeu
     # @return [Vedeu::Background]
     def background=(value)
       attributes[:background] = value
-      colour.background = value
+      @background = colour.background = Vedeu::Background.coerce(value)
     end
 
     # @return [Vedeu::Colour]
@@ -36,7 +36,7 @@ module Vedeu
 
     # @return [Vedeu::Foreground]
     def foreground
-      if colour
+      @foreground ||= if colour
         colour.foreground
 
       else
@@ -49,7 +49,7 @@ module Vedeu
     # @return [Vedeu::Foreground]
     def foreground=(value)
       attributes[:foreground] = value
-      colour.foreground = value
+      @foreground = colour.foreground = Vedeu::Foreground.coerce(value)
     end
 
     # @return [Vedeu::Background]
@@ -98,10 +98,17 @@ module Vedeu
     # model has previously set the colour and style, reverts back to that for
     # consistent formatting.
     #
+    # @note
+    #   Aliasing #to_str to #to_s seems to reduce rendering time by around ~20ms
+    #   for normal sized (80x25) terminals.
+    # @todo
+    #   Must investigate. (GL 2015-06-05)
+    #
     # @return [String] An escape sequence with value interpolated.
     def to_s
       render_position { render_colour { render_style { value } } }
     end
+    alias_method :to_str, :to_s
 
     private
 
@@ -110,7 +117,7 @@ module Vedeu
       if attributes[:colour]
         attributes[:colour]
 
-      elsif parent_colour
+      elsif parent && parent_colour
         parent_colour
 
       end
@@ -148,7 +155,7 @@ module Vedeu
       if attributes[:style]
         attributes[:style]
 
-      elsif parent_style
+      elsif parent && parent_style
         parent_style
 
       end

data/lib/vedeu/output/style.rb

@@ -71,6 +71,7 @@ module Vedeu
       @sequences ||= Array(value).flatten.map { |v| Vedeu::Esc.string(v) }.join
     end
     alias_method :escape_sequences, :to_s
+    alias_method :to_str, :to_s
 
   end # Style
 

data/lib/vedeu/output/translator.rb

@@ -93,6 +93,7 @@ module Vedeu
       end
     end
     alias_method :to_s, :escape_sequence
+    alias_method :to_str, :escape_sequence
 
     # @return [String]
     def to_html

data/lib/vedeu/output/viewport.rb

@@ -56,7 +56,7 @@ module Vedeu
         out = []
         show[0...height].each_with_index do |line, iy|
           line[0...width].each_with_index do |column, ix|
-            column.position = Vedeu::IndexPosition[iy, ix, by, bx]
+            column.position = [by + iy, bx + ix]
             out << column
           end
         end
@@ -70,6 +70,7 @@ module Vedeu
     def to_s
       render.map(&:to_s).join("\n")
     end
+    alias_method :to_str, :to_s
 
     protected
 

data/lib/vedeu/repositories/collection.rb

@@ -90,6 +90,7 @@ module Vedeu
     def to_s
       collection.map(&:to_s).join
     end
+    alias_method :to_str, :to_s
 
   end # Collection
 

data/lib/vedeu/support/terminal.rb

@@ -101,6 +101,8 @@ module Vedeu
     #
     # @return [String]
     def clear
+      virtual.clear if Vedeu::Configuration.drb?
+
       output(Esc.string('clear'))
     end
 
@@ -217,13 +219,9 @@ module Vedeu
     #
     # @return [Fixnum]
     def width
-      if Vedeu::Configuration.drb?
-        Vedeu::Configuration.drb_width
-
-      else
-        size.last
+      return Vedeu::Configuration.drb_width if Vedeu::Configuration.drb?
 
-      end
+      size.last
     end
     alias_method :xn, :width
     alias_method :txn, :width
@@ -235,13 +233,9 @@ module Vedeu
     #
     # @return [Fixnum]
     def height
-      if Vedeu::Configuration.drb?
-        Vedeu::Configuration.drb_height
+      return Vedeu::Configuration.drb_height if Vedeu::Configuration.drb?
 
-      else
-        size.first
-
-      end
+      size.first
     end
     alias_method :yn, :height
     alias_method :tyn, :height

data/test/lib/vedeu/cursor/cursor_test.rb

@@ -42,8 +42,8 @@ module Vedeu
     describe '#hide_cursor' do
       subject { instance.hide_cursor }
 
-      it { subject.must_be_instance_of(String) }
-      it { subject.must_equal("\e[?25l") }
+      it { subject.must_be_instance_of(Vedeu::EscapeChar) }
+      it { subject.to_s.must_equal("\e[?25l") }
     end
 
     describe '#inspect' do
@@ -58,8 +58,8 @@ module Vedeu
     describe '#show_cursor' do
       subject { instance.show_cursor }
 
-      it { subject.must_be_instance_of(String) }
-      it { subject.must_equal("\e[?25h") }
+      it { subject.must_be_instance_of(Vedeu::EscapeChar) }
+      it { subject.to_s.must_equal("\e[?25h") }
     end
 
     describe '#to_s' do

data/test/lib/vedeu/geometry/geometry_test.rb

@@ -96,15 +96,6 @@ module Vedeu
       it { subject.maximised.must_equal(false) }
     end
 
-    describe '#move' do
-      let(:dy) {}
-      let(:dx) {}
-
-      subject { instance.move(dy, dx) }
-
-
-    end
-
     describe '#top, #right, #bottom, #left' do
       context 'maximised is true' do
         let(:attributes) { { maximised: true } }

data/test/lib/vedeu/models/escape_char_test.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+module Vedeu
+
+  describe EscapeChar do
+
+    let(:described) { Vedeu::EscapeChar }
+    let(:instance)  { described.new(_value) }
+    let(:_value)    { "\e[?25h" }
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(described) }
+      it { instance.instance_variable_get('@value').must_equal(_value) }
+    end
+
+    describe '#colour' do
+      it { instance.colour.must_equal('') }
+    end
+
+    describe '#eql?' do
+      let(:other) { instance }
+
+      subject { instance.eql?(other) }
+
+      it { subject.must_equal(true) }
+
+      context 'when different to other' do
+        let(:other) { described.new(value: 'b') }
+
+        it { subject.must_equal(false) }
+      end
+    end
+
+    describe '#inspect' do
+      it { instance.inspect.must_equal(
+        "<Vedeu::EscapeChar '" \
+        "\\e[?25h"       \
+        "'>"
+      ) }
+    end
+
+    describe '#position' do
+      it { instance.position.must_equal('') }
+    end
+
+    describe '#style' do
+      it { instance.style.must_equal('') }
+    end
+
+    describe '#to_s' do
+      it { instance.to_s.must_be_instance_of(String) }
+    end
+
+  end # EscapeChar
+
+end # Vedeu