vedeu 0.6.51 → 0.6.52

data/lib/vedeu/output/presentation/styles.rb

@@ -15,6 +15,9 @@ module Vedeu
         @style ||= if attributes[:style]
                      Vedeu::Presentation::Style.coerce(attributes[:style])
 
+                   elsif self.is_a?(Vedeu::Views::Char) && name
+                     Vedeu::Presentation::Style.coerce(interface.style)
+
                    elsif parent
                      Vedeu::Presentation::Style.coerce(parent.style)
 

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

@@ -67,7 +67,7 @@ module Vedeu
       # @return [Float]
       def timestamp
         if options[:timestamp]
-          "_#{Time.now.to_f}".freeze
+          "_#{Vedeu.clock_time}".freeze
 
         else
           ''.freeze

data/lib/vedeu/version.rb

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

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

@@ -0,0 +1,87 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Buffers
+
+    describe Empty do
+
+      let(:described)  { Vedeu::Buffers::Empty }
+      let(:instance)   { described.new(attributes) }
+      let(:attributes) {
+        {
+          height: height,
+          name:   _name,
+          width:  width,
+        }
+      }
+      let(:height) { 10 }
+      let(:_name)  {}
+      let(:width)  { 30 }
+
+      before do
+        Vedeu.stubs(:height).returns(12)
+        Vedeu.stubs(:width).returns(36)
+      end
+
+      describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
+
+        context 'when the height is given' do
+          it { instance.instance_variable_get('@height').must_equal(10) }
+        end
+
+        context 'when the height not is given' do
+          let(:height) {}
+
+          it { instance.instance_variable_get('@height').must_equal(12) }
+        end
+
+        it { instance.instance_variable_get('@name').must_equal(_name) }
+
+        context 'when the width is given' do
+          it { instance.instance_variable_get('@width').must_equal(30) }
+        end
+
+        context 'when the width not is given' do
+          let(:width) {}
+
+          it { instance.instance_variable_get('@width').must_equal(36) }
+        end
+      end
+
+      describe 'accessors' do
+        it { instance.must_respond_to(:name) }
+      end
+
+      describe '#buffer' do
+        let(:position) { Vedeu::Geometry::Position.new(1, 1) }
+
+        subject { instance.buffer }
+
+        it { subject.must_be_instance_of(Array) }
+        it { subject.first.must_be_instance_of(Array) }
+        it { subject.first.first.must_be_instance_of(Vedeu::Models::Cell) }
+
+        it { subject.size.must_equal(31) }
+        it { subject.first.size.must_equal(11) }
+        it { subject.first.first.position.must_equal(position) }
+      end
+
+      describe '#height' do
+        subject { instance.height }
+
+        it { subject.must_equal(height + 1) }
+      end
+
+      describe '#width' do
+        subject { instance.width }
+
+        it { subject.must_equal(width + 1) }
+      end
+
+    end # Empty
+
+  end # Buffers
+
+end # Vedeu

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

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Buffers
+
+    describe View do
+
+      let(:described)  { Vedeu::Buffers::View }
+      let(:instance)   { described.new(attributes) }
+      let(:_name)      { 'Vedeu::Buffers::View' }
+      let(:attributes) {
+        {
+          name: _name,
+        }
+      }
+
+      describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
+
+        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(:_name) {}
+
+          it { instance.instance_variable_get('@name').must_equal('') }
+        end
+      end
+
+    end # View
+
+  end # Buffers
+
+end # Vedeu

data/test/lib/vedeu/colours/colour_test.rb

@@ -19,19 +19,8 @@ module Vedeu
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
-        it {
-          instance.instance_variable_get('@background').
-            must_be_instance_of(Vedeu::Colours::Background)
-        }
-        it {
-          instance.instance_variable_get('@foreground').
-            must_be_instance_of(Vedeu::Colours::Foreground)
-        }
-      end
-
-      describe 'accessors' do
-        it { instance.must_respond_to(:background) }
-        it { instance.must_respond_to(:foreground) }
+        it { instance.instance_variable_get('@background').must_equal(background)}
+        it { instance.instance_variable_get('@foreground').must_equal(foreground)}
       end
 
       describe '.coerce' do
@@ -187,6 +176,10 @@ module Vedeu
         it { subject.must_equal(expected) }
       end
 
+      describe '#background' do
+        # @todo Add more tests.
+      end
+
       describe '#background=' do
         let(:_value) { '#000000' }
 
@@ -209,6 +202,10 @@ module Vedeu
         end
       end
 
+      describe '#foreground' do
+        # @todo Add more tests.
+      end
+
       describe '#foreground=' do
         let(:_value) { '#ff0000' }
 

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

@@ -68,13 +68,22 @@ module Vedeu
       end
 
       describe '#down' do
-        let(:y) { 11 }
+        let(:y)    { 11 }
+        let(:size) {}
 
-        subject { instance.down }
+        subject { instance.down(size) }
 
         it { subject.must_be_instance_of(described) }
 
         it { subject.y.must_equal(12) }
+        it { subject.x.must_equal(0) }
+
+        context 'when a size is given and x > size' do
+          let(:x)    { 15 }
+          let(:size) { 11 }
+
+          it { subject.x.must_equal(11) }
+        end
       end
 
       describe '#left' do
@@ -144,15 +153,24 @@ module Vedeu
       end
 
       describe '#up' do
-        let(:y)  { 11 }
-        let(:oy) { 2 }
+        let(:y)    { 11 }
+        let(:oy)   { 2 }
+        let(:size) {}
 
-        subject { instance.up }
+        subject { instance.up(size) }
 
         it { subject.must_be_instance_of(described) }
 
         it { subject.y.must_equal(10) }
         it { subject.oy.must_equal(1) }
+        it { subject.x.must_equal(0) }
+
+        context 'when a size is given and x > size' do
+          let(:x)    { 15 }
+          let(:size) { 11 }
+
+          it { subject.x.must_equal(11) }
+        end
       end
 
       describe '#x' do

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

@@ -44,13 +44,11 @@ module Vedeu
         let(:output) {
           [
             [
-              Vedeu::Views::Char.new(value: ' ', position: [1, 1]),
-              Vedeu::Views::Char.new(value: ' ', position: [1, 2]),
-
+              Vedeu::Views::Char.new(name: _name, value: ' ', position: [1, 1]),
+              Vedeu::Views::Char.new(name: _name, value: ' ', position: [1, 2]),
             ], [
-              Vedeu::Views::Char.new(value: ' ', position: [2, 1]),
-              Vedeu::Views::Char.new(value: ' ', position: [2, 2]),
-
+              Vedeu::Views::Char.new(name: _name, value: ' ', position: [2, 1]),
+              Vedeu::Views::Char.new(name: _name, value: ' ', position: [2, 2]),
             ]
           ]
         }

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

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Logging
+
+    describe ClockTime do
+
+    end # ClockTime
+
+  end # Logging
+
+end # Vedeu

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

@@ -9,18 +9,16 @@ module Vedeu
       let(:described) { Vedeu::Logging::Timer }
       let(:instance)  { described.new(_message) }
       let(:_message)  { 'Testing' }
-      let(:_time)     { mock('Time') }
-      let(:started)   { 1434492219.5238185 }
+      let(:_time)     { 1219.523818 }
 
       before do
-        Time.stubs(:now).returns(_time)
-        _time.stubs(:to_f).returns(started)
+        Vedeu.stubs(:clock_time).returns(_time)
       end
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@message').must_equal(_message) }
-        it { instance.instance_variable_get('@started').must_equal(started) }
+        it { instance.instance_variable_get('@started').must_equal(_time) }
       end
 
       describe '.timer' do

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

@@ -11,12 +11,14 @@ module Vedeu
       let(:attributes) {
         {
           colour:   colour,
+          name:     _name,
           style:    style,
           value:    _value,
           position: position,
         }
       }
       let(:colour)   { Vedeu::Colours::Colour.new(background: '#000000') }
+      let(:_name)    {}
       let(:style)    {}
       let(:_value)   {}
       let(:position) {}
@@ -24,6 +26,7 @@ module Vedeu
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@colour').must_equal(colour) }
+        it { instance.instance_variable_get('@name').must_equal(_name) }
         it { instance.instance_variable_get('@style').must_equal(style) }
         it { instance.instance_variable_get('@value').must_equal('') }
         it { instance.instance_variable_get('@position').must_equal([1, 1]) }
@@ -32,6 +35,7 @@ module Vedeu
       describe 'accessors' do
         it {
           instance.must_respond_to(:colour)
+          instance.must_respond_to(:name)
           instance.must_respond_to(:style)
           instance.must_respond_to(:value)
         }
@@ -57,6 +61,18 @@ module Vedeu
         end
       end
 
+      describe '#interface' do
+        let(:interface) { Vedeu::Interfaces::Interface.new }
+
+        before do
+          Vedeu.interfaces.stubs(:by_name).with(_name).returns(interface)
+        end
+
+        subject { instance.interface }
+
+        it { subject.must_be_instance_of(Vedeu::Interfaces::Interface) }
+      end
+
       describe '#position' do
         subject { instance.position }
 

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

@@ -25,6 +25,7 @@ module Vedeu
         {
           border:   border,
           colour:   colour,
+          name:     _name,
           parent:   parent,
           position: position,
           style:    style,
@@ -43,6 +44,7 @@ module Vedeu
       }
       let(:border)        { nil }
       let(:colour)        { nil }
+      let(:_name)         { 'Vedeu::Views::Char' }
       let(:style)         { nil }
       let(:position)      { nil }
       let(:parent_colour) { nil }
@@ -51,6 +53,7 @@ module Vedeu
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@border').must_equal(border) }
+        it { instance.instance_variable_get('@name').must_equal(_name) }
         it { instance.instance_variable_get('@parent').must_equal(parent) }
         it { instance.instance_variable_get('@value').must_equal(_value) }
 
@@ -61,6 +64,8 @@ module Vedeu
         it {
           instance.must_respond_to(:border)
           instance.must_respond_to(:border=)
+          instance.must_respond_to(:name)
+          instance.must_respond_to(:name=)
           instance.must_respond_to(:parent)
           instance.must_respond_to(:parent=)
           instance.must_respond_to(:attributes)
@@ -92,6 +97,18 @@ module Vedeu
         end
       end
 
+      describe '#interface' do
+        let(:interface) { Vedeu::Interfaces::Interface.new }
+
+        before do
+          Vedeu.interfaces.stubs(:by_name).with(_name).returns(interface)
+        end
+
+        subject { instance.interface }
+
+        it { subject.must_be_instance_of(Vedeu::Interfaces::Interface) }
+      end
+
       describe '#position' do
         subject { instance.position }
       end
@@ -111,6 +128,7 @@ module Vedeu
                 background: '',
                 foreground: '',
               },
+              name: 'Vedeu::Views::Char',
               parent: {
                 background: '',
                 foreground: '',

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

@@ -19,12 +19,14 @@ module Vedeu
         {
           border: border,
           colour: colour,
+          name:   _name,
           parent: parent,
           value:  _value
         }
       }
       let(:border) {}
       let(:colour) {}
+      let(:_name)  { 'Vedeu::Views::HTMLChar' }
       let(:parent) { Vedeu::Views::Line.new(colour: parent_colour) }
       let(:parent_colour) {}
       let(:_value) {}
@@ -61,25 +63,36 @@ module Vedeu
           end
 
           context 'when there is no colour' do
-            context 'when there is a parent colour' do
-              let(:parent_colour) {
-                Vedeu::Colours::Colour.new(background: '#002222',
-                                           foreground: '#dd2200')
-              }
-
-              it { subject.must_equal(
-                "<td style='" \
-                "border:1px #002222 solid;" \
-                "background:#002222;" \
-                "color:#dd2200;"      \
-                "border-top:1px #dd2200 solid;" \
-                "border-left:1px #dd2200 solid;" \
-                "'>&nbsp;</td>"
-              ) }
+            context 'when there is an interface' do
+              it { subject.must_equal("<td style=''>&nbsp;</td>") }
             end
 
-            context 'when there is no parent colour' do
-              it { subject.must_equal("<td style=''>&nbsp;</td>") }
+            context 'when there is no interface' do
+              let(:_name) {}
+
+              context 'when there is a parent colour' do
+                let(:parent_colour) {
+                  Vedeu::Colours::Colour.new(background: '#002222',
+                                             foreground: '#dd2200')
+                }
+
+                it { subject.must_equal(
+                  "<td style='" \
+                  "border:1px #002222 solid;" \
+                  "background:#002222;" \
+                  "color:#dd2200;"      \
+                  "border-top:1px #dd2200 solid;" \
+                  "border-left:1px #dd2200 solid;" \
+                  "'>&nbsp;</td>"
+                ) }
+              end
+
+              context 'when there is no parent colour' do
+                let(:parent) {}
+                let(:parent_colour) {}
+
+                it { subject.must_equal("<td style=''>&nbsp;</td>") }
+              end
             end
           end
         end