vedeu 0.6.71 → 0.7.0

data/lib/vedeu/input/mouse.rb

@@ -8,7 +8,7 @@ module Vedeu
 
       # Trigger an event depending on which button was pressed.
       #
-      # @param input [String]
+      # @param (see #initialize)
       # @return [void]
       def self.click(input)
         new(input).click

data/lib/vedeu/interfaces/clear.rb

@@ -160,10 +160,9 @@ module Vedeu
         Vedeu.timer("Clearing #{clearing}: '#{name}'".freeze) do
           @clear ||= Array.new(height) do |iy|
             Array.new(width) do |ix|
-              Vedeu::Views::Char.new(value:    ' '.freeze,
-                                     colour:   colour,
-                                     name:     name,
-                                     position: [y + iy, x + ix])
+              Vedeu::Cells::Clear.new(colour:   colour,
+                                      name:     name,
+                                      position: [y + iy, x + ix])
             end
           end
         end

data/lib/vedeu/output/compressor.rb

@@ -118,6 +118,7 @@ module Vedeu
       # @param char [Vedeu::Views::Char]
       # @return [String]
       def position_for(char)
+        return ''.freeze unless char.position
         return ''.freeze if char.position.y == @y
 
         @y = char.position.y

data/lib/vedeu/presentation/colour.rb

@@ -18,6 +18,9 @@ module Vedeu
                      elsif self.is_a?(Vedeu::Views::Char) && name
                        Vedeu::Colours::Colour.coerce(interface.colour)
 
+                     elsif self.respond_to?(:named_parent) && name
+                       Vedeu::Colours::Colour.coerce(named_parent.colour)
+
                      elsif parent && present?(parent.colour)
                        Vedeu::Colours::Colour.coerce(parent.colour)
 

data/lib/vedeu/repositories/defaults.rb

@@ -21,11 +21,20 @@ module Vedeu
       # @return [void] A new instance of the class including this
       #   module.
       def initialize(attributes = {})
-        defaults.merge!(attributes).each do |key, value|
+        attrs = attributes.to_h.keep_if { |key, _| defaults.key?(key) }
+
+        defaults.merge!(attrs).each do |key, value|
           instance_variable_set("@#{key}", value || defaults.fetch(key))
         end
       end
 
+      private
+
+      # @return [Hash<void>]
+      def defaults
+        {}
+      end
+
     end # Defaults
 
   end # Repositories

data/lib/vedeu/templating/decoder.rb

@@ -10,7 +10,7 @@ module Vedeu
     class Decoder
 
       # @param (see #initialize)
-      # @return [Object]
+      # @return (see #process)
       def self.process(data)
         new(data).process
       end

data/lib/vedeu/templating/encoder.rb

@@ -10,7 +10,7 @@ module Vedeu
     class Encoder
 
       # @param (see #initialize)
-      # @return [String]
+      # @return (see #process)
       def self.process(data)
         new(data).process
       end

data/lib/vedeu/templating/template.rb

@@ -6,8 +6,8 @@ module Vedeu
     #
     class Template
 
-      # @param (see Vedeu::Templating::Template#new)
-      # @return [void]
+      # @param (see #initialize)
+      # @return (see #parse)
       def self.parse(object, path, options = {})
         new(object, path, options).parse
       end

data/lib/vedeu/templating/view_template.rb

@@ -5,7 +5,7 @@ module Vedeu
     # Extend Template to provide client application view specific
     # parsing.
     #
-    class ViewTemplate < Template
+    class ViewTemplate < Vedeu::Templating::Template
 
       include Vedeu::Common
       include Vedeu::Templating::Helpers

data/lib/vedeu/terminal/terminal.rb

@@ -65,6 +65,15 @@ module Vedeu
       yield if block_given?
     end
 
+    # Disables the mouse and shows the cursor. Used by the debugging
+    # snippet in {file:docs/debugging.md}.
+    #
+    # @return [String]
+    def debugging!
+      output(Vedeu::EscapeSequences::Esc.mouse_x10_off +
+             Vedeu::EscapeSequences::Esc.show_cursor)
+    end
+
     # Clears the entire terminal space.
     #
     # @example

data/lib/vedeu/version.rb

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

data/lib/vedeu/views/html_char.rb

@@ -10,7 +10,7 @@ module Vedeu
       include Vedeu::Common
 
       # @param (see #initialize)
-      # @return [String]
+      # @return (see #render)
       def self.render(char, options = {})
         new(char, options).render
       end

data/test/lib/vedeu/application/application_controller_test.rb

@@ -24,10 +24,10 @@ module Vedeu
 
       subject { instance.redirect_to(controller, action, params) }
 
-      it {
+      it do
         Vedeu.expects(:trigger).with(:_goto_, controller, action, params)
         subject
-      }
+      end
 
       it { instance.must_respond_to(:redirect) }
       it { instance.must_respond_to(:goto) }

data/test/lib/vedeu/application/controller_test.rb

@@ -29,11 +29,11 @@ module Vedeu
       describe '.controller' do
         subject { described_model.controller(:some_controller) }
 
-        it {
+        it do
           Vedeu::Runtime::Router.expects(:add_controller).
             with(:some_controller, 'Vedeu::ControllerTestKlass')
           subject
-        }
+        end
 
         it { subject.must_be_instance_of(Hash) }
       end
@@ -41,13 +41,13 @@ module Vedeu
       describe '.action' do
         subject { described_model.action(:some_action, :other_action) }
 
-        it {
+        it do
           Vedeu::Runtime::Router.expects(:add_action).
             with(:some_controller, :some_action)
           Vedeu::Runtime::Router.expects(:add_action).
             with(:some_controller, :other_action)
           subject
-        }
+        end
 
         it { subject.must_be_instance_of(Array) }
       end

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

@@ -49,8 +49,10 @@ module Vedeu
       end
 
       describe 'accessors' do
-        it {
+        it do
           instance.must_respond_to(:attributes)
+          instance.must_respond_to(:bottom_horizontal)
+          instance.must_respond_to(:bottom_horizontal=)
           instance.must_respond_to(:bottom_left)
           instance.must_respond_to(:bottom_left=)
           instance.must_respond_to(:bottom_right)
@@ -73,17 +75,23 @@ module Vedeu
           instance.must_respond_to(:show_top=)
           instance.must_respond_to(:title)
           instance.must_respond_to(:title=)
+          instance.must_respond_to(:top_horizontal)
+          instance.must_respond_to(:top_horizontal=)
           instance.must_respond_to(:top_left)
           instance.must_respond_to(:top_left=)
           instance.must_respond_to(:top_right)
           instance.must_respond_to(:top_right=)
+          instance.must_respond_to(:left_vertical)
+          instance.must_respond_to(:left_vertical=)
+          instance.must_respond_to(:right_vertical)
+          instance.must_respond_to(:right_vertical=)
           instance.must_respond_to(:vertical)
           instance.must_respond_to(:vertical=)
           instance.must_respond_to(:name)
           instance.must_respond_to(:enabled)
           instance.must_respond_to(:enabled=)
           instance.must_respond_to(:enabled?)
-        }
+        end
       end
 
       describe '#deputy' do

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

@@ -6,10 +6,11 @@ module Vedeu
 
     describe Caption do
 
-      let(:described) { Vedeu::Borders::Caption }
-      let(:instance)  { described.new(_value, chars) }
-      let(:_value)    { 'Bismuth' }
-      let(:chars)     {
+      let(:described)  { Vedeu::Borders::Caption }
+      let(:instance)   { described.new(_name, _value, horizontal) }
+      let(:_name)      { 'Vedeu::Borders::Caption' }
+      let(:_value)     { 'Bismuth' }
+      let(:horizontal) {
         [
           Vedeu::Views::Char.new(value: '-', position: [4, 1], border: type),
           Vedeu::Views::Char.new(value: '-', position: [4, 2], border: type),
@@ -31,25 +32,40 @@ module Vedeu
         context 'when the caption is empty' do
           let(:_value) {}
 
-          it { subject.must_equal(chars) }
+          it { subject.must_equal(horizontal) }
         end
 
         context 'when the caption is not empty' do
+          let(:border)   {
+            Vedeu::Borders::Border.new(name: _name)
+          }
+          let(:geometry) {
+            Vedeu::Geometries::Geometry.new(name: _name,
+                                            x:    1,
+                                            xn:   10,
+                                            y:    1,
+                                            yn:   4)
+          }
           let(:expected) {
             [
               Vedeu::Views::Char.new(value: '-', position: [4, 1], border: type),
-              Vedeu::Views::Char.new(value: ' ', position: [4, 2], border: nil),
-              Vedeu::Views::Char.new(value: 'B', position: [4, 3], border: nil),
-              Vedeu::Views::Char.new(value: 'i', position: [4, 4], border: nil),
-              Vedeu::Views::Char.new(value: 's', position: [4, 5], border: nil),
-              Vedeu::Views::Char.new(value: 'm', position: [4, 6], border: nil),
-              Vedeu::Views::Char.new(value: 'u', position: [4, 7], border: nil),
-              Vedeu::Views::Char.new(value: 't', position: [4, 8], border: nil),
-              Vedeu::Views::Char.new(value: ' ', position: [4, 9], border: nil),
+              Vedeu::Cells::Char.new(value: ' ', position: [4, 2]),
+              Vedeu::Cells::Char.new(value: 'B', position: [4, 3]),
+              Vedeu::Cells::Char.new(value: 'i', position: [4, 4]),
+              Vedeu::Cells::Char.new(value: 's', position: [4, 5]),
+              Vedeu::Cells::Char.new(value: 'm', position: [4, 6]),
+              Vedeu::Cells::Char.new(value: 'u', position: [4, 7]),
+              Vedeu::Cells::Char.new(value: 't', position: [4, 8]),
+              Vedeu::Cells::Char.new(value: ' ', position: [4, 9]),
               Vedeu::Views::Char.new(value: '-', position: [4, 10], border: type),
             ]
           }
 
+          before do
+            Vedeu.borders.stubs(:by_name).returns(border)
+            Vedeu.geometries.stubs(:by_name).returns(geometry)
+          end
+
           it { subject.must_equal(expected) }
         end
       end

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

@@ -14,26 +14,45 @@ module Vedeu
       let(:boolean)    { true }
 
       describe '.border' do
-        it { described.must_respond_to(:border) }
+        let(:_name) { 'Vedeu::Borders::DSL' }
+
+        after { Vedeu.borders.reset! }
+
+        subject { described.border(_name) { } }
+
+        it { subject.must_be_instance_of(Vedeu::Borders::Border) }
+
+        context 'when the name is not given' do
+          let(:_name) {}
+
+          it { proc { subject}.must_raise(Vedeu::Error::MissingRequired) }
+        end
+
+        context 'when the block is not given' do
+          subject { described.border(name) }
+
+          it { proc { subject}.must_raise(Vedeu::Error::RequiresBlock) }
+        end
+
       end
 
       describe '#bottom_left' do
-        let(:char) { 'C' }
+        let(:char)    { 'C' }
+        let(:options) { {} }
 
-        subject { instance.bottom_left(char) }
+        subject { instance.bottom_left(char, options) }
 
-        it { subject.must_be_instance_of(String) }
-        it { subject.must_equal('C') }
+        it { subject.must_be_instance_of(Vedeu::Cells::BottomLeft) }
         it { instance.must_respond_to(:bottom_left=) }
       end
 
       describe '#bottom_right' do
-        let(:char) { 'D' }
+        let(:char)    { 'D' }
+        let(:options) { {} }
 
-        subject { instance.bottom_right(char) }
+        subject { instance.bottom_right(char, options) }
 
-        it { subject.must_be_instance_of(String) }
-        it { subject.must_equal('D') }
+        it { subject.must_be_instance_of(Vedeu::Cells::BottomRight) }
         it { instance.must_respond_to(:bottom_right=) }
       end
 
@@ -50,12 +69,12 @@ module Vedeu
       end
 
       describe '#horizontal' do
-        let(:char) { 'H' }
+        let(:char)    { 'H' }
+        let(:options) { {} }
 
-        subject { instance.horizontal(char) }
+        subject { instance.horizontal(char, options) }
 
-        it { subject.must_be_instance_of(String) }
-        it { subject.must_equal('H') }
+        it { subject.must_be_instance_of(Vedeu::Cells::Horizontal) }
         it { instance.must_respond_to(:horizontal=) }
       end
 
@@ -189,22 +208,22 @@ module Vedeu
       end
 
       describe '#top_left' do
-        let(:char) { 'A' }
+        let(:char)    { 'A' }
+        let(:options) { {} }
 
-        subject { instance.top_left(char) }
+        subject { instance.top_left(char, options) }
 
-        it { subject.must_be_instance_of(String) }
-        it { subject.must_equal('A') }
+        it { subject.must_be_instance_of(Vedeu::Cells::TopLeft) }
         it { instance.must_respond_to(:top_left=) }
       end
 
       describe '#top_right' do
-        let(:char) { 'B' }
+        let(:char)    { 'B' }
+        let(:options) { {} }
 
-        subject { instance.top_right(char) }
+        subject { instance.top_right(char, options) }
 
-        it { subject.must_be_instance_of(String) }
-        it { subject.must_equal('B') }
+        it { subject.must_be_instance_of(Vedeu::Cells::TopRight) }
         it { instance.must_respond_to(:top_right=) }
       end
 
@@ -228,12 +247,12 @@ module Vedeu
       end
 
       describe '#vertical' do
-        let(:char) { 'V' }
+        let(:char)    { 'V' }
+        let(:options) { {} }
 
-        subject { instance.vertical(char) }
+        subject { instance.vertical(char, options) }
 
-        it { subject.must_be_instance_of(String) }
-        it { subject.must_equal('V') }
+        it { subject.must_be_instance_of(Vedeu::Cells::Vertical) }
         it { instance.must_respond_to(:vertical=) }
       end
 

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

@@ -59,10 +59,10 @@ module Vedeu
         context 'when the border is enabled' do
           let(:enabled) { true }
 
-          it {
+          it do
             Vedeu.expects(:render_output)
             subject
-          }
+          end
 
           context 'but the interface/view is not visible' do
             let(:visible) { false }

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

@@ -6,10 +6,11 @@ module Vedeu
 
     describe Title do
 
-      let(:described) { Vedeu::Borders::Title }
-      let(:instance)  { described.new(_value, chars) }
-      let(:_value)    { 'Aluminium' }
-      let(:chars)     {
+      let(:described)  { Vedeu::Borders::Title }
+      let(:instance)   { described.new(_name, _value, horizontal) }
+      let(:_name)      { 'Vedeu::Borders::Title' }
+      let(:_value)     { 'Aluminium' }
+      let(:horizontal) {
         [
           Vedeu::Views::Char.new(value: '-', position: [1, 1], border: type),
           Vedeu::Views::Char.new(value: '-', position: [1, 2], border: type),
@@ -27,31 +28,32 @@ module Vedeu
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@name').must_equal(_name) }
         it { instance.instance_variable_get('@value').must_equal(_value) }
-        it { instance.instance_variable_get('@chars').must_equal(chars) }
+        it { instance.instance_variable_get('@horizontal').must_equal(horizontal) }
       end
 
       describe '.render' do
-        subject { described.render(_value, chars) }
+        subject { described.render(_name, _value, horizontal) }
 
         context 'when the title is empty' do
           let(:_value) {}
 
-          it { subject.must_equal(chars) }
+          it { subject.must_equal(horizontal) }
         end
 
         context 'when the title is not empty' do
           let(:expected) {
             [
               Vedeu::Views::Char.new(value: '-', position: [1, 1], border: type),
-              Vedeu::Views::Char.new(value: ' ', position: [1, 2], border: nil),
-              Vedeu::Views::Char.new(value: 'A', position: [1, 3], border: nil),
-              Vedeu::Views::Char.new(value: 'l', position: [1, 4], border: nil),
-              Vedeu::Views::Char.new(value: 'u', position: [1, 5], border: nil),
-              Vedeu::Views::Char.new(value: 'm', position: [1, 6], border: nil),
-              Vedeu::Views::Char.new(value: 'i', position: [1, 7], border: nil),
-              Vedeu::Views::Char.new(value: 'n', position: [1, 8], border: nil),
-              Vedeu::Views::Char.new(value: ' ', position: [1, 9], border: nil),
+              Vedeu::Cells::Char.new(value: ' ', position: [1, 2]),
+              Vedeu::Cells::Char.new(value: 'A', position: [1, 3]),
+              Vedeu::Cells::Char.new(value: 'l', position: [1, 4]),
+              Vedeu::Cells::Char.new(value: 'u', position: [1, 5]),
+              Vedeu::Cells::Char.new(value: 'm', position: [1, 6]),
+              Vedeu::Cells::Char.new(value: 'i', position: [1, 7]),
+              Vedeu::Cells::Char.new(value: 'n', position: [1, 8]),
+              Vedeu::Cells::Char.new(value: ' ', position: [1, 9]),
               Vedeu::Views::Char.new(value: '-', position: [1, 10], border: type),
             ]
           }