vedeu 0.8.18 → 0.8.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bed6cd0c3c695df9f891c552340787a070f6f54a
-  data.tar.gz: 8dcad64d499e1cf9dffb5dda7451b050f9a09a12
+  metadata.gz: b277bb2a5c69ac52c885232267ee82fdb002277d
+  data.tar.gz: edc448e3e5a89a5ad038bae149d9a2adbff9f939
 SHA512:
-  metadata.gz: 179414aaacba620522ea4005d8c353609ea5deab9e9ad4d7d0d5431ee31bc634ca32c42df602056a41078f8eb3a8a779758fe2a1d07257c71a037e41d1420460
-  data.tar.gz: 1ddf063acbd38734c3098c5cc88b4cb1bf0aa9240ec8d9f806be1c82c2107d80890d1b3d9c639b81264ccfcc6e230832a6b7a7e0cdb78fa659b8c7664b863722
+  metadata.gz: a615ad7a66fa2d035a9b996cbe45346d5c0d5d649135a4f0dff83d9e407e6e06dedaaacfcb225f8dbfe1beeee7e528054fd659c71f17d510d192f261a803620d
+  data.tar.gz: e9e791cb8613bbaaf07d54904dd052254dd5fd4bb7f09f3caa7df79db934ae8a9ae5186d404849665d631661acdff2c911a4f47f066474ff72c7589cb8157f35

data/lib/vedeu/borders/border.rb

@@ -315,7 +315,7 @@ module Vedeu
           enabled:           false,
           horizontal:        Vedeu.esc.horizontal,
           left_vertical:     nil,
-          name:              '',
+          name:              nil,
           parent:            nil,
           repository:        Vedeu.borders,
           right_vertical:    nil,

data/lib/vedeu/borders/refresh.rb

@@ -120,6 +120,13 @@ module Vedeu
         [(bottom_left if left?), captionbar, (bottom_right if right?)].compact
       end
 
+      # @return [Array<void>]
+      def bottom_border
+        build_collection(bordered_width) do |ix|
+          bottom_horizontal.dup.tap { |cell| cell.position = [yn, bx + ix] }
+        end
+      end
+
       # @macro geometry_by_name
       def geometry
         Vedeu.geometries.by_name(name)
@@ -141,9 +148,7 @@ module Vedeu
       # @return [Array<void>]
       def left
         build_collection(bordered_height) do |iy|
-          cell = left_vertical.dup
-          cell.position = [by + iy, x]
-          cell
+          left_vertical.dup.tap { |cell| cell.position = [by + iy, x] }
         end
       end
 
@@ -152,9 +157,7 @@ module Vedeu
       # @return [Array<void>]
       def right
         build_collection(bordered_height) do |iy|
-          cell = right_vertical.dup
-          cell.position = [by + iy, xn]
-          cell
+          right_vertical.dup.tap { |cell| cell.position = [by + iy, xn] }
         end
       end
 
@@ -170,34 +173,29 @@ module Vedeu
         [(top_left if left?), titlebar, (top_right if right?)].compact
       end
 
+      # @return [Array<void>]
+      def top_border
+        build_collection(bordered_width) do |ix|
+          top_horizontal.dup.tap { |cell| cell.position = [y, bx + ix] }
+        end
+      end
+
       # An optional caption for when the bottom border is to be shown.
       #
       # @return (see Vedeu::Borders::Caption#render)
       def captionbar
-        characters = build_collection(bordered_width) do |ix|
-          cell = bottom_horizontal.dup
-          cell.position = [yn, bx + ix]
-          cell
-        end
+        return bottom_border unless present?(caption)
 
-        return characters unless present?(caption)
-
-        Vedeu::Borders::Caption.render(name, caption, characters)
+        Vedeu::Borders::Caption.render(name, caption, bottom_border)
       end
 
       # An optional title for when the top border is to be shown.
       #
       # @return (see Vedeu::Borders::Title#render)
       def titlebar
-        characters = build_collection(bordered_width) do |ix|
-          cell = top_horizontal.dup
-          cell.position = [y, bx + ix]
-          cell
-        end
-
-        return characters unless present?(title)
+        return top_border unless present?(title)
 
-        Vedeu::Borders::Title.render(name, title, characters)
+        Vedeu::Borders::Title.render(name, title, top_border)
       end
 
       # Build a collection with the given size of objects given within

data/lib/vedeu/buffers/buffer.rb

@@ -136,20 +136,7 @@ module Vedeu
       #
       # @return [Array<Array<Array<Vedeu::Cells::Char>>>]
       def render
-        current = if back?
-                    swap
-
-                    front
-
-                  elsif front?
-                    front
-
-                  elsif previous?
-                    previous
-
-                  end
-
-        Vedeu::Output::Viewport.render(current) unless current.nil?
+        Vedeu::Output::Viewport.render(current)
       end
 
       # Returns the number of lines of content for the buffer or 0 if
@@ -174,12 +161,28 @@ module Vedeu
 
       private
 
+      # @return [Vedeu::Views::View|NilClass]
+      def current
+        if back?
+          swap
+
+          front
+
+        elsif front?
+          front
+
+        elsif previous?
+          previous
+
+        end
+      end
+
       # @macro defaults_method
       def defaults
         {
           back:       nil,
           front:      nil,
-          name:       '',
+          name:       nil,
           previous:   nil,
           repository: Vedeu.buffers,
         }

data/lib/vedeu/cells/cursor.rb

@@ -20,6 +20,11 @@ module Vedeu
       alias foreground null
       alias style null
 
+      # @return [String]
+      def to_ast
+        ''
+      end
+
       # Return an empty hash as most escape sequences won't make
       # sense as JSON.
       #
@@ -44,6 +49,11 @@ module Vedeu
       end
       alias to_str to_s
 
+      # @return [String]
+      def text
+        ''
+      end
+
       # @return [Symbol]
       def type
         :cursor

data/lib/vedeu/cells/empty.rb

@@ -91,7 +91,7 @@ module Vedeu
       def defaults
         {
           colour:   {},
-          name:     '',
+          name:     nil,
           position: nil,
           style:    '',
           value:    '',

data/lib/vedeu/cells/escape.rb

@@ -28,6 +28,11 @@ module Vedeu
       alias foreground null
       alias style null
 
+      # @return [String]
+      def text
+        ''
+      end
+
       # Return an empty hash as most escape sequences won't make
       # sense as JSON.
       #

data/lib/vedeu/configuration/configuration.rb

@@ -30,6 +30,7 @@ module Vedeu
     info:     [:white,         :light_grey],
     input:    [:light_yellow,  :yellow],
     magenta:  [:light_magenta, :magenta],
+    nonevent: [:magenta,       :light_magenta],
     output:   [:light_yellow,  :yellow],
     red:      [:light_red,     :red],
     render:   [:light_green,   :green],

data/lib/vedeu/cursors/cursor.rb

@@ -231,7 +231,7 @@ module Vedeu
       # @macro defaults_method
       def defaults
         {
-          name:       '',
+          name:       nil,
           ox:         1,
           oy:         1,
           repository: Vedeu.cursors,
@@ -246,11 +246,6 @@ module Vedeu
         Vedeu::Cells::Cursor.new(position: position, value: visibility)
       end
 
-      # @return [Hash<Symbol => Fixnum>]
-      def new_attributes(new_y = y, new_x = x, new_oy = oy, new_ox = ox)
-        attributes.merge!(x: new_x, y: new_y, ox: new_ox, oy: new_oy)
-      end
-
       # Returns the escape sequence for setting the visibility of the
       # cursor.
       #

data/lib/vedeu/cursors/refresh.rb

@@ -19,10 +19,7 @@ module Vedeu
                      :ox,
                      :oy,
                      :render,
-                     :visible,
-                     :visible?,
-                     :x,
-                     :y
+                     :visible?
 
       def_delegators :geometry,
                      :bordered_height,
@@ -52,13 +49,12 @@ module Vedeu
       #
       # @return [Array]
       def by_name
-        Vedeu.trigger(:_refresh_view_content_, name) if refresh_view?
-
         Vedeu.log(type:    :cursor,
-                  message: "Refreshing cursor: '#{name}' (x:#{x}, y:#{y}, " \
-                           "ox:#{ox}, oy:#{oy}, visible:#{visible})")
+                  message: "Refreshing cursor: (#{cursor.inspect})")
 
         render
+
+        Vedeu.trigger(:_refresh_view_content_, name) if refresh_view?
       end
 
       private

data/lib/vedeu/dsl/elements.rb

@@ -171,12 +171,9 @@ module Vedeu
 
             end
 
-        if view_model?
+        if view_model? || line_model? || stream_model?
           model.add(l)
 
-        elsif line_model? || stream_model?
-          model.add([l])
-
         else
           raise Vedeu::Error::Fatal,
                 "Cannot add stream to '#{model.class.name}' model."

data/lib/vedeu/editor/cursor.rb

@@ -173,7 +173,7 @@ module Vedeu
       # @macro defaults_method
       def defaults
         {
-          name: '',
+          name: nil,
           ox:   0,
           oy:   0,
           x:    0,

data/lib/vedeu/events/trigger.rb

@@ -42,7 +42,7 @@ module Vedeu
       # @return [Array]
       def trigger
         if Vedeu.config.debug? && results.empty?
-          Vedeu.log(type:    :event,
+          Vedeu.log(type:    :nonevent,
                     message: "No action for: '#{name.inspect}'")
         end
 

data/lib/vedeu/geometries/move.rb

@@ -66,7 +66,7 @@ module Vedeu
       def defaults
         {
           direction: :none,
-          name:      '',
+          name:      nil,
           offset:    1,
         }
       end

data/lib/vedeu/groups/group.rb

@@ -162,7 +162,7 @@ module Vedeu
       def defaults
         {
           members:    Set.new,
-          name:       '',
+          name:       nil,
           repository: Vedeu.groups,
           visible:    true,
         }

data/lib/vedeu/input/keymap.rb

@@ -88,7 +88,7 @@ module Vedeu
       # @macro defaults_method
       def defaults
         {
-          name:       '',
+          name:       nil,
           keys:       [],
           repository: Vedeu.keymaps,
         }

data/lib/vedeu/interfaces/interface.rb

@@ -155,7 +155,7 @@ module Vedeu
           delay:          0.0,
           editable:       false,
           group:          '',
-          name:           '',
+          name:           nil,
           parent:         nil,
           repository:     Vedeu.interfaces,
           style:          :normal,

data/lib/vedeu/menus/menu.rb

@@ -206,7 +206,7 @@ module Vedeu
           client:     nil,
           collection: [],
           current:    0,
-          name:       '',
+          name:       nil,
           repository: Vedeu.menus,
           selected:   nil,
         }

data/lib/vedeu/output/compressor.rb

@@ -61,8 +61,10 @@ module Vedeu
       #
       # @return [Array]
       def content
-        @_content ||= output.content.reject do |cell|
-          cell.class == Vedeu::Cells::Empty
+        @_content ||= Vedeu.timer('Removing empty cells...') do
+          output.content.reject do |cell|
+            cell.class == Vedeu::Cells::Empty
+          end
         end
       end
 

data/lib/vedeu/output/viewport.rb

@@ -35,7 +35,7 @@ module Vedeu
       # @param (see #initialize)
       # @return (see #render)
       def self.render(view)
-        new(view).render
+        new(view).render if view
       end
 
       # Returns a new instance of Vedeu::Output::Viewport.

data/lib/vedeu/renderers/escape.rb

@@ -39,9 +39,7 @@ module Vedeu
 
         output.each do |row|
           row.each do |char|
-            next unless renderable?(char) &&
-                        positionable?(char) &&
-                        escapable?(char)
+            next unless positionable?(char)
 
             empty[char.position.y - 1][char.position.x - 1] = char.to_ast
           end
@@ -50,39 +48,6 @@ module Vedeu
         empty
       end
 
-      # @return [Array<Class>]
-      def renderables
-        [
-          Vedeu::Cells::Border,
-          Vedeu::Cells::BottomHorizontal,
-          Vedeu::Cells::BottomLeft,
-          Vedeu::Cells::BottomRight,
-          Vedeu::Cells::Corner,
-          Vedeu::Cells::Char,
-          Vedeu::Cells::Clear,
-          Vedeu::Cells::Cursor,
-          Vedeu::Cells::Empty,
-          Vedeu::Cells::Escape,
-          Vedeu::Cells::Horizontal,
-          Vedeu::Cells::LeftVertical,
-          Vedeu::Cells::RightVertical,
-          Vedeu::Cells::TopHorizontal,
-          Vedeu::Cells::TopLeft,
-          Vedeu::Cells::TopRight,
-          Vedeu::Cells::Vertical,
-        ]
-      end
-
-      # @return [Boolean]
-      def renderable?(char)
-        renderables.include?(char.class)
-      end
-
-      # @return [Boolean]
-      def escapable?(char)
-        char.respond_to?(:to_ast)
-      end
-
     end # Escape
 
   end # Renderers

data/lib/vedeu/renderers/text.rb

@@ -34,9 +34,7 @@ module Vedeu
 
         output.each do |row|
           row.each do |char|
-            next unless renderable?(char) &&
-                        positionable?(char) &&
-                        textual?(char)
+            next unless positionable?(char)
 
             empty[char.position.y - 1][char.position.x - 1] = char.text
           end
@@ -45,37 +43,6 @@ module Vedeu
         empty
       end
 
-      # @return [Array<Class>]
-      def renderables
-        [
-          Vedeu::Cells::Border,
-          Vedeu::Cells::BottomHorizontal,
-          Vedeu::Cells::BottomLeft,
-          Vedeu::Cells::BottomRight,
-          Vedeu::Cells::Corner,
-          Vedeu::Cells::Char,
-          Vedeu::Cells::Clear,
-          Vedeu::Cells::Empty,
-          Vedeu::Cells::Horizontal,
-          Vedeu::Cells::LeftVertical,
-          Vedeu::Cells::RightVertical,
-          Vedeu::Cells::TopHorizontal,
-          Vedeu::Cells::TopLeft,
-          Vedeu::Cells::TopRight,
-          Vedeu::Cells::Vertical,
-        ]
-      end
-
-      # @return [Boolean]
-      def renderable?(char)
-        renderables.include?(char.class)
-      end
-
-      # @return [Boolean]
-      def textual?(char)
-        char.respond_to?(:text)
-      end
-
     end # Text
 
   end # Renderers

data/lib/vedeu/repositories/collection.rb

@@ -5,7 +5,8 @@ module Vedeu
   module Repositories
 
     # Convert an Array into an object which has some meaning in the
-    # context it is being used.
+    # context it is being used. Various classes throughout Vedeu
+    # subclass this class.
     #
     # @api private
     #
@@ -60,10 +61,10 @@ module Vedeu
       # @return [Vedeu::Repositories::Collection]
       def add(other)
         if other.is_a?(Vedeu::Repositories::Collection)
-          return self.class.coerce(other, parent, name) if empty?
+          return klass.coerce(other, parent, name) if empty?
 
         else
-          self.class.new(@collection += Array(other), parent, name)
+          klass.new(@collection += Array(other), parent, name)
 
         end
       end
@@ -77,6 +78,15 @@ module Vedeu
       end
       alias to_str to_s
 
+      private
+
+      # Return the inheriting class.
+      #
+      # @return [void]
+      def klass
+        self.class
+      end
+
     end # Collection
 
   end # Repositories

data/lib/vedeu/version.rb

@@ -3,6 +3,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.8.18'
+  VERSION = '0.8.19'
 
 end

data/lib/vedeu/views/view.rb

@@ -125,14 +125,10 @@ module Vedeu
       # @macro raise_missing_required
       # @return [Vedeu::Views::View]
       def update_buffer(refresh = false)
-        if present?(name)
-          buffer.add(self, refresh)
+        raise Vedeu::Error::MissingRequired,
+              'Cannot store a view without a name.' unless present?(name)
 
-        else
-          raise Vedeu::Error::MissingRequired,
-                'Cannot store a view without a name.'
-
-        end
+        buffer.add(self, refresh)
 
         self
       end

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

@@ -58,6 +58,12 @@ module Vedeu
         it { subject.must_equal("\e[?25h") }
       end
 
+      describe '#to_ast' do
+        subject { instance.to_ast }
+
+        it { subject.must_equal('') }
+      end
+
       describe '#to_h' do
         let(:expected) {
           {
@@ -96,6 +102,12 @@ module Vedeu
         it { instance.must_respond_to(:to_str) }
       end
 
+      describe '#text' do
+        subject { instance.text }
+
+        it { subject.must_equal('') }
+      end
+
       describe '#type' do
         subject { instance.type }
 

data/test/lib/vedeu/cells/empty_test.rb

@@ -20,7 +20,7 @@ module Vedeu
         }
       }
       let(:colour)   { {} }
-      let(:_name)    { '' }
+      let(:_name)    { nil }
       let(:position) { Vedeu::Geometries::Position.new(1, 1) }
       let(:style)    { '' }
       let(:_value)   { '' }

data/test/lib/vedeu/cells/escape_test.rb

@@ -58,6 +58,12 @@ module Vedeu
         it { subject.must_equal("\e[?25h") }
       end
 
+      describe '#text' do
+        subject { instance.text }
+
+        it { subject.must_equal('') }
+      end
+
       describe '#to_h' do
         let(:expected) {
           {

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

@@ -48,7 +48,7 @@ module Vedeu
         context 'when a name is not given' do
           let(:_name) {}
 
-          it { instance.instance_variable_get('@name').must_equal('') }
+          it { instance.instance_variable_get('@name').must_equal(nil) }
         end
 
         context 'when an offset is given' do

data/test/lib/vedeu/output/viewport_test.rb

@@ -55,7 +55,13 @@ module Vedeu
 
         subject { described.render(view) }
 
-        context 'when the interface is visible' do
+        context 'when the view is empty or nil' do
+          let(:view) {}
+
+          it { subject.must_equal(nil) }
+        end
+
+        context 'when the view is visible' do
           context 'and Vedeu is ready' do
             it do
               Vedeu.expects(:render_output)

data/test/lib/vedeu/templating/helpers_test.rb

@@ -62,7 +62,7 @@ module Vedeu
         #     Vedeu::Views::Stream.new(
         #       client: nil,
         #       colour: Vedeu::Colours::Colour.coerce(attributes),
-        #       name:   '',
+        #       name:   nil,
         #       parent: nil,
         #       style:  Vedeu::Presentation::Style.new,
         #       value: 'colour text')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.8.18
+  version: 0.8.19
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard