vedeu 0.6.25 → 0.6.26

data/lib/vedeu/repositories/store.rb

@@ -51,7 +51,7 @@ module Vedeu
       # @return [Array|Hash|Set]
       def reset
         Vedeu.log(type:    :reset,
-                  message: "(#{self.class.name}) #{registered.inspect}")
+                  message: "(#{self.class.name}) #{registered.inspect}".freeze)
 
         @storage = in_memory
       end

data/lib/vedeu/runtime/bootstrap.rb

@@ -65,12 +65,12 @@ module Vedeu
       # @return [void]
       def client_application!
         [
-          'app/views/templates/**/*',
-          'app/views/interfaces/**/*',
-          'app/controllers/**/*',
-          'app/helpers/**/*',
-          'app/views/**/*',
-          'app/models/keymaps/**/*',
+          'app/views/templates/**/*'.freeze,
+          'app/views/interfaces/**/*'.freeze,
+          'app/controllers/**/*'.freeze,
+          'app/helpers/**/*'.freeze,
+          'app/views/**/*'.freeze,
+          'app/models/keymaps/**/*'.freeze,
         ].each { |path| load(File.join(base_path, path)) }
       end
 
@@ -103,7 +103,7 @@ module Vedeu
       # @return [Array<String>]
       def loadables(path)
         Dir.glob(path).select do |file|
-          File.file?(file) && File.extname(file) == '.rb'
+          File.file?(file) && File.extname(file) == '.rb'.freeze
         end
       end
 
@@ -121,7 +121,7 @@ module Vedeu
         "controller and action: (args are optional)\n\n" \
         "Vedeu.configure do\n" \
         "  root :some_controller, :show, *args\n" \
-        "end\n\n"
+        "end\n\n".freeze
       end
 
     end # Bootstrap

data/lib/vedeu/runtime/launcher.rb

@@ -102,7 +102,7 @@ module Vedeu
     #
     # @return [void]
     def terminate!
-      Vedeu.log(type: :info, message: 'Exiting gracefully.')
+      Vedeu.log(type: :info, message: 'Exiting gracefully.'.freeze)
 
       $stdin  = STDIN
       $stdout = STDOUT

data/lib/vedeu/runtime/main_loop.rb

@@ -31,7 +31,7 @@ module Vedeu
           end
         rescue Vedeu::Error::Interrupt
           Vedeu.log(type:    :info,
-                    message: 'Vedeu execution interrupted, exiting.')
+                    message: 'Vedeu execution interrupted, exiting.'.freeze)
         end
 
         # :nocov:

data/lib/vedeu/runtime/router.rb

@@ -22,11 +22,11 @@ module Vedeu
       def add_controller(controller, klass)
         unless present?(controller)
           fail Vedeu::Error::MissingRequired,
-               'Cannot store controller without a name attribute.'
+               'Cannot store controller without a name attribute.'.freeze
         end
 
         Vedeu.log(type:    :create,
-                  message: "Controller: ':#{controller}'")
+                  message: "Controller: ':#{controller}'.freeze")
 
         if registered?(controller)
           storage[controller].merge!(klass: klass)
@@ -50,7 +50,8 @@ module Vedeu
       def add_action(controller, action)
         if present?(controller) && present?(action)
           Vedeu.log(type:    :create,
-                    message: "Action: ':#{action}' (for ':#{controller}')")
+                    message: "Action: ':#{action}' " \
+                             "(for ':#{controller}')".freeze)
 
           if registered?(controller)
             storage[controller][:actions] << action
@@ -65,7 +66,8 @@ module Vedeu
 
         else
           fail Vedeu::Error::MissingRequired,
-               'Cannot store action without a controller or name attribute.'
+               'Cannot store action without a controller or name ' \
+               'attribute.'.freeze
 
         end
       end
@@ -84,7 +86,7 @@ module Vedeu
       # @return [void]
       def goto(controller, action, **args)
         Vedeu.log(type:    :debug,
-                  message: "Routing: #{controller} #{action}")
+                  message: "Routing: #{controller} #{action}".freeze)
 
         route(controller, action, args) if action_defined?(action, controller)
       end
@@ -120,11 +122,11 @@ module Vedeu
           return true if storage[controller][:actions].include?(action)
 
           fail Vedeu::Error::ActionNotFound,
-               "#{action} is not registered for #{controller}."
+               "#{action} is not registered for #{controller}.".freeze
 
         else
           fail Vedeu::Error::ControllerNotFound,
-               "#{controller} is not registered."
+               "#{controller} is not registered.".freeze
 
         end
       end
@@ -153,7 +155,7 @@ module Vedeu
 
         else
           fail Vedeu::Error::MissingRequired,
-               "Cannot route to #{controller} as no class defined."
+               "Cannot route to #{controller} as no class defined.".freeze
 
         end
       end

data/lib/vedeu/templating/template.rb

@@ -52,11 +52,11 @@ module Vedeu
       # @return [String]
       def path
         fail Vedeu::Error::MissingRequired,
-             'No path to template specified.' if @path.empty?
+             'No path to template specified.'.freeze if @path.empty?
 
         unless File.exist?(@path)
           fail Vedeu::Error::MissingRequired,
-               "Template file cannot be found. (#{@path})"
+               "Template file cannot be found. (#{@path})".freeze
         end
 
         @path

data/lib/vedeu/terminal/buffer.rb

@@ -20,7 +20,11 @@ module Vedeu
       #
       # @return [Array<Array<Vedeu::Models::Cell>>]
       def buffer
-        @output ||= empty_buffer.dup
+        @output ||= Array.new(Vedeu.height) do |y|
+          Array.new(Vedeu.width) do |x|
+            Vedeu::Models::Cell.new(position: [y + 1, x + 1])
+          end
+        end
       end
       alias_method :cells, :buffer
 
@@ -36,15 +40,6 @@ module Vedeu
         Vedeu.renderers.clear if Vedeu.ready?
       end
 
-      # @return [Array<Array<Vedeu::Models::Cell>>]
-      def empty_buffer
-        @empty_buffer ||= Array.new(Vedeu.height) do |y|
-          Array.new(Vedeu.width) do |x|
-            Vedeu::Models::Cell.new(position: [y + 1, x + 1])
-          end
-        end
-      end
-
       # @return [Vedeu::Models::Page]
       def output
         Vedeu::Models::Page.coerce(buffer)
@@ -81,7 +76,11 @@ module Vedeu
       #
       # @return [Array<Array<Vedeu::Models::Cell>>]
       def reset
-        @output = empty_buffer
+        @output = Array.new(Vedeu.height) do |y|
+          Array.new(Vedeu.width) do |x|
+            Vedeu::Models::Cell.new(position: [y + 1, x + 1])
+          end
+        end
       end
 
       # Write a collection of cells to the virtual terminal.

data/lib/vedeu/terminal/terminal.rb

@@ -34,7 +34,7 @@ module Vedeu
     #
     # @return [String]
     def input
-      Vedeu.log(type: :input, message: 'Waiting for user input...')
+      Vedeu.log(type: :input, message: 'Waiting for user input...'.freeze)
 
       if raw_mode? || fake_mode?
         Vedeu::Editor::Capture.read(console)
@@ -75,7 +75,7 @@ module Vedeu
     # @param mode [Symbol]
     # @return [void]
     def initialize_screen(mode)
-      Vedeu.log(type: :info, message: "Terminal entering '#{mode}' mode")
+      Vedeu.log(type: :info, message: "Terminal entering '#{mode}' mode".freeze)
 
       output(Vedeu::EscapeSequences::Esc.string('screen_init'))
 

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.25'
+  VERSION = '0.6.26'.freeze
 
 end

data/test/lib/vedeu/borders/border_test.rb

@@ -18,6 +18,7 @@ module Vedeu
           enabled:      false,
           horizontal:   'q',
           name:         _name,
+          parent:       nil,
           repository:   Vedeu.borders,
           show_bottom:  true,
           show_left:    true,
@@ -409,17 +410,6 @@ module Vedeu
         end
       end
 
-      describe '#render' do
-        before { Vedeu.stubs(:trigger).with(:_refresh_border_, _name) }
-
-        subject { instance.render }
-
-        it {
-          Vedeu.expects(:trigger).with(:_refresh_border_, _name)
-          subject
-        }
-      end
-
     end # Border
 
   end # Borders

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

@@ -8,10 +8,11 @@ module Vedeu
 
       let(:described) { Vedeu::Colours::Repository }
       let(:instance)  { described.new }
+      let(:storage)   { {} }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@storage').must_equal({}) }
+        it { instance.instance_variable_get('@storage').must_equal(storage) }
       end
 
       describe 'accessors' do

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

@@ -41,7 +41,57 @@ module Vedeu
       end
 
       describe '.background_codes' do
+        let(:expected) {
+          {
+            black:         40,
+            red:           41,
+            green:         42,
+            yellow:        43,
+            blue:          44,
+            magenta:       45,
+            cyan:          46,
+            light_grey:    47,
+            default:       49,
+            dark_grey:     100,
+            light_red:     101,
+            light_green:   102,
+            light_yellow:  103,
+            light_blue:    104,
+            light_magenta: 105,
+            light_cyan:    106,
+            white:         107,
+          }
+        }
+
         it { described.background_codes.must_be_instance_of(Hash) }
+        it { described.background_codes.must_equal(expected) }
+      end
+
+      describe '.foreground_codes' do
+        let(:expected) {
+          {
+            black:         30,
+            red:           31,
+            green:         32,
+            yellow:        33,
+            blue:          34,
+            magenta:       35,
+            cyan:          36,
+            light_grey:    37,
+            default:       39,
+            dark_grey:     90,
+            light_red:     91,
+            light_green:   92,
+            light_yellow:  93,
+            light_blue:    94,
+            light_magenta: 95,
+            light_cyan:    96,
+            white:         97,
+          }
+        }
+
+        it { described.foreground_codes.must_be_instance_of(Hash) }
+        it { described.foreground_codes.must_equal(expected) }
       end
 
       describe 'background colour methods' do

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

@@ -218,9 +218,7 @@ module Vedeu
       describe '#remove' do
         subject { instance.remove('francium') }
 
-        it { instance.must_respond_to(:destroy) }
         it { instance.must_respond_to(:delete) }
-        it { instance.must_respond_to(:deregister) }
 
         context 'when the storage is empty' do
           before { instance.reset }

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

@@ -46,37 +46,6 @@ module Vedeu
         end
       end
 
-      describe '#empty_buffer' do
-        subject { described.empty_buffer }
-
-        it { subject.must_be_instance_of(Array) }
-      end
-
-      # describe '#output' do
-      #   subject { described.output }
-
-      #   context 'when nothing has been written to the buffer' do
-      #     it {
-      #       described.instance_variable_get('@output').must_equal(empty_buffer)
-      #     }
-      #   end
-
-      #   context 'when something has been written to the buffer' do
-      #     let(:expected) {
-      #       exp = empty_buffer
-      #       exp[1][2] = Vedeu::Views::Char.new(value: 'a', position: [1, 2])
-      #       exp
-      #     }
-
-      #     before do
-      #       described.write(Vedeu::Views::Char.new(value: 'a',
-      #                                              position: [1, 2]))
-      #     end
-
-      #     it { described.instance_variable_get('@output').must_equal(expected) }
-      #   end
-      # end
-
       describe '#render' do
         let(:ready) { false }
 
@@ -111,35 +80,6 @@ module Vedeu
         let(:_value) {}
 
         subject { described.write(_value) }
-
-        # context 'when the value is nil' do
-        #   let(:expected) {
-        #     [
-        #       [
-        #         Vedeu::Models::Cell.new(position: [1, 1]),
-        #         Vedeu::Models::Cell.new(position: [1, 2]),
-        #         Vedeu::Models::Cell.new(position: [1, 3])
-        #       ], [
-        #         Vedeu::Models::Cell.new(position: [2, 1]),
-        #         Vedeu::Models::Cell.new(position: [2, 2]),
-        #         Vedeu::Models::Cell.new(position: [2, 3])
-        #       ]
-        #     ]
-        #   }
-
-        #   it { subject.must_equal(described) }
-        #   it { described.output.must_equal(expected) }
-        # end
-
-        # context 'when the value is not nil' do
-        #   let(:_value)   { Vedeu::Views::Char.new(y: 2, x: 1, value: 'a') }
-        #   let(:expected) {
-
-        #   }
-
-        #   it { subject.must_equal(described) }
-        #   it { described.output.must_equal(expected) }
-        # end
       end
 
     end # Buffer
@@ -147,152 +87,3 @@ module Vedeu
   end # Terminal
 
 end # Vedeu
-
-# require 'test_helper'
-
-# module Vedeu
-
-#   module Buffers
-
-#     describe VirtualBuffer do
-
-#       let(:described) { Vedeu::Buffers::VirtualBuffer }
-#       let(:instance)  { described.new(height, width, renderer) }
-#       let(:height)    { 3 }
-#       let(:width)     { 3 }
-#       let(:renderer)  { Vedeu::Renderers::HTML.new }
-
-#       describe '#initialize' do
-#         it { instance.must_be_instance_of(described) }
-#         it { instance.instance_variable_get('@height').must_equal(3) }
-#         it { instance.instance_variable_get('@width').must_equal(3) }
-#         it { instance.instance_variable_get('@renderer').must_equal(renderer) }
-#       end
-
-#       describe 'accessors' do
-#         it { instance.must_respond_to(:renderer) }
-#         it { instance.must_respond_to(:renderer=) }
-#         it { instance.must_respond_to(:height) }
-#         it { instance.must_respond_to(:width) }
-#       end
-
-#       describe '.output' do
-#         let(:data) {}
-
-#         before do
-#           Vedeu.stubs(:width).returns(3)
-#           Vedeu.stubs(:height).returns(3)
-#         end
-
-#         subject { described.output(data) }
-
-#         it { subject.must_be_instance_of(Array) }
-#       end
-
-#       describe '#cells' do
-#         before do
-#           Vedeu.stubs(:width).returns(3)
-#           Vedeu.stubs(:height).returns(3)
-#         end
-
-#         subject { instance.cells }
-
-#         it { subject.must_be_instance_of(Array) }
-#         it { subject.size.must_equal(3) }
-#         it { subject.flatten.size.must_equal(9) }
-#       end
-
-#       describe '#read' do
-#         subject { instance.read(y, x) }
-
-#         context 'when x is out of bounds' do
-#           let(:y) { 1 }
-#           let(:x) { 5 }
-
-#           it { subject.must_equal([]) }
-#         end
-
-#         context 'when y is out of bounds' do
-#           let(:y) { 5 }
-#           let(:x) { 1 }
-
-#           it { subject.must_equal([]) }
-#         end
-
-#         context 'when both x and y are out of bounds' do
-#           let(:y) { 5 }
-#           let(:x) { 5 }
-
-#           it { subject.must_equal([]) }
-#         end
-
-#         context 'when x and y are in bounds' do
-#           let(:y) { 0 }
-#           let(:x) { 2 }
-
-#           it { subject.must_be_instance_of(Vedeu::Models::Cell) }
-#         end
-#       end
-
-#       describe '#output' do
-#         it { instance.must_respond_to(:output) }
-#       end
-
-#       describe '#render' do
-#         before do
-#           Vedeu.stubs(:width).returns(3)
-#           Vedeu.stubs(:height).returns(3)
-#         end
-
-#         subject { instance.render }
-
-#         it { subject.must_be_instance_of(String) }
-#       end
-
-#       describe '#reset' do
-#         subject { instance.reset }
-
-#         it { subject.must_be_instance_of(Array) }
-
-#         it { instance.must_respond_to(:clear) }
-#       end
-
-#       describe '#write' do
-#         let(:data) { Vedeu::Views::Char.new(value: 'a') }
-
-#         subject { instance.write(y, x, data) }
-
-#         context 'when x is out of bounds' do
-#           let(:y) { 1 }
-#           let(:x) { 5 }
-
-#           it { subject.must_equal(false) }
-#         end
-
-#         context 'when y is out of bounds' do
-#           let(:y) { 5 }
-#           let(:x) { 1 }
-
-#           it { subject.must_equal(false) }
-#         end
-
-#         context 'when both x and y are out of bounds' do
-#           let(:y) { 5 }
-#           let(:x) { 5 }
-
-#           it { subject.must_equal(false) }
-#         end
-
-#         context 'when x and y are in bounds' do
-#           let(:y) { 0 }
-#           let(:x) { 2 }
-
-#           it { subject.must_equal(true) }
-#         end
-#       end
-
-#     end # VirtualBuffer
-
-#   end # Buffers
-
-# end # Vedeu