vedeu 0.6.14 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e1b859a5c5879bc2165e48baaf00b3a15448111
-  data.tar.gz: dd4db5330f731e8f171c38c3c3f22bd6331b5356
+  metadata.gz: 7229836cd42c82c006486c2f7ed0022ec046d221
+  data.tar.gz: 1ae9b7c3569417d567f5f0efef7ad3122ed4002f
 SHA512:
-  metadata.gz: 54b2f06a47ded5480ada1597206145f678390d23897656060724a263b37a68fdecc139a2f3393fb6ab6b97b47aca0d1e1cba762e62dc2df4b4c44a36ba25b59a
-  data.tar.gz: 29b42c9a6fb03431f8b4c45688edb6f30c7df68b434933406cc81e8eb69dc29614c8244762d622b59119034d5c8918ae1f8209d7e9640197182be2dd5e3e628e
+  metadata.gz: 55f86239b851af40caea7a418f4c6d540a1646d9cf716334e36ee4efc01076af59cdc866a44524f09b98be3cad760ca00c0a410dd34a9b839651a964f803ecb8
+  data.tar.gz: 3b75c1b0e8e30de1ce8ea0d41b0aeee735b193a22aa2c53a73a2b8e214a06efe84a83ecf9385a31a896ad8958471700049cca651f9c35fa9b8990677e333fce4

data/Rakefile

@@ -3,16 +3,16 @@ require 'rake/testtask'
 require 'yard'
 require 'rubocop/rake_task'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs.push 'lib'
-  t.libs.push 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-  t.warning = false # set to true for Ruby warnings (ruby -w)
+Rake::TestTask.new(:test) do |task|
+  task.libs.push 'lib'
+  task.libs.push 'test'
+  task.pattern = 'test/**/*_test.rb'
+  task.verbose = false
+  task.warning = true # set to true for Ruby warnings (ruby -w)
 end
 
-YARD::Rake::YardocTask.new(:yard) do |t|
-  t.files = [
+YARD::Rake::YardocTask.new(:yard) do |task|
+  task.files = [
     'lib/**/*.rb',
     '-',
     'docs/api.md',

data/docs/events/system.md

@@ -10,13 +10,6 @@ popular here.
 
     Vedeu.trigger(:_exit_)
 
-### :_clear_
-Clears the whole terminal space, or when a name is given, the named
-interface area will be cleared.
-
-    Vedeu.trigger(:_clear_)
-    Vedeu.clear_by_name(name)
-
 ### :_command_
 Will cause the triggering of the `:command` event; which you should
 define to 'do things'.
@@ -60,13 +53,6 @@ logging is enabled in the configuration.
 
     Vedeu.trigger(:_log_, message)
 
-### :_maximise_
-Maximising an interface.
-
-    Vedeu.trigger(:_maximise_, name)
-
-See {Vedeu::Geometry::Geometry#maximise}
-
 ### :_mode_switch_
 When triggered (by default, after the user presses `escape`), Vedeu
 switches between modes of the terminal. The idea here being
@@ -75,16 +61,3 @@ modes allow the user to enter more elaborate commands- such as commands
 with arguments.
 
     Vedeu.trigger(:_mode_switch_)
-
-### :_resize_
-When triggered will cause Vedeu to trigger the `:_clear_` and
-`:_refresh_` events. Please see those events for their behaviour.
-
-    Vedeu.trigger(:_resize_)
-
-### :_unmaximise_
-Unmaximising an interface.
-
-    Vedeu.trigger(:_unmaximise_, name)
-
-See {Vedeu::Geometry::Geometry#unmaximise}

data/docs/events/view.md

@@ -0,0 +1,23 @@
+# @title Vedeu View Events
+
+## View Events
+
+### :_maximise_
+Maximising an interface.
+
+    Vedeu.trigger(:_maximise_, name)
+
+See {Vedeu::Geometry::Geometry#maximise}
+
+### :_resize_
+When triggered will cause Vedeu to trigger the `:_clear_` and
+`:_refresh_` events. Please see those events for their behaviour.
+
+    Vedeu.trigger(:_resize_)
+
+### :_unmaximise_
+Unmaximising an interface.
+
+    Vedeu.trigger(:_unmaximise_, name)
+
+See {Vedeu::Geometry::Geometry#unmaximise}

data/docs/events/visibility.md

@@ -2,6 +2,13 @@
 
 ## Visibility Events
 
+### :_clear_
+Clears the whole terminal space, or when a name is given, the named
+interface area will be cleared.
+
+    Vedeu.trigger(:_clear_)
+    Vedeu.clear_by_name(name)
+
 ### :_clear_group_
 Clears the spaces occupied by the interfaces belonging to the named
 group.

data/docs/events.md

@@ -29,6 +29,9 @@ See {file:docs/events/menu.md}
 ### Movement Events
 See {file:docs/events/movement.md}
 
+### View Events
+See {file:docs/events/view.md}
+
 ### Visibility Events
 See {file:docs/events/visibility.md}
 

data/lib/vedeu/application/controller.rb

@@ -8,7 +8,7 @@ module Vedeu
     #
     module ClassMethods
 
-      attr_accessor :controller_name
+      attr_writer :controller_name
 
       # Specifying the controller name in your controller provides
       # Vedeu with the means to route requests to different parts of

data/lib/vedeu/bindings/all.rb

@@ -28,5 +28,6 @@ require 'vedeu/bindings/movement'
 require 'vedeu/bindings/focus'
 require 'vedeu/bindings/refresh'
 require 'vedeu/bindings/system'
+require 'vedeu/bindings/view'
 require 'vedeu/bindings/visibility'
 require 'vedeu/bindings/bindings'

data/lib/vedeu/bindings/bindings.rb

@@ -19,6 +19,7 @@ module Vedeu
       Vedeu::Bindings::Focus.setup!
       Vedeu::Bindings::Refresh.setup!
       Vedeu::Bindings::System.setup!
+      Vedeu::Bindings::View.setup!
 
       true
     end

data/lib/vedeu/bindings/system.rb

@@ -14,17 +14,13 @@ module Vedeu
       # @return [TrueClass]
       def setup!
         cleanup!
-        clear!
         command!
         editor!
         exit!
         initialize!
         keypress!
         log!
-        maximise!
         mode_switch!
-        resize!
-        unmaximise!
       end
 
       private
@@ -39,19 +35,6 @@ module Vedeu
         end
       end
 
-      # See {file:docs/events/system.md#\_cleanup_}
-      def clear!
-        Vedeu.bind(:_clear_) do |name|
-          if name
-            Vedeu::Clear::NamedInterface.render(name)
-
-          else
-            Vedeu::Terminal::Buffer.clear
-
-          end
-        end
-      end
-
       # See {file:docs/events/system.md#\_command_}
       def command!
         Vedeu.bind(:_command_) { |command| Vedeu.trigger(:command, command) }
@@ -84,30 +67,11 @@ module Vedeu
         Vedeu.bind(:_log_) { |msg| Vedeu.log(type: :debug, message: msg) }
       end
 
-      # See {file:docs/events/system.md#\_maximise_}
-      def maximise!
-        Vedeu.bind(:_maximise_) do |name|
-          Vedeu.geometries.by_name(name).maximise
-        end
-      end
-
       # See {file:docs/events/system.md#\_mode_switch_}
       def mode_switch!
         Vedeu.bind(:_mode_switch_) { fail Vedeu::Error::ModeSwitch }
       end
 
-      # See {file:docs/events/system.md#\_resize_}
-      def resize!
-        Vedeu.bind(:_resize_, delay: 0.25) { Vedeu.resize }
-      end
-
-      # See {file:docs/events/system.md#\_unmaximise_}
-      def unmaximise!
-        Vedeu.bind(:_unmaximise_) do |name|
-          Vedeu.geometries.by_name(name).unmaximise
-        end
-      end
-
       # :nocov:
 
     end # System

data/lib/vedeu/bindings/view.rb

@@ -0,0 +1,50 @@
+module Vedeu
+
+  module Bindings
+
+    # System events relating to the view.
+    #
+    module View
+
+      extend self
+
+      # Setup events relating to client applications. This method is
+      # called by Vedeu.
+      #
+      # @return [TrueClass]
+      def setup!
+        maximise!
+        resize!
+        unmaximise!
+      end
+
+      private
+
+      # :nocov:
+
+      # See {file:docs/events/view.md#\_maximise_}
+      def maximise!
+        Vedeu.bind(:_maximise_) do |name|
+          Vedeu.geometries.by_name(name).maximise
+        end
+      end
+
+      # See {file:docs/events/view.md#\_resize_}
+      def resize!
+        Vedeu.bind(:_resize_, delay: 0.25) { Vedeu.resize }
+      end
+
+      # See {file:docs/events/view.md#\_unmaximise_}
+      def unmaximise!
+        Vedeu.bind(:_unmaximise_) do |name|
+          Vedeu.geometries.by_name(name).unmaximise
+        end
+      end
+
+      # :nocov:
+
+    end # View
+
+  end # Bindings
+
+end # Vedeu

data/lib/vedeu/bindings/visibility.rb

@@ -14,6 +14,7 @@ module Vedeu
       #
       # @return [TrueClass]
       def setup!
+        clear!
         clear_group!
         hide_cursor!
         hide_group!
@@ -30,6 +31,19 @@ module Vedeu
 
       # :nocov:
 
+      # See {file:docs/events/system.md#\_cleanup_}
+      def clear!
+        Vedeu.bind(:_clear_) do |name|
+          if name
+            Vedeu::Clear::NamedInterface.render(name)
+
+          else
+            Vedeu::Terminal::Buffer.clear
+
+          end
+        end
+      end
+
       # See {file:docs/events/visibility.md#\_clear_group_}
       def clear_group!
         Vedeu.bind(:_clear_group_) do |name|

data/lib/vedeu/buffers/buffer.rb

@@ -74,13 +74,6 @@ module Vedeu
         true
       end
 
-      # Clear the buffer.
-      #
-      # @return [Array<Array<Vedeu::Views::Char>>]
-      def clear
-        Vedeu::Output::Output.render(Vedeu::Clear::NamedInterface.render(name))
-      end
-
       # Return a boolean indicating content presence on the buffer
       # type.
       #
@@ -115,7 +108,7 @@ module Vedeu
       #
       # @return [Array<Array<Array<Vedeu::Views::Char>>>]
       def hide
-        Vedeu::Output::Output.render(clear)
+        Vedeu.trigger(:_clear_, name)
       end
 
       # Return the content for this buffer.

data/lib/vedeu/cursors/cursor.rb

@@ -45,6 +45,12 @@ module Vedeu
       # @return [Fixnum]
       attr_writer :y
 
+      # @param attributes [Hash] See #initialize
+      # @return [Vedeu::Cursors::Cursor]
+      def self.store(attributes)
+        new(attributes).store
+      end
+
       # Returns a new instance of Vedeu::Cursors::Cursor.
       #
       # @param attributes [Hash]
@@ -60,7 +66,6 @@ module Vedeu
       #   the cursor.
       # @option attributes y [Fixnum] The terminal y coordinate for
       #   the cursor.
-      #
       # @return [Vedeu::Cursors::Cursor]
       def initialize(attributes = {})
         @attributes = defaults.merge!(attributes)
@@ -70,15 +75,23 @@ module Vedeu
         end
       end
 
+      # An object is equal when its values are the same.
+      #
+      # @param other [Vedeu::Cursors::Cursor]
+      # @return [Boolean]
+      def eql?(other)
+        self.class == other.class && name == other.name
+      end
+      alias_method :==, :eql?
+
       # Moves the cursor down by one row.
       #
       # @return [Vedeu::Cursors::Cursor]
       def move_down
         @oy += 1
 
-        @attributes = new_attributes(coordinate.y_position, x, oy, ox)
-
-        Vedeu::Cursors::Cursor.new(@attributes).store
+        Vedeu::Cursors::Cursor.store(
+          new_attributes(coordinate.y_position, x, oy, ox))
       end
 
       # Moves the cursor left by one column.
@@ -87,18 +100,16 @@ module Vedeu
       def move_left
         @ox -= 1
 
-        @attributes = new_attributes(y, coordinate.x_position, oy, ox)
-
-        Vedeu::Cursors::Cursor.new(@attributes).store
+        Vedeu::Cursors::Cursor.store(
+          new_attributes(y, coordinate.x_position, oy, ox))
       end
 
       # Moves the cursor to the top left of the named interface.
       #
       # @return [Vedeu::Cursors::Cursor]
       def move_origin
-        @attributes = attributes.merge!(x: bx, y: by, ox: 0, oy: 0)
-
-        Vedeu::Cursors::Cursor.new(@attributes).store
+        Vedeu::Cursors::Cursor.store(
+          attributes.merge!(x: bx, y: by, ox: 0, oy: 0))
       end
 
       # Moves the cursor right by one column.
@@ -107,9 +118,8 @@ module Vedeu
       def move_right
         @ox += 1
 
-        @attributes = new_attributes(y, coordinate.x_position, oy, ox)
-
-        Vedeu::Cursors::Cursor.new(@attributes).store
+        Vedeu::Cursors::Cursor.store(
+          new_attributes(y, coordinate.x_position, oy, ox))
       end
 
       # Moves the cursor up by one row.
@@ -118,9 +128,8 @@ module Vedeu
       def move_up
         @oy -= 1
 
-        @attributes = new_attributes(coordinate.y_position, x, oy, ox)
-
-        Vedeu::Cursors::Cursor.new(@attributes).store
+        Vedeu::Cursors::Cursor.store(
+          new_attributes(coordinate.y_position, x, oy, ox))
       end
 
       # Renders the cursor.
@@ -136,12 +145,11 @@ module Vedeu
       # @param new_ox [Fixnum] The column/character position.
       # @return [Vedeu::Cursors::Cursor]
       def reposition(new_oy, new_ox)
-        @attributes = new_attributes(coordinate.y_position,
-                                     coordinate.x_position,
-                                     new_oy,
-                                     new_ox)
+        @oy = new_oy
+        @ox = new_ox
 
-        Vedeu::Cursors::Cursor.new(@attributes).store
+        Vedeu::Cursors::Cursor.store(
+          new_attributes(coordinate.y_position, coordinate.x_position, oy, ox))
       end
 
       # Returns an escape sequence to position the cursor and set its

data/lib/vedeu/cursors/refresh.rb

@@ -38,7 +38,7 @@ module Vedeu
 
         Vedeu.trigger(:_refresh_, name) if refresh_view?
 
-        Vedeu::Terminal.output(cursor.to_s)
+        cursor.render
       end
 
       protected

data/lib/vedeu/editor/cursor.rb

@@ -33,11 +33,11 @@ module Vedeu
 
       # @!attribute [rw] x
       # @return [Fixnum]
-      attr_accessor :x
+      attr_writer :x
 
       # @!attribute [rw] y
       # @return [Fixnum]
-      attr_accessor :y
+      attr_writer :y
 
       # Returns a new instance of Vedeu::Editor::Cursor.
       #

data/lib/vedeu/geometry/geometry.rb

@@ -72,6 +72,12 @@ module Vedeu
       # @return [Fixnum]
       attr_writer :yn
 
+      # @param attributes [Hash] See #initialize
+      # @return [Vedeu::Geometry::Geometry]
+      def self.store(attributes)
+        new(attributes).store
+      end
+
       # Returns a new instance of Vedeu::Geometry::Geometry.
       #
       # @param attributes [Hash]
@@ -94,6 +100,15 @@ module Vedeu
         end
       end
 
+      # An object is equal when its values are the same.
+      #
+      # @param other [Vedeu::Geometry::Geometry]
+      # @return [Boolean]
+      def eql?(other)
+        self.class == other.class && name == other.name
+      end
+      alias_method :==, :eql?
+
       # Will maximise the named interface geometry. This means it will
       # occupy all of the available space on the terminal window.
       #
@@ -128,15 +143,7 @@ module Vedeu
           dyn = yn + 1
         end
 
-        @attributes = attributes.merge(
-          centred:   false,
-          maximised: false,
-          x:         x,
-          xn:        xn,
-          y:         dy,
-          yn:        dyn,
-        )
-        Vedeu::Geometry::Geometry.new(@attributes).store
+        Vedeu::Geometry::Geometry.store(move_attributes.merge!(y: dy, yn: dyn))
       end
 
       # Moves the geometry left by one column.
@@ -152,15 +159,7 @@ module Vedeu
           dxn = xn - 1
         end
 
-        @attributes = attributes.merge(
-          centred:   false,
-          maximised: false,
-          x:         dx,
-          xn:        dxn,
-          y:         y,
-          yn:        yn,
-        )
-        Vedeu::Geometry::Geometry.new(@attributes).store
+        Vedeu::Geometry::Geometry.store(move_attributes.merge!(x: dx, xn: dxn))
       end
 
       # Moves the geometry to the top left of the terminal.
@@ -168,15 +167,11 @@ module Vedeu
       # TODO: Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_origin
-        @attributes = attributes.merge(
-          centred:   false,
-          maximised: false,
-          x:         1,
-          xn:        xn - x + 1,
-          y:         1,
-          yn:        yn - y + 1,
-        )
-        Vedeu::Geometry::Geometry.new(@attributes).store
+        Vedeu::Geometry::Geometry.store(
+          move_attributes.merge!(x:  1,
+                                 xn: (xn - x + 1),
+                                 y:  1,
+                                 yn: (yn - y + 1)))
       end
 
       # Moves the geometry right by one column.
@@ -192,15 +187,7 @@ module Vedeu
           dxn = xn + 1
         end
 
-        @attributes = attributes.merge(
-          centred:   false,
-          maximised: false,
-          x:         dx,
-          xn:        dxn,
-          y:         y,
-          yn:        yn,
-        )
-        Vedeu::Geometry::Geometry.new(@attributes).store
+        Vedeu::Geometry::Geometry.store(move_attributes.merge!(x: dx, xn: dxn))
       end
 
       # Moves the geometry up by one column.
@@ -216,15 +203,7 @@ module Vedeu
           dyn = yn - 1
         end
 
-        @attributes = attributes.merge(
-          centred:   false,
-          maximised: false,
-          x:         x,
-          xn:        xn,
-          y:         dy,
-          yn:        dyn,
-        )
-        Vedeu::Geometry::Geometry.new(@attributes).store
+        Vedeu::Geometry::Geometry.store(move_attributes.merge!(y: dy, yn: dyn))
       end
 
       # Will unmaximise the named interface geometry. Previously, when
@@ -258,7 +237,7 @@ module Vedeu
         @area = Vedeu::Geometry::Area.from_attributes(area_attributes)
       end
 
-      # @return [Hash<Symbol => Fixnum, Boolean>]
+      # @return [Hash<Symbol => Boolean, Fixnum>]
       def area_attributes
         {
           y:         _y,
@@ -274,6 +253,17 @@ module Vedeu
         }
       end
 
+      # @return [Hash<Symbol => Boolean, Fixnum>]
+      def move_attributes
+        @attributes.merge(
+          centred:   false,
+          maximised: false,
+          x:         x,
+          xn:        xn,
+          y:         y,
+          yn:        yn)
+      end
+
       # Returns the row/line start position for the interface.
       #
       # @return [Fixnum]

data/lib/vedeu/logging/mono_logger.rb

@@ -12,6 +12,7 @@ module Vedeu
       #   (typically STDOUT, STDERR or an open file).
       # @return [Vedeu::Logging::MonoLogger]
       def initialize(logdev)
+        @progname          = 'Vedeu'
         @level             = Logger::DEBUG
         @default_formatter = Logger::Formatter.new
         @formatter         = nil

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

@@ -80,8 +80,9 @@ module Vedeu
       def render
         return [] unless visible?
 
+        Vedeu.trigger(:_clear_, name)
+
         output = [
-          Vedeu::Clear::NamedInterface.render(name),
           Vedeu::Output::Viewport.render(self),
           Vedeu.borders.by_name(name).render,
         ]

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

@@ -36,7 +36,7 @@ module Vedeu
 
       # @return [Array<Array<Vedeu::Views::Char>>]
       def render
-        output
+        Vedeu::Output::Output.render(output)
       end
 
       protected

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.14'
+  VERSION = '0.6.15'
 
 end

data/test/lib/vedeu/bindings/system_test.rb

@@ -8,17 +8,13 @@ module Vedeu
 
       context 'the system events needed by Vedeu to run are defined' do
         it { Vedeu.bound?(:_cleanup_).must_equal(true) }
-        it { Vedeu.bound?(:_clear_).must_equal(true) }
         it { Vedeu.bound?(:_command_).must_equal(true) }
         it { Vedeu.bound?(:_editor_).must_equal(true) }
         it { Vedeu.bound?(:_exit_).must_equal(true) }
         it { Vedeu.bound?(:_initialize_).must_equal(true) }
         it { Vedeu.bound?(:_keypress_).must_equal(true) }
         it { Vedeu.bound?(:_log_).must_equal(true) }
-        it { Vedeu.bound?(:_maximise_).must_equal(true) }
         it { Vedeu.bound?(:_mode_switch_).must_equal(true) }
-        it { Vedeu.bound?(:_resize_).must_equal(true) }
-        it { Vedeu.bound?(:_unmaximise_).must_equal(true) }
       end
 
     end # System

data/test/lib/vedeu/bindings/view_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Bindings
+
+    describe View do
+
+      context 'the system events needed by Vedeu to run are defined' do
+        it { Vedeu.bound?(:_maximise_).must_equal(true) }
+        it { Vedeu.bound?(:_resize_).must_equal(true) }
+        it { Vedeu.bound?(:_unmaximise_).must_equal(true) }
+      end
+
+    end # View
+
+  end # Bindings
+
+end # Vedeu

data/test/lib/vedeu/bindings/visibility_test.rb

@@ -7,6 +7,7 @@ module Vedeu
     describe Visibility do
 
       context 'the visibility events are defined' do
+        it { Vedeu.bound?(:_clear_).must_equal(true) }
         it { Vedeu.bound?(:_clear_group_).must_equal(true) }
 
         it { Vedeu.bound?(:_cursor_hide_).must_equal(true) }

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

@@ -69,24 +69,6 @@ module Vedeu
         end
       end
 
-      describe '#clear' do
-        let(:emptiness) { mock }
-
-        before do
-          Vedeu::Clear::NamedInterface.stubs(:render).returns(emptiness)
-          Vedeu::Output::Output.stubs(:render).returns(emptiness)
-        end
-
-        subject { instance.clear }
-
-        it {
-          Vedeu::Clear::NamedInterface.expects(:render).with(_name).
-            returns(emptiness)
-          Vedeu::Output::Output.expects(:render).with(emptiness)
-          subject
-        }
-      end
-
       describe '#front?' do
         subject { instance.front? }
 
@@ -120,18 +102,21 @@ module Vedeu
       end
 
       describe '#hide' do
-        before { Vedeu::Output::Output.stubs(:render) }
+        before { Vedeu.stubs(:trigger) }
 
         subject { instance.hide }
 
         it {
-          Vedeu::Output::Output.expects(:render)
+          Vedeu.expects(:trigger).with(:_clear_, _name)
           subject
         }
       end
 
       describe '#show' do
-        before { Vedeu::Output::Output.stubs(:render) }
+        before do
+          # Vedeu::Clear::NamedInterface.stubs(:render)
+          Vedeu::Output::Output.stubs(:render)
+        end
 
         subject { instance.show }
 

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

@@ -72,6 +72,26 @@ module Vedeu
         it { instance.must_respond_to(:y=) }
       end
 
+      describe '.store' do
+        subject { described.store(attributes) }
+
+        it { subject.must_equal(instance) }
+      end
+
+      describe '#eql?' do
+        let(:other) { instance }
+
+        subject { instance.eql?(other) }
+
+        it { subject.must_equal(true) }
+
+        context 'when different to other' do
+          let(:other) { described.new(name: 'other_cursor') }
+
+          it { subject.must_equal(false) }
+        end
+      end
+
       describe '#hide' do
         let(:visible)     { true }
         let(:hide_cursor) {
@@ -224,8 +244,8 @@ module Vedeu
 
         it { subject.must_be_instance_of(described) }
 
-        it { subject.x.must_equal(8) }
-        it { subject.y.must_equal(7) }
+        it { subject.x.must_equal(10) }
+        it { subject.y.must_equal(8) }
         it { subject.ox.must_equal(5) }
         it { subject.oy.must_equal(3) }
       end

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

@@ -69,6 +69,26 @@ module Vedeu
         it { instance.must_respond_to(:yn=) }
       end
 
+      describe '.store' do
+        subject { described.store(attributes) }
+
+        it { subject.must_equal(instance) }
+      end
+
+      describe '#eql?' do
+        let(:other) { instance }
+
+        subject { instance.eql?(other) }
+
+        it { subject.must_equal(true) }
+
+        context 'when different to other' do
+          let(:other) { described.new(name: 'other_geometry') }
+
+          it { subject.must_equal(false) }
+        end
+      end
+
       describe '#maximise' do
         let(:attributes) {
           {

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

@@ -29,14 +29,6 @@ module Vedeu
         let(:geometry)  {
           Vedeu::Geometry::Geometry.new(name: _name, x: 1, y: 1, xn: 2, yn: 2)
         }
-
-        before do
-          Vedeu.interfaces.stubs(:by_name).returns(interface)
-          Vedeu.geometries.stubs(:by_name).returns(geometry)
-        end
-
-        subject { instance.render }
-
         let(:output) {
           [
             [
@@ -51,6 +43,19 @@ module Vedeu
           ]
         }
 
+        before do
+          Vedeu.interfaces.stubs(:by_name).returns(interface)
+          Vedeu.geometries.stubs(:by_name).returns(geometry)
+          Vedeu::Output::Output.stubs(:render).returns(output)
+        end
+
+        subject { instance.render }
+
+        it { subject.must_be_instance_of(Array) }
+        it {
+          Vedeu::Output::Output.expects(:render).with(output)
+          subject
+        }
         it { subject.must_equal(output) }
       end
 

data/test/support/examples/material_colours_app.rb

@@ -94,6 +94,18 @@ class VedeuMaterialColoursApp
     zindex(1)
   end
 
+  Vedeu.interface 'keys_interface' do
+    colour(foreground: '#ffffff', background: :default)
+    cursor!
+    geometry 'keys_interface' do
+      x(3)
+      xn(64)
+      y(15)
+      yn(28)
+    end
+    zindex(1)
+  end
+
   Vedeu.keymap('_global_') do
     key(:up)    { Vedeu.trigger(:_cursor_up_)    }
     key(:right) { Vedeu.trigger(:_cursor_right_) }
@@ -177,6 +189,56 @@ class VedeuMaterialColoursApp
     view 'empty_interface' do
       line { line '' }
     end
+
+Vedeu.keymap('_global_') do
+    key(:up)    { Vedeu.trigger(:_cursor_up_)    }
+    key(:right) { Vedeu.trigger(:_cursor_right_) }
+    key(:down)  { Vedeu.trigger(:_cursor_down_)  }
+    key(:left)  { Vedeu.trigger(:_cursor_left_)  }
+
+    key('q')        { Vedeu.trigger(:_exit_) }
+    key(:escape)    { Vedeu.trigger(:_mode_switch_) }
+    key(:shift_tab) { Vedeu.trigger(:_focus_prev_) }
+    key(:tab)       { Vedeu.trigger(:_focus_next_) }
+
+    key('a') { Vedeu.trigger(:_view_left_, 'main_interface')  }
+    key('s') { Vedeu.trigger(:_view_down_, 'main_interface')  }
+    key('d') { Vedeu.trigger(:_view_up_, 'main_interface')    }
+    key('f') { Vedeu.trigger(:_view_right_, 'main_interface') }
+
+    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') }
+  end
+
+    view 'keys_interface' do
+      line { left 'left,down,up,right - Move cursor' }
+      line { left 'q - 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
 
   Vedeu.focus_by_name 'main_interface'

data/test/test_helper.rb

@@ -89,17 +89,17 @@ require 'mocha/setup'
 require 'vedeu'
 require 'support/helpers/model_test_class'
 
-# require 'minitest/reporters'
-# require 'support/average_duration_reporter'
-# Minitest::Reporters.use!(
-#     # # commented out by default (makes tests slower)
-#     # Minitest::Reporters::MeanTimeReporter.new({
-#     #   previous_runs_filename: "/tmp/durations",
-#     #   report_filename:        "/tmp/durations_results"})
-#     # Minitest::Reporters::DefaultReporter.new({ color: true,
-#     #                                            slow_suite_count: 15 }),
-#     # Minitest::Reporters::SpecReporter.new
-# )
+require 'minitest/reporters'
+require 'minitest/reporters/mean_time_reporter'
+Minitest::Reporters.use!(
+  # # commented out by default (makes tests slower)
+  Minitest::Reporters::MeanTimeReporter.new({
+    previous_runs_filename: "/tmp/durations",
+    report_filename:        "/tmp/durations_results"})
+  # Minitest::Reporters::DefaultReporter.new({ color: true,
+  #                                            slow_suite_count: 15 }),
+  # Minitest::Reporters::SpecReporter.new
+)
 
 def test_configuration
   Vedeu::Configuration.reset!

data/vedeu.gemspec

@@ -23,12 +23,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard',              '2.13.0'
   spec.add_development_dependency 'guard-minitest',     '2.4.4'
   spec.add_development_dependency 'guard-rubocop',      '1.2.0'
-  spec.add_development_dependency 'minitest',           '5.8.0'
-  spec.add_development_dependency 'minitest-reporters', '1.1.1'
+  spec.add_development_dependency 'minitest',           '5.8.1'
+  spec.add_development_dependency 'minitest-reporters', '1.1.2'
   spec.add_development_dependency 'mocha',              '1.1.0'
   spec.add_development_dependency 'pry',                '0.10.1'
   spec.add_development_dependency 'rubocop',            '0.34.2'
-
   spec.add_development_dependency 'ruby-prof',          '0.15.8'
   spec.add_development_dependency 'simplecov',          '0.10.0'
   spec.add_development_dependency 'simplecov-console',  '0.2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.14
+  version: 0.6.15
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.8.0
+        version: 5.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.8.0
+        version: 5.8.1
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +261,7 @@ files:
 - docs/events/movement.md
 - docs/events/refresh.md
 - docs/events/system.md
+- docs/events/view.md
 - docs/events/visibility.md
 - docs/getting_started.md
 - docs/object_graph.md
@@ -286,6 +287,7 @@ files:
 - lib/vedeu/bindings/movement.rb
 - lib/vedeu/bindings/refresh.rb
 - lib/vedeu/bindings/system.rb
+- lib/vedeu/bindings/view.rb
 - lib/vedeu/bindings/visibility.rb
 - lib/vedeu/borders/all.rb
 - lib/vedeu/borders/border.rb
@@ -486,6 +488,7 @@ files:
 - test/lib/vedeu/bindings/movement_test.rb
 - test/lib/vedeu/bindings/refresh_test.rb
 - test/lib/vedeu/bindings/system_test.rb
+- test/lib/vedeu/bindings/view_test.rb
 - test/lib/vedeu/bindings/visibility_test.rb
 - test/lib/vedeu/borders/border_test.rb
 - test/lib/vedeu/borders/dsl_test.rb
@@ -639,7 +642,6 @@ files:
 - test/lib/vedeu/terminal/terminal_test.rb
 - test/lib/vedeu_test.rb
 - test/support/all_seeds.sh
-- test/support/average_duration_reporter.rb
 - test/support/colour_support.sh
 - test/support/coverage.rb
 - test/support/examples/borders_app.rb
@@ -704,6 +706,7 @@ test_files:
 - test/lib/vedeu/bindings/movement_test.rb
 - test/lib/vedeu/bindings/refresh_test.rb
 - test/lib/vedeu/bindings/system_test.rb
+- test/lib/vedeu/bindings/view_test.rb
 - test/lib/vedeu/bindings/visibility_test.rb
 - test/lib/vedeu/borders/border_test.rb
 - test/lib/vedeu/borders/dsl_test.rb
@@ -857,7 +860,6 @@ test_files:
 - test/lib/vedeu/terminal/terminal_test.rb
 - test/lib/vedeu_test.rb
 - test/support/all_seeds.sh
-- test/support/average_duration_reporter.rb
 - test/support/colour_support.sh
 - test/support/coverage.rb
 - test/support/examples/borders_app.rb

data/test/support/average_duration_reporter.rb

@@ -1,201 +0,0 @@
-require 'yaml'
-
-module Minitest
-  module Reporters
-
-    class MeanTimeReporter < DefaultReporter
-
-      # @param options [Hash]
-      # @option previous_runs_filename [String] Contains the times for each test
-      #   by description. Defaults to '/tmp/minitest_reporters_previous_run'.
-      # @option report_filename [String] Contains the parsed results for the
-      #   last test run. Defaults to '/tmp/minitest_reporters_report'.
-      # @return [Minitest::Reporters::MeanTimeReporter]
-      def initialize(options = {})
-        super
-
-        @all_suite_times = []
-      end
-
-      # Copies the suite times from the
-      # {Minitest::Reporters::DefaultReporter#after_suite} method, making them
-      # available to this class.
-      #
-      # @return [Hash<String => Float>]
-      def after_suite(suite)
-        super
-
-        @all_suite_times = @suite_times
-      end
-
-      # Runs the {Minitest::Reporters::DefaultReporter#report} method and then
-      # enhances it by storing the results to the 'previous_runs_filename' and
-      # outputs the parsed results to both the 'report_filename' and the
-      # terminal.
-      #
-      def report
-        super
-
-        create_or_update_previous_runs!
-
-        create_new_report!
-      end
-
-      protected
-
-      attr_accessor :all_suite_times
-
-      private
-
-      # @return [Hash<String => Float>]
-      def current_run
-        Hash[all_suite_times]
-      end
-
-      # @return [Hash] Sets default values for the filenames used by this class.
-      def defaults
-        {
-          previous_runs_filename: '/tmp/minitest_reporters_previous_run',
-          report_filename:        '/tmp/minitest_reporters_report',
-        }
-      end
-
-      # Added to the top of the report file to be helpful.
-      #
-      # @return [String]
-      def report_header
-        "Samples: #{samples}\n\n"
-      end
-
-      # The report itself. Displays statistic about all runs, ideal for use with
-      # the Unix 'head' command. Listed in slowest average descending order.
-      #
-      # @return [String]
-      def report_body
-        previous_run.each_with_object([]) do |(description, timings), obj|
-          size = timings.size
-          sum  = timings.inject { |total, x| total + x }
-          avg  = (sum / size).round(9).to_s.ljust(12)
-          min  = timings.min.to_s.ljust(12)
-          max  = timings.max.to_s.ljust(12)
-
-          obj << "#{avg_label} #{avg} " \
-                 "#{min_label} #{min} " \
-                 "#{max_label} #{max} " \
-                 "#{des_label} #{description}\n"
-        end.sort.reverse.join
-      end
-
-      # @return [Hash]
-      def options
-        defaults.merge!(@options)
-      end
-
-      # @return [Hash<String => Array<Float>]
-      def previous_run
-        @previous_run ||= YAML.load_file(previous_runs_filename)
-      end
-
-      # @return [String] The path to the file which contains all the durations
-      #   for each test run. The previous runs file is in YAML format, using the
-      #   test name for the key and an array containing the time taken to run
-      #   this test for values.
-      #
-      # @return [String]
-      def previous_runs_filename
-        options[:previous_runs_filename]
-      end
-
-      # Returns a boolean indicating whether a previous runs file exists.
-      #
-      # @return [Boolean]
-      def previously_ran?
-        File.exist?(previous_runs_filename)
-      end
-
-      # @return [String] The path to the file which contains the parsed test
-      #   results. The results file contains a line for each test with the
-      #   average time of the test, the minimum time the test took to run,
-      #   the maximum time the test took to run and a description of the test
-      #   (which is the test name as emitted by Minitest).
-      def report_filename
-        options[:report_filename]
-      end
-
-      # A barbaric way to find out how many runs are in the previous runs file;
-      # this method takes the first test listed, and counts its samples
-      # trusting (naively) all runs to be the same number of samples. This will
-      # produce incorrect averages when new tests are added, so it is advised
-      # to restart the statistics by removing the 'previous runs' file.
-      #
-      # @return [Fixnum]
-      def samples
-        return 1 unless previous_run.first[1].is_a?(Array)
-
-        previous_run.first[1].size
-      end
-
-      # Creates a new 'previous runs' file, or updates the existing one with
-      # the latest timings.
-      #
-      # @return [void]
-      def create_or_update_previous_runs!
-        if previously_ran?
-          current_run.each do |description, elapsed|
-          new_times = if previous_run["#{description}"]
-                        Array(previous_run["#{description}"]) << elapsed
-
-                      else
-                        Array(elapsed)
-
-                      end
-
-            previous_run.store("#{description}", new_times)
-          end
-
-          File.write(previous_runs_filename, previous_run.to_yaml)
-
-        else
-
-          File.write(previous_runs_filename, current_run.to_yaml)
-
-        end
-      end
-
-      # Creates a new report file in the 'report_filename'. This file contains
-      # a line for each test of the following example format:
-      #
-      # Avg: 0.0555555 Min: 0.0498765 Max: 0.0612345 Description: The test name
-      #
-      # Note however the timings are to 9 decimal places, and padded to 12
-      # characters and each label is coloured, Avg (yellow), Min (green),
-      # Max (red) and Description (blue). It looks pretty!
-      #
-      # @return [void]
-      def create_new_report!
-        File.write(report_filename, report_header + report_body)
-      end
-
-      # @return [String] A yellow 'Avg:' label.
-      def avg_label
-        "\e[33mAvg:\e[39m"
-      end
-
-      # @return [String] A blue 'Description:' label.
-      def des_label
-        "\e[34mDescription:\e[39m"
-      end
-
-      # @return [String] A red 'Max:' label.
-      def max_label
-        "\e[31mMax:\e[39m"
-      end
-
-      # @return [String] A green 'Min:' label.
-      def min_label
-        "\e[32mMin:\e[39m"
-      end
-
-    end
-  end
-end