vedeu 0.6.69 → 0.6.70

data/test/lib/vedeu/models/focus_test.rb

@@ -17,14 +17,14 @@ module Vedeu
       before do
         Vedeu.stubs(:log)
 
-        described.reset
-        Vedeu.interfaces.reset
+        described.reset!
+        Vedeu.interfaces.reset!
 
         Vedeu.stubs(:trigger)
       end
       after do
-        described.reset
-        Vedeu.interfaces.reset
+        described.reset!
+        Vedeu.interfaces.reset!
       end
 
       describe '#add' do
@@ -101,7 +101,7 @@ module Vedeu
       end
 
       describe '#current' do
-        before { described.reset }
+        before { described.reset! }
 
         subject { described.current }
 
@@ -113,7 +113,7 @@ module Vedeu
         end
 
         context 'when no interfaces are defined' do
-          it { proc { subject }.must_raise(Vedeu::Error::Fatal) }
+          it { subject.must_equal(nil) }
         end
 
         context 'API methods' do
@@ -148,6 +148,21 @@ module Vedeu
         end
       end
 
+      describe '#focus?' do
+        context 'when there are no interfaces defined' do
+          before { described.reset! }
+
+          it { described.focus?.must_equal(false) }
+        end
+
+        context 'when there are interfaces defined' do
+          before { described.add('thallium') }
+          after  { described.reset! }
+
+          it { described.focus?.must_equal(true) }
+        end
+      end
+
       describe '#next_item' do
         it 'the next interface is focussed when the method is called' do
           described.add('thallium')
@@ -157,7 +172,7 @@ module Vedeu
         end
 
         context 'returns false if storage is empty' do
-          before { described.reset }
+          before { described.reset! }
 
           it { described.next_item.must_equal(false) }
         end
@@ -188,7 +203,7 @@ module Vedeu
         end
 
         context 'when there are no interfaces' do
-          before { described.reset }
+          before { described.reset! }
 
           it { described.next_visible_item.must_equal(false) }
         end
@@ -203,7 +218,7 @@ module Vedeu
         end
 
         context 'returns false if storage is empty' do
-          before { described.reset }
+          before { described.reset! }
 
           it { described.prev_item.must_equal(false) }
         end
@@ -235,7 +250,7 @@ module Vedeu
         end
 
         context 'when there are no interfaces' do
-          before { described.reset }
+          before { described.reset! }
 
           it { described.prev_visible_item.must_equal(false) }
         end

data/test/lib/vedeu/models/page_test.rb

@@ -275,6 +275,12 @@ module Vedeu
         end
       end
 
+      describe '#size' do
+        subject { instance.size }
+
+        it { subject.must_be_instance_of(Fixnum) }
+      end
+
     end # Page
 
   end # Models

data/test/lib/vedeu/models/row_test.rb

@@ -144,6 +144,18 @@ module Vedeu
         end
       end
 
+      describe '#reset_character' do
+        subject { instance.reset_character }
+
+        it { subject.must_be_instance_of(Vedeu::Views::Char) }
+      end
+
+      describe '#size' do
+        subject { instance.size }
+
+        it { subject.must_be_instance_of(Fixnum) }
+      end
+
     end # Row
 
   end # Models

data/test/lib/vedeu/presentation/background_test.rb

@@ -0,0 +1,72 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Presentation
+
+    module Colour
+
+      describe Background do
+
+        let(:includer) { Vedeu::PresentationColourTestClass.new(attributes) }
+        let(:attributes) {
+          {
+            colour: colour,
+            parent: parent
+          }
+        }
+        let(:colour)     {
+          {
+            background: background,
+            foreground: foreground
+          }
+        }
+        let(:background) { '#000033' }
+        let(:foreground) { '#aadd00' }
+        let(:parent)     { Vedeu::ParentPresentationColourTestClass.new }
+
+        describe '#background' do
+          subject { includer.background }
+
+          it { subject.must_be_instance_of(Vedeu::Colours::Background) }
+
+          context 'when a colour is not set' do
+            let(:colour) {}
+
+            context 'when a parent is not available' do
+              let(:parent) {}
+
+              it { subject.colour.must_equal('') }
+            end
+
+            context 'when a parent is available' do
+              it { subject.colour.must_equal('#330000') }
+            end
+          end
+
+          context 'when a colour is set' do
+            it { subject.colour.must_equal('#000033') }
+          end
+
+          # @todo Add more tests.
+        end
+
+        describe '#background=' do
+          subject { includer.background = '#987654' }
+
+          it {
+            includer.colour.background.colour.must_equal('#000033')
+            subject
+            includer.colour.background.colour.must_equal('#987654')
+          }
+
+          it { subject.must_equal('#987654') }
+        end
+
+      end # Background
+
+    end # Colour
+
+  end # Presentation
+
+end # Vedeu

data/test/lib/vedeu/presentation/colour_test.rb

@@ -0,0 +1,67 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Presentation
+
+    describe Colour do
+
+      let(:includer) { Vedeu::PresentationColourTestClass.new(attributes) }
+      let(:attributes) {
+        {
+          colour: colour,
+          parent: parent
+        }
+      }
+      let(:colour)     {
+        {
+          background: background,
+          foreground: foreground
+        }
+      }
+      let(:background) { '#000033' }
+      let(:foreground) { '#aadd00' }
+      let(:parent)     { Vedeu::ParentPresentationColourTestClass.new }
+
+      describe '#colour' do
+        subject { includer.colour }
+
+        it { subject.must_be_instance_of(Vedeu::Colours::Colour) }
+
+        context 'when a colour is not set' do
+          let(:colour) {}
+
+          context 'when a parent is not available' do
+            let(:parent) {}
+
+            it { subject.background.colour.must_equal('') }
+            it { subject.foreground.colour.must_equal('') }
+          end
+
+          context 'when a parent is available' do
+            it { subject.background.colour.must_equal('#330000') }
+            it { subject.foreground.colour.must_equal('#00aadd') }
+          end
+        end
+
+        context 'when a colour is set' do
+          it { subject.background.colour.must_equal('#000033') }
+          it { subject.foreground.colour.must_equal('#aadd00') }
+        end
+      end
+
+      describe '#colour=' do
+        let(:colour) {
+          Vedeu::Colours::Colour.new(foreground: '#00ff00', background: '#000000')
+        }
+
+        subject { includer.colour=(colour) }
+
+        it { subject.must_be_instance_of(Vedeu::Colours::Colour) }
+      end
+
+    end # Colour
+
+  end # Presentation
+
+end # Vedeu

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

@@ -0,0 +1,73 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Presentation
+
+    module Colour
+
+      describe Foreground do
+
+        let(:includer) { Vedeu::PresentationColourTestClass.new(attributes) }
+        let(:attributes) {
+          {
+            colour: colour,
+            parent: parent
+          }
+        }
+        let(:colour)     {
+          {
+            background: background,
+            foreground: foreground
+          }
+        }
+        let(:background) { '#000033' }
+        let(:foreground) { '#aadd00' }
+        let(:parent)     { Vedeu::ParentPresentationColourTestClass.new }
+
+        describe '#foreground' do
+          subject { includer.foreground }
+
+          it { subject.must_be_instance_of(Vedeu::Colours::Foreground) }
+          it { subject.colour.must_equal('#aadd00') }
+
+          context 'when a colour is not set' do
+            let(:colour) {}
+
+            context 'when a parent is not available' do
+              let(:parent) {}
+
+              it { subject.colour.must_equal('') }
+            end
+
+            context 'when a parent is available' do
+              it { subject.colour.must_equal('#00aadd') }
+            end
+          end
+
+          context 'when a colour is set' do
+            it { subject.colour.must_equal('#aadd00') }
+          end
+
+          # @todo Add more tests.
+        end
+
+        describe '#foreground=' do
+          subject { includer.foreground = '#123456' }
+
+          it {
+            includer.colour.foreground.colour.must_equal('#aadd00')
+            subject
+            includer.colour.foreground.colour.must_equal('#123456')
+          }
+
+          it { subject.must_equal('#123456') }
+        end
+
+      end # Foreground
+
+    end # Colour
+
+  end # Presentation
+
+end # Vedeu

data/test/lib/vedeu/{output/presentation → presentation}/styles_test.rb

@@ -6,26 +6,24 @@ module Vedeu
 
     include Vedeu::Presentation
 
-    attr_reader :parent
+    attr_reader :style
 
-    def attributes
-      {
-        style: ['underline']
-      }
+    def initialize
+      @style  = ['underline']
+      @parent = nil
     end
 
-  end
+  end # ParentPresentationStyleTestClass
 
   class PresentationStyleTestClass
 
     include Vedeu::Presentation
 
-    attr_reader :attributes
     attr_reader :parent
 
     def initialize(attributes = {})
-      @attributes = attributes
-      @parent     = @attributes[:parent]
+      @style  = attributes[:style]
+      @parent = attributes[:parent]
     end
 
   end # PresentationTestClass

data/test/lib/vedeu/{output/renderers → renderers}/all_test.rb

@@ -128,9 +128,10 @@ module Vedeu
       end
     end
 
-    describe '.reset' do
-      subject { described.reset }
+    describe '.reset!' do
+      subject { described.reset! }
 
+      it { described.must_respond_to(:reset) }
       it { subject.must_be_instance_of(Set) }
       it { subject.size.must_equal(0) }
     end

data/test/lib/vedeu/{output/renderers → renderers}/html_test.rb

@@ -28,13 +28,14 @@ module Vedeu
       let(:start_tag)     { '<td' }
       let(:start_row_tag) { '<tr>' }
       let(:template)      {
-        ::File.dirname(__FILE__) + '/../../../../support/templates/html_renderer.vedeu'
+        ::File.dirname(__FILE__) + '/../../../support/templates/html_renderer.vedeu'
       }
       let(:timestamp)     { false }
       let(:write_file)    { false }
       let(:buffer)        { Vedeu::Buffers::Terminal }
 
       before do
+        Vedeu::Configuration.stubs(:compression?).returns(false)
         ::File.stubs(:write)
         Vedeu.stubs(:height).returns(2)
         Vedeu.stubs(:width).returns(4)

data/test/lib/vedeu/{output/renderers → renderers}/json_test.rb

@@ -13,6 +13,7 @@ module Vedeu
       let(:_name)     { 'Vedeu::Renderers::JSON' }
 
       before do
+        Vedeu::Configuration.stubs(:compression?).returns(false)
         ::File.stubs(:write)
         Vedeu.stubs(:height).returns(1)
         Vedeu.stubs(:width).returns(1)

data/test/lib/vedeu/{output/renderers → renderers}/options_test.rb

@@ -30,16 +30,20 @@ module Vedeu
       describe '#compress?' do
         subject { instance.compress? }
 
-        context 'when the option is not set' do
+        context 'when the option is not set or is set to false' do
           before { options.tap { |o| o.delete(:compression) } }
 
-          it { subject.must_equal(false) }
-        end
+          context 'when Vedeu::Configuration.compression? is set to false' do
+            before { Vedeu::Configuration.stubs(:compression?).returns(false) }
+
+            it { subject.must_equal(false) }
+          end
 
-        context 'when the option is set and is false' do
-          let(:compression) { false }
+          context 'when Vedeu::Configuration.compression? is set to true' do
+            before { Vedeu::Configuration.stubs(:compression?).returns(true) }
 
-          it { subject.must_equal(false) }
+            it { subject.must_equal(true) }
+          end
         end
 
         context 'when the option is set and is true' do

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

@@ -43,6 +43,7 @@ module Vedeu
     describe '.reset!' do
       subject { described.reset! }
 
+      it { described.must_respond_to(:reset) }
       it { subject.must_equal(true) }
     end
 

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

@@ -42,10 +42,12 @@ module Vedeu
           subject
           described.ready?.must_equal(false)
         }
+        it { described.instance.must_respond_to(:reset) }
       end
 
       describe '#reset!' do
         it { described.instance.must_respond_to(:reset!) }
+        it { described.instance.must_respond_to(:reset) }
       end
 
     end # Flags

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

@@ -17,7 +17,7 @@ module Vedeu
 
       describe '#background' do
         let(:expected) {
-          "{{eJxdj0+LwjAQxT1I6poqy7IX8aDUL+B5ehlYXOhNULynOkqxbSSZ+If98sZ0q+BcMsObN7+Xbk/DaEM7cgCbgi4WYMWGVBXDJypmU+SOyf5JkNuyoJrnvtGldkbD+N/3E2bbNpF35mp7PBjt6l2WxLN5KAFisfbaXhtqNA2T9xO/T1FAjA0pSzoilWuQJ2VCgr7lW0kv99KQ9YLiQteP/F4UIPGsSkd+O7xZ8v0KNWW6crj5UauKWoAHNn9Mhxj5qeVJDECU6RfG0MeHBwd3NqRjxg==}}"
+          "{{eJxdjk8LgkAUxDvEGuqhoEt0KOwLeH5eFqLAW5B43/QV0rov1t3+fPtWy4TmNMNvGGY8IVjkWKIFyCt8NABHo1HUAYS8kBUqE7eOJFlNsPxWt11ueuPBlJ9Ecb1osqpMo3ATd2LAdpljZ9L4YQSr/4n9D7LES6MRS/wMfK5EjX0K+U3o7krAG/OSOMwcNDaOCFORar87yFzrLqTFOJml0Xw4tjb4NO3gG3z2TbI=}}"
         }
 
         subject { instance.background('#000000') { 'background text' } }
@@ -43,7 +43,16 @@ module Vedeu
             }
           }
           let(:expected) {
-            "{{eJxdj0GLAjEMhT1Ide0osjfxoIx/oHjMXAKLC3MTVrxXjTI4TqVNXcU/v7Wzo+ApCV/ee0m7a2C0ph15gHVBvw7ghy3pUwJD1My22Hgmd5cgt2VBFavQmNJ4a2D8r/uKs2uaTlBu9PZ4sMZXuzxNZkrN50oJEItVYHtjqWYGJu8W308oIME6KU9bIpMrkGdt4wU9x7eSXuqlJReA5sJUj/sDFCDxoktPYTvWPB3WblOmK0e/j0qfqDEPYfV/2QA7YWqyJMYwlNknJtDDhwb7f4vpYjo=}}"
+            "{{eJxdjs0KgkAYRVvEGOrCltGisBcYXH5uBqLAXZC4n/QrpNGJ+enn7Rs1C9rdy7kc7nQmYVFghRagqPGhAY5GIW8CCFkpamwN7ZIU0ioJy89023c9Bg8iduLl9aKkbassDjeUJgmlBMgud+wsFQ5Mwupfsf9CknpZPCGpn4PPWt7g2EJ246q/EjBtXgJ/moNC7Qg3tWy77w4St7pzYZGm8yyOhu9rg0/Tyd5Hdkwm}}"
+          }
+          let(:expected_decoded) {
+            Vedeu::Views::Stream.new(
+              client: nil,
+              colour: Vedeu::Colours::Colour.coerce(attributes),
+              name:   '',
+              parent: nil,
+              style:  Vedeu::Presentation::Style.new,
+              value: 'colour text')
           }
 
           it { subject.must_equal(expected) }
@@ -56,7 +65,7 @@ module Vedeu
             }
           }
           let(:expected) {
-            "{{eJxdTz1vwjAQ7VCZgo2E2BBDq/QPZL4sp1YM2ZBA7AYuVdQkruxzW8Sf5+IAlerF9/Tufdzjk4PFjo4UAXY1/QSADXuyrYEZWmZf7yNTOGvQh6amjnMZXOOid7C86t4TDrdhJMq9PXx+eBe7o4Pn/2tvd1KBwcGtzB4UqNVWtJXzNNBlZl6rKpeniukW9Jf1qcEk8KmhP+e1pyCE5dp1fX8hFWj8tk0k2U5/mc2GpBemX05+48621Af3QIoM9xUGR4JuWRpTGOpijgYm2GtwegEm12KL}}"
+            "{{eJxdjrsOwjAMRRlQimiHMiIGUPmBzu4SgRi6IVF1D9RFFWmMkpTH35O0PCQ8Xfse23c8IZiXWGEHUDZ4NwAHq1G0IUT8JBtUNvWKJHWaYPFGt31vPiKAmB/F6XLW1KmKYPmPbb4my4I8GTFgu8It1aRxmOdJtK7r1BXLwgKmXIkWPem7iF+F7qOE3NinxN+LvUbjHGEbUj67M5mjbkJ2mGazPImH7CuLD+uPvQC3X0x2}}"
           }
 
           it { subject.must_equal(expected) }
@@ -70,7 +79,7 @@ module Vedeu
             }
           }
           let(:expected) {
-            "{{eJxFTj0LwkAMdZCqvQ5dxUHRP1BcCnEJiIOboLifmkqx7cldzg/888bTYpa85OXlvW7fwHBPJ/IA+5LuDmDLlnSdQIqa2ZYHz+ReCtSxKqnhTICpjLcGRj/dMsyuBT1RHvTxcrbGN6f1NJllUvN5BNFqJ1xhLP25osjzLIsWagfqqm1wiB0/KzIw/hlsLDkhNJem+eQTMgKFN115kuvQ19P0m2vC9ODwb9DoWvadMCTY5hcUDrEnsLVUGDwxXqSoIMaPFJM3E8dZBA==}}"
+            "{{eJxFjjsLwkAQhC0kSpIirVgo8Q8caQKb5kAs0gmG9KfZSPByK/fw8e+9xIhbzfANOzNfEqxqbNAB1B0+DcDJahR9BDG/yA6VZYMiSU4TrKfofvTmJxaQ8LO43K6anGrKNN4xf1kWQHCoPGtJ45+1bZ4zFhRhBSFXoscynY0u5nehx8aIG/uWSLCZCo8ajSfCdqSGiR4GPvUQ0iErkjJNvhO3Fl92ePYBmEpC+w==}}"
           }
 
           it { subject.must_equal(expected) }
@@ -79,7 +88,7 @@ module Vedeu
 
       describe '#foreground' do
         let(:expected) {
-          "{{eJxdT02LwjAQ9SDRNSmIeFk8rNQ/0PP0MigeeltY8R51lGJtJJnsKv5509QP2FwyjzfvY7p9A59r2pEHWJf05wB+2JI+KRiiZrblxjO5mwS5rUqqOQuDqYy3BiYP3SJi9xx6QbnR2+PBGl/vDHz9X5u/SAEKW7ci7QgQy1XQ7o2lli5SNcviE3myAnnWNjYYOL5W9Hb+tuQCobk0ddM/kAIk/urKU9iOf5GO38ZTpgtHz49an6gJb0Ao096YK+wF9MyTGANR5iNUMMBGg8kdnYZjyg==}}"
+          "{{eJxdTrsOwjAMZEApoh1AYkEMoPIDnd0lAjF0Q6LqHlqDKtIYpQmPvycpj0p4uvOdfTccEcwLrNACFDXeW4CD0SiaECJeyhqVSTwiSVYTLD7WbcfbLwhgwo+ivJw1WVURLP9tm5/I0iCLBwzYLndHJ9L43mdxtE66YWmYw5gr0aB3ehbxq9BdlZC35imxj9hrbJ0iTE3Kd3cic66bkBaTdJrFsz5jZfBh/MMXxlpNtQ==}}"
         }
 
         subject { instance.foreground('#000000') { 'foreground text' } }
@@ -91,7 +100,7 @@ module Vedeu
 
       describe '#style' do
         let(:expected) {
-          "{{eJx1kD9vAjEMxRlQCneB0oEBdSjiE3R2lghUJLZKRew5zlSnhjNKnALqlycX/kmV2J7z/Hu20+4QjFZYYgBYVbj3AF/s0GwlDLRhdlURGP1fDvnaVljzexRkKTiC1ws3S7W/ik4kC7P++XYU6pLg7X/b9GYKkPqctpi0BIiPZWQ35PAhO7+ZQskGUr0l5Nrz0SJ0C7Il5Dvj0qJZer2HfDr00TBcUd2cGU0R2V9jA6oXyJJYTJ4TNmY8cErv1maL11Fx3/M3KKmfYnWZpQZaqqHuQaabbt0/AcA1bbY=}}"
+          "{{eJx1j08LgkAQxTuEWUoGnaJD4SfoPHtZigJvQeJ91SmkdSfWtT/fPle0IOj2Zt57P2aGLsEiwRxrgKTARwVwMhpF6YHPM1mgMhurSFKtCZZddNfOVS9cmPFUZNeLplrlBKvf2PZjOmwUhQMHnH3clM6k8W/p8DG7EvNi8HhlXhJhnJLMYcKVKLH3fH4T2l7Mpl/cUWPV7IQpSNnnmrLTUO5C1sgCNo/CoCWuDT6NxbwBBzVXlA==}}"
         }
 
         subject { instance.style(:bold) { 'style text' } }

data/test/lib/vedeu/{models/views → views}/line_test.rb

@@ -71,7 +71,6 @@ module Vedeu
 
       describe 'accessors' do
         it {
-          instance.must_respond_to(:attributes)
           instance.must_respond_to(:parent)
           instance.must_respond_to(:parent=)
         }
@@ -84,6 +83,12 @@ module Vedeu
         it { instance.must_respond_to(:<<) }
       end
 
+      describe '#attributes' do
+        subject { instance.attributes }
+
+        it { subject.must_be_instance_of(Hash) }
+      end
+
       describe '#chars' do
         subject { instance.chars }
 

data/test/lib/vedeu/views/lines_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Views
+
+    describe Lines do
+
+    end # Lines
+
+  end # Views
+
+end # Vedeu

data/test/lib/vedeu/{models/views → views}/stream_test.rb

@@ -59,7 +59,6 @@ module Vedeu
           instance.must_respond_to(:content)
           instance.must_respond_to(:text)
           instance.must_respond_to(:value=)
-          instance.must_respond_to(:attributes)
         }
       end
 
@@ -73,6 +72,12 @@ module Vedeu
         it { instance.must_respond_to(:<<) }
       end
 
+      describe '#attributes' do
+        subject { instance.attributes }
+
+        it { subject.must_be_instance_of(Hash) }
+      end
+
       describe '#chars' do
         subject { instance.chars }
 

data/test/lib/vedeu/views/streams_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Views
+
+    describe Streams do
+
+    end # Streams
+
+  end # Views
+
+end # Vedeu

data/test/lib/vedeu/views/view_collection_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Views
+
+    describe ViewCollection do
+
+    end # ViewCollection
+
+  end # Views
+
+end # Vedeu

data/test/lib/vedeu/{models/views → views}/view_test.rb

@@ -30,7 +30,6 @@ module Vedeu
 
       describe 'accessors' do
         it {
-          instance.must_respond_to(:attributes)
           instance.must_respond_to(:client)
           instance.must_respond_to(:client=)
           instance.must_respond_to(:cursor_visible)
@@ -54,6 +53,12 @@ module Vedeu
         # it { skip }
       end
 
+      describe '#attributes' do
+        subject { instance.attributes }
+
+        it { subject.must_be_instance_of(Hash) }
+      end
+
       describe '#deputy' do
         subject { instance.deputy }
 

data/test/support/examples/material_colours_app.rb

@@ -287,7 +287,7 @@ class VedeuMaterialColoursApp
                 message: "Keypresses: #{Vedeu.all_keypresses.inspect}")
     end
 
-    key('q')        { Vedeu.trigger(:_exit_) }
+    key('q', :ctrl_c) { Vedeu.trigger(:_exit_) }
     # key(:escape)    { Vedeu.trigger(:_mode_switch_, :fake) }
     key(:f1)    { Vedeu.trigger(:_mode_switch_, :fake) }
     key(:f2)    { Vedeu.trigger(:_mode_switch_, :raw) }