vedeu 0.7.2 → 0.7.3

data/lib/vedeu/borders/refresh.rb

@@ -102,50 +102,15 @@ module Vedeu
       # @return [Array<Array<Vedeu::Views::Char>>]
       def output
         Vedeu.timer("Drawing border: '#{name}'".freeze) do
-          [top, left, right, bottom].flatten
+          [
+            (top if top?),
+            (left if left?),
+            (right if right?),
+            (bottom if bottom?),
+          ].flatten
         end
       end
 
-      # Creates the bottom left border character.
-      #
-      # @return [NilClass|Vedeu::Cells::Border|Vedeu::Views::Char]
-      def build_bottom_left
-        return nil unless left?
-        return bottom_left if bottom_left
-
-        Vedeu::Cells::BottomLeft.new(attributes)
-      end
-
-      # Creates the bottom right border character.
-      #
-      # @return [NilClass|Vedeu::Cells::Border|Vedeu::Views::Char]
-      def build_bottom_right
-        return nil unless right?
-        return bottom_right if bottom_right
-
-        Vedeu::Cells::BottomRight.new(attributes)
-      end
-
-      # Creates the top left border character.
-      #
-      # @return [NilClass|Vedeu::Cells::Border|Vedeu::Views::Char]
-      def build_top_left
-        return nil unless left?
-        return top_left if top_left
-
-        Vedeu::Cells::TopLeft.new(attributes)
-      end
-
-      # Creates the top right border character.
-      #
-      # @return [NilClass|Vedeu::Cells::Border|Vedeu::Views::Char]
-      def build_top_right
-        return nil unless right?
-        return top_right if top_right
-
-        Vedeu::Cells::TopRight.new(attributes)
-      end
-
       # Renders the bottom border for the interface.
       #
       # @note
@@ -155,9 +120,7 @@ module Vedeu
       #
       # @return [String]
       def bottom
-        return [] unless bottom?
-
-        [build_bottom_left, captionbar, build_bottom_right].compact
+        [(bottom_left if left?), captionbar, (bottom_right if right?)].compact
       end
 
       # Returns the geometry for the interface.
@@ -182,10 +145,8 @@ module Vedeu
       #
       # @return [Array<void>]
       def left
-        return [] unless left?
-
         build_collection(bordered_height) do |iy|
-          cell = left_vertical_cell.dup
+          cell = left_vertical.dup
           cell.position = [by + iy, x]
           cell
         end
@@ -195,10 +156,8 @@ module Vedeu
       #
       # @return [Array<void>]
       def right
-        return [] unless right?
-
         build_collection(bordered_height) do |iy|
-          cell = right_vertical_cell.dup
+          cell = right_vertical.dup
           cell.position = [by + iy, xn]
           cell
         end
@@ -213,9 +172,7 @@ module Vedeu
       #
       # @return [String]
       def top
-        return [] unless top?
-
-        [build_top_left, titlebar, build_top_right].compact
+        [(top_left if left?), titlebar, (top_right if right?)].compact
       end
 
       # An optional caption for when the bottom border is to be shown.
@@ -223,20 +180,15 @@ module Vedeu
       # @return [Array<Vedeu::Views::Char>]
       # @see [Vedeu::Borders::Caption#render]
       def captionbar
-        return build_bottom unless present?(caption)
-
-        Vedeu::Borders::Caption.render(name, caption, build_bottom)
-      end
-
-      # Creates a bottom border character.
-      #
-      # @return [Array<Vedeu::Views::Char>]
-      def build_bottom
-        build_collection(bordered_width) do |ix|
-          cell = bottom_horizontal_cell.dup
+        characters = build_collection(bordered_width) do |ix|
+          cell = bottom_horizontal.dup
           cell.position = [yn, bx + ix]
           cell
         end
+
+        return characters unless present?(caption)
+
+        Vedeu::Borders::Caption.render(name, caption, characters)
       end
 
       # An optional title for when the top border is to be shown.
@@ -244,60 +196,15 @@ module Vedeu
       # @return [Array<Vedeu::Views::Char>]
       # @see [Vedeu::Borders::Title#render]
       def titlebar
-        return build_top unless present?(title)
-
-        Vedeu::Borders::Title.render(name, title, build_top)
-      end
-
-      # Creates a top border character.
-      #
-      # @return [Array<Vedeu::Views::Char>]
-      def build_top
-        build_collection(bordered_width) do |ix|
-          cell = top_horizontal_cell.dup
+        characters = build_collection(bordered_width) do |ix|
+          cell = top_horizontal.dup
           cell.position = [y, bx + ix]
           cell
         end
-      end
-
-      # Return the client application configured left vertical cell
-      # character, or the default if not set.
-      #
-      # @return [Vedeu::Cells::LeftVertical]
-      def left_vertical_cell
-        return left_vertical if left_vertical
-
-        Vedeu::Cells::LeftVertical.new(attributes)
-      end
 
-      # Return the client application configured right vertical cell
-      # character, or the default if not set.
-      #
-      # @return [Vedeu::Cells::RightVertical]
-      def right_vertical_cell
-        return right_vertical if right_vertical
-
-        Vedeu::Cells::RightVertical.new(attributes)
-      end
-
-      # Return the client application configured top horizontal cell
-      # character, or the default if not set.
-      #
-      # @return [Vedeu::Cells::TopHorizontal]
-      def top_horizontal_cell
-        return top_horizontal if top_horizontal
-
-        Vedeu::Cells::TopHorizontal.new(attributes)
-      end
-
-      # Return the client application configured bottom horizontal
-      # cell character, or the default if not set.
-      #
-      # @return [Vedeu::Cells::BottomHorizontal]
-      def bottom_horizontal_cell
-        return bottom_horizontal if bottom_horizontal
+        return characters unless present?(title)
 
-        Vedeu::Cells::BottomHorizontal.new(attributes)
+        Vedeu::Borders::Title.render(name, title, characters)
       end
 
       # Build a collection with the given size of objects given within
@@ -313,4 +220,13 @@ module Vedeu
 
   end # Borders
 
+  # :nocov:
+
+  # See {file:docs/borders.md#label-3A_refresh_border_}
+  Vedeu.bind(:_refresh_border_) do |name|
+    Vedeu::Borders::Refresh.by_name(name) if Vedeu.ready?
+  end
+
+  # :nocov:
+
 end # Vedeu

data/lib/vedeu/borders/repository.rb

@@ -28,11 +28,6 @@ module Vedeu
 
   # :nocov:
 
-  # See {file:docs/borders.md#label-3A_refresh_border_}
-  Vedeu.bind(:_refresh_border_) do |name|
-    Vedeu::Borders::Refresh.by_name(name)
-  end
-
   # See {file:docs/borders.md#label-3A_set_border_caption_}
   Vedeu.bind(:_set_border_caption_) do |name, caption|
     Vedeu::Borders::SetAttribute.update(name, :title, caption)

data/lib/vedeu/buffers/buffer.rb

@@ -69,9 +69,7 @@ module Vedeu
       #
       # @return [Boolean] Whether the buffer targetted has content.
       def back?
-        return false if back.nil? || back.lines.empty?
-
-        true
+        (back.nil? || back.lines.empty?) ? false : true
       end
 
       # Return a boolean indicating whether the cursor should be
@@ -107,9 +105,7 @@ module Vedeu
       #
       # @return [Boolean] Whether the buffer targetted has content.
       def front?
-        return false if front.nil? || front.lines.empty?
-
-        true
+        (front.nil? || front.lines.empty?) ? false : true
       end
 
       # Return a boolean indicating content presence on the buffer
@@ -117,9 +113,7 @@ module Vedeu
       #
       # @return [Boolean] Whether the buffer targetted has content.
       def previous?
-        return false if previous.nil? || previous.lines.empty?
-
-        true
+        (previous.nil? || previous.lines.empty?) ? false : true
       end
 
       # Retrieve the latest content from the buffer.
@@ -137,18 +131,20 @@ module Vedeu
       #
       # @return [Array<Array<Array<Vedeu::Views::Char>>>]
       def render
-        if back?
-          swap
+        current = if back?
+                    swap
 
-          Vedeu::Output::Viewport.render(front)
+                    front
 
-        elsif front?
-          Vedeu::Output::Viewport.render(front)
+                  elsif front?
+                    front
 
-        elsif previous?
-          Vedeu::Output::Viewport.render(previous)
+                  elsif previous?
+                    previous
 
-        end
+                  end
+
+        Vedeu::Output::Viewport.render(current) unless current.nil?
       end
 
       # Returns the number of lines of content for the buffer or 0 if

data/lib/vedeu/buffers/refresh.rb

@@ -85,14 +85,14 @@ module Vedeu
 
   # :nocov:
 
-  # See {file:docs/events/refresh.md#\_refresh_view_}
+  # See {file:docs/events/refresh.md}
   Vedeu.bind(:_refresh_view_) do |name|
-    Vedeu::Buffers::Refresh.by_name(name)
+    Vedeu::Buffers::Refresh.by_name(name) if Vedeu.ready?
   end
 
-  # See {file:docs/events/refresh.md#\_refresh_view_content_}
+  # See {file:docs/events/refresh.md}
   Vedeu.bind(:_refresh_view_content_) do |name|
-    Vedeu::Buffers::Refresh.refresh_content_by_name(name)
+    Vedeu::Buffers::Refresh.refresh_content_by_name(name) if Vedeu.ready?
   end
 
   # :nocov:

data/lib/vedeu/cursors/refresh.rb

@@ -51,7 +51,7 @@ module Vedeu
       #
       # @return [Array]
       def by_name
-        refresh_view if refresh_view?
+        Vedeu.trigger(:_refresh_view_content_, name) if refresh_view?
 
         Vedeu.log(type:    :cursor,
                   message: "Refreshing cursor: '#{name}' (x:#{x}, y:#{y}, " \
@@ -67,11 +67,6 @@ module Vedeu
         present?(@name) ? @name : Vedeu.focus
       end
 
-      # @return [void]
-      def refresh_view
-        Vedeu.trigger(:_refresh_view_content_, name)
-      end
-
       # Returns true when the view should be refreshed. This is
       # determined by checking that the offsets for x and y are
       # outside the (bordered) width and (bordered) height of the
@@ -103,7 +98,7 @@ module Vedeu
 
   # See {file:docs/events/refresh.md#\_refresh_cursor_}
   Vedeu.bind(:_refresh_cursor_) do |name|
-    Vedeu::Cursors::Refresh.by_name(name)
+    Vedeu::Cursors::Refresh.by_name(name) if Vedeu.ready?
   end
 
   # :nocov:

data/lib/vedeu/groups/clear.rb

@@ -67,7 +67,9 @@ module Vedeu
   # :nocov:
 
   # See {file:docs/events/visibility.md#\_clear_group_}
-  Vedeu.bind(:_clear_group_) { |name| Vedeu.clear_by_group(name) }
+  Vedeu.bind(:_clear_group_) do |name|
+    Vedeu.clear_by_group(name) if Vedeu.ready?
+  end
 
   # :nocov:
 

data/lib/vedeu/groups/refresh.rb

@@ -77,9 +77,9 @@ module Vedeu
 
   # :nocov:
 
-  # See {file:docs/events/refresh.md#\_refresh_group_}
+  # See {file:docs/events/refresh.md}
   Vedeu.bind(:_refresh_group_) do |name|
-    Vedeu::Groups::Refresh.by_name(name)
+    Vedeu::Groups::Refresh.by_name(name) if Vedeu.ready?
   end
 
   # :nocov:

data/lib/vedeu/interfaces/clear.rb

@@ -235,11 +235,11 @@ module Vedeu
   # :nocov:
 
   # See {file:docs/events/visibility.md#\_clear_view_}
-  Vedeu.bind(:_clear_view_) { |name| Vedeu.clear_by_name(name) }
+  Vedeu.bind(:_clear_view_) { |name| Vedeu.clear_by_name(name) if Vedeu.ready? }
 
   # See {file:docs/events/visibility.md#\_clear_view_content_}
   Vedeu.bind(:_clear_view_content_) do |name|
-    Vedeu.clear_content_by_name(name)
+    Vedeu.clear_content_by_name(name) if Vedeu.ready?
   end
 
   # :nocov:

data/lib/vedeu/output/refresh.rb

@@ -32,8 +32,8 @@ module Vedeu
 
   # :nocov:
 
-  # See {file:docs/events/refresh.md#\_refresh_}
-  Vedeu.bind(:_refresh_) { Vedeu::Output::Refresh.all }
+  # See {file:docs/events/refresh.md}
+  Vedeu.bind(:_refresh_) { Vedeu::Output::Refresh.all if Vedeu.ready? }
 
   # :nocov:
 

data/lib/vedeu/repositories/model.rb

@@ -108,12 +108,8 @@ module Vedeu
       #   after yielding.
       # @todo Perhaps some validation could be added here?
       # @return [void] The model instance stored in the repository.
-      def store
-        new_model = repository.store(self)
-
-        yield if block_given?
-
-        new_model
+      def store(&block)
+        repository.store(self, &block)
       end
 
     end # Model

data/lib/vedeu/repositories/repository.rb

@@ -156,20 +156,22 @@ module Vedeu
       # Stores the model instance by name in the repository of the
       # model.
       #
+      # @note If a block is given, store the model, return the model
+      #   after yielding.
       # @param model [void] A model instance.
       # @raise [Vedeu::Error::MissingRequired] When the name attribute
       #   is not defined.
       # @return [void] The model instance which was stored.
-      def store(model)
-        unless present?(model.name)
-          fail Vedeu::Error::MissingRequired,
-               "Cannot store model '#{model.class}' " \
-               'without a name attribute.'.freeze
-        end
+      def store(model, &block)
+        valid_model?(model)
 
         log_store(model)
 
         storage[model.name] = model
+
+        yield if block_given?
+
+        model
       end
       alias_method :register, :store
       alias_method :add, :store
@@ -185,6 +187,15 @@ module Vedeu
                   message: "#{model.class.name}: '#{model.name}'".freeze)
       end
 
+      #
+      # @param model [void] A model instance.
+      # @return [Boolean]
+      def valid_model?(model)
+        fail Vedeu::Error::MissingRequired,
+             "Cannot store model '#{model.class}' without a name " \
+             'attribute.'.freeze unless present?(model.name)
+      end
+
     end # Repository
 
   end # Repositories

data/lib/vedeu/runtime/flags.rb

@@ -12,6 +12,8 @@ module Vedeu
 
         # @return [Boolean]
         def ready!
+          Vedeu.log(type: :info, message: 'Vedeu ready!')
+
           instance.options[:ready] = true
         end