vedeu 0.6.24 → 0.6.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31ffcc8349f9218094f5a70a9aad877413bd7190
-  data.tar.gz: c2cba91b9c9c55055ca68aff099fb974005b6c03
+  metadata.gz: 815df61c875e913607ccedbc8d9851c4888b4a5b
+  data.tar.gz: 31b4afe5a7789f707d7e17ae05127c8e66b34684
 SHA512:
-  metadata.gz: e70bd67f435d4db9713ffdc8cb729463e7a7189bfd5ce4d4aa3a4d1d22c699ad3c43647d5410492632497450e51786f1a2cab57345e3b3bc7407783820c857df
-  data.tar.gz: d3cbb5f04bc6eb6f12d452e51c0711254f2203d82b2c929c97157a0e7c98d9d922e5443d3323bf7a69cfa92d90cf568d3ae2a461bc9759e0ebadd0551131ba42
+  metadata.gz: cf4133bd63868341598ed14ca0b0086f45f8604f40bebe8013365ba36976fed7502755e93c09a968810db61cc07ae410089bfcb0b3f266c9ce27f9b38ec509a8
+  data.tar.gz: 88c0bee0f579b4a8d75c693e78c3cd99d263f7f867601c3c69fd0d081ff387024f138a6dd1b7e97cc82379a8a88b1a7f4dd6229956dd27b7bd22ee019bd95b07

data/lib/vedeu/borders/refresh.rb

@@ -57,7 +57,7 @@ module Vedeu
 
       # @return [Array<Array<Vedeu::Views::Char>>]
       def render
-        Vedeu::Output::Output.render(output) if enabled?
+        Vedeu.render_output(output) if enabled?
       end
 
       protected

data/lib/vedeu/buffers/buffer.rb

@@ -112,10 +112,10 @@ module Vedeu
         swap if back?
 
         if front?
-          front.render
+          Vedeu::Output::Viewport.render(front)
 
         elsif previous?
-          previous.render
+          Vedeu::Output::Viewport.render(previous)
 
         end
       end

data/lib/vedeu/configuration/api.rb

@@ -299,14 +299,18 @@ module Vedeu
       #
       #   Vedeu.configure do
       #     log_only :debug, :event
+      #
+      #     # or
+      #     log_only [:debug, :info]
+      #
       #     # ...
       #   end
       #
       # @param types [Array<Symbol>] The message types which should be
-      #   slogged.
+      #   logged.
       # @return [Array<Symbol>]
       def log_only(*types)
-        options[:log_only] = types
+        options[:log_only] = types.flatten
       end
 
       # Sets boolean to enable/disable profiling. Vedeu's default

data/lib/vedeu/cursors/cursor.rb

@@ -132,7 +132,9 @@ module Vedeu
       #
       # @return [Array<Vedeu::Models::Escape>]
       def render
-        Vedeu::Output::Output.render(escape_sequence)
+        Vedeu.log(type: :info, message: "Refreshing cursor: '#{name}'")
+
+        Vedeu.render_output(escape_sequence)
       end
 
       # Arbitrarily move the cursor to a given position.

data/lib/vedeu/cursors/refresh.rb

@@ -37,8 +37,6 @@ module Vedeu
       #
       # @return [Array]
       def by_name
-        Vedeu.log(type: :info, message: "Refreshing cursor: '#{name}'")
-
         Vedeu.trigger(:_refresh_view_content_, name) if refresh_view?
 
         cursor.render

data/lib/vedeu/editor/document.rb

@@ -46,9 +46,17 @@ module Vedeu
       #
       # @return [Vedeu::Editor::Document]
       def delete_character
-        @lines = lines.delete_character(y, x - 1)
+        if x - 1 < 0 && y == 0
+          bol
 
-        left
+        elsif x - 1 < 0 && y > 0
+          delete_line
+
+        else
+          @lines = lines.delete_character(y, x - 1)
+
+          left
+        end
       end
 
       # Delete a line.
@@ -58,6 +66,8 @@ module Vedeu
         @lines = lines.delete_line(y)
 
         up
+
+        eol
       end
 
       # Returns the document as a string with line breaks if there is
@@ -93,9 +103,9 @@ module Vedeu
       #
       # @return [Vedeu::Editor::Document]
       def insert_line
-        down
+        @lines = lines.insert_line(y + 1)
 
-        @lines = lines.insert_line(Vedeu::Editor::Line.new, y)
+        down
 
         bol
       end
@@ -103,8 +113,8 @@ module Vedeu
       # Returns the current line from the collection of lines.
       #
       # @return [Array<String|void>]
-      def line
-        lines.line(y)
+      def line(index = y)
+        lines.line(index)
       end
 
       # Returns the collection of lines which constitutes the document
@@ -135,7 +145,7 @@ module Vedeu
 
         Vedeu.trigger(:_clear_view_content_, name)
 
-        Vedeu::Output::Output.render(output)
+        Vedeu.render_output(output)
 
         cursor.refresh
 
@@ -146,6 +156,8 @@ module Vedeu
       #
       # @return [Vedeu::Editor::Document]
       def left
+        return self if x - 1 < 0
+
         cursor.left
 
         refresh
@@ -155,6 +167,8 @@ module Vedeu
       #
       # @return [Vedeu::Editor::Document]
       def right
+        return self if x + 1 > line.size
+
         cursor.right
 
         refresh
@@ -164,18 +178,36 @@ module Vedeu
       #
       # @return [Vedeu::Editor::Document]
       def up
-        cursor.up
+        if x > line(y - 1).size
+          cursor.up
 
-        refresh
+          eol
+
+        else
+          cursor.up
+
+          refresh
+
+        end
       end
 
       # Move the virtual cursor down.
       #
       # @return [Vedeu::Editor::Document]
       def down
-        cursor.down
+        return self if y + 1 >= lines.size
 
-        refresh
+        if x > line(y + 1).size
+          cursor.down
+
+          eol
+
+        else
+          cursor.down
+
+          refresh
+
+        end
       end
 
       # Move the virtual cursor to the beginning of the line.
@@ -187,6 +219,15 @@ module Vedeu
         refresh
       end
 
+      # Move the virtual cursor to the end of the line.
+      #
+      # @return [Vedeu::Editor::Document]
+      def eol
+        cursor.x = line.size
+
+        refresh
+      end
+
       private
 
       # Returns the default options/attributes for this class.

data/lib/vedeu/editor/editor.rb

@@ -13,6 +13,7 @@ module Vedeu
       def_delegators :document,
                      :clear,
                      :delete_character,
+                     :delete_line,
                      :down,
                      :insert_character,
                      :insert_line,
@@ -49,6 +50,7 @@ module Vedeu
 
         case input
         when :backspace then delete_character
+        when :delete    then delete_line
         when :ctrl_c    then Vedeu.trigger(:_exit_)
         when :down      then down
         when :enter     then insert_line
@@ -57,7 +59,6 @@ module Vedeu
         when :right     then right
         when :tab       then execute
         when :up        then up
-        # when ''         then delete_line
         else
           insert_character(input)
         end

data/lib/vedeu/editor/line.rb

@@ -66,7 +66,7 @@ module Vedeu
       # @param index [Fixnum|NilClass]
       # @return [String]
       def delete_character(index = nil)
-        return self if line.empty? || (index && index <= 0)
+        return self if line.empty? || (index && index < 0)
 
         new_line = if index && index <= size
                      line.dup.tap { |line| line.slice!(index) }

data/lib/vedeu/editor/lines.rb

@@ -61,7 +61,8 @@ module Vedeu
       # @param x [Fixnum]
       # @return [Vedeu::Editor::Lines]
       def delete_character(y, x)
-        lines[y] = line(y).delete_character(x)
+        lines[y] = line(y).delete_character(x) unless line(y).empty?
+
         Vedeu::Editor::Lines.coerce(lines)
       end
 
@@ -70,7 +71,7 @@ module Vedeu
       # @param index [Fixnum|NilClass]
       # @return [String]
       def delete_line(index = nil)
-        return self if lines.empty? || (index && index <= 0)
+        return self if lines.empty? || (index && index < 0)
 
         new_lines = if index && index <= size
                       lines.dup.tap { |lines| lines.slice!(index) }
@@ -95,7 +96,7 @@ module Vedeu
       #
       # @return [Boolean]
       def empty?
-        size == 0
+        lines.empty?
       end
 
       # An object is equal when its values are the same.
@@ -115,19 +116,20 @@ module Vedeu
       # @return [Vedeu::Editor::Lines]
       def insert_character(character, y, x)
         lines[y] = line(y).insert_character(character, x)
+
         Vedeu::Editor::Lines.coerce(lines)
       end
 
       # Insert the line on the line below the given index.
       #
-      # @param line [String]
       # @param index [Fixnum|NilClass]
       # @return [Vedeu::Editor::Lines]
-      def insert_line(line, index = nil)
-        return self unless line
-
-        Vedeu::Editor::Lines.coerce(Vedeu::Editor::Insert
-                                    .into(lines, line, index, size))
+      def insert_line(index = nil)
+        Vedeu::Editor::Lines.coerce(
+          Vedeu::Editor::Insert.into(lines,
+                                     Vedeu::Editor::Line.new,
+                                     index,
+                                     size))
       end
 
       # Returns the line at the given index.
@@ -135,17 +137,17 @@ module Vedeu
       # @param index [Fixnum|NilClass]
       # @return [Vedeu::Editor::Line]
       def line(index = nil)
-        return Vedeu::Editor::Line.new                unless lines
-        return Vedeu::Editor::Line.coerce(lines.last) unless index
+        return Vedeu::Editor::Line.new unless lines
+        return Vedeu::Editor::Line.coerce(lines[-1]) unless index
 
         indexed = if index <= 0
-                    lines.first
+                    lines[0]
 
                   elsif index && index <= size
                     lines[index]
 
                   else
-                    lines.last
+                    lines[-1]
 
                   end
 

data/lib/vedeu/esc/esc.rb

@@ -40,7 +40,7 @@ module Vedeu
       def string(value = '')
         return '' if value.empty?
 
-        send(value.to_sym)
+        send(value)
       rescue NoMethodError
         ''
       end

data/lib/vedeu/groups/group.rb

@@ -69,7 +69,7 @@ module Vedeu
       #
       # @return [Array<String>]
       def by_zindex
-        interfaces.sort { |a, b| a.zindex <=> b.zindex }.map(&:name)
+        interfaces.sort_by(&:zindex).map(&:name)
       end
 
       # An object is equal when its values are the same.

data/lib/vedeu/input/store.rb

@@ -36,12 +36,12 @@ module Vedeu
 
       # @return [NilClass|Symbol|String]
       def last_command
-        all_commands.last
+        all_commands[-1]
       end
 
       # @return [NilClass|Symbol|String]
       def last_keypress
-        all_keypresses.last
+        all_keypresses[-1]
       end
 
       # @return [Hash<Symbol => Array<Symbol|String>>]

data/lib/vedeu/logging/log.rb

@@ -142,6 +142,7 @@ module Vedeu
             create: [:light_green,   :green],
             debug:  [:light_red,     :red],
             error:  [:light_red,     :red],
+            editor: [:light_blue,    :blue],
             drb:    [:light_blue,    :blue],
             event:  [:light_magenta, :magenta],
             info:   [:white,         :default],

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

@@ -76,11 +76,6 @@ module Vedeu
       end
       alias_method :lines, :value
 
-      # @return [Array<Array<Vedeu::Views::Char>>]
-      def render
-        Vedeu::Output::Viewport.render(self)
-      end
-
       # Store the view and immediately refresh it; causing to be
       # pushed to the Terminal. Called by {Vedeu::DSL::View.renders}.
       #

data/lib/vedeu/output/clear/interface.rb

@@ -51,7 +51,7 @@ module Vedeu
 
       # @return [Array<Array<Vedeu::Views::Char>>]
       def render
-        Vedeu::Output::Output.render(output)
+        Vedeu.render_output(output)
       end
 
       protected

data/lib/vedeu/output/output.rb

@@ -13,8 +13,8 @@ module Vedeu
       #
       # @return [Array|String]
       # @see #initialize
-      def self.render(output)
-        new(output).render
+      def self.render_output(output)
+        new(output).render_output
       end
 
       # Return a new instance of Vedeu::Output::Output.
@@ -33,7 +33,7 @@ module Vedeu
       # not other renderers.
       #
       # @return [Array|NilClass]
-      def render
+      def render_output
         return nil if output.nil?
         return render_terminal_buffer unless output.is_a?(Vedeu::Models::Escape)
 
@@ -55,4 +55,13 @@ module Vedeu
 
   end # Output
 
+  # Write the given output to the configured or default renderers.
+  #
+  # @example
+  #   Vedeu.render_output(output)
+  #
+  # @!method render_output
+  # @return [Array|NilClass]
+  def_delegators Vedeu::Output::Output, :render_output
+
 end # Vedeu

data/lib/vedeu/output/viewport.rb

@@ -26,8 +26,8 @@ module Vedeu
                      :ox,
                      :oy
 
-      # @param view [Vedeu::Views::View]
-      # @return [Array<Array<Vedeu::Views::Char>>]
+      # @param (see #initialize)
+      # @return (see #render)
       def self.render(view)
         new(view).render
       end
@@ -44,7 +44,7 @@ module Vedeu
       #
       # @return [Array<Array<String>>|NilClass]
       def render
-        Vedeu::Output::Output.render(output) if visible?
+        Vedeu.render_output(output) if visible?
       end
 
       # Returns a string representation of the viewport.

data/lib/vedeu/terminal/terminal.rb

@@ -173,7 +173,7 @@ module Vedeu
       return Vedeu::Configuration.drb_height if Vedeu::Configuration.drb?
       return Vedeu::Configuration.height     if Vedeu::Configuration.height
 
-      size.first
+      size[0]
     end
     alias_method :yn, :height
     alias_method :tyn, :height

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.24'
+  VERSION = '0.6.25'
 
 end

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

@@ -56,7 +56,7 @@ module Vedeu
           let(:enabled) { true }
 
           it {
-            Vedeu::Output::Output.expects(:render)
+            Vedeu.expects(:render_output)
             subject
           }
         end

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

@@ -106,7 +106,7 @@ module Vedeu
       describe '#render' do
         before {
           Vedeu.stubs(:log)
-          Vedeu::Output::Output.stubs(:render)
+          Vedeu.stubs(:render_output)
         }
 
         subject { instance.render }

data/test/lib/vedeu/configuration/api_test.rb

@@ -246,6 +246,11 @@ module Vedeu
           configuration = Vedeu.configure { log_only :debug, :store }
           configuration.log_only.must_equal([:debug, :store])
         end
+
+        it 'sets the options to the desired value' do
+          configuration = Vedeu.configure { log_only [:debug, :info] }
+          configuration.log_only.must_equal([:debug, :info])
+        end
       end
 
       describe '#renderer' do

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

@@ -102,8 +102,7 @@ module Vedeu
         }
 
         before do
-          Vedeu::Output::Output.stubs(:render).
-            with(hide_cursor).returns(hide_cursor)
+          Vedeu.stubs(:render_output).with(hide_cursor).returns(hide_cursor)
         end
 
         subject { instance.hide }
@@ -229,8 +228,7 @@ module Vedeu
         }
 
         before do
-          Vedeu::Output::Output.stubs(:render).
-            with(show_cursor).returns(show_cursor)
+          Vedeu.stubs(:render_output).with(show_cursor).returns(show_cursor)
         end
 
         subject { instance.show }

data/test/lib/vedeu/editor/document_test.rb

@@ -35,7 +35,7 @@ module Vedeu
         Vedeu.geometries.stubs(:by_name).with(_name).returns(geometry)
         Vedeu.interfaces.stubs(:by_name).with(_name).returns(interface)
 
-        Vedeu::Output::Output.stubs(:render)
+        Vedeu.stubs(:render_output)
       }
 
       describe '#initialize' do
@@ -59,31 +59,15 @@ module Vedeu
       end
 
       describe '#delete_character' do
-        let(:y) { 0 }
-        let(:x) { 0 }
-
-        subject { instance.delete_character }
-
-        it { subject.must_be_instance_of(described) }
-
-        # it { skip }
+        it { instance.must_respond_to(:delete_character) }
       end
 
       describe '#delete_line' do
-        let(:y) { 0 }
-
-        subject { instance.delete_line }
-
-        it { subject.must_be_instance_of(described) }
-
-        # it { skip }
+        it { instance.must_respond_to(:delete_line) }
       end
 
       describe '#down' do
-        subject { instance.down }
-
-        it { subject.must_be_instance_of(described) }
-        # it { skip }
+        it { instance.must_respond_to(:down) }
       end
 
       describe '#execute' do
@@ -95,36 +79,23 @@ module Vedeu
       end
 
       describe '#insert_character' do
-        let(:character) { 'a' }
-
-        subject { instance.insert_character(character) }
-
-        it { subject.must_be_instance_of(described) }
-
-        # it { skip }
+        it { instance.must_respond_to(:insert_character) }
 
         context 'when the character is a Symbol' do
           let(:character) { :a }
 
+          subject { instance.insert_character(character) }
+
           it { subject.must_equal(instance) }
         end
       end
 
       describe '#insert_line' do
-        let(:y) { 2 }
-
-        subject { instance.insert_line }
-
-        it { subject.must_be_instance_of(described) }
-
-        # it { skip }
+        it { instance.must_respond_to(:insert_line) }
       end
 
       describe '#left' do
-        subject { instance.left }
-
-        it { subject.must_be_instance_of(described) }
-        # it { skip }
+        it { instance.must_respond_to(:left) }
       end
 
       describe '#line' do
@@ -139,12 +110,6 @@ module Vedeu
         context 'when the line is not empty' do
           it { subject.must_equal(Vedeu::Editor::Line.new('Hydrogen')) }
         end
-
-        # context 'when y is set' do
-        #   let(:y) { 2 }
-
-        #   it { subject.must_equal(Vedeu::Editor::Line.new('Lithium')) }
-        # end
       end
 
       describe '#lines' do
@@ -162,44 +127,27 @@ module Vedeu
       end
 
       describe '#reset!' do
-        subject { instance.reset! }
-
-        it { subject.must_be_instance_of(described) }
+        it { instance.must_respond_to(:reset!) }
       end
 
       describe '#refresh' do
-        before do
-          Vedeu.stubs(:trigger)
-          Vedeu::Output::Output.stubs(:render)
-        end
-
-        subject { instance.refresh }
-
-        it { subject.must_be_instance_of(described) }
-
-        it {
-          Vedeu.expects(:trigger).with(:_clear_view_content_, _name)
-          subject
-        }
-
-        it {
-          Vedeu::Output::Output.expects(:render)
-          subject
-        }
+        it { instance.must_respond_to(:refresh) }
       end
 
       describe '#right' do
-        subject { instance.right }
-
-        it { subject.must_be_instance_of(described) }
-        # it { skip }
+        it { instance.must_respond_to(:right) }
       end
 
       describe '#up' do
-        subject { instance.up }
+        it { instance.must_respond_to(:up) }
+      end
+
+      describe '#bol' do
+        it { instance.must_respond_to(:bol) }
+      end
 
-        it { subject.must_be_instance_of(described) }
-        # it { skip }
+      describe '#eol' do
+        it { instance.must_respond_to(:eol) }
       end
 
     end # Editor

data/test/lib/vedeu/editor/lines_test.rb

@@ -140,7 +140,7 @@ module Vedeu
           context 'and x is the first character of the line' do
             let(:x) { 0 }
             let(:expected) {
-              Vedeu::Editor::Lines.new([Vedeu::Editor::Line.new('Hydrogen')])
+              Vedeu::Editor::Lines.new([Vedeu::Editor::Line.new('ydrogen')])
             }
 
             it { subject.must_equal(expected) }
@@ -180,7 +180,7 @@ module Vedeu
             let(:expected) {
               Vedeu::Editor::Lines.new([
                 Vedeu::Editor::Line.new('Hydrogen'),
-                Vedeu::Editor::Line.new('Helium'),
+                Vedeu::Editor::Line.new('elium'),
                 Vedeu::Editor::Line.new('Lithium'),
               ])
             }
@@ -411,67 +411,56 @@ module Vedeu
       end
 
       describe '#insert_line' do
-        let(:line)  { "Many text..." }
         let(:index) { 1 }
 
-        subject { instance.insert_line(line, index) }
+        subject { instance.insert_line(index) }
 
         it { subject.must_be_instance_of(described) }
 
-        context 'when a line is not given' do
-          let(:line) {}
+        context 'and an index is not given' do
+          let(:index) {}
           let(:expected) {
-            Vedeu::Editor::Lines.coerce(['Some text...', 'More text...', 'Other text...'])
+            Vedeu::Editor::Lines.coerce(['Some text...', 'More text...', 'Other text...', ''])
           }
 
           it { subject.must_equal(expected) }
         end
 
-        context 'when a line is given' do
-          context 'and an index is not given' do
-            let(:index) {}
-            let(:expected) {
-              Vedeu::Editor::Lines.coerce(['Some text...', 'More text...', 'Other text...', 'Many text...'])
-            }
-
-            it { subject.must_equal(expected) }
-          end
-
-          context 'and a negative index is given' do
-            let(:index) { -4 }
-            let(:expected) {
-              Vedeu::Editor::Lines.coerce(['Many text...', 'Some text...', 'More text...', 'Other text...'])
-            }
+        context 'and a negative index is given' do
+          let(:index) { -4 }
+          let(:expected) {
+            Vedeu::Editor::Lines.coerce(['', 'Some text...', 'More text...', 'Other text...'])
+          }
 
-            it { subject.must_equal(expected) }
-          end
+          it { subject.must_equal(expected) }
+        end
 
-          context 'and an index is given' do
-            let(:expected) {
-              Vedeu::Editor::Lines.coerce(['Some text...', 'Many text...', 'More text...', 'Other text...'])
-            }
+        context 'and an index is given' do
+          let(:expected) {
+            Vedeu::Editor::Lines.coerce(['Some text...', '', 'More text...', 'Other text...'])
+          }
 
-            it { subject.must_equal(expected) }
-          end
+          it { subject.must_equal(expected) }
+        end
 
-          context 'and an index of the last line is given' do
-            let(:index) { 5 }
-            let(:expected) {
-              Vedeu::Editor::Lines.coerce(['Some text...', 'More text...', 'Other text...', 'Many text...'])
-            }
+        context 'and an index of the last line is given' do
+          let(:index) { 5 }
+          let(:expected) {
+            Vedeu::Editor::Lines.coerce(['Some text...', 'More text...', 'Other text...', ''])
+          }
 
-            it { subject.must_equal(expected) }
-          end
+          it { subject.must_equal(expected) }
+        end
 
-          context 'and an index greater than the number of lines is given' do
-            let(:index) { 10 }
-            let(:expected) {
-              Vedeu::Editor::Lines.coerce(['Some text...', 'More text...', 'Other text...', 'Many text...'])
-            }
+        context 'and an index greater than the number of lines is given' do
+          let(:index) { 10 }
+          let(:expected) {
+            Vedeu::Editor::Lines.coerce(['Some text...', 'More text...', 'Other text...', ''])
+          }
 
-            it { subject.must_equal(expected) }
-          end
+          it { subject.must_equal(expected) }
         end
+
       end
 
       describe '#line' do

data/test/lib/vedeu/groups/group_test.rb

@@ -70,12 +70,20 @@ module Vedeu
       end
 
       describe '#by_zindex' do
+        let(:interfaces) {
+          [
+            Vedeu::Models::Interface.new(zindex: 3, name: 'c'),
+            Vedeu::Models::Interface.new(zindex: 1, name: 'a'),
+            Vedeu::Models::Interface.new(zindex: 2, name: 'b'),
+          ]
+        }
+
+        before { instance.stubs(:interfaces).returns(interfaces) }
+
         subject { instance.by_zindex }
 
         it { subject.must_be_instance_of(Array) }
-
-        # @todo Add more tests.
-        # it { skip }
+        it { subject.must_equal(['a', 'b', 'c']) }
       end
 
       describe '#hide' do

data/test/lib/vedeu/models/views/view_test.rb

@@ -59,19 +59,6 @@ module Vedeu
         # it { skip }
       end
 
-      describe '#render' do
-        before do
-          Vedeu::Output::Viewport.stubs(:render).with(instance)
-        end
-
-        subject { instance.render }
-
-        it {
-          Vedeu::Output::Viewport.expects(:render).with(instance)
-          subject
-        }
-      end
-
       describe '#store_immediate' do
         before { Vedeu.stubs(:trigger) }
 

data/test/lib/vedeu/output/clear/interface_test.rb

@@ -52,14 +52,14 @@ module Vedeu
         before do
           Vedeu.interfaces.stubs(:by_name).returns(interface)
           Vedeu.geometries.stubs(:by_name).returns(geometry)
-          Vedeu::Output::Output.stubs(:render).returns(output)
+          Vedeu.stubs(:render_output).returns(output)
         end
 
         subject { instance.render }
 
         it { subject.must_be_instance_of(Array) }
         it {
-          Vedeu::Output::Output.expects(:render).with(output)
+          Vedeu.expects(:render_output).with(output)
           subject
         }
         it { subject.must_equal(output) }

data/test/lib/vedeu/output/output_test.rb

@@ -16,8 +16,8 @@ module Vedeu
         it { instance.instance_variable_get('@output').must_equal(output) }
       end
 
-      describe '.render' do
-        subject { described.render(output) }
+      describe '.render_output' do
+        subject { described.render_output(output) }
 
         context 'when the output is empty' do
           it { subject.must_be_instance_of(NilClass) }
@@ -51,8 +51,8 @@ module Vedeu
         end
       end
 
-      describe '#render' do
-        it { instance.must_respond_to(:render) }
+      describe '#render_output' do
+        it { instance.must_respond_to(:render_output) }
       end
 
     end # Output

data/test/lib/vedeu/output/viewport_test.rb

@@ -40,7 +40,7 @@ module Vedeu
 
       describe '.render' do
         before do
-          Vedeu::Output::Output.stubs(:render)
+          Vedeu.stubs(:render_output)
           Vedeu.stubs(:ready?).returns(ready)
         end
 
@@ -49,7 +49,7 @@ module Vedeu
         context 'when the interface is visible' do
           context 'and Vedeu is ready' do
             it {
-              Vedeu::Output::Output.expects(:render)
+              Vedeu.expects(:render_output)
               subject
             }
           end

data/test/lib/vedeu_test.rb

@@ -60,6 +60,7 @@ describe Vedeu do
   it { Vedeu.must_respond_to(:ready!) }
   it { Vedeu.must_respond_to(:ready?) }
   it { Vedeu.must_respond_to(:render) }
+  it { Vedeu.must_respond_to(:render_output) }
   it { Vedeu.must_respond_to(:renders) }
   it { Vedeu.must_respond_to(:renderer) }
   it { Vedeu.must_respond_to(:renderers) }

data/test/support/examples/editor_app.rb

@@ -36,7 +36,7 @@ class VedeuEditorApp
       x  columns(1)
       xn columns(11)
       y  rows(1)
-      yn rows(1) + 4
+      yn rows(1) + 10
     end
     zindex 1
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.24
+  version: 0.6.25
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard