vedeu 0.4.23 → 0.4.24

data/lib/vedeu/output/renderers/all.rb

@@ -26,8 +26,7 @@ module Vedeu
       threads = storage.map do |renderer|
         Thread.new(renderer) do
           mutex.synchronize do
-            Vedeu.log(type: :debug,
-              message: "Rendering with: '#{renderer}' (#{storage.size} defined)")
+            Vedeu.log(type: :debug, message: "Rendering with: '#{renderer}'")
             renderer.render(*args)
           end
         end

data/lib/vedeu/output/renderers/terminal.rb

@@ -35,7 +35,9 @@ module Vedeu
 
       # @return [String]
       def parsed
-        Vedeu::Compressor.new(output).render
+        Vedeu::Timer.for(:debug, 'Compression') do
+          Vedeu::Compressor.new(output).render
+        end
       end
 
     end # Terminal

data/lib/vedeu/output/viewport.rb

@@ -52,16 +52,16 @@ module Vedeu
     def render
       return [] unless visible?
 
-      Vedeu.log(type: :output, message: "Rendering: '#{name}'")
-
-      out = []
-      show[0...height].each_with_index do |line, iy|
-        line[0...width].each_with_index do |column, ix|
-          column.position = Vedeu::IndexPosition[iy, ix, by, bx]
-          out << column
+      Vedeu::Timer.for(:output, "Rendering: #{name}") do
+        out = []
+        show[0...height].each_with_index do |line, iy|
+          line[0...width].each_with_index do |column, ix|
+            column.position = Vedeu::IndexPosition[iy, ix, by, bx]
+            out << column
+          end
         end
+        out
       end
-      out
     end
 
     # Returns a string representation of the viewport.

data/lib/vedeu/repositories/collections/all.rb

@@ -1,8 +1,35 @@
 require 'vedeu/repositories/collection'
 
-require_relative 'chars'
-require_relative 'events'
-require_relative 'interfaces'
-require_relative 'keys'
-require_relative 'lines'
-require_relative 'streams'
+module Vedeu
+
+  # A collection of {Vedeu::Char} instances.
+  class Chars < Vedeu::Collection
+
+  end # Chars
+
+  # A collection of {Vedeu::Event} instances.
+  class Events < Vedeu::Collection
+
+  end # Events
+
+  # A collection of {Vedeu::Interface} instances.
+  class Interfaces < Vedeu::Collection
+
+  end # Interfaces
+
+  # A collection of {Vedeu::Key} instances.
+  class Keys < Vedeu::Collection
+
+  end # Keys
+
+  # A collection of {Vedeu::Line} instances.
+  class Lines < Vedeu::Collection
+
+  end # Lines
+
+  # A collection of {Vedeu::Stream} instances.
+  class Streams < Vedeu::Collection
+
+  end # Streams
+
+end

data/lib/vedeu/repositories/registerable.rb

@@ -7,12 +7,33 @@ module Vedeu
     # These class methods are mixed into the repository.
     module ClassMethods
 
+      # The null model is used when the repository cannot be found.
+      #
       # @param klass [Class]
       # @return [Symbol]
       def null(klass)
         define_method(:null_model) { klass }
       end
 
+      # The real model is the usual model to use for a given repository.
+      #
+      # @param klass [Class]
+      # @return [Symbol]
+      def real(klass)
+        define_method(:real_model) { klass }
+      end
+
+      # Register a repository for storing models.
+      #
+      # @param model [Class]
+      # @param storage [Class|Hash]
+      # @return [Vedeu::Repository]
+      def register(model = nil, storage = {})
+        new(model, storage).tap do |klass|
+          Vedeu::Repositories.register(klass.repository)
+        end
+      end
+
     end # ClassMethods
 
     # When this module is included in a class, provide ClassMethods as class

data/lib/vedeu/repositories/repositories/borders.rb

@@ -16,12 +16,13 @@ module Vedeu
       #
       # @return [Vedeu::Borders]
       def reset!
-        @borders = Vedeu::Borders.register(Vedeu::Border)
+        @borders = register(Vedeu::Border)
       end
 
     end
 
     null Vedeu::Null::Border
+    # real Vedeu::Border
 
   end # Borders
 

data/lib/vedeu/repositories/repositories/buffers.rb

@@ -15,12 +15,13 @@ module Vedeu
       #
       # @return [Vedeu::Buffers]
       def reset!
-        @buffers = Vedeu::Buffers.register(Vedeu::Buffer)
+        @buffers = register(Vedeu::Buffer)
       end
 
     end
 
     null Vedeu::Null::Buffer
+    # real Vedeu::Buffer
 
   end # Buffers
 

data/lib/vedeu/repositories/repositories/cursors.rb

@@ -20,7 +20,7 @@ module Vedeu
       #
       # @return [Vedeu::Cursors]
       def reset!
-        @cursors = Vedeu::Cursors.register(Vedeu::Cursor)
+        @cursors = register(Vedeu::Cursor)
       end
 
     end

data/lib/vedeu/repositories/repositories/events_repository.rb

@@ -15,7 +15,7 @@ module Vedeu
       #
       # @return [Vedeu::EventsRepository]
       def reset!
-        @events = Vedeu::EventsRepository.new(Vedeu::Events)
+        @events = new(Vedeu::Events)
       end
 
     end

data/lib/vedeu/repositories/repositories/geometries.rb

@@ -16,12 +16,13 @@ module Vedeu
       #
       # @return [Vedeu::Geometries]
       def reset!
-        @geometries = Vedeu::Geometries.register(Vedeu::Geometry)
+        @geometries = register(Vedeu::Geometry)
       end
 
     end
 
     null Vedeu::Null::Geometry
+    # real Vedeu::Geometry
 
   end # Geometries
 

data/lib/vedeu/repositories/repositories/groups.rb

@@ -15,7 +15,7 @@ module Vedeu
       #
       # @return [Vedeu::Groups]
       def reset!
-        @groups = Vedeu::Groups.register(Vedeu::Group)
+        @groups = register(Vedeu::Group)
       end
 
     end

data/lib/vedeu/repositories/repositories/interfaces_repository.rb

@@ -15,12 +15,13 @@ module Vedeu
       #
       # @return [Vedeu::InterfacesRepository]
       def reset!
-        @interfaces = Vedeu::InterfacesRepository.register(Vedeu::Interface)
+        @interfaces = register(Vedeu::Interface)
       end
 
     end
 
     null Vedeu::Null::Interface
+    # real Vedeu::Interface
 
   end # InterfacesRepository
 

data/lib/vedeu/repositories/repositories/keymaps.rb

@@ -15,7 +15,7 @@ module Vedeu
       #
       # @return [Vedeu::Keymaps]
       def reset!
-        @keymaps = Vedeu::Keymaps.register(Vedeu::Keymap)
+        @keymaps = register(Vedeu::Keymap)
       end
 
     end

data/lib/vedeu/repositories/repositories/menus.rb

@@ -15,7 +15,7 @@ module Vedeu
       #
       # @return [Vedeu::Menus]
       def reset!
-        @menus = Vedeu::Menus.register(Vedeu::Menu)
+        @menus = register(Vedeu::Menu)
       end
 
     end

data/lib/vedeu/repositories/repository.rb

@@ -22,15 +22,6 @@ module Vedeu
     # @return [void]
     attr_reader :storage
 
-    # @param model [Class]
-    # @param storage [Class|Hash]
-    # @return [Vedeu::Repository]
-    def self.register(model = nil, storage = {})
-      new(model, storage).tap do |klass|
-        Vedeu::Repositories.register(klass.repository)
-      end
-    end
-
     # Returns a new instance of Vedeu::Repository.
     #
     # @param model [Class]
@@ -45,7 +36,7 @@ module Vedeu
     #
     # @return [Class]
     def repository
-      self.class # .name
+      self.class
     end
 
     # @param name [String] The name of the stored model.

data/lib/vedeu/support/log.rb

@@ -94,7 +94,8 @@ module Vedeu
       #
       # @return [TrueClass]
       def log(message:, force: false, type: :info)
-        logger.debug([message_type(type), message]) if enabled? || force
+        logger.debug([message_type(type),
+                      message_body(type, message)]) if enabled? || force
       end
 
       # @return [TrueClass]
@@ -108,6 +109,8 @@ module Vedeu
 
       private
 
+      # @param message [String]
+      # @param time [Time]
       # @return [String]
       def formatted_message(message, time = Time.now)
         [timestamp(time.utc.iso8601), message, "\n"].join
@@ -123,9 +126,19 @@ module Vedeu
         Vedeu::Configuration.log
       end
 
+      # @param type [Symbol] The type of log message.
+      # @param body [String] The log message itself.
+      # @return [String]
+      def message_body(type, body)
+        Vedeu::Esc.send(message_types.fetch(type, :default).last) do
+          body
+        end
+      end
+
+      # @param type [Symbol] The type of log message.
       # @return [String]
       def message_type(type)
-        Vedeu::Esc.send(message_types.fetch(type, :default)) do
+        Vedeu::Esc.send(message_types.fetch(type, :default).first) do
           "[#{type}]".ljust(9)
         end
       end
@@ -133,23 +146,24 @@ module Vedeu
       # @return [Hash<Symbol => Symbol>]
       def message_types
         {
-          config: :yellow,
-          create: :green,
-          debug:  :red,
-          drb:    :blue,
-          event:  :magenta,
-          info:   :default,
-          input:  :yellow,
-          output: :green,
-          store:  :cyan,
-          test:   :white,
-          update: :cyan,
+          config: [:light_yellow,  :yellow],
+          create: [:light_green,   :green],
+          debug:  [:light_red,     :red],
+          drb:    [:light_blue,    :blue],
+          event:  [:light_magenta, :magenta],
+          info:   [:white,         :default],
+          input:  [:light_yellow,  :yellow],
+          output: [:light_green,   :green],
+          store:  [:light_cyan,    :cyan],
+          test:   [:light_white,   :white],
+          update: [:light_cyan,    :cyan],
         }
       end
 
       # Returns a formatted (red, underlined) UTC timestamp,
       # eg. 2014-10-24T12:34:56Z
       #
+      # @param utc_time [String]
       # @return [String]
       def timestamp(utc_time)
         return '' if @last_seen == utc_time

data/lib/vedeu/support/terminal.rb

@@ -37,7 +37,7 @@ module Vedeu
     #
     # @return [String]
     def input
-      Vedeu.log(type: :debug, message: "--- Waiting for user input")
+      Vedeu.log(type: :debug, message: 'Waiting for user input...')
 
       keys_or_cmd = if raw_mode?
                       keys = console.getch

data/lib/vedeu/support/timer.rb

@@ -3,16 +3,19 @@ module Vedeu
   # Measure the duration. Used for debugging.
   class Timer
 
+    # @param type [Symbol]
     # @param message [String]
     # @param block [Proc]
     # @return [void]
-    def self.for(message = '', &block)
-      new(message).measure(&block)
+    def self.for(type = :debug, message = '', &block)
+      new(type, message).measure(&block)
     end
 
+    # @param type [Symbol]
     # @param message [String]
     # @return [Vedeu::Timer]
-    def initialize(message = '')
+    def initialize(type = :debug, message = '')
+      @type    = type
       @message = message
       @started = Time.now.to_f
     end
@@ -24,7 +27,7 @@ module Vedeu
 
       elapsed = ((Time.now.to_f - started) * 1000).to_i
 
-      Vedeu.log(type: :debug, message: "#{message} took #{elapsed}ms.")
+      Vedeu.log(type: type, message: "#{message} took #{elapsed}ms.")
 
       work
     end
@@ -39,6 +42,10 @@ module Vedeu
     # @return [String]
     attr_reader :message
 
+    # @!attribute [r] type
+    # @return [Symbol]
+    attr_reader :type
+
   end # Timer
 
 end # Vedeu

data/test/lib/vedeu/cursor/move_test.rb

@@ -5,7 +5,8 @@ module Vedeu
   describe Move do
 
     let(:described) { Vedeu::Move }
-    let(:instance)  { described.new(_name, dy, dx) }
+    let(:instance)  { described.new(entity, _name, dy, dx) }
+    let(:entity)    { Vedeu::Cursor }
     let(:_name)     { '' }
     let(:dy)        { 0 }
     let(:dx)        { 0 }
@@ -56,6 +57,7 @@ module Vedeu
 
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
+      it { instance.instance_variable_get('@entity').must_equal(entity) }
       it { instance.instance_variable_get('@name').must_equal(_name) }
       it { instance.instance_variable_get('@dy').must_equal(dy) }
       it { instance.instance_variable_get('@dx').must_equal(dx) }
@@ -69,7 +71,7 @@ module Vedeu
         Vedeu::Cursor.new(name: 'manganese', oy: 2, ox: 3, x: 8, y: 7).store
       end
 
-      subject { described.by_name(direction, _name) }
+      subject { described.by_name(entity, direction, _name) }
 
       it { subject.must_be_instance_of(Vedeu::Cursor) }
 
@@ -107,7 +109,7 @@ module Vedeu
     describe '.down' do
       let(:_name) { 'move_down' }
 
-      subject { described.down(_name) }
+      subject { described.down(entity, _name) }
 
       it { subject.must_be_instance_of(Vedeu::Cursor) }
 
@@ -135,7 +137,7 @@ module Vedeu
     describe '.left' do
       let(:_name) { 'move_left' }
 
-      subject { described.left(_name) }
+      subject { described.left(entity, _name) }
 
       it { subject.must_be_instance_of(Vedeu::Cursor) }
 
@@ -161,7 +163,7 @@ module Vedeu
     describe '.right' do
       let(:_name) { 'move_right' }
 
-      subject { described.right(_name) }
+      subject { described.right(entity, _name) }
 
       it { subject.must_be_instance_of(Vedeu::Cursor) }
 
@@ -189,7 +191,7 @@ module Vedeu
     describe '.up' do
       let(:_name) { 'move_up' }
 
-      subject { described.up(_name) }
+      subject { described.up(entity, _name) }
 
       it { subject.must_be_instance_of(Vedeu::Cursor) }
 
@@ -215,7 +217,7 @@ module Vedeu
     describe '#origin' do
       let(:_name) { 'move_origin' }
 
-      subject { described.origin(_name) }
+      subject { described.origin(entity, _name) }
 
       it { subject.must_be_instance_of(Vedeu::Cursor) }
 

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

@@ -5,18 +5,34 @@ module Vedeu
   describe Coordinate do
 
     let(:described) { Vedeu::Coordinate }
-    let(:instance)  { described.new(height, width, x, y) }
+    let(:instance)  { described.new(_name) }
+    let(:_name)     { 'coordinate' }
     let(:height)    { 6 }
     let(:width)     { 6 }
     let(:x)         { 7 }
     let(:y)         { 5 }
 
+    let(:borders)   { mock('Vedeu::Borders') }
+    let(:border)    {
+      Vedeu::Border.new({
+        name: _name,
+        enabled: true
+      })
+    }
+
+    before do
+      Vedeu::Geometry.new({name: _name,
+        height: height,
+        width: width,
+        x: x,
+        y: y}).store
+      Vedeu.stubs(:borders).returns(borders)
+      borders.stubs(:by_name).returns(border)
+    end
+
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
-      it { instance.instance_variable_get('@height').must_equal(height) }
-      it { instance.instance_variable_get('@width').must_equal(width) }
-      it { instance.instance_variable_get('@x').must_equal(x) }
-      it { instance.instance_variable_get('@y').must_equal(y) }
+      it { instance.instance_variable_get('@name').must_equal(_name) }
     end
 
     describe '#yn' do
@@ -29,7 +45,7 @@ module Vedeu
       end
 
       context 'when the height is > 0' do
-        it { subject.must_equal(11) }
+        it { subject.must_equal(9) }
       end
     end
 
@@ -43,16 +59,12 @@ module Vedeu
       end
 
       context 'when the width is > 0' do
-        it { subject.must_equal(13) }
+        it { subject.must_equal(11) }
       end
     end
 
     describe '#y_position' do
       let(:index)  { 0 }
-      let(:height) { 6 }
-      let(:width)  { 6 }
-      let(:x)      { 7 }
-      let(:y)      { 5 }
 
       subject { instance.y_position(index) }
 
@@ -61,18 +73,18 @@ module Vedeu
       context 'with a negative index' do
         let(:index) { -3 }
 
-        it { subject.must_equal(5) }
+        it { subject.must_equal(6) }
       end
 
       context 'with an index greater than the maximum index for y' do
         let(:index) { 9 }
 
-        it { subject.must_equal(11) }
+        it { subject.must_equal(9) }
 
         context 'but the height is negative' do
           let(:height) { -2 }
 
-          it { subject.must_equal(0) }
+          it { subject.must_equal(1) }
         end
       end
 
@@ -85,10 +97,6 @@ module Vedeu
 
     describe '#x_position' do
       let(:index)  { 0 }
-      let(:height) { 6 }
-      let(:width)  { 6 }
-      let(:x)      { 7 }
-      let(:y)      { 5 }
 
       subject { instance.x_position(index) }
 
@@ -97,18 +105,18 @@ module Vedeu
       context 'with a negative index' do
         let(:index) { -3 }
 
-        it { subject.must_equal(7) }
+        it { subject.must_equal(8) }
       end
 
       context 'with an index greater than the maximum index for x' do
         let(:index) { 9 }
 
-        it { subject.must_equal(13) }
+        it { subject.must_equal(11) }
 
         context 'but the width is negative' do
           let(:width) { -2 }
 
-          it { subject.must_equal(0) }
+          it { subject.must_equal(3) }
         end
       end
 

data/test/lib/vedeu/geometry/geometry_test.rb

@@ -20,7 +20,7 @@ module Vedeu
         yn:         yn,
       }
     }
-    let(:centred)   {}
+    let(:centred)   { false }
     let(:height)    {}
     let(:maximised) { false }
     let(:_name)     {}
@@ -56,7 +56,10 @@ module Vedeu
 
       it { subject.must_be_instance_of(String) }
 
-      it { subject.must_equal('<Vedeu::Geometry x:1 xn:40 y:1 yn:12 maximise:false>') }
+      it { subject.must_equal(
+        '<Vedeu::Geometry x:1 xn:40 y:1 yn:12 centred:false maximise:false>'
+        )
+      }
     end
 
     describe '#maximise' do
@@ -93,6 +96,15 @@ module Vedeu
       it { subject.maximised.must_equal(false) }
     end
 
+    describe '#move' do
+      let(:dy) {}
+      let(:dx) {}
+
+      subject { instance.move(dy, dx) }
+
+
+    end
+
     describe '#top, #right, #bottom, #left' do
       context 'maximised is true' do
         let(:attributes) { { maximised: true } }