vedeu 0.1.7 → 0.1.8

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

@@ -8,12 +8,7 @@ module Vedeu
 
     describe '#coerce' do
       it 'returns an empty collection when there are no lines' do
-        Interface.new({ lines: {} }).lines.must_equal([])
-      end
-
-      it 'contains a single Line object when the line is just a String' do
-        Interface.new({ lines: 'some text' }).lines.size
-          .must_equal(1)
+        Interface.new({ lines: [] }).lines.must_equal([])
       end
 
       it 'contains a single Line object when there is a single line' do

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

@@ -10,7 +10,7 @@ module Vedeu
       end
 
       it 'contains a single Stream when there is a single stream' do
-        Line.new({ streams: 'some text' }).streams.size
+        Line.new({ streams: [{ text: 'some text' }] }).streams.size
           .must_equal(1)
       end
 

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

@@ -3,59 +3,22 @@ require 'test_helper'
 require 'json'
 
 require 'vedeu/models/composition'
-require 'vedeu/support/interface_store'
+require 'vedeu/api/store'
 
 module Vedeu
   describe Composition do
-    describe '.enqueue' do
-      it 'enqueues the interfaces for rendering' do
-        attributes = {
-          interfaces: [
-            {
-              name: 'Composition.enqueue_1',
-              geometry: {
-                width: 35,
-                height: 5,
-              },
-              lines: {
-                streams: {
-                  text: 'bd459118e6175689e4394e242debc2ae'
-                }
-              }
-            }, {
-              name: 'Composition.enqueue_2',
-              geometry: {
-                width: 35,
-                height: 5,
-              },
-              lines: {
-                streams: {
-                  text: '837acb2cb2ea3ef359257851142a7830'
-                }
-              }
-            }
-          ]
-        }
-
-        Composition.enqueue(attributes)
-        InterfaceStore
-          .query('Composition.enqueue_1').dequeue
-          .must_match(/bd459118e6175689e4394e242debc2ae/)
-        InterfaceStore
-          .query('Composition.enqueue_2').dequeue
-          .must_match(/837acb2cb2ea3ef359257851142a7830/)
-      end
-    end
+    before { API::Store.reset }
 
     describe '#interfaces' do
       it 'returns a collection of interfaces' do
+        Vedeu.interface('dummy') do
+          width  5
+          height 5
+        end
         Composition.new({
           interfaces: {
-            name:   'dummy',
-            geometry: {
-              width:  5,
-              height: 5
-            }
+            name:  'dummy',
+            lines: []
           }
         }).interfaces.first.must_be_instance_of(Interface)
       end
@@ -67,7 +30,12 @@ module Vedeu
 
     describe '#to_s' do
       it 'returns the stringified content for a single interface, single line, single stream' do
-        InterfaceStore.create({ name: 'int1_lin1_str1', geometry: { y: 3, x: 3, width: 15, height: 3 } })
+        Vedeu.interface('int1_lin1_str1') do
+          y      3
+          x      3
+          width  15
+          height 3
+        end
         json = File.read('test/support/json/int1_lin1_str1.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -80,7 +48,12 @@ module Vedeu
       end
 
       it 'returns the stringified content for a single interface, single line, multiple streams' do
-        InterfaceStore.create({ name: 'int1_lin1_str3', geometry: { y: 3, x: 3, width: 30, height: 3 } })
+        Vedeu.interface('int1_lin1_str3') do
+          y      3
+          x      3
+          width  30
+          height 3
+        end
         json = File.read('test/support/json/int1_lin1_str3.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -93,7 +66,12 @@ module Vedeu
       end
 
       it 'returns the stringified content for a single interface, multiple lines, single stream' do
-        InterfaceStore.create({ name: 'int1_lin2_str1', geometry: { y: 3, x: 3, width: 15, height: 3 } })
+        Vedeu.interface('int1_lin2_str1') do
+          y      3
+          x      3
+          width  15
+          height 3
+        end
         json = File.read('test/support/json/int1_lin2_str1.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -107,7 +85,12 @@ module Vedeu
       end
 
       it 'returns the stringified content for a single interface, multiple lines, multiple streams' do
-        InterfaceStore.create({ name: 'int1_lin2_str3', geometry: { y: 3, x: 3, width: 30, height: 3 } })
+        Vedeu.interface('int1_lin2_str3') do
+          y      3
+          x      3
+          width  30
+          height 3
+        end
         json = File.read('test/support/json/int1_lin2_str3.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -121,10 +104,14 @@ module Vedeu
       end
 
       it 'returns the stringified content for a single interface, multiple lines, multiple streams, streams contain styles' do
+        Vedeu.interface('int1_lin2_str3_styles') do
+          y      3
+          x      3
+          width  30
+          height 3
+        end
         json = File.read('test/support/json/int1_lin2_str3_styles.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
-        InterfaceStore.create({ name: 'int1_lin2_str3_styles', geometry: { y: 3, x: 3, width: 30, height: 3 } })
-
         Composition.new(attributes).to_s.must_equal(
           "\e[3;3H                              \e[3;3H" \
           "\e[4;3H                              \e[4;3H" \
@@ -134,8 +121,18 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, single line, single stream' do
-        InterfaceStore.create({ name: 'int2_lin1_str1_1', geometry: { y: 3, x: 3, width: 15, height: 3 } })
-        InterfaceStore.create({ name: 'int2_lin1_str1_2', geometry: { y: 6, x: 6, width: 15, height: 3 } })
+        Vedeu.interface('int2_lin1_str1_1') do
+          y      3
+          x      3
+          width  15
+          height 3
+        end
+        Vedeu.interface('int2_lin1_str1_2') do
+          y      6
+          x      6
+          width  15
+          height 3
+        end
         json = File.read('test/support/json/int2_lin1_str1.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -152,8 +149,18 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, single line, multiple streams' do
-        InterfaceStore.create({ name: 'int2_lin1_str3_1', geometry: { y: 3, x: 3, width: 30, height: 3 } })
-        InterfaceStore.create({ name: 'int2_lin1_str3_2', geometry: { y: 6, x: 6, width: 30, height: 3 } })
+        Vedeu.interface('int2_lin1_str3_1') do
+          y      3
+          x      3
+          width  30
+          height 3
+        end
+        Vedeu.interface('int2_lin1_str3_2') do
+          y      6
+          x      6
+          width  30
+          height 3
+        end
         json = File.read('test/support/json/int2_lin1_str3.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -170,8 +177,18 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, multiple lines, single stream' do
-        InterfaceStore.create({ name: 'int2_lin2_str1_1', geometry: { y: 3, x: 3, width: 15, height: 3 } })
-        InterfaceStore.create({ name: 'int2_lin2_str1_2', geometry: { y: 6, x: 6, width: 15, height: 3 } })
+        Vedeu.interface('int2_lin2_str1_1') do
+          y      3
+          x      3
+          width  15
+          height 3
+        end
+        Vedeu.interface('int2_lin2_str1_2') do
+          y      6
+          x      6
+          width  15
+          height 3
+        end
         json = File.read('test/support/json/int2_lin2_str1.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -190,8 +207,18 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, multiple lines, multiple streams' do
-        InterfaceStore.create({ name: 'int2_lin2_str3_1', geometry: { y: 3, x: 3, width: 30, height: 3 } })
-        InterfaceStore.create({ name: 'int2_lin2_str3_2', geometry: { y: 6, x: 6, width: 30, height: 3 } })
+        Vedeu.interface('int2_lin2_str3_1') do
+          y      3
+          x      3
+          width  30
+          height 3
+        end
+        Vedeu.interface('int2_lin2_str3_2') do
+          y      6
+          x      6
+          width  30
+          height 3
+        end
         json = File.read('test/support/json/int2_lin2_str3.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -210,13 +237,32 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, multiple lines, multiple streams, streams contain styles' do
-        InterfaceStore.create({ name: 'int2_lin2_str3_styles_1', geometry: { y: 3, x: 3, width: 30, height: 3 } })
-        InterfaceStore.create({ name: 'int2_lin2_str3_styles_2', geometry: { y: 6, x: 6, width: 30, height: 3 } })
+        Vedeu.interface('int2_lin2_str3_styles_1') do
+          y      3
+          x      3
+          width  30
+          height 3
+        end
+        Vedeu.interface('int2_lin2_str3_styles_2') do
+          y      6
+          x      6
+          width  30
+          height 3
+        end
         json = File.read('test/support/json/int2_lin2_str3_styles.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
         Composition.new(attributes).to_s.must_equal(
-          "\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;21mSome text...\e[38;5;226m\e[48;5;46m \e[38;5;231m\e[48;5;201mmore text...\e[4;3H\e[38;5;16m\e[48;5;21mSome text...\e[38;5;226m\e[48;5;46m \e[38;5;231m\e[48;5;201mmore text...\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;21mSome text...\e[38;5;226m\e[48;5;46m \e[38;5;231m\e[48;5;201mmore text...\e[7;6H\e[38;5;16m\e[48;5;21mSome text...\e[38;5;226m\e[48;5;46m \e[38;5;231m\e[48;5;201mmore text..."
+          "\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;21mSome text...\e[38;5;226m\e[48;5;46m \e[38;5;231m\e[48;5;201mmore text..." \
+          "\e[4;3H\e[38;5;16m\e[48;5;21mSome text...\e[38;5;226m\e[48;5;46m \e[38;5;231m\e[48;5;201mmore text..." \
+          "\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;21mSome text...\e[38;5;226m\e[48;5;46m \e[38;5;231m\e[48;5;201mmore text..." \
+          "\e[7;6H\e[38;5;16m\e[48;5;21mSome text...\e[38;5;226m\e[48;5;46m \e[38;5;231m\e[48;5;201mmore text..."
         )
       end
     end

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

@@ -55,6 +55,18 @@ module Vedeu
       end
     end
 
+    describe '#north' do
+      it 'returns the top minus the value when the value is provided' do
+        geometry = Geometry.new({ height: 6, width: 18, y: 4 })
+        geometry.north(2).must_equal(2)
+      end
+
+      it 'returns the top minus 1 without a value' do
+        geometry = Geometry.new({ height: 6, width: 18, y: 4 })
+        geometry.north.must_equal(3)
+      end
+    end
+
     describe '#left' do
       it 'centred is true' do
         console = IO.console
@@ -75,6 +87,18 @@ module Vedeu
       end
     end
 
+    describe '#west' do
+      it 'returns the left minus the value when the value is provided' do
+        geometry = Geometry.new({ height: 6, width: 18, x: 7 })
+        geometry.west(2).must_equal(5)
+      end
+
+      it 'returns the left minus 1 without a value' do
+        geometry = Geometry.new({ height: 6, width: 18, x: 7 })
+        geometry.west.must_equal(6)
+      end
+    end
+
     describe '#bottom' do
       it 'centred is true' do
         console = IO.console
@@ -95,6 +119,18 @@ module Vedeu
       end
     end
 
+    describe '#south' do
+      it 'returns the bottom plus the value when the value is provided' do
+        geometry = Geometry.new({ height: 6, width: 18, y: 3 })
+        geometry.south(2).must_equal(11)
+      end
+
+      it 'returns the bottom plus 1 without a value' do
+        geometry = Geometry.new({ height: 6, width: 18, y: 3 })
+        geometry.south.must_equal(10)
+      end
+    end
+
     describe '#right' do
       it 'centred is true' do
         console = IO.console
@@ -115,6 +151,18 @@ module Vedeu
       end
     end
 
+    describe '#east' do
+      it 'returns the right plus the value when the value is provided' do
+        geometry = Geometry.new({ height: 6, width: 18, x: 7 })
+        geometry.east(2).must_equal(27)
+      end
+
+      it 'returns the right plus 1 without a value' do
+        geometry = Geometry.new({ height: 6, width: 18, x: 7 })
+        geometry.east.must_equal(26)
+      end
+    end
+
     describe '#position' do
       it 'centred is true' do
         console = IO.console

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

@@ -6,6 +6,7 @@ module Vedeu
     let(:interface) {
       Interface.new({
         name:  '#initialize',
+        group: 'my_group',
         lines: [],
         colour: {
           foreground: '#ff0000',
@@ -25,6 +26,10 @@ module Vedeu
       interface.name.must_equal('#initialize')
     end
 
+    it 'has a name attribute' do
+      interface.group.must_equal('my_group')
+    end
+
     it 'has a lines attribute' do
       interface.lines.must_equal([])
     end
@@ -33,6 +38,14 @@ module Vedeu
       interface.colour.must_be_instance_of(Colour)
     end
 
+    it 'has a style attribute' do
+      interface.style.must_equal('')
+    end
+
+    it 'has a geometry attribute' do
+      interface.geometry.must_be_instance_of(Geometry)
+    end
+
     it 'has a current attribute' do
       interface.current.must_equal("\e[1;1H#initialize")
     end
@@ -42,9 +55,12 @@ module Vedeu
       Interface.new({ cursor: false }).cursor.must_equal(false)
     end
 
+    it 'has a delay attribute' do
+      interface.delay.must_equal(0.0)
+    end
+
     describe '#enqueue' do
       it 'delegates to the Queue class to enqueue itself' do
-        Queue.reset
         interface = Interface.new({
           name:   'Interface#enqueue',
           geometry: {
@@ -93,9 +109,9 @@ module Vedeu
         attributes = {
           name:   '#refresh',
           lines:  [
-            { streams: '#refresh' },
-            { streams: '#refresh' },
-            { streams: '#refresh' }
+            { streams: [{ text: '#refresh' }] },
+            { streams: [{ text: '#refresh' }] },
+            { streams: [{ text: '#refresh' }] }
           ],
           colour: {
             foreground: '#ff0000',
@@ -107,7 +123,7 @@ module Vedeu
           }
         }
         interface = Interface.new(attributes)
-        interface.enqueue
+        diode = interface.enqueue
 
         Terminal.stub(:output, nil) do
           interface.refresh.must_equal(
@@ -159,7 +175,7 @@ module Vedeu
     end
 
     describe '#to_s' do
-      it 'returns an String' do
+      it 'returns an string' do
         Interface.new({
           name:   '#to_s',
           lines:  [],
@@ -168,14 +184,14 @@ module Vedeu
             background: '#000000'
           },
           geometry: {
-            width:  3,
+            width:  9,
             height: 3
           }
         }).to_s.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         \e[1;1H" \
+          "\e[2;1H         \e[2;1H" \
+          "\e[3;1H         \e[3;1H"
         )
       end
     end