vedeu 0.8.16 → 0.8.17

data/lib/vedeu/coercers/all.rb

@@ -14,19 +14,14 @@ module Vedeu
 end # Vedeu
 
 require 'vedeu/coercers/coercer'
-
 require 'vedeu/coercers/alignment'
 require 'vedeu/coercers/horizontal_alignment'
 require 'vedeu/coercers/vertical_alignment'
-
 require 'vedeu/coercers/chars'
-
 require 'vedeu/coercers/colour'
 require 'vedeu/coercers/colour_attributes'
-
 require 'vedeu/coercers/editor_line'
 require 'vedeu/coercers/editor_lines'
-
 require 'vedeu/coercers/lines'
 require 'vedeu/coercers/page'
 require 'vedeu/coercers/position'

data/lib/vedeu/cursors/all.rb

@@ -15,6 +15,94 @@ module Vedeu
 
   end # Cursors
 
+  # :nocov:
+
+  # See {file:docs/cursors.md}
+  Vedeu.bind(:_cursor_bottom_) do |name|
+    name ||= Vedeu.focus
+    count = Vedeu.buffers.by_name(name).size
+
+    Vedeu::Cursors::Reposition.new(name: name,
+                                   y:    count,
+                                   x:    0,
+                                   mode: :relative).reposition
+
+    Vedeu.trigger(:_clear_view_, name)
+    Vedeu.trigger(:_refresh_view_, name)
+  end
+
+  # See {file:docs/events/by_name/cursor_down.md}
+  Vedeu.bind(:_cursor_down_) do |name, offset|
+    Vedeu::Cursors::Move.move(name, :move_down, offset)
+  end
+
+  # See {file:docs/events/by_name/cursor_left.md}
+  Vedeu.bind(:_cursor_left_) do |name, offset|
+    Vedeu::Cursors::Move.move(name, :move_left, offset)
+  end
+
+  # See {file:docs/cursors.md}
+  Vedeu.bind(:_cursor_origin_) do |name|
+    Vedeu.cursors.by_name(name).move_origin
+
+    Vedeu.trigger(:_refresh_cursor_, name)
+  end
+  Vedeu.bind_alias(:_cursor_reset_, :_cursor_origin_)
+
+  # See {file:docs/cursors.md}
+  Vedeu.bind(:_cursor_position_) do |name|
+    Vedeu.cursors.by_name(name).inspect
+  end
+
+  # See {file:docs/cursors.md}
+  Vedeu.bind(:_cursor_reposition_) do |name, y, x|
+    Vedeu::Cursors::Reposition.new(name: name,
+                                   y:    y,
+                                   x:    x,
+                                   mode: :absolute).reposition
+  end
+
+  # See {file:docs/events/by_name/cursor_right.md}
+  Vedeu.bind(:_cursor_right_) do |name, offset|
+    Vedeu::Cursors::Move.move(name, :move_right, offset)
+  end
+
+  # See {file:docs/events/by_name/cursor_up.md}
+  Vedeu.bind(:_cursor_up_) do |name, offset|
+    Vedeu::Cursors::Move.move(name, :move_up, offset)
+  end
+
+  # See {file:docs/cursors.md}
+  Vedeu.bind(:_cursor_top_) do |name|
+    name ||= Vedeu.focus
+
+    Vedeu::Cursors::Reposition.new(name: name,
+                                   y:    0,
+                                   x:    0,
+                                   mode: :relative).reposition
+
+    Vedeu.trigger(:_clear_view_, name)
+    Vedeu.trigger(:_refresh_view_, name)
+  end
+
+  # See {file:docs/cursors.md#vedeuhide_cursor__}
+  Vedeu.bind(:_hide_cursor_) { |name| Vedeu.hide_cursor(name) }
+  Vedeu.bind_alias(:_cursor_hide_, :_hide_cursor_)
+
+  # See {file:docs/events/refresh.md#\_refresh_cursor_}
+  Vedeu.bind(:_refresh_cursor_) do |name|
+    Vedeu::Cursors::Refresh.by_name(name) if Vedeu.ready?
+  end
+
+  # See {file:docs/cursors.md#vedeushow_cursor__}
+  Vedeu.bind(:_show_cursor_) { |name| Vedeu.show_cursor(name) }
+  Vedeu.bind_alias(:_cursor_show_, :_show_cursor_)
+
+  # See {file:docs/cursors.md#vedeutoggle_cursor__}
+  Vedeu.bind(:_toggle_cursor_) { |name| Vedeu.toggle_cursor(name) }
+
+  # :nocov:
+
 end # Vedeu
 
 require 'vedeu/cursors/move'

data/lib/vedeu/cursors/cursor.rb

@@ -22,7 +22,7 @@ module Vedeu
                      :byn
 
       # @!attribute [r] name
-      # @return [String|Symbol]
+      # @macro return_name
       attr_reader :name
 
       # @!attribute [w] ox
@@ -177,12 +177,12 @@ module Vedeu
 
       # @return [Fixnum]
       def ox
-        @ox = @ox < 0 ? 0 : @ox
+        @ox = @ox < 1 ? 1 : @ox
       end
 
       # @return [Fixnum]
       def oy
-        @oy = @oy < 0 ? 0 : @oy
+        @oy = @oy < 1 ? 1 : @oy
       end
 
       # Return the position of this cursor.
@@ -214,11 +214,9 @@ module Vedeu
 
       private
 
-      # Returns the geometry for the interface.
-      #
-      # @return (see Vedeu::Geometries::Repository#by_name)
+      # @macro geometry_by_name
       def geometry
-        @geometry ||= Vedeu.geometries.by_name(name)
+        @_geometry ||= Vedeu.geometries.by_name(name)
       end
 
       # Determine correct x and y related coordinates.
@@ -234,8 +232,8 @@ module Vedeu
       def defaults
         {
           name:       '',
-          ox:         0,
-          oy:         0,
+          ox:         1,
+          oy:         1,
           repository: Vedeu.cursors,
           visible:    false,
           x:          1,
@@ -281,87 +279,4 @@ module Vedeu
                  :show_cursor,
                  :toggle_cursor
 
-  # :nocov:
-
-  # See {file:docs/cursors.md#vedeuhide_cursor__}
-  Vedeu.bind(:_hide_cursor_) { |name| Vedeu.hide_cursor(name) }
-  Vedeu.bind_alias(:_cursor_hide_, :_hide_cursor_)
-
-  # See {file:docs/cursors.md#vedeushow_cursor__}
-  Vedeu.bind(:_show_cursor_) { |name| Vedeu.show_cursor(name) }
-  Vedeu.bind_alias(:_cursor_show_, :_show_cursor_)
-
-  # See {file:docs/cursors.md#vedeutoggle_cursor__}
-  Vedeu.bind(:_toggle_cursor_) { |name| Vedeu.toggle_cursor(name) }
-
-  # See {file:docs/events/by_name/cursor_left.md}
-  Vedeu.bind(:_cursor_left_) do |name, offset|
-    Vedeu::Cursors::Move.move(name, :move_left, offset)
-  end
-
-  # See {file:docs/events/by_name/cursor_down.md}
-  Vedeu.bind(:_cursor_down_) do |name, offset|
-    Vedeu::Cursors::Move.move(name, :move_down, offset)
-  end
-
-  # See {file:docs/events/by_name/cursor_up.md}
-  Vedeu.bind(:_cursor_up_) do |name, offset|
-    Vedeu::Cursors::Move.move(name, :move_up, offset)
-  end
-
-  # See {file:docs/events/by_name/cursor_right.md}
-  Vedeu.bind(:_cursor_right_) do |name, offset|
-    Vedeu::Cursors::Move.move(name, :move_right, offset)
-  end
-
-  # See {file:docs/cursors.md}
-  Vedeu.bind(:_cursor_origin_) do |name|
-    Vedeu.cursors.by_name(name).move_origin
-
-    Vedeu.trigger(:_refresh_cursor_, name)
-  end
-  Vedeu.bind_alias(:_cursor_reset_, :_cursor_origin_)
-
-  # See {file:docs/cursors.md}
-  Vedeu.bind(:_cursor_position_) do |name|
-    Vedeu.cursors.by_name(name).inspect
-  end
-
-  # See {file:docs/cursors.md}
-  Vedeu.bind(:_cursor_reposition_) do |name, y, x|
-    Vedeu::Cursors::Reposition.new(name: name,
-                                   y:    y,
-                                   x:    x,
-                                   mode: :absolute).reposition
-  end
-
-  # See {file:docs/cursors.md}
-  Vedeu.bind(:_cursor_top_) do |name|
-    name ||= Vedeu.focus
-
-    Vedeu::Cursors::Reposition.new(name: name,
-                                   y:    0,
-                                   x:    0,
-                                   mode: :relative).reposition
-
-    Vedeu.trigger(:_clear_view_, name)
-    Vedeu.trigger(:_refresh_view_, name)
-  end
-
-  # See {file:docs/cursors.md}
-  Vedeu.bind(:_cursor_bottom_) do |name|
-    name ||= Vedeu.focus
-    count = Vedeu.buffers.by_name(name).size
-
-    Vedeu::Cursors::Reposition.new(name: name,
-                                   y:    count,
-                                   x:    0,
-                                   mode: :relative).reposition
-
-    Vedeu.trigger(:_clear_view_, name)
-    Vedeu.trigger(:_refresh_view_, name)
-  end
-
-  # :nocov:
-
 end # Vedeu

data/lib/vedeu/cursors/move.rb

@@ -29,22 +29,22 @@ module Vedeu
       def initialize(name, direction, offset)
         @name      = name
         @direction = direction
-        @offset    = offset
+        @offset    = offset || 1
       end
 
       # @return [NilClass|Vedeu::Cursors::Cursor]
       def move
-        return nil unless visible? && valid_direction?
-
-        cursor.public_send(direction, offset)
-        cursor.store { Vedeu.trigger(:_refresh_cursor_, name) }
-        cursor
+        if visible? && valid?
+          cursor.public_send(direction, offset)
+          cursor.store { Vedeu.trigger(:_refresh_cursor_, name) }
+          cursor
+        end
       end
 
       protected
 
       # @!attribute [r] name
-      # @return [String|Symbol] The name of the cursor.
+      # @macro return_name
       attr_reader :name
 
       # @!attribute [r] direction
@@ -58,19 +58,49 @@ module Vedeu
 
       private
 
-      # @return [Vedeu::Cursors::Cursor]
+      # @macro cursor_by_name
       def cursor
         @_cursor ||= Vedeu.cursors.by_name(name)
       end
 
+      # @return [Hash<Symbol => Proc>]
+      def directions
+        {
+          move_down:  proc { valid_down? },
+          move_left:  proc { valid_left? },
+          move_right: proc { valid_right? },
+          move_up:    proc { valid_up? },
+        }
+      end
+
+      # @return [Boolean]
+      def valid?
+        valid_direction? && directions.fetch(direction).call
+      end
+
       # @return [Boolean]
       def valid_direction?
-        [
-          :move_down,
-          :move_left,
-          :move_right,
-          :move_up,
-        ].include?(direction)
+        directions.keys.include?(direction)
+      end
+
+      # @return [Boolean]
+      def valid_down?
+        true
+      end
+
+      # @return [Boolean]
+      def valid_left?
+        (cursor.ox - offset) > 0
+      end
+
+      # @return [Boolean]
+      def valid_right?
+        true
+      end
+
+      # @return [Boolean]
+      def valid_up?
+        (cursor.oy - offset) > 0
       end
 
     end # Move

data/lib/vedeu/cursors/refresh.rb

@@ -63,7 +63,7 @@ module Vedeu
 
       private
 
-      # @return [String|Symbol]
+      # @macro return_name
       def name
         present?(@name) ? @name : Vedeu.focus
       end
@@ -78,30 +78,18 @@ module Vedeu
         visible? && (ox >= bordered_width || oy >= bordered_height)
       end
 
-      # @return [Vedeu::Cursors::Cursor]
-      # @see Vedeu::Cursors::Repository#by_name
+      # @macro cursor_by_name
       def cursor
-        @cursor ||= Vedeu.cursors.by_name(name)
+        @_cursor ||= Vedeu.cursors.by_name(name)
       end
 
-      # Fetch the geometry by name.
-      #
-      # @return (see Vedeu::Geometries::Repository#by_name)
+      # @macro geometry_by_name
       def geometry
-        @geometry ||= Vedeu.geometries.by_name(name)
+        @_geometry ||= Vedeu.geometries.by_name(name)
       end
 
     end # Refresh
 
   end # Cursors
 
-  # :nocov:
-
-  # See {file:docs/events/refresh.md#\_refresh_cursor_}
-  Vedeu.bind(:_refresh_cursor_) do |name|
-    Vedeu::Cursors::Refresh.by_name(name) if Vedeu.ready?
-  end
-
-  # :nocov:
-
 end # Vedeu

data/lib/vedeu/cursors/reposition.rb

@@ -37,7 +37,7 @@ module Vedeu
       protected
 
       # @!attribute [r] name
-      # @return [String|Symbol]
+      # @macro return_name
       attr_reader :name
 
       # @!attribute [r] x
@@ -91,7 +91,7 @@ module Vedeu
         }
       end
 
-      # @return [Vedeu::Geometries::Geometry]
+      # @macro geometry_by_name
       def geometry
         Vedeu.geometries.by_name(name)
       end

data/lib/vedeu/distributed/all.rb

@@ -9,6 +9,22 @@ module Vedeu
 
   end # Distributed
 
+  # :nocov:
+
+  # See {file:docs/events/drb.md#\_drb_restart_}
+  Vedeu.bind(:_drb_restart_) { Vedeu::Distributed::Server.restart }
+
+  # See {file:docs/events/drb.md#\_drb_start_}
+  Vedeu.bind(:_drb_start_) { Vedeu::Distributed::Server.start }
+
+  # See {file:docs/events/drb.md#\_drb_status_}
+  Vedeu.bind(:_drb_status_) { Vedeu::Distributed::Server.status }
+
+  # See {file:docs/events/drb.md#\_drb_stop_}
+  Vedeu.bind(:_drb_stop_) { Vedeu::Distributed::Server.stop }
+
+  # :nocov:
+
 end # Vedeu
 
 require 'vedeu/distributed/uri'

data/lib/vedeu/distributed/server.rb

@@ -256,20 +256,4 @@ module Vedeu
                  :drb_status,
                  :drb_stop
 
-  # :nocov:
-
-  # See {file:docs/events/drb.md#\_drb_restart_}
-  Vedeu.bind(:_drb_restart_) { Vedeu::Distributed::Server.restart }
-
-  # See {file:docs/events/drb.md#\_drb_start_}
-  Vedeu.bind(:_drb_start_) { Vedeu::Distributed::Server.start }
-
-  # See {file:docs/events/drb.md#\_drb_status_}
-  Vedeu.bind(:_drb_status_) { Vedeu::Distributed::Server.status }
-
-  # See {file:docs/events/drb.md#\_drb_stop_}
-  Vedeu.bind(:_drb_stop_) { Vedeu::Distributed::Server.stop }
-
-  # :nocov:
-
 end # Vedeu

data/lib/vedeu/dsl/dsl.rb

@@ -65,8 +65,8 @@ module Vedeu
     # @return [void]
     def method_missing(method, *args, &block)
       Vedeu.log(type:    :debug,
-                message: "!!!method_missing '#{method}' " \
-                         "(#{client.inspect})")
+                message: "!!!method_missing '#{method}' sending to " \
+                         "#{client.inspect}")
 
       client.send(method, *args, &block) if client
     end