vedeu 0.6.28 → 0.6.29

data/lib/vedeu/models/views/composition.rb

@@ -12,10 +12,6 @@ module Vedeu
       collection Vedeu::Views::ViewCollection
       member     Vedeu::Views::View
 
-      # @!attribute [r] attributes
-      # @return [Hash]
-      attr_reader :attributes
-
       # @!attribute [r] parent
       # @return [NilClass] Composition objects do not have a parent.
       attr_reader :parent
@@ -29,9 +25,7 @@ module Vedeu
       # @option attributes value [Vedeu::Views::ViewCollection]
       # @return [Vedeu::Views::Composition]
       def initialize(attributes = {})
-        @attributes = defaults.merge!(attributes)
-
-        @attributes.each do |key, value|
+        defaults.merge!(attributes).each do |key, value|
           instance_variable_set("@#{key}", value)
         end
       end
@@ -43,6 +37,17 @@ module Vedeu
       end
       alias_method :<<, :add
 
+      # @return [Hash]
+      def attributes
+        {
+          client: @client,
+          colour: @colour,
+          parent: @parent,
+          style:  @style,
+          value:  value,
+        }
+      end
+
       # @return [Vedeu::Views::ViewCollection]
       def value
         collection.coerce(@value, self)

data/lib/vedeu/models/views/line.rb

@@ -32,6 +32,7 @@ module Vedeu
       # Returns a new instance of Vedeu::Views::Line.
       #
       # @param attributes [Hash]
+      # @option attributes client [void]
       # @option attributes colour [Vedeu::Colours::Colour]
       # @option attributes parent [Vedeu::Views::View]
       # @option attributes style [Vedeu::Presentation::Style]

data/lib/vedeu/models/views/stream.rb

@@ -38,6 +38,7 @@ module Vedeu
       # Returns a new instance of Vedeu::Views::Stream.
       #
       # @param attributes [Hash]
+      # @option attributes client [void]
       # @option attributes colour [Vedeu::Colours::Colour]
       # @option attributes style [Vedeu::Presentation::Style]
       # @option attributes parent [Vedeu::Views::Line]

data/lib/vedeu/null/all.rb

@@ -11,5 +11,4 @@ module Vedeu
 end # Vedeu
 
 require 'vedeu/null/generic'
-require 'vedeu/null/interface'
 require 'vedeu/null/view'

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

@@ -96,7 +96,7 @@ module Vedeu
         geometry.height
       end
 
-      # @see Vedeu::Models::Interfaces#by_name
+      # @see Vedeu::Interfaces::Repository#by_name
       def interface
         @interface ||= Vedeu.interfaces.by_name(name)
       end

data/lib/vedeu/output/output.rb

@@ -11,9 +11,11 @@ module Vedeu
 
       # Writes output to the defined renderers.
       #
-      # @return [Array|String]
+      # @return [Array|NilClass|String]
       # @see #initialize
       def self.render_output(output)
+        return nil if output.nil?
+
         new(output).render_output
       end
 
@@ -32,23 +34,39 @@ module Vedeu
       # because escape sequences only make sense to the terminal and
       # not other renderers.
       #
-      # @return [Array|NilClass]
+      # @return [Array|String|NilClass]
       def render_output
-        return nil if output.nil?
-        return render_terminal_buffer unless output.is_a?(Vedeu::Models::Escape)
+        if escape_sequence?
+          direct_write!
 
-        Vedeu::Output::Direct.write(value: output.value,
-                                    x:     output.position.x,
-                                    y:     output.position.y)
+        else
+          buffer_write!
+
+        end
       end
 
+      protected
+
       # @!attribute [r] output
-      # @return [Array<Array<Vedeu::Views::Char>>]
+      # @return [Array<Array<Vedeu::Views::Char>>|
+      #   NilClass|Vedeu::Models::Escape]
       attr_reader :output
 
+      private
+
       # @return [Array]
-      def render_terminal_buffer
-        Vedeu::Terminal::Buffer.write(output).render
+      def buffer_write!
+        Vedeu::Terminal::Buffer.write(output)
+      end
+
+      # @return [Array<String>]
+      def direct_write!
+        Vedeu::Terminal.output(output.to_s)
+      end
+
+      # @return [Boolean]
+      def escape_sequence?
+        output.is_a?(Vedeu::Models::Escape)
       end
 
     end # Output

data/lib/vedeu/output/refresh/refresh.rb

@@ -17,7 +17,7 @@ module Vedeu
 
       # Refresh all registered interfaces.
       #
-      # @return [Array<Vedeu::Models::Interface>]
+      # @return [Array<Vedeu::Interfaces::Interface>]
       def all
         Vedeu.timer('Refreshing all'.freeze) do
           Vedeu.interfaces.zindexed.each do |interface|

data/lib/vedeu/output/renderers/all.rb

@@ -20,7 +20,7 @@ module Vedeu
       threads = storage.map do |renderer|
         Thread.new(renderer) do
           mutex.synchronize do
-            renderer.clear
+            toggle_cursor { renderer.clear }
           end
         end
       end
@@ -51,7 +51,7 @@ module Vedeu
       threads = storage.map do |renderer|
         Thread.new(renderer) do
           mutex.synchronize do
-            renderer.render(output)
+            toggle_cursor { renderer.render(output) }
           end
         end
       end
@@ -101,6 +101,15 @@ module Vedeu
       @storage ||= in_memory
     end
 
+    # @return [void]
+    def toggle_cursor
+      Vedeu.hide_cursor(Vedeu.focus)
+
+      yield
+
+      Vedeu.show_cursor(Vedeu.focus)
+    end
+
   end # Renderers
 
   # @example

data/lib/vedeu/output/text.rb

@@ -83,6 +83,11 @@ module Vedeu
         string.center(width, pad)
       end
 
+      # @return [Object]
+      def client
+        options[:client]
+      end
+
       # If a colour, background or foreground option is set, use them
       # as the colour settings for the new Vedeu::Views::Stream.
       #
@@ -114,6 +119,7 @@ module Vedeu
       # @return [Hash<Symbol => NilClass, String, Symbol>]
       def defaults
         {
+          client: nil,
           anchor: :left,
           colour: nil,
           model:  nil,
@@ -131,7 +137,7 @@ module Vedeu
 
       # @return [Vedeu::Views::Line]
       def line
-        @line ||= Vedeu::Views::Line.build(parent: parent)
+        @line ||= Vedeu::Views::Line.build(parent: parent, client: client)
       end
 
       # Returns the model option when set.
@@ -169,7 +175,8 @@ module Vedeu
       #
       # @return [void]
       def stream
-        @stream ||= Vedeu::Views::Stream.build(colour: colour,
+        @stream ||= Vedeu::Views::Stream.build(client: client,
+                                               colour: colour,
                                                parent: parent,
                                                style:  style,
                                                value:  aligned)

data/lib/vedeu/repositories/model.rb

@@ -79,8 +79,8 @@ module Vedeu
         # @return [Hash<Symbol => NilClass, String>]
         def defaults
           {
-            client:    nil,
-            name:      '',
+            client: nil,
+            name:   '',
           }
         end
 
@@ -126,11 +126,13 @@ module Vedeu
       # @return [String]
       def dsl_class
         case demodulize(self.class.name)
-        when 'Border'.freeze   then 'Vedeu::Borders::DSL'.freeze
-        when 'Buffer'.freeze   then 'Vedeu::Buffers::DSL'.freeze
-        when 'Geometry'.freeze then 'Vedeu::Geometry::DSL'.freeze
-        when 'Group'.freeze    then 'Vedeu::Groups::DSL'.freeze
-        when 'Menu'.freeze     then 'Vedeu::Menus::DSL'.freeze
+        when 'Border'.freeze    then 'Vedeu::Borders::DSL'.freeze
+        when 'Buffer'.freeze    then 'Vedeu::Buffers::DSL'.freeze
+        when 'Geometry'.freeze  then 'Vedeu::Geometry::DSL'.freeze
+        when 'Group'.freeze     then 'Vedeu::Groups::DSL'.freeze
+        when 'Interface'.freeze then 'Vedeu::Interfaces::DSL'.freeze
+        when 'Keymap'.freeze    then 'Vedeu::Keymaps::DSL'.freeze
+        when 'Menu'.freeze      then 'Vedeu::Menus::DSL'.freeze
         # when 'ModelTestClass' then 'Vedeu::Repositories::ModelTestClass::DSL'
         else
           'Vedeu::DSL::'.freeze + demodulize(self.class.name)

data/lib/vedeu/repositories/repositories.rb

@@ -6,6 +6,13 @@ module Vedeu
 
     extend self
 
+    # Access all the repositories stored.
+    #
+    # @return [Array]
+    def all
+      storage.map(&:repository)
+    end
+
     # Register a repository with the collection of Vedeu repositories.
     #
     # @param klass [Class]
@@ -40,13 +47,6 @@ module Vedeu
 
     private
 
-    # Access all the repositories stored.
-    #
-    # @return [Array]
-    def all
-      storage.map(&:repository)
-    end
-
     # Access to the storage for this repository.
     #
     # @return [Array]

data/lib/vedeu/runtime/main_loop.rb

@@ -25,6 +25,8 @@ module Vedeu
           Vedeu.trigger(:_refresh_cursor_, Vedeu.focus)
 
           while @loop
+            Vedeu.refresh
+
             yield
 
             safe_exit_point!

data/lib/vedeu/templating/view_template.rb

@@ -74,7 +74,7 @@ module Vedeu
 
       # Fetch the interface by name.
       #
-      # @return [Vedeu::Models::Interface]
+      # @return [Vedeu::Interfaces::Interface]
       def interface
         Vedeu.interfaces.by_name(options[:name])
       end

data/lib/vedeu/terminal/buffer.rb

@@ -70,6 +70,7 @@ module Vedeu
       def render
         Vedeu.renderers.render(output) if Vedeu.ready?
       end
+      alias_method :refresh, :render
 
       # Removes all content from the virtual terminal; effectively
       # clearing it.
@@ -142,5 +143,6 @@ module Vedeu
   # @!method clear
   #   @see Vedeu::Terminal::Buffer#clear
   def_delegators Vedeu::Terminal::Buffer, :clear
+  def_delegators Vedeu::Terminal::Buffer, :refresh
 
 end # Vedeu

data/lib/vedeu/version.rb

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

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

@@ -42,7 +42,7 @@ module Vedeu
           Vedeu::Geometry::Geometry.new(name: _name, x: 1, xn: 7, y: 1, yn: 4)
         }
         let(:interface) {
-          Vedeu::Models::Interface.new(name: _name, visible: true)
+          Vedeu::Interfaces::Interface.new(name: _name, visible: true)
         }
         before do
           Vedeu.borders.stubs(:by_name).returns(border)

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

@@ -7,8 +7,8 @@ module Vedeu
     describe Presentation do
 
       let(:described)  { Vedeu::DSL::Presentation }
-      let(:instance)   { Vedeu::DSL::Interface.new(model) }
-      let(:model)      { Vedeu::Models::Interface.new }
+      let(:instance)   { Vedeu::Interfaces::DSL.new(model) }
+      let(:model)      { Vedeu::Interfaces::Interface.new }
       let(:background) { '#00ff00' }
       let(:foreground) { '#ff00ff' }
 

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

@@ -13,6 +13,7 @@ module Vedeu
           {
             anchor: anchor,
             model:  model,
+            client: nil,
           }
         }
         let(:anchor)   { :text }
@@ -30,7 +31,7 @@ module Vedeu
 
         context 'when the model is a Vedeu::Views::View' do
           let(:model)    { Vedeu::Views::View.new }
-          let(:instance) { Vedeu::DSL::Interface.new(model) }
+          let(:instance) { Vedeu::Interfaces::DSL.new(model) }
 
           it { subject.must_be_instance_of(Vedeu::Views::Lines) }
 

data/test/lib/vedeu/editor/cropper_test.rb

@@ -26,7 +26,7 @@ module Vedeu
                                         yn:     3)
       }
       let(:interface) {
-        Vedeu::Models::Interface.new(name: _name)
+        Vedeu::Interfaces::Interface.new(name: _name)
       }
 
       before do

data/test/lib/vedeu/editor/document_test.rb

@@ -27,7 +27,7 @@ module Vedeu
         Vedeu::Geometry::Geometry.new({ name: _name, x: 1, xn: 5, y: 1, yn: 5 })
       }
       let(:interface) {
-        Vedeu::Models::Interface.new({ name: _name })
+        Vedeu::Interfaces::Interface.new({ name: _name })
       }
 
       before {

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

@@ -11,6 +11,7 @@ module Vedeu
       let(:attributes) {
         {
           centred:    centred,
+          client:     client,
           height:     height,
           maximised:  maximised,
           name:       _name,
@@ -23,6 +24,7 @@ module Vedeu
         }
       }
       let(:centred)   { false }
+      let(:client)    {}
       let(:height)    {}
       let(:maximised) { false }
       let(:_name)     { 'vedeu_geometry_geometry' }
@@ -40,6 +42,7 @@ module Vedeu
           instance.instance_variable_get('@attributes').must_equal(attributes)
         }
         it { instance.instance_variable_get('@centred').must_equal(centred) }
+        it { instance.instance_variable_get('@client').must_equal(client) }
         it { instance.instance_variable_get('@height').must_equal(height) }
         it { instance.instance_variable_get('@maximised').must_equal(maximised) }
         it { instance.instance_variable_get('@name').must_equal(_name) }

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

@@ -72,9 +72,9 @@ module Vedeu
       describe '#by_zindex' do
         let(:interfaces) {
           [
-            Vedeu::Models::Interface.new(zindex: 3, name: 'c'),
-            Vedeu::Models::Interface.new(zindex: 1, name: 'a'),
-            Vedeu::Models::Interface.new(zindex: 2, name: 'b'),
+            Vedeu::Interfaces::Interface.new(zindex: 3, name: 'c'),
+            Vedeu::Interfaces::Interface.new(zindex: 1, name: 'a'),
+            Vedeu::Interfaces::Interface.new(zindex: 2, name: 'b'),
           ]
         }
 

data/test/lib/vedeu/{dsl/keymap_test.rb → input/dsl_test.rb}

@@ -2,11 +2,11 @@ require 'test_helper'
 
 module Vedeu
 
-  module DSL
+  module Keymaps
 
-    describe Keymap do
+    describe DSL do
 
-      let(:described) { Vedeu::DSL::Keymap }
+      let(:described) { Vedeu::Keymaps::DSL }
       let(:instance)  { described.new(model) }
       let(:model)     { Vedeu::Input::Keymap.new(name: '_test_') }
 
@@ -64,8 +64,8 @@ module Vedeu
         end
       end
 
-    end # Keymap
+    end # DSL
 
-  end # DSL
+  end # Keymaps
 
 end # Vedeu

data/test/lib/vedeu/{dsl/interface_test.rb → interfaces/dsl_test.rb}

@@ -2,14 +2,14 @@ require 'test_helper'
 
 module Vedeu
 
-  module DSL
+  module Interfaces
 
-    describe Interface do
+    describe DSL do
 
-      let(:described) { Vedeu::DSL::Interface }
+      let(:described) { Vedeu::Interfaces::DSL }
       let(:instance)  { described.new(model, client) }
       let(:model)     {
-        Vedeu::Models::Interface.new(name: _name)
+        Vedeu::Interfaces::Interface.new(name: _name)
       }
       let(:_name)  { 'actinium' }
       let(:client) {}
@@ -23,7 +23,7 @@ module Vedeu
           end
         }
 
-        it { subject.must_be_instance_of(Vedeu::Models::Interface) }
+        it { subject.must_be_instance_of(Vedeu::Interfaces::Interface) }
 
         context 'when the block is not given' do
           subject { described.interface('fluorine') }
@@ -322,8 +322,8 @@ module Vedeu
         it { instance.must_respond_to(:z) }
       end
 
-    end # Interface
+    end # DSL
 
-  end # DSL
+  end # Interfaces
 
 end # Vedeu

data/test/lib/vedeu/{models → interfaces}/interface_test.rb

@@ -2,11 +2,11 @@ require 'test_helper'
 
 module Vedeu
 
-  module Models
+  module Interfaces
 
     describe Interface do
 
-      let(:described)  { Vedeu::Models::Interface }
+      let(:described)  { Vedeu::Interfaces::Interface }
       let(:instance)   { described.new(attributes) }
       let(:attributes) {
         {
@@ -93,6 +93,6 @@ module Vedeu
 
     end # Interface
 
-  end # Models
+  end # Interfaces
 
 end # Vedeu

data/test/lib/vedeu/{null/interface_test.rb → interfaces/null_test.rb}

@@ -2,11 +2,11 @@ require 'test_helper'
 
 module Vedeu
 
-  module Null
+  module Interfaces
 
-    describe Interface do
+    describe Null do
 
-      let(:described)  { Vedeu::Null::Interface }
+      let(:described)  { Vedeu::Interfaces::Null }
       let(:instance)   { described.new(attributes) }
       let(:_name)      { 'null_interface' }
       let(:attributes) {
@@ -23,8 +23,8 @@ module Vedeu
         it { instance.instance_variable_get('@name').must_equal(_name) }
       end
 
-    end # Interface
+    end # Null
 
-  end # Null
+  end # Interfaces
 
 end # Vedeu

data/test/lib/vedeu/{models/interfaces_test.rb → interfaces/repository_test.rb}

@@ -2,11 +2,11 @@ require 'test_helper'
 
 module Vedeu
 
-  module Models
+  module Interfaces
 
-    describe Interfaces do
+    describe Repository do
 
-      let(:described) { Vedeu::Models::Interfaces }
+      let(:described) { Vedeu::Interfaces::Repository }
 
       it { described.must_respond_to(:interfaces) }
 
@@ -31,8 +31,8 @@ module Vedeu
         it { subject.must_equal([@lithium, @hydrogen, @helium]) }
       end
 
-    end # Interfaces
+    end # Repository
 
-  end # Models
+  end # Interfaces
 
 end # Vedeu

data/test/lib/vedeu/logging/log_test.rb

@@ -27,7 +27,7 @@ module Vedeu
 
         it {
           capture_io { subject }.must_equal(
-            ["\e[92m[create] \e[39m\e[32mLogging to stdout...\e[39m\n", ""]
+            ["\e[96m[create] \e[39m\e[36mLogging to stdout...\e[39m\n", ""]
           )
         }
       end
@@ -40,7 +40,7 @@ module Vedeu
 
         it {
           capture_io { subject }.must_equal(
-            ["", "\e[91m[debug]  \e[39m\e[31mLogging to stderr...\e[39m\n"]
+            ["", "\e[97m[debug]  \e[39m\e[39mLogging to stderr...\e[39m\n"]
           )
         }
       end

data/test/lib/vedeu/models/views/view_test.rb

@@ -88,7 +88,7 @@ module Vedeu
         subject { instance.visible? }
 
         context 'when the interface is visible' do
-          let(:interface) { Vedeu::Models::Interface.new(visible: true) }
+          let(:interface) { Vedeu::Interfaces::Interface.new(visible: true) }
 
           before do
             Vedeu.interfaces.stubs(:by_name).with(_name).returns(interface)

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

@@ -29,7 +29,7 @@ module Vedeu
 
       describe '#render' do
         let(:interface) {
-          Vedeu::Models::Interface.new(name: _name, visible: visible)
+          Vedeu::Interfaces::Interface.new(name: _name, visible: visible)
         }
         let(:visible)   { true }
         let(:geometry)  {

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

@@ -29,22 +29,17 @@ module Vedeu
               Vedeu::Models::Escape.new(value: "\e[?25h", position: [1, 1])
             }
 
-            before { Vedeu::Output::Direct.stubs(:write).returns(output.to_s) }
-
-            it { subject.must_equal("\e[1;1H\e[?25h") }
+            it {
+              Vedeu::Terminal.expects(:output)
+              subject
+            }
           end
 
           context 'and the output is not an escape sequence' do
             let(:output) { Vedeu::Models::Page.new }
-            let(:buffer) { mock('Vedeu::Terminal::Buffer') }
-
-            before do
-              Vedeu::Terminal::Buffer.stubs(:write)
-              buffer.expects(:render).returns(output)
-            end
 
             it {
-              Vedeu::Terminal::Buffer.expects(:write).with(output).returns(buffer)
+              Vedeu::Terminal::Buffer.expects(:write).with(output)
               subject
             }
           end

data/test/lib/vedeu/output/presentation/presentation_test.rb

@@ -53,7 +53,7 @@ module Vedeu
       }
       let(:line) {
         Vedeu::Views::Line.new(value:  [],
-                               parent: Vedeu::Models::Interface.new,
+                               parent: Vedeu::Interfaces::Interface.new,
                                colour: green,
                                style:  Vedeu::Presentation::Style.new('normal'))
       }

data/test/lib/vedeu/output/refresh/refresh_test.rb

@@ -24,7 +24,7 @@ module Vedeu
 
         context 'when there are registered interfaces' do
           let(:interface)  {
-            Vedeu::Models::Interface.new(name: 'Vedeu::Output::Refresh')
+            Vedeu::Interfaces::Interface.new(name: 'Vedeu::Output::Refresh')
           }
           let(:interfaces) { [interface] }
 

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

@@ -63,6 +63,8 @@ module Vedeu
       before do
         Vedeu::Renderers.reset
         Vedeu::Renderers.renderer(DummyRenderer)
+        Vedeu.stubs(:hide_cursor)
+        Vedeu.stubs(:show_cursor)
       end
 
       subject { described.render(output) }