vedeu 0.5.0 → 0.5.1

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

@@ -9,10 +9,7 @@ module Vedeu
     let(:output)    {}
     let(:drb)       { false }
 
-    before do
-      Vedeu::Configuration.stubs(:drb?).returns(drb)
-      Vedeu.renderers.stubs(:render)
-    end
+    before { Vedeu::Configuration.stubs(:drb?).returns(drb) }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
@@ -28,10 +25,10 @@ module Vedeu
         let(:drb)            { true }
         let(:virtual_buffer) { [] }
 
-        before do
+        before {
           # Vedeu::Renderers::HTML.stubs(:to_file)
           Vedeu::VirtualBuffer.stubs(:retrieve).returns(virtual_buffer)
-        end
+        }
 
         it {
           Vedeu.expects(:trigger).with(:_drb_store_output_, output)

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

@@ -6,9 +6,9 @@ module Vedeu
 
     let(:described) { Vedeu::Refresh }
 
-    before { Vedeu.interfaces.reset }
-
     describe '.all' do
+      before { Vedeu.interfaces.reset }
+
       subject { described.all }
 
       it { subject.must_be_instance_of(Array) }

data/test/lib/vedeu/output/renderers/file_test.rb

@@ -26,9 +26,7 @@ module Vedeu
       describe '#render' do
         let(:_time) { Time.new(2015, 4, 12, 20, 05, 00, "+01:00") }
 
-        before do
-          ::File.stubs(:write)
-        end
+        before { ::File.stubs(:write) }
 
         subject { instance.render(output) }
 

data/test/lib/vedeu/output/renderers/html_test.rb

@@ -17,9 +17,7 @@ module Vedeu
       let(:content)     { [''] }
       let(:write_file) { false }
 
-      before do
-        ::File.stubs(:write)
-      end
+      before { ::File.stubs(:write) }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }

data/test/lib/vedeu/output/renderers/json_test.rb

@@ -11,9 +11,7 @@ module Vedeu
       let(:options)   { {} }
       let(:output)    {}
 
-      before do
-        ::File.stubs(:write)
-      end
+      before { ::File.stubs(:write) }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }

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

@@ -57,10 +57,10 @@ module Vedeu
     describe '.render' do
       let(:output) {}
 
-      before do
+      before {
         Vedeu::Renderers.reset
         Vedeu::Renderers.renderer(DummyRenderer)
-      end
+      }
 
       subject { described.render(output) }
 

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

@@ -8,13 +8,11 @@ module Vedeu
     let(:instance)  { described.new(interface) }
     let(:interface) { Vedeu.interfaces.by_name('lithium') }
     let(:visibility) { true }
+    let(:geometry)   { Vedeu::Geometry.new(height: 3, width: 3) }
 
-    before do
+    before {
+      Vedeu.geometries.stubs(:by_name).returns(geometry)
       Vedeu.interface 'lithium' do
-        geometry do
-          height 3
-          width 3
-        end
         lines do
           line 'barium'
           line 'carbon'
@@ -23,9 +21,10 @@ module Vedeu
           line 'nickel'
           line 'osmium'
         end
+        style nil
         visible(visibility)
       end
-    end
+    }
     after { Vedeu.interfaces.reset }
 
     describe '#initialize' do
@@ -60,9 +59,9 @@ module Vedeu
       let(:x)      { 1 }
       let(:y)      { 1 }
 
-      before do
+      before {
         interface.stubs(:cursor).returns(cursor)
-      end
+      }
 
       subject { instance.render }
 
@@ -104,15 +103,15 @@ module Vedeu
 
           it 'scrolls the content the correct position' do
             subject.must_equal(
-              "\e[1;1Hb\n" \
-              "\e[1;2Ha\n" \
-              "\e[1;3Hr\n" \
-              "\e[2;1Hc\n" \
-              "\e[2;2Ha\n" \
-              "\e[2;3Hr\n" \
-              "\e[3;1Hh\n" \
-              "\e[3;2He\n" \
-              "\e[3;3Hl"
+              "\e[1;1H\e[39m\e[49mb\n" \
+              "\e[1;2H\e[39m\e[49ma\n" \
+              "\e[1;3H\e[39m\e[49mr\n" \
+              "\e[2;1H\e[39m\e[49mc\n" \
+              "\e[2;2H\e[39m\e[49ma\n" \
+              "\e[2;3H\e[39m\e[49mr\n" \
+              "\e[3;1H\e[39m\e[49mh\n" \
+              "\e[3;2H\e[39m\e[49me\n" \
+              "\e[3;3H\e[39m\e[49ml"
             )
           end
         end
@@ -124,15 +123,15 @@ module Vedeu
 
             it "renders the visible content" do
               subject.must_equal(
-                "\e[1;1Hb\n" \
-                "\e[1;2Ha\n" \
-                "\e[1;3Hr\n" \
-                "\e[2;1Hc\n" \
-                "\e[2;2Ha\n" \
-                "\e[2;3Hr\n" \
-                "\e[3;1Hh\n" \
-                "\e[3;2He\n" \
-                "\e[3;3Hl"
+                "\e[1;1H\e[39m\e[49mb\n" \
+                "\e[1;2H\e[39m\e[49ma\n" \
+                "\e[1;3H\e[39m\e[49mr\n" \
+                "\e[2;1H\e[39m\e[49mc\n" \
+                "\e[2;2H\e[39m\e[49ma\n" \
+                "\e[2;3H\e[39m\e[49mr\n" \
+                "\e[3;1H\e[39m\e[49mh\n" \
+                "\e[3;2H\e[39m\e[49me\n" \
+                "\e[3;3H\e[39m\e[49ml"
               )
             end
           end
@@ -143,15 +142,15 @@ module Vedeu
 
             it "is cropped to show only that which fits" do
               subject.must_equal(
-                "\e[1;1Hb\n" \
-                "\e[1;2Ha\n" \
-                "\e[1;3Hr\n" \
-                "\e[2;1Hc\n" \
-                "\e[2;2Ha\n" \
-                "\e[2;3Hr\n" \
-                "\e[3;1Hh\n" \
-                "\e[3;2He\n" \
-                "\e[3;3Hl"
+                "\e[1;1H\e[39m\e[49mb\n" \
+                "\e[1;2H\e[39m\e[49ma\n" \
+                "\e[1;3H\e[39m\e[49mr\n" \
+                "\e[2;1H\e[39m\e[49mc\n" \
+                "\e[2;2H\e[39m\e[49ma\n" \
+                "\e[2;3H\e[39m\e[49mr\n" \
+                "\e[3;1H\e[39m\e[49mh\n" \
+                "\e[3;2H\e[39m\e[49me\n" \
+                "\e[3;3H\e[39m\e[49ml"
               )
             end
           end
@@ -164,15 +163,15 @@ module Vedeu
 
             it 'scrolls the content the correct position' do
               subject.must_equal(
-                "\e[1;1Hb\n" \
-                "\e[1;2Ha\n" \
-                "\e[1;3Hr\n" \
-                "\e[2;1Hc\n" \
-                "\e[2;2Ha\n" \
-                "\e[2;3Hr\n" \
-                "\e[3;1Hh\n" \
-                "\e[3;2He\n" \
-                "\e[3;3Hl"
+                "\e[1;1H\e[39m\e[49mb\n" \
+                "\e[1;2H\e[39m\e[49ma\n" \
+                "\e[1;3H\e[39m\e[49mr\n" \
+                "\e[2;1H\e[39m\e[49mc\n" \
+                "\e[2;2H\e[39m\e[49ma\n" \
+                "\e[2;3H\e[39m\e[49mr\n" \
+                "\e[3;1H\e[39m\e[49mh\n" \
+                "\e[3;2H\e[39m\e[49me\n" \
+                "\e[3;3H\e[39m\e[49ml"
               )
             end
           end
@@ -183,15 +182,15 @@ module Vedeu
 
             it "scrolls the content the correct position" do
               subject.must_equal(
-                "\e[1;1Hb\n" \
-                "\e[1;2Ha\n" \
-                "\e[1;3Hr\n" \
-                "\e[2;1Hc\n" \
-                "\e[2;2Ha\n" \
-                "\e[2;3Hr\n" \
-                "\e[3;1Hh\n" \
-                "\e[3;2He\n" \
-                "\e[3;3Hl"
+                "\e[1;1H\e[39m\e[49mb\n" \
+                "\e[1;2H\e[39m\e[49ma\n" \
+                "\e[1;3H\e[39m\e[49mr\n" \
+                "\e[2;1H\e[39m\e[49mc\n" \
+                "\e[2;2H\e[39m\e[49ma\n" \
+                "\e[2;3H\e[39m\e[49mr\n" \
+                "\e[3;1H\e[39m\e[49mh\n" \
+                "\e[3;2H\e[39m\e[49me\n" \
+                "\e[3;3H\e[39m\e[49ml"
               )
             end
           end
@@ -204,15 +203,15 @@ module Vedeu
 
             it "renders the visible content" do
               subject.must_equal(
-                "\e[1;1Hb\n" \
-                "\e[1;2Ha\n" \
-                "\e[1;3Hr\n" \
-                "\e[2;1Hc\n" \
-                "\e[2;2Ha\n" \
-                "\e[2;3Hr\n" \
-                "\e[3;1Hh\n" \
-                "\e[3;2He\n" \
-                "\e[3;3Hl"
+                "\e[1;1H\e[39m\e[49mb\n" \
+                "\e[1;2H\e[39m\e[49ma\n" \
+                "\e[1;3H\e[39m\e[49mr\n" \
+                "\e[2;1H\e[39m\e[49mc\n" \
+                "\e[2;2H\e[39m\e[49ma\n" \
+                "\e[2;3H\e[39m\e[49mr\n" \
+                "\e[3;1H\e[39m\e[49mh\n" \
+                "\e[3;2H\e[39m\e[49me\n" \
+                "\e[3;3H\e[39m\e[49ml"
               )
             end
           end
@@ -223,15 +222,15 @@ module Vedeu
 
             it "is cropped to show only that which fits" do
               subject.must_equal(
-                "\e[1;1Hb\n" \
-                "\e[1;2Ha\n" \
-                "\e[1;3Hr\n" \
-                "\e[2;1Hc\n" \
-                "\e[2;2Ha\n" \
-                "\e[2;3Hr\n" \
-                "\e[3;1Hh\n" \
-                "\e[3;2He\n" \
-                "\e[3;3Hl"
+                "\e[1;1H\e[39m\e[49mb\n" \
+                "\e[1;2H\e[39m\e[49ma\n" \
+                "\e[1;3H\e[39m\e[49mr\n" \
+                "\e[2;1H\e[39m\e[49mc\n" \
+                "\e[2;2H\e[39m\e[49ma\n" \
+                "\e[2;3H\e[39m\e[49mr\n" \
+                "\e[3;1H\e[39m\e[49mh\n" \
+                "\e[3;2H\e[39m\e[49me\n" \
+                "\e[3;3H\e[39m\e[49ml"
               )
             end
           end

data/test/lib/vedeu/repositories/model_test.rb

@@ -2,25 +2,6 @@ require 'test_helper'
 
 module Vedeu
 
-  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
-
   describe Model do
 
     let(:described)  { ModelTestClass }

data/test/lib/vedeu/repositories/repository_test.rb

@@ -179,21 +179,21 @@ module Vedeu
     end
 
     describe '#inspect' do
+      before { Vedeu.interfaces.reset }
+
       subject { instance.inspect }
 
       it { subject.must_be_instance_of(String) }
 
       context 'when there are no models stored in the repository' do
-        before { instance.reset }
-
         it { subject.must_equal("<Vedeu::Repository: []>") }
       end
 
       context 'when there are models stored in the repository' do
-        before do
+        before {
           Vedeu.interface('hydrogen') {}
           Vedeu.interface('helium') {}
-        end
+        }
         after { Vedeu.interfaces.reset }
 
         subject { Vedeu.interfaces.inspect }
@@ -239,20 +239,20 @@ module Vedeu
       end
 
       context 'when the model is not registered' do
-        before do
+        before {
           instance.reset
           instance.store(Vedeu::TestModel.new('zinc'))
-        end
+        }
 
         it { subject.must_be_instance_of(FalseClass) }
       end
 
       context 'when the model is registered' do
-        before do
+        before {
           instance.reset
           instance.store(Vedeu::TestModel.new('gadolinium'))
           instance.store(Vedeu::TestModel.new('francium'))
-        end
+        }
 
         it 'returns the storage with the model removed' do
           subject.size.must_equal(1)

data/test/lib/vedeu/runtime/application_test.rb

@@ -8,10 +8,10 @@ module Vedeu
     let(:instance)      { described.new(configuration) }
     let(:configuration) { Vedeu.configuration }
 
-    before do
+    before {
       configuration.stubs(:drb?).returns(false)
       Terminal.stubs(:open).returns([''])
-    end
+    }
 
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }

data/test/lib/vedeu/runtime/launcher_test.rb

@@ -7,13 +7,6 @@ module Vedeu
     let(:described) { Vedeu::Launcher }
     let(:instance)  { described.new }
 
-    before do
-      Configuration.stubs(:configure)# .returns(test_configuration)
-      Application.stubs(:start)
-      Kernel.stubs(:exit)
-      Kernel.stubs(:puts)
-    end
-
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
       it { instance.instance_variable_get('@argv').must_equal([]) }
@@ -39,6 +32,13 @@ module Vedeu
     end
 
     describe '#execute!' do
+      before {
+        Configuration.stubs(:configure)# .returns(test_configuration)
+        Application.stubs(:start)
+        Kernel.stubs(:exit)
+        Kernel.stubs(:puts)
+      }
+
       subject { instance.execute! }
 
       it 'returns 0 for successful execution' do

data/test/lib/vedeu/runtime/router_test.rb

@@ -20,23 +20,23 @@ module Vedeu
     before { described.reset! }
 
     describe '.add_controller' do
-      let(:controller_name) {}
+      let(:controller) {}
       let(:klass) { "SomeController" }
 
-      subject { described.add_controller(controller_name, klass) }
+      subject { described.add_controller(controller, klass) }
 
       context 'when a name is not given' do
         it { proc { subject }.must_raise(Vedeu::MissingRequired) }
       end
 
       context 'when a name is given' do
-        let(:controller_name) { :some_controller }
+        let(:controller) { :some_controller }
 
         context 'when the controller is registered' do
-          before do
-            described.add_controller(controller_name, '')
-            described.add_action(controller_name, :show_basket)
-          end
+          before {
+            described.add_controller(controller, '')
+            described.add_action(controller, :show_basket)
+          }
           after  { described.reset! }
 
           it {
@@ -63,29 +63,29 @@ module Vedeu
     end
 
     describe '.add_action' do
-      let(:controller_name) {}
-      let(:action_name)     {}
+      let(:controller) {}
+      let(:action)     {}
 
-      subject { described.add_action(controller_name, action_name) }
+      subject { described.add_action(controller, action) }
 
       context 'when the controller is not given' do
-        let(:action_name) { :some_action }
+        let(:action) { :some_action }
 
         it { proc { subject }.must_raise(Vedeu::MissingRequired) }
       end
 
       context 'when the name is not given' do
-        let(:controller_name) { :some_controller }
+        let(:controller) { :some_controller }
 
         it { proc { subject }.must_raise(Vedeu::MissingRequired) }
       end
 
       context 'when the controller and name is given' do
-        let(:controller_name) { :some_controller }
-        let(:action_name) { :some_action }
+        let(:controller) { :some_controller }
+        let(:action) { :some_action }
 
         context 'when the controller is registered' do
-          before { described.add_controller(controller_name, 'SomeController') }
+          before { described.add_controller(controller, 'SomeController') }
           after  { described.reset! }
 
           it {
@@ -114,8 +114,8 @@ module Vedeu
     end
 
     describe '.goto' do
-      let(:controller_name) { :some_controller }
-      let(:action_name)     { :some_action }
+      let(:controller) { :some_controller }
+      let(:action)     { :some_action }
       let(:args)            {
         {
           customer_id: 7,
@@ -123,16 +123,16 @@ module Vedeu
         }
       }
 
-      subject { described.goto(controller_name, action_name, **args) }
+      subject { described.goto(controller, action, **args) }
 
       it { described.must_respond_to(:action) }
 
       context 'when the controller is registered' do
         context 'when the controller klass is defined' do
-          before do
-            described.add_controller(controller_name, 'Vedeu::SomeController')
-            described.add_action(controller_name, action_name)
-          end
+          before {
+            described.add_controller(controller, 'Vedeu::SomeController')
+            described.add_action(controller, action)
+          }
           after { described.reset! }
 
           it {
@@ -149,20 +149,20 @@ module Vedeu
         end
 
         context 'when the action is not defined for this controller' do
-          let(:action_name) { :undefined_action }
+          let(:action) { :undefined_action }
 
-          before do
-            described.add_controller(controller_name, 'Vedeu::SomeController')
-          end
+          before {
+            described.add_controller(controller, 'Vedeu::SomeController')
+          }
 
           it { proc { subject }.must_raise(Vedeu::ActionNotFound) }
         end
 
         context 'when the controller klass is not defined' do
-          before do
-            described.add_controller(controller_name, '')
-            described.add_action(controller_name, action_name)
-          end
+          before {
+            described.add_controller(controller, '')
+            described.add_action(controller, action)
+          }
           after { described.reset! }
 
           it { proc { subject }.must_raise(Vedeu::MissingRequired) }
@@ -175,12 +175,12 @@ module Vedeu
     end
 
     describe '.registered' do
-      let(:controller_name) { :some_controller }
+      let(:controller) { :some_controller }
 
-      subject { described.registered?(controller_name) }
+      subject { described.registered?(controller) }
 
       context 'when the controller is registered' do
-        before { described.add_controller(controller_name, "SomeController") }
+        before { described.add_controller(controller, "SomeController") }
         after  { described.reset! }
 
         it { subject.must_equal(true) }