vedeu 0.6.9 → 0.6.10

data/test/lib/vedeu/api/external_test.rb

@@ -0,0 +1,62 @@
+require 'test_helper'
+
+module Vedeu
+
+  module API
+
+    describe External do
+
+      it { Vedeu.must_respond_to(:bind) }
+      it { Vedeu.must_respond_to(:bind_alias) }
+      it { Vedeu.must_respond_to(:border) }
+      it { Vedeu.must_respond_to(:bound?) }
+      it { Vedeu.must_respond_to(:clear) }
+      it { Vedeu.must_respond_to(:clear_by_group) }
+      it { Vedeu.must_respond_to(:clear_by_name) }
+      it { Vedeu.must_respond_to(:configuration) }
+      it { Vedeu.must_respond_to(:configure) }
+      it { Vedeu.must_respond_to(:cursor) }
+      it { Vedeu.must_respond_to(:drb_restart) }
+      it { Vedeu.must_respond_to(:drb_start) }
+      it { Vedeu.must_respond_to(:drb_status) }
+      it { Vedeu.must_respond_to(:drb_stop) }
+      it { Vedeu.must_respond_to(:events) }
+      it { Vedeu.must_respond_to(:exit) }
+      it { Vedeu.must_respond_to(:focus) }
+      it { Vedeu.must_respond_to(:focus_by_name) }
+      it { Vedeu.must_respond_to(:focus_next) }
+      it { Vedeu.must_respond_to(:focus_previous) }
+      it { Vedeu.must_respond_to(:focussed?) }
+      it { Vedeu.must_respond_to(:geometry) }
+      it { Vedeu.must_respond_to(:goto) }
+      it { Vedeu.must_respond_to(:group) }
+      it { Vedeu.must_respond_to(:height) }
+      it { Vedeu.must_respond_to(:hide_cursor) }
+      it { Vedeu.must_respond_to(:hide_group) }
+      it { Vedeu.must_respond_to(:hide_interface) }
+      it { Vedeu.must_respond_to(:interface) }
+      it { Vedeu.must_respond_to(:keymap) }
+      it { Vedeu.must_respond_to(:keypress) }
+      it { Vedeu.must_respond_to(:log) }
+      it { Vedeu.must_respond_to(:log_stderr) }
+      it { Vedeu.must_respond_to(:log_stdout) }
+      it { Vedeu.must_respond_to(:menu) }
+      it { Vedeu.must_respond_to(:render) }
+      it { Vedeu.must_respond_to(:renders) }
+      it { Vedeu.must_respond_to(:show_cursor) }
+      it { Vedeu.must_respond_to(:show_group) }
+      it { Vedeu.must_respond_to(:show_interface) }
+      it { Vedeu.must_respond_to(:toggle_cursor) }
+      it { Vedeu.must_respond_to(:toggle_group) }
+      it { Vedeu.must_respond_to(:toggle_interface) }
+      it { Vedeu.must_respond_to(:trigger) }
+      it { Vedeu.must_respond_to(:unbind) }
+      it { Vedeu.must_respond_to(:unbind_alias) }
+      it { Vedeu.must_respond_to(:views) }
+      it { Vedeu.must_respond_to(:width) }
+
+    end # External
+
+  end
+
+end # Vedeu

data/test/lib/vedeu/{internal_api_test.rb → api/internal_test.rb}

@@ -2,7 +2,9 @@ require 'test_helper'
 
 module Vedeu
 
-  describe InternalAPI do
+  module API
+
+    describe Internal do
 
       it { Vedeu.must_respond_to(:background_colours) }
       it { Vedeu.must_respond_to(:borders) }
@@ -24,6 +26,8 @@ module Vedeu
       it { Vedeu.must_respond_to(:resize) }
       it { Vedeu.must_respond_to(:timer) }
 
-  end # InternalAPI
+    end # Internal
+
+  end # API
 
 end # Vedeu

data/test/lib/vedeu/application/controller_test.rb

@@ -30,7 +30,7 @@ module Vedeu
         subject { described_model.controller(:some_controller) }
 
         it {
-          Vedeu::Router.expects(:add_controller).
+          Vedeu::Runtime::Router.expects(:add_controller).
             with(:some_controller, 'Vedeu::ControllerTestKlass')
           subject
         }
@@ -42,9 +42,9 @@ module Vedeu
         subject { described_model.action(:some_action, :other_action) }
 
         it {
-          Vedeu::Router.expects(:add_action).
+          Vedeu::Runtime::Router.expects(:add_action).
             with(:some_controller, :some_action)
-          Vedeu::Router.expects(:add_action).
+          Vedeu::Runtime::Router.expects(:add_action).
             with(:some_controller, :other_action)
           subject
         }

data/test/lib/vedeu/bindings/application_test.rb

@@ -20,12 +20,12 @@ module Vedeu
           }
         }
 
-        before { Vedeu::Router.stubs(:goto) }
+        before { Vedeu::Runtime::Router.stubs(:goto) }
 
         subject { Vedeu.trigger(:_goto_, controller, action, **args) }
 
         it {
-          Vedeu::Router.expects(:goto)
+          Vedeu::Runtime::Router.expects(:goto)
             .with(:some_controller, :show_basket, args)
           subject
         }

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

@@ -10,38 +10,33 @@ module Vedeu
       let(:instance)   { described.new(attributes) }
       let(:attributes) {
         {
-          colour: colour,
-          style:  style,
-          value:  _value,
-          x:      x,
-          y:      y,
+          colour:   colour,
+          style:    style,
+          value:    _value,
+          position: position,
         }
       }
-      let(:colour) { Vedeu::Colours::Colour.new(background: '#000000') }
-      let(:style)  {}
-      let(:_value) {}
-      let(:x)      {}
-      let(:y)      {}
+      let(:colour)   { Vedeu::Colours::Colour.new(background: '#000000') }
+      let(:style)    {}
+      let(:_value)   {}
+      let(:position) {}
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@colour').must_equal(colour) }
         it { instance.instance_variable_get('@style').must_equal(style) }
-        it { instance.instance_variable_get('@value').must_equal(_value) }
-        it { instance.instance_variable_get('@x').must_equal(x) }
-        it { instance.instance_variable_get('@y').must_equal(y) }
+        it { instance.instance_variable_get('@value').must_equal('') }
+        it { instance.instance_variable_get('@position').must_equal([1, 1]) }
       end
 
       describe 'accessors' do
         it { instance.must_respond_to(:colour) }
         it { instance.must_respond_to(:style) }
         it { instance.must_respond_to(:value) }
-        it { instance.must_respond_to(:x) }
-        it { instance.must_respond_to(:y) }
       end
 
       describe '#eql?' do
-        let(:other) { described.new(value: nil) }
+        let(:other) { described.new(value: nil, position: nil) }
 
         subject { instance.eql?(other) }
 
@@ -50,12 +45,48 @@ module Vedeu
         it { subject.must_equal(true) }
 
         context 'when different to other' do
-          let(:other) { described.new(value: 'b') }
+          let(:other) { described.new(value: 'b', position: [2, 3]) }
 
           it { subject.must_equal(false) }
         end
       end
 
+      describe '#position' do
+        subject { instance.position }
+
+        it { subject.must_be_instance_of(Vedeu::Geometry::Position) }
+      end
+
+      describe '#to_hash' do
+        let(:expected) {
+          {
+            colour:   "\e[48;2;0;0;0m",
+            style:    '',
+            value:    '',
+            position: "\e[1;1H",
+          }
+        }
+
+        subject { instance.to_hash }
+
+        it { subject.must_be_instance_of(Hash) }
+        it { subject.must_equal(expected) }
+      end
+
+      describe '#to_html' do
+        subject { instance.to_html }
+
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal('') }
+      end
+
+      describe '#to_s' do
+        subject { instance.to_s }
+
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal('') }
+      end
+
     end # Cell
 
   end # Models

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

@@ -10,22 +10,19 @@ module Vedeu
       let(:instance)   { described.new(attributes) }
       let(:attributes) {
         {
-          value:    _value,
           position: position,
+          value:    _value,
         }
       }
-      let(:_value)     { "\e[?25h" }
       let(:position)   { [2, 6] }
+      let(:_value)     { "\e[?25h" }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@position').must_equal(position) }
         it { instance.instance_variable_get('@value').must_equal(_value) }
       end
 
-      describe 'accessors' do
-        it { instance.must_respond_to(:value) }
-      end
-
       describe '#null' do
         it { instance.null.must_equal(nil) }
         it { instance.background.must_equal(nil) }
@@ -54,13 +51,38 @@ module Vedeu
         it { instance.position.must_be_instance_of(Vedeu::Geometry::Position) }
       end
 
+      describe '#position' do
+        subject { instance.position }
+
+        it { subject.must_be_instance_of(Vedeu::Geometry::Position) }
+      end
+
       describe '#value' do
-        it { instance.value.must_be_instance_of(String) }
+        subject { instance.value }
+
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal("\e[?25h") }
+      end
+
+      describe '#to_hash' do
+        subject { instance.to_hash }
+
+        it { subject.must_be_instance_of(Hash) }
+        it { subject.must_equal({}) }
+      end
+
+      describe '#to_html' do
+        subject { instance.to_html }
+
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal('') }
       end
 
       describe '#to_s' do
         subject { instance.to_s }
 
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal("\e[2;6H\e[?25h") }
         it { instance.must_respond_to(:to_str) }
       end
 

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

@@ -130,56 +130,6 @@ module Vedeu
         end
       end
 
-      describe '#each' do
-        subject { instance.each }
-
-        it { subject.must_be_instance_of(Enumerator) }
-      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([:hydrogen]) }
-
-          it { subject.must_equal(false) }
-        end
-      end
-
-      describe '#row' do
-        let(:index) {}
-
-        subject { instance.row(index) }
-
-        context 'when the index is nil' do
-          it { subject.must_equal(nil) }
-        end
-
-        context 'when the index is not nil' do
-          context 'and the index is in range' do
-            let(:index) { 1 }
-
-            it { subject.must_equal([:beryllium, :boron, :carbon]) }
-          end
-
-          context 'and the index is out of range' do
-            let(:index) { 4 }
-
-            it { subject.must_equal(nil) }
-          end
-
-          context 'and the index is out of range' do
-            let(:index) { -4 }
-
-            it { subject.must_equal(nil) }
-          end
-        end
-      end
-
       describe '#cell' do
         let(:row_index)  {}
         let(:cell_index) {}
@@ -235,6 +185,76 @@ module Vedeu
         end
       end
 
+      # describe '#content' do
+      #   subject { instance.content }
+
+      #   it { subject.must_equal() }
+      # end
+
+      describe '#each' do
+        subject { instance.each }
+
+        it { subject.must_be_instance_of(Enumerator) }
+      end
+
+      describe '#empty?' do
+        subject { instance.empty? }
+
+        context 'when the page is empty' do
+          let(:rows) { [] }
+
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the pages is not empty' do
+          it { subject.must_equal(false) }
+        end
+      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([:hydrogen]) }
+
+          it { subject.must_equal(false) }
+        end
+      end
+
+      describe '#row' do
+        let(:index) {}
+
+        subject { instance.row(index) }
+
+        context 'when the index is nil' do
+          it { subject.must_equal(nil) }
+        end
+
+        context 'when the index is not nil' do
+          context 'and the index is in range' do
+            let(:index) { 1 }
+
+            it { subject.must_equal([:beryllium, :boron, :carbon]) }
+          end
+
+          context 'and the index is out of range' do
+            let(:index) { 4 }
+
+            it { subject.must_equal(nil) }
+          end
+
+          context 'and the index is out of range' do
+            let(:index) { -4 }
+
+            it { subject.must_equal(nil) }
+          end
+        end
+      end
+
     end # Page
 
   end # Models

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

@@ -58,26 +58,6 @@ module Vedeu
         end
       end
 
-      describe '#each' do
-        subject { instance.each }
-
-        it { subject.must_be_instance_of(Enumerator) }
-      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([:hydrogen]) }
-
-          it { subject.must_equal(false) }
-        end
-      end
-
       describe '#cell' do
         let(:index) {}
 
@@ -108,6 +88,46 @@ module Vedeu
         end
       end
 
+      # describe '#content' do
+      #   subject { instance.content }
+
+      #   it { subject.must_equal() }
+      # end
+
+      describe '#each' do
+        subject { instance.each }
+
+        it { subject.must_be_instance_of(Enumerator) }
+      end
+
+      describe '#empty?' do
+        subject { instance.empty? }
+
+        context 'when the row is empty' do
+          let(:cells) { [] }
+
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the row is not empty' do
+          it { subject.must_equal(false) }
+        end
+      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([:hydrogen]) }
+
+          it { subject.must_equal(false) }
+        end
+      end
+
     end # Row
 
   end # Models

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

@@ -27,14 +27,14 @@ module Vedeu
 
           context 'when the output is all Vedeu::Views::Char elements' do
             let(:output) {
-              [
+              Vedeu::Models::Page.coerce([
                 Vedeu::Views::Char.new(value:  'Y',
                                        colour: { foreground: '#ff0000' }),
                 Vedeu::Views::Char.new(value:  'e',
                                        colour: { foreground: '#ff0000' }),
                 Vedeu::Views::Char.new(value:  's',
                                        colour: { foreground: '#ff0000' }),
-              ]
+              ])
             }
             it 'converts the non-Vedeu::Views::Char elements into String ' \
                'elements' do
@@ -44,7 +44,7 @@ module Vedeu
 
           context 'when the output is all Vedeu::Views::Char elements' do
             let(:output) {
-              [
+              Vedeu::Models::Page.coerce([
                 Vedeu::Views::Char.new(value:  'a',
                                        colour: { foreground: '#ff0000' }),
                 Vedeu::Views::Char.new(value:  'b',
@@ -53,7 +53,7 @@ module Vedeu
                                        colour: { foreground: '#0000ff' }),
                 Vedeu::Views::Char.new(value:  'd',
                                        colour: { foreground: '#0000ff' }),
-              ]
+              ])
             }
             it 'compresses multiple colours and styles where possible' do
               subject.must_equal("\e[38;2;255;0;0mab\e[38;2;0;0;255mcd")
@@ -63,11 +63,11 @@ module Vedeu
           context 'when the output is not all Vedeu::Views::Char ' \
                   'elements' do
             let(:output) {
-              [
+              Vedeu::Models::Page.coerce([
                 Vedeu::Views::Char.new(value: 'N'),
                 Vedeu::Models::Escape.new(value: "\e[?25l"),
                 Vedeu::Views::Char.new(value: 't'),
-              ]
+              ])
             }
             it 'converts the non-Vedeu::Views::Char elements into String ' \
                'elements' do
@@ -81,14 +81,14 @@ module Vedeu
 
           context 'when the output is all Vedeu::Views::Char elements' do
             let(:output) {
-              [
+              Vedeu::Models::Page.coerce([
                 Vedeu::Views::Char.new(value:  'Y',
                                        colour: { foreground: '#ff0000' }),
                 Vedeu::Views::Char.new(value:  'e',
                                        colour: { foreground: '#ff0000' }),
                 Vedeu::Views::Char.new(value:  's',
                                        colour: { foreground: '#ff0000' }),
-              ]
+              ])
             }
             it 'converts the non-Vedeu::Views::Char elements into String ' \
                'elements' do
@@ -100,7 +100,7 @@ module Vedeu
 
           context 'when the output is all Vedeu::Views::Char elements' do
             let(:output) {
-              [
+              Vedeu::Models::Page.coerce([
                 Vedeu::Views::Char.new(value:  'a',
                                        colour: { foreground: '#ff0000' }),
                 Vedeu::Views::Char.new(value:  'b',
@@ -109,7 +109,7 @@ module Vedeu
                                        colour: { foreground: '#0000ff' }),
                 Vedeu::Views::Char.new(value:  'd',
                                        colour: { foreground: '#0000ff' }),
-              ]
+              ])
             }
             it 'compresses multiple colours and styles where possible' do
               subject.must_equal(
@@ -123,11 +123,11 @@ module Vedeu
 
           context 'when the output is not all Vedeu::Views::Char elements' do
             let(:output) {
-              [
+              Vedeu::Models::Page.coerce([
                 Vedeu::Views::Char.new(value: 'N'),
                 Vedeu::Models::Escape.new(value: "\e[?25l"),
                 Vedeu::Views::Char.new(value: 't'),
-              ]
+              ])
             }
             it 'converts the non-Vedeu::Views::Char elements into String ' \
                'elements' do

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

@@ -11,40 +11,34 @@ module Vedeu
       let(:output)    {}
       let(:drb)       { false }
 
-      before { Vedeu::Configuration.stubs(:drb?).returns(drb) }
-
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@output').must_equal(output) }
       end
 
       describe '.render' do
-        before { Vedeu.renderers.stubs(:render) }
-
-        subject { described.render(output) }
+        # let(:buffer) { mock }
 
-        context 'when DRb is enabled' do
-          let(:drb)            { true }
-          let(:virtual_buffer) { [] }
+        # before do
+        #   Vedeu::Terminal::Buffer.stubs(:write).returns(buffer)
+        #   buffer.stubs(:render)
+        # end
 
-          before do
-            Vedeu::Configuration.stubs(:drb?).returns(drb)
-            # Vedeu::Renderers::HTML.stubs(:to_file)
-            # Vedeu::Buffers::VirtualBuffers.stubs(:retrieve).returns(virtual_buffer)
-          end
+        # subject { described.render(output) }
 
-          it {
-            Vedeu.expects(:trigger).with(:_drb_store_output_, output)
-            subject
-          }
+        # it {
+        #   Vedeu::Terminal::Buffer.expects(:write).with(output)
+        #   subject
+        # }
 
-          # it 'writes the virtual buffer to a file' do
-          #   Vedeu::Renderers::HTML.expects(:to_file).with(virtual_buffer)
-          #   subject
-          # end
-        end
+        # it {
+        #   buffer.expects(:render)
+        #   subject
+        # }
+      end
 
-        it { Vedeu.renderers.expects(:render).with(output); subject }
+      describe '#render' do
+        it { instance.must_respond_to(:render) }
       end
 
     end # Output