vedeu 0.1.13 → 0.1.14

data/test/lib/vedeu/models/attributes/colour_translator_test.rb

@@ -5,12 +5,12 @@ module Vedeu
   describe ColourTranslator do
     describe '#background' do
       {
-        '#5f0000' => "\e[48;5;52m",
-        '#008700' => "\e[48;5;28m",
-        '#0000d7' => "\e[48;5;20m",
-        '#afafaf' => "\e[48;5;145m",
-        '#afd700' => "\e[48;5;148m",
-        '#af005f' => "\e[48;5;125m",
+        '#5f0000' => "\e[48;2;95;0;0m",
+        '#008700' => "\e[48;2;0;135;0m",
+        '#0000d7' => "\e[48;2;0;0;215m",
+        '#afafaf' => "\e[48;2;175;175;175m",
+        '#afd700' => "\e[48;2;175;215;0m",
+        '#af005f' => "\e[48;2;175;0;95m",
       }.map do |html_colour, terminal_colour|
         it 'translation is performed' do
           ColourTranslator.new(html_colour).background
@@ -41,12 +41,12 @@ module Vedeu
 
     describe '#foreground' do
       {
-        '#5f0000' => "\e[38;5;52m",
-        '#008700' => "\e[38;5;28m",
-        '#0000d7' => "\e[38;5;20m",
-        '#afafaf' => "\e[38;5;145m",
-        '#afd700' => "\e[38;5;148m",
-        '#af005f' => "\e[38;5;125m",
+        '#5f0000' => "\e[38;2;95;0;0m",
+        '#008700' => "\e[38;2;0;135;0m",
+        '#0000d7' => "\e[38;2;0;0;215m",
+        '#afafaf' => "\e[38;2;175;175;175m",
+        '#afd700' => "\e[38;2;175;215;0m",
+        '#af005f' => "\e[38;2;175;0;95m",
       }.map do |html_colour, terminal_colour|
         it 'translation is performed' do
           ColourTranslator.new(html_colour).foreground

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

@@ -6,7 +6,7 @@ module Vedeu
       it 'returns an escape sequence' do
         Colour.new({
           background: '#000000'
-        }).background.must_equal("\e[48;5;16m")
+        }).background.must_equal("\e[48;2;0;0;0m")
       end
 
       it 'returns an empty string when the value is empty' do
@@ -18,7 +18,7 @@ module Vedeu
       it 'returns an escape sequence' do
         Colour.new({
           foreground: '#ff0000'
-        }).foreground.must_equal("\e[38;5;196m")
+        }).foreground.must_equal("\e[38;2;255;0;0m")
       end
 
       it 'returns an empty string when the value is empty' do
@@ -31,19 +31,19 @@ module Vedeu
         Colour.new({
           foreground: '#ff0000',
           background: '#000000'
-        }).to_s.must_equal("\e[38;5;196m\e[48;5;16m")
+        }).to_s.must_equal("\e[38;2;255;0;0m\e[48;2;0;0;0m")
       end
 
       it 'returns an escape sequence when the foreground is missing' do
         Colour.new({
           background: '#000000'
-        }).to_s.must_equal("\e[48;5;16m")
+        }).to_s.must_equal("\e[48;2;0;0;0m")
       end
 
       it 'returns an escape sequence when the background is missing' do
         Colour.new({
           foreground: '#ff0000',
-        }).to_s.must_equal("\e[38;5;196m")
+        }).to_s.must_equal("\e[38;2;255;0;0m")
       end
 
       it 'returns an empty string when both are missing' do

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

@@ -41,7 +41,7 @@ module Vedeu
           "\e[3;3H               \e[3;3H" \
           "\e[4;3H               \e[4;3H" \
           "\e[5;3H               \e[5;3H" \
-          "\e[3;3HSome text..."
+          "\e[3;3HSome text...\e[?25h"
         )
       end
 
@@ -57,7 +57,7 @@ module Vedeu
           "\e[3;3H                              \e[3;3H" \
           "\e[4;3H                              \e[4;3H" \
           "\e[5;3H                              \e[5;3H" \
-          "\e[3;3HSome text... more text..."
+          "\e[3;3HSome text... more text...\e[?25h"
         )
       end
 
@@ -74,7 +74,7 @@ module Vedeu
           "\e[4;3H               \e[4;3H" \
           "\e[5;3H               \e[5;3H" \
           "\e[3;3HSome text..." \
-          "\e[4;3HSome text..."
+          "\e[4;3HSome text...\e[?25h"
         )
       end
 
@@ -91,7 +91,7 @@ module Vedeu
           "\e[4;3H                              \e[4;3H" \
           "\e[5;3H                              \e[5;3H" \
           "\e[3;3HSome text... more text..." \
-          "\e[4;3HSome text... more text..."
+          "\e[4;3HSome text... more text...\e[?25h"
         )
       end
 
@@ -107,7 +107,7 @@ module Vedeu
           "\e[3;3H                              \e[3;3H" \
           "\e[4;3H                              \e[4;3H" \
           "\e[5;3H                              \e[5;3H" \
-          "\e[3;3H\e[38;5;16m\e[48;5;21m\e[24m\e[21m\e[27m\e[4mSome text...\e[38;5;226m\e[48;5;46m\e[24m\e[21m\e[27m \e[38;5;231m\e[48;5;201m\e[1mmore text..."
+          "\e[3;3H\e[38;2;0;0;0m\e[48;2;0;0;255m\e[24m\e[21m\e[27m\e[4mSome text...\e[38;2;255;255;0m\e[48;2;0;255;0m\e[24m\e[21m\e[27m \e[38;2;255;255;255m\e[48;2;255;0;255m\e[1mmore text...\e[?25h"
         )
       end
 
@@ -129,11 +129,11 @@ module Vedeu
           "\e[3;3H               \e[3;3H" \
           "\e[4;3H               \e[4;3H" \
           "\e[5;3H               \e[5;3H" \
-          "\e[3;3HSome text..." \
+          "\e[3;3HSome text...\e[?25h"    \
           "\e[6;6H               \e[6;6H" \
           "\e[7;6H               \e[7;6H" \
           "\e[8;6H               \e[8;6H" \
-          "\e[6;6HSome text..."
+          "\e[6;6HSome text...\e[?25h"
         )
       end
 
@@ -155,11 +155,11 @@ module Vedeu
           "\e[3;3H                              \e[3;3H" \
           "\e[4;3H                              \e[4;3H" \
           "\e[5;3H                              \e[5;3H" \
-          "\e[3;3HSome text... more text..."             \
+          "\e[3;3HSome text... more text...\e[?25h"      \
           "\e[6;6H                              \e[6;6H" \
           "\e[7;6H                              \e[7;6H" \
           "\e[8;6H                              \e[8;6H" \
-          "\e[6;6HSome text... more text..."
+          "\e[6;6HSome text... more text...\e[?25h"
         )
       end
 
@@ -182,12 +182,12 @@ module Vedeu
           "\e[4;3H               \e[4;3H" \
           "\e[5;3H               \e[5;3H" \
           "\e[3;3HSome text..." \
-          "\e[4;3HSome text..." \
+          "\e[4;3HSome text...\e[?25h"    \
           "\e[3;3H               \e[3;3H" \
           "\e[4;3H               \e[4;3H" \
           "\e[5;3H               \e[5;3H" \
           "\e[3;3HSome text..." \
-          "\e[4;3HSome text..."
+          "\e[4;3HSome text...\e[?25h"
         )
       end
 
@@ -210,12 +210,12 @@ module Vedeu
           "\e[4;3H                              \e[4;3H" \
           "\e[5;3H                              \e[5;3H" \
           "\e[3;3HSome text... more text..."             \
-          "\e[4;3HSome text... more text..."             \
+          "\e[4;3HSome text... more text...\e[?25h"      \
           "\e[6;6H                              \e[6;6H" \
           "\e[7;6H                              \e[7;6H" \
           "\e[8;6H                              \e[8;6H" \
           "\e[6;6HSome text... more text..."             \
-          "\e[7;6HSome text... more text..."
+          "\e[7;6HSome text... more text...\e[?25h"
         )
       end
 
@@ -237,13 +237,13 @@ module Vedeu
           "\e[3;3H                              \e[3;3H" \
           "\e[4;3H                              \e[4;3H" \
           "\e[5;3H                              \e[5;3H" \
-          "\e[3;3H\e[38;5;16m\e[48;5;21m\e[24m\e[21m\e[27m\e[4mSome text...\e[38;5;226m\e[48;5;46m\e[24m\e[21m\e[27m \e[38;5;231m\e[48;5;201m\e[1mmore text..." \
-          "\e[4;3H\e[38;5;16m\e[48;5;21m\e[24m\e[21m\e[27m\e[4mSome text...\e[38;5;226m\e[48;5;46m\e[24m\e[21m\e[27m \e[38;5;231m\e[48;5;201m\e[1mmore text..." \
+          "\e[3;3H\e[38;2;0;0;0m\e[48;2;0;0;255m\e[24m\e[21m\e[27m\e[4mSome text...\e[38;2;255;255;0m\e[48;2;0;255;0m\e[24m\e[21m\e[27m \e[38;2;255;255;255m\e[48;2;255;0;255m\e[1mmore text..." \
+          "\e[4;3H\e[38;2;0;0;0m\e[48;2;0;0;255m\e[24m\e[21m\e[27m\e[4mSome text...\e[38;2;255;255;0m\e[48;2;0;255;0m\e[24m\e[21m\e[27m \e[38;2;255;255;255m\e[48;2;255;0;255m\e[1mmore text...\e[?25h" \
           "\e[6;6H                              \e[6;6H" \
           "\e[7;6H                              \e[7;6H" \
           "\e[8;6H                              \e[8;6H" \
-          "\e[6;6H\e[38;5;16m\e[48;5;21m\e[24m\e[21m\e[27m\e[4mSome text...\e[38;5;226m\e[48;5;46m\e[24m\e[21m\e[27m \e[38;5;231m\e[48;5;201m\e[1mmore text..." \
-          "\e[7;6H\e[38;5;16m\e[48;5;21m\e[24m\e[21m\e[27m\e[4mSome text...\e[38;5;226m\e[48;5;46m\e[24m\e[21m\e[27m \e[38;5;231m\e[48;5;201m\e[1mmore text..."
+          "\e[6;6H\e[38;2;0;0;0m\e[48;2;0;0;255m\e[24m\e[21m\e[27m\e[4mSome text...\e[38;2;255;255;0m\e[48;2;0;255;0m\e[24m\e[21m\e[27m \e[38;2;255;255;255m\e[48;2;255;0;255m\e[1mmore text..." \
+          "\e[7;6H\e[38;2;0;0;0m\e[48;2;0;0;255m\e[24m\e[21m\e[27m\e[4mSome text...\e[38;2;255;255;0m\e[48;2;0;255;0m\e[24m\e[21m\e[27m \e[38;2;255;255;255m\e[48;2;255;0;255m\e[1mmore text...\e[?25h"
         )
       end
     end

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

@@ -16,8 +16,7 @@ module Vedeu
           x: 5,
           width: 10,
           height: 15,
-        },
-        current: "\e[1;1H#initialize"
+        }
       })
     }
 
@@ -40,8 +39,7 @@ module Vedeu
               height: 15
             },
             cursor: true,
-            delay: 0.0,
-            current: "\e[1;1H#initialize"
+            delay: 0.0
           }
         )
       end
@@ -84,9 +82,12 @@ module Vedeu
     end
 
     describe '#cursor' do
-      it 'returns the value' do
-        interface.cursor.must_equal(true)
-        Interface.new({ cursor: false }).cursor.must_equal(false)
+      it 'returns an escape sequence when the cursor is enabled (default)' do
+        Interface.new({ cursor: true }).cursor.must_equal("\e[?25h")
+      end
+
+      it 'returns an escape sequence when the cursor is disabled' do
+        Interface.new({ cursor: false }).cursor.must_equal("\e[?25l")
       end
     end
 
@@ -110,10 +111,10 @@ module Vedeu
             height: 3
           }
         }).to_s.must_equal(
-          "\e[38;5;196m\e[48;5;16m" \
+          "\e[38;2;255;0;0m\e[48;2;0;0;0m" \
           "\e[1;1H         \e[1;1H" \
           "\e[2;1H         \e[2;1H" \
-          "\e[3;1H         \e[3;1H"
+          "\e[3;1H         \e[3;1H\e[?25h"
         )
       end
     end

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

@@ -2,29 +2,21 @@ require 'test_helper'
 
 module Vedeu
   describe Line do
-    let(:line) {
-      Line.new({
+    let(:line)       { Line.new(attributes) }
+    let(:attributes) {
+      {
         colour: {
           foreground: '#ff0000',
           background: '#000000'
         },
         streams: [],
         style:   'normal'
-      })
+      }
     }
 
     describe '#attributes' do
       it 'returns the attributes' do
-        line.attributes.must_equal(
-          {
-            colour: {
-              foreground: '#ff0000',
-              background: '#000000'
-            },
-            streams: [],
-            style: 'normal'
-          }
-        )
+        line.attributes.must_equal(attributes)
       end
     end
 
@@ -49,7 +41,7 @@ module Vedeu
     describe '#to_s' do
       it 'returns a String' do
         line.to_s.must_equal(
-          "\e[38;5;196m\e[48;5;16m" \
+          "\e[38;2;255;0;0m\e[48;2;0;0;0m" \
           "\e[24m\e[21m\e[27m"
         )
       end

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

@@ -5,10 +5,10 @@ module Vedeu
       before { Store.reset }
 
       describe '#create' do
-        it 'creates and returns the stored record' do
+        it 'stores the interface attributes and returns the storage collection' do
           attributes = { name: 'sulphur' }
 
-          Store.create(attributes).must_equal({ name: 'sulphur' })
+          Store.create(attributes).must_equal({ 'sulphur' => { name: 'sulphur' } })
         end
       end
 

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

@@ -88,7 +88,7 @@ module Vedeu
 
         it 'returns a String' do
           stream.to_s.must_equal(
-            "\e[38;5;196m\e[48;5;16m" \
+            "\e[38;2;255;0;0m\e[48;2;0;0;0m" \
             "\e[24m\e[21m\e[27m"      \
             "Some text           "
           )
@@ -99,7 +99,7 @@ module Vedeu
 
           it 'returns a String' do
             stream.to_s.must_equal(
-              "\e[38;5;196m\e[48;5;16m" \
+              "\e[38;2;255;0;0m\e[48;2;0;0;0m" \
               "\e[24m\e[21m\e[27m"      \
               "     Some text      "
             )
@@ -111,7 +111,7 @@ module Vedeu
 
           it 'returns a String' do
             stream.to_s.must_equal(
-              "\e[38;5;196m\e[48;5;16m" \
+              "\e[38;2;255;0;0m\e[48;2;0;0;0m" \
               "\e[24m\e[21m\e[27m"      \
               "           Some text"
             )
@@ -122,7 +122,7 @@ module Vedeu
       describe 'when a width is not set' do
         it 'returns a String' do
           stream.to_s.must_equal(
-            "\e[38;5;196m\e[48;5;16m" \
+            "\e[38;2;255;0;0m\e[48;2;0;0;0m" \
             "\e[24m\e[21m\e[27m"      \
             "Some text"
           )

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

@@ -2,115 +2,24 @@ require 'test_helper'
 
 module Vedeu
   describe Buffers do
+    before do
+      Buffers.reset
+    end
+
     describe '.create' do
       it 'creates an entry for the interface, and saves :clear' do
       end
     end
 
     describe '.enqueue' do
-      it 'saves the new sequence for the interface into :next' do
-      end
-    end
-
-    describe '.refresh' do
       it 'raises an exception if the interface cannot be found by name' do
+        name     = 'unknown'
+        sequence = '...'
+        proc { Buffers.enqueue(name, sequence) }.must_raise(RefreshFailed)
       end
 
-    # describe '#refresh' do
-    #   let(:attributes) {
-    #     {
-    #       name:   '#refresh',
-    #       lines:  [],
-    #       colour: {
-    #         foreground: '#ff0000',
-    #         background: '#000000'
-    #       },
-    #       geometry: {
-    #         width:  3,
-    #         height: 3
-    #       }
-    #     }
-    #   }
-
-    #   it 'returns a blank interface when there is no content to display (initial state)' do
-    #     Terminal.stub(:output, nil) do
-    #       Interface.new(attributes).refresh.must_equal(
-    #         "\e[38;5;196m\e[48;5;16m" \
-    #         "\e[1;1H   \e[1;1H" \
-    #         "\e[2;1H   \e[2;1H" \
-    #         "\e[3;1H   \e[3;1H"
-    #       )
-    #     end
-    #   end
-
-    #   it 'returns the fresh content when content is queued up to be displayed' do
-    #     attributes = {
-    #       name:   '#refresh',
-    #       lines:  [
-    #         { streams: [{ text: '#refresh' }] },
-    #         { streams: [{ text: '#refresh' }] },
-    #         { streams: [{ text: '#refresh' }] }
-    #       ],
-    #       colour: {
-    #         foreground: '#ff0000',
-    #         background: '#000000'
-    #       },
-    #       geometry: {
-    #         width:  11,
-    #         height: 3
-    #       }
-    #     }
-    #     interface = Interface.new(attributes)
-    #     diode = interface.enqueue
-
-    #     Terminal.stub(:output, nil) do
-    #       interface.refresh.must_equal(
-    #         "\e[38;5;196m\e[48;5;16m" \
-    #         "\e[1;1H           \e[1;1H" \
-    #         "\e[2;1H           \e[2;1H" \
-    #         "\e[3;1H           \e[3;1H" \
-    #         "\e[1;1H#refresh" \
-    #         "\e[2;1H#refresh" \
-    #         "\e[3;1H#refresh"
-    #       )
-    #     end
-    #   end
-
-    #   it 'returns the previously shown content when there is stale content from last run' do
-    #     attributes = {
-    #       name:   '#refresh',
-    #       lines:  [],
-    #       colour: {
-    #         foreground: '#ff0000',
-    #         background: '#000000'
-    #       },
-    #       geometry: {
-    #         width:  11,
-    #         height: 3
-    #       }
-    #     }
-    #     interface = Interface.new(attributes)
-    #     interface.current = "\e[38;5;196m\e[48;5;16m" \
-    #                         "\e[1;1H           \e[1;1H" \
-    #                         "\e[2;1H           \e[2;1H" \
-    #                         "\e[3;1H           \e[3;1H" \
-    #                         "\e[1;1H#refresh" \
-    #                         "\e[2;1H#refresh" \
-    #                         "\e[3;1H#refresh"
-
-    #     Terminal.stub(:output, nil) do
-    #       interface.refresh.must_equal(
-    #         "\e[38;5;196m\e[48;5;16m" \
-    #         "\e[1;1H           \e[1;1H" \
-    #         "\e[2;1H           \e[2;1H" \
-    #         "\e[3;1H           \e[3;1H" \
-    #         "\e[1;1H#refresh" \
-    #         "\e[2;1H#refresh" \
-    #         "\e[3;1H#refresh"
-    #       )
-    #     end
-    #   end
-    # end
+      it 'saves the new sequence for the interface into :next' do
+      end
     end
 
     describe '.refresh_all' do