vedeu 0.0.17 → 0.0.18

data/lib/vedeu/support/terminal.rb

@@ -7,6 +7,8 @@ module Vedeu
 
       def output(stream = '')
         console.print(stream)
+
+        stream
       end
 
       def width

data/lib/vedeu/version.rb

@@ -1,3 +1,3 @@
 module Vedeu
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/test/lib/vedeu/application_test.rb

@@ -15,7 +15,7 @@ module Vedeu
 
       before do
         Terminal.stubs(:open).yields(self)
-        InterfaceRepository.stubs(:initial_state)
+        Output.stubs(:render)
         EventLoop.stubs(:main_sequence)
         Terminal.stubs(:close)
       end

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

@@ -23,7 +23,7 @@ module Vedeu
         end
 
         it 'returns an escape sequence' do
-          subject.must_equal("\e[48;5;49m")
+          subject.must_equal("\e[48;2;49m")
         end
       end
 

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

@@ -35,7 +35,7 @@ module Vedeu
           let(:pair) { [:blue] }
 
           it 'returns the code for blue on default' do
-            subject.must_equal("\e[38;2;34m\e[48;5;49m")
+            subject.must_equal("\e[38;2;34m\e[48;2;49m")
           end
         end
 
@@ -43,7 +43,7 @@ module Vedeu
           let(:pair) { [nil, :cyan] }
 
           it 'returns the code for default with cyan background' do
-            subject.must_equal("\e[38;5;39m\e[48;2;46m")
+            subject.must_equal("\e[38;2;39m\e[48;2;46m")
           end
         end
 

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

@@ -10,9 +10,8 @@ module Vedeu
     let(:interface)          { 'dummy' }
 
     before do
-      Interface.create({ name: 'dummy' })
-      Interface.create({ name: 'test_interface' })
-      Renderer.stubs(:write).returns(stream)
+      Interface.create({ name: 'dummy', width: 15, height: 2 })
+      Interface.create({ name: 'test_interface', width: 15, height: 2 })
     end
 
     after do
@@ -60,22 +59,28 @@ module Vedeu
 
       context 'when unstyled' do
         context 'and a single line' do
-          let(:output) { [['Some text...']] }
-          let(:stream) { 'Some text...' }
+          let(:output) { { 'dummy' => [['Some text...']] } }
+          let(:stream) {
+            [[["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1HSome text...\e[2;1H               \e[2;1H", "\e[38;2;39m\e[48;2;49m", "\e[?25h"], ["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1H\e[2;1H               \e[2;1H", "\e[38;2;39m\e[48;2;49m", "\e[?25h"]]]
+          }
 
-          it 'returns a String' do
+          it 'returns the enqueue composition' do
             subject.must_equal(stream)
           end
         end
 
         context 'and multi-line' do
           let(:output) {
-            [
-              ['Some text...'],
-              ['Some more text...']
-            ]
+            {
+              'dummy' => [
+                ['Some text...'],
+                ['Some more text...']
+              ]
+            }
+          }
+          let(:stream) {
+            [[["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1HSome text...\e[2;1H               \e[2;1H", "\e[1;1H               \e[1;1HSome more tex...\e[0m\e[2;1H               \e[2;1H", "\e[38;2;39m\e[48;2;49m", "\e[?25h"], ["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1H\e[2;1H               \e[2;1H", "\e[38;2;39m\e[48;2;49m", "\e[?25h"]]]
           }
-          let(:stream) { "Some text...\nSome more text..." }
 
           it 'returns a String' do
             subject.must_equal(stream)
@@ -87,11 +92,15 @@ module Vedeu
         context 'with colour pair' do
           context 'and a single line' do
             let(:output) {
-              [
-                [{ colour: [:red, :white] }, 'Some text...']
-              ]
+              {
+                'dummy' => [
+                  [{ colour: [:red, :white] }, 'Some text...']
+                ]
+              }
+            }
+            let(:stream) {
+              [[["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1H\e[38;2;31m\e[48;2;47m\e[2;1H               \e[2;1HSome text...", "\e[38;2;39m\e[48;2;49m", "\e[?25h"], ["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1H\e[2;1H               \e[2;1H", "\e[38;2;39m\e[48;2;49m", "\e[?25h"]]]
             }
-            let(:stream) { "\e[38;5;31m\e[48;5;47mSome text..." }
 
             it 'returns a String' do
               subject.must_equal(stream)
@@ -100,14 +109,15 @@ module Vedeu
 
           context 'and multi-line' do
             let(:output) {
-              [
-                [{ colour: [:red, :white] },   'Some text...'],
-                [{ colour: [:blue, :yellow] }, 'Some more text...']
-              ]
+              {
+                'dummy' => [
+                  [{ colour: [:red, :white] },   'Some text...'],
+                  [{ colour: [:blue, :yellow] }, 'Some more text...']
+                ]
+              }
             }
             let(:stream) {
-              "\e[38;5;31m\e[48;5;47mSome text...\n" \
-              "\e[38;5;34m\e[48;5;43mSome more text..."
+              [[["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1H\e[38;2;31m\e[48;2;47m\e[2;1H               \e[2;1HSome text...", "\e[1;1H               \e[1;1H\e[38;2;34m\e[48;2;43m\e[2;1H               \e[2;1HSome more tex...\e[0m", "\e[38;2;39m\e[48;2;49m", "\e[?25h"], ["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1H\e[2;1H               \e[2;1H", "\e[38;2;39m\e[48;2;49m", "\e[?25h"]]]
             }
 
             it 'returns a String' do
@@ -119,12 +129,14 @@ module Vedeu
         context 'with a style' do
           context 'and a single line' do
             let(:output) {
-              [
-                [{ style: :bold }, 'Some text...']
-              ]
+              {
+                'dummy' => [
+                  [{ style: :bold }, 'Some text...']
+                ]
+              }
             }
             let(:stream) {
-              "\e[1mSome text..."
+              [[["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1H\e[1m\e[2;1H               \e[2;1HSome text...", "\e[38;2;39m\e[48;2;49m", "\e[?25h"], ["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1H\e[2;1H               \e[2;1H", "\e[38;2;39m\e[48;2;49m", "\e[?25h"]]]
             }
 
             it 'returns a String' do
@@ -134,14 +146,15 @@ module Vedeu
 
           context 'and multi-line' do
             let(:output) {
-              [
-                [{ style: :inverse },   'Some text...'],
-                [{ style: :underline }, 'Some more text...']
-              ]
+              {
+                'dummy' => [
+                  [{ style: :inverse },   'Some text...'],
+                  [{ style: :underline }, 'Some more text...']
+                ]
+              }
             }
             let(:stream) {
-              "\e[7mSome text...\n" \
-              "\e[4mSome more text..."
+              [[["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1H\e[7m\e[2;1H               \e[2;1HSome text...", "\e[1;1H               \e[1;1H\e[4m\e[2;1H               \e[2;1HSome more tex...\e[0m", "\e[38;2;39m\e[48;2;49m", "\e[?25h"], ["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1H\e[2;1H               \e[2;1H", "\e[38;2;39m\e[48;2;49m", "\e[?25h"]]]
             }
 
             it 'returns a String' do
@@ -152,12 +165,14 @@ module Vedeu
 
         context 'with an unknown style' do
           let(:output) {
-            [
-              [{ style: :unknown }, 'Some text...']
-            ]
+            {
+              'dummy' => [
+                [{ style: :unknown }, 'Some text...']
+              ]
+            }
           }
           let(:stream) {
-            "Some text..."
+            [[["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1H\e[2;1H               \e[2;1HSome text...", "\e[38;2;39m\e[48;2;49m", "\e[?25h"], ["\e[38;2;39m\e[48;2;49m", "\e[1;1H               \e[1;1H\e[2;1H               \e[2;1H", "\e[38;2;39m\e[48;2;49m", "\e[?25h"]]]
           }
 
           it 'renders in the default style' do

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

@@ -171,17 +171,5 @@ module Vedeu
         subject.must_equal("\e[8")
       end
     end
-
-    describe '.esc' do
-      let(:subject) { described_class.esc }
-
-      it 'returns a String' do
-        subject.must_be_instance_of(String)
-      end
-
-      it 'returns an escape sequence' do
-        subject.must_equal("\e[")
-      end
-    end
   end
 end

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

@@ -23,7 +23,7 @@ module Vedeu
         end
 
         it 'returns an escape sequence' do
-          subject.must_equal("\e[38;5;39m")
+          subject.must_equal("\e[38;2;39m")
         end
       end
 

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

@@ -0,0 +1,26 @@
+require_relative '../../../test_helper'
+
+module Vedeu
+  describe Output do
+    let(:described_class) { Output }
+    let(:subject)         { described_class.new }
+    let(:result)          {}
+    let(:queued_result)   { { 'dummy' => [['queued...']] } }
+
+    before do
+      Interface.create({ name: 'dummy', width: 10, height: 2, cursor: true })
+    end
+
+    after do
+      InterfaceRepository.reset
+    end
+
+    it 'returns an Output instance' do
+      subject.must_be_instance_of(Output)
+    end
+
+    describe '.render' do
+      let(:subject) { described_class.render }
+    end
+  end
+end

data/test/lib/vedeu/process/process_test.rb

@@ -16,13 +16,17 @@ module Vedeu
       let(:command) { Command.new }
 
       before do
+        Interface.create({ name: 'dummy' })
         Queue.stubs(:dequeue).returns(input)
         CommandRepository.stubs(:by_keypress).returns(command)
         CommandRepository.stubs(:by_keyword).returns(command)
         command.stubs(:execute).returns(result)
       end
 
-      after { Queue.clear }
+      after do
+        InterfaceRepository.reset
+        Queue.clear
+      end
 
       context 'when there is no input' do
         it 'returns a NilClass' do
@@ -48,7 +52,7 @@ module Vedeu
         end
 
         context 'or the result is anything else' do
-          let(:result) { :something_else }
+          let(:result) { { 'dummy' => [['output...']] } }
 
           it 'returns an Array' do
             subject.must_be_instance_of(Array)
@@ -74,7 +78,7 @@ module Vedeu
         end
 
         context 'or the result is anything else' do
-          let(:result) { :something_else }
+          let(:result) { { 'dummy' => [['output...']] } }
 
           it 'returns an Array' do
             subject.must_be_instance_of(Array)

data/test/lib/vedeu/repository/interface_repository_test.rb

@@ -8,6 +8,8 @@ module Vedeu
 
     before { Interface.create({ name: 'dummy' }) }
 
+    after { InterfaceRepository.reset }
+
     describe '.activate' do
       let(:subject) { described_class.activate(interface) }
 
@@ -40,19 +42,11 @@ module Vedeu
       end
     end
 
-    describe '.initial_state' do
-      let(:subject) { described_class.initial_state }
-
-      before { Compositor.stubs(:arrange) }
-
-      it 'returns an Array' do
-        subject.must_be_instance_of(Array)
-      end
-    end
-
     describe '.update' do
       let(:subject) { described_class.update }
 
+      before { Compositor.stubs(:arrange) }
+
       it 'returns an Array' do
         subject.must_be_instance_of(Array)
       end

data/test/lib/vedeu/repository/interface_test.rb

@@ -43,13 +43,11 @@ module Vedeu
       end
     end
 
-    describe '#initial_state' do
-      let(:subject) { described_instance.initial_state }
+    describe '#update' do
+      let(:subject) { described_instance.update }
 
-      before { Compositor.stubs(:arrange) }
-
-      it 'returns a NilClass' do
-        subject.must_be_instance_of(NilClass)
+      it 'returns a Array' do
+        subject.must_be_instance_of(Array)
       end
     end
 

data/test/lib/vedeu/{process → support}/queue_test.rb

@@ -4,20 +4,21 @@ module Vedeu
   describe Queue do
     let(:described_class) { Queue }
 
-    before { described_class.clear }
+    before { described_class.enqueue(:result) }
+    after  { described_class.clear }
 
     describe '.dequeue' do
       let(:subject) { described_class.dequeue }
 
       context 'when the queue is empty' do
+        before { described_class.clear }
+
         it 'returns a NilClass' do
           subject.must_be_instance_of(NilClass)
         end
       end
 
       context 'when the queue is not empty' do
-        before { described_class.enqueue(:result) }
-
         it 'returns the first entry added' do
           subject.must_be_instance_of(Symbol)
         end
@@ -33,7 +34,25 @@ module Vedeu
       end
 
       it 'contains the enqueued item' do
-        subject.size.must_equal(1)
+        subject.size.must_equal(2)
+      end
+    end
+
+    describe '.enqueued?' do
+      let(:subject) { described_class.enqueued? }
+
+      context 'when the queue contains data' do
+        it 'returns a TrueClass' do
+          subject.must_be_instance_of(TrueClass)
+        end
+      end
+
+      context 'when the queue is empty' do
+        before { described_class.clear }
+
+        it 'returns a FalseClass' do
+          subject.must_be_instance_of(FalseClass)
+        end
       end
     end
 
@@ -45,7 +64,7 @@ module Vedeu
       end
 
       it 'returns the size of the queue' do
-        subject.must_equal(0)
+        subject.must_equal(1)
       end
     end
 
@@ -69,7 +88,7 @@ module Vedeu
       end
 
       it 'returns the queue as a String' do
-        subject.must_equal("[]")
+        subject.must_equal("[:result]")
       end
     end
   end

data/test/lib/vedeu/support/terminal_test.rb

@@ -28,14 +28,12 @@ module Vedeu
     describe '.output' do
       let(:subject) { described_class.output }
 
-      before { console.stubs(:print).returns("test") }
-
       it 'returns a String' do
         subject.must_be_instance_of(String)
       end
 
       it 'returns the output' do
-        subject.must_equal("test")
+        subject.must_equal("")
       end
     end
 
@@ -86,8 +84,12 @@ module Vedeu
     describe '.close' do
       let(:subject) { described_class.close }
 
-      it 'returns a NilClass' do
-        subject.must_be_instance_of(NilClass)
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[24;1H                                                                                \e[24;1H")
       end
     end
 
@@ -120,18 +122,12 @@ module Vedeu
     describe '.clear_screen' do
       let(:subject) { described_class.clear_screen }
 
-      before { Esc.stubs(:clear).returns('') }
-
-      it 'returns a NilClass' do
-        subject.must_be_instance_of(NilClass)
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
       end
 
-      context 'capturing output' do
-        let(:io) { capture_io { subject }.join }
-
-        it 'returns a String' do
-          io.must_be_instance_of(String)
-        end
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[2J")
       end
     end
 
@@ -139,56 +135,48 @@ module Vedeu
       let(:subject) { described_class.clear_line(index) }
       let(:index)   { 0 }
 
-      it 'returns a NilClass' do
-        subject.must_be_instance_of(NilClass)
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[0;1H                                                                                \e[0;1H")
       end
     end
 
     describe '.show_cursor' do
       let(:subject) { described_class.show_cursor }
 
-      it 'returns a NilClass' do
-        subject.must_be_instance_of(NilClass)
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
       end
 
-      context 'capturing output' do
-        let(:io) { capture_io { subject }.join }
-
-        it 'returns a String' do
-          io.must_be_instance_of(String)
-        end
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[?25h")
       end
     end
 
     describe '.hide_cursor' do
       let(:subject) { described_class.hide_cursor }
 
-      it 'returns a NilClass' do
-        subject.must_be_instance_of(NilClass)
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
       end
 
-      context 'capturing output' do
-        let(:io) { capture_io { subject }.join }
-
-        it 'returns a String' do
-          io.must_be_instance_of(String)
-        end
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[?25l")
       end
     end
 
     describe '.reset_colours' do
       let(:subject) { described_class.reset_colours }
 
-      it 'returns a NilClass' do
-        subject.must_be_instance_of(NilClass)
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
       end
 
-      context 'capturing output' do
-        let(:io) { capture_io { subject }.join }
-
-        it 'returns a String' do
-          io.must_be_instance_of(String)
-        end
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[0m")
       end
     end
 
@@ -211,8 +199,12 @@ module Vedeu
     describe '#initial_setup!' do
       let(:subject) { described_class.new.initial_setup! }
 
-      it 'returns a NilClass' do
-        subject.must_be_instance_of(NilClass)
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[1;1H")
       end
     end
   end