vedeu 0.1.3 → 0.1.4

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

@@ -11,10 +11,12 @@ module Vedeu
           foreground: '#ff0000',
           background: '#000000'
         },
-        y: 3,
-        x: 5,
-        width: 10,
-        height: 15,
+        geometry: {
+          y: 3,
+          x: 5,
+          width: 10,
+          height: 15,
+        },
         current: "\e[1;1H#initialize"
       })
     }
@@ -31,24 +33,6 @@ module Vedeu
       interface.colour.must_be_instance_of(Colour)
     end
 
-    it 'has a y attribute' do
-      interface.y.must_equal(3)
-      Interface.new.y.must_equal(1)
-    end
-
-    it 'has an x attribute' do
-      interface.x.must_equal(5)
-      Interface.new.x.must_equal(1)
-    end
-
-    it 'has a width attribute' do
-      interface.width.must_equal(10)
-    end
-
-    it 'has a height attribute' do
-      interface.height.must_equal(15)
-    end
-
     it 'has a current attribute' do
       interface.current.must_equal("\e[1;1H#initialize")
     end
@@ -58,18 +42,15 @@ module Vedeu
       Interface.new({ cursor: false }).cursor.must_equal(false)
     end
 
-    it 'has a centred attribute' do
-      interface.centred.must_equal(false)
-      Interface.new({ centred: true }).centred.must_equal(true)
-    end
-
     describe '#enqueue' do
       it 'delegates to the Queue class to enqueue itself' do
         Queue.reset
         interface = Interface.new({
           name:   'Interface#enqueue',
-          width:  8,
-          height: 2,
+          geometry: {
+            width:  8,
+            height: 2,
+          },
           lines:  [ { streams: { text: 'a8f39' } } ]
         })
         interface.enqueue
@@ -81,28 +62,6 @@ module Vedeu
       end
     end
 
-    describe '#geometry' do
-      it 'delegates to the Geometry class' do
-        interface = Interface.new({
-          name:   '#geometry',
-          width:  5,
-          height: 5
-        })
-        interface.geometry.must_be_instance_of(Geometry)
-      end
-    end
-
-    describe '#origin' do
-      it 'delegates to the Geometry class to get the origin' do
-        interface = Interface.new({
-          name:   '#origin',
-          width:  5,
-          height: 5
-        })
-        interface.origin.must_equal("\e[1;1H")
-      end
-    end
-
     describe '#refresh' do
       let(:attributes) {
         {
@@ -112,8 +71,10 @@ module Vedeu
             foreground: '#ff0000',
             background: '#000000'
           },
-          width:  3,
-          height: 3
+          geometry: {
+            width:  3,
+            height: 3
+          }
         }
       }
 
@@ -140,8 +101,10 @@ module Vedeu
             foreground: '#ff0000',
             background: '#000000'
           },
-          width:  11,
-          height: 3
+          geometry: {
+            width:  11,
+            height: 3
+          }
         }
         interface = Interface.new(attributes)
         interface.enqueue
@@ -167,8 +130,10 @@ module Vedeu
             foreground: '#ff0000',
             background: '#000000'
           },
-          width:  11,
-          height: 3
+          geometry: {
+            width:  11,
+            height: 3
+          }
         }
         interface = Interface.new(attributes)
         interface.current = "\e[38;5;196m\e[48;5;16m" \
@@ -202,8 +167,10 @@ module Vedeu
             foreground: '#ff0000',
             background: '#000000'
           },
-          width:  3,
-          height: 3
+          geometry: {
+            width:  3,
+            height: 3
+          }
         }).to_s.must_equal(
           "\e[38;5;196m\e[48;5;16m" \
           "\e[1;1H   \e[1;1H" \

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

@@ -10,9 +10,13 @@ module Vedeu
           background: '#000000'
         },
         text:  'Some text',
-        style: 'normal'
+        style: 'normal',
+        width: width,
+        align: align
       })
     }
+    let(:align) { :left }
+    let(:width) { 9 }
 
     it 'has a colour attribute' do
       stream.colour.must_be_instance_of(Colour)
@@ -26,13 +30,59 @@ module Vedeu
       stream.style.must_equal("\e[24m\e[21m\e[27m")
     end
 
+    it 'has a width attribute' do
+      stream.width.must_equal(9)
+    end
+
+    it 'has an align attribute' do
+      stream.align.must_equal(:left)
+    end
+
     describe '#to_s' do
-      it 'returns a String' do
-        stream.to_s.must_equal(
-          "\e[38;5;196m\e[48;5;16m" \
-          "\e[24m\e[21m\e[27m" \
-          "Some text"
-        )
+      describe 'when a width is set and align is default' do
+        let(:width) { 20 }
+
+        it 'returns a String' do
+          stream.to_s.must_equal(
+            "\e[38;5;196m\e[48;5;16m" \
+            "\e[24m\e[21m\e[27m"      \
+            "Some text           "
+          )
+        end
+
+        describe 'and align is :centre' do
+          let(:align) { :centre }
+
+          it 'returns a String' do
+            stream.to_s.must_equal(
+              "\e[38;5;196m\e[48;5;16m" \
+              "\e[24m\e[21m\e[27m"      \
+              "     Some text      "
+            )
+          end
+        end
+
+        describe 'and align is :right' do
+          let(:align) { :right }
+
+          it 'returns a String' do
+            stream.to_s.must_equal(
+              "\e[38;5;196m\e[48;5;16m" \
+              "\e[24m\e[21m\e[27m"      \
+              "           Some text"
+            )
+          end
+        end
+      end
+
+      describe 'when a width is not set' do
+        it 'returns a String' do
+          stream.to_s.must_equal(
+            "\e[38;5;196m\e[48;5;16m" \
+            "\e[24m\e[21m\e[27m"      \
+            "Some text"
+          )
+        end
       end
     end
   end

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

@@ -11,8 +11,10 @@ module Vedeu
       it 'returns the escape sequence to clear the whole interface' do
         interface = Interface.new({
           name:   'ClearInterface.call',
-          width:  5,
-          height: 2
+          geometry: {
+            width:  5,
+            height: 2
+          }
         })
         ClearInterface.call(interface).must_equal(
           "\e[1;1H     \e[1;1H" \
@@ -23,8 +25,10 @@ module Vedeu
       it 'returns the escape sequence to clear the whole interface with specified colours' do
         interface = Interface.new({
           name:   'ClearInterface.call',
-          width:  5,
-          height: 2,
+          geometry: {
+            width:  5,
+            height: 2,
+          },
           colour: {
             foreground: '#00ff00',
             background: '#ffff00'

data/test/lib/vedeu/{support/translator_test.rb → output/colour_translator_test.rb}

@@ -1,8 +1,8 @@
 require 'test_helper'
-require 'vedeu/support/translator'
+require 'vedeu/output/colour_translator'
 
 module Vedeu
-  describe Translator do
+  describe ColourTranslator do
     describe '#translate' do
       {
         '#ff0000' => 196, # red
@@ -13,29 +13,29 @@ module Vedeu
         '#b94f1c' => 130, # sunset orange
       }.map do |html_colour, terminal_colour|
         it 'translation is performed' do
-          Translator.translate(html_colour)
+          ColourTranslator.translate(html_colour)
             .must_equal(terminal_colour)
         end
       end
 
       it 'returns empty string when not present' do
-        Translator.translate.must_equal('')
+        ColourTranslator.translate.must_equal('')
       end
 
       it 'returns empty string when the wrong type!' do
-        Translator.translate(:wrong_type).must_equal('')
+        ColourTranslator.translate(:wrong_type).must_equal('')
       end
 
       it 'returns empty string when invalid format' do
-        Translator.translate('345678').must_equal('')
+        ColourTranslator.translate('345678').must_equal('')
       end
 
       it 'returns empty string when invalid format' do
-        Translator.translate('#h11111').must_equal('')
+        ColourTranslator.translate('#h11111').must_equal('')
       end
 
       it 'returns empty string when invalid format' do
-        Translator.translate('#1111').must_equal('')
+        ColourTranslator.translate('#1111').must_equal('')
       end
     end
   end

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

@@ -68,85 +68,173 @@ module Vedeu
         end
       end
 
-      describe 'colour parsing' do
-        it 'parses the template and colour directives within' do
-          user_view = UserView.new
-          user_view.stub(:path, 'test/support/erb/colour.erb') do
-            ERBParser.parse(user_view).must_equal(
-              {
-                interfaces: [
-                  {
-                    name:  'test',
-                    lines: [
-                      {
-                        streams: {
-                          text: "\e[38;5;52mDark red text on default background."
-                        }
-                      }, {
-                        streams: {
-                          text: "\e[48;5;201mDefault text on magenta background."
-                        }
-                      }, {
-                        streams: {
-                          text: "\e[38;5;196m\e[48;5;17mRed text on dark blue background."
-                        }
+
+      it 'parses the template and colour directives within' do
+        user_view = UserView.new
+        user_view.stub(:path, 'test/support/erb/colour.erb') do
+          ERBParser.parse(user_view).must_equal(
+            {
+              interfaces: [
+                {
+                  name:  'test',
+                  lines: [
+                    {
+                      streams: {
+                        text: "\e[38;5;52mDark red text on default background."
                       }
-                    ]
-                  }
-                ]
-              }
-            )
-          end
+                    }, {
+                      streams: {
+                        text: "\e[48;5;201mDefault text on magenta background."
+                      }
+                    }, {
+                      streams: {
+                        text: "\e[38;5;196m\e[48;5;17mRed text on dark blue background."
+                      }
+                    }
+                  ]
+                }
+              ]
+            }
+          )
         end
       end
 
-      describe 'style parsing' do
-        it 'parses the template and style directives within' do
-          user_view = UserView.new
-          user_view.stub(:path, 'test/support/erb/style.erb') do
-            ERBParser.parse(user_view).must_equal(
-              {
-                interfaces: [
-                  {
-                    name:  'test',
-                    lines: [
-                      {
-                        streams: { text: 'Empty style leads to nothing.' }
-                      }, {
-                        streams: { text: "\e[4mUnderlined text." }
-                      }, {
-                        streams: { text: 'Unknown style leads to nothing.' }
+      it 'parses the template and style directives within' do
+        user_view = UserView.new
+        user_view.stub(:path, 'test/support/erb/style.erb') do
+          ERBParser.parse(user_view).must_equal(
+            {
+              interfaces: [
+                {
+                  name:  'test',
+                  lines: [
+                    {
+                      streams: { text: 'Empty style leads to nothing.' }
+                    }, {
+                      streams: { text: "\e[4mUnderlined text." }
+                    }, {
+                      streams: { text: 'Unknown style leads to nothing.' }
+                    }
+                  ]
+                }
+              ]
+            }
+          )
+        end
+      end
+
+      it 'parses the template and both colour and style directives within' do
+        user_view = UserView.new
+        user_view.stub(:path, 'test/support/erb/colour_style.erb') do
+          ERBParser.parse(user_view).must_equal(
+            {
+              interfaces: [
+                {
+                  name:  'test',
+                  lines: [
+                    {
+                      streams: {
+                        text: "\e[38;5;21m\e[4m\e[48;5;17mBlue underline text on dark blue background."
                       }
-                    ]
-                  }
-                ]
-              }
-            )
-          end
+                    }
+                  ]
+                }
+              ]
+            }
+          )
         end
       end
 
-      describe 'colour and style parsing' do
-        it 'parses the template and both colour and style directives within' do
-          user_view = UserView.new
-          user_view.stub(:path, 'test/support/erb/colour_style.erb') do
-            ERBParser.parse(user_view).must_equal(
-              {
-                interfaces: [
-                  {
-                    name:  'test',
-                    lines: [
-                      {
-                        streams: {
-                          text: "\e[38;5;21m\e[4m\e[48;5;17mBlue underline text on dark blue background."
-                        }
+      it 'treats sections of the template as one line' do
+        user_view = UserView.new
+        user_view.stub(:path, 'test/support/erb/line.erb') do
+          ERBParser.parse(user_view).must_equal(
+            {
+              interfaces: [
+                {
+                  name:  'test',
+                  lines: [
+                    {
+                      streams: {
+                        text: "  This is line one.  This is line two."
                       }
-                    ]
-                  }
-                ]
-              }
-            )
-          end
+                    }
+                  ]
+                }
+              ]
+            }
+          )
+        end
+      end
+
+      it 'treats sections of the template as one line with a foreground' do
+        user_view = UserView.new
+        user_view.stub(:path, 'test/support/erb/line_foreground.erb') do
+          ERBParser.parse(user_view).must_equal(
+            {
+              interfaces: [
+                {
+                  name:  'test',
+                  lines: [
+                    {
+                      streams: {
+                        text: "  \e[38;5;226mThis is line one.\e[38;2;39m  This is line two."
+                      }
+                    }
+                  ]
+                }
+              ]
+            }
+          )
+        end
+      end
+
+      it 'treats sections of the template as one line with a foreground' do
+        user_view = UserView.new
+        user_view.stub(:path, 'test/support/erb/line_foreground_2x.erb') do
+          ERBParser.parse(user_view).must_equal(
+            {
+              interfaces: [
+                {
+                  name:  'test',
+                  lines: [
+                    {
+                      streams: {
+                        text: "  \e[38;5;226mThis is line one.\e[38;2;39m  \e[38;5;196mThis is line two.\e[38;2;39m  This is line three."
+                      }
+                    }
+                  ]
+                }
+              ]
+            }
+          )
+        end
+      end
+
+      it 'treats sections of the template as one line' do
+        skip
+        user_view = UserView.new
+        user_view.stub(:path, 'test/support/erb/line_2x.erb') do
+          ERBParser.parse(user_view).must_equal(
+            {
+              interfaces: [
+                {
+                  name:  'test',
+                  lines: [
+                    {
+                      streams: {
+                        text: "  This is line one.  This is line two."
+                      }
+                    }, {
+                      streams: {
+                        text: "  This is line three.  This is line four."
+                      }
+                    }
+                  ]
+                }
+              ]
+            }
+          )
         end
       end
     end