vedeu 0.0.39 → 0.0.40

data/lib/vedeu/support/terminal.rb

@@ -1,6 +1,6 @@
 require 'io/console'
 
-require_relative 'esc'
+require 'vedeu/support/esc'
 
 module Vedeu
   module Terminal

data/test/example_app/lib/app.rb

@@ -27,6 +27,27 @@ module Example
     end
   end
 
+  class MenuCommand
+    def self.dispatch
+      @command ||= new
+      @command.dispatch
+    end
+
+    def initialize; end
+
+    def dispatch
+      Vedeu::Parser.parse({ 'example' => render })
+    end
+
+    def render
+      menu.render.map { |item| "#{item}\n" }
+    end
+
+    def menu
+      @_menu ||= Vedeu::Menu.new(['hydrogen', 'carbon', 'nitrogen', 'oxygen'])
+    end
+  end
+
   class App
     include Vedeu
 
@@ -36,7 +57,7 @@ module Example
       colour  foreground: '#ff0000', background: '#000000'
       cursor  false
       width   40
-      height  3
+      height  5
       centred true
     end
 
@@ -58,18 +79,77 @@ module Example
       keypress 't'
     end
 
+    # command 'menu' do
+    #   entity   MenuCommand
+    #   keyword  'menu'
+    #   keypress 'm'
+    # end
+
     command 'exit' do
       entity   Vedeu::Exit
       keyword  'exit'
       keypress 'q'
     end
 
+    event :show_menu do
+      MenuCommand.dispatch
+
+      # Vedeu::Output.render
+    end
+
     event :key do |key|
       case key
-      when 'v' then puts "v was pressed."
-      when :f1 then puts "F1 was pressed."
-      when :f2 then run(:some_event, [:args, :go, :here])
-      when 'x' then run(:_exit_)
+      when "v"        then puts "v was pressed."
+      when :f1        then puts "F1 was pressed."
+      when :f2        then run(:some_event, [:args, :go, :here])
+      when "x"        then run(:_exit_)
+
+      when :up then
+        run(:menu_prev)
+        run(:menu_render)
+        run(:show_menu)
+        run(:refresh)
+
+      when :down then
+        run(:menu_next)
+        run(:menu_render)
+        run(:show_menu)
+        run(:refresh)
+
+      when :page_up then
+        run(:menu_top)
+        run(:menu_render)
+        run(:show_menu)
+        run(:refresh)
+
+      when :page_down then
+        run(:menu_bottom)
+        run(:menu_render)
+        run(:show_menu)
+        run(:refresh)
+
+      when :enter then
+        run(:menu_select)
+        run(:app_select_item, m)
+        run(:menu_render)
+        run(:show_menu)
+        run(:refresh)
+
+      when :backspace then
+        run(:menu_deselect)
+        run(:menu_render)
+        run(:show_menu)
+        run(:refresh)
+
+      when "r" then
+        run(:menu_render)
+        run(:show_menu)
+        run(:refresh)
+
+      when "m" then
+        run(:show_menu)
+        run(:refresh)
+
       else
       end
     end

data/test/lib/vedeu/application_test.rb

@@ -1,5 +1,5 @@
-require_relative '../../test_helper'
-require_relative '../../../lib/vedeu/application'
+require 'test_helper'
+require 'vedeu/application'
 
 module Vedeu
   describe Application do

data/test/lib/vedeu/configuration_test.rb

@@ -1,5 +1,5 @@
-require_relative '../../test_helper'
-require_relative '../../../lib/vedeu/configuration'
+require 'test_helper'
+require 'vedeu/configuration'
 
 module Vedeu
   describe Configuration do

data/test/lib/vedeu/launcher_test.rb

@@ -1,5 +1,5 @@
-require_relative '../../test_helper'
-require_relative '../../../lib/vedeu/launcher'
+require 'test_helper'
+require 'vedeu/launcher'
 
 module Vedeu
   describe Launcher do

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

@@ -1,5 +1,5 @@
-require_relative '../../../../test_helper'
-require_relative '../../../../../lib/vedeu/models/attributes/collection'
+require 'test_helper'
+require 'vedeu/models/attributes/collection'
 
 module Vedeu
   class TestClass

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

@@ -1,11 +1,11 @@
-require_relative '../../../../test_helper'
-require_relative '../../../../../lib/vedeu/models/attributes/interface_collection'
-require_relative '../../../../../lib/vedeu/models/composition'
+require 'test_helper'
+require 'vedeu/models/attributes/interface_collection'
+require 'vedeu/models/composition'
 
 module Vedeu
   describe InterfaceCollection do
     describe '#coerce' do
-      before { InterfaceRepository.reset }
+      before { Persistence.reset }
 
       it 'returns an empty collection when there are no interfaces' do
         composition = Composition.new

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

@@ -1,6 +1,6 @@
-require_relative '../../../../test_helper'
-require_relative '../../../../../lib/vedeu/models/attributes/line_collection'
-require_relative '../../../../../lib/vedeu/models/interface'
+require 'test_helper'
+require 'vedeu/models/attributes/line_collection'
+require 'vedeu/models/interface'
 
 module Vedeu
   describe LineCollection do

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

@@ -1,6 +1,6 @@
-require_relative '../../../../test_helper'
-require_relative '../../../../../lib/vedeu/models/attributes/stream_collection'
-require_relative '../../../../../lib/vedeu/models/line'
+require 'test_helper'
+require 'vedeu/models/attributes/stream_collection'
+require 'vedeu/models/line'
 
 module Vedeu
   describe StreamCollection do

data/test/lib/vedeu/models/colour_test.rb

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/models/colour'
+require 'test_helper'
+require 'vedeu/models/colour'
 
 module Vedeu
   describe Colour do

data/test/lib/vedeu/models/composition_test.rb

@@ -1,6 +1,6 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/models/composition'
-require_relative '../../../../lib/vedeu/repository/interface_repository'
+require 'test_helper'
+require 'vedeu/models/composition'
+require 'vedeu/support/persistence'
 
 module Vedeu
   describe Composition do
@@ -36,13 +36,13 @@ module Vedeu
           ]
         }
 
-        Composition.new(attributes).to_json.must_equal("{\"interfaces\":[{\"colour\":{\"foreground\":\"\#ffff33\",\"background\":\"\#ffff77\"},\"style\":\"\",\"name\":\"Composition#to_json\",\"lines\":[],\"y\":1,\"x\":1,\"z\":1,\"width\":5,\"height\":5,\"cursor\":true}]}")
+        Composition.new(attributes).to_json.must_equal("{\"interfaces\":[{\"colour\":{\"foreground\":\"\#ffff33\",\"background\":\"\#ffff77\"},\"style\":\"\",\"name\":\"Composition#to_json\",\"lines\":[],\"y\":1,\"x\":1,\"width\":5,\"height\":5,\"cursor\":true}]}")
       end
     end
 
     describe '#to_s' do
       it 'returns the stringified content for a single interface, single line, single stream' do
-        InterfaceRepository.create({ name: 'int1_lin1_str1', y: 3, x: 3, width: 10, height: 3 })
+        Persistence.create({ name: 'int1_lin1_str1', y: 3, x: 3, width: 10, height: 3 })
         json = File.read('test/support/json/int1_lin1_str1.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -55,7 +55,7 @@ module Vedeu
       end
 
       it 'returns the stringified content for a single interface, single line, multiple streams' do
-        InterfaceRepository.create({ name: 'int1_lin1_str3', y: 3, x: 3, width: 10, height: 3 })
+        Persistence.create({ name: 'int1_lin1_str3', y: 3, x: 3, width: 10, height: 3 })
         json = File.read('test/support/json/int1_lin1_str3.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -68,7 +68,7 @@ module Vedeu
       end
 
       it 'returns the stringified content for a single interface, multiple lines, single stream' do
-        InterfaceRepository.create({ name: 'int1_lin2_str1', y: 3, x: 3, width: 10, height: 3 })
+        Persistence.create({ name: 'int1_lin2_str1', y: 3, x: 3, width: 10, height: 3 })
         json = File.read('test/support/json/int1_lin2_str1.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -82,7 +82,7 @@ module Vedeu
       end
 
       it 'returns the stringified content for a single interface, multiple lines, multiple streams' do
-        InterfaceRepository.create({ name: 'int1_lin2_str3', y: 3, x: 3, width: 10, height: 3 })
+        Persistence.create({ name: 'int1_lin2_str3', y: 3, x: 3, width: 10, height: 3 })
         json = File.read('test/support/json/int1_lin2_str3.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -98,7 +98,7 @@ module Vedeu
       it 'returns the stringified content for a single interface, multiple lines, multiple streams, streams contain styles' do
         json = File.read('test/support/json/int1_lin2_str3_styles.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
-        InterfaceRepository.create({ name: 'int1_lin2_str3_styles', y: 3, x: 3, width: 10, height: 3 })
+        Persistence.create({ name: 'int1_lin2_str3_styles', y: 3, x: 3, width: 10, height: 3 })
 
         Composition.new(attributes).to_s.must_equal(
           "\e[3;3H          \e[3;3H" \
@@ -109,8 +109,8 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, single line, single stream' do
-        InterfaceRepository.create({ name: 'int2_lin1_str1_1', y: 3, x: 3, width: 10, height: 3 })
-        InterfaceRepository.create({ name: 'int2_lin1_str1_2', y: 6, x: 6, width: 10, height: 3 })
+        Persistence.create({ name: 'int2_lin1_str1_1', y: 3, x: 3, width: 10, height: 3 })
+        Persistence.create({ name: 'int2_lin1_str1_2', y: 6, x: 6, width: 10, height: 3 })
         json = File.read('test/support/json/int2_lin1_str1.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -127,8 +127,8 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, single line, multiple streams' do
-        InterfaceRepository.create({ name: 'int2_lin1_str3_1', y: 3, x: 3, width: 10, height: 3 })
-        InterfaceRepository.create({ name: 'int2_lin1_str3_2', y: 6, x: 6, width: 10, height: 3 })
+        Persistence.create({ name: 'int2_lin1_str3_1', y: 3, x: 3, width: 10, height: 3 })
+        Persistence.create({ name: 'int2_lin1_str3_2', y: 6, x: 6, width: 10, height: 3 })
         json = File.read('test/support/json/int2_lin1_str3.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -145,8 +145,8 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, multiple lines, single stream' do
-        InterfaceRepository.create({ name: 'int2_lin2_str1_1', y: 3, x: 3, width: 10, height: 3 })
-        InterfaceRepository.create({ name: 'int2_lin2_str1_2', y: 6, x: 6, width: 10, height: 3 })
+        Persistence.create({ name: 'int2_lin2_str1_1', y: 3, x: 3, width: 10, height: 3 })
+        Persistence.create({ name: 'int2_lin2_str1_2', y: 6, x: 6, width: 10, height: 3 })
         json = File.read('test/support/json/int2_lin2_str1.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -165,8 +165,8 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, multiple lines, multiple streams' do
-        InterfaceRepository.create({ name: 'int2_lin2_str3_1', y: 3, x: 3, width: 10, height: 3 })
-        InterfaceRepository.create({ name: 'int2_lin2_str3_2', y: 6, x: 6, width: 10, height: 3 })
+        Persistence.create({ name: 'int2_lin2_str3_1', y: 3, x: 3, width: 10, height: 3 })
+        Persistence.create({ name: 'int2_lin2_str3_2', y: 6, x: 6, width: 10, height: 3 })
         json = File.read('test/support/json/int2_lin2_str3.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 
@@ -185,8 +185,8 @@ module Vedeu
       end
 
       it 'returns the stringified content for multiple interfaces, multiple lines, multiple streams, streams contain styles' do
-        InterfaceRepository.create({ name: 'int2_lin2_str3_styles_1', y: 3, x: 3, width: 10, height: 3 })
-        InterfaceRepository.create({ name: 'int2_lin2_str3_styles_2', y: 6, x: 6, width: 10, height: 3 })
+        Persistence.create({ name: 'int2_lin2_str3_styles_1', y: 3, x: 3, width: 10, height: 3 })
+        Persistence.create({ name: 'int2_lin2_str3_styles_2', y: 6, x: 6, width: 10, height: 3 })
         json = File.read('test/support/json/int2_lin2_str3_styles.json')
         attributes = JSON.load(json, nil, symbolize_names: true)
 

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

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/models/interface'
+require 'test_helper'
+require 'vedeu/models/interface'
 
 module Vedeu
   describe Interface do
@@ -13,7 +13,6 @@ module Vedeu
         },
         y: 3,
         x: 5,
-        z: 2,
         width: 10,
         height: 15,
         current: "\e[1;1H#initialize"
@@ -42,11 +41,6 @@ module Vedeu
       Interface.new.x.must_equal(1)
     end
 
-    it 'has a z attribute' do
-      interface.z.must_equal(2)
-      Interface.new.z.must_equal(1)
-    end
-
     it 'has a width attribute' do
       interface.width.must_equal(10)
     end
@@ -71,7 +65,19 @@ module Vedeu
 
     describe '#enqueue' do
       it 'delegates to the Queue class to enqueue itself' do
-        skip
+        Queue.reset
+        interface = Interface.new({
+          name:   'Interface#enqueue',
+          width:  5,
+          height: 2,
+          lines:  [ { streams: { text: 'a8f39' } } ]
+        })
+        interface.enqueue
+        interface.dequeue.must_equal(
+          "\e[1;1H     \e[1;1H" \
+          "\e[2;1H     \e[2;1H" \
+          "\e[1;1Ha8f39"
+        )
       end
     end
 
@@ -112,12 +118,14 @@ module Vedeu
       }
 
       it 'returns a blank interface when there is no content to display (initial state)' do
-        Interface.new(attributes).refresh.must_equal(
-          "\e[38;5;196m\e[48;5;16m" \
-          "\e[1;1H   \e[1;1H" \
-          "\e[2;1H   \e[2;1H" \
-          "\e[3;1H   \e[3;1H"
-        )
+        Terminal.stub(:output, nil) do
+          Interface.new(attributes).refresh.must_equal(
+            "\e[38;5;196m\e[48;5;16m" \
+            "\e[1;1H   \e[1;1H" \
+            "\e[2;1H   \e[2;1H" \
+            "\e[3;1H   \e[3;1H"
+          )
+        end
       end
 
       it 'returns the fresh content when content is queued up to be displayed' do
@@ -138,15 +146,17 @@ module Vedeu
         interface = Interface.new(attributes)
         interface.enqueue
 
-        interface.refresh.must_equal(
-          "\e[38;5;196m\e[48;5;16m" \
-          "\e[1;1H        \e[1;1H" \
-          "\e[2;1H        \e[2;1H" \
-          "\e[3;1H        \e[3;1H" \
-          "\e[1;1H#refresh" \
-          "\e[2;1H#refresh" \
-          "\e[3;1H#refresh"
-        )
+        Terminal.stub(:output, nil) do
+          interface.refresh.must_equal(
+            "\e[38;5;196m\e[48;5;16m" \
+            "\e[1;1H        \e[1;1H" \
+            "\e[2;1H        \e[2;1H" \
+            "\e[3;1H        \e[3;1H" \
+            "\e[1;1H#refresh" \
+            "\e[2;1H#refresh" \
+            "\e[3;1H#refresh"
+          )
+        end
       end
 
       it 'returns the previously shown content when there is stale content from last run' do
@@ -169,15 +179,17 @@ module Vedeu
                             "\e[2;1H#refresh" \
                             "\e[3;1H#refresh"
 
-        interface.refresh.must_equal(
-          "\e[38;5;196m\e[48;5;16m" \
-          "\e[1;1H        \e[1;1H" \
-          "\e[2;1H        \e[2;1H" \
-          "\e[3;1H        \e[3;1H" \
-          "\e[1;1H#refresh" \
-          "\e[2;1H#refresh" \
-          "\e[3;1H#refresh"
-        )
+        Terminal.stub(:output, nil) do
+          interface.refresh.must_equal(
+            "\e[38;5;196m\e[48;5;16m" \
+            "\e[1;1H        \e[1;1H" \
+            "\e[2;1H        \e[2;1H" \
+            "\e[3;1H        \e[3;1H" \
+            "\e[1;1H#refresh" \
+            "\e[2;1H#refresh" \
+            "\e[3;1H#refresh"
+          )
+        end
       end
     end
 
@@ -212,7 +224,7 @@ module Vedeu
           },
           width:  3,
           height: 3
-        }).to_json.must_equal("{\"colour\":{\"foreground\":\"#ff0000\",\"background\":\"#000000\"},\"style\":\"\",\"name\":\"#to_json\",\"lines\":[],\"y\":1,\"x\":1,\"z\":1,\"width\":3,\"height\":3,\"cursor\":true}")
+        }).to_json.must_equal("{\"colour\":{\"foreground\":\"#ff0000\",\"background\":\"#000000\"},\"style\":\"\",\"name\":\"#to_json\",\"lines\":[],\"y\":1,\"x\":1,\"width\":3,\"height\":3,\"cursor\":true}")
       end
     end
   end