vedeu 0.6.70 → 0.6.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a215a258800fb64a1c3493c3a504bfed883fc54
-  data.tar.gz: f6b96d7ba7a7e0b5aca5e55ef211a3afc5b50f4c
+  metadata.gz: e6f85cb55a50d53c490a1a1f8f0bb3adbf38035d
+  data.tar.gz: 98154c75cbe858bb6ec6810f8a9887ebca55ffbb
 SHA512:
-  metadata.gz: 901c2cce80b9ec3468c80c538e8c6b8b372cea78db1fae7b04cfee13bf0b457ade911966d1086b0bec8b4f04d9270ec08d0a7b9e1296aac56011fbd1e56d5b69
-  data.tar.gz: b747cefb06613a45addde327f5183c13cfa8d7dc0cfcf2367b6b75ebf65bd581d4f595f2bbd329ebc47739a8fe86d8e2befd9111c0e74d7af4b4d3a25ae4e8fa
+  metadata.gz: 23e2508ccb6cac4af70ef49caa6cd8be4c13cb71233f3b121a78979fbda7956a4e0efa79c7b518558bb3054d11a6cb9c69b6bfe263afa4bdd1a9ed9941b9e5ce
+  data.tar.gz: ee5c80b253f55995582811f1f579ce8c2a408be5adb5ec699d1ddd87ae36f3a13dce1c4a4616a3831a1336758b0cf69555b8274fde96a2ca5d4ab6f0e36d4a3b

data/lib/vedeu/borders/caption.rb

@@ -20,7 +20,7 @@ module Vedeu
 
         caption_index = 0
         chars.each_with_index do |char, index|
-          next if index <= start_index || index > (width - 4)
+          next if index <= start_index || index > (width - 2)
 
           char.border   = nil
           char.value    = characters[caption_index]
@@ -32,7 +32,7 @@ module Vedeu
 
       # @return [Fixnum]
       def start_index
-        (width - size) - 4
+        (width - size) - 2
       end
 
     end # Caption

data/lib/vedeu/borders/refresh.rb

@@ -130,7 +130,7 @@ module Vedeu
       #
       # @return [Array<Vedeu::Views::Char>]
       def build_top
-        build_horizontal(:bottom_horizontal, y)
+        build_horizontal(:top_horizontal, y)
       end
 
       # Creates a bottom border character.
@@ -237,8 +237,7 @@ module Vedeu
       def captionbar
         return nil unless caption
 
-        @_caption ||= Vedeu::Borders::Caption
-                        .render(caption, width, build_bottom)
+        @_caption ||= Vedeu::Borders::Caption.render(caption, build_bottom)
       end
 
       # An optional title for when the top border is to be shown.
@@ -248,7 +247,7 @@ module Vedeu
       def titlebar
         return nil unless title
 
-        @_title ||= Vedeu::Borders::Title.render(title, width, build_top)
+        @_title ||= Vedeu::Borders::Title.render(title, build_top)
       end
 
     end # Refresh

data/lib/vedeu/borders/set_attribute.rb

@@ -2,6 +2,10 @@ module Vedeu
 
   module Borders
 
+    # Provides the mechanism to set attributes on a
+    # {Vedeu::Borders::Border} object. At the moment, it is used for
+    # setting the title and caption for a named border.
+    #
     # @api private
     #
     class SetAttribute

data/lib/vedeu/borders/title.rb

@@ -10,12 +10,12 @@ module Vedeu
     #
     class Title
 
+      # @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 self.render(value = '', width = Vedeu.width, chars = [])
-        new(value, width, chars).render
+      # @return [Array<Vedeu::Views::Char>]
+      def self.render(value = '', chars = [])
+        new(value, chars).render
       end
 
       # Returns a new instance of Vedeu::Borders::Title or
@@ -24,11 +24,9 @@ module Vedeu
       # @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, chars = [])
+      def initialize(value = '', chars = [])
         @value = value
-        @width = width
         @chars = chars
       end
 
@@ -63,8 +61,9 @@ module Vedeu
       def to_s
         value.to_s
       end
+      alias_method :to_str, :to_s
 
-      # Return the value or an empty string.
+      # Return the value (a title or a caption) or an empty string.
       #
       # @return [String]
       def value
@@ -76,7 +75,8 @@ module Vedeu
       protected
 
       # @!attribute [r] chars
-      # @return [Array<Vedeu::Views::Char>]
+      # @return [Array<Vedeu::Views::Char>] An array of border
+      #   characters.
       attr_reader :chars
 
       private
@@ -141,11 +141,11 @@ module Vedeu
         title.chomp.slice(0...(width - 4))
       end
 
-      # Return the given width or the width of the terminal.
+      # Return the size of the horizontal border given via #chars.
       #
       # @return [Fixnum]
       def width
-        @width || Vedeu.width
+        chars.size
       end
 
     end # Title

data/lib/vedeu/cursors/cursor.rb

@@ -216,7 +216,7 @@ module Vedeu
       #
       # @return [Vedeu::Geometries::Position]
       def position
-        @position = Vedeu::Geometries::Position[y, x]
+        @position = Vedeu::Geometries::Position.coerce([y, x])
       end
 
       # Show a named cursor, or without a name, the cursor of the

data/lib/vedeu/cursors/move.rb

@@ -2,6 +2,9 @@ module Vedeu
 
   module Cursors
 
+    # Provides the mechanism to move a named cursor in a given
+    # direction.
+    #
     # @api private
     #
     class Move

data/lib/vedeu/dsl/lines.rb

@@ -2,6 +2,8 @@ module Vedeu
 
   module DSL
 
+    # Provides the mechanism to add lines to a view via the DSL.
+    #
     class Lines
 
       # @raise [Vedeu::Error::RequiresBlock]

data/lib/vedeu/dsl/streams.rb

@@ -2,6 +2,8 @@ module Vedeu
 
   module DSL
 
+    # Provides the mechanism to add streams to a line via the DSL.
+    #
     class Streams
 
       # @raise [Vedeu::Error::RequiresBlock]

data/lib/vedeu/editor/cursor.rb

@@ -131,6 +131,7 @@ module Vedeu
       def to_s
         "\e[#{real_y};#{real_x}H\e[?25h".freeze
       end
+      alias_method :to_str, :to_s
 
       # Move the virtual cursor up by one line.
       #

data/lib/vedeu/editor/lines.rb

@@ -120,6 +120,7 @@ module Vedeu
       def to_s
         collection.map(&:to_s).join
       end
+      alias_method :to_str, :to_s
 
     end # Lines
 

data/lib/vedeu/esc/esc.rb

@@ -115,7 +115,7 @@ module Vedeu
 
       # @return [String]
       def last_character_position
-        Vedeu::Geometries::Position[Vedeu.height, Vedeu.width].to_s
+        Vedeu::Geometries::Position.coerce([Vedeu.height, Vedeu.width]).to_s
       end
 
     end # Esc

data/lib/vedeu/geometries/all.rb

@@ -20,4 +20,5 @@ require 'vedeu/geometries/dsl/all'
 require 'vedeu/geometries/geometry'
 require 'vedeu/geometries/move'
 require 'vedeu/geometries/position'
+require 'vedeu/geometries/positionable'
 require 'vedeu/geometries/repository'

data/lib/vedeu/geometries/position.rb

@@ -22,11 +22,12 @@ module Vedeu
       # Convenience constructor for Vedeu::Geometries::Position.
       #
       # @param (see #initialize)
-      def self.[](y, x)
+      def self.[](y = 1, x = 1)
         new(y, x)
       end
 
-      # @param value [Array<Fixnum>|Vedeu::Geometries::Position]
+      # @param value [Array<Fixnum>|Fixnum|Hash|
+      #   Vedeu::Geometries::Position]
       # @return [Vedeu::Geometries::Position]
       def self.coerce(value)
         if value.is_a?(self)
@@ -35,6 +36,9 @@ module Vedeu
         elsif value.is_a?(Array)
           new(*value)
 
+        elsif value.is_a?(Fixnum)
+          new(value, 1)
+
         elsif value.is_a?(Hash)
           new(value.fetch(:y, 1), value.fetch(:x, 1))
 
@@ -92,9 +96,14 @@ module Vedeu
         [y, x]
       end
 
-      # @return [Vedeu::Geometries::Position]
-      def to_position
-        self
+      # Return the position as a Hash.
+      #
+      # @return [Hash<Symbol => Fixnum|NilClass>]
+      def to_h
+        {
+          y: y,
+          x: x,
+        }
       end
 
       # Return the escape sequence required to position the cursor at

data/lib/vedeu/geometries/positionable.rb

@@ -0,0 +1,55 @@
+module Vedeu
+
+  module Geometries
+
+    # Provide position functionality to the including model.
+    #
+    # @api private
+    #
+    module Positionable
+
+      # Gets the position.
+      #
+      # @return [Vedeu::Geometries::Position]
+      def position
+        @_position ||= Vedeu::Geometries::Position.coerce(@position)
+      end
+
+      # Sets the position.
+      #
+      # @param value [Array<void>|Hash<void>|
+      #   Vedeu::Geometries::Position]
+      # @return [Vedeu::Geometries::Position]
+      def position=(value)
+        @_position = @position = Vedeu::Geometries::Position.coerce(value)
+      end
+
+      # Returns a boolean indicating the position attribute of the
+      # including model is set.
+      #
+      # @return [Boolean]
+      def position?
+        position.is_a?(Vedeu::Geometries::Position)
+      end
+
+      # Returns the x coordinate for the model when the position
+      # attribute of the including model is set.
+      #
+      # @return [Fixnum|NilClass]
+      def x
+        position.x if position?
+      end
+
+      # Returns the y coordinate for the model when the position
+      # attribute of the including model is set.
+      #
+      # @return [Fixnum|NilClass]
+      def y
+        position.y if position?
+      end
+
+    end # Positionable
+
+  end # Geometries
+
+end # Vedeu

data/lib/vedeu/interfaces/clear.rb

@@ -142,11 +142,11 @@ module Vedeu
         Vedeu.timer("Optimised clearing #{clearing}: '#{name}'".freeze) do
           height.times.map do |iy|
             [
-              position(y + iy, x),
+              build_position(y + iy, x),
               colour.to_s,
               chars,
             ].join
-          end.join + position(y, x)
+          end.join + build_position(y, x)
         end
       end
 
@@ -180,8 +180,11 @@ module Vedeu
                       end
       end
 
+      # @param pos_y [Fixnum]
+      # @param pos_x [Fixnum]
       # @return [Vedeu::Geometries::Position]
-      def position(pos_y, pos_x)
+      # @todo Not sure if #to_s is required here. (GL: 2015-11-30)
+      def build_position(pos_y, pos_x)
         Vedeu::Geometries::Position.new(pos_y, pos_x).to_s
       end
 

data/lib/vedeu/models/cell.rb

@@ -9,6 +9,7 @@ module Vedeu
     class Cell
 
       include Vedeu::Repositories::Defaults
+      include Vedeu::Geometries::Positionable
 
       # @!attribute [r] colour
       # @return [NilClass|String]
@@ -46,11 +47,6 @@ module Vedeu
         @interface ||= Vedeu.interfaces.by_name(name)
       end
 
-      # @return [Vedeu::Geometries::Position]
-      def position
-        Vedeu::Geometries::Position.coerce(@position)
-      end
-
       # @return [Hash]
       def to_hash
         {
@@ -71,6 +67,7 @@ module Vedeu
       def to_s
         value.to_s
       end
+      alias_method :to_str, :to_s
 
       private
 

data/lib/vedeu/models/escape.rb

@@ -8,6 +8,8 @@ module Vedeu
     #
     class Escape
 
+      include Vedeu::Geometries::Positionable
+
       # @!attribute [r] value
       # @return [String]
       attr_reader :value
@@ -48,11 +50,6 @@ module Vedeu
       end
       alias_method :==, :eql?
 
-      # @return [String]
-      def position
-        Vedeu::Geometries::Position.coerce(@position)
-      end
-
       # Return an empty hash as most escape sequences won't make
       # sense as JSON.
       #

data/lib/vedeu/output/write.rb

@@ -103,6 +103,7 @@ module Vedeu
                    Vedeu::EscapeSequences::Esc.reset +
                    position(position_end)
       end
+      alias_method :to_str, :to_s
 
     end # Write
 

data/lib/vedeu/presentation/background.rb

@@ -4,6 +4,11 @@ module Vedeu
 
     module Colour
 
+      # Provides the background colour when included in a class with
+      # a colour attribute.
+      #
+      # @api private
+      #
       module Background
 
         include Vedeu::Repositories::Parent

data/lib/vedeu/presentation/foreground.rb

@@ -4,6 +4,11 @@ module Vedeu
 
     module Colour
 
+      # Provides the foreground colour when included in a class with
+      # a colour attribute.
+      #
+      # @api private
+      #
       module Foreground
 
         include Vedeu::Repositories::Parent

data/lib/vedeu/presentation/presentation.rb

@@ -1,7 +1,10 @@
+require 'vedeu/geometries/positionable'
+
 module Vedeu
 
   module Presentation
 
+    include Vedeu::Geometries::Positionable
     include Vedeu::Presentation::Colour
     include Vedeu::Presentation::Styles
 
@@ -17,14 +20,6 @@ module Vedeu
 
     private
 
-    # Returns a boolean indicating the model has a position
-    # attribute.
-    #
-    # @return [Boolean]
-    def position?
-      self.respond_to?(:position) && position.is_a?(Vedeu::Geometries::Position)
-    end
-
     # Renders the colour attributes of the receiver and yields (to
     # then render the styles).
     #
@@ -35,9 +30,9 @@ module Vedeu
 
     # @return [String]
     def render_position
-      return yield unless position?
+      return position.to_s { yield } if position?
 
-      position.to_s { yield }
+      yield
     end
 
     # Renders the style attributes of the receiver and yields (to

data/lib/vedeu/version.rb

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

data/lib/vedeu/views/char.rb

@@ -1,3 +1,5 @@
+require 'vedeu/geometries/positionable'
+
 module Vedeu
 
   module Views
@@ -12,6 +14,7 @@ module Vedeu
     class Char
 
       include Comparable
+      include Vedeu::Geometries::Positionable
       include Vedeu::Repositories::Parent
       include Vedeu::Presentation
 
@@ -94,19 +97,6 @@ module Vedeu
         @interface ||= Vedeu.interfaces.by_name(name)
       end
 
-      # @return [Vedeu::Geometries::Position]
-      def position
-        @_position ||= Vedeu::Geometries::Position.coerce(@position)
-      end
-
-      # Sets the position of the Vedeu::Views::Char.
-      #
-      # @param value [Array<void>|Hash<void>|Vedeu::Geometries::Position]
-      # @return [Vedeu::Geometries::Position]
-      def position=(value)
-        @_position = @position = Vedeu::Geometries::Position.coerce(value)
-      end
-
       # @return [String]
       def value
         return @value unless border
@@ -114,20 +104,6 @@ module Vedeu
         Vedeu::EscapeSequences::Esc.border { @value }
       end
 
-      # Returns the x position for the Vedeu::Views::Char when set.
-      #
-      # @return [Fixnum|NilClass]
-      def x
-        position.x if position
-      end
-
-      # Returns the y position for the Vedeu::Views::Char when set.
-      #
-      # @return [Fixnum|NilClass]
-      def y
-        position.y if position
-      end
-
       # Returns a Hash of all the values before coercion.
       #
       # @note
@@ -142,7 +118,7 @@ module Vedeu
           colour:   colour_to_hash,
           name:     name.to_s,
           parent:   parent_to_hash,
-          position: position_to_hash,
+          position: position.to_h,
           style:    style.to_s,
           value:    value,
         }
@@ -189,14 +165,6 @@ module Vedeu
         }
       end
 
-      # @return [Hash<Symbol => Fixnum>]
-      def position_to_hash
-        {
-          y: y,
-          x: x,
-        }
-      end
-
     end # Char
 
   end # Views

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

@@ -6,19 +6,51 @@ module Vedeu
 
     describe Caption do
 
-      let(:instance) {}
+      let(:described) { Vedeu::Borders::Caption }
+      let(:instance)  { described.new(_value, chars) }
+      let(:_value)    { 'Bismuth' }
+      let(:chars)     {
+        [
+          Vedeu::Views::Char.new(value: '-', position: [4, 1], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [4, 2], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [4, 3], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [4, 4], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [4, 5], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [4, 6], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [4, 7], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [4, 8], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [4, 9], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [4, 10], border: type),
+        ]
+      }
+      let(:type) { :bottom_horizontal }
 
       describe '#render' do
-        let(:top_border) {}
+        subject { instance.render }
 
-        subject { instance.render(top_border) }
+        context 'when the caption is empty' do
+          let(:_value) {}
 
-        context 'when the title is empty' do
-          # @todo Add more tests.
+          it { subject.must_equal(chars) }
         end
 
-        context 'when the title is not empty' do
-          # @todo Add more tests.
+        context 'when the caption is not empty' do
+          let(:expected) {
+            [
+              Vedeu::Views::Char.new(value: '-', position: [4, 1], border: type),
+              Vedeu::Views::Char.new(value: ' ', position: [4, 2], border: nil),
+              Vedeu::Views::Char.new(value: 'B', position: [4, 3], border: nil),
+              Vedeu::Views::Char.new(value: 'i', position: [4, 4], border: nil),
+              Vedeu::Views::Char.new(value: 's', position: [4, 5], border: nil),
+              Vedeu::Views::Char.new(value: 'm', position: [4, 6], border: nil),
+              Vedeu::Views::Char.new(value: 'u', position: [4, 7], border: nil),
+              Vedeu::Views::Char.new(value: 't', position: [4, 8], border: nil),
+              Vedeu::Views::Char.new(value: ' ', position: [4, 9], border: nil),
+              Vedeu::Views::Char.new(value: '-', position: [4, 10], border: type),
+            ]
+          }
+
+          it { subject.must_equal(expected) }
         end
       end
 

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

@@ -7,22 +7,57 @@ module Vedeu
     describe Title do
 
       let(:described) { Vedeu::Borders::Title }
-      let(:instance)  { described.new(_value, width, chars) }
+      let(:instance)  { described.new(_value, chars) }
       let(:_value)    { 'Aluminium' }
-      let(:width)     { 10 }
-      let(:chars)     { [] }
+      let(:chars)     {
+        [
+          Vedeu::Views::Char.new(value: '-', position: [1, 1], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [1, 2], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [1, 3], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [1, 4], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [1, 5], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [1, 6], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [1, 7], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [1, 8], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [1, 9], border: type),
+          Vedeu::Views::Char.new(value: '-', position: [1, 10], border: type),
+        ]
+      }
+      let(:type) { :top_horizontal }
 
       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 '.render' do
-        subject { described.render(_value, width, chars) }
+        subject { described.render(_value, chars) }
 
-        # @todo Add more tests.
+        context 'when the title is empty' do
+          let(:_value) {}
+
+          it { subject.must_equal(chars) }
+        end
+
+        context 'when the title is not empty' do
+          let(:expected) {
+            [
+              Vedeu::Views::Char.new(value: '-', position: [1, 1], border: type),
+              Vedeu::Views::Char.new(value: ' ', position: [1, 2], border: nil),
+              Vedeu::Views::Char.new(value: 'A', position: [1, 3], border: nil),
+              Vedeu::Views::Char.new(value: 'l', position: [1, 4], border: nil),
+              Vedeu::Views::Char.new(value: 'u', position: [1, 5], border: nil),
+              Vedeu::Views::Char.new(value: 'm', position: [1, 6], border: nil),
+              Vedeu::Views::Char.new(value: 'i', position: [1, 7], border: nil),
+              Vedeu::Views::Char.new(value: 'n', position: [1, 8], border: nil),
+              Vedeu::Views::Char.new(value: ' ', position: [1, 9], border: nil),
+              Vedeu::Views::Char.new(value: '-', position: [1, 10], border: type),
+            ]
+          }
+
+          it { subject.must_equal(expected) }
+        end
       end
 
       describe '#eql?' do
@@ -40,22 +75,14 @@ module Vedeu
       end
 
       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
+        it { instance.must_respond_to(:render) }
       end
 
       describe '#to_s' do
         subject { instance.to_s }
 
+        it { instance.must_respond_to(:to_str) }
+
         it { subject.must_equal('Aluminium') }
       end
 

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

@@ -147,6 +147,8 @@ module Vedeu
 
         subject { instance.to_s }
 
+        it { instance.must_respond_to(:to_str) }
+
         it { subject.must_be_instance_of(String) }
 
         it { subject.must_equal("\e[6;12H\e[?25h") }

data/test/lib/vedeu/editor/lines_test.rb

@@ -463,6 +463,8 @@ module Vedeu
       describe '#to_s' do
         subject { instance.to_s }
 
+        it { instance.must_respond_to(:to_str) }
+
         context 'when there are no lines' do
           let(:collection) {}
 

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

@@ -30,6 +30,33 @@ module Vedeu
         subject { described.[](y, x) }
 
         it { instance.must_be_instance_of(described) }
+
+        context 'when the x and y coordinates are given' do
+          it { instance.y.must_equal(12) }
+          it { instance.x.must_equal(19) }
+        end
+
+        context 'when the x coordinate is not given' do
+          let(:x) {}
+
+          it { instance.y.must_equal(12) }
+          it { instance.x.must_equal(1) }
+        end
+
+        context 'when the y coordinate is not given' do
+          let(:y) {}
+
+          it { instance.y.must_equal(1) }
+          it { instance.x.must_equal(19) }
+        end
+
+        context 'when the x and y coordinates are not given' do
+          let(:x) {}
+          let(:y) {}
+
+          it { instance.y.must_equal(1) }
+          it { instance.x.must_equal(1) }
+        end
       end
 
       describe '#<=>' do
@@ -75,6 +102,14 @@ module Vedeu
           it { subject.x.must_equal(8) }
         end
 
+        context 'when the value is an Fixnum' do
+          let(:_value) { 2 }
+
+          it { subject.must_be_instance_of(described) }
+          it { subject.y.must_equal(2) }
+          it { subject.x.must_equal(1) }
+        end
+
         context 'when the value is a Hash' do
           let(:_value) { { y: 3, x: 9 } }
 
@@ -84,6 +119,8 @@ module Vedeu
         end
 
         context 'when the value is something unhandled' do
+          let(:_value) { :invalid }
+
           it { subject.must_be_instance_of(NilClass) }
         end
       end
@@ -103,44 +140,67 @@ module Vedeu
       end
 
       describe '#to_a' do
-        subject { Vedeu::Geometries::Position.new.to_a }
+        subject { instance.to_a }
 
-        it { subject.must_equal([1, 1]) }
+        it { subject.must_equal([12, 19]) }
       end
 
-      describe '#to_position' do
-        subject { instance.to_position }
+      describe '#to_h' do
+        subject { instance.to_h }
 
-        it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
-        it { subject.must_equal(instance) }
+        it { subject.must_equal({ y: 12, x: 19 }) }
       end
 
       describe '#to_s' do
-        # subject { described.new.to_s }
+        let(:_value) {}
+
+        subject { described.coerce(_value).to_s }
 
-        it 'returns an escape sequence when no coordinates are provided' do
-          Vedeu::Geometries::Position.new.to_s.must_equal("\e[1;1H")
+        context 'when no coordinates are provided' do
+          it { subject.must_equal('') }
         end
 
-        it 'returns an escape sequence when coordinates are provided' do
-          Vedeu::Geometries::Position[12, 19].to_s.must_equal("\e[12;19H")
+        context 'when coordinates are provided' do
+          let(:_value) { [12, 19] }
+
+          it 'returns an escape sequence' do
+            subject.must_equal("\e[12;19H")
+          end
         end
 
-        it 'returns an escape sequence if a coordinate is missing' do
-          Vedeu::Geometries::Position.new(12).to_s.must_equal("\e[12;1H")
+        context 'when a coordinate is missing' do
+          let(:_value) { 12 }
+
+          it 'returns an escape sequence' do
+            subject.must_equal("\e[12;1H")
+          end
         end
 
-        it 'returns an escape sequence if the x coordinate is negative' do
-          Vedeu::Geometries::Position[12, -5].to_s.must_equal("\e[12;1H")
+        context 'when the x coordinate is negative' do
+          let(:_value) { [12, -5] }
+
+          it 'returns an escape sequence' do
+            subject.must_equal("\e[12;1H")
+          end
         end
 
-        it 'returns an escape sequence if the y coordinate is negative' do
-          Vedeu::Geometries::Position[-12, 5].to_s.must_equal("\e[1;5H")
+        context 'when the y coordinate is negative' do
+          let(:_value) { [-12, 5] }
+
+          it 'returns an escape sequence' do
+            subject.must_equal("\e[1;5H")
+          end
         end
 
-        it 'resets to starting position when a block is given' do
-          Vedeu::Geometries::Position[4, 9].to_s { 'test' }.
-            must_equal("\e[4;9Htest")
+        context 'when a block is given' do
+          let(:instance) { described.coerce(_value) }
+          let(:_value)   { [4, 9] }
+
+          subject { instance.to_s { 'test' } }
+
+          it 'returns an escape sequence and the result of the block' do
+            subject.must_equal("\e[4;9Htest")
+          end
         end
       end
 
@@ -165,7 +225,7 @@ module Vedeu
       describe '#down' do
         subject { instance.down }
 
-        it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
+        it { subject.must_be_instance_of(described) }
         it { subject.y.must_equal(13) }
         it { subject.x.must_equal(19) }
 
@@ -179,7 +239,7 @@ module Vedeu
       describe '#left' do
         subject { instance.left }
 
-        it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
+        it { subject.must_be_instance_of(described) }
         it { subject.y.must_equal(12) }
         it { subject.x.must_equal(18) }
 
@@ -193,7 +253,7 @@ module Vedeu
       describe '#right' do
         subject { instance.right }
 
-        it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
+        it { subject.must_be_instance_of(described) }
         it { subject.y.must_equal(12) }
         it { subject.x.must_equal(20) }
 
@@ -207,7 +267,7 @@ module Vedeu
       describe '#up' do
         subject { instance.up }
 
-        it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
+        it { subject.must_be_instance_of(described) }
         it { subject.y.must_equal(11) }
         it { subject.x.must_equal(19) }
 

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

@@ -0,0 +1,67 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Geometries
+
+    describe Positionable do
+
+      # describe '#position' do
+      #   subject { instance.position }
+
+      #   it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
+
+      #   # @todo Add more tests.
+      # end
+
+      # describe '#position=' do
+      #   subject { instance.position=(value) }
+
+      #   it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
+
+      #   # @todo Add more tests.
+      # end
+
+      # describe '#position?' do
+      #   subject { instance.position? }
+
+      #   # @todo Add more tests.
+      # end
+
+      # describe '#x' do
+      #   let(:position) { Vedeu::Geometries::Position.coerce([17, 2]) }
+
+      #   subject { instance.x }
+
+      #   context 'when a position is set' do
+      #     it { subject.must_equal(2) }
+      #   end
+
+      #   context 'when a position is not set' do
+      #     let(:position) {}
+
+      #     it { subject.must_equal(nil) }
+      #   end
+      # end
+
+      # describe '#y' do
+      #   let(:position) { Vedeu::Geometries::Position.coerce([17, 2]) }
+
+      #   subject { instance.y }
+
+      #   context 'when a position is set' do
+      #     it { subject.must_equal(17) }
+      #   end
+
+      #   context 'when a position is not set' do
+      #     let(:position) {}
+
+      #     it { subject.must_equal(nil) }
+      #   end
+      # end
+
+    end # Positionable
+
+  end # Positionable
+
+end # Vedeu

data/test/lib/vedeu/models/cell_test.rb

@@ -105,6 +105,7 @@ module Vedeu
       describe '#to_s' do
         subject { instance.to_s }
 
+        it { instance.must_respond_to(:to_str) }
         it { subject.must_be_instance_of(String) }
         it { subject.must_equal('') }
       end

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

@@ -51,16 +51,6 @@ module Vedeu
         it { instance.must_respond_to(:==) }
       end
 
-      describe '#position' do
-        it { instance.position.must_be_instance_of(Vedeu::Geometries::Position) }
-      end
-
-      describe '#position' do
-        subject { instance.position }
-
-        it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
-      end
-
       describe '#value' do
         subject { instance.value }
 

data/test/lib/vedeu/renderers/json_test.rb

@@ -54,8 +54,6 @@ module Vedeu
           "    \"parent\": {\n" \
           "    },\n" \
           "    \"position\": {\n" \
-          "      \"y\": null,\n" \
-          "      \"x\": null\n" \
           "    },\n" \
           "    \"style\": \"\",\n" \
           "    \"value\": \"a\"\n" \
@@ -70,8 +68,6 @@ module Vedeu
           "    \"parent\": {\n" \
           "    },\n" \
           "    \"position\": {\n" \
-          "      \"y\": null,\n" \
-          "      \"x\": null\n" \
           "    },\n" \
           "    \"style\": \"\",\n" \
           "    \"value\": \"\\u001b[0m\"\n" \

data/test/lib/vedeu/views/char_test.rb

@@ -109,38 +109,35 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Interfaces::Interface) }
       end
 
-      describe '#position' do
-        subject { instance.position }
-      end
-
-      describe '#position=' do
-        subject { instance.position=(value) }
-      end
-
       describe '#to_hash' do
+        let(:position) { Vedeu::Geometries::Position.coerce([17, 2]) }
+        let(:expected) {
+          {
+            border: '',
+            colour: {
+              background: '',
+              foreground: '',
+            },
+            name: 'Vedeu::Views::Char',
+            parent: {
+              background: '',
+              foreground: '',
+              style: '',
+            },
+            position: {
+              y: 17,
+              x: 2,
+            },
+            style: '',
+            value: 'a',
+          }
+        }
+
         subject { instance.to_hash }
 
         it { subject.must_be_instance_of(Hash) }
 
-        it { subject.must_equal(
-              border: '',
-              colour: {
-                background: '',
-                foreground: '',
-              },
-              name: 'Vedeu::Views::Char',
-              parent: {
-                background: '',
-                foreground: '',
-                style: '',
-              },
-              position: {
-                y: nil,
-                x: nil
-              },
-              style: '',
-              value: 'a')
-        }
+        it { subject.must_equal(expected) }
       end
 
       describe '#to_html' do
@@ -155,7 +152,7 @@ module Vedeu
         it { subject.must_be_instance_of(String) }
 
         context 'when a position is specified' do
-          let(:position) { Vedeu::Geometries::Position[17, 2] }
+          let(:position) { Vedeu::Geometries::Position.coerce([17, 2]) }
 
           it { subject.must_equal("\e[17;2Ha") }
         end
@@ -240,38 +237,6 @@ module Vedeu
         end
       end
 
-      describe '#x' do
-        let(:position) { Vedeu::Geometries::Position[17, 2] }
-
-        subject { instance.x }
-
-        context 'when a position is set' do
-          it { subject.must_equal(2) }
-        end
-
-        context 'when a position is not set' do
-          let(:position) {}
-
-          it { subject.must_equal(nil) }
-        end
-      end
-
-      describe '#y' do
-        let(:position) { Vedeu::Geometries::Position[17, 2] }
-
-        subject { instance.y }
-
-        context 'when a position is set' do
-          it { subject.must_equal(17) }
-        end
-
-        context 'when a position is not set' do
-          let(:position) {}
-
-          it { subject.must_equal(nil) }
-        end
-      end
-
     end # Char
 
   end # Views

data/vedeu.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mocha',              '1.1.0'
   spec.add_development_dependency 'pry',                '0.10.3'
   spec.add_development_dependency 'rubocop',            '0.35.1'
-  spec.add_development_dependency 'simplecov',          '0.10.0'
+  spec.add_development_dependency 'simplecov',          '0.11.0'
   spec.add_development_dependency 'simplecov-console',  '0.2.0'
   spec.add_development_dependency 'yard',               '0.8.7.6'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.70
+  version: 0.6.71
 platform: ruby
 authors:
 - Gavin Laking
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
@@ -433,6 +433,7 @@ files:
 - lib/vedeu/geometries/geometry.rb
 - lib/vedeu/geometries/move.rb
 - lib/vedeu/geometries/position.rb
+- lib/vedeu/geometries/positionable.rb
 - lib/vedeu/geometries/repository.rb
 - lib/vedeu/groups/all.rb
 - lib/vedeu/groups/clear.rb
@@ -632,6 +633,7 @@ files:
 - test/lib/vedeu/geometries/geometry_test.rb
 - test/lib/vedeu/geometries/move_test.rb
 - test/lib/vedeu/geometries/position_test.rb
+- test/lib/vedeu/geometries/positionable_test.rb
 - test/lib/vedeu/geometries/repository_test.rb
 - test/lib/vedeu/groups/clear_test.rb
 - test/lib/vedeu/groups/dsl_test.rb
@@ -857,6 +859,7 @@ test_files:
 - test/lib/vedeu/geometries/geometry_test.rb
 - test/lib/vedeu/geometries/move_test.rb
 - test/lib/vedeu/geometries/position_test.rb
+- test/lib/vedeu/geometries/positionable_test.rb
 - test/lib/vedeu/geometries/repository_test.rb
 - test/lib/vedeu/groups/clear_test.rb
 - test/lib/vedeu/groups/dsl_test.rb