vedeu 0.6.9 → 0.6.10

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

@@ -9,7 +9,7 @@ module Vedeu
       let(:described) { Vedeu::Renderers::EscapeSequence }
       let(:instance)  { described.new(options) }
       let(:options)   { {} }
-      let(:output)    {}
+      let(:output)    { Vedeu::Models::Page.new }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -21,13 +21,15 @@ module Vedeu
 
         it { subject.must_be_instance_of(String) }
 
-        context 'when there is no output' do
-          it { subject.must_equal('') }
+        context 'when there is an empty buffer' do
+          let(:expected) { '' }
+
+          it { subject.must_equal(expected) }
         end
 
-        context 'when there is output' do
+        context 'when there is content on the buffer' do
           let(:output) {
-            [
+            Vedeu::Models::Page.coerce([
               Vedeu::Views::Char.new(value: 't',
                                      colour: {
                                        background: '#ff0000',
@@ -48,14 +50,16 @@ module Vedeu
                                        background: '#00ffff',
                                        foreground: '#000000'
                                      }),
-             ]
+            ])
           }
 
-          it { subject.must_equal(
-            "\\e[38;2;255;255;255m\\e[48;2;255;0;0mt\n" \
-            "\\e[38;2;0;0;0m\\e[48;2;255;255;0me\n"     \
-            "\\e[38;2;0;0;0m\\e[48;2;0;255;0ms\n"       \
-            "\\e[38;2;0;0;0m\\e[48;2;0;255;255mt\n")
+          it {
+            subject.must_equal(
+              "\\e[38;2;255;255;255m\\e[48;2;255;0;0mt" \
+              "\\e[38;2;0;0;0m\\e[48;2;255;255;0me"     \
+              "\\e[38;2;0;0;0m\\e[48;2;0;255;0ms"       \
+              "\\e[38;2;0;0;0m\\e[48;2;0;255;255mt"
+            )
           }
         end
       end

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

@@ -10,86 +10,84 @@ module Vedeu
       let(:instance)   { described.new(options) }
       let(:options)    {
         {
-          content:    content,
-          write_file: write_file,
+          content:       content,
+          end_tag:       end_tag,
+          end_row_tag:   end_row_tag,
+          filename:      filename,
+          start_tag:     start_tag,
+          start_row_tag: start_row_tag,
+          template:      template,
+          timestamp:     timestamp,
+          write_file:    write_file,
         }
       }
-      let(:content)     { [''] }
-      let(:write_file) { false }
-
-      before { ::File.stubs(:write) }
+      let(:content)       { '' }
+      let(:end_tag)       { '</td>' }
+      let(:end_row_tag)   { '</tr>' }
+      let(:filename)      { 'out' }
+      let(:start_tag)     { '<td' }
+      let(:start_row_tag) { '<tr>' }
+      let(:template)      {
+        ::File.dirname(__FILE__) + '/../../../../support/templates/html_renderer.vedeu'
+      }
+      let(:timestamp)     { false }
+      let(:write_file)    { false }
+      let(:buffer)        { Vedeu::Terminal::Buffer }
+
+      before do
+        ::File.stubs(:write)
+        Vedeu.stubs(:height).returns(2)
+        Vedeu.stubs(:width).returns(4)
+        Vedeu::Terminal::Buffer.reset
+      end
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@options').must_equal(options) }
+        it { instance.instance_variable_get('@output').must_equal(nil) }
       end
 
-      # describe '#render' do
-      #   before { ::File.stubs(:open) }
-
-      #   subject { instance.render(content) }
-
-      #   it { subject.must_be_instance_of(String) }
-
-      #   context 'when the :write_file option is true' do
-      #     let(:write_file) { true }
-
-      #     context 'when a path is given' do
-      #       let(:path) { '/tmp/test_vedeu_html_renderer.html' }
-
-      #       # it do
-      #       #   ::File.expects(:open)
-      #       #   subject
-      #       # end
-      #     end
-
-      #     context 'when a path is not given' do
-      #       let(:path) {}
-      #       let(:_time) { Time.new(2015, 4, 12, 16, 55) }
-
-      #       before { Time.stubs(:now).returns(_time) }
-
-      #       # it do
-      #       #   ::File.expects(:open)#.with('/tmp/vedeu_html_1428854100.html', 'w')
-      #       #   subject
-      #       # end
-      #     end
-      #   end
-
-      #   context 'when the :write_file options is false' do
-      #     let(:write_file) { false }
-
-      #     # @todo Add more tests.
-      #     # it { skip }
-      #   end
-      # end
-
-      describe '#html_body' do
-        let(:content) {
-          [
-            [
-              Vedeu::Views::Char.new(value: 't'),
-              Vedeu::Views::Char.new(value: 'e'),
-              Vedeu::Views::Char.new(value: 's'),
-              Vedeu::Views::Char.new(value: 't'),
-            ]
-          ]
+      describe '#render' do
+        let(:output) {
+          Vedeu::Models::Page.coerce([
+            Vedeu::Views::Char.new(value: 'a',
+                                   colour: {
+                                     background: '#ff0000',
+                                     foreground: '#ffffff' }),
+          ])
+        }
+        let(:expected) {
+          "<html>\n" \
+          "  <head>\n" \
+          "    <style type='text/css'>\n" \
+          "      body {\n" \
+          "        background:#000;\n" \
+          "      }\n" \
+          "      td {\n" \
+          "        border:1px #171717 solid;\n" \
+          "        font-size:12px;\n" \
+          "        font-family:monospace;\n" \
+          "        height:18px;\n" \
+          "        margin:1px;\n" \
+          "        text-align:center;\n" \
+          "        vertical-align:center;\n" \
+          "        width:18px;\n" \
+          "      }\n" \
+          "    </style>\n" \
+          "  </head>\n" \
+          "  <body>\n" \
+          "    <table>\n" \
+          "      <tr>\n" \
+          "<td style='border:1px #ff0000 solid;background:#ff0000;color:#ffffff;'>a</td></tr>\n" \
+          "    </table>\n" \
+          "  </body>\n" \
+          "</html>\n"
         }
 
-        subject { instance.html_body }
+        subject { instance.render(output) }
 
         it { subject.must_be_instance_of(String) }
-
-        it do
-          subject.must_equal(
-            "<tr>\n" \
-            "<td style=''>t</td>\n" \
-            "<td style=''>e</td>\n" \
-            "<td style=''>s</td>\n" \
-            "<td style=''>t</td>\n" \
-            "</tr>\n"
-          )
-        end
+        it { subject.must_equal(expected) }
       end
 
     end # HTML

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

@@ -9,9 +9,14 @@ module Vedeu
       let(:described) { Vedeu::Renderers::JSON }
       let(:instance)  { described.new(options) }
       let(:options)   { {} }
-      let(:output)    {}
+      let(:output)    { Vedeu::Models::Page.new }
 
-      before { ::File.stubs(:write) }
+      before do
+        ::File.stubs(:write)
+        Vedeu.stubs(:height).returns(1)
+        Vedeu.stubs(:width).returns(1)
+        Vedeu::Terminal::Buffer.reset
+      end
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -19,90 +24,38 @@ module Vedeu
       end
 
       describe '#render' do
+        let(:output) {
+          Vedeu::Models::Page.coerce([
+            Vedeu::Views::Char.new(value: 'a',
+                                   colour: {
+                                     background: '#ff0000',
+                                     foreground: '#ffffff' }),
+          ])
+        }
+        let(:expected) {
+          "[\n"   \
+          "  {\n" \
+          "    \"border\": \"\",\n" \
+          "    \"colour\": {\n" \
+          "      \"background\": \"\\u001b[48;2;255;0;0m\",\n" \
+          "      \"foreground\": \"\\u001b[38;2;255;255;255m\"\n" \
+          "    },\n" \
+          "    \"parent\": {\n" \
+          "    },\n" \
+          "    \"position\": {\n" \
+          "      \"y\": null,\n" \
+          "      \"x\": null\n" \
+          "    },\n" \
+          "    \"style\": \"\",\n" \
+          "    \"value\": \"a\"\n" \
+          "  }\n" \
+          "]"
+        }
+
         subject { instance.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::Colours::Colour.new(foreground: '#ff0000',
-                                       background: '#ffffff')
-          }
-          let(:output) {
-            [
-              [
-                Vedeu::Views::Char.new(value: 'a',
-                                       colour: colour,
-                                       parent: parent,
-                                       position: Vedeu::Geometry::Position[5, 3])
-              ]
-            ]
-          }
-          let(:parent)   {}
-          let(:expected) {
-            <<-eos
-[
-  {
-    \"border\": \"\",
-    \"colour\": {
-      \"background\": \"\\u001b[48;2;255;255;255m\",
-      \"foreground\": \"\\u001b[38;2;255;0;0m\"
-    },
-    \"parent\": {
-    },
-    \"position\": {
-      \"y\": 5,
-      \"x\": 3
-    },
-    \"style\": \"\",
-    \"value\": \"a\"
-  }
-]
-            eos
-          }
-
-          it { subject.must_equal(expected.chomp) }
-
-          context 'when a parent is available' do
-            let(:parent) {
-              Vedeu::Views::Stream.new(
-                colour: Vedeu::Colours::Colour.coerce(background: '',
-                                                      foreground: '')
-              )
-            }
-
-            let(:expected) {
-              <<-eos
-[
-  {
-    \"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\"
-  }
-]
-              eos
-            }
-
-            it { subject.must_equal(expected.chomp) }
-          end
-        end
+        it { subject.must_equal(expected) }
       end
 
     end # JSON

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

@@ -9,7 +9,27 @@ module Vedeu
       let(:described) { Vedeu::Renderers::Terminal }
       let(:instance)  { described.new(options) }
       let(:options)   { {} }
-      let(:output)    {}
+      let(:output)    {
+        Vedeu::Models::Page.coerce([
+          [
+            Vedeu::Models::Cell.new(position: [1, 1]),
+            Vedeu::Views::Char.new(value: 'a', position: [1, 2]),
+            Vedeu::Models::Cell.new(position: [1, 3]),
+          ], [
+            Vedeu::Models::Cell.new(position: [2, 1]),
+            Vedeu::Views::Char.new(value: 'b', position: [2, 2]),
+            Vedeu::Models::Cell.new(position: [2, 3]),
+          ], [
+            Vedeu::Models::Cell.new(position: [3, 1]),
+            Vedeu::Views::Char.new(value: 'c', position: [3, 2]),
+            Vedeu::Models::Cell.new(position: [3, 3]),
+          ],
+        ])
+      }
+
+      before do
+        Vedeu::Terminal.stubs(:output).returns(output)
+      end
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -19,7 +39,7 @@ module Vedeu
       describe '#render' do
         subject { instance.render(output) }
 
-        it { subject.must_be_instance_of(Array) }
+        it { subject.must_be_instance_of(Vedeu::Models::Page) }
       end
 
     end # Terminal