vedeu 0.4.13 → 0.4.14

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

@@ -14,8 +14,10 @@ module Vedeu
     }
 
     describe '#initialize' do
-      it { instance.must_be_instance_of(described) }
-      it { instance.instance_variable_get('@attributes').must_equal(attributes) }
+      subject { instance }
+
+      it { subject.must_be_instance_of(described) }
+      it { subject.instance_variable_get('@attributes').must_equal(attributes) }
     end
 
     describe '#background' do
@@ -45,11 +47,25 @@ module Vedeu
     describe '#background=' do
       let(:value) { '#000000' }
 
-      subject { instance.background=(value) }
+      subject { instance.background = (value) }
 
       it { subject.must_equal(value) }
     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(background: '#ff0000') }
+
+        it { subject.must_equal(false) }
+      end
+    end
+
     describe '#foreground' do
       subject { instance.foreground }
 
@@ -77,7 +93,7 @@ module Vedeu
     describe '#foreground=' do
       let(:value) { '#ff0000' }
 
-      subject { instance.foreground=(value) }
+      subject { instance.foreground = (value) }
 
       it { subject.must_equal(value) }
     end

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

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+module Vedeu
+
+  describe Compressor do
+
+    let(:described) { Vedeu::Compressor }
+    let(:instance)  { described.new(output) }
+    let(:output)    {}
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(Vedeu::Compressor) }
+      it { instance.instance_variable_get('@output').must_equal(output) }
+      it { instance.instance_variable_get('@colour').must_equal('') }
+      it { instance.instance_variable_get('@style').must_equal('') }
+    end
+
+    describe '#render' do
+      subject { instance.render }
+
+      it { subject.must_be_instance_of(String) }
+
+      context 'when the output is all Vedeu::Char elements' do
+
+      end
+
+      context 'when the output is not all Vedeu::Char elements' do
+        let(:output) {
+          [
+            Vedeu::Char.new(value: 'N'),
+            'o',
+            Vedeu::Char.new(value: 't'),
+          ]
+        }
+        it 'converts the non-Vedeu::Char elements into String elements' do
+          subject.must_equal('Not')
+        end
+      end
+    end
+
+  end # Compressor
+
+end # Vedeu

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

@@ -17,7 +17,7 @@ module Vedeu
     }
     let(:border) {}
     let(:colour) {}
-    let(:parent) { Vedeu::Line.new({ colour: parent_colour }) }
+    let(:parent) { Vedeu::Line.new(colour: parent_colour) }
     let(:parent_colour) {}
     let(:value) {}
 
@@ -35,39 +35,50 @@ module Vedeu
         let(:border) { :top_left }
 
         context 'when there is a colour' do
-          let(:colour) { Vedeu::Colour.new({ background: '#220022', foreground: '#aadd00' }) }
+          let(:colour) {
+            Vedeu::Colour.new(background: '#220022', foreground: '#aadd00')
+          }
 
           it { subject.must_equal(
-            "<td style='background:#220022;color:#aadd00;border:1px #220022 solid;border-top:1px #aadd00 solid;border-left:1px #aadd00 solid;'>&nbsp;</td>"
+            "<td style='background:#220022;color:#aadd00;"           \
+            "border:1px #220022 solid;border-top:1px #aadd00 solid;" \
+            "border-left:1px #aadd00 solid;'>&nbsp;</td>"
           ) }
         end
 
         context 'when there is no colour' do
           context 'when there is a parent colour' do
-            let(:parent_colour) { Vedeu::Colour.new({ background: '#002222', foreground: '#dd2200' }) }
+            let(:parent_colour) {
+              Vedeu::Colour.new(background: '#002222', foreground: '#dd2200')
+            }
 
             it { subject.must_equal(
-              "<td style='background:#002222;color:#dd2200;border:1px #002222 solid;border-top:1px #dd2200 solid;border-left:1px #dd2200 solid;'>&nbsp;</td>"
+              "<td style='background:#002222;color:#dd2200;"           \
+              "border:1px #002222 solid;border-top:1px #dd2200 solid;" \
+              "border-left:1px #dd2200 solid;'>&nbsp;</td>"
             ) }
           end
 
           context 'when there is no parent colour' do
             it { subject.must_equal(
-              "<td style='background:#000;color:#222;border:1px #000 solid;border-top:1px #222 solid;border-left:1px #222 solid;'>&nbsp;</td>"
+              "<td style='background:#000;color:#222;border:1px #000 solid;" \
+              "border-top:1px #222 solid;border-left:1px #222 solid;'>"      \
+              "&nbsp;</td>"
             ) }
           end
         end
       end
 
+      grey = '1px #222 solid'
       {
-        top_horizontal:    "border-top:1px #222 solid;",
-        left_vertical:     "border-left:1px #222 solid;",
-        right_vertical:    "border-right:1px #222 solid;",
-        bottom_horizontal: "border-bottom:1px #222 solid;",
-        top_left:          "border-top:1px #222 solid;border-left:1px #222 solid;",
-        top_right:         "border-top:1px #222 solid;border-right:1px #222 solid;",
-        bottom_left:       "border-bottom:1px #222 solid;border-left:1px #222 solid;",
-        bottom_right:      "border-bottom:1px #222 solid;border-right:1px #222 solid;",
+        top_horizontal:    "border-top:#{grey};",
+        left_vertical:     "border-left:#{grey};",
+        right_vertical:    "border-right:#{grey};",
+        bottom_horizontal: "border-bottom:#{grey};",
+        top_left:     "border-top:#{grey};border-left:#{grey};",
+        top_right:    "border-top:#{grey};border-right:#{grey};",
+        bottom_left:  "border-bottom:#{grey};border-left:#{grey};",
+        bottom_right: "border-bottom:#{grey};border-right:#{grey};",
         horizontal:        '',
         vertical:          ''
       }.each do |border_style, result|
@@ -84,20 +95,21 @@ module Vedeu
 
       context 'when there is no border' do
         context 'when there is no value' do
-          it { subject.must_equal("<td>&nbsp;</td>") }
+          it { subject.must_equal('<td>&nbsp;</td>') }
         end
 
         context 'when the value is empty' do
           let(:value) { '' }
 
-          it { subject.must_equal("<td>&nbsp;</td>") }
+          it { subject.must_equal('<td>&nbsp;</td>') }
         end
 
         context 'when there is a value' do
           let(:value) { 'a' }
 
           it { subject.must_equal(
-            "<td style='background:#000;color:#222;border:1px #000 solid;'>a</td>"
+            "<td style='background:#000;color:#222;" \
+            "border:1px #000 solid;'>a</td>"
           ) }
         end
       end

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

@@ -6,7 +6,8 @@ module Vedeu
 
     let(:described) { Vedeu::NullBorder }
     let(:instance)  { described.new(interface) }
-    let(:interface) { stub('Interface', x: 4, y: 6, xn: 10, yn: 12) }
+    let(:interface) { stub('Interface', geometry: geometry) }
+    let(:geometry)  { stub('Geometry', x: 4, y: 6, xn: 10, yn: 12) }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(Vedeu::NullBorder) }

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

@@ -5,46 +5,36 @@ module Vedeu
   describe Output do
 
     let(:described) { Vedeu::Output }
-    let(:instance)  { described.new(interface) }
-    let(:interface) {
-      Vedeu.interface 'flourine' do
-        geometry do
-          height 3
-          width  32
-        end
-      end
-    }
-    let(:lines) {
-      [
-        Line.new({ streams: [Stream.new({ value: 'this is the first' })] }),
-        Line.new({ streams: [Stream.new({ value: 'this is the second and it is long' })] }),
-        Line.new({ streams: [Stream.new({ value: 'this is the third, it is even longer and still truncated' })] }),
-        Line.new({ streams: [Stream.new({ value: 'this should not render' })] }),
-      ]
-    }
-
-    before do
-      interface.lines = lines
-      IO.console.stubs(:print)
-    end
+    let(:instance)  { described.new(content) }
+    let(:content)   {}
 
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
-      it { instance.instance_variable_get('@interface').must_equal(interface) }
+      it { instance.instance_variable_get('@content').must_equal(content) }
     end
 
     describe '.render' do
-      before { Vedeu::FileRenderer.stubs(:render) }
+      let(:rendered) { interface.render }
 
-      subject { described.render(interface) }
+      before do
+        Vedeu.renderers.stubs(:render)
+        # Vedeu::FileRenderer.stubs(:render)
+        # Vedeu::HTMLRenderer.stubs(:to_file)
+        # Vedeu::TerminalRenderer.stubs(:render).returns(rendered)
+      end
 
-      it { subject.must_be_instance_of(Array) }
+      subject { described.render(content) }
 
-      context 'when a border is defined for the interface' do
-      end
+      # context 'when DRb is enabled' do
+      #   it { }
+      # end
 
-      context 'when a border is not defined for the interface' do
-      end
+      # context 'when DRb is not enabled' do
+      #   it 'sends the rendered interface to the Terminal' do
+      #     Vedeu::TerminalRenderer.expects(:render)
+      #     subject.must_be_instance_of(Array)
+      #   end
+      # end
     end
 
   end # Output

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

@@ -2,9 +2,28 @@ require 'test_helper'
 
 module Vedeu
 
+  class ParentPresentationTestClass
+    include Presentation
+
+    def parent
+      nil
+    end
+
+    def attributes
+      {
+        colour: { background: '#330000', foreground: '#00aadd' },
+        style:  ['bold']
+      }
+    end
+  end
+
   class PresentationTestClass
     include Presentation
 
+    def parent
+      ParentPresentationTestClass.new
+    end
+
     def attributes
       {
         colour: { background: '#000033', foreground: '#aadd00' },
@@ -44,9 +63,9 @@ module Vedeu
     end
 
     describe '#colour=' do
-      let(:colour) { Colour.new({ foreground: '#00ff00', background: '#000000' }) }
+      let(:colour) { Colour.new(foreground: '#00ff00', background: '#000000') }
 
-      subject { receiver.colour=(colour) }
+      subject { receiver.colour = (colour) }
 
       it { subject.must_be_instance_of(Colour) }
     end
@@ -60,23 +79,31 @@ module Vedeu
     describe '#style=' do
       let(:style) { Style.new('normal') }
 
-      subject { receiver.style=(style) }
+      subject { receiver.style = (style) }
 
       it { subject.must_be_instance_of(Style) }
     end
 
     describe '#to_s' do
       let(:line) {
-        Vedeu::Line.new({
-          streams: [],
-          parent:  Vedeu::Interface.new,
-          colour:  Colour.new({ foreground: '#00ff00', background: '#000000' }),
-          style:   Style.new('normal')
-        })
+        Vedeu::Line.new(streams: [],
+                        parent:  Vedeu::Interface.new,
+                        colour:  line_colour,
+                        style:   Style.new('normal'))
+      }
+      let(:line_colour) {
+        Colour.new(foreground: '#00ff00', background: '#000000')
+      }
+      let(:stream) {
+        Stream.new(value: stream_value,
+                   parent: line,
+                   colour: stream_colour,
+                   style: stream_style)
       }
-      let(:stream) { Stream.new({ value: stream_value, parent: line, colour: stream_colour, style: stream_style }) }
       let(:stream_value)  { 'Some text' }
-      let(:stream_colour) { Colour.new({ foreground: '#ff0000', background: '#000000' }) }
+      let(:stream_colour) {
+        Colour.new(foreground: '#ff0000', background: '#000000')
+      }
       let(:stream_style)  { Style.new(:underline) }
 
       it 'returns output' do
@@ -84,13 +111,9 @@ module Vedeu
           # - stream colour
           # - stream style
           # - stream content
-          # - line style
-          # - line colour
           "\e[38;2;255;0;0m\e[48;2;0;0;0m"  \
           "\e[4m"                           \
-          "Some text"                       \
-          "\e[24m\e[22m\e[27m"              \
-          "\e[38;2;0;255;0m\e[48;2;0;0;0m"
+          'Some text'
         )
       end
     end

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

@@ -24,7 +24,7 @@ module Vedeu
       context 'when there are no registered interfaces' do
         before { Vedeu.focusable.reset }
 
-        it { described.by_focus.must_equal(nil) }
+        it { subject.must_equal(nil) }
       end
 
       context 'when there are registered interfaces' do
@@ -32,13 +32,24 @@ module Vedeu
     end
 
     describe '.by_group' do
+      subject { described.by_group(group_name) }
+
       context 'when there are no registered groups' do
+        let(:group_name) { '' }
+
         before { Vedeu.groups.reset }
 
-        it { proc { described.by_group('') }.must_raise(ModelNotFound) }
+        it { proc { subject }.must_raise(ModelNotFound) }
       end
 
       context 'when there are registered groups' do
+        let(:group_name) { 'elements' }
+
+        before do
+          Vedeu::Group.new(name: group_name, members: 'aluminium').store
+        end
+
+        it { Vedeu.buffers.expects(:render).with('aluminium'); subject }
       end
     end
 
@@ -47,14 +58,7 @@ module Vedeu
 
       subject { described.by_name(interface_name) }
 
-      context 'when the interface or buffer is not found' do
-        let(:interface_name) { '' }
-
-        it { proc { described.by_name('') }.must_raise(ModelNotFound) }
-      end
-
-      context 'when the interface or buffer is found' do
-      end
+      it { Vedeu.buffers.expects(:render).with(interface_name); subject }
     end
 
   end # Refresh

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

@@ -0,0 +1,96 @@
+require 'test_helper'
+
+module Vedeu
+
+  class DummyRenderer
+    def self.render
+      :dummy
+    end
+  end
+
+  class FooRenderer
+    def self.render
+      :foo
+    end
+  end
+
+  describe Renderers do
+
+    let(:described) { Vedeu::Renderers }
+
+    before { Vedeu::Renderers.reset }
+    after  { Vedeu::Renderers.reset }
+
+    describe '.renderers' do
+      subject { described.renderers }
+
+      it { subject.must_be_instance_of(Module) }
+
+      # context 'API' do
+      #   before { Vedeu::Renderers.renderer(*renderers) }
+
+      #   subject { Vedeu.renderers.render }
+
+      #   context 'when a single renderer is defined' do
+      #     let(:renderers) { DummyRenderer }
+
+      #     it { subject.must_equal([:dummy]) }
+      #   end
+
+      #   context 'when multiple renderers are defined' do
+      #     let(:renderers) { [DummyRenderer, FooRenderer] }
+
+      #     it { subject.must_equal([:dummy, :foo]) }
+      #   end
+
+      #   context 'when no renderers are defined' do
+      #     let(:renderers) {}
+
+      #     it { subject.must_equal([]) }
+      #   end
+      # end
+    end
+
+    describe '.renderer' do
+      let(:renderers) {}
+
+      subject { described.renderer(*renderers) }
+
+      it { subject.must_be_instance_of(Set) }
+
+      context 'with a single renderer' do
+        let(:renderers) { DummyRenderer }
+
+        it { subject.size.must_equal(1) }
+      end
+
+      context 'with multiple renderers' do
+        let(:renderers) { [DummyRenderer, FooRenderer] }
+
+        it { subject.size.must_equal(2) }
+      end
+
+      context 'with no renderer' do
+        let(:renderers) {}
+
+        it { subject.size.must_equal(0) }
+      end
+    end
+
+    describe '.reset' do
+      subject { described.reset }
+
+      it { subject.must_be_instance_of(Set) }
+      it { subject.size.must_equal(0) }
+    end
+
+    describe '.storage' do
+      subject { described.storage }
+
+      it { subject.must_be_instance_of(Set) }
+      it { subject.size.must_equal(0) }
+    end
+
+  end # Renderers
+
+end # Vedeu

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

@@ -16,7 +16,7 @@ module Vedeu
     describe '.render' do
       subject { described.render }
 
-      # it { subject.must_be_instance_of(String) }
+      # it { subject.must_be_instance_of(Fixnum) }
     end
 
   end # FileRenderer

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

@@ -27,7 +27,7 @@ module Vedeu
       context 'when a path is given' do
         let(:path) { '/tmp/test_vedeu_html_renderer.html' }
 
-        #it { subject.must_equal('') }
+        # it { subject.must_equal('') }
       end
 
       context 'when a path is not given' do
@@ -48,20 +48,24 @@ module Vedeu
         let(:output) {
           [
             [
-              Vedeu::Char.new({ value: 't' }),
-              Vedeu::Char.new({ value: 'e' }),
-              Vedeu::Char.new({ value: 's' }),
-              Vedeu::Char.new({ value: 't' }),
+              Vedeu::Char.new(value: 't'),
+              Vedeu::Char.new(value: 'e'),
+              Vedeu::Char.new(value: 's'),
+              Vedeu::Char.new(value: 't'),
             ]
           ]
         }
 
         it { subject.must_equal(
           "<tr>\n" \
-          "<td style='background:#000;color:#222;border:1px #000 solid;'>t</td>\n" \
-          "<td style='background:#000;color:#222;border:1px #000 solid;'>e</td>\n" \
-          "<td style='background:#000;color:#222;border:1px #000 solid;'>s</td>\n" \
-          "<td style='background:#000;color:#222;border:1px #000 solid;'>t</td>\n" \
+          "<td style='background:#000;color:#222;border:1px #000 solid;'>"   \
+          "t</td>\n" \
+            "<td style='background:#000;color:#222;border:1px #000 solid;'>" \
+          "e</td>\n" \
+            "<td style='background:#000;color:#222;border:1px #000 solid;'>" \
+          "s</td>\n" \
+            "<td style='background:#000;color:#222;border:1px #000 solid;'>" \
+          "t</td>\n" \
           "</tr>\n") }
       end
     end

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

@@ -0,0 +1,52 @@
+require 'test_helper'
+
+module Vedeu
+
+  describe JSONRenderer do
+
+    let(:described) { Vedeu::JSONRenderer }
+    let(:instance)  { described.new(output) }
+    let(:output)    {}
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(Vedeu::JSONRenderer) }
+      it { instance.instance_variable_get('@output').must_equal(output) }
+    end
+
+    describe '.render' do
+      subject { described.render(output) }
+
+      it { subject.must_be_instance_of(String) }
+
+      context 'when the output is empty' do
+        it { subject.must_equal('') }
+      end
+
+      context 'when the output is not empty' do
+        let(:colour) {
+          Vedeu::Colour.new(foreground: '#ff0000', background: '#ffffff')
+        }
+        let(:output) {
+          [
+            [
+              Vedeu::Char.new(value: 'a',
+                              colour: colour,
+                              position: Vedeu::Position[5, 3])
+            ]
+          ]
+        }
+        it { subject.must_equal(
+          "{\"border\":\"\",\"colour\":{\""                        \
+          "background\":\"\\u001b[48;2;255;255;255m\","            \
+          "\"foreground\":\"\\u001b[38;2;255;0;0m\"},"             \
+          "\"parent\":{\""                                         \
+          "background\":\"\",\"foreground\":\"\",\"style\":\"\"}," \
+          "\"position\":{\"y\":5,\"x\":3},\"style\":\"\","         \
+          "\"value\":\"a\"}\n\n"
+        ) }
+      end
+    end
+
+  end # JSONRenderer
+
+end # Vedeu

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

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+module Vedeu
+
+  describe NullRenderer do
+
+    let(:described) { Vedeu::NullRenderer }
+
+    describe '.render' do
+      let(:args) {}
+
+      subject { described.render(*args) }
+
+      it { subject.must_be_instance_of(NilClass) }
+    end
+
+  end # NullRenderer
+
+end # Vedeu