vedeu 0.6.8 → 0.6.9

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

@@ -21,7 +21,9 @@ module Vedeu
       end
 
       context 'when there are registered interfaces' do
-        let(:interface)  { Vedeu::Interface.new(name: 'Vedeu::Refresh') }
+        let(:interface)  {
+          Vedeu::Models::Interface.new(name: 'Vedeu::Refresh')
+        }
         let(:interfaces) { [interface] }
 
         before { Vedeu.interfaces.stubs(:zindexed).returns(interfaces) }

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

@@ -17,7 +17,7 @@ module Vedeu
 
       describe '#background' do
         let(:expected) {
-          "{{eJx1j08PATEQxR2ki5YQLuJA1hdwnr1MCMmeiXvZIRtrK93Wn/jyqiyJRC+dl9f3m9dqTUF/TQlZgHVKlwJgaTTJo4A2SmN0urGGijsHvs1Sys3EDSpTVisYvHMzr4tyCFxyI7eHvVY2TxQMf59NPyYDgS9aHIrxxB8GbL5yiJ3S9Bex+JgsEnFYYVFzBfwktW/YKMwtIwWdd2z5lAw4nmVmyfn+jsPet+bI0NV4Sj2XRyqRrt7r15HAwKlyA0e/AkXUxSY08JnB1gP9j2kt}}"
+          "{{eJx1UE1rAjEQ7UGiNbEI7aX0oKx/wPPsZVAs7E1QvMfdaVlcNyWZtEr/fLPRdUHoXDLDm/eR6Q0MvO6oIA+wK+nHAWzYkj4qGKNmtuXeM7lfCTKvSqp5HhpTGW8NvF15yzi7tukH5l7nh09rfF0YmNyvLW6gAIUXtSxRs3ksAWK1DRIfxtK/Eu83UKQqSx5EOtqC/NI2Jhw6PlfU0daWXAA0l6Zu/hdAARK/deUpbMc3S1660FOmE0fNx1ofqTUIYS83SBX2w9T6SYyGqNJnHMEQGw4+/QF64W6r}}"
         }
 
         subject { instance.background('#000000') { 'background text' } }
@@ -43,7 +43,7 @@ module Vedeu
             }
           }
           let(:expected) {
-            "{{eJx1jzGPwjAMhRlQypEUcboJMYDKH4gY3cW6Eyd1BrGnYFBFaVCacKD784SUMiAx2U/P77Pd7WkYrWlLDmBd0F8NsLSG1FHAEJW1psidpfqfA9+UBVVW+kaX2hkN40fuJ+i6bSKfzNXmsDfaVVsNk9ex76fJQGBDyxIxk3I+l5IBW6w8YqcNvUX8Pk2WiizpsDReAT8pEy7s1/ZakobPR2x5lww4nlXpyPuhZsmw2T21dLGB8FGpI7U4f1rzcSow8qqlcwx4FOkXxtDHewYHNz0LZ6E=}}"
+            "{{eJx1j09rAjEQxXso0ZooQk/Sg2X9AsHj7GVoqbC3guI96lQW140kk/7BL2/MdhUETzPDm/ebN49dC6MlbSgALEv68QBzdmT2CoZomF25Ckz+KEGuq5Jq1rGxlQ3Owsu/7z3Nvm060bky693W2VBvLIxv194uogCFDa3I1ETr6VRrAeJjERFf1tFdxOwiilwV2YPI+wuQB+NSwp7nv4qutk9HPgqGS1uf/4uiAInfpgoUt1MtsmGT5JXplxPvqTZ7auExaPN/rrATp/aWxHQMVf6Mfejh2YODE6SObR8=}}"
           }
 
           it { subject.must_equal(expected) }
@@ -56,7 +56,7 @@ module Vedeu
             }
           }
           let(:expected) {
-            "{{eJx1j0sLwjAQhD1IfCQVxZN4UOof8Ly9LIpCz4r3qFspto2kiQ/886apehDMJTtMvtlJs61gtKMjWYBdSrcSYGM0yVxAH6UxOt1bQ+WTAz9kKRVm7gaVKasVjN/c0uvyM7QcuZeH80krWxwVTH6fLb4mA4F1Whw2GLDV1rGJ0vSXXX9NFok4FLMkmbvDomAL/CK1b9gtzSMjBYM3vakkA45XmVlyvr/jsF/vnhq6G5/QKWROVZVKuGr1jyOBLac+6Rx9PIpoiAF0sWKw9wKlIWgJ}}"
+            "{{eJx1j09rAjEQxXuQaE0UoSfpoWX7BTzPXgaLhb0VFO9RZ8vSdVOSSVX65Tub9Q8Umkvm8eY386Y3cDBd044iwLqiQwBYsie7NzBBy+yrTWQKPxr0tq6o4ZkUrnbRO3g8c69Jh0vRF3Jjt58f3sVm5+Dpb9v8aiow2E0rsjsFarEStnSe/mXfrqbKTZGZl7KcyVP5aAX6y/qUcBj4VNONfvcUxLBcuaa9T0wFGr9tHUm6019kky7JM9OR07z7xu6pDdYKCdrdnxvsi7rs0piWockfcARDbBkc/wISY22H}}"
           }
 
           it { subject.must_equal(expected) }
@@ -70,7 +70,7 @@ module Vedeu
             }
           }
           let(:expected) {
-            "{{eJx1j0sLwjAQhD1IfCSK4kk8KPoHihdhe1kUBc8V71G3UqyNpIkP/POmqXoQzCU7O5mPSbWuoL+lA1mAbUK3HCAymuRZQAelMTrZWUP5kwPfpwllJnCDSpXVCgbv3MLr/DPUXHIn96ejVjY7KBj+Ppt/TQYCS9p6LCaBO9MpA7bcOESsNP1FrL4mC0WRjePZLAhY2NoAv0jtizZz80hJQfedjgrJgONVppac7+/1uFNWGBm6G09oZPLs9hUvXMPy46HAmlMfOkePRxH2sAVNLDLYfgH3e2lq}}"
+            "{{eJx1UMFqAjEQ7aFEa6IIPUkPFf2BxYswexlaWvBWqHiPOiuL66Ykk2rpz3c2WxUKzSXz5s1785LbroPRirYUAVYlHQPAO3uyBwNDtMy+XEem8K1Bb6qSas6kcJWL3sHDr+454XAuOqJc281+512stw4e/449XUgFBlu3xcRMMzmzmQL1shSLwnn61+L1QqrcNNqimM+zTOX9JegP61PQXuCviq7qN09BCMulq5tnCqlA46etIsl0uheTYRtozHTi5HdX24P0bxKQvO035AY7gs67NKZlaPJ77EMPGw0OfgB4C27o}}"
           }
 
           it { subject.must_equal(expected) }
@@ -79,7 +79,7 @@ module Vedeu
 
       describe '#foreground' do
         let(:expected) {
-          "{{eJx1j0sLwjAQhD1IqiaKohfxoNQ/4Hl7WRSFnhXv0a5SrI2kiQ/886bxBYK5ZIfJtzOp1hT015SQBVindCkAlkaTPApoozRGpxtrqLhz4NsspdxM3KAyZbWCwYubeV28h8CRG7k97LWyeaJg+Pts+jEZCHxui8MKAzZfOXanNP1lFx+TRSIOxXjiD4uaK+AnqX3DRmFuGSnovOhlKRlwPMvMkvP9HYe9b9TI0NX4LfVcHqmsUwpX7/nrSGDg1DuBo49AEXWxCQ0sGWw9ADevaUg=}}"
+          "{{eJx1kMuKAjEQRV1IfCSK4GxkFkr7A66rN4XiQO8ExX3UmqGx7UhS8cH8/KTjC4TJJnW5depWUm8aGKxpRx5gndPZASzZkj4o6KFmtvnGM7lfCXJb5FTyJBSmMN4a+Lxzs6jdo2gEcqO3+x9rfLkzMHxvmz5NAQpv07KkJkDMV4H9Npb+Zb+epkhVlqjxJB6RdlYgj9rGDduOrwW96IUlFwzNuSmr9wVTgMSTLjyF7nhnyccreMR04TizVeoDVctVIix7+4NUYSOoR57EGIgq7WMH2lgx2P0DtPJuxg==}}"
         }
 
         subject { instance.foreground('#000000') { 'foreground text' } }
@@ -91,7 +91,7 @@ module Vedeu
 
       describe '#style' do
         let(:expected) {
-          "{{eJx1j71OAzEQhCkiJzk7EESFKEB5Auq5ZgUKUupE6X25BZ1wbpHP5ke8PD4nlwIp3Yxmv9nd0URwu+WaI7Bt+KsD1sGz3RvMyYbgmyoG7n419M413IbHJMRJ9IK7I/ecfTeIcSIru3t/8xLbWnD/f+zpFCoYOrStFhcKarlJ7Kt4Psu+nEJVmh4qZxvoD+vzaUUXfhwLro/YurcKmj6ti4xpJa5Gkc1qcZWHHwJ/h9wybe2eh8p01+Hd0tA4uWGDpkyRKW9ohoJ6hi7/AKgrZ54=}}"
+          "{{eJx1j0FLAzEQhT1IajepFTyJB0t/Qc+zl0Gp0Jtg6T3bnZal6U5JJrbinzebuhUEb/N48715c33D8LCimiLAqqFjAHgXT3Zv4A6tiG+qKBS+NOi1a6iVWRrYcfQMjz/cS9ahHwaJrOx6t/Uc25rh6e/a88VUYPCctpheKVDzZWI37Olf9vViqtJ0UDlagj5Yn6sVQT4d/WJvnkIyrDTcdo8lU4HGD+siwbBiV0ORxWI6zuhE6CQ5c9jaPfUHUsvz86XBQVL9PY2ZQlPe4wgK7Bi8/QYTK20c}}"
         }
 
         subject { instance.style(:bold) { 'style text' } }

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

@@ -186,7 +186,7 @@ module Vedeu
         context 'with a style directive' do
           let(:content) { "This is a <%= style(:bold) { 'test' } %>." }
           let(:style) {
-            Vedeu::Style.new(:bold)
+            Vedeu::Presentation::Style.new(:bold)
           }
 
           let(:expected) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -239,6 +239,15 @@ files:
 - docs/configuration.md
 - docs/dsl.md
 - docs/events.md
+- docs/events/application.md
+- docs/events/document.md
+- docs/events/drb.md
+- docs/events/focus.md
+- docs/events/menu.md
+- docs/events/movement.md
+- docs/events/refresh.md
+- docs/events/system.md
+- docs/events/visibility.md
 - docs/getting_started.md
 - docs/object_graph.md
 - lib/vedeu.rb
@@ -398,9 +407,10 @@ files:
 - lib/vedeu/output/compressor.rb
 - lib/vedeu/output/direct.rb
 - lib/vedeu/output/output.rb
-- lib/vedeu/output/presentation.rb
 - lib/vedeu/output/presentation/colour.rb
+- lib/vedeu/output/presentation/presentation.rb
 - lib/vedeu/output/presentation/style.rb
+- lib/vedeu/output/presentation/styles.rb
 - lib/vedeu/output/renderers.rb
 - lib/vedeu/output/renderers/escape_sequence.rb
 - lib/vedeu/output/renderers/file.rb
@@ -410,7 +420,6 @@ files:
 - lib/vedeu/output/renderers/renderer_options.rb
 - lib/vedeu/output/renderers/terminal.rb
 - lib/vedeu/output/renderers/text.rb
-- lib/vedeu/output/style.rb
 - lib/vedeu/output/templates/html_renderer.vedeu
 - lib/vedeu/output/text.rb
 - lib/vedeu/output/viewport.rb
@@ -578,8 +587,9 @@ files:
 - test/lib/vedeu/output/direct_test.rb
 - test/lib/vedeu/output/output_test.rb
 - test/lib/vedeu/output/presentation/colour_test.rb
+- test/lib/vedeu/output/presentation/presentation_test.rb
 - test/lib/vedeu/output/presentation/style_test.rb
-- test/lib/vedeu/output/presentation_test.rb
+- test/lib/vedeu/output/presentation/styles_test.rb
 - test/lib/vedeu/output/renderers/escape_sequence_test.rb
 - test/lib/vedeu/output/renderers/file_test.rb
 - test/lib/vedeu/output/renderers/html_test.rb
@@ -589,7 +599,6 @@ files:
 - test/lib/vedeu/output/renderers/terminal_test.rb
 - test/lib/vedeu/output/renderers/text_test.rb
 - test/lib/vedeu/output/renderers_test.rb
-- test/lib/vedeu/output/style_test.rb
 - test/lib/vedeu/output/text_test.rb
 - test/lib/vedeu/output/viewport_test.rb
 - test/lib/vedeu/output/wordwrap_test.rb
@@ -804,8 +813,9 @@ test_files:
 - test/lib/vedeu/output/direct_test.rb
 - test/lib/vedeu/output/output_test.rb
 - test/lib/vedeu/output/presentation/colour_test.rb
+- test/lib/vedeu/output/presentation/presentation_test.rb
 - test/lib/vedeu/output/presentation/style_test.rb
-- test/lib/vedeu/output/presentation_test.rb
+- test/lib/vedeu/output/presentation/styles_test.rb
 - test/lib/vedeu/output/renderers/escape_sequence_test.rb
 - test/lib/vedeu/output/renderers/file_test.rb
 - test/lib/vedeu/output/renderers/html_test.rb
@@ -815,7 +825,6 @@ test_files:
 - test/lib/vedeu/output/renderers/terminal_test.rb
 - test/lib/vedeu/output/renderers/text_test.rb
 - test/lib/vedeu/output/renderers_test.rb
-- test/lib/vedeu/output/style_test.rb
 - test/lib/vedeu/output/text_test.rb
 - test/lib/vedeu/output/viewport_test.rb
 - test/lib/vedeu/output/wordwrap_test.rb

data/lib/vedeu/output/style.rb

@@ -1,76 +0,0 @@
-module Vedeu
-
-  # Converts the style value or value collection into a terminal escape
-  # sequence. Unrecognised values are discarded- an empty string is returned.
-  #
-  # Vedeu has a range of symbol styles which are compatible with most terminals
-  # which are ANSI compatible. Like colours, they can be defined in either
-  # interfaces, for specific lines or within streams.
-  # Styles are applied as encountered.
-  #
-  # @see Vedeu::Esc
-  #
-  class Style
-
-    include Vedeu::Common
-
-    # @!attribute [rw] value
-    # @return [String|Symbol]
-    attr_accessor :value
-
-    # Produces new objects of the correct class from the value, ignores objects
-    # that have already been coerced.
-    #
-    # @param value [Object|NilClass]
-    # @return [Object]
-    def self.coerce(value)
-      if value.is_a?(self)
-        value
-
-      else
-        new(value)
-
-      end
-    end
-
-    # Return a new instance of Vedeu::Style.
-    #
-    # @param value [Array<String|Symbol>|String|Symbol]
-    #   The style value or a collection of values.
-    # @return [Vedeu::Style]
-    def initialize(value = nil)
-      @value = value
-    end
-
-    # Return an attributes hash for this class.
-    #
-    # @return [Hash<Symbol => Array<String|Symbol>|String|Symbol>]
-    def attributes
-      {
-        style: value,
-      }
-    end
-
-    # An object is equal when its values are the same.
-    #
-    # @param other [Vedeu::Views::Char]
-    # @return [Boolean]
-    def eql?(other)
-      self.class == other.class && value == other.value
-    end
-    alias_method :==, :eql?
-
-    # Return the terminal escape sequences after converting the style or styles.
-    #
-    # @return [String]
-    def to_s
-      return '' unless present?(value)
-
-      @sequences ||= Array(value).flatten.map { |v| Vedeu::Esc.string(v) }.join
-    end
-    alias_method :escape_sequences, :to_s
-    alias_method :to_str, :to_s
-
-  end # Style
-
-end # Vedeu

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

@@ -1,120 +0,0 @@
-require 'test_helper'
-
-module Vedeu
-
-  describe Style do
-
-    let(:described) { Vedeu::Style }
-    let(:instance)  { described.new(_value) }
-    let(:_value)    { 'bold' }
-
-    describe 'alias methods' do
-      it { instance.must_respond_to(:escape_sequences) }
-    end
-
-    describe '#initialize' do
-      it { instance.must_be_instance_of(described) }
-      it { instance.instance_variable_get('@value').must_equal('bold') }
-    end
-
-    describe 'accessors' do
-      it { instance.must_respond_to(:value) }
-      it { instance.must_respond_to(:value=) }
-    end
-
-    describe '.coerce' do
-      let(:_value) { 'bold' }
-
-      subject { described.coerce(_value) }
-
-      it { subject.must_be_instance_of(described) }
-
-      context 'when the value is nil' do
-        let(:_value) { nil }
-
-        it { subject.must_be_instance_of(described) }
-      end
-
-      context 'when the value is a Style already' do
-        let(:_value) { Vedeu::Style.new('bold') }
-
-        it 'returns the value' do
-          subject.must_equal(_value)
-        end
-      end
-
-      context 'when the value is an Array' do
-        let(:_value)  { [:bold, :blink] }
-
-        it { subject.value.must_equal([:bold, :blink]) }
-      end
-    end
-
-    describe '#attributes' do
-      subject { instance.attributes }
-
-      it { subject.must_be_instance_of(Hash) }
-
-      it 'returns an attributes hash for this instance' do
-        subject.must_equal(style: 'bold')
-      end
-    end
-
-    describe '#eql?' do
-      let(:other) { instance }
-
-      subject { instance.eql?(other) }
-
-      it { subject.must_equal(true) }
-
-      context 'when different to other' do
-        let(:other) { described.new('underline') }
-
-        it { subject.must_equal(false) }
-      end
-    end
-
-    describe '#to_s' do
-      let(:_value) {}
-
-      subject { instance.to_s }
-
-      it { subject.must_be_instance_of(String) }
-      it { subject.must_equal('') }
-
-      describe 'for a single style' do
-        let(:_value) { 'normal' }
-
-        it 'returns an escape sequence' do
-          subject.must_equal("\e[24m\e[22m\e[27m")
-        end
-      end
-
-      describe 'for multiple styles' do
-        let(:_value) { ['normal', 'underline'] }
-
-        it 'returns an escape sequence for multiple styles' do
-          subject.must_equal("\e[24m\e[22m\e[27m\e[4m")
-        end
-      end
-
-      describe 'for an unknown style' do
-        let(:_value) { 'unknown' }
-
-        it 'returns an empty string for an unknown style' do
-          subject.must_equal('')
-        end
-      end
-
-      describe 'for an empty or nil' do
-        let(:_value) { '' }
-
-        it 'returns an empty string for empty or nil' do
-          subject.must_equal('')
-        end
-      end
-    end
-
-  end # Style
-
-end # Vedeu