vedeu 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e848f5366e26266f101ad5e5fb0c3e0e724fc7f
-  data.tar.gz: e611d426fecc958f335acb8fc54c5a4d697e6638
+  metadata.gz: ce06977605476701c2ac6f998a0af92fd38d5206
+  data.tar.gz: 5a72b5086a86d4af8871d7318e07bce64fca2af7
 SHA512:
-  metadata.gz: 165c47a59cfb6f52a3237c00b459c0aa0d38b8e797a3e8665c4686418da37aac4fc035f51aaee6e12e0c269fa04e276be15187acfa6b2546e692643726b0136c
-  data.tar.gz: 8e8e62514882dcfc5e71a6a4e425e3ac7633adc66ffae289e131535959751ac01a6a80a73712c399ed2c556e6441f510805f72cbf1ed1441f84df89173b83102
+  metadata.gz: 8363bd8ce4582edc87027a0ab688d1f8b97f50e0e25f328f59f6ceebe7ef016022fc9893bfd091652252615f1da1a7daecaa9c373a094b0c1f12296220ab8552
+  data.tar.gz: 1d1f967155fa6c2f747203703a2cb4aaa48934ad4926a6a6f5b2b27b89321b2b3b7776e6a16e92ea59fe09f5644728736d02450ca72da58a54f8c4b6d07185ef

data/bin/composition

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+
+-> { its -> { a } }
+trap('INT') { exit! }
+
+require 'vedeu'
+require 'pry'
+
+json = File.read('../test/support/composition.json')
+hash = Yajl::Parser.parse(json)
+comp = Vedeu::Buffer::Composition.new(hash)

data/lib/vedeu/output/buffer/composition.rb

@@ -0,0 +1,9 @@
+module Vedeu
+  module Buffer
+    class Composition
+      include Virtus.model
+
+      attribute :interface, Array[Buffer::Interface]
+    end
+  end
+end

data/lib/vedeu/output/buffer/formatting.rb

@@ -0,0 +1,29 @@
+module Vedeu
+  module Buffer
+    module Formatting
+      include Virtus.module
+
+      attribute :style,      Vedeu::Buffer::Style
+      attribute :foreground, Symbol
+      attribute :background, Symbol
+
+      private
+
+      def colour
+        if foreground && background
+          [foreground, background]
+        elsif foreground.nil? || background.nil?
+          []
+        end
+      end
+
+      def styles
+        if style
+          style
+        elsif style.nil?
+          []
+        end
+      end
+    end
+  end
+end

data/lib/vedeu/output/buffer/interface.rb

@@ -0,0 +1,14 @@
+module Vedeu
+  module Buffer
+    class Interface
+      include Virtus.model
+
+      attribute :name, String
+      attribute :line, Array[Buffer::Line]
+
+      def to_compositor
+        line.map(&:to_compositor)
+      end
+    end
+  end
+end

data/lib/vedeu/output/buffer/line.rb

@@ -0,0 +1,14 @@
+module Vedeu
+  module Buffer
+    class Line
+      include Virtus.model
+      include Formatting
+
+      attribute :stream,     Array[Buffer::Stream]
+
+      def to_compositor
+        [{ style: styles, colour: colour }, *stream.map(&:to_compositor)]
+      end
+    end
+  end
+end

data/lib/vedeu/output/buffer/parser.rb

@@ -0,0 +1,28 @@
+module Vedeu
+  module Buffer
+    class Parser
+      def initialize(composition)
+        @composition = composition
+      end
+
+      def to_compositor
+        composition.interface.inject({}) do |acc, interface|
+          acc[interface.name] = interface.to_compositor
+          acc
+        end
+      end
+
+      def to_hash
+        Oj.load(to_json)
+      end
+
+      def to_json
+        Oj.dump(composition, mode: :compat, circular: true)
+      end
+
+      private
+
+      attr_reader :composition
+    end
+  end
+end

data/lib/vedeu/output/buffer/stream.rb

@@ -0,0 +1,14 @@
+module Vedeu
+  module Buffer
+    class Stream
+      include Virtus.model
+      include Formatting
+
+      attribute :text, String, default: ''
+
+      def to_compositor
+        { style: styles, colour: colour, text: text }
+      end
+    end
+  end
+end

data/lib/vedeu/output/buffer/style.rb

@@ -0,0 +1,11 @@
+module Vedeu
+  module Buffer
+    class Style < Virtus::Attribute
+      def coerce(value)
+        if value.is_a?(::String) && !value.empty?
+          value.split(/ /).map(&:to_sym)
+        end
+      end
+    end
+  end
+end

data/lib/vedeu/output/colour_pair.rb

@@ -0,0 +1,43 @@
+module Vedeu
+  class ColourPair
+    class << self
+      def define(pair = [])
+        return '' if pair.empty?
+
+        new(pair).define
+      end
+      alias_method :set, :define
+
+      def reset
+        new.reset
+      end
+    end
+
+    def initialize(pair = [])
+      @pair = pair || []
+    end
+
+    def define
+      [foreground, background].join
+    end
+    alias_method :set, :define
+
+    def reset
+      [foreground(:default), background(:default)].join
+    end
+
+    def foreground(value = pair[0])
+      @foreground ||= Foreground.escape_sequence(value)
+    end
+    alias_method :fg, :foreground
+
+    def background(value = pair[1])
+      @background ||= Background.escape_sequence(value)
+    end
+    alias_method :bg, :background
+
+    private
+
+    attr_reader :pair
+  end
+end

data/lib/vedeu/output/compositor.rb

@@ -45,7 +45,7 @@ module Vedeu
     def pad_stream
       if stream.size < height
         remaining = height - stream.size
-        remaining.times { |i| stream << [''] }
+        remaining.times { |i| stream << [{ text: '' }] }
       end
     end
 
@@ -65,14 +65,6 @@ module Vedeu
       interface.geometry.width
     end
 
-    def stream
-      @_stream ||= if @stream.is_a?(String)
-        [@stream.split("\n")]
-      else
-        @stream
-      end
-    end
-
     def interface
       @_interface ||= InterfaceRepository.find(@interface)
     end

data/lib/vedeu/output/directive.rb

@@ -14,34 +14,29 @@ module Vedeu
     end
 
     def enact
-      return wordwrap if string?
-      [set_position, set_colour, set_style].join
+      [set_position, set_colour, set_style, set_text].join
     end
 
     private
 
     attr_reader :interface, :directives
 
-    def wordwrap
-      Wordwrap.this(directives, options)
-    end
-
-    def string?
-      directives.is_a?(String)
-    end
-
     def set_position
       Position.set(*position)
     end
 
     def set_colour
-      Colour.set(colour)
+      Colour.set(colour) unless colour.empty?
     end
 
     def set_style
       Array(style).map { |s| Style.set(s) }.join
     end
 
+    def set_text
+      Wordwrap.this(text, options)
+    end
+
     def position
       directives.fetch(:position, [])
     end
@@ -54,6 +49,10 @@ module Vedeu
       directives.fetch(:style, [])
     end
 
+    def text
+      directives.fetch(:text, '')
+    end
+
     def options
       {
         width: interface.geometry.width,

data/lib/vedeu/output/esc.rb

@@ -34,17 +34,18 @@ module Vedeu
     def negative
       [esc, '7m'].join
     end
-    alias_method :reverse, :negative
-    alias_method :inverse, :negative
 
     def positive
       [esc, '27m'].join
     end
 
     def normal
+      [underline_off, bold_off, positive].join
+    end
+
+    def dim
       [esc, '2m'].join
     end
-    alias_method :dim, :normal
 
     def reset
       [esc, '0m'].join

data/lib/vedeu/output/renderer.rb

@@ -0,0 +1,6 @@
+module Vedeu
+  class Renderer
+    def initialize
+    end
+  end
+end

data/lib/vedeu/output/style.rb

@@ -18,11 +18,11 @@ module Vedeu
       when :bold_off      then Esc.bold_off
       when :clear         then Esc.clear
       when :hide_cursor   then Cursor.hide
-      when :inverse       then Esc.inverse
       when :negative      then Esc.negative
       when :positive      then Esc.positive
       when :reset         then Esc.reset
-      when :normal        then Esc.reset
+      when :normal        then Esc.normal
+      when :dim           then Esc.dim
       when :show_cursor   then Cursor.show
       when :underline     then Esc.underline
       when :underline_off then Esc.underline_off

data/lib/vedeu/repository/interface.rb

@@ -42,7 +42,7 @@ module Vedeu
     private
 
     def initial_state
-      { name => Array.new(geometry.height) { [''] } }
+      { name => Array.new(geometry.height) { [{ text: '' }] } }
     end
 
     def layer_attr

data/lib/vedeu/version.rb

@@ -1,3 +1,3 @@
 module Vedeu
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 end

data/lib/vedeu.rb

@@ -1,8 +1,8 @@
 require 'date'
 require 'logger'
 require 'io/console'
+require 'oj'
 require 'virtus'
-require 'yajl'
 
 require_relative 'vedeu/input/input'
 
@@ -11,6 +11,14 @@ require_relative 'vedeu/support/exit'
 require_relative 'vedeu/support/queue'
 require_relative 'vedeu/support/terminal'
 
+require_relative 'vedeu/output/buffer/parser'
+require_relative 'vedeu/output/buffer/style'
+require_relative 'vedeu/output/buffer/formatting'
+require_relative 'vedeu/output/buffer/stream'
+require_relative 'vedeu/output/buffer/line'
+require_relative 'vedeu/output/buffer/interface'
+require_relative 'vedeu/output/buffer/composition'
+
 require_relative 'vedeu/output/base'
 require_relative 'vedeu/output/background'
 require_relative 'vedeu/output/compositor'
@@ -21,8 +29,10 @@ require_relative 'vedeu/output/geometry'
 require_relative 'vedeu/output/layer'
 require_relative 'vedeu/output/esc'
 require_relative 'vedeu/output/colour'
+require_relative 'vedeu/output/colour_pair'
 require_relative 'vedeu/output/output'
 require_relative 'vedeu/output/position'
+require_relative 'vedeu/output/renderer'
 require_relative 'vedeu/output/style'
 require_relative 'vedeu/output/translator'
 require_relative 'vedeu/output/wordwrap'

data/test/lib/vedeu/output/buffer/composition_test.rb

@@ -0,0 +1,20 @@
+require_relative '../../../../test_helper'
+
+module Vedeu
+  module Buffer
+    describe Composition do
+      let(:described_class)    { Composition }
+      let(:described_instance) { described_class.new(attributes) }
+      let(:subject)            { described_instance }
+      let(:attributes)         { { interface: [] } }
+
+      it 'returns a Composition instance' do
+        subject.must_be_instance_of(Composition)
+      end
+
+      it 'has an interface attribute' do
+        subject.interface.must_be_instance_of(Array)
+      end
+    end
+  end
+end

data/test/lib/vedeu/output/buffer/interface_test.rb

@@ -0,0 +1,24 @@
+require_relative '../../../../test_helper'
+
+module Vedeu
+  module Buffer
+    describe Interface do
+      let(:described_class)    { Interface }
+      let(:described_instance) { described_class.new(attributes) }
+      let(:subject)            { described_instance }
+      let(:attributes)         { { name: 'dummy', line: [] } }
+
+      it 'returns a Interface instance' do
+        subject.must_be_instance_of(Interface)
+      end
+
+      it 'has a name attribute' do
+        subject.name.must_be_instance_of(String)
+      end
+
+      it 'has a line attribute' do
+        subject.line.must_be_instance_of(Array)
+      end
+    end
+  end
+end

data/test/lib/vedeu/output/buffer/line_test.rb

@@ -0,0 +1,39 @@
+require_relative '../../../../test_helper'
+
+module Vedeu
+  module Buffer
+    describe Line do
+      let(:described_class)    { Line }
+      let(:described_instance) { described_class.new(attributes) }
+      let(:subject)            { described_instance }
+      let(:attributes)         {
+        {
+          style:      'normal',
+          foreground: :red,
+          background: :black,
+          stream:     []
+        }
+      }
+
+      it 'returns a Line instance' do
+        subject.must_be_instance_of(Line)
+      end
+
+      it 'has a style attribute' do
+        subject.style.must_be_instance_of(Array)
+      end
+
+      it 'has a foreground attribute' do
+        subject.foreground.must_be_instance_of(Symbol)
+      end
+
+      it 'has a background attribute' do
+        subject.background.must_be_instance_of(Symbol)
+      end
+
+      it 'has a stream attribute' do
+        subject.stream.must_be_instance_of(Array)
+      end
+    end
+  end
+end

data/test/lib/vedeu/output/buffer/parser_test.rb

@@ -0,0 +1,58 @@
+require_relative '../../../../test_helper'
+
+module Vedeu
+  module Buffer
+    describe Parser do
+      let(:described_class)    { Parser }
+      let(:described_instance) { described_class.new(composition) }
+      let(:subject)            { described_instance }
+      let(:json)               { File.read(Vedeu.root_path + '/test/support/composition.json') }
+      let(:json_as_hash)       { Oj.load(json) }
+      let(:composition)        { Vedeu::Buffer::Composition.new(json_as_hash) }
+
+      it 'returns a Parser instance' do
+        subject.must_be_instance_of(Buffer::Parser)
+      end
+
+      it 'sets an instance variable' do
+        subject.instance_variable_get('@composition').must_equal(composition)
+      end
+
+      describe '#to_compositor' do
+        let(:subject) { described_instance.to_compositor }
+
+        it 'returns a Hash' do
+          subject.must_be_instance_of(Hash)
+        end
+
+        it 'returns the composition as a Compositor format' do
+          subject.must_equal({"dumb"=>[[{:style=>[:normal], :colour=>[:red, :black]}, {:style=>[:underline, :negative], :colour=>[:yellow, :black], :text=>"Some text..."}, {:style=>[:normal], :colour=>[:green, :black], :text=>"Some more text..."}], [{:style=>[], :colour=>[]}, {:style=>[], :colour=>[], :text=>"Even more text..."}]], "dumber"=>[[{:style=>[], :colour=>[]}, {:style=>[], :colour=>[], :text=>"Yet more text..."}]]})
+        end
+      end
+
+      describe '#to_hash' do
+        let(:subject) { described_instance.to_hash }
+
+        it 'returns a Hash' do
+          subject.must_be_instance_of(Hash)
+        end
+
+        it 'returns the composition as a Hash' do
+          subject.must_equal({"interface"=>[{"name"=>"dumb", "line"=>[{"style"=>["normal"], "foreground"=>"red", "background"=>"black", "stream"=>[{"style"=>["underline", "negative"], "foreground"=>"yellow", "background"=>"black", "text"=>"Some text..."}, {"style"=>["normal"], "foreground"=>"green", "background"=>"black", "text"=>"Some more text..."}]}, {"style"=>nil, "foreground"=>nil, "background"=>nil, "stream"=>[{"style"=>nil, "foreground"=>nil, "background"=>nil, "text"=>"Even more text..."}]}]}, {"name"=>"dumber", "line"=>[{"style"=>nil, "foreground"=>nil, "background"=>nil, "stream"=>[{"style"=>nil, "foreground"=>nil, "background"=>nil, "text"=>"Yet more text..."}]}]}]})
+        end
+      end
+
+      describe '#to_json' do
+        let(:subject) { described_instance.to_json }
+
+        it 'returns a String' do
+          subject.must_be_instance_of(String)
+        end
+
+        it 'returns a String' do
+          subject.must_equal("{\"interface\":[{\"name\":\"dumb\",\"line\":[{\"style\":[\"normal\"],\"foreground\":\"red\",\"background\":\"black\",\"stream\":[{\"style\":[\"underline\",\"negative\"],\"foreground\":\"yellow\",\"background\":\"black\",\"text\":\"Some text...\"},{\"style\":[\"normal\"],\"foreground\":\"green\",\"background\":\"black\",\"text\":\"Some more text...\"}]},{\"style\":null,\"foreground\":null,\"background\":null,\"stream\":[{\"style\":null,\"foreground\":null,\"background\":null,\"text\":\"Even more text...\"}]}]},{\"name\":\"dumber\",\"line\":[{\"style\":null,\"foreground\":null,\"background\":null,\"stream\":[{\"style\":null,\"foreground\":null,\"background\":null,\"text\":\"Yet more text...\"}]}]}]}")
+        end
+      end
+    end
+  end
+end

data/test/lib/vedeu/output/buffer/stream_test.rb

@@ -0,0 +1,39 @@
+require_relative '../../../../test_helper'
+
+module Vedeu
+  module Buffer
+    describe Stream do
+      let(:described_class)    { Stream }
+      let(:described_instance) { described_class.new(attributes) }
+      let(:subject)            { described_instance }
+      let(:attributes)         {
+        {
+          style:      'normal',
+          foreground: :red,
+          background: :black,
+          text:       'Some text'
+        }
+      }
+
+      it 'returns a Stream instance' do
+        subject.must_be_instance_of(Stream)
+      end
+
+      it 'has a foreground attribute' do
+        subject.foreground.must_be_instance_of(Symbol)
+      end
+
+      it 'has a background attribute' do
+        subject.background.must_be_instance_of(Symbol)
+      end
+
+      it 'has a text attribute' do
+        subject.text.must_be_instance_of(String)
+      end
+
+      it 'has a style attribute' do
+        subject.style.must_be_instance_of(Array)
+      end
+    end
+  end
+end

data/test/lib/vedeu/output/buffer/style_test.rb

@@ -0,0 +1,8 @@
+require_relative '../../../../test_helper'
+
+module Vedeu
+  module Buffer
+    describe Style do
+    end
+  end
+end

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

@@ -0,0 +1,104 @@
+require_relative '../../../test_helper'
+
+module Vedeu
+  describe Colour do
+    let(:described_class)    { Colour }
+    let(:described_instance) { described_class.new }
+    let(:subject)            { described_instance }
+    let(:pair)               { [] }
+
+    it 'returns a Colour instance' do
+      subject.must_be_instance_of(Colour)
+    end
+
+    it 'sets an instance variable' do
+      subject.instance_variable_get('@pair').must_equal([])
+    end
+
+    describe '.set' do
+      let(:subject) { described_class.set(pair) }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      context 'when the foreground and background are specified as symbols' do
+        context 'when both the foreground and background is specified' do
+          let(:pair) { [:red, :yellow] }
+
+          it 'returns the code for red on yellow' do
+            subject.must_equal("\e[38;2;31m\e[48;2;43m")
+          end
+        end
+
+        context 'when a foreground is specified' do
+          let(:pair) { [:blue] }
+
+          it 'returns the code for blue on default' do
+            subject.must_equal("\e[38;2;34m\e[48;2;49m")
+          end
+        end
+
+        context 'when a background is specified' do
+          let(:pair) { [nil, :cyan] }
+
+          it 'returns the code for default with cyan background' do
+            subject.must_equal("\e[38;2;39m\e[48;2;46m")
+          end
+        end
+
+        context 'when an invalid foreground/background is specified' do
+          let(:pair) { [:melon, :raspberry] }
+
+          it 'returns the default code' do
+            subject.must_equal("\e[38;2;39m\e[48;2;49m")
+          end
+        end
+
+        context 'when no foreground/background is specified' do
+          let(:pair) { [] }
+
+          it 'return an empty string' do
+            subject.must_equal('')
+          end
+        end
+      end
+
+      context 'when the foreground and background are specified as strings' do
+        let(:pair) { ['#ff0000', '#0000ff'] }
+
+        it 'returns the default code' do
+          subject.must_equal("\e[38;5;196m\e[48;5;21m")
+        end
+      end
+    end
+
+    describe '.reset' do
+      let(:subject) { described_class.reset }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[38;2;39m\e[48;2;49m")
+      end
+    end
+
+    describe '#foreground' do
+      let(:subject) { described_instance.foreground }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+    end
+
+    describe '#background' do
+      let(:subject) { described_instance.background }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+    end
+  end
+end

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

@@ -34,7 +34,7 @@ module Vedeu
     end
 
     describe '#arrange' do
-      let(:subject)    { described_class.new(attributes).arrange }
+      let(:subject) { described_class.new(attributes).arrange }
 
       context 'when empty' do
         let(:stream)      { [[]] }
@@ -58,7 +58,7 @@ module Vedeu
 
       context 'when unstyled' do
         context 'and a single line' do
-          let(:stream)      { [['Some text...']] }
+          let(:stream)      { [[{ text: 'Some text...' }]] }
           let(:composition) {
             [
               [
@@ -76,8 +76,8 @@ module Vedeu
         context 'and multi-line' do
           let(:stream) {
             [
-              ['Some text...'],
-              ['Some more text...']
+              [{ text: 'Some text...' }],
+              [{ text: 'Some more text...' }]
             ]
           }
           let(:composition) {
@@ -95,17 +95,19 @@ module Vedeu
         end
 
         context 'but is a string containing new-lines' do
-          let(:stream)      { "Some text...\nSome more text..." }
+          let(:stream)      { [[{ text: "Some text...\nSome more text..." }]] }
           let(:composition) {
             [
               [
-                "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1HSome text...Some 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;1HSome text...
+...\e[0m\e[38;2;39m\e[48;2;49m\e[?25h",
                 "\e[38;2;39m\e[48;2;49m\e[2;1H               \e[2;1H\e[38;2;39m\e[48;2;49m\e[?25h"
               ]
             ]
           }
 
           it 'returns the enqueued composition' do
+            skip # The newline in the composition is not the desired behaviour. Wordwrap is the culprit.
             subject.must_equal(composition)
           end
         end
@@ -116,7 +118,7 @@ module Vedeu
           context 'and a single line' do
             let(:stream) {
               [
-                [{ colour: [:red, :white] }, 'Some text...', { colour: :default }]
+                [{ colour: [:red, :white], text: 'Some text...' }, { colour: :default }]
               ]
             }
             let(:composition) {
@@ -136,8 +138,8 @@ module Vedeu
           context 'and multi-line' do
             let(:stream) {
               [
-                [{ colour: [:red, :white] },   'Some text...'],
-                [{ colour: [:blue, :yellow] }, 'Some more text...']
+                [{ colour: [:red, :white], text: 'Some text...' }],
+                [{ colour: [:blue, :yellow], text: 'Some more text...' }]
               ]
             }
             let(:composition) {
@@ -157,7 +159,11 @@ module Vedeu
 
         context 'with a style' do
           context 'and a single line' do
-            let(:stream)      { [[{ style: :bold }, 'Some text...', { style: :bold_off }]] }
+            let(:stream)      {
+              [
+                [{ style: :bold, text: 'Some text...' }, { style: :bold_off }]
+              ]
+            }
             let(:composition) {
               [
                 [
@@ -175,8 +181,8 @@ module Vedeu
           context 'and multi-line' do
             let(:stream) {
                 [
-                  [{ style: :inverse },   'Some text...'],
-                  [{ style: :underline }, 'Some more text...']
+                  [{ style: :negative, text: 'Some text...' }],
+                  [{ style: :underline, text: 'Some more text...' }]
                 ]
             }
             let(:composition) {
@@ -195,7 +201,11 @@ module Vedeu
         end
 
         context 'with an unknown style' do
-          let(:stream)      { [[{ style: :unknown }, 'Some text...']] }
+          let(:stream)      {
+            [
+              [{ style: :unknown, text: 'Some text...' }]
+            ]
+          }
           let(:composition) {
             [
               [
@@ -209,6 +219,28 @@ module Vedeu
             subject.must_equal(composition)
           end
         end
+
+        context 'with a complicated stream' do
+          let(:stream) {
+            [
+              [{:style=>[:normal], :colour=>[:red, :black]}, {:style=>[:underline, :negative], :colour=>[:yellow, :black], :text=>"Some text..."}, {:style=>[:normal], :colour=>[:green, :black], :text=>"Some more text..."}],
+              [{:style=>[], :colour=>[]}, {:style=>[], :colour=>[], :text=>"Even more text..."}]
+            ]
+          }
+
+          let(:composition) {
+            [
+              [
+                "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1H\e[38;2;31m\e[48;2;40m\e[24m\e[21m\e[27m\e[38;2;33m\e[48;2;40m\e[4m\e[7mSome text...\e[38;2;32m\e[48;2;40m\e[24m\e[21m\e[27mSome more tex...\e[0m\e[38;2;39m\e[48;2;49m\e[?25h",
+                "\e[38;2;39m\e[48;2;49m\e[2;1H               \e[2;1HEven more tex...\e[0m\e[38;2;39m\e[48;2;49m\e[?25h"
+              ]
+            ]
+          }
+
+          it 'returns the enqueued composition' do
+            subject.must_equal(composition)
+          end
+        end
       end
     end
   end

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

@@ -74,7 +74,7 @@ module Vedeu
         let(:style) { [:normal, :underline, :normal] }
 
         it 'returns an escape sequence' do
-          subject.must_equal("\e[0m\e[4m\e[0m")
+          subject.must_equal("\e[24m\e[21m\e[27m\e[4m\e[24m\e[21m\e[27m")
         end
       end
     end

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

@@ -88,8 +88,8 @@ module Vedeu
       end
     end
 
-    describe '.inverse' do
-      let(:subject) { described_class.inverse }
+    describe '.negative' do
+      let(:subject) { described_class.negative }
 
       it 'returns a String' do
         subject.must_be_instance_of(String)
@@ -119,6 +119,18 @@ module Vedeu
         subject.must_be_instance_of(String)
       end
 
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[24m\e[21m\e[27m")
+      end
+    end
+
+    describe '.dim' do
+      let(:subject) { described_class.dim }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
       it 'returns an escape sequence' do
         subject.must_equal("\e[2m")
       end

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

@@ -30,7 +30,7 @@ module Vedeu
           ]
         }
 
-        before { Compositor.arrange({ 'dummy' => 'Testing Output.render' }) }
+        before { Compositor.arrange({ 'dummy' => [[{ text: 'Testing Output.render' }]] }) }
 
         it { subject.must_equal(output) }
       end

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

@@ -0,0 +1,13 @@
+require_relative '../../../test_helper'
+
+module Vedeu
+  describe Renderer do
+    let(:described_class)    { Renderer }
+    let(:described_instance) { described_class.new }
+    let(:subject)            { described_instance }
+
+    it 'returns a Renderer instance' do
+      subject.must_be_instance_of(Renderer)
+    end
+  end
+end

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

@@ -72,14 +72,6 @@ module Vedeu
         end
       end
 
-      context 'when the style is inverse' do
-        let(:style) { :inverse }
-
-        it 'returns an escape sequence' do
-          subject.must_equal("\e[7m")
-        end
-      end
-
       context 'when the style is positive' do
         let(:style) { :positive }
 
@@ -100,7 +92,15 @@ module Vedeu
         let(:style) { :normal }
 
         it 'returns an escape sequence' do
-          subject.must_equal("\e[0m")
+          subject.must_equal("\e[24m\e[21m\e[27m")
+        end
+      end
+
+      context 'when the style is dim' do
+        let(:style) { :dim }
+
+        it 'returns an escape sequence' do
+          subject.must_equal("\e[2m")
         end
       end
 

data/test/support/composition.json

@@ -0,0 +1,47 @@
+{
+    "interface":[
+        {
+            "name":"dumb",
+            "line":[
+                {
+                    "style":"normal",
+                    "foreground":"red",
+                    "background":"black",
+                    "stream":[
+                        {
+                            "style":"underline negative",
+                            "foreground":"yellow",
+                            "background":"black",
+                            "text":"Some text..."
+                        },
+                        {
+                            "style":"normal",
+                            "foreground":"green",
+                            "background":"black",
+                            "text":"Some more text..."
+                        }
+                    ]
+                },
+                {
+                    "stream":[
+                        {
+                            "text":"Even more text..."
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "name":"dumber",
+            "line":[
+                {
+                    "stream":[
+                        {
+                            "text":"Yet more text..."
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

data/test/support/composition.rb

@@ -0,0 +1,5 @@
+require 'pry'
+
+json = File.read('./composition.json')
+hash = Yajl::Parser.parse(json)
+comp = Vedeu::Composition.new(hash)

data/test/support/composition.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<interface>
+  <name>dumb</name>
+  <line>
+    <style>normal</style>
+    <foreground>red</foreground>
+    <background>black</background>
+    <stream>
+      <style>underline negative</style>
+      <foreground>yellow</foreground>
+      <background>black</background>
+      <text>Some text...</text>
+    </stream>
+    <stream>
+      <style>normal</style>
+      <foreground>green</foreground>
+      <background>black</background>
+      <text>Some more text...</text>
+    </stream>
+  </line>
+  <line>
+    <stream>
+      <text>Even more text...</text>
+    </stream>
+  </line>
+</interface>
+
+<interface>
+  <name>dumber</name>
+  <line>
+    <stream>
+      <text>Yet more text...</text>
+    </stream>
+  </line>
+</interface>

data/test/test_helper.rb

@@ -23,7 +23,7 @@ end
 # commented out by default (makes tests slower)
 # require 'minitest/reporters'
 # Minitest::Reporters.use!(
-  # Minitest::Reporters::DefaultReporter.new({ color: true, slow_count: 5 })
+  # Minitest::Reporters::DefaultReporter.new({ color: true, slow_count: 5 }),
   # Minitest::Reporters::SpecReporter.new
 # )
 

data/vedeu.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov',          '0.8.2'
 
+  spec.add_dependency "oj"
   spec.add_dependency "virtus"
-  spec.add_dependency "yajl-ruby"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.2
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -224,6 +224,7 @@ description:
 email:
 - gavinlaking@gmail.com
 executables:
+- composition
 - vedeu
 extensions: []
 extra_rdoc_files: []
@@ -236,6 +237,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/composition
 - bin/vedeu
 - config/cucumber.yml
 - documentation/composition.ebnf
@@ -257,7 +259,15 @@ files:
 - lib/vedeu/launcher.rb
 - lib/vedeu/output/background.rb
 - lib/vedeu/output/base.rb
+- lib/vedeu/output/buffer/composition.rb
+- lib/vedeu/output/buffer/formatting.rb
+- lib/vedeu/output/buffer/interface.rb
+- lib/vedeu/output/buffer/line.rb
+- lib/vedeu/output/buffer/parser.rb
+- lib/vedeu/output/buffer/stream.rb
+- lib/vedeu/output/buffer/style.rb
 - lib/vedeu/output/colour.rb
+- lib/vedeu/output/colour_pair.rb
 - lib/vedeu/output/compositor.rb
 - lib/vedeu/output/cursor.rb
 - lib/vedeu/output/directive.rb
@@ -267,6 +277,7 @@ files:
 - lib/vedeu/output/layer.rb
 - lib/vedeu/output/output.rb
 - lib/vedeu/output/position.rb
+- lib/vedeu/output/renderer.rb
 - lib/vedeu/output/style.rb
 - lib/vedeu/output/translator.rb
 - lib/vedeu/output/wordwrap.rb
@@ -289,6 +300,13 @@ files:
 - test/lib/vedeu/launcher_test.rb
 - test/lib/vedeu/output/background_test.rb
 - test/lib/vedeu/output/base_test.rb
+- test/lib/vedeu/output/buffer/composition_test.rb
+- test/lib/vedeu/output/buffer/interface_test.rb
+- test/lib/vedeu/output/buffer/line_test.rb
+- test/lib/vedeu/output/buffer/parser_test.rb
+- test/lib/vedeu/output/buffer/stream_test.rb
+- test/lib/vedeu/output/buffer/style_test.rb
+- test/lib/vedeu/output/colour_pair_test.rb
 - test/lib/vedeu/output/colour_test.rb
 - test/lib/vedeu/output/compositor_test.rb
 - test/lib/vedeu/output/cursor_test.rb
@@ -299,6 +317,7 @@ files:
 - test/lib/vedeu/output/layer_test.rb
 - test/lib/vedeu/output/output_test.rb
 - test/lib/vedeu/output/position_test.rb
+- test/lib/vedeu/output/renderer_test.rb
 - test/lib/vedeu/output/style_test.rb
 - test/lib/vedeu/output/translator_test.rb
 - test/lib/vedeu/output/wordwrap_test.rb
@@ -318,6 +337,9 @@ files:
 - test/lib/vedeu/version_test.rb
 - test/lib/vedeu_test.rb
 - test/support/colours.rb
+- test/support/composition.json
+- test/support/composition.rb
+- test/support/composition.xml
 - test/test_helper.rb
 - vedeu.gemspec
 homepage: http://www.gavinlaking.name/
@@ -353,6 +375,13 @@ test_files:
 - test/lib/vedeu/launcher_test.rb
 - test/lib/vedeu/output/background_test.rb
 - test/lib/vedeu/output/base_test.rb
+- test/lib/vedeu/output/buffer/composition_test.rb
+- test/lib/vedeu/output/buffer/interface_test.rb
+- test/lib/vedeu/output/buffer/line_test.rb
+- test/lib/vedeu/output/buffer/parser_test.rb
+- test/lib/vedeu/output/buffer/stream_test.rb
+- test/lib/vedeu/output/buffer/style_test.rb
+- test/lib/vedeu/output/colour_pair_test.rb
 - test/lib/vedeu/output/colour_test.rb
 - test/lib/vedeu/output/compositor_test.rb
 - test/lib/vedeu/output/cursor_test.rb
@@ -363,6 +392,7 @@ test_files:
 - test/lib/vedeu/output/layer_test.rb
 - test/lib/vedeu/output/output_test.rb
 - test/lib/vedeu/output/position_test.rb
+- test/lib/vedeu/output/renderer_test.rb
 - test/lib/vedeu/output/style_test.rb
 - test/lib/vedeu/output/translator_test.rb
 - test/lib/vedeu/output/wordwrap_test.rb
@@ -382,5 +412,8 @@ test_files:
 - test/lib/vedeu/version_test.rb
 - test/lib/vedeu_test.rb
 - test/support/colours.rb
+- test/support/composition.json
+- test/support/composition.rb
+- test/support/composition.xml
 - test/test_helper.rb
 has_rdoc: