vedeu 0.6.8 → 0.6.9

data/test/lib/vedeu/dsl/group_test.rb

@@ -8,7 +8,7 @@ module Vedeu
 
       let(:described)  { Vedeu::DSL::Group }
       let(:instance)   { described.new(model, client) }
-      let(:model)      { Vedeu::Group.new }
+      let(:model)      { Vedeu::Models::Group.new }
       let(:client)     {}
       let(:group_name) { 'main_screen' }
 
@@ -42,7 +42,7 @@ module Vedeu
           end
         }
 
-        it { subject.must_be_instance_of(Vedeu::Group) }
+        it { subject.must_be_instance_of(Vedeu::Models::Group) }
 
         it { subject.members.must_equal(Set['editor_interface']) }
       end
@@ -58,7 +58,7 @@ module Vedeu
           end
         }
 
-        it { subject.must_be_instance_of(Vedeu::Group) }
+        it { subject.must_be_instance_of(Vedeu::Models::Group) }
 
         it { subject.members.must_equal(expected) }
       end

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

@@ -9,7 +9,7 @@ module Vedeu
       let(:described) { Vedeu::DSL::Interface }
       let(:instance)  { described.new(model, client) }
       let(:model)     {
-        Vedeu::Interface.new(name: _name)
+        Vedeu::Models::Interface.new(name: _name)
       }
       let(:_name)  { 'actinium' }
       let(:client) {}
@@ -29,7 +29,7 @@ module Vedeu
           end
         }
 
-        it { subject.must_be_instance_of(Vedeu::Interface) }
+        it { subject.must_be_instance_of(Vedeu::Models::Interface) }
 
         context 'when the block is not given' do
           subject { described.interface('fluorine') }
@@ -172,7 +172,7 @@ module Vedeu
         end
 
         context 'when the interface has a name' do
-          before { Vedeu::Focus.reset }
+          before { Vedeu::Models::Focus.reset }
 
           it { subject.must_equal(['actinium']) }
         end
@@ -213,7 +213,7 @@ module Vedeu
 
         subject { instance.group(_value) }
 
-        it { subject.must_be_instance_of(Vedeu::Group) }
+        it { subject.must_be_instance_of(Vedeu::Models::Group) }
 
         context 'when the value is empty or nil' do
           let(:_value) { '' }
@@ -225,7 +225,8 @@ module Vedeu
           let(:members) { Set['actinium', 'lanthanum'] }
 
           before do
-            Vedeu::Group.new(name: 'elements', members: ['lanthanum']).store
+            Vedeu::Models::Group.new(name:    'elements',
+                                     members: ['lanthanum']).store
           end
 
           it {

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

@@ -12,7 +12,7 @@ module Vedeu
       let(:client)     {}
       let(:colour)     { Vedeu::Colours::Colour.new }
       let(:parent)     { Vedeu::Views::View.new }
-      let(:style)      { Vedeu::Style.new }
+      let(:style)      { Vedeu::Presentation::Style.new }
       let(:_value)     { [] }
       let(:attributes) {
         {
@@ -75,7 +75,9 @@ module Vedeu
         end
 
         context 'when the block is not given' do
-          it { proc { instance.streams }.must_raise(Vedeu::Error::InvalidSyntax) }
+          it {
+            proc { instance.streams }.must_raise(Vedeu::Error::InvalidSyntax)
+          }
         end
 
         it { instance.must_respond_to(:stream) }

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

@@ -8,7 +8,7 @@ module Vedeu
 
       let(:described)  { Vedeu::DSL::Presentation }
       let(:instance)   { Vedeu::DSL::Interface.new(model) }
-      let(:model)      { Vedeu::Interface.new }
+      let(:model)      { Vedeu::Models::Interface.new }
       let(:background) { '#00ff00' }
       let(:foreground) { '#ff00ff' }
 
@@ -92,7 +92,7 @@ module Vedeu
         it { instance.must_respond_to(:styles) }
         it { instance.must_respond_to(:styles=) }
 
-        it { subject.must_be_instance_of(Vedeu::Style) }
+        it { subject.must_be_instance_of(Vedeu::Presentation::Style) }
       end
 
     end # Presentation

data/test/lib/vedeu/dsl/text_test.rb

@@ -35,7 +35,7 @@ module Vedeu
           it { subject.must_be_instance_of(Vedeu::Views::Lines) }
 
           it 'adds the text to the model' do
-            Vedeu::Text.expects(:add).with(_value, modified_options)
+            Vedeu::Output::Text.expects(:add).with(_value, modified_options)
             subject
           end
         end
@@ -47,7 +47,7 @@ module Vedeu
           it { subject.must_be_instance_of(Vedeu::Views::Streams) }
 
           it 'adds the text to the model' do
-            Vedeu::Text.expects(:add).with(_value, modified_options)
+            Vedeu::Output::Text.expects(:add).with(_value, modified_options)
             subject
           end
         end
@@ -60,7 +60,7 @@ module Vedeu
           it { subject.must_be_instance_of(Vedeu::Views::Streams) }
 
           it 'adds the text to the model' do
-            Vedeu::Text.expects(:add).with(_value, modified_options)
+            Vedeu::Output::Text.expects(:add).with(_value, modified_options)
             subject
           end
         end
@@ -70,7 +70,7 @@ module Vedeu
             let(:anchor) { :align }
 
             it 'adds the text to the model' do
-              Vedeu::Text.expects(:add).with(_value, modified_options)
+              Vedeu::Output::Text.expects(:add).with(_value, modified_options)
               instance.align(_value, options)
             end
           end
@@ -79,7 +79,7 @@ module Vedeu
             let(:anchor) { :center }
 
             it 'adds the text to the model' do
-              Vedeu::Text.expects(:add).with(_value, modified_options)
+              Vedeu::Output::Text.expects(:add).with(_value, modified_options)
               instance.center(_value, options)
             end
           end
@@ -88,7 +88,7 @@ module Vedeu
             let(:anchor) { :centre }
 
             it 'adds the text to the model' do
-              Vedeu::Text.expects(:add).with(_value, modified_options)
+              Vedeu::Output::Text.expects(:add).with(_value, modified_options)
               instance.centre(_value, options)
             end
           end
@@ -97,7 +97,7 @@ module Vedeu
             let(:anchor) { :left }
 
             it 'adds the text to the model' do
-              Vedeu::Text.expects(:add).with(_value, modified_options)
+              Vedeu::Output::Text.expects(:add).with(_value, modified_options)
               instance.left(_value, options)
             end
           end
@@ -106,7 +106,7 @@ module Vedeu
             let(:anchor) { :right }
 
             it 'adds the text to the model' do
-              Vedeu::Text.expects(:add).with(_value, modified_options)
+              Vedeu::Output::Text.expects(:add).with(_value, modified_options)
               instance.right(_value, options)
             end
           end

data/test/lib/vedeu/editor/document_test.rb

@@ -6,7 +6,7 @@ module Vedeu
 
     describe Document do
 
-      let(:described) { Vedeu::Editor::Document }
+      let(:described)  { Vedeu::Editor::Document }
       let(:instance)   { described.new(attributes) }
       let(:attributes) {
         {
@@ -21,7 +21,7 @@ module Vedeu
       }
       let(:_name)  { 'Vedeu::Editor::Document' }
 
-      before { Vedeu::Direct.stubs(:write) }
+      before { Vedeu::Output::Direct.stubs(:write) }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -52,9 +52,13 @@ module Vedeu
         }
 
         before do
-          Vedeu::Geometry::Geometry.new(name: _name, x: 1, y: 1, xn: 5, yn: 5).store
+          Vedeu::Geometry::Geometry.new(name: _name,
+                                        x:    1,
+                                        y:    1,
+                                        xn:   5,
+                                        yn:   5).store
           Vedeu::Terminal.stubs(:output)
-          Vedeu::Direct.stubs(:write).returns(expected)
+          Vedeu::Output::Direct.stubs(:write).returns(expected)
         end
 
         subject { instance.clear }
@@ -175,12 +179,12 @@ module Vedeu
         }
         let(:output) { "\e[1;1HA\e[2;1HB\e[3;1HC\e[1;1H\e[?25h" }
 
-        before { Vedeu::Direct.stubs(:write) }
+        before { Vedeu::Output::Direct.stubs(:write) }
 
         subject { instance.render }
 
         it {
-          Vedeu::Direct.expects(:write).with(value: output, x: 1, y: 1)
+          Vedeu::Output::Direct.expects(:write).with(value: output, x: 1, y: 1)
           subject
         }
       end

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

@@ -29,6 +29,7 @@ module Vedeu
 
       describe 'accessors' do
         it { instance.must_respond_to(:name) }
+        it { instance.must_respond_to(:name=) }
       end
 
       describe '#add' do
@@ -90,16 +91,6 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Input::Keys) }
       end
 
-      describe '#name' do
-        subject { instance.name }
-
-        it { subject.must_be_instance_of(String) }
-      end
-
-      describe '#name=' do
-        it { instance.must_respond_to(:name=) }
-      end
-
     end # Keymap
 
   end # Input

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

@@ -2,243 +2,250 @@ require 'test_helper'
 
 module Vedeu
 
-  describe Focus do
+  module Models
 
-    let(:described) { Vedeu::Focus }
+    describe Focus do
 
-    before do
-      Vedeu::Focus.reset
-      Vedeu.interfaces.reset
+      let(:described) { Vedeu::Models::Focus }
 
-      Vedeu.stubs(:trigger)
-    end
-    after do
-      Vedeu::Focus.reset
-      Vedeu.interfaces.reset
-    end
+      before do
+        Vedeu::Models::Focus.reset
+        Vedeu.interfaces.reset
 
-    describe '#add' do
-      context 'adds an interface to storage' do
-        it { Vedeu::Focus.add('thallium').must_equal(['thallium']) }
+        Vedeu.stubs(:trigger)
+      end
+      after do
+        Vedeu::Models::Focus.reset
+        Vedeu.interfaces.reset
       end
 
-      context 'does not add it again if already exists' do
-        before { Vedeu.interface('thallium') {} }
+      describe '#add' do
+        context 'adds an interface to storage' do
+          it { Vedeu::Models::Focus.add('thallium').must_equal(['thallium']) }
+        end
 
-        it {
-          Vedeu::Focus.add('thallium')
-          Vedeu::Focus.registered.must_equal(['thallium'])
-        }
-      end
+        context 'does not add it again if already exists' do
+          before { Vedeu.interface('thallium') {} }
 
-      it 'does not add it again if already exists' do
-        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
+          it {
+            Vedeu::Models::Focus.add('thallium')
+            Vedeu::Models::Focus.registered.must_equal(['thallium'])
+          }
+        end
 
-      context 'adds the interface to storage focussed' do
-        before { Vedeu.interface('thallium') {} }
+        it 'does not add it again if already exists' do
+          Vedeu::Models::Focus.add('thallium')
+          Vedeu::Models::Focus.add('lead')
+          Vedeu::Models::Focus.add('bismuth')
+          Vedeu::Models::Focus.add('bismuth', true)
+          Vedeu::Models::Focus.registered.must_equal(
+            ['bismuth', 'thallium', 'lead']
+          )
+        end
 
-        it {
-          Vedeu::Focus.add('thallium')
-          Vedeu::Focus.add('lead', true)
-          Vedeu::Focus.registered.must_equal(['lead', 'thallium'])
-        }
-      end
+        context 'adds the interface to storage focussed' do
+          before { Vedeu.interface('thallium') {} }
 
-      context 'adds the interface to storage unfocussed' do
-        before { Vedeu.interface('thallium') {} }
+          it {
+            Vedeu::Models::Focus.add('thallium')
+            Vedeu::Models::Focus.add('lead', true)
+            Vedeu::Models::Focus.registered.must_equal(['lead', 'thallium'])
+          }
+        end
 
-        it {
-          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
-        Vedeu::Focus.add('thallium')
-        Vedeu::Focus.add('lead')
-        Vedeu::Focus.add('bismuth')
-        Vedeu::Focus.by_name('lead').must_equal('lead')
-      end
+        context 'adds the interface to storage unfocussed' do
+          before { Vedeu.interface('thallium') {} }
 
-      it 'raises an exception if the interface does not exist' do
-        proc { Vedeu::Focus.by_name('not_found') }.
-          must_raise(Vedeu::Error::ModelNotFound)
+          it {
+            Vedeu::Models::Focus.add('thallium')
+            Vedeu::Models::Focus.add('lead')
+            Vedeu::Models::Focus.registered.must_equal(['thallium', 'lead'])
+          }
+        end
       end
 
-      context 'API methods' do
+      describe '#by_name' do
         it 'the named interface is focussed when the method is called' do
-          Vedeu::Focus.add('thallium')
-          Vedeu::Focus.add('lead')
-          Vedeu::Focus.add('bismuth')
-          Vedeu.focus_by_name('lead').must_equal('lead')
+          Vedeu::Models::Focus.add('thallium')
+          Vedeu::Models::Focus.add('lead')
+          Vedeu::Models::Focus.add('bismuth')
+          Vedeu::Models::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') }.
+          proc { Vedeu::Models::Focus.by_name('not_found') }.
             must_raise(Vedeu::Error::ModelNotFound)
         end
-      end
-    end
 
-    describe '#current' do
-      before { Vedeu::Focus.reset }
-
-      subject { described.current }
-
-      it 'returns the name of the interface currently in focus' do
-        Vedeu::Focus.add('thallium')
-        Vedeu::Focus.add('lead')
-        Vedeu::Focus.add('bismuth')
-        subject.must_equal('thallium')
+        context 'API methods' do
+          it 'the named interface is focussed when the method is called' do
+            Vedeu::Models::Focus.add('thallium')
+            Vedeu::Models::Focus.add('lead')
+            Vedeu::Models::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(Vedeu::Error::ModelNotFound)
+          end
+        end
       end
 
-      context 'when no interfaces are defined' do
-        it { subject.must_equal(nil) }
-      end
+      describe '#current' do
+        before { Vedeu::Models::Focus.reset }
+
+        subject { described.current }
 
-      context 'API methods' do
         it 'returns the name of the interface currently in focus' do
-          Vedeu::Focus.add('thallium')
-          Vedeu::Focus.add('lead')
-          Vedeu::Focus.add('bismuth')
-          Vedeu.focus.must_equal('thallium')
+          Vedeu::Models::Focus.add('thallium')
+          Vedeu::Models::Focus.add('lead')
+          Vedeu::Models::Focus.add('bismuth')
+          subject.must_equal('thallium')
         end
-      end
-    end
 
-    describe '#current?' do
-      before { Vedeu::Focus.stubs(:current).returns('lead') }
+        context 'when no interfaces are defined' do
+          it { subject.must_equal(nil) }
+        end
 
-      context 'when the interface is currently in focus' do
-        it { Vedeu::Focus.current?('lead').must_equal(true) }
+        context 'API methods' do
+          it 'returns the name of the interface currently in focus' do
+            Vedeu::Models::Focus.add('thallium')
+            Vedeu::Models::Focus.add('lead')
+            Vedeu::Models::Focus.add('bismuth')
+            Vedeu.focus.must_equal('thallium')
+          end
+        end
       end
 
-      context 'when the interface is not currently in focus' do
-        it { Vedeu::Focus.current?('bismuth').must_equal(false) }
-      end
+      describe '#current?' do
+        before { Vedeu::Models::Focus.stubs(:current).returns('lead') }
 
-      context 'API methods' do
         context 'when the interface is currently in focus' do
-          it { Vedeu.focussed?('lead').must_equal(true) }
+          it { Vedeu::Models::Focus.current?('lead').must_equal(true) }
         end
 
         context 'when the interface is not currently in focus' do
-          it { Vedeu.focussed?('bismuth').must_equal(false) }
+          it { Vedeu::Models::Focus.current?('bismuth').must_equal(false) }
         end
-      end
-    end
-
-    describe '#next_item' do
-      it 'the next interface is focussed when the method is called' do
-        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 { Vedeu::Focus.reset }
+        context 'API methods' do
+          context 'when the interface is currently in focus' do
+            it { Vedeu.focussed?('lead').must_equal(true) }
+          end
 
-        it { Vedeu::Focus.next_item.must_equal(false) }
+          context 'when the interface is not currently in focus' do
+            it { Vedeu.focussed?('bismuth').must_equal(false) }
+          end
+        end
       end
-    end
 
-    describe '#next_visible_item' do
-      before do
-        Vedeu.stubs(:trigger)
-        Vedeu.interface('gold') { visible true }
-        Vedeu.interface('silver') { visible true }
-        Vedeu.interface('platinum') { visible false }
-      end
+      describe '#next_item' do
+        it 'the next interface is focussed when the method is called' do
+          Vedeu::Models::Focus.add('thallium')
+          Vedeu::Models::Focus.add('lead')
+          Vedeu::Models::Focus.add('bismuth')
+          Vedeu::Models::Focus.next_item.must_equal('lead')
+        end
 
-      it 'the next visible interface is focussed when the method is called' do
-        Vedeu::Focus.next_visible_item.must_equal('silver')
+        context 'returns false if storage is empty' do
+          before { Vedeu::Models::Focus.reset }
+
+          it { Vedeu::Models::Focus.next_item.must_equal(false) }
+        end
       end
 
-      context 'when there are no visible interfaces' do
-        before {
-          Vedeu.interface('gold') { visible false }
-          Vedeu.interface('silver') { visible false }
+      describe '#next_visible_item' do
+        before do
+          Vedeu.stubs(:trigger)
+          Vedeu.interface('gold') { visible true }
+          Vedeu.interface('silver') { visible true }
           Vedeu.interface('platinum') { visible false }
-        }
+        end
 
-        it 'puts the first interface defined in focus' do
-          Vedeu::Focus.next_visible_item.must_equal('gold')
+        it 'the next visible interface is focussed when the method is called' do
+          Vedeu::Models::Focus.next_visible_item.must_equal('silver')
         end
-      end
 
-      context 'when there are no interfaces' do
-        before { Vedeu::Focus.reset }
+        context 'when there are no visible interfaces' do
+          before {
+            Vedeu.interface('gold') { visible false }
+            Vedeu.interface('silver') { visible false }
+            Vedeu.interface('platinum') { visible 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
-        Vedeu::Focus.add('thallium')
-        Vedeu::Focus.add('lead')
-        Vedeu::Focus.add('bismuth')
-        Vedeu::Focus.prev_item.must_equal('bismuth')
-      end
+          it 'puts the first interface defined in focus' do
+            Vedeu::Models::Focus.next_visible_item.must_equal('gold')
+          end
+        end
 
-      context 'returns false if storage is empty' do
-        before { Vedeu::Focus.reset }
+        context 'when there are no interfaces' do
+          before { Vedeu::Models::Focus.reset }
 
-        it { Vedeu::Focus.prev_item.must_equal(false) }
+          it { Vedeu::Models::Focus.next_visible_item.must_equal(false) }
+        end
       end
-    end
 
-    describe '#prev_visible_item' do
-      before do
-        Vedeu.stubs(:trigger)
-        Vedeu.interface('gold') { visible true }
-        Vedeu.interface('silver') { visible true }
-        Vedeu.interface('platinum') { visible false }
-      end
+      describe '#prev_item' do
+        it 'the previous interface is focussed when the method is called' do
+          Vedeu::Models::Focus.add('thallium')
+          Vedeu::Models::Focus.add('lead')
+          Vedeu::Models::Focus.add('bismuth')
+          Vedeu::Models::Focus.prev_item.must_equal('bismuth')
+        end
+
+        context 'returns false if storage is empty' do
+          before { Vedeu::Models::Focus.reset }
 
-      it 'the previous visible interface is focussed when the method is called' do
-        Vedeu::Focus.prev_visible_item.must_equal('silver')
+          it { Vedeu::Models::Focus.prev_item.must_equal(false) }
+        end
       end
 
-      context 'when there are no visible interfaces' do
+      describe '#prev_visible_item' do
         before do
-          Vedeu.interface('gold') { visible false }
-          Vedeu.interface('silver') { visible false }
+          Vedeu.stubs(:trigger)
+          Vedeu.interface('gold') { visible true }
+          Vedeu.interface('silver') { visible true }
           Vedeu.interface('platinum') { visible false }
         end
 
-        it 'puts the first interface defined in focus' do
-          Vedeu::Focus.prev_visible_item.must_equal('gold')
+        it 'the previous visible interface is focussed when the method is ' \
+           'called' do
+          Vedeu::Models::Focus.prev_visible_item.must_equal('silver')
         end
-      end
 
-      context 'when there are no interfaces' do
-        before { Vedeu::Focus.reset }
+        context 'when there are no visible interfaces' do
+          before do
+            Vedeu.interface('gold') { visible false }
+            Vedeu.interface('silver') { visible false }
+            Vedeu.interface('platinum') { visible false }
+          end
 
-        it { Vedeu::Focus.prev_visible_item.must_equal(false) }
-      end
-    end
+          it 'puts the first interface defined in focus' do
+            Vedeu::Models::Focus.prev_visible_item.must_equal('gold')
+          end
+        end
 
-    describe '#refresh' do
-      before do
-        Vedeu::Focus.add('thallium')
-        Vedeu.stubs(:trigger).returns([])
+        context 'when there are no interfaces' do
+          before { Vedeu::Models::Focus.reset }
+
+          it { Vedeu::Models::Focus.prev_visible_item.must_equal(false) }
+        end
       end
 
-      it 'triggers the event to refresh the interface current in focus' do
-        Vedeu::Focus.refresh.must_equal([])
+      describe '#refresh' do
+        before do
+          Vedeu::Models::Focus.add('thallium')
+          Vedeu.stubs(:trigger).returns([])
+        end
+
+        it 'triggers the event to refresh the interface current in focus' do
+          Vedeu::Models::Focus.refresh.must_equal([])
+        end
       end
-    end
 
-  end # Focus
+    end # Focus
+
+  end # Models
 
 end # Vedeu