vedeu 0.5.0 → 0.5.1

data/lib/vedeu/templating/decoder.rb

@@ -2,7 +2,7 @@ module Vedeu
 
   module Templating
 
-    # Converts an encoded string back into an object or objects.
+    # Converts an encoded string back into an object or collection of objects.
     #
     class Decoder
 
@@ -20,6 +20,8 @@ module Vedeu
         @data = data
       end
 
+      # Converts an encoded string back into an object or collection of objects.
+      #
       # @return [Object]
       def process
         demarshal
@@ -55,7 +57,7 @@ module Vedeu
         Base64.strict_decode64(unwrap)
       end
 
-      # Removes '{{' and '}}' from the start and end of the data.
+      # Removes delimiters from the start and end of the data.
       #
       # @return [String]
       def unwrap

data/lib/vedeu/templating/encoder.rb

@@ -2,7 +2,7 @@ module Vedeu
 
   module Templating
 
-    # Converts an object or objects into an encoded string.
+    # Converts an object or collection of objects into an encoded String.
     #
     class Encoder
 
@@ -20,6 +20,8 @@ module Vedeu
         @data = data
       end
 
+      # Converts an object or collection of objects into an encoded String.
+      #
       # @return [String]
       def process
         wrap
@@ -33,7 +35,7 @@ module Vedeu
 
       private
 
-      # Adds '{{' and '}}' to the start and end of the data.
+      # Adds delimiters to the start and end of the data.
       #
       # @return [String]
       def wrap

data/lib/vedeu/templating/view_template.rb

@@ -23,7 +23,9 @@ module Vedeu
                              Vedeu::Templating::Decoder.process(stream)
 
                            else
-                             Vedeu::Stream.new(value: stream)
+                             Vedeu::Stream.new(colour: default_colour,
+                                               style:  default_style,
+                                               value:  stream)
 
                            end
           end
@@ -46,10 +48,41 @@ module Vedeu
 
       private
 
+      # @return [Vedeu::Colour|Hash<Symbol => Symbol>]
+      def default_colour
+        if interface?
+          interface.colour
+
+        else
+          {
+            background: :default,
+            foreground: :default,
+          }
+
+        end
+      end
+
+      # @return [Symbol]
+      def default_style
+        if interface?
+          interface.style
+
+        else
+          :normal
+
+        end
+      end
+
+      # @return [Vedeu::Interface]
+      def interface
+        Vedeu.interfaces.by_name(options[:name]) if options[:name]
+      end
+      alias_method :interface?, :interface
+
       # @param line [String]
       # @return [Array<String>]
       def streams_for(line)
-        line.split(/({{.*}})/)
+        line.split(/({{\s*[^}]+\s*}})/)
       end
 
       # @return [Array<String>]

data/lib/vedeu/version.rb

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

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

@@ -9,7 +9,7 @@ module Vedeu
     let(:object)    {}
 
     describe '#initialize' do
-      it { instance.must_be_instance_of(Vedeu::ApplicationView) }
+      it { instance.must_be_instance_of(described) }
       it { instance.instance_variable_get('@object').must_equal(object) }
     end
 

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

@@ -34,6 +34,8 @@ module Vedeu
             with(:some_controller, 'Vedeu::ControllerTestKlass')
           subject
         }
+
+        it { subject.must_be_instance_of(Hash) }
       end
 
       describe '.action' do
@@ -46,6 +48,8 @@ module Vedeu
             with(:some_controller, :other_action)
           subject
         }
+
+        it { subject.must_be_instance_of(Array) }
       end
 
     end # ClassMethods

data/test/lib/vedeu/bindings_test.rb

@@ -38,6 +38,8 @@ module Vedeu
         Vedeu::Bindings::System.expects(:setup!)
         subject
       }
+
+      it { subject.must_equal(true) }
     end
 
 	end # Bindings

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

@@ -113,18 +113,13 @@ module Vedeu
       let(:bottom)  { false }
       let(:left)    { false }
       let(:right)   { false }
+      let(:geometry) {
+        Vedeu::Geometry.new(name: 'Border#bxbxnbybyn', x: 2, xn: 6, y: 2, yn: 6)
+      }
 
-      before do
-        Vedeu.interface('Border#bxbxnbybyn') do
-          geometry do
-            x      2
-            xn     6
-            y      2
-            yn     6
-          end
-        end
-      end
-      after { Vedeu.interfaces.reset }
+      before {
+        Vedeu.geometries.stubs(:by_name).returns(geometry)
+      }
 
       describe '#bx' do
         subject { instance.bx }
@@ -216,14 +211,12 @@ module Vedeu
     end
 
     describe '#width' do
-      before do
-        Vedeu.interface 'borders' do
-          geometry do
-            width 8
-          end
-        end
-      end
-      after { Vedeu.interfaces.reset }
+      let(:geometry) {
+        Vedeu::Geometry.new(name: 'borders', width: 8)
+      }
+      before {
+        Vedeu.geometries.stubs(:by_name).returns(geometry)
+      }
 
       subject { instance.width }
 
@@ -273,14 +266,12 @@ module Vedeu
     end
 
     describe '#height' do
-      before do
-        Vedeu.interface 'borders' do
-          geometry do
-            height 5
-          end
-        end
-      end
-      after { Vedeu.interfaces.reset }
+      let(:geometry) {
+        Vedeu::Geometry.new(name: 'borders', height: 5)
+      }
+      before {
+        Vedeu.geometries.stubs(:by_name).returns(geometry)
+      }
 
       subject { instance.height }
 
@@ -441,19 +432,16 @@ module Vedeu
       let(:left)    { false }
       let(:right)   { false }
       let(:visibility) { true }
-
-      before do
-        Vedeu.interface('Border#render') do
-          geometry do
-            x      1
-            xn     4
-            y      1
-            yn     4
-          end
-          visible(visibility)
-        end
-      end
-      after { Vedeu.interfaces.reset }
+      let(:geometry) {
+        Vedeu::Geometry.new(name: 'Border#render', x: 1, xn: 4, y: 1, yn: 4)
+      }
+      let(:interface) {
+        Vedeu::Interface.new(visible: visibility)
+      }
+      before {
+        Vedeu.interfaces.stubs(:by_name).returns(interface)
+        Vedeu.geometries.stubs(:by_name).returns(geometry)
+      }
 
       subject { instance.render }
 

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

@@ -6,8 +6,6 @@ module Vedeu
 
     let(:described) { Vedeu::Borders }
 
-    after { Vedeu.borders.reset! }
-
     it { described.must_respond_to(:borders) }
 
   end # Borders

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

@@ -6,10 +6,7 @@ module Vedeu
 
     let(:described)   { Vedeu::RenderBorder }
     let(:instance)    { described.new(border) }
-    let(:border)      {
-      Vedeu::Border.new(enabled: enabled,
-                        name: _name).store
-    }
+    let(:border)      { Vedeu::Border.new(enabled: enabled, name: _name) }
     let(:visible)     { false }
     let(:enabled)     { false }
     let(:_name)       { 'Vedeu::RenderBorder' }
@@ -22,15 +19,16 @@ module Vedeu
     end
 
     describe '#render' do
-      before do
-        Vedeu::Geometry.new(name: _name, x: 1, xn: 3, y: 1, yn: 3).store
-        Vedeu::Interface.new(name: _name, visible: visible).store
-      end
-      after do
-        Vedeu.geometries.reset!
-        Vedeu.interfaces.reset!
-        Vedeu.borders.reset!
-      end
+      let(:geometry) {
+        Vedeu::Geometry.new(name: _name, x: 1, xn: 3, y: 1, yn: 3)
+      }
+      let(:interface) {
+        Vedeu::Interface.new(name: _name, visible: visible)
+      }
+      before {
+        Vedeu.geometries.stubs(:by_name).returns(geometry)
+        Vedeu.interfaces.stubs(:by_name).returns(interface)
+      }
 
       subject { instance.render }
 

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

@@ -20,11 +20,6 @@ module Vedeu
     let(:previous)  {}
     let(:interface) {}
 
-    before do
-      Vedeu.stubs(:trigger)
-    end
-    after { Vedeu.interfaces.reset }
-
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
       it { instance.instance_variable_get('@name').must_equal(_name) }
@@ -62,6 +57,9 @@ module Vedeu
         end
       }
 
+      before { Vedeu.stubs(:trigger) }
+      after { Vedeu.interfaces.reset }
+
       subject { instance.add(content) }
 
       it { subject.must_equal(true) }
@@ -76,6 +74,9 @@ module Vedeu
     end
 
     describe '#back?' do
+      before { Vedeu.stubs(:trigger) }
+      after { Vedeu.interfaces.reset }
+
       subject { instance.back? }
 
       context 'with content' do
@@ -96,6 +97,9 @@ module Vedeu
     end
 
     describe '#front?' do
+      before { Vedeu.stubs(:trigger) }
+      after { Vedeu.interfaces.reset }
+
       subject { instance.front? }
 
       context 'with content' do
@@ -115,6 +119,9 @@ module Vedeu
     end
 
     describe '#previous?' do
+      before { Vedeu.stubs(:trigger) }
+      after { Vedeu.interfaces.reset }
+
       subject { instance.previous? }
 
       context 'with content' do

data/test/lib/vedeu/buffers/display_buffer_test.rb

@@ -31,11 +31,11 @@ module Vedeu
     let(:example_model)    { Vedeu::TestInterfaceModel }
     let(:example_instance) { example_model.new }
 
-    before do
+    before {
       example_instance.store
 
       Vedeu::Refresh.stubs(:by_name)
-    end
+    }
     after { Vedeu.interfaces.reset }
 
     describe '#store_immediate' do

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

@@ -10,26 +10,26 @@ module Vedeu
       let(:instance)  { described.new(_name) }
       let(:_name)     { 'my_first_app' }
 
-      before do
-        FileUtils.stubs(:cp_r)
-        FileUtils.stubs(:mkdir)
-      end
-
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@name').must_equal(_name) }
       end
 
       describe '.generate' do
-        it { described.must_respond_to(:generate) }
-      end
+        # before {
+        #   FileUtils.stubs(:cp_r)
+        #   FileUtils.stubs(:mkdir)
+        # }
 
-      describe '#generate' do
-        subject { instance.generate }
+        subject { instance.generate(_name) }
 
         # @todo Add more tests.
       end
 
+      describe '#generate' do
+        it { instance.must_respond_to(:generate) }
+      end
+
     end # Application
 
   end # Generator

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

@@ -10,22 +10,25 @@ module Vedeu
       let(:instance)  { described.new(_name) }
       let(:_name)     { 'my_first_view' }
 
-      before do
-        FileUtils.stubs(:cp_r)
-        FileUtils.stubs(:mkdir)
-      end
-
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@name').must_equal(_name) }
       end
 
       describe '.generate' do
-        it { described.must_respond_to(:generate) }
+        # before {
+        #   FileUtils.stubs(:cp_r)
+        #   FileUtils.stubs(:mkdir)
+        # }
+
+        subject { described.generate(_name) }
+
+        # @todo
+        # it { skip }
       end
 
       describe '#generate' do
-        subject { instance.generate }
+        it { described.must_respond_to(:generate) }
       end
 
     end # View

data/test/lib/vedeu/cli/main_test.rb

@@ -12,10 +12,10 @@ module Vedeu
       describe '#new' do
         let(:_name) { 'app_name' }
 
-        before do
+        before {
           instance.stubs(:say)
           Vedeu::Generator::Application.stubs(:generate).returns('')
-        end
+        }
 
         subject { instance.new(_name) }
 
@@ -28,10 +28,10 @@ module Vedeu
       describe '#view' do
         let(:_name) { 'view_name' }
 
-        before do
+        before {
           instance.stubs(:say)
           Vedeu::Generator::View.stubs(:generate).returns('')
-        end
+        }
 
         subject { instance.view(_name) }