vedeu 0.1.7 → 0.1.8

data/lib/vedeu/output/{render_interface.rb → render.rb}

@@ -2,7 +2,7 @@ require 'vedeu/models/line'
 require 'vedeu/models/stream'
 
 module Vedeu
-  class RenderInterface
+  class Render
     def self.call(interface)
       new(interface).render
     end
@@ -15,7 +15,7 @@ module Vedeu
       out = [interface.clear]
       processed_lines.each_with_index do |line, index|
         if index + 1 <= height
-          out << interface.geometry.origin(index)
+          out << interface.origin(index)
           out << line.to_s
         end
       end
@@ -62,11 +62,11 @@ module Vedeu
     end
 
     def height
-      interface.geometry.height
+      interface.height
     end
 
     def width
-      interface.geometry.width
+      interface.width
     end
   end
 end

data/lib/vedeu/support/esc.rb

@@ -17,9 +17,12 @@ module Vedeu
       when 'bold'          then "\e[1m"
       when 'bold_off'      then "\e[21m"
       when 'clear'         then "\e[38;2;39m\e[48;2;49m\e[2J"
+      when 'clear_line'    then "\e[38;2;39m\e[48;2;49m\e[2K"
       when 'colour_reset'  then "\e[38;2;39m\e[48;2;49m"
       when 'fg_reset'      then "\e[38;2;39m"
       when 'hide_cursor'   then "\e[?25l"
+      when 'screen_init'   then "\e[0m\e[38;2;39m\e[48;2;49m\e[2J\e[?25l"
+      when 'screen_exit'   then "\e[?25h\e[38;2;39m\e[48;2;49m\e[0m"
       when 'negative'      then "\e[7m"
       when 'positive'      then "\e[27m"
       when 'reset'         then "\e[0m"

data/lib/vedeu/support/menu.rb

@@ -1,5 +1,5 @@
 require 'vedeu'
-require 'vedeu/support/events'
+require 'vedeu/api/events'
 
 # Todo: mutation (events, menu)
 

data/lib/vedeu/support/terminal.rb

@@ -5,7 +5,7 @@ require 'vedeu/support/esc'
 module Vedeu
   module Terminal
     extend self
-    # :nocov:
+
     def open(mode, &block)
       @mode = mode
 
@@ -36,7 +36,6 @@ module Vedeu
 
       end
     end
-    # :nocov:
 
     def output(stream = '')
       console.print(stream)
@@ -44,18 +43,14 @@ module Vedeu
       stream
     end
 
-    # :nocov:
     def initialize_screen(&block)
-      output Esc.string 'reset'
-      output Esc.string 'clear'
-      output Esc.string 'hide_cursor'
+      output Esc.string 'screen_init'
 
       yield
     end
 
     def restore_screen
-      output Esc.string 'show_cursor'
-      output Esc.string 'reset'
+      output Esc.string 'screen_exit'
       output clear_last_line
     end
 
@@ -66,10 +61,9 @@ module Vedeu
     def raw_mode?
       @mode == :raw
     end
-    # :nocov:
 
     def clear_last_line
-      Esc.set_position((height - 1), 1) + "\e[2K"
+      Esc.set_position((height - 1), 1) + Esc.string('clear_line')
     end
 
     def centre

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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 require 'vedeu/api/line'
 require 'vedeu/api/interface'
-require 'vedeu/support/interface_store'
+require 'vedeu/api/store'
 
 module Vedeu
   module API

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

@@ -0,0 +1,37 @@
+require 'test_helper'
+require 'vedeu/api/events'
+
+module Vedeu
+  module API
+    describe Events do
+      describe '#on' do
+        it 'adds the event block to the handlers' do
+          skip
+          events = Events.new
+          events.on(:some_event) { proc { |x| x } }
+        end
+
+        it 'adds the specified throttle to the throttles' do
+          skip
+          events = Events.new
+          events.on(:some_event, 250) { proc { |x| x } }
+        end
+      end
+
+      describe '#trigger' do
+        it 'returns a collection containing the event when the event is ' \
+           'pre-registered' do
+          events = Events.new do
+            on(:_exit_) { fail StopIteration }
+          end
+          proc { events.trigger(:_exit_) }.must_raise(StopIteration)
+        end
+
+        it 'returns an empty collection when the event has not been registered' do
+          events = Events.new
+          events.trigger(:_not_found_).must_be_empty
+        end
+      end
+    end
+  end
+end

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

@@ -15,17 +15,19 @@ end
 module Vedeu
   module API
     describe Grid do
-      it 'raises an exception if the value is less than 1' do
-        proc { Grid.columns(0) }.must_raise(OutOfRange)
-      end
+      describe '.columns' do
+        it 'raises an exception if the value is less than 1' do
+          proc { Grid.columns(0) }.must_raise(OutOfRange)
+        end
 
-      it 'raises an exception if the value is greater than 12' do
-        proc { Grid.columns(13) }.must_raise(OutOfRange)
-      end
+        it 'raises an exception if the value is greater than 12' do
+          proc { Grid.columns(13) }.must_raise(OutOfRange)
+        end
 
-      it 'returns the width if the value is in range' do
-        IO.console.stub :winsize, [25, 80] do
-          Grid.columns(7).must_equal(42)
+        it 'returns the width if the value is in range' do
+          IO.console.stub :winsize, [25, 80] do
+            Grid.columns(7).must_equal(42)
+          end
         end
       end
     end

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

@@ -4,6 +4,8 @@ require 'vedeu/api/interface'
 module Vedeu
   module API
     describe Interface do
+      before { API::Store.reset }
+
       interface = Interface.new('widget')
 
       it 'creates and stores a new interface' do
@@ -12,27 +14,27 @@ module Vedeu
 
       it 'allows interfaces to share behaviour' do
         IO.console.stub :winsize, [10, 40] do
-          main =    Interface.save('main') do
+          main =    Vedeu.interface('main') do
                       colour  foreground: '#ff0000', background: '#000000'
                       cursor  false
                       centred true
                       width   10
                       height  2
                     end
-          status =  Interface.save('status') do
+          status =  Vedeu.interface('status') do
                       colour  foreground: 'aadd00', background: '#4040cc'
                       cursor  true
                       centred true
                       width   10
                       height  1
-                      y       main.geometry.bottom
-                      x       main.geometry.left
+                      y       use('main').bottom
+                      x       use('main').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)
+          main.left.must_equal(15)
+          main.top.must_equal(4)
+          status.left.must_equal(15)
+          status.top.must_equal(5)
         end
       end
 
@@ -67,11 +69,6 @@ module Vedeu
       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

@@ -1,8 +1,6 @@
 require 'test_helper'
 
 require 'vedeu/api/line'
-require 'vedeu/api/interface'
-require 'vedeu/support/interface_store'
 
 module Vedeu
   module API

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

@@ -0,0 +1,49 @@
+require 'test_helper'
+require 'vedeu/api/store'
+
+module Vedeu
+  module API
+    describe Store do
+      before { Store.reset }
+
+      describe '#create' do
+        it 'creates and returns the stored record' do
+          attributes = { name: 'sulphur' }
+
+          Store.create(attributes).must_equal({ name: 'sulphur' })
+        end
+      end
+
+      describe '#query' do
+        before do
+          Store.reset
+          Vedeu.interface('chlorine')
+        end
+
+        it 'returns the record when found' do
+          Store.query('chlorine').must_equal({ name: 'chlorine', geometry: {} })
+        end
+
+        it 'raises an exception when name is empty' do
+          proc { Store.query('') }.must_raise(EntityNotFound)
+        end
+
+        it 'raises an exception when name is nil' do
+          proc { Store.query(nil) }.must_raise(EntityNotFound)
+        end
+
+        it 'raises an exception when the record cannot be found' do
+          proc { Store.query('dummy') }.must_raise(EntityNotFound)
+        end
+      end
+
+      describe '#reset' do
+        it 'deletes all records stored' do
+          Vedeu.interface('potassium')
+
+          Store.reset.must_equal({})
+        end
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 require 'vedeu/api/line'
 require 'vedeu/api/interface'
-require 'vedeu/support/interface_store'
+require 'vedeu/api/store'
 
 module Vedeu
   module API

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

@@ -7,7 +7,7 @@ module Vedeu
   module API
     describe View do
       before do
-        InterfaceStore.reset
+        Store.reset
         Interface.save('testing_view') do
           x      1
           y      1

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

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+require 'vedeu/models/attributes/background'
+
+module Vedeu
+  describe Background do
+  end
+end

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

@@ -0,0 +1,78 @@
+require 'test_helper'
+require 'vedeu/models/attributes/colour_translator'
+
+module Vedeu
+  describe ColourTranslator do
+    describe '#background' do
+      {
+        '#5f0000' => "\e[48;5;52m",
+        '#008700' => "\e[48;5;28m",
+        '#0000d7' => "\e[48;5;20m",
+        '#afafaf' => "\e[48;5;145m",
+        '#afd700' => "\e[48;5;148m",
+        '#af005f' => "\e[48;5;125m",
+      }.map do |html_colour, terminal_colour|
+        it 'translation is performed' do
+          ColourTranslator.new(html_colour).background
+            .must_equal(terminal_colour)
+        end
+      end
+
+      it 'returns empty string when not present' do
+        ColourTranslator.new.background.must_equal('')
+      end
+
+      it 'returns empty string when the wrong type!' do
+        ColourTranslator.new(:wrong_type).background.must_equal('')
+      end
+
+      it 'returns empty string when invalid format' do
+        ColourTranslator.new('345678').background.must_equal('')
+      end
+
+      it 'returns empty string when invalid format' do
+        ColourTranslator.new('#h11111').background.must_equal('')
+      end
+
+      it 'returns empty string when invalid format' do
+        ColourTranslator.new('#1111').background.must_equal('')
+      end
+    end
+
+    describe '#foreground' do
+      {
+        '#5f0000' => "\e[38;5;52m",
+        '#008700' => "\e[38;5;28m",
+        '#0000d7' => "\e[38;5;20m",
+        '#afafaf' => "\e[38;5;145m",
+        '#afd700' => "\e[38;5;148m",
+        '#af005f' => "\e[38;5;125m",
+      }.map do |html_colour, terminal_colour|
+        it 'translation is performed' do
+          ColourTranslator.new(html_colour).foreground
+            .must_equal(terminal_colour)
+        end
+      end
+
+      it 'returns empty string when not present' do
+        ColourTranslator.new.foreground.must_equal('')
+      end
+
+      it 'returns empty string when the wrong type!' do
+        ColourTranslator.new(:wrong_type).foreground.must_equal('')
+      end
+
+      it 'returns empty string when invalid format' do
+        ColourTranslator.new('345678').foreground.must_equal('')
+      end
+
+      it 'returns empty string when invalid format' do
+        ColourTranslator.new('#h11111').foreground.must_equal('')
+      end
+
+      it 'returns empty string when invalid format' do
+        ColourTranslator.new('#1111').foreground.must_equal('')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+require 'vedeu/models/attributes/foreground'
+
+module Vedeu
+  describe Foreground do
+  end
+end

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

@@ -1,11 +1,14 @@
 require 'test_helper'
+
 require 'vedeu/models/composition'
 require 'vedeu/models/attributes/interface_collection'
+require 'vedeu/api/store'
+
 
 module Vedeu
   describe InterfaceCollection do
     describe '#coerce' do
-      before { InterfaceStore.reset }
+      before { API::Store.reset }
 
       it 'returns an empty collection when there are no interfaces' do
         composition = Composition.new
@@ -13,15 +16,28 @@ module Vedeu
       end
 
       it 'returns a collection when there is a single interface' do
-        composition = Composition.new({ interfaces: { name: 'InterfaceCollection#coerce' } })
+        Vedeu.interface('dumb') {}
+
+        composition = Composition.new(
+          {
+            interfaces: { name: 'dumb' }
+          }
+        )
         composition.interfaces.first.must_be_instance_of(Interface)
       end
 
       it 'returns a collection when there are multiple interfaces' do
-        composition = Composition.new({ interfaces: [
-          { name: 'dumb' },
-          { name: 'dumber' }
-        ]})
+        Vedeu.interface('dumb')   {}
+        Vedeu.interface('dumber') {}
+
+        composition = Composition.new(
+          {
+            interfaces: [
+              { name: 'dumb' },
+              { name: 'dumber' }
+            ]
+          }
+        )
         composition.interfaces.size.must_equal(2)
       end
     end