vedeu 0.6.30 → 0.6.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea4a90f4f35a50a9277083e0f25eb794c4bde66f
-  data.tar.gz: f88025c5b2d624ff2cd1f66ec06e52465157ea22
+  metadata.gz: e129ccc6fe63f7b1f7b48ab9030683d79fe8544c
+  data.tar.gz: fab4cf9d158706ff5670b11c59bfaf1f03710683
 SHA512:
-  metadata.gz: 346ade00d603a72378c0da55b48650c87335ededb334f576ebee3fb0c1249c66af74574aa90bd4ebe21e38eb651b7862b523ebe2e536a7734c057fa09c500718
-  data.tar.gz: cba34e4d351846db0e2d08de4f125a25674d8430badf95e4820db70ed8fa66b502476ad8e1499f758f19d50029bb9907253024ea15172b66d918784fe4d80a16
+  metadata.gz: f76de0943d7be6e18efc10e248acac5232be21608228f45766a4815dd9e6bda0488dc7d304793fa6dea38aceadbf8bbcbba2694fe9763aff645db8d7b8f37b58
+  data.tar.gz: 8e9ef60497f7132a022a87d8223dddb9b3e486f3887ada7ffc276143dab0dc4c35341a141104eb2c8e5b4621ced3d1de2d00517bfa1aa315b75da4ae9b355f42

data/.codeclimate.yml

@@ -1,6 +1,3 @@
-engines:
-  rubocop:
-    enabled: true
 ratings:
   paths:
     - lib/**

data/lib/vedeu/all.rb

@@ -7,7 +7,6 @@ require 'vedeu/repositories/all'
 require 'vedeu/events/all'
 require 'vedeu/esc/all'
 require 'vedeu/logging/all'
-require 'vedeu/options'
 require 'vedeu/error'
 require 'vedeu/runtime/all'
 require 'vedeu/terminal/all'
@@ -42,6 +41,4 @@ require 'vedeu/input/all'
 require 'vedeu/interfaces/all'
 require 'vedeu/menus/all'
 require 'vedeu/templating/all'
-
-require 'vedeu/bindings/all'
 require 'vedeu/plugins/all'

data/lib/vedeu/borders/border.rb

@@ -25,10 +25,6 @@ module Vedeu
                      :y,
                      :yn
 
-      # @!attribute [rw] attributes
-      # @return [Hash]
-      attr_accessor :attributes
-
       # @!attribute [rw] bottom_left
       # @return [String]
       attr_accessor :bottom_left
@@ -148,9 +144,9 @@ module Vedeu
           parent:       @parent,
           repository:   @repository,
           show_bottom:  @show_bottom,
-          show_left:    @show_,
-          show_right:   @show_,
-          show_top:     @show_,
+          show_left:    @show_left,
+          show_right:   @show_right,
+          show_top:     @show_top,
           style:        @style,
           title:        @title,
           top_left:     @top_left,

data/lib/vedeu/borders/refresh.rb

@@ -362,9 +362,13 @@ module Vedeu
 
   end # Borders
 
+  # :nocov:
+
   # See {file:docs/events/refresh.md#\_refresh_border_}
   Vedeu.bind(:_refresh_border_) do |name|
     Vedeu::Borders::Refresh.by_name(name)
   end
 
+  # :nocov:
+
 end # Vedeu

data/lib/vedeu/buffers/refresh.rb

@@ -74,6 +74,8 @@ module Vedeu
 
   end # Buffers
 
+  # :nocov:
+
   # See {file:docs/events/refresh.md#\_refresh_view_}
   Vedeu.bind(:_refresh_view_) do |name|
     Vedeu::Buffers::Refresh.by_name(name)
@@ -84,4 +86,6 @@ module Vedeu
     Vedeu::Buffers::Refresh.refresh_content_by_name(name)
   end
 
+  # :nocov:
+
 end # Vedeu

data/lib/vedeu/cursors/cursor.rb

@@ -17,10 +17,6 @@ module Vedeu
                      :by,
                      :byn
 
-      # @!attribute [r] attributes
-      # @return [Hash]
-      attr_reader :attributes
-
       # @!attribute [r] name
       # @return [String|Symbol]
       attr_reader :name
@@ -43,7 +39,7 @@ module Vedeu
 
       # @param (see #initialize)
       # @return [Vedeu::Cursors::Cursor]
-      def self.store(attributes)
+      def self.store(attributes = {})
         new(attributes).store
       end
 
@@ -64,13 +60,24 @@ module Vedeu
       #   the cursor.
       # @return [Vedeu::Cursors::Cursor]
       def initialize(attributes = {})
-        @attributes = defaults.merge!(attributes)
-
-        @attributes.each do |key, value|
+        defaults.merge!(attributes).each do |key, value|
           instance_variable_set("@#{key}", value)
         end
       end
 
+      # @return [Hash]
+      def attributes
+        {
+          name:       @name,
+          ox:         ox,
+          oy:         oy,
+          repository: @repository,
+          visible:    @visible,
+          x:          x,
+          y:          y,
+        }
+      end
+
       # An object is equal when its values are the same.
       #
       # @param other [Vedeu::Cursors::Cursor]
@@ -88,9 +95,9 @@ module Vedeu
       # @return [Vedeu::Cursors::Cursor]
       def move_down
         @oy += 1
+        @y = coordinate(oy, :y).y
 
-        Vedeu::Cursors::Cursor.store(
-          new_attributes(coordinate.y_position, x, oy, ox))
+        store
       end
 
       # Moves the cursor left by one column.
@@ -101,9 +108,9 @@ module Vedeu
       # @return [Vedeu::Cursors::Cursor]
       def move_left
         @ox -= 1
+        @x = coordinate(ox, :x).x
 
-        Vedeu::Cursors::Cursor.store(
-          new_attributes(y, coordinate.x_position, oy, ox))
+        store
       end
 
       # Moves the cursor to the top left of the named interface.
@@ -113,8 +120,12 @@ module Vedeu
       #
       # @return [Vedeu::Cursors::Cursor]
       def move_origin
-        Vedeu::Cursors::Cursor.store(
-          attributes.merge!(x: bx, y: by, ox: 0, oy: 0))
+        @x = bx
+        @y = by
+        @ox = 0
+        @oy = 0
+
+        store
       end
 
       # Moves the cursor right by one column.
@@ -125,9 +136,9 @@ module Vedeu
       # @return [Vedeu::Cursors::Cursor]
       def move_right
         @ox += 1
+        @x = coordinate(ox, :x).x
 
-        Vedeu::Cursors::Cursor.store(
-          new_attributes(y, coordinate.x_position, oy, ox))
+        store
       end
 
       # Moves the cursor up by one row.
@@ -138,9 +149,9 @@ module Vedeu
       # @return [Vedeu::Cursors::Cursor]
       def move_up
         @oy -= 1
+        @y = coordinate(oy, :y).y
 
-        Vedeu::Cursors::Cursor.store(
-          new_attributes(coordinate.y_position, x, oy, ox))
+        store
       end
 
       # Renders the cursor.
@@ -160,9 +171,10 @@ module Vedeu
       def reposition(new_oy, new_ox)
         @oy = new_oy
         @ox = new_ox
+        @y  = coordinate(oy, :y).y
+        @x  = coordinate(ox, :x).x
 
-        Vedeu::Cursors::Cursor.store(
-          new_attributes(coordinate.y_position, coordinate.x_position, oy, ox))
+        store
       end
 
       # @return [Array<Fixnum>]
@@ -200,14 +212,12 @@ module Vedeu
 
       # @return [Fixnum]
       def ox
-        @ox = 0 if @ox < 0
-        @ox
+        @ox < 0 ? 0 : @ox
       end
 
       # @return [Fixnum]
       def oy
-        @oy = 0 if @oy < 0
-        @oy
+        @oy < 0 ? 0 : @oy
       end
 
       # Return the position of this cursor.
@@ -235,21 +245,15 @@ module Vedeu
 
       # @return [Fixnum] The column/character coordinate.
       def x
-        @x = bx  if @x < bx
-        @x = bxn if @x > bxn
-
-        @attributes[:x] = @x
-
+        @x = (@x < bx) ? bx : @x
+        @x = (@x > bxn) ? bxn : @x
         @x
       end
 
       # @return [Fixnum] The row/line coordinate.
       def y
-        @y = by  if @y < by
-        @y = byn if @y > byn
-
-        @attributes[:y] = @y
-
+        @y = (@y < by) ? by : @y
+        @y = (@y > byn) ? byn : @y
         @y
       end
 
@@ -260,9 +264,11 @@ module Vedeu
         @border ||= Vedeu.borders.by_name(name)
       end
 
+      # Determine correct x and y related coordinates.
+      #
       # @return [Vedeu::Geometry::Coordinate]
-      def coordinate
-        @coordinate ||= Vedeu::Geometry::Coordinate.new(name, oy, ox)
+      def coordinate(offset, type)
+        Vedeu::Geometry::Coordinate.new(name: name, offset: offset, type: type)
       end
 
       # The default values for a new instance of this class.
@@ -313,6 +319,8 @@ module Vedeu
   def_delegators Vedeu::Cursors::Cursor, :hide_cursor, :show_cursor,
                  :toggle_cursor
 
+  # :nocov:
+
   # See {file:docs/events/visibility.md#\_hide_cursor_}
   Vedeu.bind(:_hide_cursor_) { |name| Vedeu.hide_cursor(name) }
   # Vedeu.bind_alias(:_cursor_hide_, :_hide_cursor_)
@@ -372,4 +380,6 @@ module Vedeu
     Vedeu.trigger(:_refresh_cursor_, name)
   end
 
+  # :nocov:
+
 end # Vedeu

data/lib/vedeu/cursors/refresh.rb

@@ -86,9 +86,13 @@ module Vedeu
 
   end # Cursors
 
+  # :nocov:
+
   # See {file:docs/events/refresh.md#\_refresh_cursor_}
   Vedeu.bind(:_refresh_cursor_) do |name|
     Vedeu::Cursors::Refresh.by_name(name)
   end
 
+  # :nocov:
+
 end # Vedeu

data/lib/vedeu/distributed/server.rb

@@ -249,6 +249,8 @@ module Vedeu
   def_delegators Vedeu::Distributed::Server, :drb_restart, :drb_start,
                  :drb_status, :drb_stop
 
+  # :nocov:
+
   # See {file:docs/events/drb.md#\_drb_restart_}
   Vedeu.bind(:_drb_restart_) { Vedeu::Distributed::Server.restart }
 
@@ -261,4 +263,6 @@ module Vedeu
   # See {file:docs/events/drb.md#\_drb_stop_}
   Vedeu.bind(:_drb_stop_) { Vedeu::Distributed::Server.stop }
 
+  # :nocov:
+
 end # Vedeu

data/lib/vedeu/editor/editor.rb

@@ -87,9 +87,13 @@ module Vedeu
 
   end # Editor
 
+  # :nocov:
+
   # See {file:docs/events/system.md#\_editor_}
   Vedeu.bind(:_editor_) do |key|
     Vedeu::Editor::Editor.keypress(name: Vedeu.focus, input: key)
   end
 
+  # :nocov:
+
 end # Vedeu

data/lib/vedeu/editor/repository.rb

@@ -24,6 +24,8 @@ module Vedeu
   # @return [Vedeu::Editor::Repository]
   def_delegators Vedeu::Editor::Repository, :documents
 
+  # :nocov:
+
   # See {file:docs/events/document.md#\_editor_execute_}
   Vedeu.bind(:_editor_execute_) do |name|
     Vedeu.documents.by_name(name).execute
@@ -65,4 +67,6 @@ module Vedeu
   # See {file:docs/events/document.md#\_editor_up_}
   Vedeu.bind(:_editor_up_) { |name| Vedeu.documents.by_name(name).up }
 
+  # :nocov:
+
 end # Vedeu

data/lib/vedeu/events/event.rb

@@ -194,7 +194,12 @@ module Vedeu
         @now         = 0    # reset now
 
         message = "Triggering: '#{name.inspect}'"
-        message << " with '#{args.inspect}'" if args.any?
+
+        if args.size > 1
+          message << " with #{args.inspect}"
+        elsif args.one?
+          message << " for #{args.first.inspect}"
+        end
 
         Vedeu.log(type: :event, message: message)
 

data/lib/vedeu/geometry/all.rb

@@ -17,7 +17,7 @@ require 'vedeu/geometry/area'
 require 'vedeu/geometry/coordinate'
 require 'vedeu/geometry/dimension'
 require 'vedeu/geometry/dsl'
-require 'vedeu/geometry/generic_coordinate'
+require 'vedeu/geometry/coordinate'
 require 'vedeu/geometry/geometry'
 require 'vedeu/geometry/grid'
 require 'vedeu/geometry/null'

data/lib/vedeu/geometry/coordinate.rb

@@ -6,62 +6,164 @@ module Vedeu
     #
     class Coordinate
 
-      extend Forwardable
+      # Return a new instance of Vedeu::Geometry::Coordinate.
+      #
+      # @param attributes [Hash]
+      # @option attributes name [String|Symbol]
+      # @option attributes type [Symbol]
+      # @option attributes offset [Fixnum]
+      # @return [Vedeu::Geometry::Coordinate]
+      def initialize(attributes = {})
+        defaults.merge!(attributes).each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
+      end
 
-      def_delegators :x,
-                     :x_position,
-                     :xn
+      # Returns the maximum coordinate for an area.
+      #
+      # @example
+      #   # d = 2
+      #   # d_dn = 4 # represents width or height
+      #   dn # => 6
+      #
+      # @return [Fixnum]
+      def dn_position
+        return 0 if d_dn <= 0
 
-      def_delegators :y,
-                     :y_position,
-                     :yn
+        d + d_dn
+      end
+      alias_method :xn, :dn_position
+      alias_method :yn, :dn_position
 
-      # Returns a new instance of Vedeu::Geometry::Coordinate.
+      # Returns the coordinate for a given index.
       #
-      # @param name [String|Symbol]
-      # @param oy [Fixnum]
-      # @param ox [Fixnum]
-      # @return [Vedeu::Geometry::Coordinate]
-      def initialize(name, oy, ox)
-        @name = name
-        @ox   = ox
-        @oy   = oy
+      # @example
+      #   # d_range = [4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
+      #   position     # => 4
+      #   position(-2) # => 4
+      #   position(2)  # => 6
+      #   position(15) # => 13
+      #
+      # @return [Fixnum]
+      def d_position
+        pos = if offset <= 0
+                d
+
+              elsif offset > dn_index
+                dn_position
+
+              else
+                d_range[offset]
+
+              end
+
+        pos = pos < bd ? bd : pos
+        pos = pos > bdn ? bdn : pos
+        pos
       end
+      alias_method :x, :d_position
+      alias_method :y, :d_position
 
       protected
 
       # @!attribute [r] name
-      # @return [String|Symbol]
+      # @return [String]
       attr_reader :name
 
-      # @!attribute [rw] ox
+      # @!attribute [r] offset
       # @return [Fixnum]
-      attr_accessor :ox
+      attr_reader :offset
 
-      # @!attribute [rw] oy
-      # @return [Fixnum]
-      attr_accessor :oy
+      # @!attribute [r] type
+      # @return [Symbol]
+      attr_reader :type
 
       private
 
-      # Provide an instance of {Vedeu::Geometry::GenericCoordinate} to
-      # determine correct x related coordinates.
+      # @see Vedeu::Borders::Repository#by_name
+      def border
+        @border ||= Vedeu.borders.by_name(name)
+      end
+
+      # Return the :x or :y value from the border.
+      #
+      # @return [Fixnum]
+      def d
+        border.send(coordinate_type[0])
+      end
+
+      # Return the :bx or :by value from the border.
+      #
+      # @return [Fixnum]
+      def bd
+        border.send(coordinate_type[1])
+      end
+
+      # Return the :bxn or :byn value from the border.
+      #
+      # @return [Fixnum]
+      def bdn
+        border.send(coordinate_type[2])
+      end
+
+      # Return the :width or :height value from the border.
+      #
+      # @return [Fixnum]
+      def d_dn
+        border.send(coordinate_type[3])
+      end
+
+      # Ascertain the correct methods to use for determining the
+      # coordinates.
+      #
+      # @raise [Vedeu::Error::InvalidSyntax] When the coordinate type
+      #   is not given.
+      # @return [Fixnum]
+      def coordinate_type
+        @_type ||= case type
+                   when :x then [:x, :bx, :bxn, :width]
+                   when :y then [:y, :by, :byn, :height]
+                   else
+                     fail Vedeu::Error::InvalidSyntax,
+                          'Coordinate type not given, cannot continue.'.freeze
+                   end
+      end
+
+      # Returns the maximum index for an area.
+      #
+      # @example
+      #   # d_dn = 3
+      #   dn_index # => 2
+      #
+      # @return [Fixnum]
+      def dn_index
+        return 0 if d_dn < 1
+
+        d_dn - 1
+      end
+
+      # Returns an array with all coordinates from d to dn.
+      #
+      # @example
+      #   # d_dn = 10
+      #   # d = 4
+      #   # dn = 14
+      #   d_range # => [4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
       #
-      # @return [Vedeu::Geometry::GenericCoordinate]
-      def x
-        @x ||= Vedeu::Geometry::GenericCoordinate.new(name:   name,
-                                                      offset: ox,
-                                                      type:   :x)
+      # @return [Array]
+      def d_range
+        (d...dn_position).to_a
       end
 
-      # Provide an instance of {Vedeu::Geometry::GenericCoordinate} to
-      # determine correct y related coordinates.
+      # The default values for a new instance of this class.
       #
-      # @return [Vedeu::Geometry::GenericCoordinate]
-      def y
-        @y ||= Vedeu::Geometry::GenericCoordinate.new(name:   name,
-                                                      offset: oy,
-                                                      type:   :y)
+      # @return [Hash]
+      def defaults
+        {
+          name:   '',
+          offset: nil,
+          type:   :x,
+        }
       end
 
     end # Coordinate