vedeu 0.4.18 → 0.4.19

data/lib/vedeu/distributed/server.rb

@@ -3,7 +3,6 @@ module Vedeu
   module Distributed
 
     # A class for the server side of the DRb server/client relationship.
-    #
     class Server
 
       $SAFE = 1 # disable `eval` and related calls on strings passed
@@ -158,15 +157,17 @@ module Vedeu
 
         end
       rescue NoMethodError # raised when #join is called on NilClass.
-        # ...
+        Vedeu.log(type: :debug, message: 'Attempted to #join on DRb.thread.')
       end
 
-      private
+      protected
 
       # @!attribute [r] configuration
       # @return [Configuration]
       attr_reader :configuration
 
+      private
+
       # @return [Boolean]
       def drb?
         Vedeu::Configuration.drb?

data/lib/vedeu/distributed/subprocess.rb

@@ -1,10 +1,7 @@
-require 'vedeu/distributed/test_application'
-
 module Vedeu
 
   # @example
   #   Vedeu::TestApplication.build
-  #
   class Subprocess
 
     # @param (see #initialize)
@@ -45,7 +42,7 @@ module Vedeu
       file_unlink
     end
 
-    private
+    protected
 
     # @!attribute [r] application
     # @return [Vedeu::TestApplication]
@@ -55,6 +52,8 @@ module Vedeu
     # @return [Fixnum]
     attr_accessor :pid
 
+    private
+
     # @return [String]
     def command
       "ruby #{file_path}"

data/lib/vedeu/distributed/test_application.rb

@@ -13,7 +13,6 @@ module Vedeu
   #     app.menus         = ''
   #     app.views         = ''
   #   end
-  #
   class TestApplication
 
     # @!attribute [rw] borders

data/lib/vedeu/distributed/uri.rb

@@ -4,7 +4,6 @@ module Vedeu
 
     # Value class which provides the host and port for the DRb server and
     # client.
-    #
     class Uri
 
       # @!attribute [r] host

data/lib/vedeu/dsl/components/border.rb

@@ -1,5 +1,5 @@
-require 'vedeu/output/border'
-require 'vedeu/dsl/shared/all'
+require 'vedeu/dsl/shared/presentation'
+require 'vedeu/dsl/shared/use'
 
 module Vedeu
 
@@ -26,7 +26,6 @@ module Vedeu
     #   # ...or standalone; referencing the target interface or view.
     #   Vedeu.border 'some_interface' do
     #     # ...
-    #
     class Border
 
       include Vedeu::DSL
@@ -303,7 +302,7 @@ module Vedeu
         model.vertical = char
       end
 
-      private
+      protected
 
       # @!attribute [r] client
       # @return [Object]

data/lib/vedeu/dsl/components/geometry.rb

@@ -1,12 +1,8 @@
-require 'vedeu/geometry/geometry'
-require 'vedeu/dsl/shared/all'
-
 module Vedeu
 
   module DSL
 
     # Provide DSL methods for configuring the geometry of an interface.
-    #
     class Geometry
 
       include Vedeu::DSL
@@ -187,7 +183,7 @@ module Vedeu
         model.yn = value
       end
 
-      private
+      protected
 
       # @!attribute [r] client
       # @return [Object]

data/lib/vedeu/dsl/components/keymap.rb

@@ -1,5 +1,4 @@
 require 'vedeu/support/common'
-require 'vedeu/input/key'
 
 module Vedeu
 
@@ -8,7 +7,6 @@ module Vedeu
     # Provides methods to be used to define keypress mapped to actions.
     #
     # @api public
-    #
     class Keymap
 
       include Vedeu::Common
@@ -123,7 +121,7 @@ module Vedeu
         model.name = value
       end
 
-      private
+      protected
 
       # @!attribute [r] client
       # @return [Object]

data/lib/vedeu/dsl/components/menu.rb

@@ -6,7 +6,6 @@ module Vedeu
     # events to drive them.
     #
     # @api public
-    #
     class Menu
 
       include Vedeu::DSL
@@ -73,7 +72,7 @@ module Vedeu
         model.name = value
       end
 
-      private
+      protected
 
       # @!attribute [r] client
       # @return [Object]

data/lib/vedeu/dsl/composition.rb

@@ -1,11 +1,8 @@
-require 'vedeu/models/interface'
-
 module Vedeu
 
   module DSL
 
     # DSL for creating collections of interfaces.
-    #
     class Composition
 
       include Vedeu::DSL
@@ -74,7 +71,7 @@ module Vedeu
         model.add(new_model)
       end
 
-      private
+      protected
 
       # @!attribute [r] client
       # @return [Object]
@@ -84,6 +81,8 @@ module Vedeu
       # @return [Composition]
       attr_reader :model
 
+      private
+
       # @param name [String]
       # @param lines [Vedeu::Lines]
       # @return [Hash]

data/lib/vedeu/dsl/group.rb

@@ -1,11 +1,8 @@
-require 'vedeu/models/group'
-
 module Vedeu
 
   module DSL
 
     # DSL for adding interfaces to a group.
-    #
     class Group
 
       include Vedeu::DSL
@@ -58,7 +55,7 @@ module Vedeu
         model.add(interface_name)
       end
 
-      private
+      protected
 
       # @!attribute [r] client
       # @return [Object]

data/lib/vedeu/dsl/interface.rb

@@ -1,17 +1,8 @@
-require 'vedeu/cursor/cursor'
-require 'vedeu/models/focus'
-require 'vedeu/geometry/geometry'
-require 'vedeu/models/group'
-require 'vedeu/models/line'
-require 'vedeu/output/border'
-require 'vedeu/support/common'
-
 module Vedeu
 
   module DSL
 
     # DSL for creating interfaces.
-    #
     class Interface
 
       include Vedeu::Common
@@ -247,7 +238,7 @@ module Vedeu
         model.visible = boolean
       end
 
-      private
+      protected
 
       # @!attribute [r] client
       # @return [Object]
@@ -257,6 +248,8 @@ module Vedeu
       # @return [Interface]
       attr_reader :model
 
+      private
+
       # @return [Hash]
       def attributes
         {

data/lib/vedeu/dsl/line.rb

@@ -1,5 +1,3 @@
-require 'vedeu/dsl/shared/all'
-
 module Vedeu
 
   module DSL
@@ -34,7 +32,6 @@ module Vedeu
     #   end
     #
     # @api public
-    #
     class Line
 
       include Vedeu::DSL
@@ -107,7 +104,7 @@ module Vedeu
       end
       alias_method :stream, :streams
 
-      private
+      protected
 
       # @!attribute [r] client
       # @return [Object]
@@ -117,6 +114,8 @@ module Vedeu
       # @return [Line]
       attr_reader :model
 
+      private
+
       # @return [Hash]
       def attributes
         {

data/lib/vedeu/dsl/shared/text.rb

@@ -1,6 +1,3 @@
-require 'vedeu/output/text'
-require 'vedeu/models/all'
-
 module Vedeu
 
   module DSL

data/lib/vedeu/dsl/stream.rb

@@ -1,5 +1,3 @@
-require 'vedeu/dsl/shared/all'
-
 module Vedeu
 
   module DSL
@@ -7,7 +5,6 @@ module Vedeu
     # Provides methods to be used to define views.
     #
     # @api public
-    #
     class Stream
 
       include Vedeu::DSL
@@ -33,7 +30,7 @@ module Vedeu
         model.add(model.class.build(attributes, &block))
       end
 
-      private
+      protected
 
       # @!attribute [r] client
       # @return [Object]
@@ -43,6 +40,8 @@ module Vedeu
       # @return [Stream]
       attr_reader :model
 
+      private
+
       # @return [Hash]
       def attributes
         {

data/lib/vedeu/dsl/view.rb

@@ -1,5 +1,3 @@
-require 'vedeu/models/composition'
-
 module Vedeu
 
   module DSL
@@ -7,7 +5,6 @@ module Vedeu
     # DSL for creating views.
     #
     # @api public
-    #
     class View
 
       class << self

data/lib/vedeu/events/event.rb

@@ -1,4 +1,3 @@
-require 'vedeu/repositories/all'
 require 'vedeu/events/trigger'
 
 module Vedeu
@@ -30,7 +29,6 @@ module Vedeu
   #       # Not all events you define will have arguments; like methods.
   #       :do_stuff
   #     end
-  #
   class Event
 
     include Vedeu::Model
@@ -150,7 +148,7 @@ module Vedeu
       return execute(*args) if throttling? && throttle_expired?
     end
 
-    private
+    protected
 
     # @!attribute [r] closure
     # @return [String]
@@ -172,6 +170,8 @@ module Vedeu
     # @return [String]
     attr_accessor :now
 
+    private
+
     # Execute the code stored in the event closure.
     #
     # @param args [void]

data/lib/vedeu/events/trigger.rb

@@ -7,7 +7,6 @@ module Vedeu
   #
   # @example
   #   Vedeu.trigger(:my_event, :oxidize, 'nitrogen')
-  #
   class Trigger
 
     # @param name [Symbol] The name of the event you wish to trigger. The event
@@ -41,7 +40,7 @@ module Vedeu
       end
     end
 
-    private
+    protected
 
     # @!attribute [r] name
     # @return [Symbol]
@@ -55,6 +54,8 @@ module Vedeu
     # @return [Vedeu::Repository]
     attr_reader :repository
 
+    private
+
     # @return [Array<void>|void]
     def results
       @results ||= registered_events.map { |event| event.trigger(*args) }

data/lib/vedeu/geometry/area.rb

@@ -1,7 +1,6 @@
 module Vedeu
 
   # Define an area from dimensions or points.
-  #
   class Area
 
     # @!attribute [r] y

data/lib/vedeu/geometry/canvas.rb

@@ -2,7 +2,6 @@ module Vedeu
 
   # The size of the terminal is a limitation. Defining a canvas means we have
   # more space to 'do stuff'.
-  #
   class Canvas
 
     include Singleton

data/lib/vedeu/geometry/coordinate.rb

@@ -1,7 +1,6 @@
 module Vedeu
 
   # Crudely corrects out of range values.
-  #
   class Coordinate
 
     # @!attribute [r] height
@@ -118,6 +117,12 @@ module Vedeu
       end
     end
 
+    protected
+
+    # @!attribute [r] name
+    # @return [String]
+    attr_reader :name
+
     private
 
     # Returns the maximum y index for an area.
@@ -194,12 +199,6 @@ module Vedeu
       (y...yn).to_a
     end
 
-    private
-
-    # @!attribute [r] name
-    # @return [String]
-    attr_reader :name
-
   end # Coordinate
 
 end # Vedeu

data/lib/vedeu/geometry/dimension.rb

@@ -1,7 +1,6 @@
 module Vedeu
 
   # A Dimension is either the height or width of an entity.
-  #
   class Dimension
 
     # @param (see #initialize)
@@ -42,7 +41,7 @@ module Vedeu
       dimension
     end
 
-    private
+    protected
 
     # @!attribute [r] d
     # @return [Fixnum|NilClass]
@@ -60,6 +59,8 @@ module Vedeu
     # @return [Fixnum|NilClass]
     attr_reader :default
 
+    private
+
     # @return [Array<Fixnum>]
     def dimension
       @dimension ||= if centred? && length?

data/lib/vedeu/geometry/geometry.rb

@@ -1,10 +1,5 @@
-require 'vedeu/dsl/components/all'
 require 'vedeu/repositories/model'
 
-require 'vedeu/geometry/area'
-require 'vedeu/geometry/dimension'
-require 'vedeu/support/terminal'
-
 module Vedeu
 
   # @todo Consider storing the Terminal size at the time of first creation,
@@ -26,7 +21,6 @@ module Vedeu
   #       |    bottom    |           # bottom: yn
   #    yn +--------------+           # south:  yn + 1
   #            south
-  #
   class Geometry
 
     extend Forwardable

data/lib/vedeu/geometry/grid.rb

@@ -23,7 +23,6 @@ module Vedeu
 
   # Divides horizontal terminal space into 12 equal columns, discarding
   # the remainder.
-  #
   class Grid
 
     # @see (#initialize)
@@ -49,12 +48,14 @@ module Vedeu
       column * value
     end
 
-    private
+    protected
 
     # @!attribute [r] value
     # @return [Fixnum]
     attr_reader :value
 
+    private
+
     # Returns the width of a single column in characters.
     #
     # @return [Fixnum]

data/lib/vedeu/geometry/index_position.rb

@@ -4,7 +4,6 @@ module Vedeu
   #
   # When the optional offset `oy` and `ox` params are given, the they are used
   # for the starting position.
-  #
   class IndexPosition
 
     # @param (see #initialize)

data/lib/vedeu/geometry/position.rb

@@ -1,7 +1,6 @@
 module Vedeu
 
   # Change coordinates into an escape sequence to set the cursor position.
-  #
   class Position
 
     # @!attribute [r] y

data/lib/vedeu/geometry/position_index.rb

@@ -1,7 +1,6 @@
 module Vedeu
 
   # Converts a position into an index for the terminal.
-  #
   class PositionIndex
 
     # Convenience constructor for Vedeu::Position.

data/lib/vedeu/geometry/position_validator.rb

@@ -1,33 +1,17 @@
-require 'vedeu/support/terminal'
-
 module Vedeu
 
   # Validates that the provided coordinates are within the terminal and
   # interface's geometry (with or without a border).
-  #
   class PositionValidator
 
     extend Forwardable
 
-    def_delegators :terminal,
-                   :tx,
-                   :ty,
-                   :txn,
-                   :tyn
-
     def_delegators :border,
-                   :enabled?,
                    :bx,
                    :bxn,
                    :by,
                    :byn
 
-    def_delegators :geometry,
-                   :left,
-                   :right,
-                   :top,
-                   :bottom
-
     # @!attribute [rw] x
     # @return [Fixnum]
     attr_accessor :x
@@ -58,73 +42,27 @@ module Vedeu
     #
     # @return [PositionValidator]
     def validate
-      terminal_validation
-      interface_validation
-      border_validation if enabled?
+      @x = bx  if x < bx
+      @x = bxn if x > bxn
+      @y = by  if y < by
+      @y = byn if y > byn
 
       self
     end
 
-    private
+    protected
 
     # @!attribute [r] name
     # @return [String]
     attr_reader :name
 
-    # @return [Vedeu::Terminal]
-    def terminal
-      Vedeu::Terminal
-    end
-
-    # Validate the x and y coordinates are within the dimensions of the
-    # terminal.
-    #
-    # @return [PositionValidator]
-    def terminal_validation
-      @x = tx  if x < tx
-      @x = txn if x > txn
-      @y = ty  if y < ty
-      @y = tyn if y > tyn
-
-      self
-    end
-
-    # Validate the x and y coordinates are within the dimensions of the
-    # interface.
-    #
-    # @return [PositionValidator]
-    def interface_validation
-      @x = left   if x < left
-      @x = right  if x > right
-      @y = top    if y < top
-      @y = bottom if y > bottom
-
-      self
-    end
-
-    # Validate the x and y coordinates are within the dimensions of an interface
-    # with a border.
-    #
-    # @return [PositionValidator]
-    def border_validation
-      @x = bx  if x < bx
-      @x = bxn if x > bxn
-      @y = by  if y < by
-      @y = byn if y > byn
-
-      self
-    end
+    private
 
     # @return (see Vedeu::Borders#by_name)
     def border
       @border ||= Vedeu.borders.by_name(name)
     end
 
-    # @return (see Vedeu::Geometries#by_name)
-    def geometry
-      @geometry ||= Vedeu.geometries.by_name(name)
-    end
-
   end # PositionValidator
 
 end # Vedeu

data/lib/vedeu/input/all.rb

@@ -1,5 +1,3 @@
-require 'vedeu/repositories/all'
-
 require_relative 'mapper'
 require_relative 'key'
 require_relative 'input'

data/lib/vedeu/input/input.rb

@@ -2,7 +2,6 @@ module Vedeu
 
   # Captures input from the user via {Vedeu::Terminal#input} and translates
   # special characters into symbols.
-  #
   class Input
 
     # Instantiate Input and capture keypress(es).
@@ -36,12 +35,14 @@ module Vedeu
       end
     end
 
-    private
+    protected
 
     # @!attribute [r] reader
     # @return [IO]
     attr_reader :reader
 
+    private
+
     # Returns the input from the terminal.
     #
     # @return [String]

data/lib/vedeu/input/key.rb

@@ -1,7 +1,6 @@
 module Vedeu
 
   # A single keypress or combination of keypresses bound to a specific action.
-  #
   class Key
 
     # @!attribute [r] input