vedeu 0.4.54 → 0.4.55

data/lib/vedeu/repositories/repository.rb

@@ -1,4 +1,4 @@
-require 'vedeu/support/common'
+require 'vedeu/common'
 
 module Vedeu
 
@@ -52,14 +52,23 @@ module Vedeu
 
     # Return the named model or a null object if not registered.
     #
+    # @example
+    #   Vedeu.cursors.by_name('some_name') # => Fetch the cursor belonging to
+    #                                           the interface of the same name.
+    #
+    #   Vedeu.groups.by_name(name) # => Fetch the names of the interfaces
+    #                                   belonging to this group.
+    #
     # @param name [String] The name of the stored model.
     # @return [void]
     def by_name(name)
+      name ||= Vedeu.focus
+
       if registered?(name)
         find(name)
 
       else
-        null_model.new(name)
+        null_model.new(name: name)
 
       end
     end

data/lib/vedeu/templating/all.rb

@@ -7,6 +7,7 @@ module Vedeu
 
 end # Vedeu
 
-require_relative 'helpers'
-require_relative 'directive'
-require_relative 'preprocessor'
+require 'vedeu/templating/helpers'
+require 'vedeu/templating/directive'
+require 'vedeu/templating/preprocessor'
+require 'vedeu/templating/template'

data/lib/vedeu/templating/template.rb

@@ -0,0 +1,75 @@
+require 'vedeu/templating/preprocessor'
+
+module Vedeu
+
+  module Templating
+
+    # Generic class to loading a template and parsing it via ERb.
+    #
+    # @api private
+    class Template
+
+      # @param (see Vedeu::Templating::Template#new)
+      # @return [void]
+      def self.parse(object, path, options = {})
+        new(object, path, options).parse
+      end
+
+      # Returns a new instance of Vedeu::Templating::Template.
+      #
+      # @param object [Class]
+      # @param path [String]
+      # @param options [Hash]
+      # @option options name [String] The name of an interface.
+      # @return [Vedeu::Templating::Template]
+      def initialize(object, path, options = {})
+        @object  = object
+        @path    = path.to_s
+        @options = options || {}
+      end
+
+      # @return [void]
+      def parse
+        ERB.new(load, nil, '-').result(binding)
+      end
+
+      protected
+
+      # @!attribute [r] object
+      # @return [Class]
+      attr_reader :object
+
+      # @!attribute [r] options
+      # @return [Hash]
+      attr_reader :options
+
+      private
+
+      # @return [String]
+      def preprocess
+        Vedeu::Templating::Preprocessor.process(load)
+      end
+
+      # @return [String]
+      def load
+        File.read(path)
+      end
+
+      # @raise [MissingRequired] when the path is empty.
+      # @raise [MissingRequired] when the path does not exist.
+      # @return [String]
+      def path
+        fail MissingRequired, 'No path to template specified.' if @path.empty?
+
+        unless File.exist?(@path)
+          fail MissingRequired, "Template file cannot be found. (#{@path})"
+        end
+
+        @path
+      end
+
+    end # Template
+
+  end # Templating
+
+end # Vedeu

data/lib/vedeu/version.rb

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

data/test/lib/vedeu/application/view_test.rb

@@ -13,7 +13,17 @@ module Vedeu
     let(:described) { Vedeu::ViewTestClass }
     let(:instance)  { described.new }
 
-    # @todo
+    describe '#time_now' do
+      let(:_time) { Time.new(2015, 6, 23, 22, 25, 17) }
+
+      before { Time.stubs(:now).returns(_time) }
+
+      subject { instance.time_now }
+
+      it 'returns a formatted time' do
+        subject.must_equal('Tue 23 Jun 22:25')
+      end
+    end
 
   end # View
 

data/test/lib/vedeu/bootstrap_test.rb

@@ -18,11 +18,7 @@ module Vedeu
     end
 
     describe '.start' do
-      it { described.must_respond_to(:start) }
-    end
-
-    describe '#start' do
-      subject { instance.start }
+      subject { described.start(argv, entry_point) }
 
       it {
         Vedeu::Launcher.expects(:execute!)
@@ -30,6 +26,10 @@ module Vedeu
       }
     end
 
+    describe '#start' do
+      it { instance.must_respond_to(:start) }
+    end
+
   end # Bootstrap
 
 end # Vedeu

data/test/lib/vedeu/cli/generator/helpers_test.rb

@@ -134,7 +134,7 @@ module Vedeu
         subject { instance.parse(source) }
 
         it {
-          Vedeu::Template.expects(:parse).with(instance, source)
+          Vedeu::Templating::Template.expects(:parse).with(instance, source)
           subject
         }
       end

data/test/lib/vedeu/{repositories/repositories → cursor}/cursors_test.rb

@@ -30,27 +30,6 @@ module Vedeu
       end
     end
 
-    describe '#by_name' do
-      let(:_name) { 'carbon' }
-
-      subject { described.cursors.by_name(_name) }
-
-      context 'when the cursor exists' do
-        before { Vedeu::Cursor.new(name: _name).store }
-        after { Vedeu.cursors.reset }
-
-        it { subject.must_be_instance_of(Vedeu::Cursor) }
-        it { subject.name.must_equal('carbon') }
-      end
-
-      context 'when the cursor does not exist' do
-        let(:_name) { 'nitrogen' }
-
-        it { subject.must_be_instance_of(Vedeu::Cursor) }
-        it { subject.name.must_equal('nitrogen') }
-      end
-    end
-
   end # Cursors
 
 end # Vedeu

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

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

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

@@ -4,8 +4,17 @@ module Vedeu
 
   module DSL
 
+    class TestUseClass
+
+      include Vedeu::DSL::Use
+
+    end
+
     describe Use do
 
+      let(:described) { Vedeu::DSL::Use }
+      let(:model_instance) { Vedeu::DSL::TestUseClass }
+
       # before do
       #   Vedeu.interfaces.reset
       #   Vedeu.interface('hydrogen') do

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

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+module Vedeu
+
+  describe Groups do
+
+    let(:described) { Vedeu::Groups }
+
+    it { described.must_respond_to(:groups) }
+
+    describe '#by_name' do
+      let(:_name) { 'carbon' }
+
+      subject { described.groups.by_name(_name) }
+
+      it { subject.must_be_instance_of(Vedeu::Group) }
+    end
+
+  end # Groups
+
+end # Vedeu

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

@@ -7,7 +7,12 @@ module Vedeu
     describe Border do
 
       let(:described) { Vedeu::Null::Border }
-      let(:instance)  { described.new(_name) }
+      let(:instance)  { described.new(attributes) }
+      let(:attributes){
+        {
+          name: _name
+        }
+      }
       let(:_name)     { 'null_border' }
       let(:geometry)  {
         Vedeu::Geometry.new(name: _name, x: 4, y: 6, xn: 10, yn: 12)
@@ -17,6 +22,9 @@ module Vedeu
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
+        it {
+          instance.instance_variable_get('@attributes').must_equal(attributes)
+        }
         it { instance.instance_variable_get('@name').must_equal(_name) }
       end
 

data/test/lib/vedeu/null/buffer_test.rb

@@ -7,11 +7,19 @@ module Vedeu
     describe Buffer do
 
       let(:described) { Vedeu::Null::Buffer }
-      let(:instance)  { described.new(_name) }
+      let(:instance)  { described.new(attributes) }
+      let(:attributes){
+        {
+          name: _name
+        }
+      }
       let(:_name)     { 'null_buffer' }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
+        it {
+          instance.instance_variable_get('@attributes').must_equal(attributes)
+        }
         it { instance.instance_variable_get('@name').must_equal(_name) }
       end
 

data/test/lib/vedeu/null/generic_test.rb

@@ -7,7 +7,13 @@ module Vedeu
     describe Generic do
 
       let(:described) { Vedeu::Null::Generic }
-      let(:instance)  { described.new }
+      let(:instance)  { described.new(attributes) }
+      let(:attributes){
+        {
+          name: _name
+        }
+      }
+      let(:_name) { 'null_generic' }
 
       describe 'alias methods' do
         it { instance.must_respond_to(:visible?) }
@@ -15,6 +21,9 @@ module Vedeu
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
+        it {
+          instance.instance_variable_get('@attributes').must_equal(attributes)
+        }
       end
 
       describe '#add' do

data/test/lib/vedeu/null/geometry_test.rb

@@ -7,7 +7,12 @@ module Vedeu
     describe Geometry do
 
       let(:described) { Vedeu::Null::Geometry }
-      let(:instance)  { described.new(_name) }
+      let(:instance)  { described.new(attributes) }
+      let(:attributes){
+        {
+          name: _name
+        }
+      }
       let(:_name)     { 'null_geometry' }
 
       before do
@@ -17,6 +22,9 @@ module Vedeu
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
+        it {
+          instance.instance_variable_get('@attributes').must_equal(attributes)
+        }
         it { instance.instance_variable_get('@name').must_equal(_name) }
       end
 

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

@@ -7,22 +7,25 @@ module Vedeu
     describe Interface do
 
       let(:described) { Vedeu::Null::Interface }
-      let(:instance)  { described.new(_name) }
-      let(:_name)     {}
+      let(:instance)  { described.new(attributes) }
+      let(:attributes){
+        {
+          name: _name
+        }
+      }
+      let(:_name)     { 'null_interface' }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
+        it {
+          instance.instance_variable_get('@attributes').must_equal(attributes)
+        }
         it { instance.instance_variable_get('@name').must_equal(_name) }
       end
 
       describe 'accessors' do
         it { instance.must_respond_to(:name) }
-      end
-
-      describe '#attributes' do
-        subject { instance.attributes }
-
-        it { subject.must_be_instance_of(Hash) }
+        it { instance.must_respond_to(:attributes) }
       end
 
       describe '#hide' do

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

@@ -25,6 +25,8 @@ module Vedeu
       it { subject.must_be_instance_of(String) }
 
       context 'when compression is enabled' do
+        before { Vedeu.configure { compression(true) } }
+
         context 'when the output is all Vedeu::Char elements' do
           let(:output) {
             [
@@ -67,8 +69,51 @@ module Vedeu
       end
 
       context 'when compression is not enabled' do
-        # @todo
-        # it { skip }
+        before { Vedeu.configure { compression(false) } }
+
+        context 'when the output is all Vedeu::Char elements' do
+          let(:output) {
+            [
+              Vedeu::Char.new(value: 'Y', colour: { foreground: '#ff0000' }),
+              Vedeu::Char.new(value: 'e', colour: { foreground: '#ff0000' }),
+              Vedeu::Char.new(value: 's', colour: { foreground: '#ff0000' }),
+            ]
+          }
+          it 'converts the non-Vedeu::Char elements into String elements' do
+            subject.must_equal(
+              "\e[38;2;255;0;0mY\e[38;2;255;0;0me\e[38;2;255;0;0ms"
+            )
+          end
+        end
+
+        context 'when the output is all Vedeu::Char elements' do
+          let(:output) {
+            [
+              Vedeu::Char.new(value: 'a', colour: { foreground: '#ff0000' }),
+              Vedeu::Char.new(value: 'b', colour: { foreground: '#ff0000' }),
+              Vedeu::Char.new(value: 'c', colour: { foreground: '#0000ff' }),
+              Vedeu::Char.new(value: 'd', colour: { foreground: '#0000ff' }),
+            ]
+          }
+          it 'compresses multiple colours and styles where possible' do
+            subject.must_equal(
+              "\e[38;2;255;0;0ma\e[38;2;255;0;0mb\e[38;2;0;0;255mc\e[38;2;0;0;255md"
+            )
+          end
+        end
+
+        context 'when the output is not all Vedeu::Char elements' do
+          let(:output) {
+            [
+              Vedeu::Char.new(value: 'N'),
+              Vedeu::EscapeChar.new("\e[?25l"),
+              Vedeu::Char.new(value: 't'),
+            ]
+          }
+          it 'converts the non-Vedeu::Char elements into String elements' do
+            subject.must_equal("N\e[?25lt")
+          end
+        end
       end
     end