vedeu 0.6.62 → 0.6.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161b51ae0f6dddf89fe026875fa21b5bcbef0b63
-  data.tar.gz: f724c3d3b35f703f2ba58800123628837fd7a8fa
+  metadata.gz: 62cdfdd3391cb52b378f21160f57a5f0b1bd7792
+  data.tar.gz: 1253650d2091f8d085a6ba99cfb6e035aae658e8
 SHA512:
-  metadata.gz: 66121dcb5d8c27bc23a7ec695a2eecf360dfe0946f7f0cb3cf85eb39682f6a0a683d14328987e3858807a8a3fbf75c3a440565ad0aa39c80d76eea9eea263396
-  data.tar.gz: c21adb2837c843bbb19a8b60ced2f19fa76835417ed86a15f769153c9e212f5a8b98133a5cf47446a4ab1a212971bff37321f360c2697f7849f258abece2654b
+  metadata.gz: 2cfc8ed0ff83a941c2692d1d68ea36cfd9e4022b6796efefd9b254942cc947dd29b9267090c9ddb625948edbff56074c9a7268c9339dd30ca3ab86121c52ef06
+  data.tar.gz: 3a6780083ee0f2b053aaa8dd3450173c53b0020e7909753141b8d8d6660258a6d413d91747670e2c5efca3a76fbaec2be319e851f2b5860094352edcc0b5c560

data/.rubocop.yml

@@ -124,7 +124,7 @@ Style/TrailingComma:
 Metrics/AbcSize:
   # The ABC size is a calculated magnitude, so this number can be a Fixnum or
   # a Float.
-  Max: 20
+  Max: 25
 
 Metrics/BlockNesting:
   Max: 3

data/lib/vedeu/borders/caption.rb

@@ -10,6 +10,31 @@ module Vedeu
     #
     class Caption < Title
 
+      # Overwrite the border from {#build_horizontal} on the bottom
+      # border to include the caption if given.
+      #
+      # @param [Array<Vedeu::Views::Char>]
+      # @return [Array<Vedeu::Views::Char>]
+      def render
+        return chars if empty?
+
+        caption_index = 0
+        chars.each_with_index do |char, index|
+          next if index <= start_index || index > (width - 4)
+
+          char.border   = nil
+          char.value    = characters[caption_index]
+          caption_index += 1
+        end
+      end
+
+      private
+
+      # @return [Fixnum]
+      def start_index
+        (width - size) - 4
+      end
+
     end # Caption
 
   end # Borders

data/lib/vedeu/borders/refresh.rb

@@ -97,18 +97,6 @@ module Vedeu
         end
       end
 
-      # @return [Vedeu::Borders::Caption] An optional caption for when
-      #   the bottom border is to be shown.
-      def render_caption
-        @_caption ||= Vedeu::Borders::Caption.coerce(caption, width)
-      end
-
-      # @return [Vedeu::Borders::Title] An optional title for when the
-      #   top border is to be shown.
-      def render_title
-        @_title ||= Vedeu::Borders::Title.coerce(title, width)
-      end
-
       # @param value [String]
       # @param type [Symbol|NilClass]
       # @param iy [Fixnum]
@@ -242,38 +230,25 @@ module Vedeu
         [build_top_left, titlebar, build_top_right].compact
       end
 
-      # Overwrite the border from {#build_horizontal} on the bottom
-      # border to include the caption if given.
+      # An optional caption for when the bottom border is to be shown.
       #
       # @return [Array<Vedeu::Views::Char>]
+      # @see [Vedeu::Borders::Caption#render]
       def captionbar
-        return build_bottom if render_caption.empty?
-
-        caption_starts_at = (width - render_caption.size) - 2
+        return nil unless caption
 
-        caption_index = 0
-        build_bottom.each_with_index do |char, index|
-          next if index <= caption_starts_at || index > (width - 2)
-
-          char.border   = nil
-          char.value    = render_caption.characters[caption_index]
-          caption_index += 1
-        end
+        @_caption ||= Vedeu::Borders::Caption
+                        .render(caption, width, build_bottom)
       end
 
-      # Overwrite the border from {#build_horizontal} on the top
-      # border to include the title if given.
+      # An optional title for when the top border is to be shown.
       #
       # @return [Array<Vedeu::Views::Char>]
+      # @see [Vedeu::Borders::Title#render]
       def titlebar
-        return build_top if render_title.empty?
+        return nil unless title
 
-        build_top.each_with_index do |char, index|
-          next if index == 0 || index > render_title.size
-
-          char.border = nil
-          char.value  = render_title.characters[index - 1]
-        end
+        @_title ||= Vedeu::Borders::Title.render(title, width, build_top)
       end
 
     end # Refresh

data/lib/vedeu/borders/title.rb

@@ -14,40 +14,22 @@ module Vedeu
       #   Vedeu::Borders::Caption]
       # @param width [Fixnum]
       # @return [Vedeu::Borders::Title|Vedeu::Borders::Caption]
-      def self.coerce(value = '', width = Vedeu.width)
-        if value.is_a?(self)
-          value
-
-        else
-          new(value, width)
-
-        end
+      def self.render(value = '', width = Vedeu.width, chars = [])
+        new(value, width, chars).render
       end
 
       # Returns a new instance of Vedeu::Borders::Title or
       # Vedeu::Borders::Caption.
       #
+      # @param chars [Array<Vedeu::Views::Char>]
       # @param value [String|Vedeu::Borders::Title|
       #   Vedeu::Borders::Caption]
       # @param width [Fixnum]
       # @return [Vedeu::Borders::Title|Vedeu::Borders::Caption]
-      def initialize(value = '', width = Vedeu.width)
+      def initialize(value = '', width = Vedeu.width, chars = [])
         @value = value
         @width = width
-      end
-
-      # Return the padded, truncated value as an Array of String.
-      #
-      # @return [Array<String>]
-      def characters
-        pad.chars
-      end
-
-      # Return boolean indicating whether the value is empty.
-      #
-      # @return [Boolean]
-      def empty?
-        value.empty?
+        @chars = chars
       end
 
       # An object is equal when its values are the same.
@@ -59,11 +41,20 @@ module Vedeu
       end
       alias_method :==, :eql?
 
-      # Return the size of the padded, truncated value.
+      # Overwrite the border from {#build_horizontal} on the top
+      # border to include the title if given.
       #
-      # @return [Fixnum]
-      def size
-        pad.size
+      # @param [Array<Vedeu::Views::Char>]
+      # @return [Array<Vedeu::Views::Char>]
+      def render
+        return chars if empty?
+
+        chars.each_with_index do |char, index|
+          next if index == start_index || index > size
+
+          char.border = nil
+          char.value  = characters[index - 1]
+        end
       end
 
       # Convert the value to a string.
@@ -82,8 +73,28 @@ module Vedeu
       alias_method :title, :value
       alias_method :caption, :value
 
+      protected
+
+      # @!attribute [r] chars
+      # @return [Array<Vedeu::Views::Char>]
+      attr_reader :chars
+
       private
 
+      # Return the padded, truncated value as an Array of String.
+      #
+      # @return [Array<String>]
+      def characters
+        pad.chars
+      end
+
+      # Return boolean indicating whether the value is empty.
+      #
+      # @return [Boolean]
+      def empty?
+        value.empty?
+      end
+
       # Pads the value with a single whitespace either side.
       #
       # @example
@@ -100,6 +111,18 @@ module Vedeu
         truncate.center(truncate.size + 2)
       end
 
+      # Return the size of the padded, truncated value.
+      #
+      # @return [Fixnum]
+      def size
+        pad.size
+      end
+
+      # @return [Fixnum]
+      def start_index
+        0
+      end
+
       # Truncates the value to the width of the interface, minus
       # characters needed to ensure there is at least a single
       # character of horizontal border and a whitespace on either side

data/lib/vedeu/buffers/terminal.rb

@@ -115,7 +115,9 @@ module Vedeu
   Vedeu.bind(:_drb_retrieve_output_) { Vedeu::Buffers::Terminal.output }
 
   # @see Vedeu::Buffers::Terminal#write
-  Vedeu.bind(:_drb_store_output_) { |data| Vedeu::Buffers::Terminal.write(data) }
+  Vedeu.bind(:_drb_store_output_) do |data|
+    Vedeu::Buffers::Terminal.write(data)
+  end
 
   # :nocov:
 

data/lib/vedeu/colours/translator.rb

@@ -186,7 +186,13 @@ module Vedeu
       # @return [String]
       def rgb
         if Vedeu::Configuration.colour_mode == 16_777_216
-          register(colour, format(rgb_prefix, *css_to_rgb))
+          if registered?(colour)
+            retrieve(colour)
+
+          else
+            register(colour, format(rgb_prefix, *css_to_rgb))
+
+          end
 
         else
           numbered

data/lib/vedeu/cursors/cursor.rb

@@ -85,6 +85,12 @@ module Vedeu
       end
       alias_method :==, :eql?
 
+      # @return [String]
+      def inspect
+        "<#{self.class.name} name:'#{name}', x:#{x}, y:#{y}, ox:#{ox}, " \
+        "oy:#{oy}, visible:#{visible}>"
+      end
+
       # Moves the cursor down by one row.
       #
       #   Vedeu.trigger(:_cursor_down_, name)

data/lib/vedeu/cursors/refresh.rb

@@ -13,6 +13,15 @@ module Vedeu
       extend Forwardable
       include Vedeu::Common
 
+      def_delegators :cursor,
+                     :ox,
+                     :oy,
+                     :render,
+                     :visible,
+                     :visible?,
+                     :x,
+                     :y
+
       def_delegators :geometry,
                      :bordered_height,
                      :bordered_width
@@ -45,11 +54,10 @@ module Vedeu
         refresh_view if refresh_view?
 
         Vedeu.log(type:    :output,
-                  message: "Refreshing cursor: '#{name}' (x:#{cursor.x}, " \
-                           "y:#{cursor.y}, ox:#{cursor.ox}, oy:#{cursor.oy}, " \
-                           "visible:#{cursor.visible})".freeze)
+                  message: "Refreshing cursor: '#{name}' (x:#{x}, y:#{y}, " \
+                           "ox:#{ox}, oy:#{oy}, visible:#{visible})".freeze)
 
-        cursor.render
+        render
       end
 
       private
@@ -71,8 +79,7 @@ module Vedeu
       #
       # @return [Boolean]
       def refresh_view?
-        cursor.visible? && (cursor.ox >= bordered_width ||
-                            cursor.oy >= bordered_height)
+        visible? && (ox >= bordered_width || oy >= bordered_height)
       end
 
       # @return [Vedeu::Cursors::Cursor]

data/lib/vedeu/editor/cropper.rb

@@ -90,13 +90,6 @@ module Vedeu
         @lines[oy...(oy + bordered_height)] || []
       end
 
-      # Returns the interface by name.
-      #
-      # @return (see Vedeu::Interfaces::Repository#by_name)
-      def interface
-        @interface ||= Vedeu.interfaces.by_name(name)
-      end
-
       # Return a range of visible characters from each line.
       #
       # @return [String]

data/lib/vedeu/input/capture.rb

@@ -60,7 +60,7 @@ module Vedeu
           elsif Vedeu::Input::Mapper.registered?(@key, name)
             Vedeu.trigger(:_keypress_, @key, name)
 
-          elsif interface.editable?
+          elsif Vedeu.interfaces.by_name(name).editable?
             Vedeu.trigger(:_editor_, @key)
 
           elsif @key.nil?
@@ -133,11 +133,6 @@ module Vedeu
         Vedeu.focus
       end
 
-      # @return [Vedeu::Interfaces::Interface]
-      def interface
-        Vedeu.interfaces.by_name(name)
-      end
-
     end # Input
 
   end # Input

data/lib/vedeu/input/store.rb

@@ -33,13 +33,6 @@ module Vedeu
         all_keypresses << keypress
       end
 
-      # Access all commands and keypresses stored.
-      #
-      # @return [Hash<Symbol => Array<Symbol|String>>]
-      def all
-        storage
-      end
-
       # Access all commands stored.
       #
       # @example
@@ -93,12 +86,15 @@ module Vedeu
       end
       alias_method :reset, :reset!
 
-      private
-
+      # Access all commands and keypresses stored.
+      #
       # @return [Hash<Symbol => Array<Symbol|String>>]
       def storage
         @storage ||= in_memory
       end
+      alias_method :all, :storage
+
+      private
 
       # @return [Hash<Symbol => Array<Symbol|String>>]
       def in_memory

data/lib/vedeu/interfaces/clear.rb

@@ -88,7 +88,7 @@ module Vedeu
 
       # @return [Vedeu::Colours::Colour]
       def colour
-        @colour ||= interface.colour
+        @colour ||= Vedeu.interfaces.by_name(name).colour
       end
 
       # @return [Boolean]
@@ -127,13 +127,6 @@ module Vedeu
                     end
       end
 
-      # Returns the interface by name.
-      #
-      # @return (see Vedeu::Interfaces::Repository#by_name)
-      def interface
-        @interface ||= Vedeu.interfaces.by_name(name)
-      end
-
       # @return [Hash<Symbol => Boolean>]
       def options
         defaults.merge!(@options)

data/lib/vedeu/models/focus.rb

@@ -71,7 +71,7 @@ module Vedeu
       #
       # @return [String]
       def current
-        return storage[0] unless empty?
+        return storage[0] unless storage.empty?
 
         no_interfaces_registered!
       end
@@ -90,13 +90,6 @@ module Vedeu
       end
       alias_method :focussed?, :current?
 
-      # Return a boolean indicating whether the storage is empty.
-      #
-      # @return [Boolean]
-      def empty?
-        storage.empty?
-      end
-
       # Put the next interface relative to the current interfaces in
       # focus.
       #
@@ -121,7 +114,7 @@ module Vedeu
 
         loop do
           storage.rotate!
-          break if Vedeu.interfaces.by_name(current).visible?
+          break if interface.visible?
         end
 
         update
@@ -153,7 +146,7 @@ module Vedeu
 
         loop do
           storage.rotate!(-1)
-          break if Vedeu.interfaces.by_name(current).visible?
+          break if interface.visible?
         end
 
         update
@@ -183,7 +176,7 @@ module Vedeu
       # @param name [String|Symbol]
       # @return [Boolean]
       def registered?(name)
-        return false if empty?
+        return false if storage.empty?
 
         storage.include?(name)
       end
@@ -198,6 +191,11 @@ module Vedeu
 
       private
 
+      # @return [Vedeu::Interfaces::Interface]
+      def interface
+        Vedeu.interfaces.by_name(current)
+      end
+
       # @raise [Vedeu::Error::Fatal]
       def no_interfaces_registered!
         fail Vedeu::Error::Fatal,
@@ -218,7 +216,7 @@ module Vedeu
       #
       # @return [String|FalseClass]
       def update
-        return false if empty?
+        return false if storage.empty?
 
         Vedeu.log(message: "Interface in focus: '#{current}'".freeze)
 

data/lib/vedeu/version.rb

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

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

@@ -6,7 +6,21 @@ module Vedeu
 
     describe Caption do
 
-      # @todo Add more tests.
+      let(:instance) {}
+
+      describe '#render' do
+        let(:top_border) {}
+
+        subject { instance.render(top_border) }
+
+        context 'when the title is empty' do
+          # @todo Add more tests.
+        end
+
+        context 'when the title is not empty' do
+          # @todo Add more tests.
+        end
+      end
 
     end # Caption
 

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

@@ -7,48 +7,22 @@ module Vedeu
     describe Title do
 
       let(:described) { Vedeu::Borders::Title }
-      let(:instance)  { described.new(_value, width) }
+      let(:instance)  { described.new(_value, width, chars) }
       let(:_value)    { 'Aluminium' }
       let(:width)     { 10 }
+      let(:chars)     { [] }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@value').must_equal(_value) }
         it { instance.instance_variable_get('@width').must_equal(width) }
+        it { instance.instance_variable_get('@chars').must_equal(chars) }
       end
 
-      describe '.coerce' do
-        subject { described.coerce(_value, width) }
+      describe '.render' do
+        subject { described.render(_value, width, chars) }
 
-        context 'when the value is an instance of Vedeu::Borders::Title' do
-          let(:_value) { Vedeu::Borders::Title.new('Aluminium', 10) }
-
-          it { subject.must_equal(_value) }
-        end
-
-        context 'when the value is not an instance of Vedeu::Borders::Title' do
-          it { subject.must_equal(instance) }
-        end
-      end
-
-      describe '#characters' do
-        subject { instance.characters }
-
-        it { subject.must_equal([' ', 'A', 'l', 'u', 'm', 'i', 'n', ' ']) }
-      end
-
-      describe '#empty?' do
-        subject { instance.empty? }
-
-        context 'when the value is empty' do
-          let(:_value) { '' }
-
-          it { subject.must_equal(true) }
-        end
-
-        context 'when the value is not empty' do
-          it { subject.must_equal(false) }
-        end
+        # @todo Add more tests.
       end
 
       describe '#eql?' do
@@ -65,10 +39,18 @@ module Vedeu
         end
       end
 
-      describe '#size' do
-        subject { instance.size }
+      describe '#render' do
+        let(:top_border) {}
 
-        it { subject.must_equal(8) }
+        subject { instance.render(top_border) }
+
+        context 'when the title is empty' do
+          # @todo Add more tests.
+        end
+
+        context 'when the title is not empty' do
+          # @todo Add more tests.
+        end
       end
 
       describe '#to_s' do

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

@@ -117,6 +117,18 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Models::Escape) }
       end
 
+      describe '#inspect' do
+        let(:expected) {
+          "<Vedeu::Cursors::Cursor name:'silver', x:19, y:8, ox:3, oy:2, " \
+          "visible:true>"
+        }
+
+        subject { instance.inspect }
+
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal(expected) }
+      end
+
       describe '#move_down' do
         let(:x)  { 19 }
         let(:y)  { 8 }

data/test/lib/vedeu/input/store_test.rb

@@ -26,32 +26,6 @@ module Vedeu
         it { subject.must_equal(['a']) }
       end
 
-      describe '#all' do
-        subject { described.all }
-
-        context 'when empty' do
-          it { subject.must_equal({ commands: [], keypresses: [] }) }
-        end
-
-        context 'when not empty' do
-          let(:expected) {
-            {
-              commands:   ['command_1', 'command_2'],
-              keypresses: ['a', 'b'],
-            }
-          }
-
-          before do
-            described.add_command('command_1')
-            described.add_command('command_2')
-            described.add_keypress('a')
-            described.add_keypress('b')
-          end
-
-          it { subject.must_equal(expected) }
-        end
-      end
-
       describe '#all_commands' do
         subject { described.all_commands }
 
@@ -130,6 +104,34 @@ module Vedeu
         it { subject.must_equal({ commands: [], keypresses: [] }) }
       end
 
+      describe '#storage' do
+        subject { described.storage }
+
+        it { described.must_respond_to(:all) }
+
+        context 'when empty' do
+          it { subject.must_equal({ commands: [], keypresses: [] }) }
+        end
+
+        context 'when not empty' do
+          let(:expected) {
+            {
+              commands:   ['command_1', 'command_2'],
+              keypresses: ['a', 'b'],
+            }
+          }
+
+          before do
+            described.add_command('command_1')
+            described.add_command('command_2')
+            described.add_keypress('a')
+            described.add_keypress('b')
+          end
+
+          it { subject.must_equal(expected) }
+        end
+      end
+
     end # Store
 
   end # Input

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.62
+  version: 0.6.63
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-21 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard