vedeu 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c4536e9fdde25f748de839f9a992e805b97f308
-  data.tar.gz: 0a951cfde4234e720dcbdf943bf6f91c2b95dc41
+  metadata.gz: 2ef9364bd8562905d44a580a1f6b9f0acb3820d6
+  data.tar.gz: 30849fc7340fbb1ab220e24834580bd0941e8545
 SHA512:
-  metadata.gz: f92b9b9b3bdccb7a55df3aedddde6bd9ae67a88925c1c1584d274ebcdab52a98624377968ff91f8a1f61c854567cd363e848cb67d356665e4bf7be02b07ff8b2
-  data.tar.gz: 839cbdab1f3b684e35874975b2dc6c2052487edb94cdbef65aa12c72282ab679b711fac9dc11743a85849d1e817e4992143760509541e1adaac65cc3ed283d8e
+  metadata.gz: 461240de809a3abd145c22eaea50bc32b5dfe56f41c16c35c407b6e13493f4d16e431d0fb9f2fdbb5111f847287d771f39fb7a239fe8f6c24f47677b930c4f44
+  data.tar.gz: e823ea6b126ea32dd259fdef8a58c3cd6c59c3a07bcaa8d51cb52bef0847226dbf69890d9b0e4c6ec064c5feffaaee17e48ccd91ea417dff7faf14579c5d2d83

data/deps.md

@@ -50,7 +50,7 @@ Interface
 InterfaceCollection
   InterfaceStore
 
-InterfaceTemplate
+API::Interface
   Geometry
   Interface
   InterfaceStore
@@ -129,7 +129,7 @@ Menu     - orphaned
 Grouped
 ----------------------------------------------------------------------
 
-InterfaceTemplate
+API::Interface
   Interface
   Geometry
   InterfaceStore

data/lib/vedeu.rb

@@ -1,8 +1,8 @@
 require 'vedeu/instrumentation'
-require 'vedeu/support/interface_template'
+require 'vedeu/api/interface'
 require 'vedeu/support/events'
 require 'vedeu/support/interface_store'
-
+require 'vedeu/api/view'
 require 'vedeu/models/geometry'
 require 'vedeu/support/menu'
 require 'vedeu/output/view'
@@ -20,7 +20,7 @@ module Vedeu
 
   module API
     def interface(name, &block)
-      InterfaceTemplate.save(name, &block)
+      Interface.save(name, &block)
     end
 
     def on(name, delay = 0, &block)
@@ -33,9 +33,13 @@ module Vedeu
     end
     alias_method :run, :trigger
 
-    def view(name)
+    def with(name, &block)
       InterfaceStore.query(name)
     end
+
+    def view(name = '', &block)
+      Vedeu::API::View.build(name, &block)
+    end
   end
 
   def self.events

data/lib/vedeu/api/base.rb

@@ -0,0 +1,36 @@
+module Vedeu
+  module API
+    class Base
+      def self.build(attributes = {}, &block)
+        new(attributes, &block).build
+      end
+
+      def initialize(attributes, &block)
+        @attributes = attributes
+
+        self.instance_eval(&block) if block_given?
+      end
+
+      def colour(*args)
+        if args.is_a?(Array) && args.size == 2
+          attributes[:colour] = { background: args.first, foreground: args.last }
+
+        elsif args.is_a?(Array) && args.size == 1 && args.first.is_a?(Hash)
+          attributes[:colour] = args.first
+
+        else
+          attributes[:colour] = {}
+
+        end
+      end
+
+      def style(values = [], &block)
+        if block_given?
+          attributes[:streams] << API::Stream.build({ style: [values] }, &block)
+        else
+          [values].flatten.each { |value| attributes[:style] << value }
+        end
+      end
+    end
+  end
+end

data/lib/vedeu/api/interface.rb

@@ -0,0 +1,76 @@
+require 'vedeu/models/geometry'
+require 'vedeu/support/interface_store'
+require 'vedeu/support/terminal'
+
+module Vedeu
+  module API
+    InvalidHeight = Class.new(StandardError)
+    InvalidWidth  = Class.new(StandardError)
+    XOutOfBounds  = Class.new(StandardError)
+    YOutOfBounds  = Class.new(StandardError)
+
+    class Interface
+      def self.save(name, &block)
+        new(name).save(&block)
+      end
+
+      def initialize(name)
+        @name = name.to_s
+      end
+
+      def save(&block)
+        self.instance_eval(&block) if block_given?
+
+        InterfaceStore.create(attributes)
+      end
+
+      private
+
+      attr_reader :name
+
+      def x(value)
+        fail XOutOfBounds if x_out_of_bounds?(value)
+
+        attributes[:geometry][:x] = value
+      end
+
+      def y(value)
+        fail YOutOfBounds if y_out_of_bounds?(value)
+
+        attributes[:geometry][:y] = value
+      end
+
+      def width(value)
+        fail InvalidWidth if x_out_of_bounds?(value)
+
+        attributes[:geometry][:width] = value
+      end
+
+      def height(value)
+        fail InvalidHeight if y_out_of_bounds?(value)
+
+        attributes[:geometry][:height] = value
+      end
+
+      def centred(value)
+        attributes[:geometry][:centred] = value
+      end
+
+      def attributes
+        @attributes ||= { name: name, geometry: {} }
+      end
+
+      def method_missing(method_name, arg, &block)
+        attributes[method_name] = arg
+      end
+
+      def y_out_of_bounds?(value)
+        value < 1 || value > Terminal.height
+      end
+
+      def x_out_of_bounds?(value)
+        value < 1 || value > Terminal.width
+      end
+    end
+  end
+end

data/lib/vedeu/api/line.rb

@@ -0,0 +1,41 @@
+require 'vedeu/api/base'
+require 'vedeu/api/stream'
+
+module Vedeu
+  module API
+    class Line < Base
+      def build
+        attributes
+      end
+
+      def width(value)
+        #attributes[:streams][:width] = value
+        #attributes[:streams] << API::Stream.build({ width: value })
+      end
+
+      def align(value)
+        attributes[:align] = value
+      end
+
+      def stream(&block)
+        attributes[:streams] << API::Stream.build(&block)
+      end
+
+      def text(value)
+        attributes[:streams] << { text: value }
+      end
+
+      def foreground(value = '', &block)
+        attributes[:streams] << API::Stream.build({ colour: { foreground: value } }, &block)
+      end
+
+      def background(value = '', &block)
+        attributes[:streams] << API::Stream.build({ colour: { background: value } }, &block)
+      end
+
+      def attributes
+        @_attributes ||= { colour: {}, style: [], streams: [] }.merge!(@attributes)
+      end
+    end
+  end
+end

data/lib/vedeu/api/stream.rb

@@ -0,0 +1,19 @@
+require 'vedeu/api/base'
+
+module Vedeu
+  module API
+    class Stream < Base
+      def build
+        attributes
+      end
+
+      def text(value)
+        attributes[:text] = value
+      end
+
+      def attributes
+        @_attributes ||= { colour: {}, style: [], text: '' }.merge!(@attributes)
+      end
+    end
+  end
+end

data/lib/vedeu/api/view.rb

@@ -0,0 +1,39 @@
+require 'vedeu/api/base'
+require 'vedeu/api/line'
+require 'vedeu/support/interface_store'
+
+module Vedeu
+  module API
+    InterfaceNotSpecified = Class.new(StandardError)
+
+    class View
+      def self.build(name = '', &block)
+        new(name).build(&block)
+      end
+
+      def initialize(name = '')
+        fail Vedeu::API::InterfaceNotSpecified if name.nil? || name.empty?
+
+        @name = name.to_s
+      end
+
+      def build(&block)
+        self.instance_eval(&block) if block_given?
+
+        attributes
+      end
+
+      def line(&block)
+        attributes[:lines] << API::Line.build(&block)
+      end
+
+      def attributes
+        @_attributes ||= { name: name, lines: [] }
+      end
+
+      def name
+        return @name if InterfaceStore.query(@name)
+      end
+    end
+  end
+end

data/lib/vedeu/output/menu_parser.rb

@@ -1,11 +1,11 @@
 module Vedeu
   class MenuParser
-    def self.parse(menu)
-      new(menu).parse
+    def self.parse(args)
+      new(args).parse
     end
 
-    def initialize(menu)
-      @menu = menu
+    def initialize(args)
+      @args = args
     end
 
     def parse
@@ -14,7 +14,7 @@ module Vedeu
 
     private
 
-    attr_reader :menu
+    attr_reader :args
 
     def interface
       { name: name, lines: lines }
@@ -41,11 +41,11 @@ module Vedeu
     end
 
     def items
-      menu.last
+      args.last
     end
 
     def name
-      menu.first
+      args.first
     end
   end
 end

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

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+require 'vedeu/api/line'
+require 'vedeu/api/interface'
+require 'vedeu/support/interface_store'
+
+module Vedeu
+  module API
+    describe Base do
+      before do
+        InterfaceStore.reset
+        Interface.save('testing_view') do
+          width  80
+          height 25
+          x      1
+          y      1
+          colour  foreground: '#ffffff', background: '#000000'
+          centred false
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,77 @@
+require 'test_helper'
+require 'vedeu/api/interface'
+
+module Vedeu
+  module API
+    describe Interface do
+      interface = Interface.new('widget')
+
+      it 'creates and stores a new interface' do
+        interface.save.must_be_instance_of(Vedeu::Interface)
+      end
+
+      it 'allows interfaces to share behaviour' do
+        IO.console.stub :winsize, [10, 40] do
+          main =    Interface.save('main') do
+                      colour  foreground: '#ff0000', background: '#000000'
+                      cursor  false
+                      centred true
+                      width   10
+                      height  2
+                    end
+          status =  Interface.save('status') do
+                      colour  foreground: 'aadd00', background: '#4040cc'
+                      cursor  true
+                      centred true
+                      width   10
+                      height  1
+                      y       main.geometry.bottom
+                      x       main.geometry.left
+                    end
+
+          main.geometry.left.must_equal(15)
+          main.geometry.top.must_equal(4)
+          status.geometry.left.must_equal(15)
+          status.geometry.top.must_equal(5)
+        end
+      end
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.save { x 0 } }.must_raise(XOutOfBounds)
+      end
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.save { x 999 } }.must_raise(XOutOfBounds)
+      end
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.save { y 0 } }.must_raise(YOutOfBounds)
+      end
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.save { y 999 } }.must_raise(YOutOfBounds)
+      end
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.save { width 0 } }.must_raise(InvalidWidth)
+      end
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.save { width 999 } }.must_raise(InvalidWidth)
+      end
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.save { height 0 } }.must_raise(InvalidHeight)
+      end
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.save { height 999 } }.must_raise(InvalidHeight)
+      end
+
+      it 'should have a valid spec, please write one.' do
+        skip
+        interface = Interface.new('widget')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+require 'vedeu/api/line'
+require 'vedeu/api/interface'
+require 'vedeu/support/interface_store'
+
+module Vedeu
+  module API
+    describe Line do
+      before do
+        InterfaceStore.reset
+        Interface.save('testing_view') do
+          width  80
+          height 25
+          x      1
+          y      1
+          colour  foreground: '#ffffff', background: '#000000'
+          centred false
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+require 'vedeu/api/line'
+require 'vedeu/api/interface'
+require 'vedeu/support/interface_store'
+
+module Vedeu
+  module API
+    describe Stream do
+      before do
+        InterfaceStore.reset
+        Interface.save('testing_view') do
+          width  80
+          height 25
+          x      1
+          y      1
+          colour  foreground: '#ffffff', background: '#000000'
+          centred false
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,478 @@
+require 'test_helper'
+
+require 'vedeu/api/view'
+require 'vedeu'
+
+module Vedeu
+  module API
+    describe View do
+      before do
+        InterfaceStore.reset
+        Interface.save('testing_view') do
+          width  80
+          height 25
+          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',
+            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',
+            lines: [
+              {
+                colour:  {},
+                style:   [],
+                streams: [{ text: '1. Line without colours.' }]
+              }
+            ]
+          }
+        )
+      end
+
+      it 'handles coloured lines' do
+        Vedeu.view 'testing_view' do
+          line do
+            colour '#ff0000', '#ffff00'
+            text   '2. Line with colours.'
+          end
+        end.must_equal(
+          {
+            name:  'testing_view',
+            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',
+            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',
+            lines: [
+              {
+                colour:  {},
+                style:   [],
+                streams: [{
+                  colour: { foreground: '#ff00ff' },
+                  style:  [],
+                  text:   '4. Line with only foreground set.'
+                }]
+              }
+            ]
+          }
+        )
+      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',
+            lines: [
+              {
+                colour:  {},
+                style:   [],
+                streams: [{
+                  colour: { background: '#00ff00' },
+                  style:  [],
+                  text:   '5. Line with only background set.'
+                }]
+              }
+            ]
+          }
+        )
+      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',
+            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',
+            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',
+            lines: [
+              {
+                colour:  {},
+                style:   [],
+                streams: [{
+                  colour: {},
+                  style:  ['normal'],
+                  text:   '3. Line with a normal style.'
+                }]
+              }
+            ]
+          }
+        )
+      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',
+            lines: [
+              {
+                colour:  {},
+                style:   [],
+                streams: [{
+                  colour: {},
+                  style:  ['underline'],
+                  text:   '4. Line with an underlined style.'
+                }]
+              }
+            ]
+          }
+        )
+      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',
+            lines: [
+              {
+                colour:  {},
+                style:   [],
+                streams: [
+                  {
+                    colour: {},
+                    style:  [],
+                    text:   'A stream of text.'
+                  }
+                ]
+              }
+            ]
+          }
+        )
+      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',
+            lines: [
+              {
+                colour:  {},
+                style:   [],
+                streams: [
+                  {
+                    colour: {},
+                    style:  [],
+                    text:   '1. Two streams of text, these will be'
+                  }, {
+                    colour: {},
+                    style:  [],
+                    text:   ' on the same line- note the space.'
+                  }
+                ]
+              }
+            ]
+          }
+        )
+      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',
+            lines: [
+              {
+                colour: {},
+                style: [],
+                streams: [
+                  {
+                    colour: {},
+                    style: [],
+                    text: '2. Streams can have'
+                  }, {
+                    colour: {
+                      foreground: '#ff0000',
+                      background: '#00ff00'
+                    },
+                    style: [],
+                    text: ' colours too.'
+                  }
+                ]
+              }
+            ]
+          }
+        )
+      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',
+            lines: [
+              {
+                colour: {},
+                style: [],
+                streams: [
+                  {
+                    colour: {},
+                    style: [],
+                    text: '3. Streams can have'
+                  }, {
+                    colour: {},
+                    style: ['underline'],
+                    text: ' styles too.'
+                  }
+                ]
+              }
+            ]
+          }
+        )
+      end
+
+      it 'handles alignment' do
+        skip
+        Vedeu.view 'testing_view' do
+          line do
+            width 80
+            text  'This is aligned left, and padded with spaces.'
+          end
+        end.must_equal(
+          {
+            name:  'testing_view',
+            lines: [{
+              colour:  {},
+              style:   [],
+              streams: [{
+                width: 80,
+                text:  'This is aligned left, and padded with spaces.'
+              }]
+            }]
+          }
+        )
+      end
+
+      it 'handles alignment' do
+        skip
+        Vedeu.view 'testing_view' do
+          line do
+            width 80
+            align :left # explicit
+            text  'This is aligned left, and padded with spaces.'
+          end
+        end.must_equal(
+          {
+            name:  'testing_view',
+            lines: [{
+              streams: [{
+                width: 80,
+                align: :left,
+                text:  'This is aligned left, and padded with spaces.'
+              }]
+            }]
+          }
+        )
+      end
+
+      it 'handles alignment' do
+        skip
+        Vedeu.view 'testing_view' do
+          line do
+            width 80
+            align :centre
+            text  'This is aligned centrally, and padded with spaces.'
+          end
+        end.must_equal(
+          {
+            name:  'testing_view',
+            lines: [{
+              streams: [{
+                width: 80,
+                align: :centre,
+                text:  'This is aligned right, and padded with spaces.'
+              }]
+            }]
+          }
+        )
+      end
+
+      it 'handles alignment' do
+        skip
+        Vedeu.view 'testing_view' do
+          line do
+            width 80
+            align :right
+            text  'This is aligned right, and padded with spaces.'
+          end
+        end.must_equal(
+          {
+            name:  'testing_view',
+            lines: [{
+              streams: [{
+                width: 80,
+                align: :right,
+                text:  'This is aligned right, and padded with spaces.'
+              }]
+            }]
+          }
+        )
+      end
+    end
+  end
+end

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

@@ -1,9 +1,46 @@
 require 'test_helper'
+require 'vedeu/support/menu'
 require 'vedeu/output/menu_parser'
 
 module Vedeu
   describe MenuParser do
     describe '.parse' do
+      it 'returns an interface' do
+        items  = [
+          [false, true,  'Hydrogen'],
+          [true,  false, 'Helium'],
+          [false, false, 'Lithium'],
+          [true,  true,  'Beryllium']
+        ]
+        args   = ['dummy', items]
+        parser = MenuParser.parse(args)
+        parser.must_equal(
+          {
+            interfaces: {
+              name:  'dummy',
+              lines: [
+                {
+                  streams: {
+                    text: ' > Hydrogen'
+                  }
+                }, {
+                  streams: {
+                    text: '*  Helium'
+                  }
+                }, {
+                  streams: {
+                    text: '   Lithium'
+                  }
+                }, {
+                  streams: {
+                    text: '*> Beryllium'
+                  }
+                }
+              ]
+            }
+          }
+        )
+      end
     end
   end
 end

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

@@ -46,6 +46,26 @@ module Vedeu
         })
       end
 
+      it 'returns a Hash when the output is content is a Hash' do
+        RawParser.parse({ dummy: [{ streams: { text: 'Some content' } }] })
+          .must_equal(
+            {
+              interfaces: [
+                {
+                  name:  'dummy',
+                  lines: [
+                    {
+                      streams: {
+                        text: 'Some content'
+                      }
+                    }
+                  ]
+                }
+              ]
+            }
+          )
+      end
+
       it 'returns a Hash when the output is empty' do
         RawParser.parse({}).must_equal({ interfaces: [] })
       end

data/test/lib/vedeu_test.rb

@@ -12,21 +12,21 @@ module Vedeu
     describe '.run' do
     end
 
-    describe '.view' do
-      it 'returns the interface referenced by name' do
-        Vedeu.interface 'Vedeu.view' do
-          width   5
-          height  5
-        end
-
-        Vedeu.view('Vedeu.view').must_be_instance_of(Interface)
-        Vedeu.view('Vedeu.view').name.must_equal('Vedeu.view')
-      end
-
-      it 'raises an exception if the interface does not exist' do
-        proc { Vedeu.view('unknown') }.must_raise(EntityNotFound)
-      end
-    end
+    # describe '.view' do
+    #   it 'returns the interface referenced by name' do
+    #     Vedeu.interface 'Vedeu.view' do
+    #       width   5
+    #       height  5
+    #     end
+
+    #     Vedeu.view('Vedeu.view').must_be_instance_of(Interface)
+    #     Vedeu.view('Vedeu.view').name.must_equal('Vedeu.view')
+    #   end
+
+    #   it 'raises an exception if the interface does not exist' do
+    #     proc { Vedeu.view('unknown') }.must_raise(EntityNotFound)
+    #   end
+    # end
   end
 end
 

data/vedeu.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'vedeu'
-  spec.version       = '0.1.4'
+  spec.version       = '0.1.5'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = %q{A terminal case of wonderland.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,6 +185,11 @@ files:
 - bin/vedeu
 - deps.md
 - lib/vedeu.rb
+- lib/vedeu/api/base.rb
+- lib/vedeu/api/interface.rb
+- lib/vedeu/api/line.rb
+- lib/vedeu/api/stream.rb
+- lib/vedeu/api/view.rb
 - lib/vedeu/application.rb
 - lib/vedeu/configuration.rb
 - lib/vedeu/instrumentation.rb
@@ -214,12 +219,16 @@ files:
 - lib/vedeu/support/helpers.rb
 - lib/vedeu/support/input.rb
 - lib/vedeu/support/interface_store.rb
-- lib/vedeu/support/interface_template.rb
 - lib/vedeu/support/menu.rb
 - lib/vedeu/support/queue.rb
 - lib/vedeu/support/terminal.rb
 - lib/vedeu/support/wordwrap.rb
 - logs/.gitkeep
+- test/lib/vedeu/api/base_test.rb
+- test/lib/vedeu/api/interface_test.rb
+- test/lib/vedeu/api/line_test.rb
+- test/lib/vedeu/api/stream_test.rb
+- test/lib/vedeu/api/view_test.rb
 - test/lib/vedeu/application_test.rb
 - test/lib/vedeu/configuration_test.rb
 - test/lib/vedeu/launcher_test.rb
@@ -248,7 +257,6 @@ files:
 - test/lib/vedeu/support/helpers_test.rb
 - test/lib/vedeu/support/input_test.rb
 - test/lib/vedeu/support/interface_store_test.rb
-- test/lib/vedeu/support/interface_template_test.rb
 - test/lib/vedeu/support/menu_test.rb
 - test/lib/vedeu/support/queue_test.rb
 - test/lib/vedeu/support/terminal_test.rb
@@ -303,6 +311,11 @@ signing_key:
 specification_version: 4
 summary: A terminal case of wonderland.
 test_files:
+- test/lib/vedeu/api/base_test.rb
+- test/lib/vedeu/api/interface_test.rb
+- test/lib/vedeu/api/line_test.rb
+- test/lib/vedeu/api/stream_test.rb
+- test/lib/vedeu/api/view_test.rb
 - test/lib/vedeu/application_test.rb
 - test/lib/vedeu/configuration_test.rb
 - test/lib/vedeu/launcher_test.rb
@@ -331,7 +344,6 @@ test_files:
 - test/lib/vedeu/support/helpers_test.rb
 - test/lib/vedeu/support/input_test.rb
 - test/lib/vedeu/support/interface_store_test.rb
-- test/lib/vedeu/support/interface_template_test.rb
 - test/lib/vedeu/support/menu_test.rb
 - test/lib/vedeu/support/queue_test.rb
 - test/lib/vedeu/support/terminal_test.rb

data/lib/vedeu/support/interface_template.rb

@@ -1,74 +0,0 @@
-require 'vedeu/models/geometry'
-require 'vedeu/support/interface_store'
-require 'vedeu/support/terminal'
-
-module Vedeu
-  InvalidHeight = Class.new(StandardError)
-  InvalidWidth  = Class.new(StandardError)
-  XOutOfBounds  = Class.new(StandardError)
-  YOutOfBounds  = Class.new(StandardError)
-
-  class InterfaceTemplate
-    def self.save(name, &block)
-      new(name).save(&block)
-    end
-
-    def initialize(name)
-      @name = name.to_s
-    end
-
-    def save(&block)
-      self.instance_eval(&block)
-
-      InterfaceStore.create(attributes)
-    end
-
-    def x(value)
-      fail XOutOfBounds if x_out_of_bounds?(value)
-
-      attributes[:geometry][:x] = value
-    end
-
-    def y(value)
-      fail YOutOfBounds if y_out_of_bounds?(value)
-
-      attributes[:geometry][:y] = value
-    end
-
-    def width(value)
-      fail InvalidWidth if x_out_of_bounds?(value)
-
-      attributes[:geometry][:width] = value
-    end
-
-    def height(value)
-      fail InvalidHeight if y_out_of_bounds?(value)
-
-      attributes[:geometry][:height] = value
-    end
-
-    def centred(value)
-      attributes[:geometry][:centred] = value
-    end
-
-    private
-
-    attr_reader :name
-
-    def attributes
-      @attributes ||= { name: name, geometry: {} }
-    end
-
-    def method_missing(method_name, arg, &block)
-      attributes[method_name] = arg
-    end
-
-    def y_out_of_bounds?(value)
-      value < 1 || value > Terminal.height
-    end
-
-    def x_out_of_bounds?(value)
-      value < 1 || value > Terminal.width
-    end
-  end
-end

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

@@ -1,97 +0,0 @@
-require 'test_helper'
-require 'vedeu/support/interface_template'
-
-module Vedeu
-  describe InterfaceTemplate do
-    it 'creates and stores a new interface' do
-      interface = InterfaceTemplate.save('widget') do
-                    colour  foreground: '#ff0000', background: '#5f0000'
-                    cursor  false
-                    width   10
-                    height  2
-                    centred true
-                  end
-      interface.must_be_instance_of(Interface)
-    end
-
-    it 'allows interfaces to share behaviour' do
-      IO.console.stub :winsize, [10, 40] do
-        main =    InterfaceTemplate.save('main') do
-                    colour  foreground: '#ff0000', background: '#000000'
-                    cursor  false
-                    centred true
-                    width   10
-                    height  2
-                  end
-        status =  InterfaceTemplate.save('status') do
-                    colour  foreground: 'aadd00', background: '#4040cc'
-                    cursor  true
-                    centred true
-                    width   10
-                    height  1
-                    y       main.geometry.bottom
-                    x       main.geometry.left
-                  end
-
-        main.geometry.left.must_equal(15)
-        main.geometry.top.must_equal(4)
-        status.geometry.left.must_equal(15)
-        status.geometry.top.must_equal(5)
-      end
-    end
-
-    describe '#x' do
-      interface = InterfaceTemplate.new('widget')
-
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.x(0) }.must_raise(XOutOfBounds)
-      end
-
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.x(999) }.must_raise(XOutOfBounds)
-      end
-    end
-
-    describe '#y' do
-      interface = InterfaceTemplate.new('widget')
-
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.y(0) }.must_raise(YOutOfBounds)
-      end
-
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.y(999) }.must_raise(YOutOfBounds)
-      end
-    end
-
-    describe '#width' do
-      interface = InterfaceTemplate.new('widget')
-
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.width(0) }.must_raise(InvalidWidth)
-      end
-
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.width(999) }.must_raise(InvalidWidth)
-      end
-    end
-
-    describe '#height' do
-      interface = InterfaceTemplate.new('widget')
-
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.height(0) }.must_raise(InvalidHeight)
-      end
-
-      it 'raises an exception when the value is out of bounds' do
-        proc { interface.height(999) }.must_raise(InvalidHeight)
-      end
-    end
-
-    describe '#centred' do
-      it 'should hav a valid spec, please write one.' do
-        skip
-      end
-    end
-  end
-end