vedeu 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce06977605476701c2ac6f998a0af92fd38d5206
-  data.tar.gz: 5a72b5086a86d4af8871d7318e07bce64fca2af7
+  metadata.gz: 046d21e705590582e93e96ebd7be2301265256ea
+  data.tar.gz: 0582a4583fb725376874b6b41c1d1508df473a35
 SHA512:
-  metadata.gz: 8363bd8ce4582edc87027a0ab688d1f8b97f50e0e25f328f59f6ceebe7ef016022fc9893bfd091652252615f1da1a7daecaa9c373a094b0c1f12296220ab8552
-  data.tar.gz: 1d1f967155fa6c2f747203703a2cb4aaa48934ad4926a6a6f5b2b27b89321b2b3b7776e6a16e92ea59fe09f5644728736d02450ca72da58a54f8c4b6d07185ef
+  metadata.gz: dd1aba71fdd4b148133c76e5e8e3506ab3a60c98c4e9167e68e8ab47329e641762d34a7f2ec3f1191a28745a37dac5aa21a5e6052de152f186c4053ea10519fd
+  data.tar.gz: bc2fba75fb393c82a0b6ef51d62fd6c3e7614010a432259cd8bc18ba779c464f5341e1c0cc5b540cd052415551ef38547388c2c4c9e4d143104ca54a96fcb165

data/README.md

@@ -4,6 +4,7 @@
 
 Vedeu is my attempt at creating a terminal based application framework without the need for Ncurses.
 
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -16,103 +17,8 @@ And then execute:
 
 ## Usage
 
-TODO: Write detailed documentation
-
-## Notes
-
-    Launcher
-      |-- Application
-            |-- EventLoop
-            |     |-- Input
-            |     |     |-- Queue
-            |     |     |-- Terminal
-            |     |
-            |     |-- Process
-            |     |     |-- CommandRepository
-            |     |     |-- Queue
-            |     |
-            |     |-- Output
-            |           |-- Compositor
-            |           |
-            |           |-- Directive
-            |           |     |-- Colour
-            |           |     |     |-- Background < Base
-            |           |     |     |-- Foreground < Base
-            |           |     |
-            |           |     |-- Position
-            |           |     |     |-- Esc
-            |           |     |
-            |           |     |-- Style
-            |           |     |     |-- Cursor
-            |           |     |     |-- Esc
-            |           |     |
-            |           |     |-- Wordwrap
-            |           |
-            |           |-- InterfaceRepository
-            |           |-- Position
-            |                 |-- Esc
-            |
-            |-- InterfaceRepository
-            |-- Terminal
-
-    Base
-      |-- Esc
-      |-- Translator
-
-    Command
-      |-- CommandRepository
-
-    Exit
-
-    Interface
-      |-- Colour
-      |     |-- Background < Base
-      |     |-- Foreground < Base
-      |
-      |-- Geometry
-      |     |-- Terminal
-      |
-      |-- InterfaceRepository
-
-    Repository
-      |-- Storage
-
-    Terminal
-      |-- Cursor
-      |-- Esc
-      |-- Position
-            |-- Esc
-
-### On Interfaces
-
-When we create the interface we define it's width, height, and origin (y, x).
-These numbers are based on the area available to the terminal. If the terminal is 80x25, then our interface can use all or some of this area.
-
-### On Composition
-
-To compose data suitable for output in Vedeu, you can use this EBNF. Diagrams are available in the `documentation` directory.
-
-    Output ::= (('{' (Interface '=>' Stream) '}' (',' | ))* | ('[' (Stream (',' | ))* ']' (',' | ))* | ('[' (String (',' | ))* ']') (',' | ))*
-    Stream ::= ('[' (Directive (',' | ) | String (',' | ))* ']' (',' | ))*
-    Interface ::= String
-    Directive ::= PositionDirective | ColourDirective | StyleDirective
-    PositionDirective ::= '[' Fixnum ',' Fixnum ']'
-    StyleDirective ::= Symbol
-    ColourDirective ::= '[' Symbol ',' Symbol ']'
-
-Diagrams were produced using the Railroad Diagram Generator at `http://bottlecaps.de/rr/ui`.
-
-## Usage
-
-    class MyApp
-      include Vedeu
-
-      interface 'status', { y: 1, x: 1, width: :auto, height: 1     }
-      interface 'main',   { y: 2, x: 1, width: :auto, height: :auto, fg: :red, bg: :black }
+Expect documentation soon!
 
-      command 'exit', Vedeu::Exit.dispatch, { keyword: "exit", keypress: "q" }
-      command 'help', MyApp.help,           { keyword: "help", keypress: "h" }
-    end
 
 ## Contributing
 

data/lib/vedeu.rb

@@ -8,10 +8,10 @@ require_relative 'vedeu/input/input'
 
 require_relative 'vedeu/support/event_loop'
 require_relative 'vedeu/support/exit'
+require_relative 'vedeu/support/json_parser'
 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'
@@ -29,7 +29,6 @@ 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'

data/lib/vedeu/launcher.rb

@@ -12,6 +12,7 @@ module Vedeu
       @exit_code = 1
     end
 
+    # :nocov:
     def execute!
       $stdin, $stdout, $stderr = @stdin, @stdout, @stderr
 
@@ -22,5 +23,6 @@ module Vedeu
       $stdin, $stdout, $stderr = STDIN, STDOUT, STDERR
       @kernel.exit(@exit_code)
     end
+    # :nocov:
   end
 end

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

@@ -4,6 +4,21 @@ module Vedeu
       include Virtus.model
 
       attribute :interface, Array[Buffer::Interface]
+
+      def to_compositor
+        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(attributes, mode: :compat, circular: true)
+      end
     end
   end
 end

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

@@ -10,19 +10,15 @@ module Vedeu
       private
 
       def colour
-        if foreground && background
-          [foreground, background]
-        elsif foreground.nil? || background.nil?
-          []
-        end
+        return [] if foreground.nil? || background.nil?
+
+        [foreground, background]
       end
 
       def styles
-        if style
-          style
-        elsif style.nil?
-          []
-        end
+        return [] if style.nil?
+
+        style
       end
     end
   end

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

@@ -4,7 +4,7 @@ module Vedeu
       include Virtus.model
       include Formatting
 
-      attribute :stream,     Array[Buffer::Stream]
+      attribute :stream, Array[Buffer::Stream]
 
       def to_compositor
         [{ style: styles, colour: colour }, *stream.map(&:to_compositor)]

data/lib/vedeu/output/wordwrap.rb

@@ -51,12 +51,14 @@ module Vedeu
     end
 
     def pruned
-      return value if value.size <= pruned_width
-      [
-        value.chomp.slice(0..pruned_width),
-        '...',
-        Esc.reset
-      ].join
+      if value.size <= pruned_width
+        value
+      else
+        [
+          value.chomp.slice(0..pruned_width),
+          '...'
+        ].join
+      end
     end
 
     def pruned_width

data/lib/vedeu/repository/command.rb

@@ -1,21 +1,18 @@
 module Vedeu
   class Command
-    attr_accessor :attributes, :name, :entity, :keyword, :keypress
+    include Virtus.model
 
-    def initialize(attributes = {})
-      @attributes = attributes || {}
-      @name       = attributes[:name]
-      @entity     = attributes[:entity]
-      @keyword    = attributes.fetch(:options, {}).fetch(:keyword, '')
-      @keypress   = attributes.fetch(:options, {}).fetch(:keypress, '')
-    end
+    attribute :name,     String
+    attribute :entity,   Class
+    attribute :keyword,  String, default: ''
+    attribute :keypress, String, default: ''
 
     def execute(args = [])
       executable.call(*args)
     end
 
     def executable
-      proc { |*args| attributes[:entity].dispatch(*args) }
+      proc { |*args| entity.dispatch(*args) }
     end
   end
 end

data/lib/vedeu/repository/command_repository.rb

@@ -22,13 +22,12 @@ module Vedeu
 
   # :nocov:
   module ClassMethods
-    def command(name, entity, options = {})
-      command_name = name.is_a?(Symbol) ? name.to_s : name
-
+    def command(name, entity, keypress = '', keyword = '')
       CommandRepository.create({
-        name:    command_name,
-        entity:  entity,
-        options: options
+        name:     name,
+        entity:   entity,
+        keypress: keypress,
+        keyword:  keyword
       })
     end
   end

data/lib/vedeu/repository/interface.rb

@@ -11,6 +11,7 @@ module Vedeu
       @current    = []
     end
 
+    # :nocov:
     def refresh
       if enqueued?
         @current = dequeue
@@ -22,6 +23,7 @@ module Vedeu
         @current
       end
     end
+    # :nocov:
 
     def geometry
       @geometry ||= Geometry.new(attributes)

data/lib/vedeu/support/event_loop.rb

@@ -12,6 +12,7 @@ module Vedeu
       @running = true
     end
 
+    # :nocov:
     def main_sequence
       while @running do
         Input.capture
@@ -23,6 +24,7 @@ module Vedeu
     rescue Collapse
       stop
     end
+    # :nocov:
 
     def stop
       @running = false

data/lib/vedeu/support/json_parser.rb

@@ -0,0 +1,25 @@
+module Vedeu
+  class JSONParser
+    class << self
+      def parse(json = '')
+        new(json).parse
+      end
+    end
+
+    def initialize(json = '')
+      @json = json || ''
+    end
+
+    def parse
+      Buffer::Composition.new(as_hash)
+    end
+
+    private
+
+    attr_reader :json
+
+    def as_hash
+      Oj.load(json)
+    end
+  end
+end

data/lib/vedeu/support/terminal.rb

@@ -35,6 +35,7 @@ module Vedeu
         reset_position
       end
 
+      # :nocov:
       def cooked(instance, &block)
         console.cooked do
           instance.initial_setup!
@@ -52,6 +53,7 @@ module Vedeu
         end if block_given?
       end
       alias_method :open_raw, :raw
+      # :nocov:
 
       def console
         IO.console
@@ -101,6 +103,7 @@ module Vedeu
 
     private
 
+    # :nocov:
     def terminal_mode(&block)
       {
         cooked: proc { Terminal.cooked(self, &block) },
@@ -114,6 +117,7 @@ module Vedeu
         hide: proc { Terminal.hide_cursor }
       }
     end
+    # :nocov:
 
     def set_cursor
       cursor_mode.fetch(cursor).call

data/lib/vedeu/version.rb

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

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

@@ -6,7 +6,8 @@ module Vedeu
       let(:described_class)    { Composition }
       let(:described_instance) { described_class.new(attributes) }
       let(:subject)            { described_instance }
-      let(:attributes)         { { interface: [] } }
+      let(:json)               { File.read(Vedeu.root_path + '/test/support/single_interface.json') }
+      let(:attributes)         { Oj.load(json) }
 
       it 'returns a Composition instance' do
         subject.must_be_instance_of(Composition)
@@ -15,6 +16,42 @@ module Vedeu
       it 'has an interface attribute' do
         subject.interface.must_be_instance_of(Array)
       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({"dummy"=>[[{:style=>[], :colour=>[]}, {:style=>[:normal], :colour=>[:yellow, :black], :text=>"Some 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"=>"dummy", "line"=>[{"style"=>nil, "foreground"=>nil, "background"=>nil, "stream"=>[{"style"=>["normal"], "foreground"=>"yellow", "background"=>"black", "text"=>"Some 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\":\"dummy\",\"line\":[{\"style\":null,\"foreground\":null,\"background\":null,\"stream\":[{\"style\":[\"normal\"],\"foreground\":\"yellow\",\"background\":\"black\",\"text\":\"Some text...\"}]}]}]}")
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,9 @@
+require_relative '../../../../test_helper'
+
+module Vedeu
+  module Buffer
+    describe Formatting do
+      let(:described_class) { Formatting }
+    end
+  end
+end

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

@@ -14,10 +14,24 @@ module Vedeu
 
       it 'has a name attribute' do
         subject.name.must_be_instance_of(String)
+
+        subject.name.must_equal('dummy')
       end
 
       it 'has a line attribute' do
         subject.line.must_be_instance_of(Array)
+
+        subject.line.must_equal([])
+      end
+
+      describe '#to_compositor' do
+        let(:subject) { described_instance.to_compositor }
+
+        it 'returns an Array' do
+          subject.must_be_instance_of(Array)
+
+          subject.must_equal([])
+        end
       end
     end
   end

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

@@ -21,18 +21,43 @@ module Vedeu
 
       it 'has a style attribute' do
         subject.style.must_be_instance_of(Array)
+
+        subject.style.must_equal([:normal])
       end
 
       it 'has a foreground attribute' do
         subject.foreground.must_be_instance_of(Symbol)
+
+        subject.foreground.must_equal(:red)
       end
 
       it 'has a background attribute' do
         subject.background.must_be_instance_of(Symbol)
+
+        subject.background.must_equal(:black)
       end
 
       it 'has a stream attribute' do
         subject.stream.must_be_instance_of(Array)
+
+        subject.stream.must_equal([])
+      end
+
+      describe '#to_compositor' do
+        let(:subject) { described_instance.to_compositor }
+
+        it 'returns an Array' do
+          subject.must_be_instance_of(Array)
+
+          subject.must_equal(
+            [
+              {
+                style:  [:normal],
+                colour: [:red, :black]
+              }
+            ]
+          )
+        end
       end
     end
   end

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

@@ -21,18 +21,40 @@ module Vedeu
 
       it 'has a foreground attribute' do
         subject.foreground.must_be_instance_of(Symbol)
+
+        subject.foreground.must_equal(:red)
       end
 
       it 'has a background attribute' do
         subject.background.must_be_instance_of(Symbol)
+
+        subject.background.must_equal(:black)
       end
 
       it 'has a text attribute' do
         subject.text.must_be_instance_of(String)
+
+        subject.text.must_equal('Some text')
       end
 
       it 'has a style attribute' do
         subject.style.must_be_instance_of(Array)
+
+        subject.style.must_equal([:normal])
+      end
+
+      describe '#to_compositor' do
+        let(:subject) { described_instance.to_compositor }
+
+        it 'returns a Hash' do
+          subject.must_be_instance_of(Hash)
+
+          subject.must_equal({
+            style:  [:normal],
+            colour: [:red, :black],
+            text:   "Some text"
+          })
+        end
       end
     end
   end

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

@@ -84,7 +84,7 @@ module Vedeu
             [
               [
                 "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1HSome text...\e[38;2;39m\e[48;2;49m\e[?25h",
-                "\e[38;2;39m\e[48;2;49m\e[2;1H               \e[2;1HSome more tex...\e[0m\e[38;2;39m\e[48;2;49m\e[?25h"
+                "\e[38;2;39m\e[48;2;49m\e[2;1H               \e[2;1HSome more tex...\e[38;2;39m\e[48;2;49m\e[?25h"
               ]
             ]
           }
@@ -146,7 +146,7 @@ module Vedeu
               [
                 [
                   "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1H\e[38;2;31m\e[48;2;47mSome text...\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;34m\e[48;2;43mSome 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;1H\e[38;2;34m\e[48;2;43mSome more tex...\e[38;2;39m\e[48;2;49m\e[?25h"
                 ]
               ]
             }
@@ -189,7 +189,7 @@ module Vedeu
               [
                 [
                   "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1H\e[7mSome text...\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[4mSome 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;1H\e[4mSome more tex...\e[38;2;39m\e[48;2;49m\e[?25h"
                 ]
               ]
             }
@@ -231,8 +231,8 @@ module Vedeu
           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"
+                "\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[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[38;2;39m\e[48;2;49m\e[?25h"
               ]
             ]
           }

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

@@ -24,7 +24,7 @@ module Vedeu
         let(:output) {
           [
             [
-              "\e[38;2;39m\e[48;2;49m\e[1;1H               \e[1;1HTesting Outpu...\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;1HTesting Outpu...\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"
             ]
           ]

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

@@ -39,6 +39,10 @@ module Vedeu
 
       subject { described_class.this(value, options) }
 
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
       it 'returns formatted text' do
         subject.must_equal(formatted_value)
       end
@@ -47,7 +51,7 @@ module Vedeu
         let(:options)         { { width: 70, prune: true } }
         let(:formatted_value) {
           'Lorem ipsum dolor sit amet, consectetur adipiscing elit.' \
-          " Curabitur a...\e[0m"
+          " Curabitur a..."
         }
 
         it 'returns formatted text' do

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

@@ -6,20 +6,18 @@ module Vedeu
     let(:input)           {}
 
     before do
-      CommandRepository.create({ name:    'apple',
-                                 entity:  DummyCommand,
-                                 options: {
-                                            keypress: 'a',
-                                            keyword:  'apple'
-                                          }
-                               })
-      CommandRepository.create({ name:    'banana',
-                                 entity:  DummyCommand,
-                                 options: {
-                                            keypress: 'b',
-                                            keyword:  'banana'
-                                          }
-                               })
+      CommandRepository.create({
+        name:     'apple',
+        entity:   DummyCommand,
+        keypress: 'a',
+        keyword:  'apple'
+      })
+      CommandRepository.create({
+        name:     'banana',
+        entity:   DummyCommand,
+        keypress: 'b',
+        keyword:  'banana'
+      })
     end
 
     after { CommandRepository.reset }

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

@@ -9,10 +9,8 @@ module Vedeu
       {
         name:    'dummy',
         entity:   DummyCommand,
-        options: {
-          keyword:  "dummy",
-          keypress: "d"
-        }
+        keyword:  "dummy",
+        keypress: "d"
       }
     }
 
@@ -20,24 +18,28 @@ module Vedeu
       subject.must_be_instance_of(Command)
     end
 
-    it 'sets an instance variable' do
-      subject.instance_variable_get('@attributes').must_equal(attributes)
-    end
+    it 'has a name attribute' do
+      subject.name.must_be_instance_of(String)
 
-    it 'sets an instance variable' do
-      subject.instance_variable_get('@name').must_equal('dummy')
+      subject.name.must_equal('dummy')
     end
 
-    it 'sets an instance variable' do
-      subject.instance_variable_get('@entity').must_equal(DummyCommand)
+    it 'has an entity attribute' do
+      subject.entity.must_be_instance_of(Class)
+
+      subject.entity.must_equal(DummyCommand)
     end
 
-    it 'sets an instance variable' do
-      subject.instance_variable_get('@keyword').must_equal('dummy')
+    it 'has a keypress attribute' do
+      subject.keypress.must_be_instance_of(String)
+
+      subject.keypress.must_equal('d')
     end
 
-    it 'sets an instance variable' do
-      subject.instance_variable_get('@keypress').must_equal('d')
+    it 'has an keyword attribute' do
+      subject.keyword.must_be_instance_of(String)
+
+      subject.keyword.must_equal('dummy')
     end
 
     describe '#execute' do
@@ -55,6 +57,10 @@ module Vedeu
 
     describe '#executable' do
       let(:subject) { described_instance.executable }
+
+      it 'returns a proc' do
+        subject.class.to_s.must_equal('Proc')
+      end
     end
   end
 end

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

@@ -0,0 +1,46 @@
+require_relative '../../../test_helper'
+
+module Vedeu
+  describe JSONParser do
+    let(:described_class)    { JSONParser }
+    let(:described_instance) { described_class.new(json) }
+    let(:subject)            { described_instance }
+    let(:json)               { "[]" }
+
+    it 'returns a JSONParser instance' do
+      subject.must_be_instance_of(JSONParser)
+    end
+
+    it 'sets an instance variable' do
+      subject.instance_variable_get("@json").must_equal(json)
+    end
+
+    context 'when the instance variable is nil' do
+      let(:json) {}
+
+      it 'set the instance variable to empty string' do
+        subject.instance_variable_get("@json").must_equal('')
+      end
+    end
+
+    describe '#parse' do
+      let(:subject) { described_instance.parse }
+
+      context 'when the JSON contains a single interface' do
+        let(:json) { File.read('test/support/single_interface.json') }
+
+        it 'returns a Composition instance' do
+          subject.must_be_instance_of(Buffer::Composition)
+        end
+      end
+
+      context 'when the JSON contains multiple interfaces' do
+        let(:json) { File.read('test/support/multi_interface.json') }
+
+        it 'returns a Composition instance' do
+          subject.must_be_instance_of(Buffer::Composition)
+        end
+      end
+    end
+  end
+end

data/test/support/multi_interface.json

@@ -0,0 +1,34 @@
+{
+    "interface":[
+        {
+            "name":"dummy",
+            "line":[
+                {
+                    "stream":[
+                        {
+                            "style":"normal",
+                            "foreground":"yellow",
+                            "background":"black",
+                            "text":"Some text..."
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "name":"dumber",
+            "line":[
+                {
+                    "stream":[
+                        {
+                            "style":"normal",
+                            "foreground":"red",
+                            "background":"black",
+                            "text":"Some more text..."
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

data/test/support/single_interface.json

@@ -0,0 +1,19 @@
+{
+    "interface":[
+        {
+            "name":"dummy",
+            "line":[
+                {
+                    "stream":[
+                        {
+                            "style":"normal",
+                            "foreground":"yellow",
+                            "background":"black",
+                            "text":"Some text..."
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -263,11 +263,9 @@ files:
 - 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
@@ -292,6 +290,7 @@ files:
 - lib/vedeu/repository/storage.rb
 - lib/vedeu/support/event_loop.rb
 - lib/vedeu/support/exit.rb
+- lib/vedeu/support/json_parser.rb
 - lib/vedeu/support/queue.rb
 - lib/vedeu/support/terminal.rb
 - lib/vedeu/version.rb
@@ -301,12 +300,11 @@ files:
 - 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/formatting_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
@@ -332,6 +330,7 @@ files:
 - test/lib/vedeu/repository/storage_test.rb
 - test/lib/vedeu/support/event_loop_test.rb
 - test/lib/vedeu/support/exit_test.rb
+- test/lib/vedeu/support/json_parser_test.rb
 - test/lib/vedeu/support/queue_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/version_test.rb
@@ -340,6 +339,8 @@ files:
 - test/support/composition.json
 - test/support/composition.rb
 - test/support/composition.xml
+- test/support/multi_interface.json
+- test/support/single_interface.json
 - test/test_helper.rb
 - vedeu.gemspec
 homepage: http://www.gavinlaking.name/
@@ -376,12 +377,11 @@ test_files:
 - 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/formatting_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
@@ -407,6 +407,7 @@ test_files:
 - test/lib/vedeu/repository/storage_test.rb
 - test/lib/vedeu/support/event_loop_test.rb
 - test/lib/vedeu/support/exit_test.rb
+- test/lib/vedeu/support/json_parser_test.rb
 - test/lib/vedeu/support/queue_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/version_test.rb
@@ -415,5 +416,7 @@ test_files:
 - test/support/composition.json
 - test/support/composition.rb
 - test/support/composition.xml
+- test/support/multi_interface.json
+- test/support/single_interface.json
 - test/test_helper.rb
 has_rdoc: 

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

@@ -1,28 +0,0 @@
-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/colour_pair.rb

@@ -1,43 +0,0 @@
-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/test/lib/vedeu/output/buffer/parser_test.rb

@@ -1,58 +0,0 @@
-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/colour_pair_test.rb

@@ -1,104 +0,0 @@
-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