vedeu 0.8.2 → 0.8.3

data/lib/vedeu/renderers/templates/html_renderer.vedeu

@@ -3,6 +3,7 @@
     <style type='text/css'>
       body {
         background:#000;
+        color:#fff;
       }
       td {
         border:1px #171717 solid;

data/lib/vedeu/renderers/terminal.rb

@@ -4,40 +4,39 @@ module Vedeu
 
   module Renderers
 
-    # Converts a grid of {Vedeu::Views::Char} objects into a stream of
+    # Converts a grid of {Vedeu::Cells::Char} objects into a stream of
     # escape sequences and content suitable for a terminal.
     #
     class Terminal
 
       include Vedeu::Renderers::Options
 
-      # Returns a new instance of Vedeu::Renderers::Terminal.
-      #
-      # @param options [Hash]
-      # @return [Vedeu::Renderers::Terminal]
-      def initialize(options = {})
-        @options = options || {}
-      end
-
       # Render a cleared output.
       #
       # @return [String]
       def clear
         Vedeu::Terminal.clear
+
+        render('')
       end
 
-      # @param output [Vedeu::Models::Page]
-      # @return [Array<String>]
-      def render(output)
-        Vedeu::Terminal.output(parse(output))
+      # Render the output (either content or clearing) to the console.
+      #
+      # @return [String]
+      def write
+        if write_file?
+          Vedeu::Terminal.output(write_file)
+
+        else
+          Vedeu::Terminal.output(content)
+
+        end
       end
 
       private
 
-      # @param output [Vedeu::Models::Page]
-      # @return [Array<Array<Vedeu::Views::Char>>]
-      def parse(output)
-        Vedeu::Output::Compressor.render(output, options)
+      def content
+        compression
       end
 
     end # Terminal

data/lib/vedeu/renderers/text.rb

@@ -5,33 +5,39 @@ module Vedeu
   module Renderers
 
     # Converts a grid of {Vedeu::Cells} objects or
-    # {Vedeu::Views::Char} objects into a stream of characters without
+    # {Vedeu::Cells::Char} objects into a stream of characters without
     # escape sequences.
     #
     class Text < Vedeu::Renderers::File
 
-      include Vedeu::Common
       include Vedeu::Renderers::Options
 
-      # Returns a new instance of Vedeu::Renderers::Text.
+      # Render a cleared output.
       #
-      # @param options [Hash]
-      # @return [Vedeu::Renderers::Text]
-      def initialize(options = {})
-        @options = options || {}
+      # @return [String]
+      def clear
+        render('')
       end
 
-      # Render a cleared output.
+      private
+
+      # Combine all characters in a row to produce a line, then all
+      # lines should be terminated with `\n`. Convert to an array of
+      # UTF8 codepoints, and any codepoint above 255 should be
+      # converted to a space.
       #
       # @return [String]
-      def clear
-        ''
+      def content
+        return '' if string?(output) || absent?(output)
+
+        buffer.map(&:join).join("\n").unpack('U*').map do |c|
+          (c > 255) ? ' ' : c.chr
+        end.join
       end
 
-      # @param output [Vedeu::Models::Page]
       # @return [Array<String>]
-      def render(output)
-        return '' unless present?(output)
+      def buffer
+        empty = Array.new(Vedeu.height) { Array.new(Vedeu.width) { ' ' } }
 
         output.each do |row|
           row.each do |char|
@@ -39,29 +45,11 @@ module Vedeu
                         positionable?(char) &&
                         textual?(char)
 
-            # fail char.inspect
-
-            buffer[char.position.y - 1][char.position.x - 1] = char.text
+            empty[char.position.y - 1][char.position.x - 1] = char.text
           end
         end
 
-        ::File.write(filename, data) if write_file?
-
-        data
-      end
-
-      private
-
-      # @return [Array<String>]
-      def buffer
-        @buffer ||= Array.new(Vedeu.height) { Array.new(Vedeu.width) { ' ' } }
-      end
-
-      # @return [String]
-      def data
-        @data ||= buffer.map(&:join).join("\n").unpack('U*').map do |c|
-          (c > 255) ? ' ' : c.chr
-        end.join
+        empty
       end
 
       # @return [Boolean]
@@ -73,18 +61,21 @@ module Vedeu
       # @return [Array<Class>]
       def renderables
         [
-          Vedeu::Cells::Empty,
-          Vedeu::Cells::TopLeft,
-          Vedeu::Cells::TopHorizontal,
+          Vedeu::Cells::Border,
+          Vedeu::Cells::BottomHorizontal,
+          Vedeu::Cells::BottomLeft,
+          Vedeu::Cells::BottomRight,
+          Vedeu::Cells::Corner,
           Vedeu::Cells::Char,
-          Vedeu::Cells::TopRight,
-          Vedeu::Views::Char,
           Vedeu::Cells::Clear,
+          Vedeu::Cells::Empty,
+          Vedeu::Cells::Horizontal,
           Vedeu::Cells::LeftVertical,
           Vedeu::Cells::RightVertical,
-          Vedeu::Cells::BottomLeft,
-          Vedeu::Cells::BottomHorizontal,
-          Vedeu::Cells::BottomRight,
+          Vedeu::Cells::TopHorizontal,
+          Vedeu::Cells::TopLeft,
+          Vedeu::Cells::TopRight,
+          Vedeu::Cells::Vertical,
         ]
       end
 

data/lib/vedeu/version.rb

@@ -3,6 +3,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 
 end

data/lib/vedeu/views/all.rb

@@ -14,8 +14,6 @@ require 'vedeu/views/default_attributes'
 require 'vedeu/views/value'
 
 require 'vedeu/views/chars'
-require 'vedeu/views/char'
-require 'vedeu/views/html_char'
 require 'vedeu/views/streams'
 require 'vedeu/views/stream'
 require 'vedeu/views/lines'

data/lib/vedeu/views/chars.rb

@@ -4,7 +4,7 @@ module Vedeu
 
   module Views
 
-    # A collection of {Vedeu::Views::Char} instances.
+    # A collection of {Vedeu::Cells::Char} instances.
     #
     # @api private
     #
@@ -25,12 +25,15 @@ module Vedeu
 
           coerced_collection = []
           collection.each do |element|
-            coerced_collection << element if element.is_a?(Vedeu::Views::Char)
+            coerced_collection << element if element.is_a?(Vedeu::Cells::Char)
           end
 
           new(coerced_collection, parent, name)
 
         elsif collection.is_a?(Vedeu::Views::Stream)
+          Vedeu::Views::Chars.coerce(collection.value,
+                                     collection.parent,
+                                     collection.name)
 
         elsif collection.is_a?(String)
           return new([], parent, name) if collection.empty?
@@ -44,7 +47,7 @@ module Vedeu
 
         else
           fail Vedeu::Error::InvalidSyntax,
-               'Cannot coerce for Vedeu::View::Streams, as collection ' \
+               'Cannot coerce for Vedeu::View::Chars, as collection is ' \
                'unrecognised.'
 
         end

data/lib/vedeu/views/stream.rb

@@ -1,4 +1,5 @@
 require 'vedeu/dsl/all'
+require 'vedeu/cells/all'
 
 # frozen_string_literal: true
 
@@ -32,7 +33,7 @@ module Vedeu
       include Vedeu::Views::Value
       collection Vedeu::Views::Chars
       deputy     Vedeu::Views::Stream::DSL
-      entity     Vedeu::Views::Char
+      entity     Vedeu::Cells::Char
       parent     Vedeu::Views::Streams
 
       def_delegators :value,
@@ -73,7 +74,7 @@ module Vedeu
 
       # An object is equal when its values are the same.
       #
-      # @param other [Vedeu::Views::Char]
+      # @param other [void]
       # @return [Boolean]
       def eql?(other)
         self.class == other.class && value == other.value

data/test/lib/vedeu/borders/caption_test.rb

@@ -8,25 +8,25 @@ module Vedeu
 
     describe Caption do
 
-      let(:described)  { Vedeu::Borders::Caption }
-      let(:instance)   { described.new(_name, _value, horizontal) }
-      let(:_name)      { 'Vedeu::Borders::Caption' }
-      let(:_value)     { 'Bismuth' }
+      let(:described) { Vedeu::Borders::Caption }
+      let(:instance)  { described.new(_name, _value, horizontal) }
+      let(:_name)     { 'Vedeu::Borders::Caption' }
+      let(:_value)    { 'Bismuth' }
+      let(:type)      { :bottom_horizontal }
       let(:horizontal) {
         [
-          Vedeu::Views::Char.new(value: '-', position: [4, 1], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [4, 2], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [4, 3], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [4, 4], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [4, 5], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [4, 6], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [4, 7], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [4, 8], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [4, 9], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [4, 10], border: type),
+          Vedeu::Cells::BottomHorizontal.new(position: [4, 1]),
+          Vedeu::Cells::BottomHorizontal.new(position: [4, 2]),
+          Vedeu::Cells::BottomHorizontal.new(position: [4, 3]),
+          Vedeu::Cells::BottomHorizontal.new(position: [4, 4]),
+          Vedeu::Cells::BottomHorizontal.new(position: [4, 5]),
+          Vedeu::Cells::BottomHorizontal.new(position: [4, 6]),
+          Vedeu::Cells::BottomHorizontal.new(position: [4, 7]),
+          Vedeu::Cells::BottomHorizontal.new(position: [4, 8]),
+          Vedeu::Cells::BottomHorizontal.new(position: [4, 9]),
+          Vedeu::Cells::BottomHorizontal.new(position: [4, 10]),
         ]
       }
-      let(:type) { :bottom_horizontal }
 
       describe '#render' do
         subject { instance.render }
@@ -50,7 +50,7 @@ module Vedeu
           }
           let(:expected) {
             [
-              Vedeu::Views::Char.new(value: '-', position: [4, 1], border: type),
+              Vedeu::Cells::BottomHorizontal.new(position: [4, 1]),
               Vedeu::Cells::Char.new(value: ' ', position: [4, 2]),
               Vedeu::Cells::Char.new(value: 'B', position: [4, 3]),
               Vedeu::Cells::Char.new(value: 'i', position: [4, 4]),
@@ -59,7 +59,7 @@ module Vedeu
               Vedeu::Cells::Char.new(value: 'u', position: [4, 7]),
               Vedeu::Cells::Char.new(value: 't', position: [4, 8]),
               Vedeu::Cells::Char.new(value: ' ', position: [4, 9]),
-              Vedeu::Views::Char.new(value: '-', position: [4, 10], border: type),
+              Vedeu::Cells::BottomHorizontal.new(position: [4, 10]),
             ]
           }
 

data/test/lib/vedeu/borders/title_test.rb

@@ -14,16 +14,16 @@ module Vedeu
       let(:_value)     { 'Aluminium' }
       let(:horizontal) {
         [
-          Vedeu::Views::Char.new(value: '-', position: [1, 1], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [1, 2], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [1, 3], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [1, 4], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [1, 5], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [1, 6], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [1, 7], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [1, 8], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [1, 9], border: type),
-          Vedeu::Views::Char.new(value: '-', position: [1, 10], border: type),
+          Vedeu::Cells::TopHorizontal.new(position: [1, 1]),
+          Vedeu::Cells::TopHorizontal.new(position: [1, 2]),
+          Vedeu::Cells::TopHorizontal.new(position: [1, 3]),
+          Vedeu::Cells::TopHorizontal.new(position: [1, 4]),
+          Vedeu::Cells::TopHorizontal.new(position: [1, 5]),
+          Vedeu::Cells::TopHorizontal.new(position: [1, 6]),
+          Vedeu::Cells::TopHorizontal.new(position: [1, 7]),
+          Vedeu::Cells::TopHorizontal.new(position: [1, 8]),
+          Vedeu::Cells::TopHorizontal.new(position: [1, 9]),
+          Vedeu::Cells::TopHorizontal.new(position: [1, 10]),
         ]
       }
       let(:type) { :top_horizontal }
@@ -47,7 +47,7 @@ module Vedeu
         context 'when the title is not empty' do
           let(:expected) {
             [
-              Vedeu::Views::Char.new(value: '-', position: [1, 1], border: type),
+              Vedeu::Cells::TopHorizontal.new(position: [1, 1]),
               Vedeu::Cells::Char.new(value: ' ', position: [1, 2]),
               Vedeu::Cells::Char.new(value: 'A', position: [1, 3]),
               Vedeu::Cells::Char.new(value: 'l', position: [1, 4]),
@@ -56,7 +56,7 @@ module Vedeu
               Vedeu::Cells::Char.new(value: 'i', position: [1, 7]),
               Vedeu::Cells::Char.new(value: 'n', position: [1, 8]),
               Vedeu::Cells::Char.new(value: ' ', position: [1, 9]),
-              Vedeu::Views::Char.new(value: '-', position: [1, 10], border: type),
+              Vedeu::Cells::TopHorizontal.new(position: [1, 10]),
             ]
           }
 

data/test/lib/vedeu/cells/border_test.rb

@@ -35,6 +35,12 @@ module Vedeu
         # @todo Add more tests.
       end
 
+      describe '#type' do
+        subject { instance.type }
+
+        it { subject.must_equal(:border) }
+      end
+
       describe '#value' do
         subject { instance.value }
 

data/test/lib/vedeu/cells/borders/horizontal_test.rb

@@ -11,6 +11,12 @@ module Vedeu
       let(:described) { Vedeu::Cells::Horizontal }
       let(:instance)  { described.new }
 
+      describe '#as_html' do
+        subject { instance.as_html }
+
+        it { subject.must_equal('─') }
+      end
+
       describe '#text' do
         subject { instance.text }
 

data/test/lib/vedeu/cells/borders/vertical_test.rb

@@ -11,6 +11,12 @@ module Vedeu
       let(:described) { Vedeu::Cells::Vertical }
       let(:instance)  { described.new }
 
+      describe '#as_html' do
+        subject { instance.as_html }
+
+        it { subject.must_equal('│') }
+      end
+
       describe '#text' do
         subject { instance.text }
 

data/test/lib/vedeu/cells/borders/{bottom_left_test.rb → vertices/bottom_left_test.rb}

@@ -11,6 +11,12 @@ module Vedeu
       let(:described) { Vedeu::Cells::BottomLeft }
       let(:instance)  { described.new }
 
+      describe '#as_html' do
+        subject { instance.as_html }
+
+        it { subject.must_equal('└') }
+      end
+
       describe '#type' do
         subject { instance.type }
 

data/test/lib/vedeu/cells/borders/{bottom_right_test.rb → vertices/bottom_right_test.rb}

@@ -11,6 +11,12 @@ module Vedeu
       let(:described) { Vedeu::Cells::BottomRight }
       let(:instance)  { described.new }
 
+      describe '#as_html' do
+        subject { instance.as_html }
+
+        it { subject.must_equal('┘') }
+      end
+
       describe '#type' do
         subject { instance.type }
 

data/test/lib/vedeu/cells/borders/{top_left_test.rb → vertices/top_left_test.rb}

@@ -11,6 +11,12 @@ module Vedeu
       let(:described) { Vedeu::Cells::TopLeft }
       let(:instance)  { described.new }
 
+      describe '#as_html' do
+        subject { instance.as_html }
+
+        it { subject.must_equal('┌') }
+      end
+
       describe '#type' do
         subject { instance.type }