vedeu 0.5.4 → 0.5.5

data/test/lib/vedeu/input/key_test.rb

@@ -15,7 +15,7 @@ module Vedeu
       context 'when the required block is not given' do
         subject { described.new(input) }
 
-        it { proc { subject }.must_raise(InvalidSyntax) }
+        it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
       end
     end
 

data/test/lib/vedeu/internal_api_test.rb

@@ -4,24 +4,24 @@ module Vedeu
 
 	describe InternalAPI do
 
-    it { Vedeu.must_respond_to(:background_colours) }
-    it { Vedeu.must_respond_to(:borders) }
-    it { Vedeu.must_respond_to(:buffers) }
-    it { Vedeu.must_respond_to(:cursors) }
-    it { Vedeu.must_respond_to(:debug) }
-    it { Vedeu.must_respond_to(:events) }
-    it { Vedeu.must_respond_to(:foreground_colours) }
-    it { Vedeu.must_respond_to(:geometries) }
-    it { Vedeu.must_respond_to(:groups) }
-    it { Vedeu.must_respond_to(:interfaces) }
-    it { Vedeu.must_respond_to(:keymaps) }
-    it { Vedeu.must_respond_to(:menus) }
-    it { Vedeu.must_respond_to(:ready!) }
-    it { Vedeu.must_respond_to(:ready?) }
-    it { Vedeu.must_respond_to(:renderer) }
-    it { Vedeu.must_respond_to(:renderers) }
-    it { Vedeu.must_respond_to(:resize) }
-    it { Vedeu.must_respond_to(:timer) }
+      it { Vedeu.must_respond_to(:background_colours) }
+      it { Vedeu.must_respond_to(:borders) }
+      it { Vedeu.must_respond_to(:buffers) }
+      it { Vedeu.must_respond_to(:cursors) }
+      it { Vedeu.must_respond_to(:debug) }
+      it { Vedeu.must_respond_to(:events) }
+      it { Vedeu.must_respond_to(:foreground_colours) }
+      it { Vedeu.must_respond_to(:geometries) }
+      it { Vedeu.must_respond_to(:groups) }
+      it { Vedeu.must_respond_to(:interfaces) }
+      it { Vedeu.must_respond_to(:keymaps) }
+      it { Vedeu.must_respond_to(:menus) }
+      it { Vedeu.must_respond_to(:ready!) }
+      it { Vedeu.must_respond_to(:ready?) }
+      it { Vedeu.must_respond_to(:renderer) }
+      it { Vedeu.must_respond_to(:renderers) }
+      it { Vedeu.must_respond_to(:resize) }
+      it { Vedeu.must_respond_to(:timer) }
 
 	end # InternalAPI
 

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

@@ -7,7 +7,7 @@ module Vedeu
     let(:described) { Vedeu::Focus }
 
     before {
-      Focus.reset
+      Vedeu::Focus.reset
       Vedeu.interfaces.reset
 
       Vedeu.stubs(:trigger)
@@ -20,7 +20,7 @@ module Vedeu
     describe '#add' do
       context 'adds an interface to storage' do
         it {
-          Focus.add('thallium').must_equal(['thallium'])
+          Vedeu::Focus.add('thallium').must_equal(['thallium'])
         }
       end
 
@@ -30,17 +30,17 @@ module Vedeu
         }
 
         it {
-          Focus.add('thallium')
-          Focus.registered.must_equal(['thallium'])
+          Vedeu::Focus.add('thallium')
+          Vedeu::Focus.registered.must_equal(['thallium'])
         }
       end
 
       it 'does not add it again if already exists' do
-        Focus.add('thallium')
-        Focus.add('lead')
-        Focus.add('bismuth')
-        Focus.add('bismuth', true)
-        Focus.registered.must_equal(['bismuth', 'thallium', 'lead'])
+        Vedeu::Focus.add('thallium')
+        Vedeu::Focus.add('lead')
+        Vedeu::Focus.add('bismuth')
+        Vedeu::Focus.add('bismuth', true)
+        Vedeu::Focus.registered.must_equal(['bismuth', 'thallium', 'lead'])
       end
 
       context 'adds the interface to storage focussed' do
@@ -49,9 +49,9 @@ module Vedeu
         }
 
         it {
-          Focus.add('thallium')
-          Focus.add('lead', true)
-          Focus.registered.must_equal(['lead', 'thallium'])
+          Vedeu::Focus.add('thallium')
+          Vedeu::Focus.add('lead', true)
+          Vedeu::Focus.registered.must_equal(['lead', 'thallium'])
         }
       end
 
@@ -61,48 +61,48 @@ module Vedeu
         }
 
         it {
-          Focus.add('thallium')
-          Focus.add('lead')
-          Focus.registered.must_equal(['thallium', 'lead'])
+          Vedeu::Focus.add('thallium')
+          Vedeu::Focus.add('lead')
+          Vedeu::Focus.registered.must_equal(['thallium', 'lead'])
         }
       end
     end
 
     describe '#by_name' do
       it 'the named interface is focussed when the method is called' do
-        Focus.add('thallium')
-        Focus.add('lead')
-        Focus.add('bismuth')
-        Focus.by_name('lead').must_equal('lead')
+        Vedeu::Focus.add('thallium')
+        Vedeu::Focus.add('lead')
+        Vedeu::Focus.add('bismuth')
+        Vedeu::Focus.by_name('lead').must_equal('lead')
       end
 
       it 'raises an exception if the interface does not exist' do
-        proc { Focus.by_name('not_found') }.must_raise(ModelNotFound)
+        proc { Vedeu::Focus.by_name('not_found') }.must_raise(Vedeu::ModelNotFound)
       end
 
       context 'API methods' do
         it 'the named interface is focussed when the method is called' do
-          Focus.add('thallium')
-          Focus.add('lead')
-          Focus.add('bismuth')
+          Vedeu::Focus.add('thallium')
+          Vedeu::Focus.add('lead')
+          Vedeu::Focus.add('bismuth')
           Vedeu.focus_by_name('lead').must_equal('lead')
         end
 
         it 'raises an exception if the interface does not exist' do
-          proc { Vedeu.focus_by_name('not_found') }.must_raise(ModelNotFound)
+          proc { Vedeu.focus_by_name('not_found') }.must_raise(Vedeu::ModelNotFound)
         end
       end
     end
 
     describe '#current' do
-      before { Focus.reset }
+      before { Vedeu::Focus.reset }
 
       subject { described.current }
 
       it 'returns the name of the interface currently in focus' do
-        Focus.add('thallium')
-        Focus.add('lead')
-        Focus.add('bismuth')
+        Vedeu::Focus.add('thallium')
+        Vedeu::Focus.add('lead')
+        Vedeu::Focus.add('bismuth')
         subject.must_equal('thallium')
       end
 
@@ -112,23 +112,23 @@ module Vedeu
 
       context 'API methods' do
         it 'returns the name of the interface currently in focus' do
-          Focus.add('thallium')
-          Focus.add('lead')
-          Focus.add('bismuth')
+          Vedeu::Focus.add('thallium')
+          Vedeu::Focus.add('lead')
+          Vedeu::Focus.add('bismuth')
           Vedeu.focus.must_equal('thallium')
         end
       end
     end
 
     describe '#current?' do
-      before { Focus.stubs(:current).returns('lead') }
+      before { Vedeu::Focus.stubs(:current).returns('lead') }
 
       context 'when the interface is currently in focus' do
-        it { Focus.current?('lead').must_equal(true) }
+        it { Vedeu::Focus.current?('lead').must_equal(true) }
       end
 
       context 'when the interface is not currently in focus' do
-        it { Focus.current?('bismuth').must_equal(false) }
+        it { Vedeu::Focus.current?('bismuth').must_equal(false) }
       end
 
       context 'API methods' do
@@ -144,16 +144,16 @@ module Vedeu
 
     describe '#next_item' do
       it 'the next interface is focussed when the method is called' do
-        Focus.add('thallium')
-        Focus.add('lead')
-        Focus.add('bismuth')
-        Focus.next_item.must_equal('lead')
+        Vedeu::Focus.add('thallium')
+        Vedeu::Focus.add('lead')
+        Vedeu::Focus.add('bismuth')
+        Vedeu::Focus.next_item.must_equal('lead')
       end
 
       context 'returns false if storage is empty' do
-        before { Focus.reset }
+        before { Vedeu::Focus.reset }
 
-        it { Focus.next_item.must_equal(false) }
+        it { Vedeu::Focus.next_item.must_equal(false) }
       end
     end
 
@@ -166,7 +166,7 @@ module Vedeu
       }
 
       it 'the next visible interface is focussed when the method is called' do
-        Focus.next_visible_item.must_equal('silver')
+        Vedeu::Focus.next_visible_item.must_equal('silver')
       end
 
       context 'when there are no visible interfaces' do
@@ -177,29 +177,29 @@ module Vedeu
         }
 
         it 'puts the first interface defined in focus' do
-          Focus.next_visible_item.must_equal('gold')
+          Vedeu::Focus.next_visible_item.must_equal('gold')
         end
       end
 
       context 'when there are no interfaces' do
         before { Vedeu::Focus.reset }
 
-        it { Focus.next_visible_item.must_equal(false) }
+        it { Vedeu::Focus.next_visible_item.must_equal(false) }
       end
     end
 
     describe '#prev_item' do
       it 'the previous interface is focussed when the method is called' do
-        Focus.add('thallium')
-        Focus.add('lead')
-        Focus.add('bismuth')
-        Focus.prev_item.must_equal('bismuth')
+        Vedeu::Focus.add('thallium')
+        Vedeu::Focus.add('lead')
+        Vedeu::Focus.add('bismuth')
+        Vedeu::Focus.prev_item.must_equal('bismuth')
       end
 
       context 'returns false if storage is empty' do
-        before { Focus.reset }
+        before { Vedeu::Focus.reset }
 
-        it { Focus.prev_item.must_equal(false) }
+        it { Vedeu::Focus.prev_item.must_equal(false) }
       end
     end
 
@@ -212,7 +212,7 @@ module Vedeu
       }
 
       it 'the previous visible interface is focussed when the method is called' do
-        Focus.prev_visible_item.must_equal('silver')
+        Vedeu::Focus.prev_visible_item.must_equal('silver')
       end
 
       context 'when there are no visible interfaces' do
@@ -223,25 +223,25 @@ module Vedeu
         }
 
         it 'puts the first interface defined in focus' do
-          Focus.prev_visible_item.must_equal('gold')
+          Vedeu::Focus.prev_visible_item.must_equal('gold')
         end
       end
 
       context 'when there are no interfaces' do
         before { Vedeu::Focus.reset }
 
-        it { Focus.prev_visible_item.must_equal(false) }
+        it { Vedeu::Focus.prev_visible_item.must_equal(false) }
       end
     end
 
     describe '#refresh' do
       before {
-        Focus.add('thallium')
+        Vedeu::Focus.add('thallium')
         Vedeu.stubs(:trigger).returns([])
       }
 
       it 'triggers the event to refresh the interface current in focus' do
-        Focus.refresh.must_equal([])
+        Vedeu::Focus.refresh.must_equal([])
       end
     end
 

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

@@ -12,7 +12,6 @@ module Vedeu
         colour:  colour,
         delay:   delay,
         group:   group,
-        lines:   lines,
         name:    _name,
         parent:  parent,
         style:   style,
@@ -24,7 +23,6 @@ module Vedeu
     let(:colour)     {}
     let(:delay)      { 0.0 }
     let(:group)      { '' }
-    let(:lines)      { [] }
     let(:_name)      { 'hydrogen' }
     let(:parent)     {}
     let(:repository) { Vedeu.interfaces }
@@ -33,18 +31,17 @@ module Vedeu
     let(:zindex)     { 1 }
 
     describe '#initialize' do
-      it { instance.must_be_instance_of(described) }
-      it { instance.instance_variable_get('@client').must_equal(client) }
-      it { instance.instance_variable_get('@delay').must_equal(delay) }
-      it { instance.instance_variable_get('@group').must_equal(group) }
-      it { instance.instance_variable_get('@lines').must_equal(lines) }
-      it { instance.instance_variable_get('@name').must_equal(_name) }
-      it { instance.instance_variable_get('@parent').must_equal(parent) }
-      it {
-        instance.instance_variable_get('@repository').must_equal(repository)
-      }
-      it { instance.instance_variable_get('@visible').must_equal(visible) }
-      it { instance.instance_variable_get('@zindex').must_equal(zindex) }
+      subject { instance }
+
+      it { subject.must_be_instance_of(described) }
+      it { subject.instance_variable_get('@client').must_equal(client) }
+      it { subject.instance_variable_get('@delay').must_equal(delay) }
+      it { subject.instance_variable_get('@group').must_equal(group) }
+      it { subject.instance_variable_get('@name').must_equal(_name) }
+      it { subject.instance_variable_get('@parent').must_equal(parent) }
+      it { subject.instance_variable_get('@repository').must_equal(repository) }
+      it { subject.instance_variable_get('@visible').must_equal(visible) }
+      it { subject.instance_variable_get('@zindex').must_equal(zindex) }
     end
 
     describe 'accessors' do
@@ -64,15 +61,6 @@ module Vedeu
       it { instance.must_respond_to(:visible=) }
       it { instance.must_respond_to(:visible?) }
       it { instance.must_respond_to(:attributes) }
-      it { instance.must_respond_to(:lines=) }
-    end
-
-    describe '#add' do
-      subject { instance.add(child) }
-
-      it { instance.must_respond_to(:add) }
-
-      it { instance.must_respond_to(:<<) }
     end
 
     describe '#hide' do
@@ -100,78 +88,6 @@ module Vedeu
       }
     end
 
-    describe '#lines' do
-      subject { instance.lines }
-
-      it { instance.must_respond_to(:value) }
-    end
-
-    describe '#lines?' do
-      subject { instance.lines? }
-
-      context 'when the interface has content' do
-        let(:lines) { [:line] }
-
-        it { subject.must_equal(true) }
-      end
-
-      context 'when the interface does not have content' do
-        it { subject.must_equal(false) }
-      end
-    end
-
-    describe '#group?' do
-      subject { instance.group? }
-
-      context 'when the interface belongs to a group' do
-        let(:group) { 'interfaces' }
-
-        it { subject.must_equal(true) }
-      end
-
-      context 'when the interface does not belong to a group' do
-        it { subject.must_equal(false) }
-      end
-    end
-
-    describe '#render' do
-      let(:clear)  { mock('Vedeu::Clear') }
-      let(:border) { mock('Vedeu::Border') }
-      let(:view)   { mock('Vedeu::Viewport') }
-
-      before {
-        Vedeu.stubs(:trigger).with(:_hide_cursor_, _name)
-
-        Vedeu::Clear::NamedInterface.stubs(:render).returns(:clear)
-
-        Vedeu::Viewport.stubs(:render).returns(:view)
-
-        Vedeu.borders.stubs(:by_name).returns(border)
-        border.stubs(:render).returns(:border)
-
-        Vedeu.stubs(:trigger).with(:_show_cursor_, _name)
-      }
-
-      subject { instance.render }
-
-      it { subject.must_be_instance_of(Array) }
-
-      context 'when the interface is visible' do
-        it {
-          Vedeu::Clear::NamedInterface.expects(:render).with(_name)
-          subject
-        }
-
-        it { subject.must_equal([nil, :clear, :view, :border, nil]) }
-      end
-
-      context 'when the interface is not visible' do
-        let(:visible) { false }
-
-        it { subject.must_equal([]) }
-      end
-    end
-
     describe '#show' do
       let(:buffer) { Vedeu::Buffer.new }
 
@@ -185,16 +101,6 @@ module Vedeu
       }
     end
 
-    describe '#store' do
-      subject { instance.store }
-
-      context 'when the interface has no name' do
-        let(:_name) {}
-
-        it { proc { subject }.must_raise(MissingRequired) }
-      end
-    end
-
   end # Interface
 
 end # Vedeu