vedeu 0.7.4 → 0.8.0

data/test/lib/vedeu/esc/colours_test.rb

@@ -8,38 +8,6 @@ module Vedeu
 
       let(:described) { Vedeu::EscapeSequences::Colours }
 
-      describe 'foreground colour methods' do
-        it { described.black.must_equal("\e[30m") }
-        it { described.red.must_equal("\e[31m") }
-        it { described.green.must_equal("\e[32m") }
-        it { described.yellow.must_equal("\e[33m") }
-        it { described.blue.must_equal("\e[34m") }
-        it { described.magenta.must_equal("\e[35m") }
-        it { described.cyan.must_equal("\e[36m") }
-        it { described.light_grey.must_equal("\e[37m") }
-        it { described.default.must_equal("\e[39m") }
-        it { described.dark_grey.must_equal("\e[90m") }
-        it { described.light_red.must_equal("\e[91m") }
-        it { described.light_green.must_equal("\e[92m") }
-        it { described.light_yellow.must_equal("\e[93m") }
-        it { described.light_blue.must_equal("\e[94m") }
-        it { described.light_magenta.must_equal("\e[95m") }
-        it { described.light_cyan.must_equal("\e[96m") }
-        it { described.white.must_equal("\e[97m") }
-
-        it 'returns an escape sequence for the foreground colour and resets ' \
-           'after calling the block' do
-          described.cyan do
-            'ununpentium'
-          end.must_equal("\e[36mununpentium\e[39m")
-        end
-      end
-
-      describe '.codes' do
-        it { described.codes.must_be_instance_of(Hash) }
-        it { described.must_respond_to(:foreground_codes) }
-      end
-
       describe '.background_codes' do
         let(:expected) {
           {
@@ -94,33 +62,6 @@ module Vedeu
         it { described.foreground_codes.must_equal(expected) }
       end
 
-      describe 'background colour methods' do
-        it { described.on_black.must_equal("\e[40m") }
-        it { described.on_red.must_equal("\e[41m") }
-        it { described.on_green.must_equal("\e[42m") }
-        it { described.on_yellow.must_equal("\e[43m") }
-        it { described.on_blue.must_equal("\e[44m") }
-        it { described.on_magenta.must_equal("\e[45m") }
-        it { described.on_cyan.must_equal("\e[46m") }
-        it { described.on_light_grey.must_equal("\e[47m") }
-        it { described.on_default.must_equal("\e[49m") }
-        it { described.on_dark_grey.must_equal("\e[100m") }
-        it { described.on_light_red.must_equal("\e[101m") }
-        it { described.on_light_green.must_equal("\e[102m") }
-        it { described.on_light_yellow.must_equal("\e[103m") }
-        it { described.on_light_blue.must_equal("\e[104m") }
-        it { described.on_light_magenta.must_equal("\e[105m") }
-        it { described.on_light_cyan.must_equal("\e[106m") }
-        it { described.on_white.must_equal("\e[107m") }
-
-        it 'returns an escape sequence for the background colour and resets ' \
-           'after calling the block' do
-          described.on_red do
-            'livermorium'
-          end.must_equal("\e[41mlivermorium\e[49m")
-        end
-      end
-
     end # Colours
 
   end # EscapeSequences

data/test/lib/vedeu/esc/foreground_test.rb

@@ -0,0 +1,185 @@
+require 'test_helper'
+
+module Vedeu
+
+  module EscapeSequences
+
+    describe Foreground do
+
+      let(:described) { Vedeu::EscapeSequences::Foreground }
+
+      describe '.black' do
+        context 'when a block is given' do
+          it { described.black { 'test' }.must_equal("\e[30mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.black.must_equal("\e[30m") }
+        end
+      end
+
+      describe '.red' do
+        context 'when a block is given' do
+          it { described.red { 'test' }.must_equal("\e[31mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.red.must_equal("\e[31m") }
+        end
+      end
+
+      describe '.green' do
+        context 'when a block is given' do
+          it { described.green { 'test' }.must_equal("\e[32mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.green.must_equal("\e[32m") }
+        end
+      end
+
+      describe '.yellow' do
+        context 'when a block is given' do
+          it { described.yellow { 'test' }.must_equal("\e[33mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.yellow.must_equal("\e[33m") }
+        end
+      end
+
+      describe '.blue' do
+        context 'when a block is given' do
+          it { described.blue { 'test' }.must_equal("\e[34mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.blue.must_equal("\e[34m") }
+        end
+      end
+
+      describe '.magenta' do
+        context 'when a block is given' do
+          it { described.magenta { 'test' }.must_equal("\e[35mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.magenta.must_equal("\e[35m") }
+        end
+      end
+
+      describe '.cyan' do
+        context 'when a block is given' do
+          it { described.cyan { 'test' }.must_equal("\e[36mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.cyan.must_equal("\e[36m") }
+        end
+      end
+
+      describe '.light_grey' do
+        context 'when a block is given' do
+          it { described.light_grey { 'test' }.must_equal("\e[37mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.light_grey.must_equal("\e[37m") }
+        end
+      end
+
+      describe '.default' do
+        context 'when a block is given' do
+          it { described.default { 'test' }.must_equal("\e[39mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.default.must_equal("\e[39m") }
+        end
+      end
+
+      describe '.dark_grey' do
+        context 'when a block is given' do
+          it { described.dark_grey { 'test' }.must_equal("\e[90mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.dark_grey.must_equal("\e[90m") }
+        end
+      end
+
+      describe '.light_red' do
+        context 'when a block is given' do
+          it { described.light_red { 'test' }.must_equal("\e[91mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.light_red.must_equal("\e[91m") }
+        end
+      end
+
+      describe '.light_green' do
+        context 'when a block is given' do
+          it { described.light_green { 'test' }.must_equal("\e[92mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.light_green.must_equal("\e[92m") }
+        end
+      end
+
+      describe '.light_yellow' do
+        context 'when a block is given' do
+          it { described.light_yellow { 'test' }.must_equal("\e[93mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.light_yellow.must_equal("\e[93m") }
+        end
+      end
+
+      describe '.light_blue' do
+        context 'when a block is given' do
+          it { described.light_blue { 'test' }.must_equal("\e[94mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.light_blue.must_equal("\e[94m") }
+        end
+      end
+
+      describe '.light_magenta' do
+        context 'when a block is given' do
+          it { described.light_magenta { 'test' }.must_equal("\e[95mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.light_magenta.must_equal("\e[95m") }
+        end
+      end
+
+      describe '.light_cyan' do
+        context 'when a block is given' do
+          it { described.light_cyan { 'test' }.must_equal("\e[96mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.light_cyan.must_equal("\e[96m") }
+        end
+      end
+
+      describe '.white' do
+        context 'when a block is given' do
+          it { described.white { 'test' }.must_equal("\e[97mtest\e[39m") }
+        end
+
+        context 'when a block is not given' do
+          it { described.white.must_equal("\e[97m") }
+        end
+      end
+
+    end # Foreground
+
+  end # EscapeSequences
+
+end # Vedeu

data/test/lib/vedeu/esc/mouse_test.rb

@@ -8,15 +8,20 @@ module Vedeu
 
       let(:described) { Vedeu::EscapeSequences::Mouse }
 
-      describe 'mouse methods' do
+      describe '.mouse_x10_on' do
         it { described.mouse_x10_on.must_equal("\e[?9h") }
+      end
+
+      describe '.mouse_x10_on' do
         it { described.mouse_x10_off.must_equal("\e[?9l") }
+      end
+
+      describe '.mouse_on' do
         it { described.mouse_on.must_equal("\e[?1000h") }
-        it { described.mouse_off.must_equal("\e[?1000l") }
       end
 
-      describe '.mouse_codes' do
-        it { described.mouse_codes.must_be_instance_of(Hash) }
+      describe '.mouse_off' do
+        it { described.mouse_off.must_equal("\e[?1000l") }
       end
 
     end # Mouse

data/test/lib/vedeu/geometries/area/area_test.rb

@@ -47,17 +47,36 @@ module Vedeu
         Vedeu.borders.stubs(:by_name).returns(border)
       end
 
-      describe 'accessors' do
-        it do
-          instance.must_respond_to(:y)
-          instance.must_respond_to(:yn)
-          instance.must_respond_to(:x)
-          instance.must_respond_to(:xn)
-          instance.must_respond_to(:top)
-          instance.must_respond_to(:bottom)
-          instance.must_respond_to(:left)
-          instance.must_respond_to(:right)
-        end
+      describe '#y' do
+        it { instance.must_respond_to(:y) }
+      end
+
+      describe '#yn' do
+        it { instance.must_respond_to(:yn) }
+      end
+
+      describe '#x' do
+        it { instance.must_respond_to(:x) }
+      end
+
+      describe '#xn' do
+        it { instance.must_respond_to(:xn) }
+      end
+
+      describe '#top' do
+        it { instance.must_respond_to(:top) }
+      end
+
+      describe '#bottom' do
+        it { instance.must_respond_to(:bottom) }
+      end
+
+      describe '#left' do
+        it { instance.must_respond_to(:left) }
+      end
+
+      describe '#right' do
+        it { instance.must_respond_to(:right) }
       end
 
       describe '#initialize' do
@@ -275,6 +294,10 @@ module Vedeu
         end
       end
 
+      describe '#==' do
+        it { instance.must_respond_to(:==) }
+      end
+
       describe '#centre' do
         subject { instance.centre }
 

data/test/lib/vedeu/geometries/dsl/dsl_test.rb

@@ -9,58 +9,33 @@ module Vedeu
       let(:described) { Vedeu::Geometries::DSL }
       let(:instance)  { described.new(model) }
       let(:model)     { Vedeu::Geometries::Geometry.new }
+      let(:_name)     { :vedeu_geometries_dsl }
 
       describe '.geometry' do
-        it { described.must_respond_to(:geometry) }
-      end
-
-      # describe '#alignment' do
-      #   let(:_value) { :none }
-      #   let(:width)  { 20 }
-
-      #   subject { instance.alignment(_value, width) }
-
-      #   context 'when a value and width is given' do
-      #     it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
-
-      #     context 'when the value is :center' do
-      #       let(:_value) { :center }
-
-      #       it { subject.alignment.must_equal(:centre) }
-      #     end
-
-      #     context 'when the value is :centre' do
-      #       let(:_value) { :centre }
-
-      #       it { subject.alignment.must_equal(:centre) }
-      #     end
-
-      #     context 'when the value is :left' do
-      #       let(:_value) { :left }
-
-      #       it { subject.alignment.must_equal(:left) }
-      #     end
-
-      #     context 'when the value is :right' do
-      #       let(:_value) { :right }
+        subject {
+          described.geometry(_name) do
+            # ...
+          end
+        }
 
-      #       it { subject.alignment.must_equal(:right) }
-      #     end
-      #   end
+        context 'when the name is not given' do
+          let(:_name) {}
 
-      #   context 'when a value is not given' do
-      #     let(:_value) {}
+          it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
+        end
 
-      #     it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax) }
-      #   end
+        context 'when the name is given' do
+          context 'when the block is not given' do
+            subject { described.geometry(_name) }
 
-      #   context 'when a width is not given' do
-      #     let(:_value) { :none }
-      #     let(:width)  {}
+            it { proc { subject }.must_raise(Vedeu::Error::RequiresBlock) }
+          end
 
-      #     it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax) }
-      #   end
-      # end
+          context 'when the block is given' do
+            it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
+          end
+        end
+      end
 
       describe '#align' do
         let(:vertical)   { :top }
@@ -90,9 +65,9 @@ module Vedeu
           context 'when the height is given' do
             it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
             it { subject.vertical_alignment.
-              must_be_instance_of(Vedeu::Geometries::VerticalAlignment) }
+              must_be_instance_of(Vedeu::Coercers::VerticalAlignment) }
             it { subject.horizontal_alignment.
-              must_be_instance_of(Vedeu::Geometries::HorizontalAlignment) }
+              must_be_instance_of(Vedeu::Coercers::HorizontalAlignment) }
             it { subject.height.must_equal(20) }
             it { subject.width.must_equal(20) }
           end
@@ -118,9 +93,9 @@ module Vedeu
           context 'when the width is given' do
             it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
             it { subject.vertical_alignment.
-              must_be_instance_of(Vedeu::Geometries::VerticalAlignment) }
+              must_be_instance_of(Vedeu::Coercers::VerticalAlignment) }
             it { subject.horizontal_alignment.
-              must_be_instance_of(Vedeu::Geometries::HorizontalAlignment) }
+              must_be_instance_of(Vedeu::Coercers::HorizontalAlignment) }
             it { subject.height.must_equal(20) }
             it { subject.width.must_equal(20) }
           end
@@ -206,8 +181,6 @@ module Vedeu
 
         subject { instance.align_centre(width) }
 
-        it { instance.must_respond_to(:align_center) }
-
         context 'when a width is given' do
           it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
         end
@@ -219,6 +192,10 @@ module Vedeu
         end
       end
 
+      describe '#align_center' do
+        it { instance.must_respond_to(:align_center) }
+      end
+
       describe '#align_left' do
         let(:width) { 20 }
 
@@ -304,8 +281,6 @@ module Vedeu
       describe '#height' do
         subject { instance.height(6) }
 
-        it { instance.must_respond_to(:height=) }
-
         it 'sets the attribute to the value' do
           subject.call.must_equal(6)
         end
@@ -325,6 +300,10 @@ module Vedeu
         end
       end
 
+      describe '#height=' do
+        it { instance.must_respond_to(:height=) }
+      end
+
       describe '#rows' do
         before { Vedeu::Terminal.stubs(:size).returns([25, 80]) }
 
@@ -367,8 +346,6 @@ module Vedeu
       describe '#width' do
         subject { instance.width(25) }
 
-        it { instance.must_respond_to(:width=) }
-
         it 'sets the attribute to the value' do
           subject.call.must_equal(25)
         end
@@ -388,10 +365,16 @@ module Vedeu
         end
       end
 
-      describe '#x' do
-        subject { instance.x(2) }
+      describe '#width=' do
+        it { instance.must_respond_to(:width=) }
+      end
 
+      describe '#x=' do
         it { instance.must_respond_to(:x=) }
+      end
+
+      describe '#x' do
+        subject { instance.x(2) }
 
         it 'sets the attribute to the value' do
           subject.must_equal(2)
@@ -446,11 +429,13 @@ module Vedeu
         end
       end
 
+      describe '#y=' do
+        it { instance.must_respond_to(:y=) }
+      end
+
       describe '#y' do
         subject { instance.y(5) }
 
-        it { instance.must_respond_to(:y=) }
-
         it 'sets the attribute to the value' do
           subject.must_equal(5)
         end
@@ -504,10 +489,13 @@ module Vedeu
         end
       end
 
+      describe '#xn=' do
+        it { instance.must_respond_to(:xn=) }
+      end
+
       describe '#xn' do
         subject { instance.xn(15) }
 
-        it { instance.must_respond_to(:xn=) }
         it { subject.must_equal(15) }
 
         context 'when a block is given' do
@@ -523,10 +511,13 @@ module Vedeu
         end
       end
 
+      describe '#yn=' do
+        it { instance.must_respond_to(:yn=) }
+      end
+
       describe '#yn' do
         subject { instance.yn(8) }
 
-        it { instance.must_respond_to(:yn=) }
         it { subject.must_equal(8) }
 
         context 'when a block is given' do