vedeu 0.5.0 → 0.5.1

data/test/lib/vedeu/{traps_test.rb → runtime/traps_test.rb}

@@ -2,11 +2,11 @@ require 'test_helper'
 
 module Vedeu
 
-  describe Traps do
+	describe Traps do
 
     # @todo Add more tests.
     # it { skip }
 
-  end # Traps
+	end # Traps
 
 end # Vedeu

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

@@ -17,6 +17,7 @@ module Vedeu
       }
 
       describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@data').must_equal(data) }
       end
 

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

@@ -17,6 +17,7 @@ module Vedeu
       }
 
       describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@data').must_equal(data) }
       end
 

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

@@ -29,13 +29,20 @@ module Vedeu
         context 'when the path is does not exist' do
           let(:path) { '/tmp/vedeu_does_not_exist' }
 
+          before { File.stubs(:exist?).returns(false) }
+
           it { proc { subject }.must_raise(MissingRequired) }
         end
 
         context 'when the path exists' do
-          let(:path) { 'test/support/templates/plain.erb' }
+          let(:path) { '/tmp/vedeu_exists' }
           let(:expected) { "This is a test.\n" }
 
+          before {
+            File.stubs(:exist?).returns(true)
+            File.stubs(:read).returns(expected)
+          }
+
           it { subject.must_equal(expected) }
         end
       end

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

@@ -9,17 +9,27 @@ module Vedeu
       let(:described) { Vedeu::Templating::ViewTemplate }
       let(:instance)  { described.new(object, path) }
       let(:object)    {}
-      let(:path)      {}
+      let(:path)      { '/tmp/some_template.erb' }
+      let(:content)   { '' }
 
       describe '.parse' do
+        before {
+          File.stubs(:exist?).returns(true)
+          File.stubs(:read).returns(content)
+        }
+
         subject { described.parse(object, path) }
 
         context 'with a plain text file' do
-          let(:path) { 'test/support/templates/plain.erb' }
-
+          let(:content) { "This is a test.\n" }
           let(:expected) {
             Vedeu::Lines.new([
-              Vedeu::Line.new(streams: Vedeu::Stream.new(value: 'This is a test.'))
+              Vedeu::Line.new(streams:
+                Vedeu::Stream.new(colour: {
+                                    background: :default,
+                                    foreground: :default },
+                                  style: :normal,
+                                  value: 'This is a test.'))
             ])
           }
 
@@ -27,12 +37,21 @@ module Vedeu
         end
 
         context 'with a plain text file with multiple lines' do
-          let(:path) { 'test/support/templates/multiple.erb' }
-
+          let(:content) { "This is a test.\nAnd so is this.\n" }
           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.')),
+              Vedeu::Line.new(streams:
+                Vedeu::Stream.new(colour: {
+                                    background: :default,
+                                    foreground: :default },
+                                  style: :normal,
+                                  value: 'This is a test.')),
+              Vedeu::Line.new(streams:
+                Vedeu::Stream.new(colour: {
+                                    background: :default,
+                                    foreground: :default },
+                                  style: :normal,
+                                  value: 'And so is this.')),
             ])
           }
 
@@ -40,7 +59,7 @@ module Vedeu
         end
 
         context 'with a background colour directive' do
-          let(:path)   { 'test/support/templates/background.erb' }
+          let(:content) { "This is a <%= background('#ff0000') { 'test' } %>.\n" }
           let(:colour) {
             Vedeu::Colour.new(background: '#ff0000', foreground: '')
           }
@@ -48,18 +67,63 @@ module Vedeu
           let(:expected) {
             Vedeu::Lines.new([
               Vedeu::Line.new(streams: [
-                Vedeu::Stream.new(value: 'This is a '),
+                Vedeu::Stream.new(colour: {
+                                    background: :default,
+                                    foreground: :default },
+                                  style: :normal,
+                                  value: 'This is a '),
                 Vedeu::Stream.new(value: 'test', colour: colour),
-                Vedeu::Stream.new(value: '.'),
+                Vedeu::Stream.new(colour: {
+                                    background: :default,
+                                    foreground: :default },
+                                  style: :normal,
+                                  value: '.'),
               ])
             ])
           }
 
           it { subject.must_equal(expected) }
+
+          context 'and multiple' do
+            let(:content) {
+              "This is a <%= background('#ff0000') { 'test' } %>. And so is " \
+              "<%= background('#ff0000') { 'this' } %>.\n"
+            }
+
+            let(:colour) {
+              Vedeu::Colour.new(background: '#ff0000', foreground: '')
+            }
+
+            let(:expected) {
+              Vedeu::Lines.new([
+                Vedeu::Line.new(streams: [
+                  Vedeu::Stream.new(colour: {
+                                      background: :default,
+                                      foreground: :default },
+                                    style: :normal,
+                                    value: 'This is a '),
+                  Vedeu::Stream.new(value: 'test', colour: colour),
+                  Vedeu::Stream.new(colour: {
+                                      background: :default,
+                                      foreground: :default },
+                                    style: :normal,
+                                    value: '. And so is '),
+                  Vedeu::Stream.new(value: 'this', colour: colour),
+                  Vedeu::Stream.new(colour: {
+                                      background: :default,
+                                      foreground: :default },
+                                    style: :normal,
+                                    value: '.'),
+                ])
+              ])
+            }
+
+            it { subject.must_equal(expected) }
+          end
         end
 
         context 'with a foreground colour directive' do
-          let(:path) { 'test/support/templates/foreground.erb' }
+          let(:content) { "This is a <%= foreground('#00ff00') { 'test' } %>.\n" }
           let(:colour) {
             Vedeu::Colour.new(background: '', foreground: '#00ff00')
           }
@@ -67,9 +131,17 @@ module Vedeu
           let(:expected) {
             Vedeu::Lines.new([
               Vedeu::Line.new(streams: [
-                Vedeu::Stream.new(value: 'This is a '),
+                Vedeu::Stream.new(colour: {
+                                    background: :default,
+                                    foreground: :default },
+                                  style: :normal,
+                                  value: 'This is a '),
                 Vedeu::Stream.new(value: 'test', colour: colour),
-                Vedeu::Stream.new(value: '.'),
+                Vedeu::Stream.new(colour: {
+                                    background: :default,
+                                    foreground: :default },
+                                  style: :normal,
+                                  value: '.'),
               ])
             ])
           }
@@ -78,8 +150,7 @@ module Vedeu
         end
 
         context 'with a colour directive' do
-          let(:path) { 'test/support/templates/colour.erb' }
-
+          let(:content) { "This is a <%= colour(background: '#003300', foreground: '#aadd00') { 'test' } %>.\n" }
           let(:colour) {
             Vedeu::Colour.new(background: '#003300', foreground: '#aadd00')
           }
@@ -87,9 +158,17 @@ module Vedeu
           let(:expected) {
             Vedeu::Lines.new([
               Vedeu::Line.new(streams: [
-                Vedeu::Stream.new(value: 'This is a '),
+                Vedeu::Stream.new(colour: {
+                                    background: :default,
+                                    foreground: :default },
+                                  style: :normal,
+                                  value: 'This is a '),
                 Vedeu::Stream.new(value: 'test', colour: colour),
-                Vedeu::Stream.new(value: '.'),
+                Vedeu::Stream.new(colour: {
+                                    background: :default,
+                                    foreground: :default },
+                                  style: :normal,
+                                  value: '.'),
               ])
             ])
           }
@@ -98,8 +177,7 @@ module Vedeu
         end
 
         context 'with a style directive' do
-          let(:path) { 'test/support/templates/style.erb' }
-
+          let(:content) { "This is a <%= style(:bold) { 'test' } %>." }
           let(:style) {
             Vedeu::Style.new(:bold)
           }
@@ -107,9 +185,17 @@ module Vedeu
           let(:expected) {
             Vedeu::Lines.new([
               Vedeu::Line.new(streams: [
-                Vedeu::Stream.new(value: 'This is a '),
+                Vedeu::Stream.new(colour: {
+                                    background: :default,
+                                    foreground: :default },
+                                  style: :normal,
+                                  value: 'This is a '),
                 Vedeu::Stream.new(value: 'test', style: style),
-                Vedeu::Stream.new(value: '.'),
+                Vedeu::Stream.new(colour: {
+                                    background: :default,
+                                    foreground: :default },
+                                  style: :normal,
+                                  value: '.'),
               ])
             ])
           }

data/test/lib/vedeu/terminal_mode_test.rb

@@ -55,10 +55,10 @@ module Vedeu
     describe '.mode' do
       subject { described.mode }
 
-      before do
+      before {
         described.raw_mode!
         Configuration.stubs(:terminal_mode).returns(:raw)
-      end
+      }
 
       it { subject.must_be_instance_of(Symbol) }
 

data/test/lib/vedeu/terminal_test.rb

@@ -7,10 +7,10 @@ module Vedeu
     let(:described) { Vedeu::Terminal }
     let(:console)   { IO.console }
 
-    before do
+    before {
       console.stubs(:winsize).returns([25, 80])
       console.stubs(:print)
-    end
+    }
 
     describe '.open' do
       context 'when a block was not given' do
@@ -47,10 +47,10 @@ module Vedeu
         let(:mode)  { :cooked }
         let(:input) { "Some input\r\n" }
 
-        before do
+        before {
           Terminal.stubs(:mode).returns(mode)
           console.stubs(:gets).returns(input)
-        end
+        }
 
         it { subject.must_equal('Some input') }
       end
@@ -59,12 +59,12 @@ module Vedeu
         let(:mode)  { :raw }
         let(:input) { "\e" }
 
-        before do
+        before {
           Terminal.stubs(:mode).returns(mode)
           console.stubs(:getch).returns(input)
           input.stubs(:ord).returns(27)
           console.stubs(:read_nonblock)
-        end
+        }
 
         it { subject.must_be_instance_of(String) }
       end

data/test/support/helpers/model_test_class.rb

@@ -22,6 +22,25 @@ module Vedeu
 
   end # RepositoryTestModule
 
+  module DSL
+
+    class ModelTestClass
+
+      include Vedeu::DSL::Presentation
+
+      def initialize(model, client = nil)
+        @model  = model
+        @client = client
+      end
+
+      protected
+
+      attr_reader :model
+
+    end # ModelTestClass
+
+  end # DSL
+
   class ModelTestClass
 
     include Vedeu::Model

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -438,6 +438,7 @@ files:
 - lib/vedeu/runtime/launcher.rb
 - lib/vedeu/runtime/main_loop.rb
 - lib/vedeu/runtime/router.rb
+- lib/vedeu/runtime/traps.rb
 - lib/vedeu/templating/all.rb
 - lib/vedeu/templating/decoder.rb
 - lib/vedeu/templating/encoder.rb
@@ -446,7 +447,6 @@ files:
 - lib/vedeu/templating/view_template.rb
 - lib/vedeu/terminal.rb
 - lib/vedeu/terminal_mode.rb
-- lib/vedeu/traps.rb
 - lib/vedeu/version.rb
 - test/lib/vedeu/api_test.rb
 - test/lib/vedeu/application/application_controller_test.rb
@@ -593,6 +593,7 @@ files:
 - test/lib/vedeu/runtime/launcher_test.rb
 - test/lib/vedeu/runtime/main_loop_test.rb
 - test/lib/vedeu/runtime/router_test.rb
+- test/lib/vedeu/runtime/traps_test.rb
 - test/lib/vedeu/templating/decoder_test.rb
 - test/lib/vedeu/templating/encoder_test.rb
 - test/lib/vedeu/templating/helpers_test.rb
@@ -600,18 +601,11 @@ files:
 - test/lib/vedeu/templating/view_template_test.rb
 - test/lib/vedeu/terminal_mode_test.rb
 - test/lib/vedeu/terminal_test.rb
-- test/lib/vedeu/traps_test.rb
 - test/lib/vedeu_test.rb
 - test/support/all_seeds.sh
 - 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/style.erb
 - test/test_helper.rb
 - vedeu.gemspec
 homepage: https://github.com/gavinlaking/vedeu
@@ -784,6 +778,7 @@ test_files:
 - test/lib/vedeu/runtime/launcher_test.rb
 - test/lib/vedeu/runtime/main_loop_test.rb
 - test/lib/vedeu/runtime/router_test.rb
+- test/lib/vedeu/runtime/traps_test.rb
 - test/lib/vedeu/templating/decoder_test.rb
 - test/lib/vedeu/templating/encoder_test.rb
 - test/lib/vedeu/templating/helpers_test.rb
@@ -791,17 +786,10 @@ test_files:
 - test/lib/vedeu/templating/view_template_test.rb
 - test/lib/vedeu/terminal_mode_test.rb
 - test/lib/vedeu/terminal_test.rb
-- test/lib/vedeu/traps_test.rb
 - test/lib/vedeu_test.rb
 - test/support/all_seeds.sh
 - 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/style.erb
 - test/test_helper.rb
 has_rdoc: 

data/test/support/templates/background.erb

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

data/test/support/templates/colour.erb

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

data/test/support/templates/foreground.erb

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

data/test/support/templates/multiple.erb

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

data/test/support/templates/plain.erb

@@ -1 +0,0 @@
-This is a test.