vedeu 0.5.4 → 0.5.5

data/test/lib/vedeu/configuration/api_test.rb

@@ -199,19 +199,19 @@ module Vedeu
         context 'when the value is invalid (nil)' do
           it { proc {
             Vedeu.configure { colour_mode(nil) }
-          }.must_raise(InvalidSyntax) }
+          }.must_raise(Vedeu::InvalidSyntax) }
         end
 
         context 'when the value is invalid (empty)' do
           it { proc {
             Vedeu.configure { colour_mode('') }
-          }.must_raise(InvalidSyntax) }
+          }.must_raise(Vedeu::InvalidSyntax) }
         end
 
         context 'when the value is invalid' do
           it { proc {
             Vedeu.configure { colour_mode(1234) }
-          }.must_raise(InvalidSyntax) }
+          }.must_raise(Vedeu::InvalidSyntax) }
         end
 
         it 'sets the option to the desired value' do

data/test/lib/vedeu/cursor/refresh_cursor_test.rb

@@ -24,7 +24,7 @@ module Vedeu
           y  1
           yn 3
         end
-        Vedeu::Cursor.new({ name: 'refresh_cursor', ox: ox, oy: oy }).store
+        Vedeu::Cursor.new(name: 'refresh_cursor', ox: ox, oy: oy).store
 
         Vedeu::Terminal.stubs(:output).returns(expected)
       }

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

@@ -8,7 +8,7 @@ module Vedeu
 
       let(:described) { Vedeu::DSL::Composition }
       let(:instance)  { described.new(model) }
-      let(:model)     { Vedeu::Composition.new }
+      let(:model)     { Vedeu::Views::Composition.new }
       let(:client)    {}
 
       describe '#initialize' do
@@ -24,11 +24,11 @@ module Vedeu
           end
         }
 
-        it { subject.must_be_instance_of(Vedeu::InterfaceCollection) }
-        it { subject.first.must_be_instance_of(Vedeu::Interface) }
+        it { subject.must_be_instance_of(Vedeu::Views::ViewCollection) }
+        it { subject.first.must_be_instance_of(Vedeu::Views::View) }
 
         context 'when the block is not given' do
-          it { proc { instance.view }.must_raise(InvalidSyntax) }
+          it { proc { instance.view }.must_raise(Vedeu::InvalidSyntax) }
         end
       end
 
@@ -44,13 +44,13 @@ module Vedeu
         context 'when the name of the view is not given' do
           let(:filename) { 'my_interface.erb' }
 
-          it { proc { subject }.must_raise(MissingRequired) }
+          it { proc { subject }.must_raise(Vedeu::MissingRequired) }
         end
 
         context 'when the filename of the template is not given' do
           let(:_name) { 'my_interface' }
 
-          it { proc { subject }.must_raise(MissingRequired) }
+          it { proc { subject }.must_raise(Vedeu::MissingRequired) }
         end
 
         context 'when the name and filename are given' do
@@ -62,7 +62,7 @@ module Vedeu
               with(object, filename, options).returns(content)
           }
 
-          it { subject.must_be_instance_of(Vedeu::InterfaceCollection) }
+          it { subject.must_be_instance_of(Vedeu::Views::ViewCollection) }
         end
       end
 

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

@@ -31,7 +31,7 @@ module Vedeu
         context 'when the block is not given' do
           subject { described.group(group_name) }
 
-          it { proc { subject }.must_raise(InvalidSyntax) }
+          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
         end
       end
 
@@ -58,7 +58,7 @@ module Vedeu
           end
         }
 
-        it { proc { subject }.must_raise(MissingRequired) }
+        it { proc { subject }.must_raise(Vedeu::MissingRequired) }
       end
 
       context 'it adds interface names to the group' do

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

@@ -7,7 +7,7 @@ module Vedeu
     describe Interface do
 
       let(:described) { Vedeu::DSL::Interface }
-      let(:instance)  { described.new(model) }
+      let(:instance)  { described.new(model, client) }
       let(:model)     {
         Vedeu::Interface.new(name: 'actinium')
       }
@@ -19,13 +19,41 @@ module Vedeu
         it { instance.instance_variable_get('@client').must_equal(client) }
       end
 
+      describe '.interface' do
+        after { Vedeu.interfaces.reset }
+
+        subject {
+          described.interface('flourine') do
+            # ...
+          end
+        }
+
+        it { subject.must_be_instance_of(Vedeu::Interface) }
+
+        context 'when the block is not given' do
+          subject { described.interface('flourine') }
+
+          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
+        end
+
+        context 'when the name is not given' do
+          subject {
+            described.interface('') do
+              # ...
+            end
+          }
+
+          it { proc { subject }.must_raise(Vedeu::MissingRequired) }
+        end
+      end
+
       describe '#border' do
         after { Vedeu.borders.reset }
 
         context 'when the block is not given' do
           subject { instance.border }
 
-          it { proc { subject }.must_raise(InvalidSyntax) }
+          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
         end
 
         context 'when the block is given' do
@@ -159,7 +187,7 @@ module Vedeu
         context 'when the required block is not provided' do
           subject { instance.geometry }
 
-          it { proc { subject }.must_raise(InvalidSyntax) }
+          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
         end
 
         context 'when the block is given' do
@@ -230,24 +258,6 @@ module Vedeu
         it { instance.must_respond_to(:keys) }
       end
 
-      describe '#lines' do
-        subject {
-          instance.lines do
-            # ...
-          end
-        }
-
-        it { subject.must_be_instance_of(Vedeu::Lines) }
-
-        context 'when the required block is not provided' do
-          subject { instance.lines }
-
-          it { proc { subject }.must_raise(InvalidSyntax) }
-        end
-
-        it { instance.must_respond_to(:line) }
-      end
-
       describe '#name' do
         subject { instance.name('nickel') }
 

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

@@ -23,25 +23,25 @@ module Vedeu
         context 'when a block was not given' do
           subject { instance.key(value_or_values) }
 
-          it { proc { subject }.must_raise(InvalidSyntax) }
+          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
         end
 
         context 'when a key was not given' do
           let(:value_or_values) {}
 
-          it { proc { subject }.must_raise(InvalidSyntax) }
+          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
         end
 
         context 'when an invalid key was given (nil)' do
           let(:value_or_values) { ['v', nil] }
 
-          it { proc { subject }.must_raise(InvalidSyntax) }
+          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
         end
 
         context 'when an invalid key was given (empty)' do
           let(:value_or_values) { ['v', ''] }
 
-          it { proc { subject }.must_raise(InvalidSyntax) }
+          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
         end
 
         context 'when the key is valid (not already defined)' do

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

@@ -8,7 +8,7 @@ module Vedeu
 
       let(:described) { Vedeu::DSL::Line }
       let(:instance)  { described.new(model) }
-      let(:model)     { Vedeu::Line.new(attributes) }
+      let(:model)     { Vedeu::Views::Line.new(attributes) }
       let(:attributes){
         {
           streams: streams,
@@ -19,7 +19,7 @@ module Vedeu
       }
       let(:client)    {}
       let(:streams)   { [] }
-      let(:parent)    { Vedeu::Interface.new }
+      let(:parent)    { Vedeu::Views::View.new }
       let(:colour)    { Vedeu::Colour.new }
       let(:style)     { Vedeu::Style.new }
 
@@ -38,8 +38,8 @@ module Vedeu
           end
         }
 
-        it { subject.must_be_instance_of(Vedeu::Lines) }
-        it { subject.first.must_be_instance_of(Vedeu::Line) }
+        it { subject.must_be_instance_of(Vedeu::Views::Lines) }
+        it { subject.first.must_be_instance_of(Vedeu::Views::Line) }
 
         context 'when the block is given' do
         end
@@ -54,7 +54,7 @@ module Vedeu
 
             subject { instance.line(_value) }
 
-            it { proc { subject }.must_raise(InvalidSyntax) }
+            it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
           end
         end
       end
@@ -67,12 +67,12 @@ module Vedeu
             end
           }
 
-          it { subject.must_be_instance_of(Vedeu::Streams) }
-          it { subject.first.must_be_instance_of(Vedeu::Stream) }
+          it { subject.must_be_instance_of(Vedeu::Views::Streams) }
+          it { subject.first.must_be_instance_of(Vedeu::Views::Stream) }
         end
 
         context 'when the block is not given' do
-          it { proc { instance.streams }.must_raise(InvalidSyntax) }
+          it { proc { instance.streams }.must_raise(Vedeu::InvalidSyntax) }
         end
 
         it { instance.must_respond_to(:stream) }

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

@@ -8,9 +8,9 @@ module Vedeu
 
       let(:described) { Vedeu::DSL::Stream }
       let(:instance)  { described.new(model) }
-      let(:model)     { Vedeu::Stream.new(parent: parent) }
+      let(:model)     { Vedeu::Views::Stream.new(parent: parent) }
       let(:client)    {}
-      let(:parent)    { Vedeu::Line.new }
+      let(:parent)    { Vedeu::Views::Line.new }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -21,12 +21,12 @@ module Vedeu
       describe '#stream' do
         subject { instance.stream { } }
 
-        it { subject.must_be_instance_of(Vedeu::Streams) }
+        it { subject.must_be_instance_of(Vedeu::Views::Streams) }
 
         context 'when the block is not given' do
           subject { instance.stream }
 
-          it { proc { subject }.must_raise(InvalidSyntax) }
+          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
         end
       end
 

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

@@ -16,16 +16,16 @@ module Vedeu
           }
         }
         let(:anchor)   { :text }
-        let(:model)    { Vedeu::Line.new }
+        let(:model)    { Vedeu::Views::Line.new }
         let(:instance) { Vedeu::DSL::Line.new(model) }
 
         subject { instance.text(_value, options) }
 
-        context 'when the model is a Vedeu::Interface' do
-          let(:model)    { Vedeu::Interface.new }
+        context 'when the model is a Vedeu::Views::View' do
+          let(:model)    { Vedeu::Views::View.new }
           let(:instance) { Vedeu::DSL::Interface.new(model) }
 
-          it { subject.must_be_instance_of(Vedeu::Lines) }
+          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)
@@ -33,11 +33,11 @@ module Vedeu
           end
         end
 
-        context 'when the model is a Vedeu::Line' do
-          let(:model)    { Vedeu::Line.new }
+        context 'when the model is a Vedeu::Views::Line' do
+          let(:model)    { Vedeu::Views::Line.new }
           let(:instance) { Vedeu::DSL::Line.new(model) }
 
-          it { subject.must_be_instance_of(Vedeu::Streams) }
+          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)
@@ -45,12 +45,12 @@ module Vedeu
           end
         end
 
-        context 'when the model is a Vedeu::Stream' do
-          let(:parent)   { Vedeu::Line.new }
-          let(:model)    { Vedeu::Stream.new(parent: parent) }
+        context 'when the model is a Vedeu::Views::Stream' do
+          let(:parent)   { Vedeu::Views::Line.new }
+          let(:model)    { Vedeu::Views::Stream.new(parent: parent) }
           let(:instance) { Vedeu::DSL::Stream.new(model) }
 
-          it { subject.must_be_instance_of(Vedeu::Streams) }
+          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)

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

@@ -7,49 +7,46 @@ module Vedeu
     describe View do
 
       let(:described) { Vedeu::DSL::View }
+      let(:instance)  { described.new(model, client) }
+      let(:model)     {
+        Vedeu::Views::View.new(name: 'actinium')
+      }
+      let(:client) {}
 
-      describe '.interface' do
-        after { Vedeu.interfaces.reset }
-
+      describe '.renders' do
         subject {
-          described.interface('flourine') do
+          described.renders do
             # ...
           end
         }
 
-        it { subject.must_be_instance_of(Vedeu::Interface) }
+        it { described.must_respond_to(:render) }
+        it { subject.must_be_instance_of(Array) }
 
         context 'when the block is not given' do
-          subject { described.interface('flourine') }
+          subject { described.renders }
 
-          it { proc { subject }.must_raise(InvalidSyntax) }
+          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
         end
 
-        context 'when the name is not given' do
-          subject {
-            described.interface('') do
-              # ...
-            end
-          }
-
-          it { proc { subject }.must_raise(MissingRequired) }
+        context 'when the block is given' do
+          it { subject.must_equal([]) }
         end
       end
 
-      describe '.renders' do
+      describe '.views' do
         subject {
-          described.renders do
+          described.views do
             # ...
           end
         }
 
-        it { described.must_respond_to(:render) }
         it { subject.must_be_instance_of(Array) }
 
         context 'when the block is not given' do
-          subject { described.renders }
+          subject { described.views }
 
-          it { proc { subject }.must_raise(InvalidSyntax) }
+          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
         end
 
         context 'when the block is given' do
@@ -57,24 +54,22 @@ module Vedeu
         end
       end
 
-      describe '.views' do
+      describe '#lines' do
         subject {
-          described.views do
+          instance.lines do
             # ...
           end
         }
 
-        it { subject.must_be_instance_of(Array) }
+        it { subject.must_be_instance_of(Vedeu::Views::Lines) }
 
-        context 'when the block is not given' do
-          subject { described.views }
+        context 'when the required block is not provided' do
+          subject { instance.lines }
 
-          it { proc { subject }.must_raise(InvalidSyntax) }
+          it { proc { subject }.must_raise(Vedeu::InvalidSyntax) }
         end
 
-        context 'when the block is given' do
-          it { subject.must_equal([]) }
-        end
+        it { instance.must_respond_to(:line) }
       end
 
     end # View

data/test/lib/vedeu/geometry/grid_test.rb

@@ -17,11 +17,11 @@ module Vedeu
 
     describe '.columns' do
       context 'when the value is less than 1' do
-        it { proc { Grid.columns(0) }.must_raise(OutOfRange) }
+        it { proc { Grid.columns(0) }.must_raise(Vedeu::OutOfRange) }
       end
 
       context 'when the value is greater than 12' do
-        it { proc { Grid.columns(13) }.must_raise(OutOfRange) }
+        it { proc { Grid.columns(13) }.must_raise(Vedeu::OutOfRange) }
       end
 
       context 'when the value is in range' do
@@ -33,11 +33,11 @@ module Vedeu
 
     describe '.rows' do
       context 'when the value is less than 1' do
-        it { proc { Grid.rows(0) }.must_raise(OutOfRange) }
+        it { proc { Grid.rows(0) }.must_raise(Vedeu::OutOfRange) }
       end
 
       context 'when the value is greater than 12' do
-        it { proc { Grid.rows(13) }.must_raise(OutOfRange) }
+        it { proc { Grid.rows(13) }.must_raise(Vedeu::OutOfRange) }
       end
 
       context 'when the value is in range' do