vedeu 0.6.15 → 0.6.16

data/lib/vedeu/runtime/application.rb

@@ -86,13 +86,9 @@ module Vedeu
       #
       # @return [void]
       def runner
-        if configuration.once?
-          yield
+        return yield if configuration.once?
 
-        else
-          run_many { yield }
-
-        end
+        run_many { yield }
       end
 
       # For an interactive application we capture input, (usually from

data/lib/vedeu/templating/view_template.rb

@@ -54,16 +54,12 @@ module Vedeu
       #
       # @return [Vedeu::Colours::Colour|Hash<Symbol => Symbol>]
       def default_colour
-        if options[:name]
-          interface.colour
+        return interface.colour if options[:name]
 
-        else
-          {
-            background: :default,
-            foreground: :default,
-          }
-
-        end
+        {
+          background: :default,
+          foreground: :default,
+        }
       end
 
       # Return the interface style(s) if a name option is set,
@@ -71,13 +67,9 @@ module Vedeu
       #
       # @return [Symbol]
       def default_style
-        if options[:name]
-          interface.style
+        return interface.style if options[:name]
 
-        else
-          :normal
-
-        end
+        :normal
       end
 
       # Fetch the interface by name.

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.15'
+  VERSION = '0.6.16'
 
 end

data/test/lib/vedeu/bindings/bindings_test.rb

@@ -8,12 +8,18 @@ module Vedeu
 
     describe '.setup!' do
       before do
+        Vedeu::Events::Repository.stubs(:reset!)
+
         Vedeu::Bindings::Application.stubs(:setup!)
-        Vedeu::Bindings::Visibility.stubs(:setup!)
-        Vedeu::Bindings::Movement.stubs(:setup!)
-        Vedeu::Bindings::Menus.stubs(:setup!)
+        Vedeu::Bindings::Document.stubs(:setup!)
         Vedeu::Bindings::DRB.stubs(:setup!)
+        Vedeu::Bindings::Focus.stubs(:setup!)
+        Vedeu::Bindings::Menus.stubs(:setup!)
+        Vedeu::Bindings::Movement.stubs(:setup!)
+        Vedeu::Bindings::Refresh.stubs(:setup!)
         Vedeu::Bindings::System.stubs(:setup!)
+        Vedeu::Bindings::View.stubs(:setup!)
+        Vedeu::Bindings::Visibility.stubs(:setup!)
       end
 
       subject { described.setup! }
@@ -24,12 +30,17 @@ module Vedeu
       }
 
       it {
-        Vedeu::Bindings::Visibility.expects(:setup!)
+        Vedeu::Bindings::Document.expects(:setup!)
         subject
       }
 
       it {
-        Vedeu::Bindings::Movement.expects(:setup!)
+        Vedeu::Bindings::DRB.expects(:setup!)
+        subject
+      }
+
+      it {
+        Vedeu::Bindings::Focus.expects(:setup!)
         subject
       }
 
@@ -39,7 +50,12 @@ module Vedeu
       }
 
       it {
-        Vedeu::Bindings::DRB.expects(:setup!)
+        Vedeu::Bindings::Movement.expects(:setup!)
+        subject
+      }
+
+      it {
+        Vedeu::Bindings::Refresh.expects(:setup!)
         subject
       }
 
@@ -48,6 +64,16 @@ module Vedeu
         subject
       }
 
+      it {
+        Vedeu::Bindings::View.expects(:setup!)
+        subject
+      }
+
+      it {
+        Vedeu::Bindings::Visibility.expects(:setup!)
+        subject
+      }
+
       it { subject.must_equal(true) }
     end
 

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

@@ -10,6 +10,7 @@ module Vedeu
         it { Vedeu.bound?(:_refresh_).must_equal(true) }
         it { Vedeu.bound?(:_refresh_cursor_).must_equal(true) }
         it { Vedeu.bound?(:_refresh_group_).must_equal(true) }
+        it { Vedeu.bound?(:_refresh_view_).must_equal(true) }
       end
 
     end # Refresh

data/test/lib/vedeu/bindings/visibility_test.rb

@@ -9,6 +9,7 @@ module Vedeu
       context 'the visibility events are defined' do
         it { Vedeu.bound?(:_clear_).must_equal(true) }
         it { Vedeu.bound?(:_clear_group_).must_equal(true) }
+        it { Vedeu.bound?(:_clear_view_).must_equal(true) }
 
         it { Vedeu.bound?(:_cursor_hide_).must_equal(true) }
         it { Vedeu.bound?(:_cursor_show_).must_equal(true) }

data/test/lib/vedeu/buffers/buffer_test.rb

@@ -107,14 +107,14 @@ module Vedeu
         subject { instance.hide }
 
         it {
-          Vedeu.expects(:trigger).with(:_clear_, _name)
+          Vedeu.expects(:trigger).with(:_clear_view_, _name)
           subject
         }
       end
 
       describe '#show' do
         before do
-          # Vedeu::Clear::NamedInterface.stubs(:render)
+          # Vedeu::Clear::Interface.stubs(:render)
           Vedeu::Output::Output.stubs(:render)
         end
 

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

@@ -23,10 +23,7 @@ module Vedeu
 
         context 'when the colour is named (3-bit / 8 colours)' do
           {
-            red:     "\e[41m",
-            yellow:  "\e[43m",
             magenta: "\e[45m",
-            white:   "\e[107m",
             default: "\e[49m",
             unknown: '',
           }.map do |colour, result|
@@ -38,12 +35,7 @@ module Vedeu
 
         context 'when the colour is numbered (8-bit / 256 colours)' do
           {
-            24  => "\e[48;5;24m",
-            56  => "\e[48;5;56m",
-            82  => "\e[48;5;82m",
             118 => "\e[48;5;118m",
-            143 => "\e[48;5;143m",
-            219 => "\e[48;5;219m",
             -2  => '',
             442 => ''
           }.map do |colour, result|
@@ -57,12 +49,7 @@ module Vedeu
           before { Vedeu::Configuration.stubs(:colour_mode).returns(8) }
 
           {
-            '#5f0000' => "\e[48;5;52m",
-            '#008700' => "\e[48;5;28m",
             '#0000d7' => "\e[48;5;20m",
-            '#afafaf' => "\e[48;5;145m",
-            '#afd700' => "\e[48;5;148m",
-            '#af005f' => "\e[48;5;125m",
             '999999'  => '',
             '#12121'  => '',
             '#h11111' => '',
@@ -75,12 +62,7 @@ module Vedeu
 
         context 'when the colour is a CSS value (24-bit / 16.8mil colours)' do
           {
-            '#5f0000' => "\e[48;2;95;0;0m",
-            '#008700' => "\e[48;2;0;135;0m",
             '#0000d7' => "\e[48;2;0;0;215m",
-            '#afafaf' => "\e[48;2;175;175;175m",
-            '#afd700' => "\e[48;2;175;215;0m",
-            '#af005f' => "\e[48;2;175;0;95m",
             '999999'  => '',
             '#12121'  => '',
             '#h11111' => '',

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

@@ -24,9 +24,6 @@ module Vedeu
         context 'when the colour is named (3-bit / 8 colours)' do
           {
             red:     "\e[31m",
-            yellow:  "\e[33m",
-            magenta: "\e[35m",
-            white:   "\e[97m",
             default: "\e[39m",
             unknown: '',
           }.map do |colour, result|
@@ -38,12 +35,7 @@ module Vedeu
 
         context 'when the colour is numbered (8-bit / 256 colours)' do
           {
-            24  => "\e[38;5;24m",
-            56  => "\e[38;5;56m",
             82  => "\e[38;5;82m",
-            118 => "\e[38;5;118m",
-            143 => "\e[38;5;143m",
-            219 => "\e[38;5;219m",
             -2  => '',
             442 => ''
           }.map do |colour, result|
@@ -57,12 +49,7 @@ module Vedeu
           before { Configuration.stubs(:colour_mode).returns(8) }
 
           {
-            '#5f0000' => "\e[38;5;52m",
-            '#008700' => "\e[38;5;28m",
-            '#0000d7' => "\e[38;5;20m",
-            '#afafaf' => "\e[38;5;145m",
             '#afd700' => "\e[38;5;148m",
-            '#af005f' => "\e[38;5;125m",
             '999999'  => '',
             '#12121'  => '',
             '#h11111' => '',
@@ -75,12 +62,7 @@ module Vedeu
 
         context 'when the colour is a CSS value (24-bit / 16.8mil colours)' do
           {
-            '#5f0000' => "\e[38;2;95;0;0m",
-            '#008700' => "\e[38;2;0;135;0m",
-            '#0000d7' => "\e[38;2;0;0;215m",
-            '#afafaf' => "\e[38;2;175;175;175m",
             '#afd700' => "\e[38;2;175;215;0m",
-            '#af005f' => "\e[38;2;175;0;95m",
             '999999'  => '',
             '#12121'  => '',
             '#h11111' => '',

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

@@ -26,7 +26,9 @@ module Vedeu
             y  1
             yn 3
           end
-          Vedeu::Cursors::Cursor.new(name: 'refresh_cursor', ox: ox, oy: oy).store
+          Vedeu::Cursors::Cursor.new(name: 'refresh_cursor',
+                                     ox:   ox,
+                                     oy:   oy).store
 
           Vedeu::Terminal.stubs(:output).returns(expected)
 
@@ -45,14 +47,14 @@ module Vedeu
           let(:oy) { 3 }
 
           it 'refreshes the view' do
-            Vedeu.expects(:trigger).with(:_refresh_, _name)
+            Vedeu.expects(:trigger).with(:_refresh_view_, _name)
             subject
           end
         end
 
         context 'when the cursors offset position is inside the viewable area' do
           it 'does not refresh the view' do
-            Vedeu.expects(:trigger).with(:_refresh_, _name).never
+            Vedeu.expects(:trigger).with(:_refresh_view_, _name).never
             subject
           end
         end

data/test/lib/vedeu/events/aliases_test.rb

@@ -34,8 +34,6 @@ module Vedeu
         subject { described.empty? }
 
         context 'when no aliases are registered' do
-          before { described.reset }
-
           it { subject.must_equal(true) }
         end
 
@@ -70,8 +68,6 @@ module Vedeu
       describe '.remove' do
         let(:alias_name) { :alias_test }
 
-        before { described.reset }
-
         subject { described.remove(alias_name) }
 
         it { described.must_respond_to(:unbind_alias) }
@@ -102,8 +98,6 @@ module Vedeu
       end
 
       describe '.storage' do
-        before { described.reset }
-
         subject { described.storage }
 
         it { subject.must_equal({}) }

data/test/lib/vedeu/models/views/view_test.rb

@@ -78,7 +78,7 @@ module Vedeu
         it { subject.must_be_instance_of(described) }
 
         it {
-          Vedeu.expects(:trigger).with(:_refresh_, _name)
+          Vedeu.expects(:trigger).with(:_refresh_view_, _name)
           subject
         }
       end

data/test/lib/vedeu/output/clear/{named_group_test.rb → group_test.rb}

@@ -4,11 +4,11 @@ module Vedeu
 
   module Clear
 
-    describe NamedGroup do
+    describe Group do
 
-      let(:described) { Vedeu::Clear::NamedGroup }
+      let(:described) { Vedeu::Clear::Group }
       let(:instance)  { described.new(_name) }
-      let(:_name)     { 'Vedeu::Clear::NamedGroup' }
+      let(:_name)     { 'Vedeu::Clear::Group' }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -23,7 +23,7 @@ module Vedeu
         subject { described.render(_name) }
 
         it {
-          Vedeu::Clear::NamedInterface.expects(:render).with(_name)
+          Vedeu::Clear::Interface.expects(:render).with(_name)
           subject
         }
 
@@ -35,7 +35,7 @@ module Vedeu
         it { instance.must_respond_to(:render) }
       end
 
-    end # NamedGroup
+    end # Group
 
   end # Clear
 

data/test/lib/vedeu/output/clear/{named_interface_test.rb → interface_test.rb}

@@ -4,11 +4,11 @@ module Vedeu
 
   module Clear
 
-    describe NamedInterface do
+    describe Interface do
 
-      let(:described) { Vedeu::Clear::NamedInterface }
+      let(:described) { Vedeu::Clear::Interface }
       let(:instance)  { described.new(_name) }
-      let(:_name)     { 'Vedeu::Clear::NamedInterface' }
+      let(:_name)     { 'Vedeu::Clear::Interface' }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -59,7 +59,7 @@ module Vedeu
         it { subject.must_equal(output) }
       end
 
-    end # NamedInterface
+    end # Interface
 
   end # Clear
 

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

@@ -4,12 +4,12 @@ module Vedeu
 
   module Renderers
 
-    describe RendererOptions do
+    describe Options do
 
       # @todo Add more tests.
       # it { skip }
 
-    end # RendererOptions
+    end # Options
 
   end # Renderers
 

data/vedeu.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest',           '5.8.1'
   spec.add_development_dependency 'minitest-reporters', '1.1.2'
   spec.add_development_dependency 'mocha',              '1.1.0'
-  spec.add_development_dependency 'pry',                '0.10.1'
+  spec.add_development_dependency 'pry',                '0.10.2'
   spec.add_development_dependency 'rubocop',            '0.34.2'
   spec.add_development_dependency 'ruby-prof',          '0.15.8'
   spec.add_development_dependency 'simplecov',          '0.10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.16
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +247,6 @@ files:
 - bin/vedeu_drb_client
 - bin/vedeu_drb_server
 - bin/vedeu_test
-- config/rubocop_disabled.yml
 - config/rubocop_enabled.yml
 - docs/api.md
 - docs/configuration.md
@@ -418,8 +417,9 @@ files:
 - lib/vedeu/null/interface.rb
 - lib/vedeu/null/view.rb
 - lib/vedeu/options.rb
-- lib/vedeu/output/clear/named_group.rb
-- lib/vedeu/output/clear/named_interface.rb
+- lib/vedeu/output/clear/all.rb
+- lib/vedeu/output/clear/group.rb
+- lib/vedeu/output/clear/interface.rb
 - lib/vedeu/output/compressor.rb
 - lib/vedeu/output/direct.rb
 - lib/vedeu/output/output.rb
@@ -435,7 +435,7 @@ files:
 - lib/vedeu/output/renderers/html.rb
 - lib/vedeu/output/renderers/json.rb
 - lib/vedeu/output/renderers/null.rb
-- lib/vedeu/output/renderers/renderer_options.rb
+- lib/vedeu/output/renderers/options.rb
 - lib/vedeu/output/renderers/terminal.rb
 - lib/vedeu/output/renderers/text.rb
 - lib/vedeu/output/templates/html_renderer.vedeu
@@ -594,8 +594,8 @@ files:
 - test/lib/vedeu/null/interface_test.rb
 - test/lib/vedeu/null/view_test.rb
 - test/lib/vedeu/options_test.rb
-- test/lib/vedeu/output/clear/named_group_test.rb
-- test/lib/vedeu/output/clear/named_interface_test.rb
+- test/lib/vedeu/output/clear/group_test.rb
+- test/lib/vedeu/output/clear/interface_test.rb
 - test/lib/vedeu/output/compressor_test.rb
 - test/lib/vedeu/output/direct_test.rb
 - test/lib/vedeu/output/output_test.rb
@@ -611,7 +611,7 @@ files:
 - test/lib/vedeu/output/renderers/html_test.rb
 - test/lib/vedeu/output/renderers/json_test.rb
 - test/lib/vedeu/output/renderers/null_test.rb
-- test/lib/vedeu/output/renderers/renderer_options_test.rb
+- test/lib/vedeu/output/renderers/options_test.rb
 - test/lib/vedeu/output/renderers/terminal_test.rb
 - test/lib/vedeu/output/renderers/text_test.rb
 - test/lib/vedeu/output/text_test.rb
@@ -812,8 +812,8 @@ test_files:
 - test/lib/vedeu/null/interface_test.rb
 - test/lib/vedeu/null/view_test.rb
 - test/lib/vedeu/options_test.rb
-- test/lib/vedeu/output/clear/named_group_test.rb
-- test/lib/vedeu/output/clear/named_interface_test.rb
+- test/lib/vedeu/output/clear/group_test.rb
+- test/lib/vedeu/output/clear/interface_test.rb
 - test/lib/vedeu/output/compressor_test.rb
 - test/lib/vedeu/output/direct_test.rb
 - test/lib/vedeu/output/output_test.rb
@@ -829,7 +829,7 @@ test_files:
 - test/lib/vedeu/output/renderers/html_test.rb
 - test/lib/vedeu/output/renderers/json_test.rb
 - test/lib/vedeu/output/renderers/null_test.rb
-- test/lib/vedeu/output/renderers/renderer_options_test.rb
+- test/lib/vedeu/output/renderers/options_test.rb
 - test/lib/vedeu/output/renderers/terminal_test.rb
 - test/lib/vedeu/output/renderers/text_test.rb
 - test/lib/vedeu/output/text_test.rb