vedeu 0.7.4 → 0.8.0

data/test/lib/vedeu/configuration/api_test.rb

@@ -38,9 +38,11 @@ module Vedeu
         end
       end
 
-      describe '#interactive!' do
+      describe '#interactive' do
         it { instance.must_respond_to(:interactive) }
+      end
 
+      describe '#interactive!' do
         it 'sets the option to the desired value' do
           configuration = Vedeu.configure { interactive! }
           configuration.interactive?.must_equal(true)
@@ -62,9 +64,11 @@ module Vedeu
         end
       end
 
-      describe '#standalone!' do
+      describe '#standalone' do
         it { instance.must_respond_to(:standalone) }
+      end
 
+      describe '#standalone!' do
         it 'sets the option to the desired value' do
           configuration = Vedeu.configure { standalone! }
           configuration.interactive?.must_equal(false)
@@ -87,8 +91,6 @@ module Vedeu
       end
 
       describe '#run_once!' do
-        it { instance.must_respond_to(:run_once) }
-
         it 'sets the option to the desired value' do
           configuration = Vedeu.configure { run_once! }
           configuration.once.must_equal(true)
@@ -110,9 +112,11 @@ module Vedeu
         end
       end
 
-      describe '#drb!' do
-        it { instance.must_respond_to(:drb) }
+      describe '#run_once' do
+        it { instance.must_respond_to(:run_once) }
+      end
 
+      describe '#drb!' do
         it 'sets the option to the desired value' do
           configuration = Vedeu.configure { drb! }
           configuration.drb.must_equal(true)
@@ -134,6 +138,10 @@ module Vedeu
         end
       end
 
+      describe '#drb' do
+        it { instance.must_respond_to(:drb) }
+      end
+
       describe '#drb_host' do
         it 'sets the options to the desired value' do
           configuration = Vedeu.configure { drb_host('localhost') }
@@ -163,36 +171,40 @@ module Vedeu
       end
 
       describe '#cooked!' do
-        it { instance.must_respond_to(:cooked) }
-
         it 'sets the option to the desired value' do
           configuration = Vedeu.configure { cooked! }
           configuration.terminal_mode.must_equal(:cooked)
         end
       end
 
-      describe '#fake!' do
-        it { instance.must_respond_to(:fake) }
+      describe '#cooked' do
+        it { instance.must_respond_to(:cooked) }
+      end
 
+      describe '#fake!' do
         it 'sets the option to the desired value' do
           configuration = Vedeu.configure { fake! }
           configuration.terminal_mode.must_equal(:fake)
         end
       end
 
+      describe '#fake' do
+        it { instance.must_respond_to(:fake) }
+      end
+
       describe '#raw!' do
         subject { Vedeu.configure { raw! } }
 
-        it { instance.must_respond_to(:raw) }
-
         it 'sets the option to the desired value' do
           subject.terminal_mode.must_equal(:raw)
         end
       end
 
-      describe '#debug!' do
-        it { instance.must_respond_to(:debug) }
+      describe '#raw' do
+        it { instance.must_respond_to(:raw) }
+      end
 
+      describe '#debug!' do
         it 'sets the option to the desired value' do
           configuration = Vedeu.configure { debug! }
           configuration.debug.must_equal(true)
@@ -209,14 +221,18 @@ module Vedeu
         end
       end
 
+      describe '#debug' do
+        it { instance.must_respond_to(:debug) }
+      end
+
       describe '#colour_mode' do
-        context 'when the value is invalid (nil)' do
+        context 'when the value is invalid (nil' do
           it { proc {
             Vedeu.configure { colour_mode(nil) }
           }.must_raise(Vedeu::Error::InvalidSyntax) }
         end
 
-        context 'when the value is invalid (empty)' do
+        context 'when the value is invalid (empty' do
           it { proc {
             Vedeu.configure { colour_mode('') }
           }.must_raise(Vedeu::Error::InvalidSyntax) }
@@ -274,8 +290,6 @@ module Vedeu
         #     returns([some])
         # end
 
-        it { instance.must_respond_to(:renderers) }
-
         # it 'sets the options to the desired value' do
         #   configuration = Vedeu.configure do
         #     renderer proc { other }
@@ -284,6 +298,10 @@ module Vedeu
         # end
       end
 
+      describe '#renderers' do
+        it { instance.must_respond_to(:renderers) }
+      end
+
       describe '#root' do
         it 'sets the options to the desired value' do
           configuration = Vedeu.configure { root(:controller, :action, :args) }
@@ -318,9 +336,11 @@ module Vedeu
         end
       end
 
-      describe '#compression!' do
+      describe '#compression' do
         it { instance.must_respond_to(:compression) }
+      end
 
+      describe '#compression!' do
         it 'sets the option to the desired value' do
           configuration = Vedeu.configure { compression! }
           configuration.compression.must_equal(true)
@@ -387,60 +407,81 @@ module Vedeu
       end
 
       describe '#colour' do
-        context 'when a background and foreground is given' do
-          it do
-            configuration = Vedeu.configure { colour background: '#ff0000', foreground: '#ffff00' }
-            configuration.colour.must_be_instance_of(Vedeu::Colours::Colour)
-            configuration.colour.to_s.must_equal("\e[38;2;255;255;0m\e[48;2;255;0;0m")
+        let(:configuration) {
+          Vedeu.configure do
           end
+        }
+
+        subject { configuration.colour }
+
+        it { subject.must_be_instance_of(Vedeu::Colours::Colour) }
+
+        context 'when a background and foreground is given' do
+          let(:configuration) {
+            Vedeu.configure do
+              colour background: '#ff0000', foreground: '#ffff00'
+            end
+          }
+          let(:expected) {
+            Vedeu::Colours::Colour.coerce(background: '#ff0000',
+                                          foreground: '#ffff00')
+          }
+
+          it { subject.must_equal(expected) }
         end
 
         context 'when only a background is given' do
-          it do
-            configuration = Vedeu.configure { colour background: '#ff0000' }
-            configuration.colour.must_be_instance_of(Vedeu::Colours::Colour)
-            configuration.colour.to_s.must_equal("\e[48;2;255;0;0m")
-          end
+          let(:configuration) {
+            Vedeu.configure { colour background: '#ff0000' }
+          }
+          let(:expected) {
+            Vedeu::Colours::Colour.coerce(background: '#ff0000')
+          }
+
+          it { subject.must_equal(expected) }
         end
 
         context 'when only a foreground is given' do
-          it do
-            configuration = Vedeu.configure { colour foreground: '#ffff00' }
-            configuration.colour.must_be_instance_of(Vedeu::Colours::Colour)
-            configuration.colour.to_s.must_equal("\e[38;2;255;255;0m")
-          end
+          let(:configuration) {
+            Vedeu.configure { colour foreground: '#ffff00' }
+          }
+          let(:expected) {
+            Vedeu::Colours::Colour.coerce(foreground: '#ffff00')
+          }
+
+          it { subject.must_equal(expected) }
         end
 
         context 'when neither a background nor foreground is given' do
-          it do
-            configuration = Vedeu.configure { colour background: nil, foreground: nil }
-            configuration.colour.must_be_instance_of(Vedeu::Colours::Colour)
-            configuration.colour.to_s.must_equal('')
-          end
+          let(:expected) { Vedeu::Colours::Colour.new(background: :default, foreground: :default) }
+
+          it { subject.must_equal(expected) }
         end
       end
 
       describe '#foreground' do
+        subject { configuration.foreground }
+
         context 'when a value is given' do
-          it do
-            configuration = Vedeu.configure { foreground '#ffff00' }
-            configuration.foreground.must_be_instance_of(Vedeu::Colours::Foreground)
-            configuration.foreground.to_s.must_equal("\e[38;2;255;255;0m")
-          end
+          let(:configuration) {
+            Vedeu.configure { foreground('#ffff00') }
+          }
+          let(:expected) { Vedeu::Colours::Foreground.coerce('#ffff00') }
+
+          it { subject.must_equal(expected) }
         end
 
         context 'when a value is not given' do
-          it do
-            configuration = Vedeu.configure { background nil }
-            configuration.foreground.must_be_instance_of(Vedeu::Colours::Foreground)
-            configuration.foreground.to_s.must_equal("\e[39m")
-          end
+          let(:configuration) {
+            Vedeu.configure {}
+          }
+          let(:expected) { Vedeu::Colours::Foreground.new(:default) }
+
+          it { subject.must_equal(expected) }
         end
       end
 
       describe '#mouse!' do
-        it { instance.must_respond_to(:mouse) }
-
         it 'sets the option to the desired value' do
           configuration = Vedeu.configure { mouse! }
           configuration.mouse.must_equal(true)
@@ -462,6 +503,10 @@ module Vedeu
         end
       end
 
+      describe '#mouse' do
+        it { instance.must_respond_to(:mouse) }
+      end
+
     end # API
 
   end # Config

data/test/lib/vedeu/cursors/coordinate_test.rb

@@ -15,9 +15,16 @@ module Vedeu
           type:   type,
         }
       }
-      let(:_name)  {}
-      let(:offset) {}
-      let(:type)   {}
+      let(:_name)      {}
+      let(:offset)     {}
+      let(:type)       {}
+      let(:geometry)   {
+        Vedeu::Geometries::Geometry.new(name: _name, x: 2, y: 3, xn: 10, yn: 6)
+      }
+
+      before do
+        Vedeu.geometries.stubs(:by_name).returns(geometry)
+      end
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -26,139 +33,73 @@ module Vedeu
         it { instance.instance_variable_get('@type').must_equal(type) }
       end
 
-      describe '#dn' do
-        subject { instance.dn }
-
-        # it { skip }
-      end
-
-      describe '#position' do
-        subject { instance.position }
-
-        # it { skip }
-      end
-
-      # let(:described) { Vedeu::Cursors::Coordinate }
-      # let(:instance)  { described.new(_name, oy, ox) }
-      # let(:_name)     { 'coordinate' }
-      # let(:oy)        { 0 }
-      # let(:ox)        { 0 }
-      # let(:height)    { 6 }
-      # let(:width)     { 6 }
-      # let(:x)         { 7 }
-      # let(:y)         { 5 }
-      # let(:border)    { Vedeu::Borders::Border.new(name: _name, enabled: true) }
-      # let(:geometry)  {
-      #   Vedeu::Geometries::Geometry.new(name:   _name,
-      #                                 height: height,
-      #                                 width:  width,
-      #                                 x:      x,
-      #                                 y:      y)
-      # }
-
-      # before do
-      #   Vedeu.borders.stubs(:by_name).returns(border)
-      #   Vedeu.geometries.stubs(:by_name).returns(geometry)
-      # end
-
-      # describe '#initialize' do
-      #   it { instance.must_be_instance_of(described) }
-      #   it { instance.instance_variable_get('@name').must_equal(_name) }
-      #   it { instance.instance_variable_get('@oy').must_equal(oy) }
-      #   it { instance.instance_variable_get('@ox').must_equal(ox) }
-      # end
-
-      # describe '#yn' do
-      #   subject { instance.yn }
+      describe '#dn_position' do
+        subject { instance.dn_position }
 
-      #   context 'when the height is <= to 0' do
-      #     let(:height) { 0 }
+        context 'when the type is x' do
+          let(:type) { :x }
 
-      #     it { subject.must_equal(0) }
-      #   end
+          context 'when d_dn is <= 0' do
+            before { geometry.stubs(:bordered_width).returns(0) }
 
-      #   context 'when the height is > 0' do
-      #     it { subject.must_equal(9) }
-      #   end
-      # end
+            it { subject.must_equal(0) }
+          end
 
-      # describe '#xn' do
-      #   subject { instance.xn }
+          context 'when d_dn > 0' do
+            it { subject.must_equal(11) }
+          end
+        end
 
-      #   context 'when the width is <= to 0' do
-      #     let(:width) { 0 }
+        context 'when the type is y' do
+          let(:type) { :y }
 
-      #     it { subject.must_equal(0) }
-      #   end
+          context 'when d_dn is <= 0' do
+            before { geometry.stubs(:bordered_height).returns(0) }
 
-      #   context 'when the width is > 0' do
-      #     it { subject.must_equal(11) }
-      #   end
-      # end
+            it { subject.must_equal(0) }
+          end
 
-      # describe '#y' do
-      #   let(:oy)  { 0 }
-
-      #   subject { instance.y }
-
-      #   it { subject.must_be_instance_of(Fixnum) }
-
-      #   context 'with a negative index' do
-      #     let(:oy) { -3 }
-
-      #     it { subject.must_equal(6) }
-      #   end
-
-      #   context 'with an index greater than the maximum index for y' do
-      #     let(:oy) { 9 }
-
-      #     it { subject.must_equal(9) }
-
-      #     context 'but the height is negative' do
-      #       let(:height) { -2 }
-
-      #       it { subject.must_equal(1) }
-      #     end
-      #   end
-
-      #   context 'with an index within range' do
-      #     let(:oy) { 3 }
-
-      #     it { subject.must_equal(8) }
-      #   end
-      # end
+          context 'when d_dn > 0' do
+            it { subject.must_equal(7) }
+          end
+        end
+      end
 
-      # describe '#x' do
-      #   let(:ox)  { 0 }
+      describe '#d_position' do
+        subject { instance.d_position }
 
-      #   subject { instance.x }
+        context 'when the type is x' do
+          let(:type) { :x }
 
-      #   it { subject.must_be_instance_of(Fixnum) }
+          context 'when the offset is <= 0' do
+            let(:offset) { 0 }
 
-      #   context 'with a negative index' do
-      #     let(:ox) { -3 }
+            it { subject.must_equal(2) }
+          end
 
-      #     it { subject.must_equal(8) }
-      #   end
+          context 'when the offset is > dn_index' do
+            let(:offset) { 0 }
 
-      #   context 'with an index greater than the maximum index for x' do
-      #     let(:ox) { 9 }
+            it { subject.must_equal(2) }
+          end
 
-      #     it { subject.must_equal(11) }
+          context 'when the offset is <= dn_index' do
+            let(:offset) { 0 }
 
-      #     context 'but the width is negative' do
-      #       let(:width) { -2 }
+            it { subject.must_equal(2) }
+          end
+        end
 
-      #       it { subject.must_equal(3) }
-      #     end
-      #   end
+        context 'when the type is y' do
+          let(:type) { :y }
 
-      #   context 'with an index within range' do
-      #     let(:ox) { 3 }
+          context 'when the offset is <= 0' do
+            let(:offset) { 0 }
 
-      #     it { subject.must_equal(10) }
-      #   end
-      # end
+            it { subject.must_equal(3) }
+          end
+        end
+      end
 
     end # Coordinate