vedeu 0.4.64 → 0.4.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a32a9c9990ac18d631952547ac6fb6270fce65d3
-  data.tar.gz: c246ba1065c2cc51e843d8bac331fff26752ac0e
+  metadata.gz: 75b2e5231b8b3902b1efb1235d1b3713452d65d7
+  data.tar.gz: 70bdf955c10a76f9c7fdd5e42720dca9468a1102
 SHA512:
-  metadata.gz: f122e786688becea11c0709cbbb31f246d4beb9a9b37a0238d48e43fafa94e1282ee333942457ecff92096b2341684df300ef1b7d009dcd0acd7d37c507258e8
-  data.tar.gz: 2eccc4215c84e205cddf9bd6823bb3df16f0c380beb048d97c070d84fd69a70e7323e0e890df9050ff9f33851a309bb947daac9db04721494a8493f259681ac3
+  metadata.gz: 1dfccfc1a1954962f7db2b419b8ff9def9ebba98d90445c8092291738b7ade467e60264dc86ca7f8fb4874f34c7588ae4581054dafadb075c3ab5d49deda1add
+  data.tar.gz: e766f3d3564dd8eab71731127885474c122cf2c9d7c1741b9dcef5338644e8a144c1eb05ddead0b4d9c369f96390b26c76da15ba8653ba3c4def96cd16ca4cf5

data/lib/vedeu/all.rb

@@ -106,9 +106,9 @@ require 'vedeu/templating/all'
 require 'vedeu/templating/encoder'
 require 'vedeu/templating/decoder'
 require 'vedeu/templating/helpers'
-require 'vedeu/templating/directive'
-require 'vedeu/templating/post_processor'
+require 'vedeu/templating/view_helpers'
 require 'vedeu/templating/template'
+require 'vedeu/templating/view_template'
 
 require 'vedeu/application/controller'
 require 'vedeu/application/helper'

data/lib/vedeu/dsl/composition.rb

@@ -104,7 +104,7 @@ module Vedeu
         fail Vedeu::MissingRequired,
              'Cannot render template without a filename.' unless filename
 
-        content   = Vedeu::Templating::Template.parse(object, filename)
+        content   = Vedeu::Templating::ViewTemplate.parse(object, filename)
         lines     = Vedeu::Wordwrap.for(content, options)
 
         new_model = model.member.build(template_attributes(name, lines))

data/lib/vedeu/models/interface.rb

@@ -72,6 +72,7 @@ module Vedeu
     def add(child)
       @lines = lines.add(child)
     end
+    alias_method :<<, :add
 
     # Hide a named interface buffer, or without a name, the buffer of the
     # currently focussed interface.

data/lib/vedeu/models/line.rb

@@ -39,6 +39,7 @@ module Vedeu
     def add(child)
       @_streams = @streams = collection.coerce(streams, self).add(child)
     end
+    alias_method :<<, :add
 
     # Returns an array of all the characters with formatting for this line.
     #
@@ -57,6 +58,15 @@ module Vedeu
       streams.empty?
     end
 
+    # An object is equal when its values are the same.
+    #
+    # @param other [Vedeu::Collection]
+    # @return [Boolean]
+    def eql?(other)
+      self.class == other.class && streams == other.streams
+    end
+    alias_method :==, :eql?
+
     # @return [NilClass|String]
     def name
       parent.name if parent

data/lib/vedeu/models/stream.rb

@@ -46,6 +46,7 @@ module Vedeu
     def add(child)
       parent.add(child)
     end
+    alias_method :<<, :add
 
     # Returns an array of characters, each element is the escape sequences of
     # colours and styles for this stream, the character itself, and the escape

data/lib/vedeu/templating/decoder.rb

@@ -52,7 +52,14 @@ module Vedeu
       #
       # @return [String]
       def decode64
-        Base64.strict_decode64(data)
+        Base64.strict_decode64(unwrap)
+      end
+
+      # Removes '{{' and '}}' from the start and end of the data.
+      #
+      # @return [String]
+      def unwrap
+        data.gsub(/({{)|(}})/, '')
       end
 
     end # Decoder

data/lib/vedeu/templating/encoder.rb

@@ -22,7 +22,7 @@ module Vedeu
 
       # @return [String]
       def process
-        encode64
+        wrap
       end
 
       protected
@@ -33,6 +33,13 @@ module Vedeu
 
       private
 
+      # Adds '{{' and '}}' to the start and end of the data.
+      #
+      # @return [String]
+      def wrap
+        "{{#{encode64}}}"
+      end
+
       # Encode the compressed, marshalled object or objects into a Base64
       # string.
       #

data/lib/vedeu/templating/view_helpers.rb

@@ -0,0 +1,33 @@
+module Vedeu
+
+  module Templating
+
+    # Provide helpers to be used with your Vedeu templates.
+    #
+    module ViewHelpers
+
+      include Vedeu::Templating::Helpers
+
+      private
+
+      # @see Vedeu::Templating::Helpers#colour
+      def define_stream(attributes = {}, &block)
+        fail Vedeu::InvalidSyntax, 'block not given' unless block_given?
+
+        encode(
+          Vedeu::Stream.build(colour: Vedeu::Colour.new(attributes),
+                              style:  Vedeu::Style.new(attributes[:style]),
+                              value:  block.call))
+      end
+
+      # @param data [String]
+      # @return [String]
+      def encode(data)
+        Vedeu::Templating::Encoder.process(data)
+      end
+
+    end # ViewHelpers
+
+  end # Templating
+
+end # Vedeu

data/lib/vedeu/templating/view_template.rb

@@ -0,0 +1,69 @@
+module Vedeu
+
+  module Templating
+
+    # Extend Template to provide client application view specific parsing.
+    #
+    class ViewTemplate < Template
+
+      include Vedeu::Common
+      include Vedeu::Templating::ViewHelpers
+
+      # @return [Vedeu::Lines]
+      def parse
+        lines_collection = Vedeu::Lines.new
+
+        lines.each do |line|
+          line_object = Vedeu::Line.new
+
+          streams_for(line).each do |stream|
+            next unless present?(stream)
+
+            line_object << if stream =~ /({{)|(}})/
+                             Vedeu::Templating::Decoder.process(stream)
+
+                           else
+                             Vedeu::Stream.new(value: stream)
+
+                           end
+          end
+
+          lines_collection << line_object
+        end
+
+        lines_collection
+      end
+
+      protected
+
+      # @!attribute [r] object
+      # @return [Class]
+      attr_reader :object
+
+      # @!attribute [r] options
+      # @return [Hash]
+      attr_reader :options
+
+      private
+
+      # @param line [String]
+      # @return [Array<String>]
+      def streams_for(line)
+        line.split(/({{.*}})/)
+      end
+
+      # @return [Array<String>]
+      def lines
+        content.lines.map(&:chomp)
+      end
+
+      # @return [String]
+      def content
+        ERB.new(load, nil, '-').result(binding)
+      end
+
+    end # ViewTemplate
+
+  end # Templating
+
+end # Vedeu

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.4.64'
+  VERSION = '0.4.65'
 
 end

data/test/lib/vedeu/dsl/composition_test.rb

@@ -57,7 +57,7 @@ module Vedeu
           let(:filename) { 'my_interface.erb' }
 
           before do
-            Vedeu::Templating::Template.expects(:parse).
+            Vedeu::Templating::ViewTemplate.expects(:parse).
               with(object, filename).returns(content)
           end
 

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

@@ -71,6 +71,8 @@ module Vedeu
       subject { instance.add(child) }
 
       it { instance.must_respond_to(:add) }
+
+      it { instance.must_respond_to(:<<) }
     end
 
     describe '#hide' do

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

@@ -58,6 +58,10 @@ module Vedeu
 
     describe '#add' do
       subject { instance.add(child) }
+
+      it { instance.must_respond_to(:add) }
+
+      it { instance.must_respond_to(:<<) }
     end
 
     describe '#chars' do
@@ -90,6 +94,20 @@ module Vedeu
       end
     end
 
+    describe '#eql?' do
+      let(:other) { instance }
+
+      subject { instance.eql?(other) }
+
+      it { subject.must_equal(true) }
+
+      context 'when different to other' do
+        let(:other) { described.new(streams: [:other]) }
+
+        it { subject.must_equal(false) }
+      end
+    end
+
     describe '#name' do
       subject { instance.name }
 

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

@@ -53,6 +53,8 @@ module Vedeu
       subject { instance.add(child) }
 
       it { subject.must_be_instance_of(Vedeu::Streams) }
+
+      it { instance.must_respond_to(:<<) }
     end
 
     describe '#chars' do

data/test/lib/vedeu/templating/encoder_test.rb

@@ -12,8 +12,8 @@ module Vedeu
         Vedeu::Colour.new(background: '#ff0000', foreground: '#00ff00')
       }
       let(:expected)  {
-        "eJxj4ci3EgpLTUkttbJyzs/JLy1itxJwSEpMzk4vyi/NS8m3EoPKOsHF2Kx4HJLBaj" \
-        "2VeJTT0gyAgM2KzTUEqDMtvygVXacbXIzNmgOkxcAApInNmjMEAAMcJsQ="
+        "{{eJxj4ci3EgpLTUkttbJyzs/JLy1itxJwSEpMzk4vyi/NS8m3EoPKOsHF2Kx4HJLBaj" \
+        "2VeJTT0gyAgM2KzTUEqDMtvygVXacbXIzNmgOkxcAApInNmjMEAAMcJsQ=}}"
       }
 
       describe '#initialize' do

data/test/lib/vedeu/templating/template_test.rb

@@ -40,6 +40,10 @@ module Vedeu
         end
       end
 
+      describe '#parse' do
+        it { instance.must_respond_to(:parse) }
+      end
+
     end # Templating
 
   end # Template

data/test/lib/vedeu/templating/view_helpers_test.rb

@@ -0,0 +1,139 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Templating
+
+    class ViewHelpersTestClass
+
+      include Vedeu::Templating::ViewHelpers
+
+    end
+
+    describe ViewHelpers do
+
+      let(:described) { Vedeu::Templating::ViewHelpers }
+      let(:instance)  { Vedeu::Templating::ViewHelpersTestClass.new }
+
+      describe '#background' do
+        let(:expected) {
+          "{{" \
+          "eJxdj00LwjAMhj1Ip7aKX3iW+Qd2zi5BUdhZ8d5tUYZzla4VxT9vrTrBXJI34UnetD" \
+          "sKxnvKyQJsjSZ5FjBEaYwuUmuofnDgWVlQZSJXqFJZ/QNWXgcOSGV2Omplq1zB7DNd" \
+          "Nj0GAt9sEopF5IMBW+8ceVCa/slN02OxSMIWi/s74BepvY1ebe4lKRg1tp1kwPEqS0" \
+          "tu7nMSTn+m5oZuxm/pVvJM35XO1fu1WGDg1PcCR38CRTzBPvTwxeDgCdSbXHg=" \
+          "}}"
+        }
+
+        subject { instance.background('#000000') { 'background text' } }
+
+        it { instance.must_respond_to(:bg) }
+
+        it { subject.must_equal(expected) }
+      end
+
+      describe '#colour' do
+        let(:attributes) { {} }
+
+        subject { instance.colour(attributes) { 'colour text' } }
+
+        context 'with no attributes' do
+          it { subject.must_be_instance_of(String) }
+        end
+
+        context 'with a background attribute' do
+          let(:attributes) {
+            {
+              background: '#002200'
+            }
+          }
+          let(:expected) {
+            "{{" \
+            "eJxdj08LwjAMxT1Ip7aKf8CzzC9QPGaXoCjsrHjvNMpwrlJbUfzy1k4neEpewu/l" \
+            "pdnSMNzSnhzA2hpSZwF9VNaaPHOWrk8OfFfkVFrpG11oZ37AIujIA5nanY5Gu3Kv" \
+            "YfzZzusZA4EVm8ZiKuVsJiUDttx48qAN/ZOresYSkcYNlnQ3wC/KhBidq30UpGFQ" \
+            "x/aSAcebKhz5fahp3K9OTizdbXBol+pMXzufqHorERh59XXnGOxRJCPsQgffDPZe" \
+            "Rsda7A==" \
+            "}}"
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'with a foreground attribute' do
+          let(:attributes) {
+            {
+              foreground: '#ff0000'
+            }
+          }
+          let(:expected) {
+            "{{" \
+            "eJxdj08LwjAMxT1I/dMqU8GzzC/gOb0ERWFnh/dOMxHnKrUVxS9v1+kEc2lewu/l" \
+            "td3VMN7RgRzA1hpSFwERKmvNKXOWbi8OfF+cqLQL3+hCO/MDVkF3PJCp/flotCsP" \
+            "Gqaf7bKZMRBYs0ncYsDWqUdybegf2TQzJkUSi3meL3wxOUiBX5UJMfo3+yxIw6iJ" \
+            "7SUDjndVOPL78CZxVJ+cWXrY4NAr1YWqBJXwiepvSYEdr77uHIM9CjnBAfSxYnD4" \
+            "BqMMW1Q=" \
+            "}}"
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'with both attributes' do
+          let(:attributes) {
+            {
+              background: '#000022',
+              foreground: '#ff7700',
+            }
+          }
+          let(:expected) {
+            "{{" \
+            "eJxdj0sLwjAQhD1IfCSKD/As+geKF2F7WRQFz4r3VLci1kZiIop/3jXVCuaSzCzf" \
+            "7KRaN9Db0p48wNpZ0mcFHdTO2WPiHV2fEuQuO1LuIn6YzHj7A+ZB1xhI9O50sMbn" \
+            "ewODz3RWegIUFuxqpMYRn8lEgFhsmEyNpX9yWXoiVm8kTafTKBJxawPyom1o07y6" \
+            "R0YGumV7lgIk3nTmiefhXo06xeaho7sLCY1cn9mvBMHFit/FCmusvukSQzyquI8t" \
+            "aOKbwfYLqERctQ==" \
+            "}}"
+          }
+
+          it { subject.must_equal(expected) }
+        end
+      end
+
+      describe '#foreground' do
+        let(:expected) {
+          "{{" \
+          "eJxdj08PATEQxR2ki3bFvzjL+gLOs5cJIdkzcS87ZKO2Uq0QX163WIm5dN5MfvNemy" \
+          "0Ngy3l5ADW1pA8C+ihtNYUO2fp+uTA96qg0s58o5V25gcsgo48sJP709FoV+Yaxp/t" \
+          "vJ4xEPhms6TBgC03HjloQ//Iqp6xVGSJmM5CsTTeAL9IE2J0rvahSEO/ju0lA443qR" \
+          "z5fXizZPRzmFi623ClXcozVSkq4VO9v5YKjLz6OnAMFijSIcbQwYrB7gsCxlyT" \
+          "}}"
+        }
+
+        subject { instance.foreground('#000000') { 'foreground text' } }
+
+        it { instance.must_respond_to(:fg) }
+
+        it { subject.must_equal(expected) }
+      end
+
+      describe '#style' do
+        let(:expected) {
+          "{{" \
+          "eJxdj08LwjAMxT1I59b6HzzLPoHn7BIUBc+K926LItZVaiuKX96u6gRveUl+7yXtjo" \
+          "bRjkpyABtrSJ4FDFBaa465s3R9cuCFOlJlZ77QSjvzAxZBRx7IZXE6GO2qUsPkM503" \
+          "PQYC3+w6bTFgy61H9trQP7JqeiwT9W7W3QK/SBPyk6t9KNIwbO71kgHHm1SOIM61Ki" \
+          "EJYp32w/LU0t0Gl7iSZ/pa+nPeP2UCI6++CRwDhSIbYxcSrBnsvQDMNVrp" \
+          "}}"
+        }
+
+        subject { instance.style(:bold) { 'style text' } }
+
+        it { subject.must_equal(expected) }
+      end
+
+    end # ViewHelpers
+
+  end # Templating
+
+end # Vedeu

data/test/lib/vedeu/templating/view_template_test.rb

@@ -0,0 +1,129 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Templating
+
+  	describe ViewTemplate do
+
+      let(:described) { Vedeu::Templating::ViewTemplate }
+      let(:instance)  { described.new(object, path) }
+      let(:object)    {}
+      let(:path)      {}
+
+      describe '.parse' do
+        subject { described.parse(object, path) }
+
+        context 'with a plain text file' do
+          let(:path) { 'test/support/templates/plain.erb' }
+
+          let(:expected) {
+            Vedeu::Lines.new([
+              Vedeu::Line.new(streams: Vedeu::Stream.new(value: 'This is a test.'))
+            ])
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'with a plain text file with multiple lines' do
+          let(:path) { 'test/support/templates/multiple.erb' }
+
+          let(:expected) {
+            Vedeu::Lines.new([
+              Vedeu::Line.new(streams: Vedeu::Stream.new(value: 'This is a test.')),
+              Vedeu::Line.new(streams: Vedeu::Stream.new(value: 'And so is this.')),
+            ])
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'with a background colour directive' do
+          let(:path)   { 'test/support/templates/background.erb' }
+          let(:colour) {
+            Vedeu::Colour.new(background: '#ff0000', foreground: '')
+          }
+
+          let(:expected) {
+            Vedeu::Lines.new([
+              Vedeu::Line.new(streams: [
+                Vedeu::Stream.new(value: 'This is a '),
+                Vedeu::Stream.new(value: 'test', colour: colour),
+                Vedeu::Stream.new(value: '.'),
+              ])
+            ])
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'with a foreground colour directive' do
+          let(:path) { 'test/support/templates/foreground.erb' }
+          let(:colour) {
+            Vedeu::Colour.new(background: '', foreground: '#00ff00')
+          }
+
+          let(:expected) {
+            Vedeu::Lines.new([
+              Vedeu::Line.new(streams: [
+                Vedeu::Stream.new(value: 'This is a '),
+                Vedeu::Stream.new(value: 'test', colour: colour),
+                Vedeu::Stream.new(value: '.'),
+              ])
+            ])
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'with a colour directive' do
+          let(:path) { 'test/support/templates/colour.erb' }
+
+          let(:colour) {
+            Vedeu::Colour.new(background: '#003300', foreground: '#aadd00')
+          }
+
+          let(:expected) {
+            Vedeu::Lines.new([
+              Vedeu::Line.new(streams: [
+                Vedeu::Stream.new(value: 'This is a '),
+                Vedeu::Stream.new(value: 'test', colour: colour),
+                Vedeu::Stream.new(value: '.'),
+              ])
+            ])
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'with a style directive' do
+          let(:path) { 'test/support/templates/style.erb' }
+
+          let(:style) {
+            Vedeu::Style.new(:bold)
+          }
+
+          let(:expected) {
+            Vedeu::Lines.new([
+              Vedeu::Line.new(streams: [
+                Vedeu::Stream.new(value: 'This is a '),
+                Vedeu::Stream.new(value: 'test', style: style),
+                Vedeu::Stream.new(value: '.'),
+              ])
+            ])
+          }
+
+          it { subject.must_equal(expected) }
+        end
+      end
+
+      describe '#parse' do
+        it { instance.must_respond_to(:parse) }
+      end
+
+  	end # ViewTemplate
+
+  end # Templating
+
+end # Vedeu

data/test/support/templates/background.erb

@@ -0,0 +1 @@
+This is a <%= background('#ff0000') { 'test' } %>.

data/test/support/templates/colour.erb

@@ -0,0 +1 @@
+This is a <%= colour(background: '#003300', foreground: '#aadd00') { 'test' } %>.

data/test/support/templates/foreground.erb

@@ -0,0 +1 @@
+This is a <%= foreground('#00ff00') { 'test' } %>.

data/test/support/templates/multiple.erb

@@ -0,0 +1,2 @@
+This is a test.
+And so is this.

data/test/support/templates/style.erb

@@ -0,0 +1 @@
+This is a <%= style(:bold) { 'test' } %>.

data/vedeu.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'guard',              '2.12.9'
+  spec.add_development_dependency 'guard',              '2.13.0'
   spec.add_development_dependency 'guard-minitest',     '2.4.4'
   spec.add_development_dependency 'minitest',           '5.7.0'
   spec.add_development_dependency 'minitest-reporters', '1.0.19'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.4.64
+  version: 0.4.65
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.9
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.9
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -439,11 +439,11 @@ files:
 - lib/vedeu/runtime/router.rb
 - lib/vedeu/templating/all.rb
 - lib/vedeu/templating/decoder.rb
-- lib/vedeu/templating/directive.rb
 - lib/vedeu/templating/encoder.rb
 - lib/vedeu/templating/helpers.rb
-- lib/vedeu/templating/post_processor.rb
 - lib/vedeu/templating/template.rb
+- lib/vedeu/templating/view_helpers.rb
+- lib/vedeu/templating/view_template.rb
 - lib/vedeu/terminal.rb
 - lib/vedeu/terminal_mode.rb
 - lib/vedeu/timer.rb
@@ -593,11 +593,11 @@ files:
 - test/lib/vedeu/runtime/main_loop_test.rb
 - test/lib/vedeu/runtime/router_test.rb
 - test/lib/vedeu/templating/decoder_test.rb
-- test/lib/vedeu/templating/directive_test.rb
 - test/lib/vedeu/templating/encoder_test.rb
 - test/lib/vedeu/templating/helpers_test.rb
-- test/lib/vedeu/templating/post_processor_test.rb
 - test/lib/vedeu/templating/template_test.rb
+- test/lib/vedeu/templating/view_helpers_test.rb
+- test/lib/vedeu/templating/view_template_test.rb
 - test/lib/vedeu/terminal_mode_test.rb
 - test/lib/vedeu/terminal_test.rb
 - test/lib/vedeu/timer_test.rb
@@ -607,8 +607,13 @@ files:
 - test/support/coverage.rb
 - test/support/helpers/model_test_class.rb
 - test/support/stats.sh
+- test/support/templates/background.erb
+- test/support/templates/colour.erb
+- test/support/templates/foreground.erb
+- test/support/templates/multiple.erb
 - test/support/templates/plain.erb
 - test/support/templates/simple_stuff.erb
+- test/support/templates/style.erb
 - test/test_helper.rb
 - vedeu.gemspec
 homepage: https://github.com/gavinlaking/vedeu
@@ -780,11 +785,11 @@ test_files:
 - test/lib/vedeu/runtime/main_loop_test.rb
 - test/lib/vedeu/runtime/router_test.rb
 - test/lib/vedeu/templating/decoder_test.rb
-- test/lib/vedeu/templating/directive_test.rb
 - test/lib/vedeu/templating/encoder_test.rb
 - test/lib/vedeu/templating/helpers_test.rb
-- test/lib/vedeu/templating/post_processor_test.rb
 - test/lib/vedeu/templating/template_test.rb
+- test/lib/vedeu/templating/view_helpers_test.rb
+- test/lib/vedeu/templating/view_template_test.rb
 - test/lib/vedeu/terminal_mode_test.rb
 - test/lib/vedeu/terminal_test.rb
 - test/lib/vedeu/timer_test.rb
@@ -794,7 +799,12 @@ test_files:
 - test/support/coverage.rb
 - test/support/helpers/model_test_class.rb
 - test/support/stats.sh
+- test/support/templates/background.erb
+- test/support/templates/colour.erb
+- test/support/templates/foreground.erb
+- test/support/templates/multiple.erb
 - test/support/templates/plain.erb
 - test/support/templates/simple_stuff.erb
+- test/support/templates/style.erb
 - test/test_helper.rb
 has_rdoc: 

data/lib/vedeu/templating/directive.rb

@@ -1,43 +0,0 @@
-module Vedeu
-
-  module Templating
-
-    # Converts a directive found in a template into a Vedeu::Stream object.
-    #
-    class Directive
-
-      include Vedeu::Templating::Helpers
-
-      # @param code [String]
-      # @return [Vedeu::Stream]
-      def self.process(code)
-        new(code).process
-      end
-
-      # Returns a new instance of Vedeu::Templating::Directive.
-      #
-      # @param code [String]
-      # @return [Vedeu::Templating::Directive]
-      def initialize(code)
-        @code = code
-      end
-
-      # Evaluate the code/text in the template; converting any recognised
-      # directives as they are encountered.
-      #
-      # @return [Vedeu::Stream]
-      def process
-        eval(code, proc {}.binding)
-      end
-
-      protected
-
-      # @!attribute [r] code
-      # @return [String]
-      attr_reader :code
-
-    end # Directive
-
-  end # Templating
-
-end # Vedeu

data/lib/vedeu/templating/post_processor.rb

@@ -1,81 +0,0 @@
-module Vedeu
-
-  module Templating
-
-    # Pre-processes a template, to convert all lines and lines with directives
-    # into Vedeu::Streams.
-    #
-    class PostProcessor
-
-      # @param content [String]
-      # @return [Array<Vedeu::Stream>]
-      def self.process(content)
-        new(content).process
-      end
-
-      # Returns a new instance of Vedeu::Templating::PostProcessor.
-      #
-      # @param content [String]
-      # @return [Vedeu::Templating::PostProcessor]
-      def initialize(content)
-        @content = content
-      end
-
-      # @return [Vedeu::Streams]
-      def process
-        lines.each_with_object(Vedeu::Streams.new) do |line, acc|
-          if line =~ markers?
-            acc << Vedeu::Templating::Directive.process(unmark(line))
-
-          else
-            acc << Vedeu::Stream.new(value: line.chomp)
-
-          end
-          acc
-        end
-      end
-
-      protected
-
-      # @!attribute [r] content
-      # @return [String]
-      attr_reader :content
-
-      private
-
-      # @return [Array<String>]
-      def lines
-        content.lines
-      end
-
-      # Return a pattern to remove directive markers and spaces.
-      #
-      # @example
-      #   line containing {{ or }}
-      #
-      # @return [Regexp]
-      def markers
-        /({{\s*|\s*}})/
-      end
-
-      # @example
-      #   line contains {{ or }}
-      #
-      # @return [Regexp]
-      def markers?
-        /^\s*({{)(.*?)(}})$/
-      end
-
-      # Removes the markers and any line returns from the given line.
-      #
-      # @param line [String]
-      # @return [String]
-      def unmark(line)
-        line.gsub(markers, '').chomp
-      end
-
-    end # PostProcessor
-
-  end # Templating
-
-end # Vedeu

data/test/lib/vedeu/templating/directive_test.rb

@@ -1,38 +0,0 @@
-require 'test_helper'
-
-module Vedeu
-
-  module Templating
-
-    describe Directive do
-
-      let(:described) { Vedeu::Templating::Directive }
-      let(:instance)  { described.new(code) }
-      let(:code) {
-        "colour(foreground: '#0f0') { 'Yay!' }"
-      }
-
-      describe '#initialize' do
-        it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@code').must_equal(code) }
-      end
-
-      describe '.process' do
-        it { described.must_respond_to(:process) }
-      end
-
-      describe '#process' do
-        let(:colour)   { Vedeu::Colour.coerce(foreground: '#0f0') }
-        let(:expected) { Vedeu::Stream.new(value: 'Yay!', colour: colour) }
-
-        subject { instance.process }
-
-        it { subject.must_be_instance_of(Vedeu::Stream) }
-        it { subject.must_equal(expected) }
-      end
-
-    end # Directive
-
-  end # Templating
-
-end # Vedeu

data/test/lib/vedeu/templating/post_processor_test.rb

@@ -1,44 +0,0 @@
-require 'test_helper'
-
-module Vedeu
-
-  module Templating
-
-  	describe PostProcessor do
-
-      let(:described) { Vedeu::Templating::PostProcessor }
-      let(:instance)  { described.new(content) }
-      let(:content)   {
-        "Some text here\n" \
-        "{{ colour(foreground: '#0f0') { 'Yay!' } }}\n" \
-        "More text here\n"
-      }
-      let(:expected) {
-        Vedeu::Streams.new([
-          Vedeu::Stream.new(value: 'Some text here'),
-          Vedeu::Stream.new(value: 'Yay!',
-                            colour: Vedeu::Colour.coerce(foreground: '#0f0')),
-          Vedeu::Stream.new(value: 'More text here')
-        ])
-      }
-
-      describe '#initialize' do
-        it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@content').must_equal(content) }
-      end
-
-      describe '.process' do
-        subject { described.process(content) }
-
-        it { subject.must_equal(expected) }
-      end
-
-      describe '#process' do
-        it { instance.must_respond_to(:process) }
-      end
-
-  	end # PostProcessor
-
-  end # Templating
-
-end # Vedeu