vedeu 0.2.11 → 0.2.12

data/lib/vedeu/models/char.rb

@@ -19,7 +19,7 @@ module Vedeu
     # @param attributes [Hash]
     # @return [Char]
     def initialize(attributes = {})
-      @attributes = defaults.merge!(attributes)
+      @attributes = defaults.merge(attributes)
       @parent     = @attributes[:parent]
       @value      = @attributes[:value]
     end

data/lib/vedeu/models/composition.rb

@@ -22,7 +22,7 @@ module Vedeu
     # @param block [Proc]
     # @return [Composition]
     def initialize(attributes = {}, &block)
-      @attributes = defaults.merge!(attributes)
+      @attributes = defaults.merge(attributes)
 
       if block_given?
         @self_before_instance_eval = eval('self', block.binding)

data/lib/vedeu/models/geometry.rb

@@ -16,7 +16,7 @@ module Vedeu
     # @param attributes [Hash]
     # @return [Geometry]
     def initialize(attributes = {})
-      @attributes = defaults.merge!(attributes)
+      @attributes = defaults.merge(attributes)
 
       @centred = @attributes[:centred]
       @height  = @attributes[:height]

data/lib/vedeu/models/line.rb

@@ -27,7 +27,7 @@ module Vedeu
     # @param block [Proc]
     # @return [Line]
     def initialize(attributes = {}, &block)
-      @attributes = defaults.merge!(attributes)
+      @attributes = defaults.merge(attributes)
       @parent     = @attributes[:parent]
 
       if block_given?

data/lib/vedeu/models/stream.rb

@@ -27,7 +27,7 @@ module Vedeu
     # @param block [Proc]
     # @return [Stream]
     def initialize(attributes = {}, &block)
-      @attributes = defaults.merge!(attributes)
+      @attributes = defaults.merge(attributes)
       @align      = @attributes[:align]
       @text       = @attributes[:text]
       @width      = @attributes[:width]

data/lib/vedeu/output/output.rb

@@ -62,7 +62,7 @@ module Vedeu
 
       Vedeu.log("Rendering view: '#{interface.name}'")
 
-      interface.viewport.each_with_index do |line, index|
+      interface.border.to_viewport.each_with_index do |line, index|
         out << interface.origin(index)
         out << line.join
       end

data/lib/vedeu/output/viewport.rb

@@ -37,15 +37,46 @@ module Vedeu
 
       return [] unless content?
 
-      (content[lines] || []).map do |line|
-        line.chars[columns] || [" "]
-      end.compact
+      line_pad.map { |line| column_pad(line) }.compact
     end
 
     private
 
     attr_reader :interface
 
+    # Pad the number of rows so that we always return an Array of the same
+    # length for each viewport.
+    #
+    # @return [Array<Array<String>>]
+    def line_pad
+      cl = content[lines] || []
+
+      if cl.size < (height + 1)
+        cl + [" "] * ((height + 1) - cl.size)
+
+      else
+        cl
+
+      end
+    end
+
+    # Pads the number of columns so that we always return an Array of the same
+    # length for each line.
+    #
+    # @param line [Array<String>]
+    # @return [Array<String>]
+    def column_pad(line)
+      chars = line.chars[columns] || [" "]
+
+      if chars.size < width
+        chars + [" "] * (width - chars.size)
+
+      else
+        chars
+
+      end
+    end
+
     # Scrolls the content vertically when the stored y offset for the interface
     # is outside of the visible area.
     #

data/lib/vedeu/repositories/models/cursor.rb

@@ -25,7 +25,7 @@ module Vedeu
     #
     # @return [Cursor]
     def initialize(attributes = {})
-      @attributes = defaults.merge!(attributes)
+      @attributes = defaults.merge(attributes)
 
       @name  = @attributes[:name]
       @state = @attributes[:state]
@@ -49,18 +49,26 @@ module Vedeu
 
     # Returns the x coordinate (column/character) of the cursor. Attempts to
     # sensibly reposition the cursor if it is currently outside the interface,
-    # or outside the visible area of the terminal.
+    # or outside the visible area of the terminal. If the interface has either a
+    # left or right border, then the cursor will be repositioned to be inside
+    # the border not on it.
     #
     # @return [Fixnum]
     def x
       @x = 1              if @x <= 1
       @x = Terminal.width if @x >= Terminal.width
 
-      if @x <= left
+      if border? && border.left? && @x <= (left + 1)
+        @x = (left + 1)
+
+      elsif @x <= left
         @x = left
 
+      elsif border? && border.right? && @x >= (right - 1)
+        @x = (right - 2)
+
       elsif @x >= right
-        @x = right - 1
+        @x = right
 
       else
         @x
@@ -70,18 +78,26 @@ module Vedeu
 
     # Returns the y coordinate (row/line) of the cursor. Attempts to sensibly
     # reposition the cursor if it is currently outside the interface, or outside
-    # the visible area of the terminal.
+    # the visible area of the terminal. If the interface has either a top or
+    # bottom border, then the cursor will be repositioned to be inside the
+    # border not on it.
     #
     # @return [Fixnum]
     def y
       @y = 1               if @y <= 1
       @y = Terminal.height if @y >= Terminal.height
 
-      if @y <= top
+      if border? && border.top? && @y <= (top + 1)
+        @y = (top + 1)
+
+      elsif @y <= top
         @y = top
 
+      elsif border? && border.bottom? && @y >= (bottom - 1)
+        @y = (bottom - 2)
+
       elsif @y >= bottom
-        @y = bottom - 1
+        @y = bottom
 
       else
         @y
@@ -153,6 +169,17 @@ module Vedeu
       Esc.string('hide_cursor')
     end
 
+    # Returns a boolean indicating whether the interface has a border.
+    #
+    # @return [Boolean]
+    def border?
+      border.enabled?
+    end
+
+    def border
+      interface.border
+    end
+
     # Returns an instance of the associated interface for this cursor, used to
     # ensure that {x} and {y} are still 'inside' the interface. A cursor could
     # be 'outside' the interface if the terminal has resized, causing the

data/lib/vedeu/repositories/models/event.rb

@@ -159,7 +159,7 @@ module Vedeu
     #
     # @return [Hash]
     def options
-      defaults.merge!(@options)
+      defaults.merge(@options)
     end
 
     # The default values for a new instance of Event.

data/lib/vedeu/repositories/models/group.rb

@@ -13,8 +13,8 @@ module Vedeu
     # @param members [String]
     # @return [Group]
     def initialize(name, *members)
-      @members = members.to_set
       @name    = name
+      @members = members.to_set
     end
 
     # Add a member to the group by name.

data/lib/vedeu/repositories/models/interface.rb

@@ -42,13 +42,13 @@ module Vedeu
     # @param  block [Proc]
     # @return [Interface]
     def initialize(attributes = {}, &block)
-      @attributes = defaults.merge!(attributes)
+      @attributes = defaults.merge(attributes)
 
-      @cursor = @attributes[:cursor]
-      @delay = @attributes[:delay]
-      @group = @attributes[:group]
-      @name  = @attributes[:name]
-      @parent = @attributes[:parent]
+      @cursor     = @attributes[:cursor]
+      @delay      = @attributes[:delay]
+      @group      = @attributes[:group]
+      @name       = @attributes[:name]
+      @parent     = @attributes[:parent]
 
       if block_given?
         @self_before_instance_eval = eval('self', block.binding)
@@ -68,6 +68,13 @@ module Vedeu
       self
     end
 
+    # Returns an instance of Border.
+    #
+    # @return [Border]
+    def border
+      @_border ||= Border.new(self, attributes[:border])
+    end
+
     # Returns an instance of Cursor.
     #
     # @return [Cursor]
@@ -128,6 +135,7 @@ module Vedeu
     # @return [Hash]
     def defaults
       {
+        border:   {},
         colour:   {},
         cursor:   :hide,
         delay:    0.0,

data/lib/vedeu/repositories/models/keymap.rb

@@ -60,7 +60,7 @@ module Vedeu
     # @param attributes [Hash]
     # @return [Keymap]
     def initialize(attributes = {})
-      @attributes = defaults.merge!(attributes)
+      @attributes = defaults.merge(attributes)
     end
 
     # Adds the attributes to the Keymaps repository.

data/lib/vedeu/repositories/models/offset.rb

@@ -20,7 +20,7 @@ module Vedeu
     # @param attributes [Hash]
     # @return [Offset]
     def initialize(attributes = {})
-      @attributes = defaults.merge!(attributes)
+      @attributes = defaults.merge(attributes)
       @name       = @attributes[:name]
       @y          = @attributes[:y]
       @x          = @attributes[:x]

data/lib/vedeu/support/trace.rb

@@ -93,7 +93,7 @@ module Vedeu
 
     # @return [Hash]
     def options
-      defaults.merge!(@options)
+      defaults.merge(@options)
     end
 
     # @return [Hash]

data/test/integration/views/basic_view_test.rb

@@ -21,6 +21,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',
@@ -54,6 +55,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',
@@ -82,6 +84,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',
@@ -110,6 +113,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',
@@ -139,6 +143,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',
@@ -175,6 +180,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',
@@ -210,6 +216,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name: 'testing_view',
               cursor: :hide,
               group: '',
@@ -240,6 +247,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name: 'testing_view',
               cursor: :hide,
               group: '',
@@ -271,6 +279,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name: 'testing_view',
               cursor: :hide,
               group: '',
@@ -307,6 +316,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name: 'testing_view',
               cursor: :hide,
               group: '',
@@ -343,6 +353,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',
@@ -387,6 +398,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',
@@ -437,6 +449,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name: 'testing_view',
               cursor: :hide,
               group: '',
@@ -490,6 +503,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name: 'testing_view',
               cursor: :hide,
               group: '',
@@ -536,6 +550,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',
@@ -572,6 +587,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',
@@ -608,6 +624,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',
@@ -644,6 +661,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',
@@ -689,6 +707,7 @@ module Vedeu
             end
           end.must_equal(
             { interfaces: [{
+              border: {},
               name:  'testing_view',
               cursor: :hide,
               group: '',

data/test/lib/vedeu/api/api_test.rb

@@ -156,15 +156,16 @@ module Vedeu
       let(:composition) {
         {
           interfaces: [{
-            name: "some_interface",
+            border: {},
+            colour: {},
             cursor: :hide,
+            delay: 0.0,
+            geometry: {},
             group: '',
             lines: [],
-            colour: {},
+            name: "some_interface",
+            parent: {},
             style: '',
-            geometry: {},
-            delay: 0.0,
-            parent: {}
           }]
         }
       }