vedeu 0.1.12 → 0.1.13

data/lib/vedeu/models/colour.rb

@@ -9,11 +9,13 @@ module Vedeu
     end
 
     def foreground
-      @foreground ||= ColourTranslator.new(attributes[:foreground]).foreground
+      @foreground ||= ColourTranslator
+        .new(attributes[:foreground], { truecolor: false }).foreground
     end
 
     def background
-      @background ||= ColourTranslator.new(attributes[:background]).background
+      @background ||= ColourTranslator
+        .new(attributes[:background], { truecolor: false }).background
     end
 
     def to_s

data/lib/vedeu/models/composition.rb

@@ -5,18 +5,22 @@ module Vedeu
     end
 
     def attributes
-      defaults.merge!(@attributes)
+      @_attributes ||= defaults.merge!(@attributes)
     end
 
     def interfaces
-      @interfaces ||= if _interfaces.nil? || _interfaces.empty?
+      @interfaces ||= if attributes[:interfaces].nil? || attributes[:interfaces].empty?
         []
 
       else
-        [_interfaces].flatten.map do |new_attributes|
-          stored_attributes = API::Store.query(new_attributes[:name])
+        [ attributes[:interfaces] ].flatten.map do |attrs|
+          stored = Store.query(attrs[:name])
 
-          Interface.new(stored_attributes.merge!(new_attributes))
+          combined = stored.merge(attrs) do |key, s, a|
+            key == :lines && s.empty? ? a : s
+          end
+
+          Interface.new(combined)
         end
 
       end
@@ -28,10 +32,6 @@ module Vedeu
 
     private
 
-    def _interfaces
-      attributes[:interfaces]
-    end
-
     def defaults
       {
         interfaces: []

data/lib/vedeu/models/interface.rb

@@ -11,7 +11,7 @@ module Vedeu
     end
 
     def attributes
-      defaults.merge!(@attributes)
+      @_attributes ||= defaults.merge!(@attributes)
     end
 
     def name

data/lib/vedeu/models/line.rb

@@ -1,11 +1,21 @@
 module Vedeu
   class Line
-    def initialize(attributes = {})
+    def self.build(attributes = {}, &block)
+      new(attributes, &block).attributes
+    end
+
+    def initialize(attributes = {}, &block)
       @attributes = attributes
+
+      if block_given?
+        @self_before_instance_eval = eval('self', block.binding)
+
+        instance_eval(&block)
+      end
     end
 
     def attributes
-      defaults.merge!(@attributes)
+      @_attributes ||= defaults.merge!(@attributes)
     end
 
     def colour
@@ -30,8 +40,12 @@ module Vedeu
       {
         colour:  {},
         streams: [],
-        style:   ''
+        style:   []
       }
     end
+
+    def method_missing(method, *args, &block)
+      @self_before_instance_eval.send(method, *args, &block)
+    end
   end
 end

data/lib/vedeu/{api → models}/store.rb

@@ -1,7 +1,6 @@
 module Vedeu
   EntityNotFound = Class.new(StandardError)
 
-  module API
     module Store
       extend self
 
@@ -23,5 +22,4 @@ module Vedeu
         @storage ||= {}
       end
     end
-  end
 end

data/lib/vedeu/models/stream.rb

@@ -1,11 +1,21 @@
 module Vedeu
   class Stream
-    def initialize(attributes = {})
+    def self.build(attributes = {}, &block)
+      new(attributes, &block).attributes
+    end
+
+    def initialize(attributes = {}, &block)
       @attributes = attributes
+
+      if block_given?
+        @self_before_instance_eval = eval('self', block.binding)
+
+        instance_eval(&block)
+      end
     end
 
     def attributes
-      defaults.merge!(@attributes)
+      @_attributes ||= defaults.merge!(@attributes)
     end
 
     def colour
@@ -53,11 +63,15 @@ module Vedeu
     def defaults
       {
         colour: {},
-        style:  '',
+        style:  [],
         text:   '',
         width:  nil,
         align:  :left
       }
     end
+
+    def method_missing(method, *args, &block)
+      @self_before_instance_eval.send(method, *args, &block)
+    end
   end
 end

data/lib/vedeu/output/buffers.rb

@@ -6,17 +6,17 @@ module Vedeu
 
     def create(interface)
       buffers[interface.name][:clear] = Clear.call(interface)
+      buffers[interface.name][:group] = interface.group
 
-      Vedeu.events.event("_refresh_#{interface.name}_".to_sym, interface.delay) do
+      Vedeu.event("_refresh_#{interface.name}_".to_sym, interface.delay) do
         refresh(interface.name)
       end
 
-      # TODO: cannot refresh group since no logic to fetch group from buffer
-      # unless interface.group.nil? || interface.group.empty?
-      #   Vedeu.events.event("_refresh_#{interface.group}_".to_sym, interface.delay) do
-      #     refresh_group(interface.group)
-      #   end
-      # end
+      unless interface.group.nil? || interface.group.empty?
+        Vedeu.event("_refresh_group_#{interface.group}_".to_sym, interface.delay) do
+          refresh_group(interface.group)
+        end
+      end
     end
 
     def enqueue(name, sequence)
@@ -29,6 +29,12 @@ module Vedeu
       end
     end
 
+    def refresh_group(group)
+      buffers.select.map do |name, buffer|
+        name if buffer[:group] == group
+      end.compact.map { |name| refresh(name) }
+    end
+
     def refresh(name)
       data = query(name)
 
@@ -57,7 +63,7 @@ module Vedeu
 
     def buffers
       @buffers ||= Hash.new do |hash, key|
-        hash[key] = { current: '', next: [], clear: '' }
+        hash[key] = { current: '', next: [], clear: '', group: '' }
       end
     end
   end

data/lib/vedeu/output/view.rb

@@ -13,7 +13,7 @@ module Vedeu
     end
 
     def render
-      composition.interfaces.map do |interface|
+      interfaces.map do |interface|
         Buffers.enqueue(interface.name, interface.to_s)
       end
     end
@@ -26,11 +26,15 @@ module Vedeu
 
     attr_reader :object
 
+    def interfaces
+      composition.interfaces
+    end
+
     def composition
-      @_composition ||= Composition.new(interfaces)
+      @_composition ||= Composition.new(attributes)
     end
 
-    def interfaces
+    def attributes
       {
         interfaces: [ output ]
       }

data/lib/vedeu/support/esc.rb

@@ -3,20 +3,7 @@ module Vedeu
     extend self
 
     def set_position(y = 1, x = 1, &block)
-      row    = (y == 0 || y == nil) ? 1 : y
-      column = (x == 0 || x == nil) ? 1 : x
-
-      if block_given?
-        out = []
-        out << ["\e[", row, ';', column, 'H'].join
-        out << yield
-        out << ["\e[", row, ';', column, 'H'].join
-        out
-
-      else
-        ["\e[", row, ';', column, 'H'].join
-
-      end
+      Position.new(y, x).to_s(&block)
     end
 
     def string(value = '')

data/lib/vedeu/support/position.rb

@@ -0,0 +1,31 @@
+module Vedeu
+  class Position
+    def initialize(y = 1, x = 1)
+      @y, @x = y, x
+    end
+
+    def to_s(&block)
+      if block_given?
+        [ sequence, yield, sequence ].join
+
+      else
+        sequence
+
+      end
+    end
+
+    private
+
+    def sequence
+      ["\e[", y, ';', x, 'H'].join
+    end
+
+    def y
+      (@y == 0 || @y == nil) ? 1 : @y
+    end
+
+    def x
+      (@x == 0 || @x == nil) ? 1 : @x
+    end
+  end
+end

data/lib/vedeu/support/terminal.rb

@@ -45,6 +45,10 @@ module Vedeu
       yield
     end
 
+    def clear_screen
+      output Esc.string 'clear'
+    end
+
     def restore_screen
       output Esc.string 'screen_exit'
       output clear_last_line

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

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+module Vedeu
+  describe API do
+    describe '.height' do
+      it 'returns the terminal height' do
+        IO.console.stub(:winsize, [24, 40]) do
+          Vedeu.height.must_equal(24)
+        end
+      end
+    end
+
+    describe '.width' do
+      it 'returns the terminal width' do
+        IO.console.stub(:winsize, [24, 40]) do
+          Vedeu.width.must_equal(40)
+        end
+      end
+    end
+  end
+end

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

@@ -3,70 +3,784 @@ require 'test_helper'
 module Vedeu
   module API
     describe Interface do
-      before { API::Store.reset }
+      describe '#define' do
+        before { Vedeu::Store.reset }
 
-      interface = Interface.new('widget')
+        interface = Interface.new({ name: 'widget' })
 
-      it 'creates and stores a new interface' do
-        interface.create.must_be_instance_of(Vedeu::Interface)
-      end
+        it 'creates and stores a new interface' do
+          interface.define.must_be_instance_of(Vedeu::Interface)
+        end
+
+        it 'allows interfaces to share behaviour' do
+          IO.console.stub :winsize, [10, 40] do
+            main =    Vedeu.interface('main') do
+                        colour  foreground: '#ff0000', background: '#000000'
+                        cursor  false
+                        centred true
+                        width   10
+                        height  2
+                        group   'example_group'
+                        delay   0.25
+                      end
+            status =  Vedeu.interface('status') do
+                        colour  foreground: 'aadd00', background: '#4040cc'
+                        cursor  true
+                        centred true
+                        width   10
+                        height  1
+                        y       use('main').bottom
+                        x       use('main').left
+                        group   'example_group'
+                        delay   0.25
+                      end
 
-      it 'allows interfaces to share behaviour' do
-        IO.console.stub :winsize, [10, 40] do
-          main =    Vedeu.interface('main') do
-                      colour  foreground: '#ff0000', background: '#000000'
-                      cursor  false
-                      centred true
-                      width   10
-                      height  2
-                    end
-          status =  Vedeu.interface('status') do
-                      colour  foreground: 'aadd00', background: '#4040cc'
-                      cursor  true
-                      centred true
-                      width   10
-                      height  1
-                      y       use('main').bottom
-                      x       use('main').left
-                    end
-
-          main.left.must_equal(15)
-          main.top.must_equal(4)
-          status.left.must_equal(15)
-          status.top.must_equal(5)
+            main.left.must_equal(15)
+            main.top.must_equal(4)
+            status.left.must_equal(15)
+            status.top.must_equal(5)
+          end
         end
-      end
 
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.create { x 0 } }.must_raise(XOutOfBounds)
-      end
+        it 'raises an exception when the value is out of bounds' do
+          proc { interface.define { x 0 } }.must_raise(XOutOfBounds)
+        end
 
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.create { x 999 } }.must_raise(XOutOfBounds)
-      end
+        it 'raises an exception when the value is out of bounds' do
+          proc { interface.define { x 999 } }.must_raise(XOutOfBounds)
+        end
 
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.create { y 0 } }.must_raise(YOutOfBounds)
-      end
+        it 'raises an exception when the value is out of bounds' do
+          proc { interface.define { y 0 } }.must_raise(YOutOfBounds)
+        end
 
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.create { y 999 } }.must_raise(YOutOfBounds)
-      end
+        it 'raises an exception when the value is out of bounds' do
+          proc { interface.define { y 999 } }.must_raise(YOutOfBounds)
+        end
 
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.create { width 0 } }.must_raise(InvalidWidth)
-      end
+        it 'raises an exception when the value is out of bounds' do
+          proc { interface.define { width 0 } }.must_raise(InvalidWidth)
+        end
 
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.create { width 999 } }.must_raise(InvalidWidth)
-      end
+        it 'raises an exception when the value is out of bounds' do
+          proc { interface.define { width 999 } }.must_raise(InvalidWidth)
+        end
 
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.create { height 0 } }.must_raise(InvalidHeight)
+        it 'raises an exception when the value is out of bounds' do
+          proc { interface.define { height 0 } }.must_raise(InvalidHeight)
+        end
+
+        it 'raises an exception when the value is out of bounds' do
+          proc { interface.define { height 999 } }.must_raise(InvalidHeight)
+        end
       end
 
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.create { height 999 } }.must_raise(InvalidHeight)
+      describe '#build' do
+        before do
+          Vedeu::Store.reset
+          Vedeu.interface('testing_view') do
+            x       1
+            y       1
+            colour  foreground: '#ffffff', background: '#000000'
+            centred false
+          end
+        end
+
+        it 'builds a basic view' do
+          Vedeu.view 'testing_view' do
+            line do
+              text '1. A line of text.'
+              text '2. Another line of text.'
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  {},
+                  style:   [],
+                  streams: [
+                    {
+                      text:  '1. A line of text.',
+                    }, {
+                      text:  '2. Another line of text.',
+                    }
+                  ]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles coloured lines' do
+          Vedeu.view 'testing_view' do
+            line do
+              text '1. Line without colours.'
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  {},
+                  style:   [],
+                  streams: [{ text: '1. Line without colours.' }]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles coloured lines' do
+          Vedeu.view 'testing_view' do
+            line do
+              colour background: '#ff0000', foreground: '#ffff00'
+              text   '2. Line with colours.'
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  { background: '#ff0000', foreground: '#ffff00' },
+                  style:   [],
+                  streams: [{ text: '2. Line with colours.' }]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles coloured lines' do
+          Vedeu.view 'testing_view' do
+            line do
+              colour foreground: '#a7ff00', background: '#005700'
+              text   '3. Line with explicit colour declaration.'
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  { background: '#005700', foreground: '#a7ff00' },
+                  style:   [],
+                  streams: [{ text: '3. Line with explicit colour declaration.' }]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles coloured lines' do
+          Vedeu.view 'testing_view' do
+            line do # actually uses streams
+              foreground '#ff00ff' do
+                text '4. Line with only foreground set.'
+              end
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  {},
+                  style:   [],
+                  streams: [{
+                    colour: { foreground: '#ff00ff' },
+                    style:  [],
+                    text:   '4. Line with only foreground set.',
+                    width:  nil,
+                    align:  :left
+                  }]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles coloured lines' do
+          Vedeu.view 'testing_view' do
+            line do # actually uses streams
+              background '#00ff00' do
+                text '5. Line with only background set.'
+              end
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  {},
+                  style:   [],
+                  streams: [{
+                    colour: { background: '#00ff00' },
+                    style:  [],
+                    text:   '5. Line with only background set.',
+                    width: nil,
+                    align: :left
+                  }]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles styles' do
+          Vedeu.view 'testing_view' do
+            line do
+              style 'normal'
+              text  '1. Line with a normal style.'
+            end
+          end.must_equal(
+            {
+              name: 'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  {},
+                  style:   ['normal'],
+                  streams: [{
+                    text: '1. Line with a normal style.'
+                  }]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles styles' do
+          Vedeu.view 'testing_view' do
+            line do
+              style 'underline'
+              text  '2. Line with an underline style.'
+            end
+          end.must_equal(
+            {
+              name: 'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  {},
+                  style:   ['underline'],
+                  streams: [{
+                    text: '2. Line with an underline style.'
+                  }]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles styles' do
+          Vedeu.view 'testing_view' do
+            line do # actually uses streams
+              style 'normal' do
+                text '3. Line with a normal style.'
+              end
+            end
+          end.must_equal(
+            {
+              name: 'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  {},
+                  style:   [],
+                  streams: [{
+                    colour: {},
+                    style:  ['normal'],
+                    text:   '3. Line with a normal style.',
+                    width:  nil,
+                    align:  :left
+                  }]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles styles' do
+          Vedeu.view 'testing_view' do
+            line do # actually uses streams
+              style 'underline' do
+                text '4. Line with an underlined style.'
+              end
+            end
+          end.must_equal(
+            {
+              name: 'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  {},
+                  style:   [],
+                  streams: [{
+                    colour: {},
+                    style:  ['underline'],
+                    text:   '4. Line with an underlined style.',
+                    width: nil,
+                    align: :left
+                  }]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles streams, which means sub-line colours and styles' do
+          Vedeu.view 'testing_view' do
+            line do
+              stream do
+                text 'A stream of text.'
+              end
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  {},
+                  style:   [],
+                  streams: [
+                    {
+                      colour: {},
+                      style:  [],
+                      text:   'A stream of text.',
+                      width:  nil,
+                      align:  :left
+                    }
+                  ]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles streams, which means sub-line colours and styles' do
+          Vedeu.view 'testing_view' do
+            line do
+              stream do # Stream is an 'explicit declaration'.
+                        # We don't need it unless we want to add colours and styles.
+                        # See below.
+                text '1. Two streams of text, these will be'
+              end
+
+              stream do
+                text ' on the same line- note the space.'
+              end
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  {},
+                  style:   [],
+                  streams: [
+                    {
+                      colour: {},
+                      style:  [],
+                      text:   '1. Two streams of text, these will be',
+                      width: nil,
+                      align: :left
+                    }, {
+                      colour: {},
+                      style:  [],
+                      text:   ' on the same line- note the space.',
+                      width: nil,
+                      align: :left
+                    }
+                  ]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles streams, which means sub-line colours and styles' do
+          Vedeu.view 'testing_view' do
+            line do
+              stream do
+                text '2. Streams can have'
+              end
+
+              stream do
+                colour foreground: '#ff0000', background: '#00ff00'
+                text   ' colours too.'
+              end
+            end
+          end.must_equal(
+            {
+              name: 'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour: {},
+                  style: [],
+                  streams: [
+                    {
+                      colour: {},
+                      style: [],
+                      text: '2. Streams can have',
+                      width: nil,
+                      align: :left
+                    }, {
+                      colour: {
+                        foreground: '#ff0000',
+                        background: '#00ff00'
+                      },
+                      style: [],
+                      text: ' colours too.',
+                      width: nil,
+                      align: :left
+                    }
+                  ]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles streams, which means sub-line colours and styles' do
+          Vedeu.view 'testing_view' do
+            line do
+              stream do
+                text '3. Streams can have'
+              end
+
+              stream do
+                style 'underline'
+                text  ' styles too.'
+              end
+            end
+          end.must_equal(
+            {
+              name: 'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour: {},
+                  style: [],
+                  streams: [
+                    {
+                      colour: {},
+                      style: [],
+                      text: '3. Streams can have',
+                      width: nil,
+                      align: :left
+                    }, {
+                      colour: {},
+                      style: ['underline'],
+                      text: ' styles too.',
+                      width: nil,
+                      align: :left
+                    }
+                  ]
+                }
+              ]
+            }
+          )
+        end
+
+        it 'handles alignment' do
+          Vedeu.view 'testing_view' do
+            line do
+              stream do
+                width 80
+                text  'This is aligned left, and padded with spaces.'
+              end
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [{
+                colour:  {},
+                style:   [],
+                streams: [{
+                  align:  :left,
+                  colour: {},
+                  style:  [],
+                  width:  80,
+                  text:   'This is aligned left, and padded with spaces.'
+                }]
+              }]
+            }
+          )
+        end
+
+        it 'handles alignment' do
+          Vedeu.view 'testing_view' do
+            line do
+              stream do
+                width 80
+                align :left # explicit
+                text  'This is aligned left, and padded with spaces.'
+              end
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [{
+                colour:  {},
+                style:   [],
+                streams: [{
+                  colour: {},
+                  style:  [],
+                  width:  80,
+                  align:  :left,
+                  text:   'This is aligned left, and padded with spaces.'
+                }]
+              }]
+            }
+          )
+        end
+
+        it 'handles alignment' do
+          Vedeu.view 'testing_view' do
+            line do
+              stream do
+                width 80
+                align :centre
+                text  'This is aligned centrally, and padded with spaces.'
+              end
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [{
+                colour:  {},
+                style:   [],
+                streams: [{
+                  colour: {},
+                  style:  [],
+                  width:  80,
+                  align:  :centre,
+                  text:   'This is aligned centrally, and padded with spaces.'
+                }]
+              }]
+            }
+          )
+        end
+
+        it 'handles alignment' do
+          Vedeu.view 'testing_view' do
+            line do
+              stream do
+                width 80
+                align :right
+                text  'This is aligned right, and padded with spaces.'
+              end
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [{
+                colour:  {},
+                style:   [],
+                streams: [{
+                  colour: {},
+                  style:  [],
+                  width:  80,
+                  align:  :right,
+                  text:   'This is aligned right, and padded with spaces.'
+                }]
+              }]
+            }
+          )
+        end
+
+        it 'handles multiple colour and text statements correctly' do
+          Vedeu.view 'testing_view' do
+            line do
+              foreground('#ffff00') { text "\u{25B2}" }
+              text " Prev"
+
+              foreground('#ffff00') { text "\u{25BC}" }
+              text " Next"
+
+              foreground('#ffff00') { text "\u{21B2}" }
+              text " Select"
+
+              foreground('#ffff00') { text "\u{2395}" }
+              text " Pause"
+
+              foreground('#ffff00') { text "Q" }
+              text " Quit"
+            end
+          end.must_equal(
+            {
+              name:  'testing_view',
+              group: '',
+              colour: {},
+              style: '',
+              geometry: {},
+              cursor: true,
+              delay: 0.0,
+              lines: [
+                {
+                  colour:  {},
+                  style:   [],
+                  streams: [
+                    {
+                      colour: {
+                        foreground: "#ffff00"
+                      },
+                      style: [],
+                      text: "▲",
+                      width: nil,
+                      align: :left
+                    }, {
+                      text: " Prev",
+                    }, {
+                      colour: {
+                        foreground: "#ffff00"
+                      },
+                      style: [],
+                      text: "▼",
+                      width: nil,
+                      align: :left
+                    }, {
+                      text: " Next",
+                    }, {
+                      colour: {
+                        foreground: "#ffff00"
+                      },
+                      style: [],
+                      text: "↲",
+                      width: nil,
+                      align: :left
+                    }, {
+                      text: " Select",
+                    }, {
+                      colour: {
+                        foreground: "#ffff00"
+                      },
+                      style: [],
+                      text: "⎕",
+                      width: nil,
+                      align: :left
+                    }, {
+                      text: " Pause",
+                    }, {
+                      colour: {
+                        foreground: "#ffff00"
+                      },
+                      style: [],
+                      text: "Q",
+                      width: nil,
+                      align: :left
+                    }, {
+                      text: " Quit",
+                    }
+                  ]
+                }
+              ]
+            }
+          )
+        end
+
       end
     end
   end