vedeu 0.6.32 → 0.6.33

data/lib/vedeu/interfaces/null.rb

@@ -12,15 +12,9 @@ module Vedeu
       # @return [String]
       attr_reader :attributes
 
-      # Returns a new instance of Vedeu::Interfaces::Null.
-      #
-      # @param attributes [Hash<Symbol => void>]
-      # @option attributes name [String|Symbol]
-      # @return [Vedeu::Interfaces::Null]
-      def initialize(attributes = {})
-        @attributes = attributes
-        @name       = @attributes[:name]
-        @visible    = false
+      # @return [String]
+      def group
+        ''
       end
 
     end # Null

data/lib/vedeu/models/focus.rb

@@ -82,7 +82,11 @@ module Vedeu
       #
       # @return [String]
       def current
-        storage[0]
+        return storage[0] unless empty?
+
+        fail Vedeu::Error::Fatal,
+             'No interfaces or views have been registered, therefore the ' \
+             'focus table is empty.'.freeze
       end
       alias_method :focus, :current
 

data/lib/vedeu/null/generic.rb

@@ -21,7 +21,7 @@ module Vedeu
       # @return [Vedeu::Null::Generic]
       def initialize(attributes = {})
         @attributes = attributes
-        @name       = @attributes[:name]
+        @name       = @attributes.fetch(:name, '')
       end
 
       # @return [FalseClass]
@@ -33,6 +33,8 @@ module Vedeu
       alias_method :maximise, :falsy
       alias_method :maximised?, :falsy
       alias_method :unmaximise, :falsy
+      alias_method :visible, :falsy
+      alias_method :visible?, :falsy
 
       # @return [NilClass]
       def null(*)
@@ -70,14 +72,6 @@ module Vedeu
         self
       end
 
-      # The generic null should not be visible.
-      #
-      # @return [FalseClass]
-      def visible?
-        false
-      end
-      alias_method :visible, :visible?
-
       # @return [FalseClass]
       def visible=(*)
         false

data/lib/vedeu/output/clear/interface.rb

@@ -6,6 +6,8 @@ module Vedeu
     #
     class Interface
 
+      include Vedeu::Common
+
       class << self
 
         # Clear the interface with the given name.
@@ -16,7 +18,9 @@ module Vedeu
         #
         # @return [Array<Array<Vedeu::Views::Char>>]
         # @see #initialize
-        def render(name)
+        def render(name = Vedeu.focus)
+          name || Vedeu.focus
+
           new(name).render
         end
         alias_method :clear_by_name, :render
@@ -30,7 +34,9 @@ module Vedeu
         #
         # @return [Array<Array<Vedeu::Views::Char>>]
         # @see #initialize
-        def clear_content_by_name(name)
+        def clear_content_by_name(name = Vedeu.focus)
+          name || Vedeu.focus
+
           new(name, content_only: true).render
         end
 
@@ -45,7 +51,7 @@ module Vedeu
       #   not the border as well. Defaults to false.
       # @return [Vedeu::Clear::Interface]
       def initialize(name, options = {})
-        @name    = name
+        @name    = present?(name) ? name : Vedeu.focus
         @options = options
       end
 

data/lib/vedeu/repositories/repository.rb

@@ -62,8 +62,8 @@ module Vedeu
       #
       # @param name [String|Symbol] The name of the stored model.
       # @return [void]
-      def by_name(name)
-        name ||= Vedeu.focus
+      def by_name(name = Vedeu.focus)
+        name = present?(name) ? name : Vedeu.focus
 
         return find(name) if registered?(name)
 

data/lib/vedeu/terminal/buffer.rb

@@ -95,6 +95,8 @@ module Vedeu
           buffer[v.position.y][v.position.x] = v if valid_position?(v)
         end
 
+        render
+
         self
       end
 

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.32'.freeze
+  VERSION = '0.6.33'.freeze
 
 end

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

@@ -22,7 +22,7 @@ module Vedeu
                                    show_left:   show_left,
                                    show_right:  show_right)
       }
-      let(:visible)     { false }
+      let(:visible)     { true }
       let(:enabled)     { false }
       let(:_name)       { 'Vedeu::Borders::Refresh' }
       let(:title)       {}
@@ -46,7 +46,7 @@ module Vedeu
           Vedeu::Geometry::Geometry.new(name: _name, x: 1, xn: 7, y: 1, yn: 4)
         }
         let(:interface) {
-          Vedeu::Interfaces::Interface.new(name: _name, visible: true)
+          Vedeu::Interfaces::Interface.new(name: _name, visible: visible)
         }
         before do
           Vedeu.borders.stubs(:by_name).returns(border)
@@ -63,9 +63,17 @@ module Vedeu
             Vedeu.expects(:render_output)
             subject
           }
+
+          context 'but the interface/view is not visible' do
+            let(:visible) { false }
+
+            it { Vedeu.expects(:render_output).never }
+            it { subject.must_equal(nil) }
+          end
         end
 
         context 'when the border is not enabled' do
+          it { Vedeu.expects(:render_output).never }
           it { subject.must_equal(nil) }
         end
       end

data/test/lib/vedeu/cursors/repository_test.rb

@@ -11,26 +11,35 @@ module Vedeu
       it { described.must_respond_to(:cursors) }
 
       describe '.cursor' do
+        before { Vedeu::Models::Focus.reset }
+
         subject { Vedeu.cursor }
 
         context 'when there are cursors are defined' do
           before do
-            Vedeu::Models::Focus.reset
             Vedeu.cursors.reset
-            Vedeu::Models::Focus.add('Vedeu.cursor')
             Vedeu::Cursors::Cursor.store(name: 'Vedeu.cursor')
+            Vedeu::Models::Focus.add('Vedeu.cursor')
           end
 
-          it { subject.must_be_instance_of(Vedeu::Cursors::Cursor) }
+          it 'returns the cursor of the interface/view currently in focus' do
+            subject.must_be_instance_of(Vedeu::Cursors::Cursor)
+          end
         end
 
         context 'when there are no cursors defined' do
-          before do
-            Vedeu::Models::Focus.reset
+          before {
+            Vedeu::Models::Focus.add('Vedeu.cursor')
             Vedeu.cursors.reset
-          end
+          }
+
+          it {
+            subject.must_be_instance_of(Vedeu::Cursors::Cursor)
+          }
+        end
 
-          it { subject.must_be_instance_of(NilClass) }
+        context 'when there are no interfaces or views defined' do
+          it { proc { subject }.must_raise(Vedeu::Error::Fatal) }
         end
       end
 

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

@@ -20,15 +20,43 @@ module Vedeu
       end
 
       describe '.by_name' do
+        let(:interface) {
+          Vedeu::Interfaces::Interface.new(name: _name, group: group)
+        }
+        let(:group) { :vedeu_groups_refresh_group }
+
         subject { described.by_name(_name) }
 
         context 'when the name is not present' do
           let(:_name) { '' }
 
-          it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
+          context 'when the currently focussed interface/view has a group' do
+            before { Vedeu.interfaces.stubs(:by_name).returns(interface) }
+
+            # @todo Add more tests.
+            # it { skip }
+          end
+
+          context 'when the currently focussed interface/view does not have ' \
+                  'a group' do
+            let(:group) { '' }
+
+            before { Vedeu.interfaces.stubs(:by_name).returns(interface) }
+
+            it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
+          end
+
+          context 'when no interfaces/views have been registered' do
+            before { Vedeu::Models::Focus.reset }
+
+            it { proc { subject }.must_raise(Vedeu::Error::Fatal) }
+          end
         end
 
         context 'when the name is present' do
+          # @todo Add more tests.
+          # it { skip }
+
           # it {
           #   Vedeu.expects(:trigger).with(:_refresh_view_)
           #   subject

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

@@ -7,20 +7,13 @@ module Vedeu
     describe Null do
 
       let(:described)  { Vedeu::Interfaces::Null }
-      let(:instance)   { described.new(attributes) }
-      let(:_name)      { 'null_interface' }
-      let(:attributes) {
-        {
-          name: _name
-        }
-      }
-
-      describe '#initialize' do
-        it { instance.must_be_instance_of(described) }
-        it {
-          instance.instance_variable_get('@attributes').must_equal(attributes)
-        }
-        it { instance.instance_variable_get('@name').must_equal(_name) }
+      let(:instance)   { described.new }
+
+      describe '#group' do
+        subject { instance.group }
+
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal('') }
       end
 
     end # Null

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

@@ -113,7 +113,7 @@ module Vedeu
         end
 
         context 'when no interfaces are defined' do
-          it { subject.must_equal(nil) }
+          it { proc { subject }.must_raise(Vedeu::Error::Fatal) }
         end
 
         context 'API methods' do

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

@@ -26,6 +26,16 @@ module Vedeu
         it {
           instance.instance_variable_get('@attributes').must_equal(attributes)
         }
+
+        context 'when a name is given' do
+          it { instance.instance_variable_get('@name').must_equal(_name) }
+        end
+
+        context 'when a name is not given' do
+          let(:attributes) { {} }
+
+          it { instance.instance_variable_get('@name').must_equal('') }
+        end
       end
 
       describe '#falsy' do
@@ -37,6 +47,8 @@ module Vedeu
         it { instance.must_respond_to(:maximise) }
         it { instance.must_respond_to(:maximised?) }
         it { instance.must_respond_to(:unmaximise) }
+        it { instance.must_respond_to(:visible) }
+        it { instance.must_respond_to(:visible?) }
       end
 
       describe '#null' do
@@ -78,13 +90,6 @@ module Vedeu
         it { subject.must_be_instance_of(described) }
       end
 
-      describe '#visible' do
-        subject { instance.visible }
-
-        it { subject.must_be_instance_of(FalseClass) }
-        it { instance.must_respond_to(:visible?) }
-      end
-
       describe '#visible=' do
         let(:_value) { :ignored }
 

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

@@ -61,6 +61,7 @@ module Vedeu
       let(:output) {}
 
       before do
+        Vedeu.stubs(:focus).returns(:vedeu_renderers_render)
         Vedeu::Renderers.reset
         Vedeu::Renderers.renderer(DummyRenderer)
         Vedeu.stubs(:hide_cursor)
@@ -69,24 +70,30 @@ module Vedeu
 
       subject { described.render(output) }
 
-      # it { subject.must_be_instance_of(Array) }
+      context 'when an interface/view has been defined' do
+        it {
+          DummyRenderer.expects(:render).with(output)
+          subject
+        }
 
-      it {
-        DummyRenderer.expects(:render).with(output)
-        subject
-      }
+        context 'when there is content' do
+          let(:output) {
+            Vedeu::Models::Escape
+              .new(value: Vedeu::EscapeSequences::Esc.hide_cursor)
+          }
 
-      context 'when there is content' do
-        let(:output) {
-          Vedeu::Models::Escape
-            .new(value: Vedeu::EscapeSequences::Esc.hide_cursor)
-        }
+          it { subject.must_be_instance_of(Vedeu::Models::Escape) }
+        end
 
-        it { subject.must_be_instance_of(Vedeu::Models::Escape) }
+        context 'when there is no content' do
+          it { subject.must_be_instance_of(NilClass) }
+        end
       end
 
-      context 'when there is no content' do
-        it { subject.must_be_instance_of(NilClass) }
+      context 'when no interfaces/view have been defined' do
+        before { Vedeu.stubs(:focus).raises(Vedeu::Error::Fatal) }
+
+        it { proc { subject }.must_raise(Vedeu::Error::Fatal) }
       end
     end
 

data/test/support/examples/material_colours_app.rb

@@ -97,7 +97,7 @@ class VedeuMaterialColoursApp
       x(3)
       xn(64)
       y(15)
-      yn(28)
+      yn(32)
     end
     zindex(1)
   end
@@ -113,6 +113,11 @@ class VedeuMaterialColoursApp
     key(:shift_tab) { Vedeu.trigger(:_focus_prev_) }
     key(:tab)       { Vedeu.trigger(:_focus_next_) }
 
+    key('1') { Vedeu.trigger(:_hide_interface_, 'main_interface') }
+    key('2') { Vedeu.trigger(:_show_interface_, 'main_interface') }
+    key('3') { Vedeu.trigger(:_hide_interface_, 'other_interface') }
+    key('4') { Vedeu.trigger(:_show_interface_, 'other_interface') }
+
     key('a') { Vedeu.trigger(:_view_left_, 'main_interface')  }
     key('s') { Vedeu.trigger(:_view_down_, 'main_interface')  }
     key('d') { Vedeu.trigger(:_view_up_, 'main_interface')    }
@@ -121,24 +126,23 @@ class VedeuMaterialColoursApp
     key('w') { Vedeu.trigger(:_toggle_group_, :my_group) }
     key('e') { Vedeu.trigger(:_hide_group_, :my_group) }
     key('r') { Vedeu.trigger(:_show_group_, :my_group) }
+    key('t') do
+      Vedeu.trigger(:_toggle_interface_, 'main_interface')
+      Vedeu.trigger(:_toggle_interface_, 'other_interface')
+    end
 
     key('h') { Vedeu.trigger(:_view_left_, 'other_interface')  }
     key('j') { Vedeu.trigger(:_view_down_, 'other_interface')  }
     key('k') { Vedeu.trigger(:_view_up_, 'other_interface')    }
     key('l') { Vedeu.trigger(:_view_right_, 'other_interface') }
 
-    key('t') do
-      Vedeu.trigger(:_toggle_interface_, 'main_interface')
-      Vedeu.trigger(:_toggle_interface_, 'other_interface')
-    end
-    key('1') { Vedeu.trigger(:_hide_interface_, 'main_interface') }
-    key('2') { Vedeu.trigger(:_show_interface_, 'main_interface') }
-    key('3') { Vedeu.trigger(:_hide_interface_, 'other_interface') }
-    key('4') { Vedeu.trigger(:_show_interface_, 'other_interface') }
     key('m') { Vedeu.trigger(:_maximise_, 'main_interface') }
     key('n') { Vedeu.trigger(:_unmaximise_, 'main_interface') }
     key('b') { Vedeu.trigger(:_maximise_, 'other_interface') }
     key('v') { Vedeu.trigger(:_unmaximise_, 'other_interface') }
+
+    key('x') { Vedeu.trigger(:_set_border_caption_, Vedeu.focus, 'Amazing!') }
+    key('z') { Vedeu.trigger(:_set_border_title_, Vedeu.focus, 'Surprise!') }
   end
 
   Vedeu.renders do
@@ -193,30 +197,93 @@ class VedeuMaterialColoursApp
     view 'keys_interface' do
       line {
         stream {
-          left "\u2190, \u2193, \u2191, \u2192", width: 20
+          left "\u2190 \u2193 \u2191 \u2192",
+               foreground: '#ffff00', width: 20
+        }
+        stream { left "Move cursor" }
+      }
+      line {}
+      line {
+        stream {
+          left 'a, s, d, f',
+          foreground: '#ffff00', width: 20
+        }
+        stream { left 'Move Rainbow! left, down, up, right' }
+      }
+      line {
+        stream {
+          left 'h, j, k, l',
+          foreground: '#ffff00', width: 20
+        }
+        stream { left 'Move Wow! left, down, up, right' }
+      }
+      line {}
+      line {
+        stream {
+          left 't',
+          foreground: '#ffff00', width: 20
+        }
+        stream { left 'Toggle Rainbow!/Wow!' }
+      }
+      line {
+        stream {
+          left '1, 2',
+          foreground: '#ffff00', width: 20
         }
+        stream { left 'Hide/Show Rainbow!' }
+      }
+      line {
         stream {
-          left "Move cursor"
+          left '3, 4',
+          foreground: '#ffff00', width: 20
         }
+        stream { left 'Hide/Show Wow!' }
       }
+      line {}
       line {
         stream {
-          left "q", width: 20
+          left 'm, n',
+          foreground: '#ffff00', width: 20
         }
+        stream { left 'Maximise/Unmaximise Rainbow!' }
+      }
+      line {
+        stream {
+          left 'b, v',
+          foreground: '#ffff00', width: 20
+        }
+        stream { left 'Maximise/Unmaximise Wow!' }
+      }
+      line {}
+      line {
+        stream {
+          left 'escape',
+                foreground: '#ffff00', width: 20
+        }
+        stream { left 'Mode Switch' }
+      }
+      line {
+        stream {
+          left 'shift+tab',
+          foreground: '#ffff00', width: 20
+        }
+        stream { left 'Focus previous view' }
+      }
+      line {
+        stream {
+          left 'tab',
+          foreground: '#ffff00', width: 20
+        }
+        stream { left 'Focus next view' }
+      }
+      line {}
+      line {
         stream {
-          left "Exit"
+          left 'q',
+               foreground: '#ffff00', width: 20
         }
+        stream { left 'Exit' }
       }
-      line { left 'escape - mode switch'}
-      line { left 'shift+tab - focus previous'}
-      line { left 'tab - focus next'}
-      line { left 'a, s, d, f - Move Rainbow! left, down, up, right' }
-      line { left 'h, j, k, l - Move Wow! left, down, up, right' }
-      line { left 't - Toggle Rainbow!/Wow!' }
-      line { left '1,2 - Hide/Show Rainbow!'}
-      line { left '3,4 - Hide/Show Wow!'}
-      line { left 'm,n - Maximise/Unmaximise Rainbow!' }
-      line { left 'b,v - Maximise/Unmaximise Wow!' }
     end
   end