vedeu 0.6.61 → 0.6.62

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

@@ -6,9 +6,9 @@ module Vedeu
 
     describe Lines do
 
-      let(:described) { Vedeu::Editor::Lines }
-      let(:instance)  { described.new(lines) }
-      let(:lines)     {
+      let(:described)  { Vedeu::Editor::Lines }
+      let(:instance)   { described.new(collection) }
+      let(:collection) {
         [
           Vedeu::Editor::Line.new('Some text...'),
           Vedeu::Editor::Line.new('More text...'),
@@ -18,18 +18,19 @@ module Vedeu
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@lines').must_equal(lines) }
+        it { instance.instance_variable_get('@collection').must_equal(collection) }
 
         context 'when lines were not given' do
-          let(:lines) {}
+          let(:collection) {}
 
-          it { instance.instance_variable_get('@lines').must_equal([]) }
+          it { instance.instance_variable_get('@collection').must_equal([]) }
         end
       end
 
       describe 'accessors' do
+        it { instance.must_respond_to(:collection) }
+        it { instance.must_respond_to(:collection=) }
         it { instance.must_respond_to(:lines) }
-        it { instance.must_respond_to(:lines=) }
       end
 
       describe '.coerce' do
@@ -40,16 +41,16 @@ module Vedeu
         it { subject.must_be_instance_of(described) }
 
         context 'when the document is already a Vedeu::Editor::Lines object' do
-          let(:document) { Vedeu::Editor::Lines.new(lines) }
+          let(:document) { Vedeu::Editor::Lines.new(collection) }
 
           it { subject.must_equal(document) }
-          it { subject.lines.must_equal(lines) }
+          it { subject.collection.must_equal(collection) }
         end
 
         context 'when the document is an empty Array' do
           let(:document) { [] }
 
-          it { subject.lines.must_equal([]) }
+          it { subject.collection.must_equal([]) }
         end
 
         context 'when the document is an Array' do
@@ -68,7 +69,7 @@ module Vedeu
             ]
           }
 
-          it { subject.lines.must_equal(expected) }
+          it { subject.collection.must_equal(expected) }
         end
 
         context 'when the document is a String' do
@@ -86,31 +87,6 @@ module Vedeu
         end
       end
 
-      describe '#[]' do
-        subject { instance.[](index) }
-
-        context 'when index is a Fixnum' do
-          let(:index)    { 2 }
-          let(:expected) {
-            Vedeu::Editor::Line.new('Other text...')
-          }
-
-          it { subject.must_equal(expected) }
-        end
-
-        context 'when index is a Range' do
-          let(:index)    { (1..2) }
-          let(:expected) {
-            [
-              Vedeu::Editor::Line.new('More text...'),
-              Vedeu::Editor::Line.new('Other text...')
-            ]
-          }
-
-          it { subject.must_equal(expected) }
-        end
-      end
-
       describe '#delete_character' do
         let(:x)         { 0 }
         let(:y)         { 0 }
@@ -118,7 +94,7 @@ module Vedeu
         subject { instance.delete_character(y, x) }
 
         context 'when there are no lines' do
-          let(:lines) {
+          let(:collection) {
             [
               Vedeu::Editor::Line.new('')
             ]
@@ -131,7 +107,7 @@ module Vedeu
         end
 
         context 'when there is one line' do
-          let(:lines) {
+          let(:collection) {
             [
               Vedeu::Editor::Line.new('Hydrogen')
             ]
@@ -167,7 +143,7 @@ module Vedeu
 
         context 'when there are multiple lines' do
           let(:y)     { 1 }
-          let(:lines) {
+          let(:collection) {
             [
               Vedeu::Editor::Line.new('Hydrogen'),
               Vedeu::Editor::Line.new('Helium'),
@@ -224,7 +200,7 @@ module Vedeu
         it { subject.must_be_instance_of(described) }
 
         context 'when the lines are empty' do
-          let(:lines) { [] }
+          let(:collection) { [] }
 
           it { subject.must_equal(Vedeu::Editor::Lines.new) }
         end
@@ -276,34 +252,6 @@ module Vedeu
         end
       end
 
-      describe '#empty?' do
-        subject { instance.empty? }
-
-        context 'when the line is empty' do
-          let(:lines) {}
-
-          it { subject.must_equal(true) }
-        end
-
-        context 'when the line is not empty' do
-          it { subject.must_equal(false) }
-        end
-      end
-
-      describe '#eql?' do
-        let(:other) { instance }
-
-        subject { instance.eql?(other) }
-
-        it { subject.must_equal(true) }
-
-        context 'when different to other' do
-          let(:other) { described.new('Other text...') }
-
-          it { subject.must_equal(false) }
-        end
-      end
-
       describe '#insert_character' do
         let(:x)         { 0 }
         let(:y)         { 0 }
@@ -312,7 +260,7 @@ module Vedeu
         subject { instance.insert_character(character, y, x) }
 
         context 'when there are no lines' do
-          let(:lines) {
+          let(:collection) {
             [
               Vedeu::Editor::Line.new('')
             ]
@@ -325,7 +273,7 @@ module Vedeu
         end
 
         context 'when there is one line' do
-          let(:lines) {
+          let(:collection) {
             [
               Vedeu::Editor::Line.new('Hydrogen')
             ]
@@ -361,7 +309,7 @@ module Vedeu
 
         context 'when there are multiple lines' do
           let(:y)     { 1 }
-          let(:lines) {
+          let(:collection) {
             [
               Vedeu::Editor::Line.new('Hydrogen'),
               Vedeu::Editor::Line.new('Helium'),
@@ -460,7 +408,6 @@ module Vedeu
 
           it { subject.must_equal(expected) }
         end
-
       end
 
       describe '#line' do
@@ -471,7 +418,7 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Editor::Line) }
 
         context 'when there are no lines' do
-          let(:lines) {}
+          let(:collection) {}
 
           it { subject.must_equal(Vedeu::Editor::Line.new) }
         end
@@ -513,25 +460,11 @@ module Vedeu
         end
       end
 
-      describe '#size' do
-        subject { instance.size }
-
-        context 'when there are no lines' do
-          let(:lines) {}
-
-          it { subject.must_equal(0) }
-        end
-
-        context 'when there are lines' do
-          it { subject.must_equal(3) }
-        end
-      end
-
       describe '#to_s' do
         subject { instance.to_s }
 
         context 'when there are no lines' do
-          let(:lines) {}
+          let(:collection) {}
 
           it { subject.must_equal("") }
         end

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

@@ -80,12 +80,6 @@ module Vedeu
         }
       end
 
-      describe '.store' do
-        subject { described.store(attributes) }
-
-        it { subject.must_equal(instance) }
-      end
-
       describe '#attributes' do
         subject { instance.attributes }
 

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

@@ -47,12 +47,6 @@ module Vedeu
         }
       end
 
-      describe '.store' do
-        subject { described.store(attributes) }
-
-        it { subject.must_equal(instance) }
-      end
-
       describe '#add' do
         subject { instance.add('hydrogen') }
 

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

@@ -56,7 +56,7 @@ module Vedeu
 
           it {
             Vedeu.expects(:trigger).with(:_mouse_event_, input)
-            subject.must_equal("\e[93m[input]  \e[39m\e[33mVedeu does not " \
+            subject.must_equal("\e[93m[input]    \e[39m\e[33mVedeu does not " \
                                "support mouse button '66' yet.\e[39m")
           }
         end

data/test/lib/vedeu/logging/log_test.rb

@@ -19,7 +19,7 @@ module Vedeu
         subject { described.log(message: _message, force: force, type: type) }
 
         it { subject.must_equal(
-          "\e[97m[info]   \e[39m\e[37mSome message...\e[39m"
+          "\e[97m[info]     \e[39m\e[37mSome message...\e[39m"
         ) }
       end
 
@@ -31,7 +31,7 @@ module Vedeu
 
         it {
           capture_io { subject }.must_equal(
-            ["\e[96m[create] \e[39m\e[36mLogging to stdout...\e[39m\n", ""]
+            ["\e[96m[create]   \e[39m\e[36mLogging to stdout...\e[39m\n", ""]
           )
         }
       end
@@ -44,7 +44,7 @@ module Vedeu
 
         it {
           capture_io { subject }.must_equal(
-            ["", "\e[97m[debug]  \e[39m\e[37mLogging to stderr...\e[39m\n"]
+            ["", "\e[97m[debug]    \e[39m\e[37mLogging to stderr...\e[39m\n"]
           )
         }
       end

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

@@ -17,36 +17,36 @@ module Vedeu
       before do
         Vedeu.stubs(:log)
 
-        Vedeu::Models::Focus.reset
+        described.reset
         Vedeu.interfaces.reset
 
         Vedeu.stubs(:trigger)
       end
       after do
-        Vedeu::Models::Focus.reset
+        described.reset
         Vedeu.interfaces.reset
       end
 
       describe '#add' do
         context 'adds an interface to storage' do
-          it { Vedeu::Models::Focus.add('thallium').must_equal(['thallium']) }
+          it { described.add('thallium').must_equal(['thallium']) }
         end
 
         context 'does not add it again if already exists' do
           before { Vedeu.interface('thallium') {} }
 
           it {
-            Vedeu::Models::Focus.add('thallium')
-            Vedeu::Models::Focus.registered.must_equal(['thallium'])
+            described.add('thallium')
+            described.registered.must_equal(['thallium'])
           }
         end
 
         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(
+          described.add('thallium')
+          described.add('lead')
+          described.add('bismuth')
+          described.add('bismuth', true)
+          described.registered.must_equal(
             ['bismuth', 'thallium', 'lead']
           )
         end
@@ -55,9 +55,9 @@ module Vedeu
           before { Vedeu.interface('thallium') {} }
 
           it {
-            Vedeu::Models::Focus.add('thallium')
-            Vedeu::Models::Focus.add('lead', true)
-            Vedeu::Models::Focus.registered.must_equal(['lead', 'thallium'])
+            described.add('thallium')
+            described.add('lead', true)
+            described.registered.must_equal(['lead', 'thallium'])
           }
         end
 
@@ -65,31 +65,31 @@ module Vedeu
           before { Vedeu.interface('thallium') {} }
 
           it {
-            Vedeu::Models::Focus.add('thallium')
-            Vedeu::Models::Focus.add('lead')
-            Vedeu::Models::Focus.registered.must_equal(['thallium', 'lead'])
+            described.add('thallium')
+            described.add('lead')
+            described.registered.must_equal(['thallium', 'lead'])
           }
         end
       end
 
       describe '#by_name' 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::Models::Focus.by_name('lead').must_equal('lead')
+          described.add('thallium')
+          described.add('lead')
+          described.add('bismuth')
+          described.by_name('lead').must_equal('lead')
         end
 
         it 'raises an exception if the interface does not exist' do
-          proc { Vedeu::Models::Focus.by_name('not_found') }.
+          proc { described.by_name('not_found') }.
             must_raise(Vedeu::Error::ModelNotFound)
         end
 
         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')
+            described.add('thallium')
+            described.add('lead')
+            described.add('bismuth')
             Vedeu.focus_by_name('lead').must_equal('lead')
           end
 
@@ -101,14 +101,14 @@ module Vedeu
       end
 
       describe '#current' do
-        before { Vedeu::Models::Focus.reset }
+        before { described.reset }
 
         subject { described.current }
 
         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')
+          described.add('thallium')
+          described.add('lead')
+          described.add('bismuth')
           subject.must_equal('thallium')
         end
 
@@ -118,23 +118,23 @@ module Vedeu
 
         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')
+            described.add('thallium')
+            described.add('lead')
+            described.add('bismuth')
             Vedeu.focus.must_equal('thallium')
           end
         end
       end
 
       describe '#current?' do
-        before { Vedeu::Models::Focus.stubs(:current).returns('lead') }
+        before { described.stubs(:current).returns('lead') }
 
         context 'when the interface is currently in focus' do
-          it { Vedeu::Models::Focus.current?('lead').must_equal(true) }
+          it { described.current?('lead').must_equal(true) }
         end
 
         context 'when the interface is not currently in focus' do
-          it { Vedeu::Models::Focus.current?('bismuth').must_equal(false) }
+          it { described.current?('bismuth').must_equal(false) }
         end
 
         context 'API methods' do
@@ -150,16 +150,16 @@ module Vedeu
 
       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')
+          described.add('thallium')
+          described.add('lead')
+          described.add('bismuth')
+          described.next_item.must_equal('lead')
         end
 
         context 'returns false if storage is empty' do
-          before { Vedeu::Models::Focus.reset }
+          before { described.reset }
 
-          it { Vedeu::Models::Focus.next_item.must_equal(false) }
+          it { described.next_item.must_equal(false) }
         end
       end
 
@@ -172,7 +172,7 @@ module Vedeu
         end
 
         it 'the next visible interface is focussed when the method is called' do
-          Vedeu::Models::Focus.next_visible_item.must_equal('silver')
+          described.next_visible_item.must_equal('silver')
         end
 
         context 'when there are no visible interfaces' do
@@ -183,29 +183,29 @@ module Vedeu
           }
 
           it 'puts the first interface defined in focus' do
-            Vedeu::Models::Focus.next_visible_item.must_equal('gold')
+            described.next_visible_item.must_equal('gold')
           end
         end
 
         context 'when there are no interfaces' do
-          before { Vedeu::Models::Focus.reset }
+          before { described.reset }
 
-          it { Vedeu::Models::Focus.next_visible_item.must_equal(false) }
+          it { described.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::Models::Focus.add('thallium')
-          Vedeu::Models::Focus.add('lead')
-          Vedeu::Models::Focus.add('bismuth')
-          Vedeu::Models::Focus.prev_item.must_equal('bismuth')
+          described.add('thallium')
+          described.add('lead')
+          described.add('bismuth')
+          described.prev_item.must_equal('bismuth')
         end
 
         context 'returns false if storage is empty' do
-          before { Vedeu::Models::Focus.reset }
+          before { described.reset }
 
-          it { Vedeu::Models::Focus.prev_item.must_equal(false) }
+          it { described.prev_item.must_equal(false) }
         end
       end
 
@@ -219,7 +219,7 @@ module Vedeu
 
         it 'the previous visible interface is focussed when the method is ' \
            'called' do
-          Vedeu::Models::Focus.prev_visible_item.must_equal('silver')
+          described.prev_visible_item.must_equal('silver')
         end
 
         context 'when there are no visible interfaces' do
@@ -230,25 +230,31 @@ module Vedeu
           end
 
           it 'puts the first interface defined in focus' do
-            Vedeu::Models::Focus.prev_visible_item.must_equal('gold')
+            described.prev_visible_item.must_equal('gold')
           end
         end
 
         context 'when there are no interfaces' do
-          before { Vedeu::Models::Focus.reset }
+          before { described.reset }
 
-          it { Vedeu::Models::Focus.prev_visible_item.must_equal(false) }
+          it { described.prev_visible_item.must_equal(false) }
         end
       end
 
       describe '#refresh' do
         before do
-          Vedeu::Models::Focus.add('thallium')
+          described.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([])
+          described.refresh.must_equal([])
+        end
+      end
+
+      describe '#storage' do
+        context 'when the storage is empty' do
+          it { described.storage.must_equal([]) }
         end
       end
 

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

@@ -27,7 +27,7 @@ module Vedeu
           let(:output) { Vedeu::Models::Page.new }
 
           it {
-            Vedeu::Terminal::Buffer.expects(:write).with(output)
+            Vedeu::Buffers::Terminal.expects(:write).with(output)
             subject
           }
         end
@@ -75,7 +75,7 @@ module Vedeu
             let(:output) { Vedeu::Models::Page.new }
 
             it {
-              Vedeu::Terminal::Buffer.expects(:write).with(output)
+              Vedeu::Buffers::Terminal.expects(:write).with(output)
               subject
             }
           end

data/test/lib/vedeu/output/renderers/html_test.rb

@@ -32,13 +32,13 @@ module Vedeu
       }
       let(:timestamp)     { false }
       let(:write_file)    { false }
-      let(:buffer)        { Vedeu::Terminal::Buffer }
+      let(:buffer)        { Vedeu::Buffers::Terminal }
 
       before do
         ::File.stubs(:write)
         Vedeu.stubs(:height).returns(2)
         Vedeu.stubs(:width).returns(4)
-        Vedeu::Terminal::Buffer.reset!
+        Vedeu::Buffers::Terminal.reset!
       end
 
       describe '#initialize' do

data/test/lib/vedeu/output/renderers/json_test.rb

@@ -16,7 +16,7 @@ module Vedeu
         ::File.stubs(:write)
         Vedeu.stubs(:height).returns(1)
         Vedeu.stubs(:width).returns(1)
-        Vedeu::Terminal::Buffer.reset!
+        Vedeu::Buffers::Terminal.reset!
       end
 
       describe '#initialize' do