vedeu 0.0.32 → 0.0.33

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

@@ -9,17 +9,19 @@ module Vedeu
   describe Presentation do
     describe '#colour' do
       it 'returns a Colour instance' do
-        TestPresentation.new({
+        presentation = TestPresentation.new({
           colour: { foreground: '#ff0000', background: '#333333' }
-        }).colour.must_be_instance_of(Colour)
+        })
+        presentation.colour.must_be_instance_of(Colour)
       end
     end
 
     describe '#style' do
       it 'has a style attribute' do
-        TestPresentation.new({
-          style:  ['bold', 'underline']
-        }).style.must_equal("\e[1m\e[4m")
+        presentation = TestPresentation.new({
+          style: ['bold', 'underline']
+        })
+        presentation.style.must_equal(['bold', 'underline'])
       end
     end
   end

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

@@ -4,37 +4,47 @@ require_relative '../../../../lib/vedeu/models/stream'
 module Vedeu
   describe Stream do
     it 'has a colour attribute' do
-      Stream.new({
+      stream = Stream.new({
         colour: { foreground: '#ff0000', background: '#000000' }
-      }).colour.must_be_instance_of(Colour)
+      })
+      stream.colour.must_be_instance_of(Colour)
     end
 
     it 'has a text attribute' do
-      Stream.new({ text: 'Some text' }).text.must_equal('Some text')
+      stream = Stream.new({ text: 'Some text' })
+      stream.text.must_equal('Some text')
     end
 
     it 'has a style attribute' do
-      Stream.new({ style: 'normal' }).style
-        .must_equal("\e[24m\e[21m\e[27m")
+      stream = Stream.new({ style: 'normal' })
+      stream.style.must_equal("\e[24m\e[21m\e[27m")
     end
 
     describe '#to_s' do
       it 'returns a String' do
-        Stream.new({
-          style:  'normal',
+        stream = Stream.new({
           colour: { foreground: '#ff0000', background: '#000000' },
+          style:  'normal',
           text:   'Some text'
-        }).to_s.must_equal("\e[38;5;196m\e[48;5;16m\e[24m\e[21m\e[27mSome text")
+        })
+
+        stream.to_s.must_equal(
+          "\e[38;5;196m\e[48;5;16m" \
+          "\e[24m\e[21m\e[27m" \
+          "Some text"
+        )
       end
     end
 
     describe '#to_json' do
       it 'returns a String' do
-        Stream.new({
-          style:  'normal',
+        stream = Stream.new({
           colour: { foreground: '#ff0000', background: '#000000' },
+          style:  'normal',
           text:   'Some text'
-        }).to_json.must_equal("{\"colour\":{\"foreground\":\"#ff0000\",\"background\":\"#000000\"},\"style\":\"\\u001b[24m\\u001b[21m\\u001b[27m\",\"text\":\"Some text\"}")
+        })
+
+        stream.to_json.must_equal("{\"colour\":{\"foreground\":\"#ff0000\",\"background\":\"#000000\"},\"style\":[\"normal\"],\"text\":\"Some text\"}")
       end
     end
   end

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

@@ -0,0 +1,86 @@
+require_relative '../../../test_helper'
+require_relative '../../../../lib/vedeu/models/presentation'
+require_relative '../../../../lib/vedeu/models/style'
+
+module Vedeu
+  class TestStyle
+    include Presentation
+    include Style
+  end
+
+  describe Style do
+    describe '#style' do
+      it 'returns an escape sequence for a single style' do
+        test_style = TestStyle.new(style: 'normal')
+        test_style.style.must_equal("\e[24m\e[21m\e[27m")
+      end
+
+      it 'returns an escape sequence for multiple styles' do
+        test_style = TestStyle.new(style: ['normal', 'underline'])
+        test_style.style.must_equal("\e[24m\e[21m\e[27m\e[4m")
+      end
+
+      it 'returns an empty string for an unknown style' do
+        test_style = TestStyle.new(style: 'unknown')
+        test_style.style.must_equal('')
+      end
+
+      it 'has a style attribute' do
+        test_style = TestStyle.new(style: ['normal'])
+        test_style.style.must_equal("\e[24m\e[21m\e[27m")
+      end
+
+      it 'returns an empty string for empty or nil' do
+        test_style = TestStyle.new(style: '')
+        test_style.style.must_equal('')
+      end
+
+      it 'returns an empty string for empty or nil' do
+        test_style = TestStyle.new(style: nil)
+        test_style.style.must_equal('')
+      end
+
+      it 'returns an empty string for empty or nil' do
+        test_style = TestStyle.new(style: [])
+        test_style.style.must_equal('')
+      end
+    end
+
+    describe '#style_original' do
+      it 'returns an escape sequence for a single style' do
+        test_style = TestStyle.new(style: 'normal')
+        test_style.style_original.must_equal(['normal'])
+      end
+
+      it 'returns an escape sequence for multiple styles' do
+        test_style = TestStyle.new(style: ['normal', 'underline'])
+        test_style.style_original.must_equal(['normal', 'underline'])
+      end
+
+      it 'returns an empty string for an unknown style' do
+        test_style = TestStyle.new(style: 'unknown')
+        test_style.style_original.must_equal(['unknown'])
+      end
+
+      it 'has a style attribute' do
+        test_style = TestStyle.new(style: ['normal'])
+        test_style.style_original.must_equal(['normal'])
+      end
+
+      it 'returns an empty string for empty or nil' do
+        test_style = TestStyle.new(style: '')
+        test_style.style_original.must_equal([''])
+      end
+
+      it 'returns an empty string for empty or nil' do
+        test_style = TestStyle.new(style: nil)
+        test_style.style_original.must_equal('')
+      end
+
+      it 'returns an empty string for empty or nil' do
+        test_style = TestStyle.new(style: [])
+        test_style.style_original.must_equal('')
+      end
+    end
+  end
+end

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

@@ -1,24 +1,51 @@
 require_relative '../../../test_helper'
+require_relative '../../../../lib/vedeu/repository/interface_repository'
 require_relative '../../../../lib/vedeu/output/interface_renderer'
 require_relative '../../../../lib/vedeu/models/interface'
 
 module Vedeu
   describe InterfaceRenderer do
+    before { InterfaceRepository.reset }
+
     describe '.clear' do
       it 'returns the escape sequence to clear the whole interface' do
-        interface = Interface.new({ name: 'dummy', width: 20, height: 2 })
-        InterfaceRenderer.clear(interface).must_equal("\e[1;1H                    \e[1;1H\e[2;1H                    \e[2;1H")
+        interface = Interface.new({
+          name:   '.clear',
+          width:  5,
+          height: 2
+        })
+        InterfaceRenderer.clear(interface).must_equal(
+          "\e[1;1H     \e[1;1H" \
+          "\e[2;1H     \e[2;1H"
+        )
       end
 
       it 'returns the escape sequence to clear the whole interface with specified colours' do
-        interface = Interface.new({ name: 'dummy', width: 20, height: 2, colour: { foreground: '#00ff00', background: '#ffff00' } })
-        InterfaceRenderer.clear(interface).must_equal("\e[38;5;46m\e[48;5;226m\e[1;1H                    \e[1;1H\e[2;1H                    \e[2;1H")
+        interface = Interface.new({
+          name:   '.clear',
+          width:  5,
+          height: 2,
+          colour: {
+            foreground: '#00ff00',
+            background: '#ffff00'
+          }
+        })
+        InterfaceRenderer.clear(interface).must_equal(
+          "\e[38;5;46m\e[48;5;226m" \
+          "\e[1;1H     \e[1;1H" \
+          "\e[2;1H     \e[2;1H"
+        )
       end
     end
 
     describe '.render' do
       it 'returns the content for the interface' do
-        interface = Interface.new({ name: 'dummy', width: 20, height: 2, lines: 'InterfaceRenderer.render' })
+        interface = Interface.new({
+          name:   '.render',
+          width:  5,
+          height: 2,
+          lines:  'InterfaceRenderer.render'
+        })
         InterfaceRenderer.render(interface).must_equal("\e[1;1HInterfaceRenderer.render")
       end
     end

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

@@ -1,11 +1,18 @@
 require_relative '../../../test_helper'
 require_relative '../../../../lib/vedeu/output/output'
+require_relative '../../../../lib/vedeu/support/terminal'
 
 module Vedeu
   describe Output do
     describe '.render' do
       it 'returns an Array' do
-        Output.render.must_be_instance_of(Array)
+        output = "\e[3;3H            \e[3;3H" \
+                 "\e[3;3HSome text...\e[3;3H"
+        InterfaceRepository.stub(:refresh, [output]) do
+          Terminal.stub(:output, output) do
+            Output.render.first.must_equal(output)
+          end
+        end
       end
     end
   end

data/test/lib/vedeu/repository/command_repository_test.rb

@@ -22,20 +22,24 @@ module Vedeu
 
     describe '.by_input' do
       it 'returns the correct command when the command was found by keypress' do
-        CommandRepository.by_input('b').name.must_equal('banana')
-        CommandRepository.by_input('b').name.wont_equal('apple')
-        CommandRepository.by_input('b').keypress.must_equal('b')
+        command = CommandRepository.by_input('b')
+
+        command.name.must_equal('banana')
+        command.name.wont_equal('apple')
+        command.keypress.must_equal('b')
       end
 
       it 'returns the correct command when the command was found by keyword' do
-        CommandRepository.by_input('apple').keypress.must_equal('a')
-        CommandRepository.by_input('apple').keypress.wont_equal('b')
-        CommandRepository.by_input('apple').name.wont_equal('banana')
+        command = CommandRepository.by_input('apple')
+
+        command.keypress.must_equal('a')
+        command.keypress.wont_equal('b')
+        command.name.wont_equal('banana')
       end
 
       it 'returns FalseClass when no command was found' do
-        CommandRepository.by_input('not_found')
-          .must_be_instance_of(FalseClass)
+        command = CommandRepository.by_input('not_found')
+        command.must_be_instance_of(FalseClass)
       end
 
       it 'returns FalseClass when there is no input' do
@@ -45,8 +49,8 @@ module Vedeu
 
     describe '.create' do
       it 'returns a Command' do
-        skip
-        CommandRepository.create({}).must_be_instance_of(Command)
+        command = CommandRepository.create({})
+        command.must_be_instance_of(Command)
       end
     end
 

data/test/lib/vedeu/repository/interface_repository_test.rb

@@ -6,9 +6,9 @@ module Vedeu
     describe '.create' do
       it 'returns an Interface' do
         InterfaceRepository.create({
-          name: 'dummy',
-          width: 15,
-          height: 2
+          name:   'dummy',
+          width:  5,
+          height: 5
         }).must_be_instance_of(Interface)
       end
     end
@@ -16,9 +16,9 @@ module Vedeu
     describe '.find' do
       it 'returns an Interface when the interface exists' do
         InterfaceRepository.create({
-          name: 'dummy',
-          width: 15,
-          height: 2
+          name:   'dummy',
+          width:  5,
+          height: 5
         })
         InterfaceRepository.find('dummy')
           .must_be_instance_of(Interface)
@@ -57,13 +57,13 @@ module Vedeu
       it 'returns the collection in order they should be drawn' do
         InterfaceRepository.reset
         InterfaceRepository.create({
-          name: 'a', width: 15, height: 2, z: 2
+          name: 'a', width: 5, height: 5, z: 2
         }).enqueue("a")
         InterfaceRepository.create({
-          name: 'b', width: 15, height: 2, z: 1
+          name: 'b', width: 5, height: 5, z: 1
         }).enqueue("b")
         InterfaceRepository.create({
-          name: 'c', width: 15, height: 2, z: 3
+          name: 'c', width: 5, height: 5, z: 3
         }).enqueue("c")
         InterfaceRepository.refresh.must_equal(['b', 'a', 'c'])
       end

data/test/lib/vedeu/support/coordinate_test.rb

@@ -11,6 +11,38 @@ module Vedeu
       proc { Coordinate.new({ height: 6 }) }.must_raise(KeyError)
     end
 
+    describe '#origin' do
+      it 'returns the origin for the interface' do
+        coordinate = Coordinate.new({ width: 5, height: 5, centred: false })
+        coordinate.origin.must_equal("\e[1;1H")
+      end
+
+      it 'returns the origin for the interface' do
+        console = IO.console
+        console.stub :winsize, [25, 80] do
+          coordinate = Coordinate.new({ width: 5, height: 5 })
+          coordinate.origin.must_equal("\e[10;38H")
+        end
+      end
+
+      it 'returns the line position relative to the origin' do
+        coordinate = Coordinate.new({ width: 5, height: 5, centred: false })
+        coordinate.origin(3).must_equal("\e[4;1H")
+      end
+
+      it 'returns the origin for the interface when the interface' \
+         ' is at a custom position' do
+        coordinate = Coordinate.new({ width: 5, height: 5, x: 3, y: 6, centred: false })
+        coordinate.origin.must_equal("\e[6;3H")
+      end
+
+      it 'returns the line position relative to the origin when the' \
+         ' interface is at a custom position' do
+        coordinate = Coordinate.new({ width: 5, height: 5, x: 3, y: 6, centred: false })
+        coordinate.origin(3).must_equal("\e[9;3H")
+      end
+    end
+
     describe '#terminal_height' do
       it 'raises an exception if the value is less than 1' do
         coordinate = Coordinate.new({ height: 6, width: 18, terminal_height: -2 })
@@ -28,16 +60,16 @@ module Vedeu
       it 'returns the value of terminal_height' do
         console = IO.console
         console.stub :winsize, [25, 80] do
-          Coordinate.new({ height: 6, width: 18, terminal_height: 20 })
-            .terminal_height.must_equal(20)
+          coordinate = Coordinate.new({ height: 6, width: 18, terminal_height: 20 })
+          coordinate.terminal_height.must_equal(20)
         end
       end
 
       it 'returns the default height if not set' do
         console = IO.console
         console.stub :winsize, [25, 80] do
-          Coordinate.new({ height: 6, width: 18 })
-            .instance_variable_get('@terminal_height').must_equal(25)
+          coordinate = Coordinate.new({ height: 6, width: 18 })
+          coordinate.terminal_height.must_equal(25)
         end
       end
     end
@@ -56,8 +88,17 @@ module Vedeu
         end
       end
 
+      # it 'raises an exception if the value combined with y position will cause content wrapping' do
+      #   console = IO.console
+      #   console.stub :winsize, [25, 80] do
+      #     coordinate = Coordinate.new({ height: 20, width: 18, y: 10 })
+      #     proc { coordinate.height }.must_raise(OutOfBoundsError)
+      #   end
+      # end
+
       it 'returns the value of height' do
-        Coordinate.new({ height: 6, width: 18 }).height.must_equal(6)
+        coordinate = Coordinate.new({ height: 6, width: 18 })
+        coordinate.height.must_equal(6)
       end
     end
 
@@ -76,11 +117,13 @@ module Vedeu
       end
 
       it 'returns the value of y' do
-        Coordinate.new({ height: 6, width: 18, y: 6 }).y.must_equal(6)
+        coordinate = Coordinate.new({ height: 6, width: 18, y: 6 })
+        coordinate.y.must_equal(6)
       end
 
       it 'returns 1 if not set' do
-        Coordinate.new({ height: 6, width: 18 }).y.must_equal(1)
+        coordinate = Coordinate.new({ height: 6, width: 18 })
+        coordinate.y.must_equal(1)
       end
     end
 
@@ -101,16 +144,16 @@ module Vedeu
       it 'returns the value of terminal_width' do
         console = IO.console
         console.stub :winsize, [25, 80] do
-          Coordinate.new({ height: 6, width: 18, terminal_width: 40 })
-            .terminal_width.must_equal(40)
+          coordinate = Coordinate.new({ height: 6, width: 18, terminal_width: 40 })
+          coordinate.terminal_width.must_equal(40)
         end
       end
 
       it 'returns the default width if not set' do
         console = IO.console
         console.stub :winsize, [25, 80] do
-          Coordinate.new({ height: 6, width: 18 })
-            .terminal_width.must_equal(80)
+          coordinate = Coordinate.new({ height: 6, width: 18 })
+          coordinate.terminal_width.must_equal(80)
         end
       end
     end
@@ -129,9 +172,17 @@ module Vedeu
         end
       end
 
+      # it 'raises an exception if the value combined with x position will cause content wrapping' do
+      #   console = IO.console
+      #   console.stub :winsize, [25, 80] do
+      #     coordinate = Coordinate.new({ height: 20, width: 75, x: 10 })
+      #     proc { coordinate.width }.must_raise(OutOfBoundsError)
+      #   end
+      # end
+
       it 'returns the value of width' do
-        Coordinate.new({ height: 6, width: 18, x: 6 }).width
-          .must_equal(18)
+        coordinate = Coordinate.new({ height: 6, width: 18, x: 6 })
+        coordinate.width.must_equal(18)
       end
     end
 
@@ -150,23 +201,25 @@ module Vedeu
       end
 
       it 'returns the value of x' do
-        Coordinate.new({ height: 6, width: 18, x: 6 }).x.must_equal(6)
+        coordinate = Coordinate.new({ height: 6, width: 18, x: 6 })
+        coordinate.x.must_equal(6)
       end
 
       it 'returns 1 if not set' do
-        Coordinate.new({ height: 6, width: 18 }).x.must_equal(1)
+        coordinate = Coordinate.new({ height: 6, width: 18 })
+        coordinate.x.must_equal(1)
       end
     end
 
     describe '#centered' do
       it 'has a centred attribute' do
-        Coordinate.new({ height: 6, width: 18, centred: false })
-          .centred.must_equal(false)
+        coordinate = Coordinate.new({ height: 6, width: 18, centred: false })
+        coordinate.centred.must_equal(false)
       end
 
       it 'sets the centred attribute to true if not set' do
-        Coordinate.new({ height: 6, width: 18 })
-          .centred.must_equal(true)
+        coordinate = Coordinate.new({ height: 6, width: 18 })
+        coordinate.centred.must_equal(true)
       end
     end