vedeu 0.4.27 → 0.4.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b7a510a12140180d027df9a11090a30a05c9a6
-  data.tar.gz: 22694b40928d66db21201bf4ba5e4db403b25d32
+  metadata.gz: af28147191fb71a62c5dafcafdfc482ba5197f96
+  data.tar.gz: ffba51b895e26f86fb0075b0880ee85dab52a31f
 SHA512:
-  metadata.gz: 3559b8cbb66f263c3ae5ba69057003c076a471b64344356283fee0ea65f1a37517408c9b7efe7f256f79d03ebcf628534c71f7479a8a317a8d8d605438c6cdb7
-  data.tar.gz: 62aa833e9ff4e93306294626b982da0b44bdcfbffe03d9cb77e227440d8c8872a13830a733a7408d5f3b4efb437d0d50e519ba1191463576b9b5db6be5861da6
+  metadata.gz: b710ffa6a3f5b5cb01ba0bc88ec1b5b24d0e4261f14530d39588fc00595dda35cb9318b610636f16e2ac71775af986edc4bc2fa0b622e36551d6843e93b0e0ba
+  data.tar.gz: cfa662925a0f62b56e942ff95ae0f8245cefb7384f27d00146378aa3eabd17c396cc7f565b637d88868c3f214ef96de403b2e37ecb4ed87d970ae66656a14cbc

data/bin/vedeu_drb_server

@@ -26,8 +26,6 @@ class VedeuTestApplication
     # interactive!
     # standalone!
 
-    # trace!
-
     # System keys can be redefined
     # exit_key        'q'
     # focus_next_key  :tab

data/examples/borders_app.rb

@@ -10,6 +10,8 @@ class VedeuBordersApp
 
   include Vedeu
 
+  # Be aware that running an application with debugging enabled will affect
+  # performance.
   configure do
     debug!
     log '/tmp/vedeu_borders_app.log'

data/examples/colours_app.rb

@@ -10,6 +10,8 @@ class VedeuColoursApp
 
   include Vedeu
 
+  # Be aware that running an application with debugging enabled will affect
+  # performance.
   configure do
     debug!
     log '/tmp/vedeu_colours_app.log'

data/examples/drb_app.rb

@@ -8,6 +8,8 @@ require 'vedeu'
 # An example application to demonstrate the DRb server.
 class VedeuTestApplication
 
+  # Be aware that running an application with debugging enabled will affect
+  # performance.
   Vedeu.configure do
     log         '/tmp/vedeu_test_helper.log'
     debug!
@@ -25,8 +27,6 @@ class VedeuTestApplication
     # interactive!
     # standalone!
 
-    # trace!
-
     # System keys can be redefined
     # exit_key        'q'
     # focus_next_key  :tab

data/examples/focus_app.rb

@@ -15,6 +15,8 @@ require 'vedeu'
 # Use 'space' to change focus, 'q' to exit.
 class VedeuFocusApp
 
+  # Be aware that running an application with debugging enabled will affect
+  # performance.
   Vedeu.configure do
     debug!
     log '/tmp/vedeu_focus_app.log'

data/examples/geometry_app.rb

@@ -10,6 +10,8 @@ class VedeuGeometryApp
 
   include Vedeu
 
+  # Be aware that running an application with debugging enabled will affect
+  # performance.
   configure do
     debug!
     log '/tmp/vedeu_geometry_app.log'

data/examples/material_colours_app.rb

@@ -11,6 +11,8 @@ class VedeuMaterialColoursApp
 
   include Vedeu
 
+  # Be aware that running an application with debugging enabled will affect
+  # performance.
   configure do
     debug!
     log '/tmp/vedeu_material_colours_app.log'

data/examples/panel_app.rb

@@ -11,6 +11,8 @@ class VedeuPanelApp
 
   include Vedeu
 
+  # Be aware that running an application with debugging enabled will affect
+  # performance.
   configure do
     debug!
     log '/tmp/vedeu_panel_app.log'

data/examples/view_templates_app/template.erb

@@ -1 +1,8 @@
-Here's a simple example that will be displayed in the main interface of the application.
+Here's a simple example that will be displayed in the main interface of the
+application. It's a multi-line affair, composed of words, punctuation and
+with no doubt, bad grammar. An empty line follows:
+
+Now, this line contains a <%= colours({ fg: '#ff0000', bg: '#000000' }) { 'red' } %> word. Whilst
+this has a <% foreground('#33aa33') do %>green foreground<% end %> or
+<% background('#33aa33') do %>green background<% end %>. There's also a short
+syntax being used <%= fg('#0000ff') { 'here' } %> and <%= bg('#0000ff') { 'here' } %>.

data/examples/view_templates_app/view_templates_app.rb

@@ -43,10 +43,10 @@ class VedeuViewTemplateApp
     colour foreground: '#aadd00', background: '#000000'
   end
   border('prune') do
-    colour foreground: '#aadd00', background: '#000000'
+    colour foreground: '#00aadd', background: '#000000'
   end
   border('wrap') do
-    colour foreground: '#aadd00', background: '#000000'
+    colour foreground: '#dd00aa', background: '#000000'
   end
 
   geometry('prune') do

data/lib/vedeu/all.rb

@@ -26,6 +26,7 @@ require 'vedeu/events/all'
 require 'vedeu/input/all'
 require 'vedeu/output/all'
 require 'vedeu/support/all'
+require 'vedeu/templating/all'
 
 require 'vedeu/main_loop'
 require 'vedeu/application'

data/lib/vedeu/buffers/buffer.rb

@@ -68,6 +68,15 @@ module Vedeu
       true
     end
 
+    # Return a boolean indicating content presence on the buffer type.
+    #
+    # @return [Boolean] Whether the buffer targetted has content.
+    def back?
+      return false if back.nil? || back.content.empty?
+
+      true
+    end
+
     # Returns the front buffer or, if that is empty, the interface cleared.
     #
     # @return [void]
@@ -75,6 +84,24 @@ module Vedeu
       Vedeu::Output.render(clear_buffer)
     end
 
+    # Return a boolean indicating content presence on the buffer type.
+    #
+    # @return [Boolean] Whether the buffer targetted has content.
+    def front?
+      return false if front.nil? || front.content.empty?
+
+      true
+    end
+
+    # Return a boolean indicating content presence on the buffer type.
+    #
+    # @return [Boolean] Whether the buffer targetted has content.
+    def previous?
+      return false if previous.nil? || previous.content.empty?
+
+      true
+    end
+
     # Hide this buffer.
     #
     # @return [void]
@@ -118,12 +145,12 @@ module Vedeu
     #
     # @return [Array<Array<Array<Vedeu::Char>>>]
     def buffer
-      swap if content_for?(:back)
+      swap if back?
 
-      if content_for?(:front)
+      if front?
         [front.render]
 
-      elsif content_for?(:previous)
+      elsif previous?
         [previous.render]
 
       else
@@ -165,17 +192,6 @@ module Vedeu
       true
     end
 
-    # Return a boolean indicating content presence on the buffer type.
-    #
-    # @param buffer [Symbol] One of; :back, :front or :previous.
-    # @return [Boolean] Whether the buffer targetted has content.
-    def content_for?(buffer)
-      return false if public_send(buffer).nil? ||
-                      public_send(buffer).content.empty?
-
-      true
-    end
-
     # Retrieve the interface by name.
     #
     # @return [Vedeu::Interface]
@@ -185,7 +201,7 @@ module Vedeu
 
     # @return [Vedeu::Interface]
     def view
-      if content_for?(:front)
+      if front?
         front
 
       else

data/lib/vedeu/configuration/api.rb

@@ -181,8 +181,11 @@ module Vedeu
 
       # Sets boolean to enable/disable debugging. Vedeu's default setting is
       # for debugging to be disabled. Using `debug!` or setting `debug` to true
-      # will enable debugging. If `trace!` is used, or `trace` is set to true,
-      # debugging will be enabled, overriding any setting here.
+      # will enable debugging.
+      #
+      # @note
+      #   Be aware that running an application with debugging enabled will
+      #   affect performance.
       #
       # @example
       #   Vedeu.configure do
@@ -196,37 +199,10 @@ module Vedeu
       # @param value [Boolean]
       # @return [Boolean]
       def debug!(value = true)
-        if options.key?(:trace) && options[:trace] != false
-          options[:debug] = true
-
-        else
-          options[:debug] = value
-
-        end
+        options[:debug] = value
       end
       alias_method :debug, :debug!
 
-      # Sets boolean to enable/disable tracing. Vedeu's default setting is for
-      # tracing to be disabled. Using `trace!` or setting `trace` to true will
-      # enable tracing and debugging.
-      #
-      # @example
-      #   Vedeu.configure do
-      #     trace!
-      #     ...
-      #
-      #   Vedeu.configure do
-      #     trace false
-      #     ...
-      #
-      # @param value [Boolean]
-      # @return [Boolean]
-      def trace!(value = true)
-        options[:debug] = true if value
-        options[:trace] = value
-      end
-      alias_method :trace, :trace!
-
       # Sets the colour mode of the terminal.
       #
       # @example

data/lib/vedeu/configuration/cli.rb

@@ -75,7 +75,6 @@ module Vedeu
           :run_many,
           :run_once,
           :standalone,
-          :trace,
         ]
       end
 
@@ -202,15 +201,6 @@ module Vedeu
         end
       end
 
-      # @return [OptionParser]
-      def trace
-        parser.on('-D', '--trace', 'Run application with debugging on with ' \
-                                   'method and event tracing (noisy!).') do
-          options[:debug] = true
-          options[:trace] = true
-        end
-      end
-
     end # CLI
 
   end # Config

data/lib/vedeu/configuration/configuration.rb

@@ -178,16 +178,6 @@ module Vedeu
         instance.options[:terminal_mode]
       end
 
-      # Returns whether tracing is enabled or disabled. Tracing is very noisy in
-      # the log file (logging method calls and events trigger). Default is
-      # false; meaning tracing is disabled.
-      #
-      # @return [Boolean]
-      def trace?
-        instance.options[:trace]
-      end
-      alias_method :trace, :trace?
-
       # Vedeu's default system keys. Use {Vedeu::Configuration.system_keys}.
       #
       # @return [Hash]
@@ -275,7 +265,6 @@ module Vedeu
         stderr:        nil,
         system_keys:   Vedeu::Configuration.default_system_keys,
         terminal_mode: :raw,
-        trace:         false,
       }
     end
 

data/lib/vedeu/distributed/templates/default_configuration.vedeu

@@ -16,8 +16,6 @@ Vedeu.configure do
   # interactive!
   # standalone!
 
-  # trace!
-
   # System keys can be redefined
   # exit_key        'q'
   # focus_next_key  :tab

data/lib/vedeu/dsl/composition.rb

@@ -71,6 +71,15 @@ module Vedeu
         model.add(new_model)
       end
 
+      # def content_for(name, filename, object = nil, options = {})
+      #   lines = Vedeu::Template.parse(object, filename)
+
+      #   _model = model.member.build(new_attributes(name).
+      #              merge!({ lines: lines }))
+
+      #   model.add(_model)
+      # end
+
       protected
 
       # @!attribute [r] client

data/lib/vedeu/models/char.rb

@@ -84,13 +84,7 @@ module Vedeu
     # @param value [Vedeu::Position]
     # @return [Vedeu::Position]
     def position=(value)
-      if value.is_a?(Vedeu::Position)
-        @position = @attributes[:position] = value
-
-      else
-        @position = @attributes[:position] = Vedeu::Position.coerce(value)
-
-      end
+      @position = @attributes[:position] = Vedeu::Position.coerce(value)
     end
 
     # @return [String]

data/lib/vedeu/models/line.rb

@@ -51,7 +51,7 @@ module Vedeu
     def chars
       return [] if empty?
 
-      streams.flat_map(&:chars)
+      @chars ||= streams.flat_map(&:chars)
     end
 
     # Returns a boolean indicating whether the line has content.

data/lib/vedeu/models/stream.rb

@@ -71,6 +71,16 @@ module Vedeu
       value.empty?
     end
 
+    # An object is equal when its values are the same.
+    #
+    # @param other [Vedeu::Char]
+    # @return [Boolean]
+    def eql?(other)
+      self.class == other.class && value == other.value &&
+        colour == other.colour && style == other.style && parent == other.parent
+    end
+    alias_method :==, :eql?
+
     # @return [NilClass|String]
     def name
       parent.name if parent

data/lib/vedeu/output/border.rb

@@ -159,13 +159,15 @@ module Vedeu
       return [] unless visible?
       return [] unless enabled?
 
-      out = [top, bottom]
+      Vedeu::Timer.for(:timer, "Rendering border: #{name}") do
+        out = [top, bottom]
 
-      height.times do |y|
-        out << [left(y), right(y)]
-      end
+        height.times do |y|
+          out << [left(y), right(y)]
+        end
 
-      out.flatten
+        out.flatten
+      end
     end
 
     # @return [String]

data/lib/vedeu/output/clear.rb

@@ -58,7 +58,7 @@ module Vedeu
     # @return [Array<Array<Vedeu::Char>>]
     def clear
       if visible?
-        Vedeu::Timer.for(:debug, "Clearing: #{name}") do
+        Vedeu::Timer.for(:timer, "Clearing: #{name}") do
           y, x = *position
 
           @clear ||= Array.new(height) do |iy|

data/lib/vedeu/output/compressor.rb

@@ -17,7 +17,7 @@ module Vedeu
     # @return [String]
     def render
       Array(output).flatten.map do |char|
-        out =  ''
+        out = ''
         out << char.position.to_s
         out << colour_for(char)
         out << style_for(char)

data/lib/vedeu/output/refresh.rb

@@ -12,7 +12,7 @@ module Vedeu
     def all
       message = 'Refreshing all interfaces'
 
-      Vedeu::Timer.for(:info, message) do
+      Vedeu::Timer.for(:timer, message) do
         Vedeu.interfaces.zindexed.each { |model| by_name(model.name) }
       end
     end
@@ -32,14 +32,10 @@ module Vedeu
     def by_group(group_name)
       message = "Refreshing group: '#{group_name}'"
 
-      Vedeu::Timer.for(:info, message) do
-        Vedeu.groups.find!(group_name).members.each do |name|
+      Vedeu::Timer.for(:timer, message) do
+        Vedeu.groups.find!(group_name).members.each { |name|
           Vedeu.interfaces.by_name(name)
-        end.sort do |a, b|
-          a.zindex <=> b.zindex
-        end.each do |name|
-          by_name(name)
-        end
+        }.sort { |a, b| a.zindex <=> b.zindex }.each { |name| by_name(name) }
       end
     end
 
@@ -51,7 +47,7 @@ module Vedeu
     def by_name(name)
       message = "Refreshing interface: '#{name}'"
 
-      Vedeu::Timer.for(:info, message) { Vedeu.buffers.by_name(name).render }
+      Vedeu::Timer.for(:timer, message) { Vedeu.buffers.by_name(name).render }
     end
 
   end # Refresh

data/lib/vedeu/output/renderers/terminal.rb

@@ -35,7 +35,7 @@ module Vedeu
 
       # @return [String]
       def parsed
-        Vedeu::Timer.for(:debug, 'Compression') do
+        Vedeu::Timer.for(:timer, 'Compression') do
           Vedeu::Compressor.new(output).render
         end
       end

data/lib/vedeu/output/viewport.rb

@@ -52,11 +52,11 @@ module Vedeu
     def render
       return [] unless visible?
 
-      Vedeu::Timer.for(:output, "Rendering: #{name}") do
+      Vedeu::Timer.for(:timer, "Rendering: #{name}") do
         out = []
 
-        show[0...height].each_with_index do |line, iy|
-          line[0...width].each_with_index do |column, ix|
+        show.each_with_index do |line, iy|
+          line.each_with_index do |column, ix|
             column.position = Vedeu::Position[by + iy, bx + ix]
             out << column
           end
@@ -106,7 +106,7 @@ module Vedeu
     #
     # @return [Range]
     def rows
-      top..(top + (geometry.height - 1))
+      top...(top + height)
     end
 
     # Using the current cursor's x position, return a range of visible columns.
@@ -119,7 +119,7 @@ module Vedeu
     #
     # @return [Range]
     def columns
-      left..(left + (geometry.width - 1))
+      left...(left + width)
     end
 
     # @return [Fixnum]
@@ -163,13 +163,6 @@ module Vedeu
       @cursor ||= Vedeu.cursors.by_name(name)
     end
 
-    # Return the geometry associated with the interface we are drawing.
-    #
-    # @return (see Vedeu::Geometries#by_name)
-    def geometry
-      @geometry || Vedeu.geometries.by_name(name)
-    end
-
   end # Viewport
 
 end # Vedeu

data/lib/vedeu/support/log.rb

@@ -156,6 +156,7 @@ module Vedeu
           output: [:light_green,   :green],
           store:  [:light_cyan,    :cyan],
           test:   [:light_white,   :white],
+          timer:  [:light_yellow,  :yellow],
           update: [:light_cyan,    :cyan],
         }
       end

data/lib/vedeu/support/template.rb

@@ -3,21 +3,23 @@ module Vedeu
   # Generic class to loading a template and parsing it via ERb.
   class Template
 
-    # @param object [Class]
-    # @param path [String]
+    # @param see Vedeu::Template#new
     # @return [void]
-    def self.parse(object, path)
-      new(object, path).parse
+    def self.parse(object, path, options = {})
+      new(object, path, options).parse
     end
 
     # Returns a new instance of Vedeu::Template.
     #
     # @param object [Class]
     # @param path [String]
+    # @param options [Hash]
+    # @option options name [String] The name of an interface.
     # @return [Template]
-    def initialize(object, path)
-      @object = object
-      @path   = path.to_s
+    def initialize(object, path, options = {})
+      @object  = object
+      @path    = path.to_s
+      @options = options
     end
 
     # @return [void]
@@ -31,6 +33,10 @@ module Vedeu
     # @return [Class]
     attr_reader :object
 
+    # @!attribute [r] options
+    # @return [Hash]
+    attr_reader :options
+
     private
 
     # @return [String]

data/lib/vedeu/templating/all.rb

@@ -0,0 +1,3 @@
+require_relative 'helpers'
+require_relative 'directive'
+require_relative 'preprocessor'

data/lib/vedeu/templating/directive.rb

@@ -0,0 +1,43 @@
+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
+
+      # @param code [String]
+      def initialize(code)
+        @code = code
+      end
+
+      # @return [Vedeu::Stream]
+      def process
+        eval(code, proc.binding)
+      end
+
+      protected
+
+      # @!attribute [r] code
+      # @return [String]
+      attr_reader :code
+
+      private
+
+      # @return [Proc]
+      def proc
+        @proc ||= Proc.new {}
+      end
+
+    end # Directive
+
+  end # Templating
+
+end # Vedeu

data/lib/vedeu/templating/helpers.rb

@@ -0,0 +1,63 @@
+module Vedeu
+
+  module Templating
+
+    module Helpers
+
+      # @param value [String] The HTML/CSS colour.
+      # @param block [Proc]
+      # @return [Vedeu::Stream]
+      # @raise [InvalidSyntax] The required block was not given.
+      def background(value, &block)
+        define_stream({ background: value }, &block)
+      end
+      alias_method :bg, :background
+
+      # @param attributes [Hash]
+      # @option attributes foreground [String] The HTML/CSS foreground colour.
+      # @option attributes background [String] The HTML/CSS background colour.
+      # @param block [Proc]
+      # @return [Vedeu::Stream]
+      # @raise [InvalidSyntax] The required block was not given.
+      def colour(attributes = {}, &block)
+        define_stream(attributes, &block)
+      end
+
+      # @example
+      #   Roses are {{ foreground('#ff0000', 'red') }},
+      #   violets are {{ fg('#0000ff', 'blue') }}
+      #   {{ foreground('#00ff00'), 'The test suite is all green!' }}
+      #
+      # @param value [String] The HTML/CSS colour.
+      # @param block [Proc]
+      # @return [Vedeu::Stream]
+      # @raise [InvalidSyntax] The required block was not given.
+      def foreground(value, &block)
+        define_stream({ foreground: value }, &block)
+      end
+      alias_method :fg, :foreground
+
+      private
+
+      # @param see Vedeu::Templating::Helpers#colours
+      def define_colour(attributes = {})
+        attributes.delete_if do |k, v|
+          [:background, :foreground].include?(k) == false || v.nil? || v.empty?
+        end
+
+        Vedeu::Colour.new(attributes)
+      end
+
+      # @param see Vedeu::Templating::Helpers#colours
+      def define_stream(attributes = {}, &block)
+        fail InvalidSyntax, 'block not given' unless block_given?
+
+        Vedeu::Stream.build(colour: define_colour(attributes),
+                            value:  block.call)
+      end
+
+    end # Helpers
+
+  end # Templating
+
+end # Vedeu

data/lib/vedeu/templating/preprocessor.rb

@@ -0,0 +1,72 @@
+module Vedeu
+
+  module Templating
+
+    # preprocess
+    #   takes a line at a time
+    #   splits line into component parts e.g. text1, ruby, text1
+    #     takes text1, adds to JSON stream
+    #     processes ruby, adding to a new JSON stream
+    #     takes text2, adds to a JSON stream
+    #
+    # process
+    #   converts JSON streams into line/stream objects with correct attributes
+
+    # Pre-processes a template, to convert all lines and lines with directives
+    # into Vedeu::Streams.
+    class Preprocessor
+
+      # @param lines [Array<String>]
+      def self.process(lines)
+        new(lines).process
+      end
+
+      # @param lines [Array<String>]
+      def initialize(lines)
+        @lines = lines
+      end
+
+      # @return [Array<Vedeu::Stream>]
+      def process
+        lines.each_with_object([]) do |line, acc|
+          if line =~ markers?
+            code = line.gsub(markers, '').chomp
+
+            acc << Directive.process(code)
+
+          else
+            acc << Vedeu::Stream.new(value: line.chomp)
+
+          end
+          acc
+        end
+      end
+
+      protected
+
+      # @!attribute [r] lines
+      # @return [Array<String>]
+      attr_reader :lines
+
+      private
+
+      # Return a pattern to remove directive markers and spaces.
+      #
+      # @return [Regexp]
+      def markers
+        /({{\s*|\s*}})/
+      end
+
+      # @example
+      #   line contains {{ or }}
+      #
+      # @return [Regexp]
+      def markers?
+        /^\s*({{)(.*?)(}})$/
+      end
+
+    end # Preprocessor
+
+  end # Templating
+
+end # Vedeu

data/test/lib/vedeu/configuration/api_test.rb

@@ -20,7 +20,6 @@ module Vedeu
         it { instance.must_respond_to(:cooked) }
         it { instance.must_respond_to(:raw) }
         it { instance.must_respond_to(:debug) }
-        it { instance.must_respond_to(:trace) }
       end
 
       describe '.configure' do
@@ -177,60 +176,6 @@ module Vedeu
           configuration = Vedeu.configure { debug(false) }
           configuration.debug.must_equal(false)
         end
-
-        it 'sets the option to the desired value' do
-          configuration = Vedeu.configure { trace(true) }
-          configuration.debug.must_equal(true)
-        end
-
-        it 'sets the option to the desired value' do
-          configuration = Vedeu.configure do
-            debug(false)
-            trace(true)
-          end
-
-          configuration.debug.must_equal(true)
-        end
-
-        it 'sets the option to the desired value' do
-          configuration = Vedeu.configure do
-            debug(true)
-            trace(false)
-          end
-
-          configuration.debug.must_equal(true)
-        end
-
-        it 'sets the option to the desired value' do
-          configuration = Vedeu.configure do
-            debug(false)
-            trace(false)
-          end
-
-          configuration.debug.must_equal(false)
-        end
-      end
-
-      describe '#trace!' do
-        it 'sets the option to the desired value' do
-          configuration = Vedeu.configure { trace! }
-
-          configuration.trace.must_equal(true)
-        end
-
-        it 'sets the option to the desired value' do
-          configuration = Vedeu.configure { trace(false) }
-
-          configuration.trace.must_equal(false)
-          configuration.debug.must_equal(false)
-        end
-
-        it 'sets the option to the desired value' do
-          configuration = Vedeu.configure { trace(true) }
-
-          configuration.trace.must_equal(true)
-          configuration.debug.must_equal(true)
-        end
       end
 
       describe '#colour_mode' do

data/test/lib/vedeu/configuration/cli_test.rb

@@ -131,13 +131,6 @@ module Vedeu
         end
       end
 
-      describe '#trace?' do
-        it '--trace' do
-          Configuration.configure(['--trace'])
-          Configuration.trace?.must_equal(true)
-        end
-      end
-
     end # CLI
 
   end # Config

data/test/lib/vedeu/configuration/configuration_test.rb

@@ -14,7 +14,6 @@ module Vedeu
       it { described.must_respond_to(:drb) }
       it { described.must_respond_to(:interactive) }
       it { described.must_respond_to(:once) }
-      it { described.must_respond_to(:trace) }
     end
 
     describe '.default_system_keys' do
@@ -74,12 +73,6 @@ module Vedeu
       end
     end
 
-    describe '#trace?' do
-      it 'returns the value of the trace option' do
-        Configuration.trace?.must_equal(false)
-      end
-    end
-
     describe '.configure' do
       it 'returns the options configured' do
         Configuration.configure do

data/test/lib/vedeu/geometry/coordinate_test.rb

@@ -12,22 +12,18 @@ module Vedeu
     let(:x)         { 7 }
     let(:y)         { 5 }
 
-    let(:borders)   { mock('Vedeu::Borders') }
-    let(:border)    {
-      Vedeu::Border.new({
-        name: _name,
-        enabled: true
-      })
-    }
-
     before do
-      Vedeu::Geometry.new({name: _name,
-        height: height,
-        width: width,
-        x: x,
-        y: y}).store
-      Vedeu.stubs(:borders).returns(borders)
-      borders.stubs(:by_name).returns(border)
+      Vedeu::Border.new(name: _name,
+                        enabled: true).store
+      Vedeu::Geometry.new(name: _name,
+                          height: height,
+                          width: width,
+                          x: x,
+                          y: y).store
+    end
+    after do
+      Vedeu.borders.reset
+      Vedeu.geometries.reset
     end
 
     describe '#initialize' do

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

@@ -76,6 +76,20 @@ module Vedeu
       end
     end
 
+    describe '#eql?' do
+      let(:other) { described.new(attributes) }
+
+      subject { instance.eql?(other) }
+
+      it { subject.must_equal(true) }
+
+      context 'when different to other' do
+        let(:other) { described.new(colour: Colour.coerce({ background: '#ff0000' })) }
+
+        it { subject.must_equal(false) }
+      end
+    end
+
     describe '#name' do
       subject { instance.name }
 

data/test/lib/vedeu/support/timer_test.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+
+module Vedeu
+
+  describe Timer do
+
+    let(:described) { Vedeu::Timer }
+    let(:instance)  { described.new(type, _message) }
+    let(:type)      { :debug }
+    let(:_message)  { 'Testing' }
+    let(:_time)     { mock('Time') }
+    let(:started)   { 1434492219.5238185 }
+
+    before do
+      Time.stubs(:now).returns(_time)
+      _time.stubs(:to_f).returns(started)
+    end
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(described) }
+      it { instance.instance_variable_get('@type').must_equal(type) }
+      it { instance.instance_variable_get('@message').must_equal(_message) }
+      it { instance.instance_variable_get('@started').must_equal(started) }
+    end
+
+    describe '.for' do
+      it { described.must_respond_to(:for) }
+    end
+
+    describe '#measure' do
+      subject { instance.measure { } }
+
+      it {
+        Vedeu.expects(:log).with(type: :debug,
+                                 message: "Testing took 0ms.")
+        subject
+      }
+    end
+
+  end # Timer
+
+end # Vedeu

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

@@ -0,0 +1,38 @@
+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/helpers_test.rb

@@ -0,0 +1,97 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Templating
+
+    class HelpersTestClass
+
+      include Vedeu::Templating::Helpers
+
+    end
+
+    describe Helpers do
+
+      let(:described) { Vedeu::Templating::Helpers }
+      let(:instance)  { Vedeu::Templating::HelpersTestClass.new }
+
+      describe '#background' do
+        let(:expected) {
+          Vedeu::Stream.new(value: 'background text',
+                            colour: Vedeu::Colour.coerce(background: '#000000'))
+        }
+
+        subject { instance.background('#000000') { 'background text' } }
+
+        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(Vedeu::Stream) }
+        end
+
+        context 'with a background attribute' do
+          let(:attributes) {
+            {
+              background: '#002200'
+            }
+          }
+          let(:expected) {
+            Vedeu::Stream.new(value: 'colour text',
+                              colour: Vedeu::Colour.coerce(attributes))
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'with a foreground attribute' do
+          let(:attributes) {
+            {
+              foreground: '#ff0000'
+            }
+          }
+          let(:expected) {
+            Vedeu::Stream.new(value: 'colour text',
+                              colour: Vedeu::Colour.coerce(attributes))
+          }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'with both attributes' do
+          let(:attributes) {
+            {
+              background: '#000022',
+              foreground: '#ff7700',
+            }
+          }
+          let(:expected) {
+            Vedeu::Stream.new(value: 'colour text',
+                              colour: Vedeu::Colour.coerce(attributes))
+          }
+
+          it { subject.must_equal(expected) }
+        end
+      end
+
+      describe '#foreground' do
+        let(:expected) {
+          Vedeu::Stream.new(value: 'foreground text',
+                            colour: Vedeu::Colour.coerce(foreground: '#000000'))
+        }
+
+        subject { instance.foreground('#000000') { 'foreground text' } }
+
+        it { subject.must_equal(expected) }
+      end
+
+    end # Helpers
+
+  end # Templating
+
+end # Vedeu

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

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Templating
+
+    describe Preprocessor do
+
+      let(:described) { Vedeu::Templating::Preprocessor }
+      let(:instance)  { described.new(lines) }
+      let(:lines)     {
+        [
+          "Some text here\n",
+          "{{ colour(foreground: '#0f0') { 'Yay!' } }}\n",
+          "More text here\n"
+        ]
+      }
+
+      describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@lines').must_equal(lines) }
+      end
+
+      describe '.process' do
+        it { described.must_respond_to(:process) }
+      end
+
+      describe '#process' do
+        let(:expected) {
+          [
+            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')
+          ]
+        }
+
+        subject { instance.process }
+
+        it { subject.must_equal(expected) }
+      end
+
+    end # Preprocessor
+
+  end # Templating
+
+end # Vedeu

data/test/support/templates/simple_stuff.erb

@@ -0,0 +1,6 @@
+Some text here {{ colour(background: '#ff0', foreground: '#000') { 'with colour' } }}, then more text, cool.
+Here's the next line. All ready for parsing...
+
+{{ colour(foreground: '#0f0') { 'Yay!' } }}
+
+That was fun!

data/vedeu.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'vedeu'
-  spec.version       = '0.4.27'
+  spec.version       = '0.4.28'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = 'A terminal case of wonderland.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.4.27
+  version: 0.4.28
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -434,6 +434,10 @@ files:
 - lib/vedeu/support/terminal.rb
 - lib/vedeu/support/timer.rb
 - lib/vedeu/support/visibility.rb
+- lib/vedeu/templating/all.rb
+- lib/vedeu/templating/directive.rb
+- lib/vedeu/templating/helpers.rb
+- lib/vedeu/templating/preprocessor.rb
 - lib/vedeu/traps.rb
 - logs/.gitkeep
 - test/lib/vedeu/api_test.rb
@@ -551,12 +555,17 @@ files:
 - test/lib/vedeu/support/options_test.rb
 - test/lib/vedeu/support/template_test.rb
 - test/lib/vedeu/support/terminal_test.rb
+- test/lib/vedeu/support/timer_test.rb
 - test/lib/vedeu/support/visibility_test.rb
+- test/lib/vedeu/templating/directive_test.rb
+- test/lib/vedeu/templating/helpers_test.rb
+- test/lib/vedeu/templating/preprocessor_test.rb
 - test/lib/vedeu/traps_test.rb
 - test/lib/vedeu_test.rb
 - test/support/colour_test.sh
 - test/support/helpers/model_test_class.rb
 - test/support/stats.sh
+- test/support/templates/simple_stuff.erb
 - test/test_helper.rb
 - vedeu.gemspec
 homepage: https://github.com/gavinlaking/vedeu
@@ -701,11 +710,16 @@ test_files:
 - test/lib/vedeu/support/options_test.rb
 - test/lib/vedeu/support/template_test.rb
 - test/lib/vedeu/support/terminal_test.rb
+- test/lib/vedeu/support/timer_test.rb
 - test/lib/vedeu/support/visibility_test.rb
+- test/lib/vedeu/templating/directive_test.rb
+- test/lib/vedeu/templating/helpers_test.rb
+- test/lib/vedeu/templating/preprocessor_test.rb
 - test/lib/vedeu/traps_test.rb
 - test/lib/vedeu_test.rb
 - test/support/colour_test.sh
 - test/support/helpers/model_test_class.rb
 - test/support/stats.sh
+- test/support/templates/simple_stuff.erb
 - test/test_helper.rb
 has_rdoc: