vedeu 0.0.39 → 0.0.40

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

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

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

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/models/presentation'
+require 'test_helper'
+require 'vedeu/models/presentation'
 
 module Vedeu
   class TestPresentation

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

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

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

@@ -1,6 +1,6 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/models/presentation'
-require_relative '../../../../lib/vedeu/models/style'
+require 'test_helper'
+require 'vedeu/models/presentation'
+require 'vedeu/models/style'
 
 module Vedeu
   class TestStyle
@@ -11,75 +11,75 @@ module Vedeu
   describe Style do
     describe '#style' do
       it 'returns an escape sequence for a single style' do
-        test_style = TestStyle.new(style: 'normal')
-        test_style.style.must_equal("\e[24m\e[21m\e[27m")
+        model = TestStyle.new(style: 'normal')
+        model.style.must_equal("\e[24m\e[21m\e[27m")
       end
 
       it 'returns an escape sequence for multiple styles' do
-        test_style = TestStyle.new(style: ['normal', 'underline'])
-        test_style.style.must_equal("\e[24m\e[21m\e[27m\e[4m")
+        model = TestStyle.new(style: ['normal', 'underline'])
+        model.style.must_equal("\e[24m\e[21m\e[27m\e[4m")
       end
 
       it 'returns an empty string for an unknown style' do
-        test_style = TestStyle.new(style: 'unknown')
-        test_style.style.must_equal('')
+        model = TestStyle.new(style: 'unknown')
+        model.style.must_equal('')
       end
 
       it 'has a style attribute' do
-        test_style = TestStyle.new(style: ['normal'])
-        test_style.style.must_equal("\e[24m\e[21m\e[27m")
+        model = TestStyle.new(style: ['normal'])
+        model.style.must_equal("\e[24m\e[21m\e[27m")
       end
 
       it 'returns an empty string for empty or nil' do
-        test_style = TestStyle.new(style: '')
-        test_style.style.must_equal('')
+        model = TestStyle.new(style: '')
+        model.style.must_equal('')
       end
 
       it 'returns an empty string for empty or nil' do
-        test_style = TestStyle.new(style: nil)
-        test_style.style.must_equal('')
+        model = TestStyle.new(style: nil)
+        model.style.must_equal('')
       end
 
       it 'returns an empty string for empty or nil' do
-        test_style = TestStyle.new(style: [])
-        test_style.style.must_equal('')
+        model = TestStyle.new(style: [])
+        model.style.must_equal('')
       end
     end
 
     describe '#style_original' do
       it 'returns an escape sequence for a single style' do
-        test_style = TestStyle.new(style: 'normal')
-        test_style.style_original.must_equal(['normal'])
+        model = TestStyle.new(style: 'normal')
+        model.style_original.must_equal(['normal'])
       end
 
       it 'returns an escape sequence for multiple styles' do
-        test_style = TestStyle.new(style: ['normal', 'underline'])
-        test_style.style_original.must_equal(['normal', 'underline'])
+        model = TestStyle.new(style: ['normal', 'underline'])
+        model.style_original.must_equal(['normal', 'underline'])
       end
 
       it 'returns an empty string for an unknown style' do
-        test_style = TestStyle.new(style: 'unknown')
-        test_style.style_original.must_equal(['unknown'])
+        model = TestStyle.new(style: 'unknown')
+        model.style_original.must_equal(['unknown'])
       end
 
       it 'has a style attribute' do
-        test_style = TestStyle.new(style: ['normal'])
-        test_style.style_original.must_equal(['normal'])
+        model = TestStyle.new(style: ['normal'])
+        model.style_original.must_equal(['normal'])
       end
 
       it 'returns an empty string for empty or nil' do
-        test_style = TestStyle.new(style: '')
-        test_style.style_original.must_equal([''])
+        model = TestStyle.new(style: '')
+        model.style_original.must_equal([''])
       end
 
       it 'returns an empty string for empty or nil' do
-        test_style = TestStyle.new(style: nil)
-        test_style.style_original.must_equal('')
+        model = TestStyle.new(style: nil)
+        model.style_original.must_equal('')
       end
 
       it 'returns an empty string for empty or nil' do
-        test_style = TestStyle.new(style: [])
-        test_style.style_original.must_equal('')
+        model = TestStyle.new(style: [])
+        model.style_original.must_equal('')
       end
     end
   end

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

@@ -1,11 +1,11 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/repository/interface_repository'
-require_relative '../../../../lib/vedeu/output/clear_interface'
-require_relative '../../../../lib/vedeu/models/interface'
+require 'test_helper'
+require 'vedeu/output/clear_interface'
+require 'vedeu/models/interface'
+require 'vedeu/support/persistence'
 
 module Vedeu
   describe ClearInterface do
-    before { InterfaceRepository.reset }
+    before { Persistence.reset }
 
     describe '.call' do
       it 'returns the escape sequence to clear the whole interface' do

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

@@ -1,12 +1,11 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/repository/interface_repository'
-require_relative '../../../../lib/vedeu/output/clear_interface'
-require_relative '../../../../lib/vedeu/output/render_interface'
-require_relative '../../../../lib/vedeu/models/interface'
+require 'test_helper'
+require 'vedeu/output/render_interface'
+require 'vedeu/models/interface'
+require 'vedeu/support/persistence'
 
 module Vedeu
   describe RenderInterface do
-    before { InterfaceRepository.reset }
+    before { Persistence.reset }
 
     describe '.call' do
       it 'returns the content for the interface' do

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

@@ -1,4 +1,5 @@
-require_relative '../../../test_helper'
+require 'test_helper'
+require 'vedeu/output/template'
 
 module Vedeu
   describe Template do

data/test/lib/vedeu/{support → parsing}/compositor_test.rb

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/support/compositor'
+require 'test_helper'
+require 'vedeu/parsing/compositor'
 
 module Vedeu
   describe Compositor do
@@ -30,9 +30,11 @@ module Vedeu
         }
 
         Compositor.enqueue(attributes)
-        InterfaceRepository.query(:name, 'Compositor.enqueue_1').dequeue
+        Persistence
+          .query('Compositor.enqueue_1').dequeue
           .must_match(/bd459118e6175689e4394e242debc2ae/)
-        InterfaceRepository.query(:name, 'Compositor.enqueue_2').dequeue
+        Persistence
+          .query('Compositor.enqueue_2').dequeue
           .must_match(/837acb2cb2ea3ef359257851142a7830/)
       end
     end

data/test/lib/vedeu/parsing/hash_parser_test.rb

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/parsing/hash_parser'
+require 'test_helper'
+require 'vedeu/parsing/hash_parser'
 
 module Vedeu
   describe HashParser do

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

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/parsing/json_parser'
+require 'test_helper'
+require 'vedeu/parsing/json_parser'
 
 module Vedeu
   describe JSONParser do

data/test/lib/vedeu/parsing/parser_test.rb

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/parsing/parser'
+require 'test_helper'
+require 'vedeu/parsing/parser'
 
 module Vedeu
   describe Parser do
@@ -9,10 +9,11 @@ module Vedeu
       end
 
       it 'returns a Composition when the output is JSON' do
-        skip('This is not working as it should...')
+        file   = File.read('test/support/json/int1_lin1_str1.json')
+        parser = Parser.parse(file)
 
-        Parser.parse("{\"some\": \"JSON\"}")
-          .must_be_instance_of(Composition)
+        parser.must_be_instance_of(Array)
+        parser.size.must_equal(1)
       end
 
       it 'returns a collection of interfaces when the output is a Hash' do

data/test/lib/vedeu/parsing/text_adaptor_test.rb

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/parsing/text_adaptor'
+require 'test_helper'
+require 'vedeu/parsing/text_adaptor'
 
 module Vedeu
   describe TextAdaptor do

data/test/lib/vedeu/{models/builders/interface_builder_test.rb → support/builder_test.rb}

@@ -1,10 +1,10 @@
-require_relative '../../../../test_helper'
-require_relative '../../../../../lib/vedeu/models/builders/interface_builder'
+require 'test_helper'
+require 'vedeu/support/builder'
 
 module Vedeu
-  describe InterfaceBuilder do
+  describe Builder do
     it 'creates and stores a new interface' do
-      interface = InterfaceBuilder.build('widget') do
+      interface = Builder.build('widget') do
                     colour  foreground: '#ff0000', background: '#5f0000'
                     cursor  false
                     width   10
@@ -16,7 +16,7 @@ module Vedeu
 
     it 'overrides x and y when centred is true' do
       IO.console.stub :winsize, [10, 40] do
-        interface = InterfaceBuilder.build('widget') do
+        interface = Builder.build('widget') do
                       colour  foreground: '#ff0000', background: '#5f0000'
                       cursor  false
                       centred true
@@ -25,13 +25,13 @@ module Vedeu
                       x       5
                       y       5
                     end
-      interface.x.must_equal(15)
-      interface.y.must_equal(4)
+        interface.x.must_equal(15)
+        interface.y.must_equal(4)
       end
     end
 
     it 'uses x and y when centred is false' do
-      interface = InterfaceBuilder.build('widget') do
+      interface = Builder.build('widget') do
                     colour  foreground: '#ff0000', background: '#5f0000'
                     cursor  false
                     centred false
@@ -46,14 +46,14 @@ module Vedeu
 
     it 'allows interfaces to share behaviour' do
       IO.console.stub :winsize, [10, 40] do
-        main =    InterfaceBuilder.build('main') do
+        main =    Builder.build('main') do
                     colour  foreground: '#ff0000', background: '#000000'
                     cursor  false
                     centred true
                     width   10
                     height  2
                   end
-        status =  InterfaceBuilder.build('status') do
+        status =  Builder.build('status') do
                     colour  foreground: 'aadd00', background: '#4040cc'
                     cursor  true
                     centred true

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

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/support/esc'
+require 'test_helper'
+require 'vedeu/support/esc'
 
 module Vedeu
   describe Esc do

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

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/support/events'
+require 'test_helper'
+require 'vedeu/support/events'
 
 module Vedeu
   describe Events do

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

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/support/geometry'
+require 'test_helper'
+require 'vedeu/support/geometry'
 
 module Vedeu
   describe Geometry do

data/test/lib/vedeu/{input → support}/input_test.rb

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/input/input'
+require 'test_helper'
+require 'vedeu/support/input'
 
 module Vedeu
   describe Input do
@@ -37,17 +37,16 @@ module Vedeu
       }
 
       keypresses.each do |keypress, value|
-        it 'enqueues the captured input from the terminal' do
-          Queue.reset
+        it 'triggers a :key event with the key pressed' do
           Terminal.stub :input, keypress do
-            Input.capture
-            Queue.entries.must_equal([value])
+            Vedeu.stub :trigger, value do
+              Input.capture.must_equal(value)
+            end
           end
         end
       end
 
       it 'switches the terminal mode when escape is pressed' do
-        Queue.reset
         Terminal.stub :input, "\e" do
           proc { Input.capture }.must_raise(ModeSwitch)
         end

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

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/support/menu'
+require 'test_helper'
+require 'vedeu/support/menu'
 
 module Vedeu
   describe Menu do

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

@@ -0,0 +1,55 @@
+require 'test_helper'
+require 'vedeu/support/persistence'
+
+module Vedeu
+  describe Persistence do
+    before { Persistence.reset }
+
+    describe '.update' do
+      it 'returns an Interface' do
+        Persistence.update('dummy', { name: 'dumber' })
+          .must_be_instance_of(Interface)
+      end
+
+      it 'updates and returns the existing interface when the interface exists' do
+        Persistence.update('dummy', { name: 'dumber' }).name
+          .must_equal('dumber')
+      end
+
+      it 'returns a new interface when the interface does not exist' do
+        Persistence.update('dummy', { name: 'dumber' }).name
+          .must_equal('dumber')
+      end
+    end
+
+    describe '#create' do
+      it 'creates and returns the stored record' do
+        Persistence.create({ name: 'dummy' })
+          .must_be_instance_of(Interface)
+      end
+    end
+
+    describe '#query' do
+      it 'returns false if the value is not provided' do
+        Persistence.query(nil).must_equal(false)
+      end
+
+      it 'returns the record if found' do
+        Persistence.create({ name: 'hydrogen' })
+
+        Persistence.query('hydrogen').name.must_equal('hydrogen')
+      end
+
+      it 'raises an exception when the record cannot be found' do
+        proc { Persistence.query('dummy') }.must_raise(EntityNotFound)
+      end
+    end
+
+    describe '#reset' do
+      it 'deletes all records stored' do
+        Persistence.create({ name: 'dumb' })
+        Persistence.reset.must_equal({})
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/support/queue'
+require 'test_helper'
+require 'vedeu/support/queue'
 
 module Vedeu
   describe Queue do