vedeu 0.2.4 → 0.2.5

data/lib/vedeu/support/colour_translator.rb

@@ -82,7 +82,7 @@ module Vedeu
 
     # @return [Boolean]
     def valid_name?
-      codes.keys.include?(colour)
+      Esc.codes.keys.include?(colour)
     end
 
     # @return [Boolean]
@@ -154,21 +154,6 @@ module Vedeu
       (css_to_rgb[2] / 51) * 1
     end
 
-    # @return [Hash]
-    def codes
-      {
-        black:   30,
-        red:     31,
-        green:   32,
-        yellow:  33,
-        blue:    34,
-        magenta: 35,
-        cyan:    36,
-        white:   37,
-        default: 39,
-      }
-    end
-
   end # ColourTranslator
 
 end # Vedeu

data/lib/vedeu/support/esc.rb

@@ -8,6 +8,21 @@ module Vedeu
 
     extend self
 
+    # @return [Hash]
+    def codes
+      {
+        black:   30,
+        red:     31,
+        green:   32,
+        yellow:  33,
+        blue:    34,
+        magenta: 35,
+        cyan:    36,
+        white:   37,
+        default: 39,
+      }
+    end
+
     # Dynamically creates methods for each terminal named colour. When a block
     # is given, then the colour is reset to 'default' once the block is called.
     #
@@ -21,17 +36,7 @@ module Vedeu
     #   Esc.on_blue { 'some text' } # => "\e[44msome text\e[49m"
     #
     # @return [String]
-    {
-      black:   30,
-      red:     31,
-      green:   32,
-      yellow:  33,
-      blue:    34,
-      magenta: 35,
-      cyan:    36,
-      white:   37,
-      default: 39,
-    }.each do |key, code|
+    codes.each do |key, code|
       define_method(key) do |&blk|
         "\e[#{code}m" + (blk ? blk.call + "\e[39m" : '')
       end
@@ -119,28 +124,24 @@ module Vedeu
 
     # @return [String]
     def clear
-      [ string('fg_reset'),
-        string('bg_reset'),
+      [ colour_reset,
         "\e[2J" ].join
     end
 
     # @return [String]
     def clear_line
-      [ string('fg_reset'),
-        string('bg_reset'),
+      [ colour_reset,
         "\e[2K" ].join
     end
 
     # @return [String]
     def clear_last_line
-      [ set_position((Terminal.height - 1), 1),
-        string('clear_line') ].join
+      [set_position((Terminal.height - 1), 1), clear_line].join
     end
 
     # @return [String]
     def colour_reset
-      [ string('fg_reset'),
-        string('bg_reset') ].join
+      [fg_reset, bg_reset].join
     end
 
     # @return [String]
@@ -165,9 +166,7 @@ module Vedeu
 
     # @return [String]
     def normal
-      [ string('underline_off'),
-        string('bold_off'),
-        string('positive') ].join
+      [underline_off, bold_off, positive].join
     end
 
     # @return [String]
@@ -182,16 +181,12 @@ module Vedeu
 
     # @return [String]
     def screen_init
-      [ string('reset'),
-        string('clear'),
-        string('hide_cursor') ].join
+      [reset, clear, hide_cursor].join
     end
 
     # @return [String]
     def screen_exit
-      [ string('show_cursor'),
-        string('colour_reset'),
-        string('reset') ].join
+      [show_cursor, colour_reset, reset].join
     end
 
     # @return [String]

data/lib/vedeu/support/event.rb

@@ -64,15 +64,11 @@ module Vedeu
     #
     # @return [Boolean]
     def throttle_expired?
-      if elapsed_time > delay
-        true
+      return true if elapsed_time > delay
 
-      else
-        Vedeu.log("Throttling event '#{event_name}'")
+      Vedeu.log("Throttling event '#{event_name}'")
 
-        false
-
-      end
+      false
     end
 
     # Returns a boolean indicating whether debouncing is required for this
@@ -92,15 +88,11 @@ module Vedeu
     #
     # @return [Boolean]
     def debounce_expired?
-      if set_executed > deadline
-        true
-
-      else
-        Vedeu.log("Debouncing event '#{event_name}'")
+      return true if set_executed > deadline
 
-        false
+      Vedeu.log("Debouncing event '#{event_name}'")
 
-      end
+      false
     end
 
     # @return [Float]

data/lib/vedeu/support/registrar.rb

@@ -1,13 +1,13 @@
 module Vedeu
 
-  # When the client application has defined interfaces to be used, the Registrar
-  # stores these interfaces into various repositories for later use.
+  # When the client application has defined an interface to be used, the
+  # Registrar stores the attributes into various repositories for later use.
   #
   # @api private
   class Registrar
 
     # @param attributes [Hash]
-    # @return [TrueClass|]
+    # @return [TrueClass|MissingRequired]
     def self.record(attributes = {})
       new(attributes).record
     end
@@ -22,17 +22,9 @@ module Vedeu
     #
     # @return [TrueClass|MissingRequired]
     def record
-      Vedeu::Buffers.add(attributes)
-
-      Vedeu::Offsets.add(attributes)
-
-      Vedeu::Interfaces.add(attributes)
-
-      Vedeu::Cursors.add(attributes)
-
-      Vedeu::Groups.add(attributes)
-
-      Vedeu::Focus.add(attributes)
+      [Buffers, Offsets, Interfaces, Cursors, Groups, Focus].map do |repository|
+        repository.add(attributes)
+      end
 
       true
     end

data/lib/vedeu/support/repository.rb

@@ -1,5 +1,7 @@
 module Vedeu
 
+  # Provides common methods for accessing the various repositories Vedeu uses.
+  #
   # @api private
   module Repository
 
@@ -25,8 +27,7 @@ module Vedeu
     # @return [Cursor|Offset]
     def find_or_create(name)
       storage.fetch(name) do
-        Vedeu.log("Entity (#{entity.to_s}) not found, " \
-                  "registering new for: '#{name}'")
+        Vedeu.log("Entity (#{entity}) not found, registering: '#{name}'")
 
         storage.store(name, entity.new({ name: name }))
       end

data/lib/vedeu/support/terminal.rb

@@ -65,7 +65,7 @@ module Vedeu
     # @param block [Proc]
     # @return []
     def initialize_screen(&block)
-      output Esc.string 'screen_init'
+      output(Esc.string('screen_init'))
 
       yield
     end
@@ -74,7 +74,7 @@ module Vedeu
     #
     # @return [String]
     def clear_screen
-      output Esc.string 'clear'
+      output(Esc.string('clear'))
     end
 
     # Attempts to tidy up the screen just before the application terminates.
@@ -92,7 +92,7 @@ module Vedeu
     #
     # @return [String]
     def set_cursor_mode
-      output Esc.string 'show_cursor' unless raw_mode?
+      output(Esc.string('show_cursor')) unless raw_mode?
     end
 
     # Returns a boolean indicating whether the terminal is currently in `cooked`
@@ -107,6 +107,8 @@ module Vedeu
     #
     # @return [Symbol]
     def cooked_mode!
+      Vedeu.log("Terminal switching to 'cooked' mode")
+
       @_mode = :cooked
     end
 
@@ -122,6 +124,8 @@ module Vedeu
     #
     # @return [Symbol]
     def raw_mode!
+      Vedeu.log("Terminal switching to 'raw' mode")
+
       @_mode = :raw
     end
 
@@ -130,17 +134,9 @@ module Vedeu
     #
     # @return [Symbol]
     def switch_mode!
-      if raw_mode?
-        Vedeu.log("Terminal switching to 'cooked' mode")
-
-        cooked_mode!
+      return cooked_mode! if raw_mode?
 
-      else
-        Vedeu.log("Terminal switching to 'raw' mode")
-
-        raw_mode!
-
-      end
+      raw_mode!
     end
 
     # Returns the mode of the terminal, either `:raw` or `:cooked`

data/lib/vedeu/support/trace.rb

@@ -30,7 +30,7 @@ module Vedeu
     #
     # @return []
     def trace
-      set_trace_func proc { |event, file, line, id, binding, classname|
+      set_trace_func proc { |event, _file, _line, id, binding, classname|
         if event == watched && id != :log && classes.include?(classname.to_s)
           vars = variables(binding)
 
@@ -120,7 +120,7 @@ module Vedeu
     #
     # @return [String]
     def class_count
-      @_count ||= "(#{classes.size.to_s}/#{vedeu_classes.size.to_s})"
+      @_count ||= "(#{classes.size}/#{vedeu_classes.size})"
     end
 
     # Returns the classes to be traced, without exceptions or ignored classes.
@@ -169,7 +169,6 @@ module Vedeu
       Set.new [
         # 'Vedeu::API',
         # 'Vedeu::Application',
-        # 'Vedeu::Area',
         # 'Vedeu::Background',
         # 'Vedeu::Buffers',
         # 'Vedeu::Clear',

data/test/integration/cursors_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module Vedeu
+
+  describe 'Integrations: Testing cursors, offsets and viewports' do
+
+  end
+
+end # Vedeu

data/test/integration/views/basic_view_test.rb

@@ -22,6 +22,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -54,6 +55,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -81,6 +83,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -108,6 +111,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -136,6 +140,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -171,6 +176,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -205,6 +211,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name: 'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -234,6 +241,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name: 'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -264,6 +272,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name: 'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -299,6 +308,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name: 'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -334,6 +344,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -377,6 +388,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -426,6 +438,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name: 'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -478,6 +491,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name: 'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -523,6 +537,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -558,6 +573,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -593,6 +609,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -628,6 +645,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',
@@ -672,6 +690,7 @@ module Vedeu
           end.must_equal(
             { interfaces: [{
               name:  'testing_view',
+              cursor: :hide,
               group: '',
               colour: {},
               style: '',