vedeu 0.4.26 → 0.4.27

data/lib/vedeu/output/esc.rb

@@ -77,22 +77,23 @@ module Vedeu
     # @return [Hash<Symbol => String>]
     def actions
       {
-        hide_cursor:   "\e[?25l",
-        show_cursor:   "\e[?25h",
-        bg_reset:      "\e[49m",
-        blink:         "\e[5m",
-        blink_off:     "\e[25m",
-        bold:          "\e[1m",
-        bold_off:      "\e[22m",
-        border_on:     "\e(0",
-        border_off:    "\e(B",
-        dim:           "\e[2m",
-        fg_reset:      "\e[39m",
-        negative:      "\e[7m",
-        positive:      "\e[27m",
-        reset:         "\e[0m",
-        underline:     "\e[4m",
-        underline_off: "\e[24m",
+        hide_cursor:     "\e[?25l",
+        show_cursor:     "\e[?25h",
+        cursor_position: "\e[6n",
+        bg_reset:        "\e[49m",
+        blink:           "\e[5m",
+        blink_off:       "\e[25m",
+        bold:            "\e[1m",
+        bold_off:        "\e[22m",
+        border_on:       "\e(0",
+        border_off:      "\e(B",
+        dim:             "\e[2m",
+        fg_reset:        "\e[39m",
+        negative:        "\e[7m",
+        positive:        "\e[27m",
+        reset:           "\e[0m",
+        underline:       "\e[4m",
+        underline_off:   "\e[24m",
       }
     end
 

data/lib/vedeu/output/html_char.rb

@@ -85,28 +85,31 @@ module Vedeu
 
     # @return [String]
     def colour_bg
-      if defined_value?(char.background.to_html)
-        char.background.to_html
-
-      elsif defined_value?(char.parent_background.to_html)
-        char.parent_background.to_html
-
-      else
-        '#000'
-
-      end
+      colour(char, 'background', '#000')
     end
 
     # @return [String]
     def colour_fg
-      if defined_value?(char.foreground.to_html)
-        char.foreground.to_html
+      colour(char, 'foreground', '#222')
+    end
+
+    # @param char []
+    # @param type [String]
+    # @param default [String]
+    # @return [String]
+    def colour(char, type, default)
+      parent_type         = ('parent_' + type).to_sym
+      type_to_html        = char.send(type).send(:to_html)
+      parent_type_to_html = char.send(parent_type).send(:to_html)
+
+      if defined_value?(type_to_html)
+        type_to_html
 
-      elsif defined_value?(char.parent_foreground.to_html)
-        char.parent_foreground.to_html
+      elsif defined_value?(parent_type_to_html)
+        parent_type_to_html
 
       else
-        '#222'
+        default
 
       end
     end

data/lib/vedeu/output/refresh.rb

@@ -13,7 +13,7 @@ module Vedeu
       message = 'Refreshing all interfaces'
 
       Vedeu::Timer.for(:info, message) do
-        Vedeu.interfaces.registered.each { |name| by_name(name) }
+        Vedeu.interfaces.zindexed.each { |model| by_name(model.name) }
       end
     end
 
@@ -33,7 +33,13 @@ module Vedeu
       message = "Refreshing group: '#{group_name}'"
 
       Vedeu::Timer.for(:info, message) do
-        Vedeu.groups.find!(group_name).members.each { |name| by_name(name) }
+        Vedeu.groups.find!(group_name).members.each do |name|
+          Vedeu.interfaces.by_name(name)
+        end.sort do |a, b|
+          a.zindex <=> b.zindex
+        end.each do |name|
+          by_name(name)
+        end
       end
     end
 

data/lib/vedeu/output/viewport.rb

@@ -54,12 +54,14 @@ module Vedeu
 
       Vedeu::Timer.for(:output, "Rendering: #{name}") do
         out = []
+
         show[0...height].each_with_index do |line, iy|
           line[0...width].each_with_index do |column, ix|
-            column.position = [by + iy, bx + ix]
+            column.position = Vedeu::Position[by + iy, bx + ix]
             out << column
           end
         end
+
         out
       end
     end

data/lib/vedeu/repositories/repositories/cursors.rb

@@ -28,7 +28,7 @@ module Vedeu
       if registered?(name)
         find(name)
 
-      else
+      elsif name
         Vedeu::Cursor.new(name: name).store
 
       end

data/lib/vedeu/repositories/repositories/interfaces_repository.rb

@@ -20,6 +20,14 @@ module Vedeu
     null Vedeu::Null::Interface
     # real Vedeu::Interface
 
+    # Returns the interfaces in zindex order.
+    #
+    # @return [Array<Vedeu::Interface>]
+    # @see Vedeu::DSL::Interface#zindex
+    def zindexed
+      all.sort { |a, b| a.zindex <=> b.zindex }
+    end
+
   end # InterfacesRepository
 
 end # Vedeu

data/lib/vedeu/repositories/repository.rb

@@ -39,6 +39,15 @@ module Vedeu
       self.class
     end
 
+    # @return [Array<void>] An array containing each stored model.
+    def all
+      return []             if empty?
+      return storage.values if storage.is_a?(Hash)
+      return storage.to_a   if storage.is_a?(Set)
+
+      storage
+    end
+
     # @param name [String] The name of the stored model.
     # @return [void]
     def by_name(name)

data/lib/vedeu/storage/store.rb

@@ -36,6 +36,7 @@ module Vedeu
     def reset
       @storage = in_memory
     end
+    alias_method :reset!, :reset
 
     # Return the number of entries stored.
     #

data/lib/vedeu/support/terminal.rb

@@ -175,6 +175,13 @@ module Vedeu
       @mode ||= Vedeu::Configuration.terminal_mode
     end
 
+    # Returns the position of the cursor.
+    #
+    # @return [Vedeu::Position]
+    def cursor
+      # Vedeu.trigger(:_cursor_position_)
+    end
+
     # Returns a coordinate tuple of the format [y, x], where `y` is the row/line
     # and `x` is the column/character.
     #

data/lib/vedeu/support/visibility.rb

@@ -37,8 +37,13 @@ module Vedeu
 
     # @return [void]
     def show
-      model.visible = true
-      model.store
+      if model.visible?
+        model
+
+      else
+        model.visible = true
+        model.store
+      end
     end
 
     # @return [Symbol]
@@ -54,8 +59,14 @@ module Vedeu
 
     # @return [void]
     def hide
-      model.visible = false
-      model.store
+      if model.visible?
+        model.visible = false
+        model.store
+
+      else
+        model
+
+      end
     end
 
     # @return [void]

data/test/lib/vedeu/buffers/buffer_test.rb

@@ -24,6 +24,7 @@ module Vedeu
       Vedeu.stubs(:trigger)
       # Vedeu.interfaces.stubs(:by_name).returns(interface)
     end
+    after { Vedeu.interfaces.reset }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }

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

@@ -27,6 +27,7 @@ module Vedeu
           end
         end
       end
+      after { Vedeu.interfaces.reset }
 
       describe 'alias methods' do
         it { instance.must_respond_to(:show_bottom) }

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

@@ -16,11 +16,7 @@ module Vedeu
       let(:client) {}
 
       before { Vedeu.interfaces.reset }
-
-      describe 'alias methods' do
-        it { instance.must_respond_to(:keys) }
-        it { instance.must_respond_to(:line) }
-      end
+      after  { Vedeu.interfaces.reset }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -68,6 +64,13 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Border) }
       end
 
+      describe '#button' do
+        let(:label)  { 'No' }
+        let(:_value) { false }
+
+        subject { instance.button(label, _value) }
+      end
+
       describe '#cursor' do
         let(:_value) {}
 
@@ -244,6 +247,7 @@ module Vedeu
         }
 
         it { subject.must_be_instance_of(Vedeu::Keymap) }
+        it { instance.must_respond_to(:keys) }
       end
 
       describe '#lines' do
@@ -260,6 +264,8 @@ module Vedeu
 
           it { proc { subject }.must_raise(InvalidSyntax) }
         end
+
+        it { instance.must_respond_to(:line) }
       end
 
       describe '#name' do
@@ -268,7 +274,18 @@ module Vedeu
         it { subject; model.name.must_equal('nickel') }
       end
 
+      describe '#no_cursor!' do
+        subject { instance.no_cursor! }
+
+        it {
+          subject
+          Vedeu.cursors.find('actinium').visible?.must_equal(false)
+        }
+      end
+
       describe '#show!' do
+        after { Vedeu.interfaces.reset }
+
         subject {
           Vedeu.interface 'xenon' do
             show!
@@ -279,6 +296,8 @@ module Vedeu
       end
 
       describe '#hide!' do
+        after { Vedeu.interfaces.reset }
+
         subject {
           Vedeu.interface 'xenon' do
             hide!
@@ -295,6 +314,17 @@ module Vedeu
         it { instance.visible(:show).must_equal(true) }
       end
 
+      describe '#zindex' do
+        let(:_value) { 1 }
+
+        subject { instance.zindex(_value) }
+
+        it { subject.must_equal(1) }
+
+        it { instance.must_respond_to(:z_index) }
+        it { instance.must_respond_to(:z) }
+      end
+
     end # Interface
 
   end # DSL

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

@@ -29,6 +29,8 @@ module Vedeu
 
         it { subject.must_equal(false) }
       end
+
+      it { instance.must_respond_to(:==) }
     end
 
     describe '#inspect' do
@@ -47,8 +49,11 @@ module Vedeu
       it { instance.style.must_equal('') }
     end
 
-    describe '#to_s' do
-      it { instance.to_s.must_be_instance_of(String) }
+    describe '#value' do
+      it { instance.value.must_be_instance_of(String) }
+
+      it { instance.must_respond_to(:to_s) }
+      it { instance.must_respond_to(:to_str) }
     end
 
   end # EscapeChar

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

@@ -13,14 +13,15 @@ module Vedeu
       Vedeu.interface('lead')     {}
       Vedeu.interface('bismuth')  {}
     end
+    after { Vedeu.interfaces.reset }
 
     describe '#add' do
-      context 'adds an interface to storage' do
-        before do
-          Focus.reset
-          Vedeu.interfaces.reset
-        end
+      before do
+        Focus.reset
+        Vedeu.interfaces.reset
+      end
 
+      context 'adds an interface to storage' do
         it {
           Focus.add('thallium').must_equal(['thallium'])
         }
@@ -28,8 +29,6 @@ module Vedeu
 
       context 'does not add it again if already exists' do
         before do
-          Focus.reset
-          Vedeu.interfaces.reset
           Vedeu.interface('thallium') {}
         end
 
@@ -49,8 +48,6 @@ module Vedeu
 
       context 'adds the interface to storage focussed' do
         before do
-          Focus.reset
-          Vedeu.interfaces.reset
           Vedeu.interface('thallium') {}
         end
 
@@ -63,8 +60,6 @@ module Vedeu
 
       context 'adds the interface to storage unfocussed' do
         before do
-          Focus.reset
-          Vedeu.interfaces.reset
           Vedeu.interface('thallium') {}
         end
 

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

@@ -8,15 +8,16 @@ module Vedeu
     let(:instance)   { described.new(attributes) }
     let(:attributes) {
       {
-        client: client,
-        colour: colour,
-        delay:  delay,
-        group:  group,
-        lines:  lines,
-        name:   _name,
-        parent: parent,
-        style:  style,
+        client:  client,
+        colour:  colour,
+        delay:   delay,
+        group:   group,
+        lines:   lines,
+        name:    _name,
+        parent:  parent,
+        style:   style,
         visible: visible,
+        zindex:  zindex,
       }
     }
     let(:client)     {}
@@ -29,6 +30,7 @@ module Vedeu
     let(:repository) { Vedeu.interfaces }
     let(:style)      {}
     let(:visible)    { true }
+    let(:zindex)     { 1 }
 
     describe '#initialize' do
       subject { instance }
@@ -42,6 +44,7 @@ module Vedeu
       it { subject.instance_variable_get('@parent').must_equal(parent) }
       it { subject.instance_variable_get('@repository').must_equal(repository) }
       it { subject.instance_variable_get('@visible').must_equal(visible) }
+      it { subject.instance_variable_get('@zindex').must_equal(zindex) }
     end
 
     describe '#lines?' do
@@ -91,7 +94,7 @@ module Vedeu
       it { subject.must_be_instance_of(Array) }
 
       context 'when the interface is visible' do
-        it { subject.must_equal(['', :clear, :border, :view, '']) }
+        it { subject.must_equal([:clear, :border, :view]) }
       end
 
       context 'when the interface is not visible' do