vedeu 0.5.0 → 0.5.1

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

@@ -15,7 +15,7 @@ module Vedeu
       let(:described) { Vedeu::DSL::Use }
       let(:model_instance) { Vedeu::DSL::TestUseClass }
 
-      # before do
+      # before {
       #   Vedeu.interfaces.reset
       #   Vedeu.interface('hydrogen') do
       #     delay 0.75
@@ -23,7 +23,7 @@ module Vedeu
       #   Vedeu.interface('helium') do
       #     duplicate('hydrogen')
       #   end
-      # end
+      # }
 
       describe '#duplicate' do
         subject { model_instance.duplicate(_name) }

data/test/lib/vedeu/events/trigger_test.rb

@@ -40,10 +40,10 @@ module Vedeu
       context 'when multiple results occur from triggering an event' do
         let(:event_name) { :_multiple_results_ }
 
-        before do
+        before {
           Vedeu::Event.register(event_name) { :_result_one_ }
           Vedeu::Event.register(event_name) { :_result_two_ }
-        end
+        }
 
         it { subject.must_equal([:_result_one_, :_result_two_]) }
       end

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

@@ -13,19 +13,19 @@ module Vedeu
     let(:width)     { 6 }
     let(:x)         { 7 }
     let(:y)         { 5 }
-
-    before do
-      Vedeu::Border.new(name: _name, enabled: true).store
+    let(:border)    { Vedeu::Border.new(name: _name, enabled: true) }
+    let(:geometry)  {
       Vedeu::Geometry.new(name:   _name,
                           height: height,
                           width:  width,
                           x:      x,
-                          y:      y).store
-    end
-    after do
-      Vedeu.borders.reset
-      Vedeu.geometries.reset
-    end
+                          y:      y)
+    }
+
+    before {
+      Vedeu.borders.stubs(:by_name).returns(border)
+      Vedeu.geometries.stubs(:by_name).returns(geometry)
+    }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }

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

@@ -30,8 +30,6 @@ module Vedeu
     let(:y)         {}
     let(:yn)        {}
 
-    before { Terminal.stubs(:size).returns([12, 40]) }
-
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
       it {
@@ -70,6 +68,8 @@ module Vedeu
     end
 
     describe '#inspect' do
+      before { Terminal.stubs(:size).returns([12, 40]) }
+
       subject { instance.inspect }
 
       it { subject.must_be_instance_of(String) }
@@ -119,6 +119,8 @@ module Vedeu
     end
 
     describe '#top, #right, #bottom, #left' do
+      before { Terminal.stubs(:size).returns([12, 40]) }
+
       context 'maximised is true' do
         let(:attributes) { { maximised: true } }
 
@@ -195,6 +197,8 @@ module Vedeu
     describe '#maximise' do
       let(:attributes) { { maximised: true } }
 
+      before { Terminal.stubs(:size).returns([12, 40]) }
+
       subject { instance.maximise }
 
       it { instance.top.must_equal(1) }
@@ -206,6 +210,8 @@ module Vedeu
     describe '#unmaximise' do
       let(:attributes) { { maximised: false } }
 
+      before { Terminal.stubs(:size).returns([12, 40]) }
+
       subject { instance.unmaximise }
 
       it { instance.top.must_equal(1) }

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

@@ -10,25 +10,22 @@ module Vedeu
     let(:x)         { 1 }
     let(:y)         { 1 }
     let(:enabled)   { true }
-
-    before do
-      IO.console.stubs(:size).returns([15, 40])
-      Vedeu::Border.new({
-        name:    _name,
-        enabled: enabled,
-      }).store
-      Vedeu::Geometry.new({
+    let(:border)    { Vedeu::Border.new(name: _name, enabled: enabled) }
+    let(:geometry)  {
+      Vedeu::Geometry.new(
         name: _name,
         x:    5,
         xn:   35,
         y:    5,
         yn:   10
-      }).store
-    end
-    after do
-      Vedeu.borders.reset
-      Vedeu.geometries.reset
-    end
+      )
+    }
+
+    before {
+      IO.console.stubs(:size).returns([15, 40])
+      Vedeu.borders.stubs(:by_name).returns(border)
+      Vedeu.geometries.stubs(:by_name).returns(geometry)
+    }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }

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

@@ -10,17 +10,17 @@ module Vedeu
     let(:instance)  { described.new(reader) }
     let(:raw_mode)  { true }
 
-    before do
-      reader.stubs(:raw_mode?).returns(raw_mode)
-      Vedeu.stubs(:trigger).returns([false])
-    end
-
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
       it { instance.instance_variable_get('@reader').must_equal(reader) }
     end
 
     describe '.capture' do
+      before {
+        reader.stubs(:raw_mode?).returns(raw_mode)
+        Vedeu.stubs(:trigger).returns([false])
+      }
+
       subject { described.capture(reader) }
 
       context 'when in cooked mode' do

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

@@ -29,10 +29,10 @@ module Vedeu
       subject { instance.add(key) }
 
       context 'when the key is already defined' do
-        before do
+        before {
           Vedeu.keymaps.reset
           instance.add(key)
-        end
+        }
 
         it { subject.must_equal(false) }
       end

data/test/lib/vedeu/log/timer_test.rb

@@ -10,10 +10,10 @@ module Vedeu
     let(:_time)     { mock('Time') }
     let(:started)   { 1434492219.5238185 }
 
-    before do
+    before {
       Time.stubs(:now).returns(_time)
       _time.stubs(:to_f).returns(started)
-    end
+    }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }

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

@@ -6,21 +6,16 @@ module Vedeu
 
     let(:described) { Vedeu::Focus }
 
-    before do
+    before {
       Focus.reset
       Vedeu.interfaces.reset
-    end
-    after do
+    }
+    after {
       Vedeu::Focus.reset
       Vedeu.interfaces.reset
-    end
+    }
 
     describe '#add' do
-      before do
-        Focus.reset
-        Vedeu.interfaces.reset
-      end
-
       context 'adds an interface to storage' do
         it {
           Focus.add('thallium').must_equal(['thallium'])
@@ -28,9 +23,9 @@ module Vedeu
       end
 
       context 'does not add it again if already exists' do
-        before do
+        before {
           Vedeu.interface('thallium') {}
-        end
+        }
 
         it {
           Focus.add('thallium')
@@ -47,9 +42,9 @@ module Vedeu
       end
 
       context 'adds the interface to storage focussed' do
-        before do
+        before {
           Vedeu.interface('thallium') {}
-        end
+        }
 
         it {
           Focus.add('thallium')
@@ -59,9 +54,9 @@ module Vedeu
       end
 
       context 'adds the interface to storage unfocussed' do
-        before do
+        before {
           Vedeu.interface('thallium') {}
-        end
+        }
 
         it {
           Focus.add('thallium')
@@ -161,23 +156,23 @@ module Vedeu
     end
 
     describe '#next_visible_item' do
-      before do
+      before {
         Vedeu.stubs(:trigger)
         Vedeu.interface('gold') { visible true }
         Vedeu.interface('silver') { visible true }
         Vedeu.interface('platinum') { visible false }
-      end
+      }
 
       it 'the next visible interface is focussed when the method is called' do
         Focus.next_visible_item.must_equal('silver')
       end
 
       context 'when there are no visible interfaces' do
-        before do
+        before {
           Vedeu.interface('gold') { visible false }
           Vedeu.interface('silver') { visible false }
           Vedeu.interface('platinum') { visible false }
-        end
+        }
 
         it 'puts the first interface defined in focus' do
           Focus.next_visible_item.must_equal('gold')
@@ -208,23 +203,23 @@ module Vedeu
     end
 
     describe '#prev_visible_item' do
-      before do
+      before {
         Vedeu.stubs(:trigger)
         Vedeu.interface('gold') { visible true }
         Vedeu.interface('silver') { visible true }
         Vedeu.interface('platinum') { visible false }
-      end
+      }
 
       it 'the previous visible interface is focussed when the method is called' do
         Focus.prev_visible_item.must_equal('silver')
       end
 
       context 'when there are no visible interfaces' do
-        before do
+        before {
           Vedeu.interface('gold') { visible false }
           Vedeu.interface('silver') { visible false }
           Vedeu.interface('platinum') { visible false }
-        end
+        }
 
         it 'puts the first interface defined in focus' do
           Focus.prev_visible_item.must_equal('gold')
@@ -239,10 +234,10 @@ module Vedeu
     end
 
     describe '#refresh' do
-      before do
+      before {
         Focus.add('thallium')
         Vedeu.stubs(:trigger).returns([])
-      end
+      }
 
       it 'triggers the event to refresh the interface current in focus' do
         Focus.refresh.must_equal([])

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

@@ -137,14 +137,14 @@ module Vedeu
       let(:border) { mock('Vedeu::Border') }
       let(:view)   { mock('Vedeu::Viewport') }
 
-      before do
+      before {
         Vedeu::Clear::NamedInterface.stubs(:render).returns(:clear)
 
         Vedeu.borders.stubs(:by_name).returns(border)
         border.stubs(:render).returns(:border)
         Vedeu::Viewport.stubs(:new).returns(view)
         view.stubs(:render).returns(:view)
-      end
+      }
 
       subject { instance.render }
 

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

@@ -9,17 +9,19 @@ module Vedeu
     it { described.must_respond_to(:interfaces) }
 
     describe '#zindexed' do
-      before do
-        @hydrogen = Vedeu.interface 'hydrogen' do
+      before {
+        Vedeu.interfaces.reset
+
+        @hydrogen = Vedeu.interface('hydrogen') do
           zindex 2
         end
-        @helium = Vedeu.interface 'helium' do
+        @helium = Vedeu.interface('helium') do
           zindex 3
         end
-        @lithium = Vedeu.interface 'lithium' do
+        @lithium = Vedeu.interface('lithium') do
           zindex 1
         end
-      end
+      }
       after { Vedeu.interfaces.reset }
 
       subject { Vedeu.interfaces.zindexed }

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

@@ -39,11 +39,6 @@ module Vedeu
     let(:colour)    { Colour.new(foreground: '#ff0000', background: '#000000') }
     let(:style)     { Style.new('normal') }
 
-    before do
-      parent.stubs(:colour)
-      parent.stubs(:style)
-    end
-
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
       it { instance.instance_variable_get('@streams').must_equal(streams) }

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

@@ -19,8 +19,6 @@ module Vedeu
     let(:current)    { 0 }
     let(:selected)   {}
 
-    before { Vedeu.menus.reset }
-
     describe '.menu' do
       subject {
         described.menu('elements') do

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

@@ -15,10 +15,7 @@ module Vedeu
       }
       let(:_name)     { 'null_geometry' }
 
-      before do
-        Vedeu::Terminal.stubs(:height).returns(25)
-        Vedeu::Terminal.stubs(:width).returns(40)
-      end
+      before { Vedeu::Terminal.stubs(:size).returns([25, 40]) }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }

data/test/lib/vedeu/output/clear/named_interface_test.rb

@@ -28,10 +28,10 @@ module Vedeu
           Vedeu::Geometry.new(name: _name, x: 1, y: 1, xn: 2, yn: 2)
         }
 
-        before do
+        before {
           Vedeu.interfaces.stubs(:by_name).returns(interface)
           Vedeu.geometries.stubs(:by_name).returns(geometry)
-        end
+        }
 
         subject { instance.render }
 

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

@@ -6,8 +6,6 @@ module Vedeu
 
     let(:described) { Vedeu::Esc }
 
-    before { Vedeu::Terminal.stubs(:size).returns([80, 25]) }
-
     describe '.escape' do
       let(:stream) { "\e[0m\e[38;2;39m\e[48;2;49m\e[2J\e[?25l" }
 
@@ -54,8 +52,6 @@ module Vedeu
         it { described.string('hide_cursor').must_equal("\e[?25l") }
         it { described.string('screen_init').
                must_equal("\e[0m\e[39m\e[49m\e[2J\e[?25l") }
-        it { described.string('screen_exit').
-               must_equal("\e[?25h\e[39m\e[49m\e[0m\e[80;25H\n") }
         it { described.string('negative').must_equal("\e[7m") }
         it { described.string('positive').must_equal("\e[27m") }
         it { described.string('reset').must_equal("\e[0m") }
@@ -66,6 +62,13 @@ module Vedeu
         it { described.string('underline_off').must_equal("\e[24m") }
         it { described.string('cursor_position').must_equal("\e[6n") }
       end
+
+      context 'screen_exit' do
+        before { Vedeu::Terminal.stubs(:size).returns([80, 25]) }
+
+        it { described.string('screen_exit').
+               must_equal("\e[?25h\e[39m\e[49m\e[0m\e[80;25H\n") }
+      end
     end
 
   end # Esc