vedeu 0.3.5 → 0.4.0

data/test/lib/vedeu/distributed/client_test.rb

@@ -17,8 +17,6 @@ module Vedeu
 
       describe '.connect' do
         subject { described.connect(uri) }
-
-        # it { subject.must_be_instance_of(Symbol) }
       end
 
       describe '#input' do

data/test/lib/vedeu/distributed/test_application_test.rb

@@ -10,7 +10,6 @@ module Vedeu
 
     describe '#initialize' do
       it { instance.must_be_instance_of(Vedeu::TestApplication) }
-      # it { subject.instance_variable_get('@attributes').must_equal(attributes) }
     end
 
     describe '.build' do

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

@@ -8,7 +8,7 @@ module Vedeu
 
       let(:described) { Vedeu::DSL::Keymap }
       let(:instance)  { described.new(model) }
-      let(:model)     { Vedeu::Keymap.new('_test_') }
+      let(:model)     { Vedeu::Keymap.new({ name: '_test_' }) }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -51,12 +51,6 @@ module Vedeu
         end
 
         context 'when the key is not valid (already defined)' do
-          # let(:key_j) { Key.new('j') { :do_something } }
-          # let(:key_down) { Key.new(:down) { :do_something } }
-
-          # before { model.stubs(:keys).returns([key_j, key_down]) }
-
-          # it { subject.must_equal(false) }
         end
       end
 

data/test/lib/vedeu/dsl/components/menu_test.rb

@@ -18,59 +18,11 @@ module Vedeu
       let(:collection) { [:sodium, :magnesium, :aluminium, :silicon] }
       let(:menu_name)  { 'elements' }
 
-      # describe '.define' do
-      #   before { Menus.reset }
-
-      #   context 'when a block was not given' do
-      #     it { proc { Vedeu.menu }.must_raise(InvalidSyntax) }
-      #   end
-
-      #   context 'when no name was specified' do
-      #     it { proc { Vedeu.menu { } }.must_raise(MissingRequired) }
-      #   end
-
-      #   it 'adds the menu to the menus repository' do
-      #     Vedeu.menu do
-      #       name  menu_name
-      #       items menu_items
-      #     end
-
-      #     Vedeu::Menus.registered.must_equal(['elements'])
-      #   end
-      # end
-
       describe '#initialize' do
         it { instance.must_be_instance_of(Vedeu::DSL::Menu) }
         it { instance.instance_variable_get('@model').must_equal(model) }
       end
 
-      # describe '.define' do
-      #   before { Menus.reset }
-
-      #   context 'when a block was not given' do
-      #     it { proc { Menu.define }.must_raise(InvalidSyntax) }
-      #   end
-
-      #   context 'when no name was specified for the menu' do
-      #     it { proc { Menu.define { } }.must_raise(MissingRequired) }
-      #   end
-
-      #   it 'adds the menu to the menus repository' do
-      #     Menu.define do
-      #       name  'elements'
-      #       items [:sodium, :magnesium, :aluminium, :silicon]
-      #     end
-
-      #     Vedeu::Menus.registered.must_equal(['elements'])
-      #   end
-
-      #   it 'returns the API::Menu instance' do
-      #     Menu.define do
-      #       name 'elements'
-      #     end.must_be_instance_of(Vedeu::Menu)
-      #   end
-      # end
-
       describe '#item' do
         let(:value) { :platinum }
 

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

@@ -45,134 +45,6 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Border) }
       end
 
-      # describe '#define' do
-      #   interface = Interface.new({ name: 'widget' })
-
-      #   it 'creates and stores a new interface' do
-      #     interface.define.must_be_instance_of(API::Interface)
-      #   end
-
-      #   it 'allows the setting of colours' do
-      #     Interface.build do
-      #       colour foreground: '#aadd00', background: '#222222'
-      #     end.must_equal(
-      #       {
-      #         border: {},
-      #         colour: {
-      #           foreground: '#aadd00',
-      #           background: '#222222'
-      #         },
-      #         cursor: :hide,
-      #         delay: 0.0,
-      #         geometry: {},
-      #         group: '',
-      #         lines: [],
-      #         name: '',
-      #         parent: nil,
-      #         style: '',
-      #       }
-      #     )
-      #   end
-
-      #   it 'allows the setting of styles' do
-      #     Interface.build do
-      #       style 'underline'
-      #     end.must_equal(
-      #       {
-      #         border: {},
-      #         colour: {},
-      #         cursor: :hide,
-      #         delay: 0.0,
-      #         geometry: {},
-      #         group: '',
-      #         lines: [],
-      #         name: '',
-      #         parent: nil,
-      #         style: "underline",
-      #       }
-      #     )
-      #   end
-
-      #   it 'allows the use of other interfaces for attributes like geometry' do
-      #     IO.console.stub(:winsize, [25, 40]) do
-      #       interface = Vedeu.interface 'my_interface' do
-      #         geometry do
-      #           x      5
-      #           y      5
-      #           width  5
-      #           height 5
-      #         end
-      #       end
-      #       Interface.build do
-      #         name   'my_other_interface'
-      #         y      use('my_interface').south
-      #       end.must_equal({
-      #         border: {},
-      #         colour: {},
-      #         cursor: :hide,
-      #         delay: 0.0,
-      #         geometry: {
-      #           y: 11
-      #         },
-      #         group: '',
-      #         lines: [],
-      #         name: "my_other_interface",
-      #         parent: nil,
-      #         style: '',
-      #       })
-      #     end
-      #   end
-
-      #   it 'allows the setting of a delay for events triggered for this ' \
-      #      'interface' do
-      #     Interface.build do
-      #       delay 1.0
-      #     end.must_equal(
-      #       {
-      #         border: {},
-      #         colour: {},
-      #         cursor: :hide,
-      #         delay: 1.0,
-      #         geometry: {},
-      #         group: '',
-      #         lines: [],
-      #         name: '',
-      #         parent: nil,
-      #         style: '',
-      #       })
-      #   end
-
-      #   it 'allows the interface to be part of a group- useful for creating ' \
-      #      'separate views' do
-      #     Interface.build do
-      #       group 'my_group'
-      #     end.must_equal(
-      #       {
-      #         border: {},
-      #         colour: {},
-      #         cursor: :hide,
-      #         delay: 0.0,
-      #         geometry: {},
-      #         group: "my_group",
-      #         lines: [],
-      #         name: '',
-      #         parent: nil,
-      #         style: '',
-      #       }
-      #     )
-      #   end
-      # end
-
-      # describe '#centred' do
-      #   it 'returns false if the value is false or nil' do
-      #     DSL::Interface.new.centred(false).must_equal(false)
-      #   end
-
-      #   it 'returns true' do
-      #     DSL::Interface.new.centred.must_equal(true)
-      #   end
-      # end
-
       describe '#cursor' do
         let(:value) {}
 
@@ -262,19 +134,6 @@ module Vedeu
           end
         end
 
-        # context 'when multiple calls are made' do
-        #   before do
-        #     Vedeu::Focus.reset
-        #     Vedeu.interface('curium')     { focus! }
-        #     Vedeu.interface('iodine')     {}
-        #     Vedeu.interface('dysprosium') { focus! }
-        #   end
-
-        #   it 'the last call will set that interface to be current' do
-        #     Vedeu.focus.must_equal('dysprosium')
-        #   end
-        # end
-
         context 'when no calls are made' do
           before do
             Vedeu::Focus.reset
@@ -318,7 +177,7 @@ module Vedeu
         end
       end
 
-      describe '#keys' do
+      describe '#keymap' do
         subject {
           instance.keys do
             # ...
@@ -326,34 +185,6 @@ module Vedeu
         }
 
         it { subject.must_be_instance_of(Vedeu::Keymap) }
-
-        context 'when the required block is not provided' do
-          subject { instance.keys }
-
-          it { proc { subject }.must_raise(InvalidSyntax) }
-        end
-
-        # before do
-        #   Keymaps.reset
-
-        #   Vedeu.interface 'iron' do
-        #     keys do
-        #       key('k') { :k_pressed }
-        #     end
-        #   end
-        # end
-
-        # it 'defines a keymap for the interface' do
-        #   Keymaps.interface_key?('k').must_equal(true)
-        # end
-
-        # it 'defines a keymap for the interface' do
-        #   Keymaps.interface_keys('iron').must_equal(['k'])
-        # end
-
-        # context 'when the block is not given' do
-        #   it { proc { Vedeu.interface('iron') { keys } }.must_raise(InvalidSyntax) }
-        # end
       end
 
       describe '#lines' do
@@ -370,99 +201,6 @@ module Vedeu
 
           it { proc { subject }.must_raise(InvalidSyntax) }
         end
-
-        # it 'adds a blank line with no arguments' do
-        #   interface = Vedeu.interface 'carbon' do
-        #     line
-        #   end
-        #   interface.must_be_instance_of(API::Interface)
-        #   interface.attributes.must_equal(
-        #     {
-        #       border: {},
-        #       colour: {},
-        #       cursor: :hide,
-        #       delay: 0.0,
-        #       geometry: {},
-        #       group: '',
-        #       lines: [
-        #         {
-        #           colour: {},
-        #           streams: {
-        #             text: ''
-        #           },
-        #           style: [],
-        #         }
-        #       ],
-        #       name: 'carbon',
-        #       parent: nil,
-        #       style: '',
-        #     }
-        #   )
-        # end
-
-        # it 'adds a line directly with a value and no block' do
-        #   interface = Vedeu.interface 'carbon' do
-        #     line 'This is some text...'
-        #   end
-        #   interface.must_be_instance_of(API::Interface)
-        #   interface.attributes.must_equal(
-        #     {
-        #       border: {},
-        #       colour: {},
-        #       cursor: :hide,
-        #       delay: 0.0,
-        #       geometry: {},
-        #       group: '',
-        #       lines: [
-        #         {
-        #           colour: {},
-        #           parent: composition,
-        #           streams: {
-        #             text: "This is some text..."
-        #           },
-        #           style: [],
-        #         }
-        #       ],
-        #       name: 'carbon',
-        #       parent: nil,
-        #       style: '',
-        #     }
-        #   )
-        # end
-
-        # it 'allows the addition of more attributes with a block' do
-        #   interface = Vedeu.interface 'silicon' do
-        #     lines do
-        #       text 'This is different text...'
-        #     end
-        #   end
-        #   interface.must_be_instance_of(API::Interface)
-        #   interface.attributes.must_equal(
-        #     {
-        #       border: {},
-        #       colour: {},
-        #       cursor: :hide,
-        #       delay: 0.0,
-        #       geometry: {},
-        #       group: '',
-        #       lines: [
-        #         {
-        #           colour: {},
-        #           parent: composition,
-        #           streams: [
-        #             {
-        #               text: "This is different text..."
-        #             }
-        #           ],
-        #           style: [],
-        #         }
-        #       ],
-        #       name: "silicon",
-        #       parent: nil,
-        #       style: '',
-        #     }
-        #   )
-        # end
       end
 
       describe '#name' do

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

@@ -7,12 +7,6 @@ module Vedeu
     describe Text do
 
       describe '#text' do
-
-        # it { described.must_respond_to(:align) }
-        # it { described.must_respond_to(:center) }
-        # it { described.must_respond_to(:centre) }
-        # it { described.must_respond_to(:left) }
-        # it { described.must_respond_to(:right) }
       end
 
     end # Text

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

@@ -20,8 +20,6 @@ module Vedeu
       describe '#stream' do
         subject { instance.stream { } }
 
-        # it { subject.must_be_instance_of(Vedeu::Stream) }
-
         context 'when the block is not given' do
           subject { instance.stream }
 

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

@@ -20,7 +20,6 @@ module Vedeu
       it { instance.must_be_instance_of(Event) }
       it { instance.instance_variable_get('@name').must_equal(event_name) }
       it { instance.instance_variable_get('@options').must_equal(options) }
-      # it { instance.instance_variable_get('@closure').must_equal(closure) }
       it { instance.instance_variable_get('@deadline').must_equal(0) }
       it { instance.instance_variable_get('@executed_at').must_equal(0) }
       it { instance.instance_variable_get('@now').must_equal(0) }

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

@@ -4,8 +4,14 @@ module Vedeu
 
   describe Keymap do
 
-    let(:described) { Vedeu::Keymap }
-    let(:instance)  { described.new(map_name, keys) }
+    let(:described)  { Vedeu::Keymap }
+    let(:instance)   { described.new(attributes) }
+    let(:attributes) {
+      {
+        name: map_name,
+        keys: keys
+      }
+    }
     let(:map_name)  { 'zirconium' }
     let(:keys)      { [] }
     let(:key)       { Vedeu::Key.new('a') { :output } }

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

@@ -41,7 +41,7 @@ module Vedeu
 
         context 'and the key is defined' do
           let(:key_test) { Key.new('a') { :do_something } }
-          let(:keymap_test) { Keymap.new('test', [key_test]) }
+          let(:keymap_test) { Keymap.new({ name: 'test', keys: [key_test] }) }
 
           before do
             Vedeu.keymaps.reset
@@ -71,7 +71,7 @@ module Vedeu
 
         context 'and the key is defined' do
           let(:key_test) { Key.new('a') { :do_something } }
-          let(:keymap_test) { Keymap.new('test', [key_test]) }
+          let(:keymap_test) { Keymap.new({ name: 'test', keys: [key_test] }) }
 
           before do
             Vedeu.keymaps.reset

data/test/lib/vedeu/launcher_test.rb

@@ -40,18 +40,6 @@ module Vedeu
       it 'returns 0 for successful execution' do
         subject.must_equal(0)
       end
-
-      # context 'when an exception is raised' do
-      #   before do
-      #     Application.stubs(:start).raises(StandardError)
-      #   end
-
-      #   it 'displays the exception' do
-      #     capture_io do
-      #       Launcher.execute!
-      #     end.must_equal(["", ""])
-      #   end
-      # end
     end
 
   end # Launcher

data/test/lib/vedeu/main_loop_test.rb

@@ -8,15 +8,9 @@ module Vedeu
 
     describe '.start!' do
       before do
-        # subject.expects(:while).yields do
-        #   String.expects(:new).returns("samantha")
-        # end
       end
 
       subject { described.start! { } }
-
-      # it { subject; described.instance_variable_get('@started').must_equal(true) }
-      # it { subject; described.instance_variable_get('@loop').must_equal(true) }
     end
 
     describe '.stop!' do
@@ -25,17 +19,6 @@ module Vedeu
       it { subject; described.instance_variable_get('@loop').must_equal(false) }
     end
 
-    describe '.safe_exit_point!' do
-      subject { described.safe_exit_point! }
-
-      context 'when we wish to continue' do
-      end
-
-      context 'when we wish to stop' do
-        # it { proc { subject }.must_raise(VedeuInterrupt) }
-      end
-    end
-
   end # MainLoop
 
 end # Vedeu

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

@@ -6,17 +6,37 @@ module Vedeu
 
     let(:described) { Vedeu::Focus }
 
-    before { Focus.reset }
+    before do
+      Focus.reset
+      Vedeu.interfaces.reset
+      Vedeu.interface('thallium') {}
+      Vedeu.interface('lead')     {}
+      Vedeu.interface('bismuth')  {}
+    end
 
     describe '#add' do
-      it 'adds an interface to storage' do
-        Focus.add('thallium').must_equal(['thallium'])
+      context 'adds an interface to storage' do
+        before do
+          Focus.reset
+          Vedeu.interfaces.reset
+        end
+
+        it {
+          Focus.add('thallium').must_equal(['thallium'])
+        }
       end
 
-      it 'does not add it again if already exists' do
-        Focus.add('thallium')
-        Focus.add('thallium')
-        Focus.registered.must_equal(['thallium'])
+      context 'does not add it again if already exists' do
+        before do
+          Focus.reset
+          Vedeu.interfaces.reset
+          Vedeu.interface('thallium') {}
+        end
+
+        it {
+          Focus.add('thallium')
+          Focus.registered.must_equal(['thallium'])
+        }
       end
 
       it 'does not add it again if already exists' do
@@ -27,16 +47,32 @@ module Vedeu
         Focus.registered.must_equal(['bismuth', 'thallium', 'lead'])
       end
 
-      it 'adds the interface to storage focussed' do
-        Focus.add('thallium')
-        Focus.add('lead', true)
-        Focus.registered.must_equal(['lead', 'thallium'])
+      context 'adds the interface to storage focussed' do
+        before do
+          Focus.reset
+          Vedeu.interfaces.reset
+          Vedeu.interface('thallium') {}
+        end
+
+        it {
+          Focus.add('thallium')
+          Focus.add('lead', true)
+          Focus.registered.must_equal(['lead', 'thallium'])
+        }
       end
 
-      it 'adds the interface to storage unfocussed' do
-        Focus.add('thallium')
-        Focus.add('lead')
-        Focus.registered.must_equal(['thallium', 'lead'])
+      context 'adds the interface to storage unfocussed' do
+        before do
+          Focus.reset
+          Vedeu.interfaces.reset
+          Vedeu.interface('thallium') {}
+        end
+
+        it {
+          Focus.add('thallium')
+          Focus.add('lead')
+          Focus.registered.must_equal(['thallium', 'lead'])
+        }
       end
     end
 
@@ -122,8 +158,10 @@ module Vedeu
         Focus.next_item.must_equal('lead')
       end
 
-      it 'returns false if storage is empty' do
-        Focus.next_item.must_equal(false)
+      context 'returns false if storage is empty' do
+        before { Focus.reset }
+
+        it { Focus.next_item.must_equal(false) }
       end
     end
 
@@ -135,8 +173,10 @@ module Vedeu
         Focus.prev_item.must_equal('bismuth')
       end
 
-      it 'returns false if storage is empty' do
-        Focus.prev_item.must_equal(false)
+      context 'returns false if storage is empty' do
+        before { Focus.reset }
+
+        it { Focus.prev_item.must_equal(false) }
       end
     end