vedeu 0.6.71 → 0.7.0

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

@@ -31,20 +31,20 @@ module Vedeu
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@members').must_equal(members) }
         it { instance.instance_variable_get('@name').must_equal(_name) }
-        it {
+        it do
           instance.instance_variable_get('@repository').must_equal(repository)
-        }
+        end
         it { instance.instance_variable_get('@visible').must_equal(visible) }
       end
 
       describe 'accessors' do
-        it {
+        it do
           instance.must_respond_to(:name)
           instance.must_respond_to(:name=)
           instance.must_respond_to(:visible)
           instance.must_respond_to(:visible=)
           instance.must_respond_to(:visible?)
-        }
+        end
       end
 
       describe '#add' do

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

@@ -51,10 +51,10 @@ module Vedeu
           # @todo Add more tests.
           # it { skip }
 
-          # it {
+          # it do
           #   Vedeu.expects(:trigger).with(:_refresh_view_)
           #   subject
-          # }
+          # end
         end
       end
 

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

@@ -62,32 +62,34 @@ module Vedeu
               context 'when the key is registered with a keymap' do
                 let(:registered) { true }
 
-                it {
-                  Vedeu::Input::Mapper.expects(:registered?).with(translated, _name)
+                it do
+                  Vedeu::Input::Mapper.
+                    expects(:registered?).with(translated, _name)
                   subject
-                }
+                end
 
-                it {
-                  Vedeu.expects(:trigger).with(:_keypress_, translated, 'Vedeu::Input::Capture')
+                it do
+                  Vedeu.expects(:trigger).
+                    with(:_keypress_, translated, 'Vedeu::Input::Capture')
                   subject
-                }
+                end
               end
 
               context 'when the key is not registered with a keymap' do
                 context 'when the interface is editable' do
                   let(:editable) { true }
 
-                  it {
+                  it do
                     Vedeu.expects(:trigger).with(:_editor_, :shift_f5)
                     subject
-                  }
+                  end
                 end
 
                 context 'when the interface is not editable' do
-                  it {
+                  it do
                     Vedeu.expects(:trigger).with(:key, :shift_f5)
                     subject
-                  }
+                  end
                 end
               end
             end
@@ -96,51 +98,51 @@ module Vedeu
               let(:keypress)   { "\e[M`6E" }
               let(:translated) {}
 
-              it {
+              it do
                 Vedeu.expects(:trigger).with(:_cursor_up_, _name)
                 Vedeu.expects(:trigger).with(:_mouse_event_, "\e[M`6E")
                 subject
-              }
+              end
             end
 
             context 'when the key is :f6 key (read_nonblock(5))' do
               let(:keypress)   { "\e[17~" }
               let(:translated) { :f6 }
 
-              it {
+              it do
                 Vedeu.expects(:trigger).with(:key, translated)
                 subject
-              }
+              end
             end
 
             context 'when the key is :delete (read_nonblock(4))' do
               let(:keypress) { "\e[3~" }
               let(:translated) { :delete }
 
-              it {
+              it do
                 Vedeu.expects(:trigger).with(:key, translated)
                 subject
-              }
+              end
             end
 
             context 'when the key is :up (read_nonblock(3))' do
               let(:keypress) { "\e[A" }
               let(:translated) { :up }
 
-              it {
+              it do
                 Vedeu.expects(:trigger).with(:key, translated)
                 subject
-              }
+              end
             end
 
             context 'when the key is :escape (read_nonblock(1))' do
               let(:keypress) { "\e" }
               let(:translated) { :escape }
 
-              it {
+              it do
                 Vedeu.expects(:trigger).with(:key, translated)
                 subject
-              }
+              end
             end
           end
 
@@ -148,10 +150,10 @@ module Vedeu
             let(:keypress)   { 'r' }
             let(:translated) { 'r' }
 
-            it {
+            it do
               Vedeu.expects(:trigger).with(:key, keypress)
               subject
-            }
+            end
           end
         end
 
@@ -164,67 +166,67 @@ module Vedeu
             context 'when the key is :shift_f5 (read_nonblock(7))' do
               let(:keypress) { "\e[15;2~" }
 
-              it {
+              it do
                 Vedeu.expects(:trigger).with(:_keypress_, :shift_f5)
                 subject
-              }
+              end
             end
 
             context 'when the key is really a mouse click (read_nonblock(6))' do
               let(:keypress) { "\e[M`6E" }
 
-              it {
+              it do
                 Vedeu.expects(:trigger).with(:_cursor_up_, _name)
                 Vedeu.expects(:trigger).with(:_mouse_event_, "\e[M`6E")
                 Vedeu.expects(:trigger).with(:_keypress_, nil)
                 subject
-              }
+              end
             end
 
             context 'when the key is :f6 key (read_nonblock(5))' do
               let(:keypress) { "\e[17~" }
 
-              it {
+              it do
                 Vedeu.expects(:trigger).with(:_keypress_, :f6)
                 subject
-              }
+              end
             end
 
             context 'when the key is :delete (read_nonblock(4))' do
               let(:keypress) { "\e[3~" }
 
-              it {
+              it do
                 Vedeu.expects(:trigger).with(:_keypress_, :delete)
                 subject
-              }
+              end
             end
 
             context 'when the key is :up (read_nonblock(3))' do
               let(:keypress) { "\e[A" }
 
-              it {
+              it do
                 Vedeu.expects(:trigger).with(:_keypress_, :up)
                 subject
-              }
+              end
             end
 
             context 'when the key is :escape (read_nonblock(1))' do
               let(:keypress) { "\e" }
 
-              it {
+              it do
                 Vedeu.expects(:trigger).with(:_keypress_, :escape)
                 subject
-              }
+              end
             end
           end
 
           context 'when the keypress is not an escape sequence' do
             let(:keypress)    { 'r' }
 
-            it {
+            it do
               Vedeu.expects(:trigger).with(:_keypress_, keypress)
               subject
-            }
+            end
           end
         end
 
@@ -239,17 +241,17 @@ module Vedeu
           context 'when the input is a mouse click' do
             let(:command) { "\e[M`6E" }
 
-            it {
+            it do
               Vedeu.expects(:trigger).with(:_command_, command)
               subject
-            }
+            end
           end
 
           context 'when the input is not a mouse click' do
-            it {
+            it do
               Vedeu.expects(:trigger).with(:_command_, 'help')
               subject
-            }
+            end
           end
         end
       end

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

@@ -24,41 +24,43 @@ module Vedeu
         context 'when the left mouse button was pressed' do
           let(:input) { "\e[M ,%" }
 
-          it {
+          it do
             Vedeu.expects(:trigger).with(:_mouse_event_, input)
-            Vedeu.expects(:trigger).with(:_cursor_reposition_, Vedeu.focus, 5, 12)
+            Vedeu.expects(:trigger).
+              with(:_cursor_reposition_, Vedeu.focus, 5, 12)
             subject
-          }
+          end
         end
 
         context 'when the mouse scroll wheel was moved upwards' do
           let(:input) { "\e[M`6E" }
 
-          it {
+          it do
             Vedeu.expects(:trigger).with(:_mouse_event_, input)
             Vedeu.expects(:trigger).with(:_cursor_up_, Vedeu.focus)
             subject
-          }
+          end
         end
 
         context 'when the mouse scroll wheel was moved downwards' do
           let(:input) { "\e[MaN5" }
 
-          it {
+          it do
             Vedeu.expects(:trigger).with(:_mouse_event_, input)
             Vedeu.expects(:trigger).with(:_cursor_down_, Vedeu.focus)
             subject
-          }
+          end
         end
 
         context 'when the mouse input was not recognised' do
           let(:input) { "\e[Mb0(" }
 
-          it {
+          it do
             Vedeu.expects(:trigger).with(:_mouse_event_, input)
-            subject.must_equal("\e[93m[input]    \e[39m\e[33mVedeu does not " \
-                               "support mouse button '66' yet.\e[39m")
-          }
+            subject.
+              must_equal("\e[93m[input]    \e[39m\e[33mVedeu does not " \
+                         "support mouse button '66' yet.\e[39m")
+          end
         end
       end
 

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

@@ -29,21 +29,21 @@ module Vedeu
           context 'when input was given' do
             let(:input) { 'Some text...' }
 
-            it {
+            it do
               Vedeu.expects(:trigger).with(:_command_, input)
               subject.must_equal(input)
-            }
+            end
           end
 
           context 'when input was not given' do
             let(:some_input) { "Some text...\n" }
             let(:chomped)    { 'Some text...' }
 
-            it {
+            it do
               Vedeu::Terminal.console.expects(:gets).returns(some_input)
               Vedeu.expects(:trigger).with(:_command_, chomped)
               subject.must_equal(chomped)
-            }
+            end
           end
         end
 
@@ -53,33 +53,33 @@ module Vedeu
           context 'when input was given' do
             let(:input) { 'S' }
 
-            it {
+            it do
               Vedeu.expects(:trigger).with(:_keypress_, input)
               subject.must_equal(input)
-            }
+            end
           end
 
           context 'when input was not given' do
             let(:some_input) { 'T' }
             let(:translated) { 'T' }
 
-            it {
+            it do
               Vedeu::Terminal.console.expects(:getch).returns(some_input)
               Vedeu::Input::Translator.expects(:translate).returns(translated)
               Vedeu.expects(:trigger).with(:_keypress_, translated)
               subject.must_equal(translated)
-            }
+            end
 
             context 'but a special key is pressed' do
               let(:some_input) { "\e[23;2~" }
               let(:translated) { :shift_f11 }
 
-              it {
+              it do
                 Vedeu::Terminal.console.expects(:getch).returns(some_input)
                 Vedeu::Input::Translator.expects(:translate).returns(translated)
                 Vedeu.expects(:trigger).with(:_keypress_, translated)
                 subject.must_equal(translated)
-              }
+              end
             end
           end
         end

data/test/lib/vedeu/interfaces/clear_test.rb

@@ -37,6 +37,7 @@ module Vedeu
         let(:interface) {
           Vedeu::Interfaces::Interface.new(name: _name, visible: visible)
         }
+        let(:colour)    { interface.colour }
         let(:visible)   { true }
         let(:geometry)  {
           Vedeu::Geometries::Geometry.new(name: _name, x: 1, y: 1, xn: 2, yn: 2)
@@ -44,11 +45,19 @@ module Vedeu
         let(:output) {
           [
             [
-              Vedeu::Views::Char.new(name: _name, value: ' ', position: [1, 1]),
-              Vedeu::Views::Char.new(name: _name, value: ' ', position: [1, 2]),
+              Vedeu::Cells::Clear.new(colour:   colour,
+                                      name:     _name,
+                                      position: [1, 1]),
+              Vedeu::Cells::Clear.new(colour:   colour,
+                                      name:     _name,
+                                      position: [1, 2]),
             ], [
-              Vedeu::Views::Char.new(name: _name, value: ' ', position: [2, 1]),
-              Vedeu::Views::Char.new(name: _name, value: ' ', position: [2, 2]),
+              Vedeu::Cells::Clear.new(colour:   colour,
+                                      name:     _name,
+                                      position: [2, 1]),
+              Vedeu::Cells::Clear.new(colour:   colour,
+                                      name:     _name,
+                                      position: [2, 2]),
             ]
           ]
         }
@@ -62,10 +71,10 @@ module Vedeu
         subject { instance.render }
 
         it { subject.must_be_instance_of(Array) }
-        it {
+        it do
           Vedeu.expects(:render_output).with(output)
           subject
-        }
+        end
         it { subject.must_equal(output) }
       end
 

data/test/lib/vedeu/interfaces/dsl_test.rb

@@ -45,10 +45,10 @@ module Vedeu
       describe '#delay' do
         subject { instance.delay(0.25) }
 
-        it {
+        it do
           subject
           model.delay.must_equal(0.25)
-        }
+        end
       end
 
       describe '#editable' do
@@ -118,26 +118,26 @@ module Vedeu
                                      members: ['lanthanum']).store
           end
 
-          it {
+          it do
             subject
             Vedeu.groups.find('elements').members.must_equal(members)
-          }
+          end
         end
 
         context 'when the named group does not exist' do
-          it {
+          it do
             subject
             Vedeu.groups.find('elements').members.must_equal(Set['actinium'])
-          }
+          end
         end
       end
 
       describe '#keymap' do
-        subject {
+        subject do
           instance.keys do
             # ...
           end
-        }
+        end
 
         it { subject.must_be_instance_of(Vedeu::Input::Keymap) }
         it { instance.must_respond_to(:keys) }
@@ -146,28 +146,28 @@ module Vedeu
       describe '#name' do
         subject { instance.name('nickel') }
 
-        it {
+        it do
           subject
           model.name.must_equal('nickel')
-        }
+        end
       end
 
       describe '#show!' do
-        subject {
+        subject do
           Vedeu.interface 'xenon' do
             show!
           end
-        }
+        end
 
         it { subject.visible.must_equal(true) }
       end
 
       describe '#hide!' do
-        subject {
+        subject do
           Vedeu.interface 'xenon' do
             hide!
           end
-        }
+        end
 
         it { subject.visible.must_equal(false) }
       end