vedeu 0.8.2 → 0.8.3

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

@@ -86,21 +86,21 @@ module Vedeu
           }
           let(:expected) {
             [
-              "\e[1;1H\e[39m\e[49m\e[24m\e[22m\e[27me",
-              "\e[1;2H\e[39m\e[49m\e[24m\e[22m\e[27ml",
-              "\e[1;3H\e[39m\e[49m\e[24m\e[22m\e[27mi",
-              "\e[1;4H\e[39m\e[49m\e[24m\e[22m\e[27mu",
-              "\e[1;5H\e[39m\e[49m\e[24m\e[22m\e[27mm",
-              "\e[2;1H\e[39m\e[49m\e[24m\e[22m\e[27mi",
-              "\e[2;2H\e[39m\e[49m\e[24m\e[22m\e[27mt",
-              "\e[2;3H\e[39m\e[49m\e[24m\e[22m\e[27mh",
-              "\e[2;4H\e[39m\e[49m\e[24m\e[22m\e[27mi",
-              "\e[2;5H\e[39m\e[49m\e[24m\e[22m\e[27mu",
-              "\e[3;1H\e[39m\e[49m\e[24m\e[22m\e[27me",
-              "\e[3;2H\e[39m\e[49m\e[24m\e[22m\e[27mr",
-              "\e[3;3H\e[39m\e[49m\e[24m\e[22m\e[27my",
-              "\e[3;4H\e[39m\e[49m\e[24m\e[22m\e[27ml",
-              "\e[3;5H\e[39m\e[49m\e[24m\e[22m\e[27ml"
+              "\e[1;1He",
+              "\e[1;2Hl",
+              "\e[1;3Hi",
+              "\e[1;4Hu",
+              "\e[1;5Hm",
+              "\e[2;1Hi",
+              "\e[2;2Ht",
+              "\e[2;3Hh",
+              "\e[2;4Hi",
+              "\e[2;5Hu",
+              "\e[3;1He",
+              "\e[3;2Hr",
+              "\e[3;3Hy",
+              "\e[3;4Hl",
+              "\e[3;5Hl"
             ]
           }
 

data/test/lib/vedeu/geometries/position_test.rb

@@ -155,9 +155,22 @@ module Vedeu
       end
 
       describe '#to_h' do
+        let(:expected) {
+          {
+            position: {
+              y: 12,
+              x: 19,
+            }
+          }
+        }
+
         subject { instance.to_h }
 
-        it { subject.must_equal({ y: 12, x: 19 }) }
+        it { subject.must_equal(expected) }
+      end
+
+      describe '#to_hash' do
+        it { instance.must_respond_to(:to_h) }
       end
 
       describe '#to_s' do

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

@@ -116,11 +116,11 @@ module Vedeu
                   [:lithium],
                   Vedeu::Models::Row.new([:beryllium]),
                   [
-                    Vedeu::Views::Char.new(value: 'b'),
-                    Vedeu::Views::Char.new(value: 'o'),
-                    Vedeu::Views::Char.new(value: 'r'),
-                    Vedeu::Views::Char.new(value: 'o'),
-                    Vedeu::Views::Char.new(value: 'n'),
+                    Vedeu::Cells::Char.new(value: 'b'),
+                    Vedeu::Cells::Char.new(value: 'o'),
+                    Vedeu::Cells::Char.new(value: 'r'),
+                    Vedeu::Cells::Char.new(value: 'o'),
+                    Vedeu::Cells::Char.new(value: 'n'),
                   ],
                   [nil, :carbon],
                   :nitrogen,
@@ -133,11 +133,11 @@ module Vedeu
                   Vedeu::Models::Row.new([:lithium]),
                   Vedeu::Models::Row.new([:beryllium]),
                   Vedeu::Models::Row.new([
-                    Vedeu::Views::Char.new(value: 'b'),
-                    Vedeu::Views::Char.new(value: 'o'),
-                    Vedeu::Views::Char.new(value: 'r'),
-                    Vedeu::Views::Char.new(value: 'o'),
-                    Vedeu::Views::Char.new(value: 'n'),
+                    Vedeu::Cells::Char.new(value: 'b'),
+                    Vedeu::Cells::Char.new(value: 'o'),
+                    Vedeu::Cells::Char.new(value: 'r'),
+                    Vedeu::Cells::Char.new(value: 'o'),
+                    Vedeu::Cells::Char.new(value: 'n'),
                   ]),
                   Vedeu::Models::Row.new([:carbon]),
                   Vedeu::Models::Row.new([:nitrogen]),

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

@@ -12,9 +12,9 @@ module Vedeu
       let(:instance)  { described.new(cells) }
       let(:cells)     {
         [
-          Vedeu::Views::Char.new(value: 'A'),
+          Vedeu::Cells::Char.new(value: 'A'),
           Vedeu::Cells::Empty.new(value: 'B'),
-          Vedeu::Views::Char.new(value: 'C'),
+          Vedeu::Cells::Char.new(value: 'C'),
         ]
       }
 
@@ -77,7 +77,7 @@ module Vedeu
 
         context 'when the index is not nil' do
           context 'and the index is in range' do
-            let(:expected) { Vedeu::Views::Char.new(value: 'C') }
+            let(:expected) { Vedeu::Cells::Char.new(value: 'C') }
 
             let(:index) { 2 }
 
@@ -101,10 +101,10 @@ module Vedeu
       describe '#content' do
         let(:expected) {
           [
-            Vedeu::Views::Char.new(value: 'A'),
+            Vedeu::Cells::Char.new(value: 'A'),
             Vedeu::Cells::Empty.new(value: 'B'),
-            Vedeu::Views::Char.new(value: 'C'),
-            Vedeu::Views::Char.new(value: "\e[0m"),
+            Vedeu::Cells::Char.new(value: 'C'),
+            Vedeu::Cells::Escape.new(value: "\e[0m"),
           ]
         }
 
@@ -154,7 +154,7 @@ module Vedeu
       describe '#reset_character' do
         subject { instance.reset_character }
 
-        it { subject.must_be_instance_of(Vedeu::Views::Char) }
+        it { subject.must_be_instance_of(Vedeu::Cells::Escape) }
       end
 
       describe '#size' do

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

@@ -21,6 +21,17 @@ module Vedeu
       end
 
       describe '.render' do
+        let(:colour_1) {
+          {
+            foreground: '#ff0000'
+          }
+        }
+        let(:colour_2) {
+          {
+            foreground: '#0000ff'
+          }
+        }
+
         subject { described.render(output) }
 
         it { subject.must_be_instance_of(String) }
@@ -28,20 +39,21 @@ module Vedeu
         context 'when compression is enabled' do
           before { Vedeu.configure { compression(true) } }
 
-          context 'when the output is all Vedeu::Views::Char elements' do
+          context 'when the output is all Vedeu::Cells::Char elements' do
+
             let(:output) {
               Vedeu::Models::Page.coerce([
-                Vedeu::Views::Char.new(value:    'Y',
+                Vedeu::Cells::Char.new(value:    'Y',
                                        name:     _name,
-                                       colour:   { foreground: '#ff0000' },
+                                       colour:   colour_1,
                                        position: [1, 1]),
-                Vedeu::Views::Char.new(value:    'e',
+                Vedeu::Cells::Char.new(value:    'e',
                                        name:     _name,
-                                       colour:   { foreground: '#ff0000' },
+                                       colour:   colour_1,
                                        position: [1, 2]),
-                Vedeu::Views::Char.new(value:    's',
+                Vedeu::Cells::Char.new(value:    's',
                                        name:     _name,
-                                       colour:   { foreground: '#ff0000' },
+                                       colour:   colour_1,
                                        position: [1, 3])
               ])
             }
@@ -50,30 +62,30 @@ module Vedeu
               "\e[1;2H\e[38;2;255;0;0me\e[0m" \
               "\e[1;3H\e[38;2;255;0;0ms\e[0m"
             }
-            it 'converts the non-Vedeu::Views::Char elements into String ' \
+            it 'converts the non-Vedeu::Cells::Char elements into String ' \
                'elements' do
               subject.must_equal(expected)
             end
           end
 
-          context 'when the output is all Vedeu::Views::Char elements' do
+          context 'when the output is all Vedeu::Cells::Char elements' do
             let(:output) {
               Vedeu::Models::Page.coerce([
-                Vedeu::Views::Char.new(value:    'a',
+                Vedeu::Cells::Char.new(value:    'a',
                                        name:     _name,
-                                       colour:   { foreground: '#ff0000' },
+                                       colour:   colour_1,
                                        position: [1, 1]),
-                Vedeu::Views::Char.new(value:    'b',
+                Vedeu::Cells::Char.new(value:    'b',
                                        name:     _name,
-                                       colour:   { foreground: '#ff0000' },
+                                       colour:   colour_1,
                                        position: [1, 2]),
-                Vedeu::Views::Char.new(value:    'c',
+                Vedeu::Cells::Char.new(value:    'c',
                                        name:     _name,
-                                       colour:   { foreground: '#0000ff' },
+                                       colour:   colour_2,
                                        position: [1, 3]),
-                Vedeu::Views::Char.new(value:    'd',
+                Vedeu::Cells::Char.new(value:    'd',
                                        name:     _name,
-                                       colour:   { foreground: '#0000ff' },
+                                       colour:   colour_2,
                                        position: [1, 4]),
               ])
             }
@@ -88,18 +100,17 @@ module Vedeu
             end
           end
 
-          context 'when the output is not all Vedeu::Views::Char ' \
-                  'elements' do
+          context 'when the output is not all Vedeu::Cells::Char elements' do
             let(:output) {
-              Vedeu::Models::Page.coerce([
-                Vedeu::Views::Char.new(name: _name, value: 'N', position: [1, 1]),
+              Vedeu::Models::Page.coerce(Vedeu::Models::Row.coerce([
+                Vedeu::Cells::Char.new(name: _name, value: 'A', position: [1, 1]),
                 Vedeu::Cells::Escape.new(value: "\e[?25l"),
-                Vedeu::Views::Char.new(name: _name, value: 't', position: [1, 3]),
-              ])
+                Vedeu::Cells::Char.new(name: _name, value: 'B', position: [1, 3]),
+              ]))
             }
-            let(:expected) { "\e[1;1HN\e[0m\e[1;1H\e[?25l\e[0m\e[1;3Ht\e[0m" }
+            let(:expected) { "\e[1;1HA\e[?25l\e[1;3HB\e[0m" }
 
-            it 'converts the non-Vedeu::Views::Char elements into String ' \
+            it 'converts the non-Vedeu::Cells::Char elements into String ' \
                'elements' do
               subject.must_equal(expected)
             end
@@ -109,18 +120,18 @@ module Vedeu
         context 'when compression is not enabled' do
           before { Vedeu.configure { compression(false) } }
 
-          context 'when the output is all Vedeu::Views::Char elements' do
+          context 'when the output is all Vedeu::Cells::Char elements' do
             let(:output) {
               Vedeu::Models::Page.coerce([
-                Vedeu::Views::Char.new(value:  'Y',
+                Vedeu::Cells::Char.new(value:  'Y',
                                        name:   _name,
-                                       colour: { foreground: '#ff0000' }),
-                Vedeu::Views::Char.new(value:  'e',
+                                       colour: colour_1),
+                Vedeu::Cells::Char.new(value:  'e',
                                        name:   _name,
-                                       colour: { foreground: '#ff0000' }),
-                Vedeu::Views::Char.new(value:  's',
+                                       colour: colour_1),
+                Vedeu::Cells::Char.new(value:  's',
                                        name:   _name,
-                                       colour: { foreground: '#ff0000' }),
+                                       colour: colour_1),
               ])
             }
             let(:expected) {
@@ -128,27 +139,27 @@ module Vedeu
               "\e[38;2;255;0;0me\e[0m" \
               "\e[38;2;255;0;0ms\e[0m"
             }
-            it 'converts the non-Vedeu::Views::Char elements into String ' \
+            it 'converts the non-Vedeu::Cells::Char elements into String ' \
                'elements' do
               subject.must_equal(expected)
             end
           end
 
-          context 'when the output is all Vedeu::Views::Char elements' do
+          context 'when the output is all Vedeu::Cells::Char elements' do
             let(:output) {
               Vedeu::Models::Page.coerce([
-                Vedeu::Views::Char.new(value:  'a',
+                Vedeu::Cells::Char.new(value:  'a',
                                        name:   _name,
-                                       colour: { foreground: '#ff0000' }),
-                Vedeu::Views::Char.new(value:  'b',
+                                       colour: colour_1),
+                Vedeu::Cells::Char.new(value:  'b',
                                        name:   _name,
-                                       colour: { foreground: '#ff0000' }),
-                Vedeu::Views::Char.new(value:  'c',
+                                       colour: colour_1),
+                Vedeu::Cells::Char.new(value:  'c',
                                        name:   _name,
-                                       colour: { foreground: '#0000ff' }),
-                Vedeu::Views::Char.new(value:  'd',
+                                       colour: colour_2),
+                Vedeu::Cells::Char.new(value:  'd',
                                        name:   _name,
-                                       colour: { foreground: '#0000ff' }),
+                                       colour: colour_2),
               ])
             }
             let(:expected) {
@@ -162,17 +173,19 @@ module Vedeu
             end
           end
 
-          context 'when the output is not all Vedeu::Views::Char elements' do
+          context 'when the output is not all Vedeu::Cells::Char elements' do
             let(:output) {
-              Vedeu::Models::Page.coerce([
-                Vedeu::Views::Char.new(name: _name, value: 'N'),
-                Vedeu::Cells::Escape.new(value: "\e[?25l"),
-                Vedeu::Views::Char.new(name: _name, value: 't'),
-              ])
+              Vedeu::Models::Page.coerce(
+                Vedeu::Models::Row.coerce([
+                  Vedeu::Cells::Char.new(name: _name, value: 'A'),
+                  Vedeu::Cells::Escape.new(value: "\e[?25l"),
+                  Vedeu::Cells::Char.new(name: _name, value: 'B'),
+                ])
+              )
             }
-            it 'converts the non-Vedeu::Views::Char elements into String ' \
+            it 'converts the non-Vedeu::Cells::Char elements into String ' \
                'elements' do
-              subject.must_equal("N\e[0m\e[1;1H\e[?25l\e[0mt\e[0m")
+              subject.must_equal("A\e[?25lB\e[0m")
             end
           end
         end

data/test/lib/vedeu/renderers/file_test.rb

@@ -13,14 +13,30 @@ module Vedeu
       let(:output)    { 'Some content...' }
       let(:options)   {
         {
-          filename:    filename,
-          timestamp:   timestamp,
-          compression: compression,
+          compression:   compression,
+          end_tag:       end_tag,
+          end_row_tag:   end_row_tag,
+          filename:      filename,
+          output:        output,
+          start_tag:     start_tag,
+          start_row_tag: start_row_tag,
+          template:      template,
+          timestamp:     timestamp,
+          write_file:    write_file,
         }
       }
-      let(:filename)    { 'vedeu_renderers_file' }
-      let(:timestamp)   { false }
-      let(:compression) { false }
+      let(:compression)   { false }
+      let(:end_tag)       { '</td>' }
+      let(:end_row_tag)   { '</tr>' }
+      let(:filename)      { 'vedeu_renderers_file' }
+      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 }
 
       before { ::File.stubs(:write) }
 
@@ -29,45 +45,58 @@ module Vedeu
         it { instance.instance_variable_get('@options').must_equal(options) }
       end
 
-      describe '#render' do
-        let(:_time) { Time.new(2015, 4, 12, 20, 05, 00, "+01:00") }
+      # describe '#render' do
+      #   let(:_time) { Time.new(2015, 4, 12, 20, 05, 00, "+01:00") }
 
-        subject { instance.render(output) }
+      #   subject { instance.render(output) }
 
-        # it { subject.must_be_instance_of(String) }
+      #   # it { subject.must_be_instance_of(String) }
 
-        context 'when the filename option is not set' do
-          context 'when the timestamp option is not set' do
-            # it do
-            #   ::File.expects(:write).with('/tmp/out', nil)
-            #   subject
-            # end
-          end
+      #   context 'when the filename option is not set' do
+      #     context 'when the timestamp option is not set' do
+      #       # it do
+      #       #   ::File.expects(:write).with('/tmp/out', nil)
+      #       #   subject
+      #       # end
+      #     end
 
-          context 'when the timestamp option is set' do
-            let(:timestamp) { true }
+      #     context 'when the timestamp option is set' do
+      #       let(:timestamp) { true }
 
-            before { Time.stubs(:now).returns(_time) }
+      #       before { Time.stubs(:now).returns(_time) }
 
-            # it do
-            #   ::File.expects(:write).with('/tmp/out_1428865500.0', 'w')
-            #   subject
-            # end
-          end
-        end
+      #       # it do
+      #       #   ::File.expects(:write).with('/tmp/out_1428865500.0', 'w')
+      #       #   subject
+      #       # end
+      #     end
+      #   end
 
-        context 'when the filename option is set' do
-          let(:filename) { 'some_name' }
+      #   context 'when the filename option is set' do
+      #     let(:filename) { 'some_name' }
 
-          # it do
-          #   ::File.expects(:write).with('/tmp/some_name', 'w')
-          #   subject
-          # end
-        end
-      end
+      #     # it do
+      #     #   ::File.expects(:write).with('/tmp/some_name', 'w')
+      #     #   subject
+      #     # end
+      #   end
+      # end
 
       describe '#clear' do
-        it { instance.must_respond_to(:clear) }
+        subject { instance.clear }
+
+        it { subject.must_equal('') }
+      end
+
+      describe '#write' do
+        subject { instance.write }
+
+        it do
+          ::File.expects(:write).with(filename, output)
+          subject
+        end
+
+        it { subject.must_equal(output) }
       end
 
     end # File