vedeu 0.6.23 → 0.6.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4242ab9d58186c12c3f4884987b54da9740b138d
-  data.tar.gz: 9129f04bc359fa77f802414074136695417003f7
+  metadata.gz: 31ffcc8349f9218094f5a70a9aad877413bd7190
+  data.tar.gz: c2cba91b9c9c55055ca68aff099fb974005b6c03
 SHA512:
-  metadata.gz: 449cf59c90d7017af8b6558e59dcf077ec89cb935f750365e36d0ba8b36d6a09e75f07f329ea6ab7acfa5eeaab55b9f14a35613aaef72c39b45a3be71bf21be0
-  data.tar.gz: 723cd0a76e4d71187bd28390f61fef953fe1ed73de24b976a21eaff46928d595f0d5ab8682016dd29cebf9a2aac28aa062aa364f63798c9eac1f65a920327b36
+  metadata.gz: e70bd67f435d4db9713ffdc8cb729463e7a7189bfd5ce4d4aa3a4d1d22c699ad3c43647d5410492632497450e51786f1a2cab57345e3b3bc7407783820c857df
+  data.tar.gz: d3cbb5f04bc6eb6f12d452e51c0711254f2203d82b2c929c97157a0e7c98d9d922e5443d3323bf7a69cfa92d90cf568d3ae2a461bc9759e0ebadd0551131ba42

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.ready?
+        Vedeu::Output::Output.render(output) if enabled?
       end
 
       protected
@@ -75,7 +75,7 @@ module Vedeu
 
       # @return [Array<Array<Vedeu::Views::Char>>]
       def output
-        Vedeu.timer("Bordering: '#{name}'") do
+        Vedeu.timer("Drawing border: '#{name}'") do
           out = [top, bottom]
 
           height.times { |y| out << [left(y), right(y)] }

data/lib/vedeu/buffers/refresh.rb

@@ -42,9 +42,7 @@ module Vedeu
       def by_name
         Vedeu.trigger(:_clear_view_content_, name)
 
-        Vedeu.timer("Refresh Buffer: '#{name}'") do
-          Vedeu.buffers.by_name(name).render
-        end
+        Vedeu.buffers.by_name(name).render
 
         Vedeu.trigger(:_refresh_border_, name) unless content_only?
       end

data/lib/vedeu/cursors/refresh.rb

@@ -14,6 +14,9 @@ module Vedeu
                      :height,
                      :width
 
+      # @example
+      #   Vedeu.trigger(:_refresh_cursor_, name)
+      #
       # @param (see #initialize)
       def self.by_name(name = nil)
         new(name).by_name

data/lib/vedeu/editor/cropper.rb

@@ -7,41 +7,58 @@ module Vedeu
     #
     class Cropper
 
+      extend Forwardable
+
+      def_delegators :border,
+                     :bx,
+                     :bxn,
+                     :by,
+                     :byn,
+                     :height,
+                     :width
+
       # Returns a new instance of Vedeu::Editor::Cropper.
       #
       # @param lines [Vedeu::Editor::Lines]
-      # @param height [Fixnum]
-      # @param width [Fixnum]
+      # @param name [String|Symbol]
       # @param ox [Fixnum]
       # @param oy [Fixnum]
       # @return [Vedeu::Editor::Cropper]
-      def initialize(lines:, height:, width:, ox:, oy:)
-        @lines  = lines
-        @height = height
-        @width  = width
-        @ox     = ox
-        @oy     = oy
+      def initialize(lines:, ox:, oy:, name:)
+        @lines = lines
+        @name  = name
+        @ox    = ox
+        @oy    = oy
       end
 
-      # Returns the lines cropped.
-      #
-      # @note If there are no lines of content, we return an empty
-      # array. If there are any empty lines, then they are discarded.
+      # Returns the visible lines as a sequence of {Vedeu::View::Char}
+      # objects.
       #
       # @return [Array<void>]
-      def cropped
-        lines.map { |line| columns(line) }
+      def viewport
+        out = []
+
+        visible.each_with_index do |line, iy|
+          line.chars.each_with_index do |char, ix|
+            out << Vedeu::Views::Char.new(parent:   interface,
+                                          position: [(by + iy), (bx + ix)],
+                                          value:    char)
+          end
+        end
+
+        out
       end
 
-      protected
+      # @return [Array<void>]
+      def to_a
+        visible
+      end
 
-      # @!attribute [r] height
-      # @return [Fixnum]
-      attr_reader :height
+      protected
 
-      # @!attribute [r] width
-      # @return [Fixnum]
-      attr_reader :width
+      # @!attribute [r] name
+      # @return [String|Symbol]
+      attr_reader :name
 
       # @!attribute [r] ox
       # @return [Fixnum]
@@ -53,6 +70,16 @@ module Vedeu
 
       private
 
+      # Returns the visible lines.
+      #
+      # @note If there are no lines of content, we return an empty
+      # array. If there are any empty lines, then they are discarded.
+      #
+      # @return [Array<void>]
+      def visible
+        lines.map { |line| columns(line) }
+      end
+
       # Return a range of visible lines.
       #
       # @return [Vedeu::Editor::Lines]
@@ -60,6 +87,11 @@ module Vedeu
         @lines[oy...(oy + height)] || []
       end
 
+      # @return [Vedeu::Models::Interface]
+      def interface
+        @interface ||= Vedeu.interfaces.by_name(name)
+      end
+
       # Return a range of visible characters from each line.
       #
       # @return [String]
@@ -67,6 +99,11 @@ module Vedeu
         line[ox...(ox + width)] || ''
       end
 
+      # @return [Vedeu::Borders::Border]
+      def border
+        @border ||= Vedeu.borders.by_name(name)
+      end
+
     end # Editor
 
   end # Cropper

data/lib/vedeu/editor/cursor.rb

@@ -7,21 +7,13 @@ module Vedeu
     #
     class Cursor
 
-      # @!attribute [rw] bx
-      # @return [Fixnum]
-      attr_accessor :bx
-
-      # @!attribute [rw] by
-      # @return [Fixnum]
-      attr_accessor :by
+      extend Forwardable
 
-      # @!attribute [rw] bxn
-      # @return [Fixnum]
-      attr_accessor :bxn
-
-      # @!attribute [rw] byn
-      # @return [Fixnum]
-      attr_accessor :byn
+      def_delegators :border,
+                     :bx,
+                     :bxn,
+                     :by,
+                     :byn
 
       # @!attribute [r] name
       # @return [String|Symbol]
@@ -49,10 +41,6 @@ module Vedeu
       # @option attributes y [Fixnum] The current line.
       # @option attributes x [Fixnum] The current character with the
       #   line.
-      # @option attributes by [Fixnum]
-      # @option attributes bx [Fixnum]
-      # @option attributes byn [Fixnum]
-      # @option attributes bxn [Fixnum]
       # @option attributes name [String|Symbol]
       # @option attributes oy [Fixnum]
       # @option attributes ox [Fixnum]
@@ -97,7 +85,8 @@ module Vedeu
       # document being edited.
       #
       # @return [Vedeu::Editor::Cursor]
-      def store
+      # @todo GL 2015-10-02 Should ox/oy be 0; or set to @ox/@oy?
+      def refresh
         Vedeu::Cursors::Cursor.store(name:    name,
                                      x:       real_x,
                                      y:       real_y,
@@ -105,6 +94,8 @@ module Vedeu
                                      oy:      0,
                                      visible: true)
 
+        Vedeu.trigger(:_refresh_cursor_, name)
+
         self
       end
 
@@ -165,20 +156,21 @@ module Vedeu
 
       private
 
+      # @return [Vedeu::Borders::Border]
+      def border
+        @border ||= Vedeu.borders.by_name(name)
+      end
+
       # Returns the default options/attributes for this class.
       #
-      # @return [Hash<Symbol => Fixnum|NilClass>]
+      # @return [Hash<Symbol => Fixnum|NilClass|String|Symbol>]
       def defaults
         {
-          y:    0,
-          x:    0,
-          by:   nil,
-          bx:   nil,
-          byn:  nil,
-          bxn:  nil,
           name: '',
           ox:   0,
           oy:   0,
+          x:    0,
+          y:    0,
         }
       end
 

data/lib/vedeu/editor/document.rb

@@ -9,25 +9,12 @@ module Vedeu
       include Vedeu::Repositories::Model
       extend Forwardable
 
-      def_delegators :border,
-                     :bx,
-                     :bxn,
-                     :by,
-                     :byn,
-                     :height,
-                     :width
-
       def_delegators :cursor,
-                     :bol,
                      :ox,
                      :oy,
                      :x,
                      :y
 
-      def_delegators :interface,
-                     :colour,
-                     :style
-
       # @!attribute [r] attributes
       # @return [Hash]
       attr_reader :attributes
@@ -54,13 +41,6 @@ module Vedeu
         end
       end
 
-      # Clear the document content in the terminal.
-      #
-      # @return [void]
-      def clear
-        Vedeu.trigger(:_clear_view_content_, name)
-      end
-
       # Deletes the character from the line where the cursor is
       # currently positioned.
       #
@@ -69,8 +49,6 @@ module Vedeu
         @lines = lines.delete_character(y, x - 1)
 
         left
-
-        refresh
       end
 
       # Delete a line.
@@ -82,15 +60,6 @@ module Vedeu
         up
       end
 
-      # Move the virtual cursor down.
-      #
-      # @return [Vedeu::Editor::Document]
-      def down
-        cursor.down
-
-        refresh
-      end
-
       # Returns the document as a string with line breaks if there is
       # more than one line.
       #
@@ -100,7 +69,7 @@ module Vedeu
 
         reset!
 
-        clear
+        Vedeu.trigger(:_clear_view_content_, name)
 
         Vedeu.trigger(:_command_, command)
 
@@ -129,17 +98,6 @@ module Vedeu
         @lines = lines.insert_line(Vedeu::Editor::Line.new, y)
 
         bol
-
-        refresh
-      end
-
-      # Move the virtual cursor left.
-      #
-      # @return [Vedeu::Editor::Document]
-      def left
-        cursor.left
-
-        refresh
       end
 
       # Returns the current line from the collection of lines.
@@ -157,15 +115,6 @@ module Vedeu
         @lines ||= Vedeu::Editor::Lines.coerce(data)
       end
 
-      # Render the document content in the terminal.
-      #
-      # @return [void]
-      def render
-        clear
-
-        Vedeu::Output::Output.render(output)
-      end
-
       # Reset the document to the empty state.
       #
       # @return [Vedeu::Editor::Document]
@@ -178,17 +127,30 @@ module Vedeu
       end
 
       # Store the document in the documents repository, clear and
-      # render the view.
+      # send the content to the terminal.
       #
       # @return [Vedeu::Editor::Document]
       def refresh
         store
 
-        render
+        Vedeu.trigger(:_clear_view_content_, name)
+
+        Vedeu::Output::Output.render(output)
+
+        cursor.refresh
 
         self
       end
 
+      # Move the virtual cursor left.
+      #
+      # @return [Vedeu::Editor::Document]
+      def left
+        cursor.left
+
+        refresh
+      end
+
       # Move the virtual cursor right.
       #
       # @return [Vedeu::Editor::Document]
@@ -207,21 +169,26 @@ module Vedeu
         refresh
       end
 
-      private
-
-      # Retrieve the dimensions of the document from the interface of
-      # the same name.
+      # Move the virtual cursor down.
       #
-      # @return [Vedeu::Borders::Border]
-      def border
-        @border ||= Vedeu.borders.by_name(name)
+      # @return [Vedeu::Editor::Document]
+      def down
+        cursor.down
+
+        refresh
       end
 
-      # @return [Vedeu::Models::Interface]
-      def interface
-        @interface ||= Vedeu.interfaces.by_name(name)
+      # Move the virtual cursor to the beginning of the line.
+      #
+      # @return [Vedeu::Editor::Document]
+      def bol
+        cursor.bol
+
+        refresh
       end
 
+      private
+
       # Returns the default options/attributes for this class.
       #
       # @return [Hash<Symbol => void|Symbol]
@@ -233,25 +200,17 @@ module Vedeu
         }
       end
 
-      # Return the data needed to render the document.
+      # Return the data needed to render the document, based on the
+      # current virtual cursor position. This output may be a cropped
+      # representation of the full document depending on the size of
+      # the interface.
       #
-      # @return [String]
+      # @return [Array<Vedeu::Views::Char>]
       def output
-        out = []
-
-        visible_lines.each_with_index do |line, y_index|
-          line.chars.each_with_index do |char, x_index|
-            position = [(by + y_index), (bx + x_index)]
-
-            out << Vedeu::Views::Char.new(value:    char,
-                                          parent:   interface,
-                                          position: position)
-          end
-        end
-
-        cursor.store
-
-        out.flatten
+        Vedeu::Editor::Cropper.new(lines:  lines,
+                                   name:   name,
+                                   ox:     ox,
+                                   oy:     oy).viewport
       end
 
       # Return a virtual cursor to track the cursor position within
@@ -259,25 +218,7 @@ module Vedeu
       #
       # @return [Vedeu::Editor::Cursor]
       def cursor
-        @cursor ||= Vedeu::Editor::Cursor.new(y:    0,
-                                              x:    0,
-                                              by:   by,
-                                              bx:   bx,
-                                              byn:  byn,
-                                              bxn:  bxn,
-                                              name: name)
-      end
-
-      # Return only the visible lines for the document based on the
-      # current virtual cursor position.
-      #
-      # @return [Vedeu::Editor::Lines]
-      def visible_lines
-        Vedeu::Editor::Cropper.new(lines:  lines,
-                                   height: height,
-                                   width:  width,
-                                   ox:     ox,
-                                   oy:     oy).cropped
+        @cursor ||= Vedeu::Editor::Cursor.new(name: name)
       end
 
     end # Document

data/lib/vedeu/models/focus.rb

@@ -173,6 +173,8 @@ module Vedeu
       # @return [Array]
       def refresh
         Vedeu.trigger(:_refresh_view_, current)
+
+        Vedeu.trigger(:_refresh_cursor_, current)
       end
 
       # Returns a collection of the names of all the registered

data/lib/vedeu/models/toggleable.rb

@@ -55,8 +55,8 @@ module Vedeu
       #
       # @param name [String|Symbol]
       # @return [void]
-      def hide(name = nil)
-        model_by_name(repository, name).hide
+      def hide(name = Vedeu.focus)
+        repository.by_name(name).hide
       end
       alias_method :hide_cursor,    :hide
       alias_method :hide_group,     :hide
@@ -71,8 +71,8 @@ module Vedeu
       #
       # @param name [String|Symbol]
       # @return [void]
-      def show(name = nil)
-        model_by_name(repository, name).show
+      def show(name = Vedeu.focus)
+        repository.by_name(name).show
       end
       alias_method :show_cursor,    :show
       alias_method :show_group,     :show
@@ -87,24 +87,13 @@ module Vedeu
       #
       # @param name [String|Symbol]
       # @return [void]
-      def toggle(name = nil)
-        model_by_name(repository, name).toggle
+      def toggle(name = Vedeu.focus)
+        repository.by_name(name).toggle
       end
       alias_method :toggle_cursor,    :toggle
       alias_method :toggle_group,     :toggle
       alias_method :toggle_interface, :toggle
 
-      private
-
-      # Fetch the model by name.
-      #
-      # @param name [String|Symbol]
-      # @param klass [void] The repository of the model.
-      # @return [void]
-      def model_by_name(klass, name = nil)
-        klass.by_name(name || Vedeu.focus)
-      end
-
     end # ClassMethods
 
     # When this module is included in a class, provide ClassMethods as

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) if Vedeu.ready?
+        Vedeu::Output::Output.render(output)
       end
 
       protected
@@ -132,9 +132,9 @@ module Vedeu
 
       # @return [String]
       def clearing
-        return '(content only)' if content_only?
+        return 'content' if content_only?
 
-        '(all)'
+        'interface'
       end
 
       # @return [Fixnum]

data/lib/vedeu/output/viewport.rb

@@ -44,7 +44,7 @@ module Vedeu
       #
       # @return [Array<Array<String>>|NilClass]
       def render
-        Vedeu::Output::Output.render(output) if visible? && Vedeu.ready?
+        Vedeu::Output::Output.render(output) if visible?
       end
 
       # Returns a string representation of the viewport.
@@ -65,7 +65,7 @@ module Vedeu
 
       # @return [Array<Array<Vedeu::Views::Char>>]
       def output
-        Vedeu.timer("Rendering: '#{name}'") do
+        Vedeu.timer("Rendering content: '#{name}'") do
           out = []
 
           show.each_with_index do |line, iy|

data/lib/vedeu/runtime/main_loop.rb

@@ -13,6 +13,7 @@ module Vedeu
       class << self
 
         # :nocov:
+
         # Start the main loop.
         #
         # @return [void]
@@ -21,9 +22,9 @@ module Vedeu
           @started = true
           @loop    = true
 
-          while @loop
-            Vedeu.trigger(:_refresh_cursor_, Vedeu.focus)
+          Vedeu.trigger(:_refresh_cursor_, Vedeu.focus)
 
+          while @loop
             yield
 
             safe_exit_point!
@@ -32,6 +33,7 @@ module Vedeu
           Vedeu.log(type:    :info,
                     message: 'Vedeu execution interrupted, exiting.')
         end
+
         # :nocov:
 
         # Signal that we wish to terminate the running application.
@@ -42,6 +44,7 @@ module Vedeu
         end
 
         # :nocov:
+
         # Check the application has started and we wish to continue
         # running.
         #
@@ -51,6 +54,7 @@ module Vedeu
         def safe_exit_point!
           fail Vedeu::Error::Interrupt if @started && !@loop
         end
+
         # :nocov:
 
       end # Eigenclass

data/lib/vedeu/terminal/buffer.rb

@@ -81,7 +81,7 @@ module Vedeu
       #
       # @return [Array<Array<Vedeu::Models::Cell>>]
       def reset
-        @output = empty_buffer if Vedeu.ready?
+        @output = empty_buffer
       end
 
       # Write a collection of cells to the virtual terminal.

data/lib/vedeu/version.rb

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

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

@@ -8,29 +8,43 @@ module Vedeu
 
       let(:described) { Vedeu::Editor::Cropper }
       let(:instance)  {
-        described.new(lines:  lines,
-                      height: height,
-                      width:  width,
-                      ox:     ox,
-                      oy:     oy)
+        described.new(lines: lines, name: _name, ox: ox, oy: oy)
       }
+      let(:_name)  { 'editor_cropper' }
       let(:lines)  { Vedeu::Editor::Lines.new }
-      let(:height) { 3 }
-      let(:width)  { 5 }
       let(:ox)     { 1 }
       let(:oy)     { 1 }
 
+      let(:border) {
+        Vedeu::Borders::Border.new(name: _name, enabled: false)
+      }
+      let(:geometry) {
+        Vedeu::Geometry::Geometry.new(name:   _name,
+                                        x:      1,
+                                        y:      1,
+                                        xn:     5,
+                                        yn:     3)
+      }
+      let(:interface) {
+        Vedeu::Models::Interface.new(name: _name)
+      }
+
+      before do
+        Vedeu.geometries.stubs(:by_name).with(_name).returns(geometry)
+        Vedeu.borders.stubs(:by_name).with(_name).returns(border)
+        Vedeu.interfaces.stubs(:by_name).with(_name).returns(interface)
+      end
+
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@lines').must_equal(lines) }
-        it { instance.instance_variable_get('@height').must_equal(height) }
-        it { instance.instance_variable_get('@width').must_equal(width) }
+        it { instance.instance_variable_get('@name').must_equal(_name) }
         it { instance.instance_variable_get('@ox').must_equal(ox) }
         it { instance.instance_variable_get('@oy').must_equal(oy) }
       end
 
-      describe '#cropped' do
-        subject { instance.cropped }
+      describe '#to_a' do
+        subject { instance.to_a }
 
         context 'when there are no lines' do
           let(:lines) { Vedeu::Editor::Lines.new }
@@ -50,30 +64,54 @@ module Vedeu
           }
 
           it { subject.must_equal(['elium', 'ithiu', 'eryll']) }
+        end
+      end
 
-          context 'when oy is near the bottom' do
-            let(:oy) { 6 }
+      # describe '#viewport' do
+      #   subject { instance.viewport }
 
-            it { subject.must_equal([]) }
-          end
+      #   context 'when there are no lines' do
+      #     let(:lines) { Vedeu::Editor::Lines.new }
 
-          context 'when ox is nearly past the content width' do
-            let(:oy) { 5 }
-            let(:ox) { 10 }
+      #     it { subject.must_equal([]) }
+      #   end
 
-            it 'returns only that which is visible, discarding empty lines' do
-              subject.must_equal([])
-            end
-          end
+      #   context 'when there are lines' do
+      #     let(:lines) {
+      #       Vedeu::Editor::Lines.new([
+      #         Vedeu::Editor::Line.new('Hydrogen'),
+      #         Vedeu::Editor::Line.new('Helium'),
+      #         Vedeu::Editor::Line.new('Lithium'),
+      #         Vedeu::Editor::Line.new('Beryllium'),
+      #         Vedeu::Editor::Line.new('Boron'),
+      #       ])
+      #     }
 
-          context 'when both oy and ox are effectively out of range' do
-            let(:oy) { 10 }
-            let(:ox) { 20 }
+      #     it { subject.must_equal(['elium', 'ithiu', 'eryll']) }
 
-            it { subject.must_equal([]) }
-          end
-        end
-      end
+      #     context 'when oy is near the bottom' do
+      #       let(:oy) { 6 }
+
+      #       it { subject.must_equal([]) }
+      #     end
+
+      #     context 'when ox is nearly past the content width' do
+      #       let(:oy) { 5 }
+      #       let(:ox) { 10 }
+
+      #       it 'returns only that which is visible, discarding empty lines' do
+      #         subject.must_equal([])
+      #       end
+      #     end
+
+      #     context 'when both oy and ox are effectively out of range' do
+      #       let(:oy) { 10 }
+      #       let(:ox) { 20 }
+
+      #       it { subject.must_equal([]) }
+      #     end
+      #   end
+      # end
 
     end # Cropper
 

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

@@ -10,78 +10,47 @@ module Vedeu
       let(:instance)   { described.new(attributes) }
       let(:attributes) {
         {
-          y:    y,
-          x:    x,
-          bx:   bx,
-          by:   by,
-          byn:  byn,
-          bxn:  bxn,
           name: _name,
+          ox:   ox,
           oy:   oy,
-          ox:   ox
+          x:    x,
+          y:    y,
         }
       }
-      let(:y)         { 0 }
-      let(:x)         { 0 }
-      let(:by)        { 1 }
-      let(:bx)        { 1 }
-      let(:byn)       { 6 }
-      let(:bxn)       { 6 }
-      let(:_name)     { 'editor_cursor' }
-      let(:oy)        { 0 }
-      let(:ox)        { 0 }
+      let(:_name) { 'editor_cursor' }
+      let(:ox)    { 0 }
+      let(:oy)    { 0 }
+      let(:x)     { 0 }
+      let(:y)     { 0 }
+
+      let(:border) {
+        Vedeu::Borders::Border.new(name: _name, enabled: false)
+      }
+      let(:geometry) {
+        Vedeu::Geometry::Geometry.new(name: _name,
+                                      x:    1,
+                                      y:    1,
+                                      xn:   6,
+                                      yn:   6)
+      }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@y').must_equal(y) }
         it { instance.instance_variable_get('@x').must_equal(x) }
-        it { instance.instance_variable_get('@by').must_equal(by) }
-        it { instance.instance_variable_get('@bx').must_equal(bx) }
-        it { instance.instance_variable_get('@byn').must_equal(byn) }
-        it { instance.instance_variable_get('@bxn').must_equal(bxn) }
         it { instance.instance_variable_get('@name').must_equal(_name) }
         it { instance.instance_variable_get('@oy').must_equal(0) }
         it { instance.instance_variable_get('@ox').must_equal(0) }
-
-        context 'when x is nil' do
-          it { instance.instance_variable_get('@x').must_equal(0) }
-        end
-
-        context 'when x is not nil' do
-          let(:x) { 3 }
-
-          it { instance.instance_variable_get('@x').must_equal(3) }
-        end
-
-        context 'when y is nil' do
-          it { instance.instance_variable_get('@y').must_equal(0) }
-        end
-
-        context 'when y is not nil' do
-          let(:y) { 6 }
-
-          it { instance.instance_variable_get('@y').must_equal(6) }
-        end
       end
 
       describe '#accessors' do
         it {
-          instance.must_respond_to(:bx)
-          instance.must_respond_to(:bx=)
-          instance.must_respond_to(:by)
-          instance.must_respond_to(:by=)
-          instance.must_respond_to(:bxn)
-          instance.must_respond_to(:bxn=)
-          instance.must_respond_to(:byn)
-          instance.must_respond_to(:byn=)
           instance.must_respond_to(:name)
           instance.must_respond_to(:ox)
           instance.must_respond_to(:ox=)
           instance.must_respond_to(:oy)
           instance.must_respond_to(:oy=)
-          instance.must_respond_to(:x)
           instance.must_respond_to(:x=)
-          instance.must_respond_to(:y)
           instance.must_respond_to(:y=)
         }
       end
@@ -120,13 +89,18 @@ module Vedeu
         it { subject.ox.must_equal(3) }
       end
 
-      describe '#store' do
-        before { Vedeu::Cursors::Cursor.stubs(:store) }
+      describe '#refresh' do
+        before {
+          Vedeu::Cursors::Cursor.stubs(:store)
+          Vedeu.stubs(:trigger)
+        }
 
-        subject { instance.store }
+        subject { instance.refresh }
 
         it 'stores the virtual cursor in place of the real cursor' do
           Vedeu::Cursors::Cursor.expects(:store)
+          Vedeu.expects(:trigger).with(:_refresh_cursor_, _name)
+
           subject.must_be_instance_of(described)
         end
       end
@@ -157,14 +131,16 @@ module Vedeu
       end
 
       describe '#to_s' do
-        let(:x) { 11 }
-        let(:y) { 5 }
+        let(:x)  { 11 }
+        let(:y)  { 5 }
+        let(:ox) { 0 }
+        let(:oy) { 0 }
 
         subject { instance.to_s }
 
         it { subject.must_be_instance_of(String) }
 
-        it { subject.must_equal("\e[6;6H\e[?25h") }
+        it { subject.must_equal("\e[6;12H\e[?25h") }
       end
 
       describe '#up' do

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

@@ -58,17 +58,6 @@ module Vedeu
         }
       end
 
-      describe '#clear' do
-        before { Vedeu.stubs(:trigger).with(:_clear_view_content_, _name) }
-
-        subject { instance.clear }
-
-        it {
-          Vedeu.expects(:trigger).with(:_clear_view_content_, _name)
-          subject
-        }
-      end
-
       describe '#delete_character' do
         let(:y) { 0 }
         let(:x) { 0 }
@@ -172,29 +161,6 @@ module Vedeu
         it { subject.must_equal(expected) }
       end
 
-      describe '#render' do
-        let(:data) {
-          Vedeu::Editor::Lines.new([
-            Vedeu::Editor::Line.new('A'),
-            Vedeu::Editor::Line.new('B'),
-            Vedeu::Editor::Line.new('C'),
-          ])
-        }
-        let(:output) { "\e[1;1HA\e[2;1HB\e[3;1HC\e[1;1H\e[?25h" }
-
-        before {
-          Vedeu.stubs(:trigger).with(:_clear_view_content_, _name)
-          Vedeu::Output::Output.stubs(:render)
-        }
-
-        subject { instance.render }
-
-        it {
-          Vedeu::Output::Output.expects(:render)
-          subject
-        }
-      end
-
       describe '#reset!' do
         subject { instance.reset! }
 
@@ -202,12 +168,22 @@ module Vedeu
       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 {
-          instance.expects(:render)
+          Vedeu.expects(:trigger).with(:_clear_view_content_, _name)
+          subject
+        }
+
+        it {
+          Vedeu::Output::Output.expects(:render)
           subject
         }
       end

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

@@ -30,6 +30,10 @@ module Vedeu
         end
       end
 
+      describe 'accessors' do
+        it { instance.must_respond_to(:rows) }
+      end
+
       describe '.coerce' do
         let(:_value) {}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.23
+  version: 0.6.24
 platform: ruby
 authors:
 - Gavin Laking