vedeu 0.4.46 → 0.4.47

data/lib/vedeu/output/clear/all.rb

@@ -0,0 +1,2 @@
+require_relative 'named_group'
+require_relative 'named_interface'

data/lib/vedeu/output/clear/named_group.rb

@@ -0,0 +1,52 @@
+module Vedeu
+
+  module Clear
+
+    # Clear the named group.
+    #
+    # @api private
+    class NamedGroup
+
+      class << self
+
+        # @param name [String]
+        # @return [void]
+        def render(name)
+          new(name).render
+        end
+        alias_method :clear_by_group, :render
+        alias_method :by_group, :render
+
+      end # Eigenclass
+
+      # Return a new instance of Vedeu::Clear::NamedGroup.
+      #
+      # @param name [String]
+      # @return [Vedeu::Clear::NamedGroup]
+      def initialize(name)
+        @name = name
+      end
+
+      # @return [void]
+      def render
+        members.each { |name| Vedeu::Clear::NamedInterface.render(name) }
+      end
+
+      protected
+
+      # @!attribute [r] name
+      # @return [String]
+      attr_reader :name
+
+      private
+
+      # @return [Array<String>]
+      def members
+        Vedeu.groups.by_name(name).members
+      end
+
+    end # Group
+
+  end # Clear
+
+end # Vedeu

data/lib/vedeu/output/clear/named_interface.rb

@@ -0,0 +1,99 @@
+module Vedeu
+
+  module Clear
+
+    # Clear the named interface.
+    #
+    # @api private
+    class NamedInterface
+
+      class << self
+
+        # @return [void]
+        # @see #initialize
+        def render(name)
+          new(name).render
+        end
+        alias_method :clear_by_name, :render
+        alias_method :by_name, :render
+
+      end # Eigenclass
+
+      # Return a new instance of Vedeu::Clear::NamedInterface.
+      #
+      # @param name [String] The name of the interface to clear.
+      # @return [Vedeu::Clear::NamedInterface]
+      def initialize(name)
+        @name = name
+      end
+
+      # @return [void]
+      def render
+        return [] unless interface.visible?
+
+        output
+      end
+
+      protected
+
+      # @!attribute [r] name
+      # @return [String]
+      attr_reader :name
+
+      private
+
+      # @see Vedeu::Geometries#by_name
+      def geometry
+        @geometry ||= Vedeu.geometries.by_name(name)
+      end
+
+      # @see Vedeu::Interfaces#by_name
+      def interface
+        @interface ||= Vedeu.interfaces.by_name(name)
+      end
+
+      # For each visible line of the interface, set the foreground and
+      # background colours to those specified when the interface was defined,
+      # then starting write space characters over the area which the interface
+      # occupies.
+      #
+      # @return [Array<Array<Vedeu::Char>>]
+      def output
+        Vedeu.timer("Clearing: #{name}") do
+          @clear ||= Array.new(height) do |iy|
+            Array.new(width) do |ix|
+              Vedeu::Char.new(value:    ' ',
+                              colour:   colour,
+                              position: Vedeu::Position[y + iy, x + ix])
+            end
+          end
+        end
+      end
+
+      def colour
+        @colour ||= interface.colour
+      end
+
+      def height
+        @height ||= geometry.height
+      end
+
+      def width
+        @width ||= geometry.width
+      end
+
+      # @return [Fixnum]
+      def x
+        @x ||= geometry.x
+      end
+
+      # @return [Fixnum]
+      def y
+        @y ||= geometry.y
+      end
+
+    end # NamedInterface
+
+  end # Clear
+
+end # Vedeu

data/lib/vedeu/output/esc.rb

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

data/lib/vedeu/output/viewport.rb

@@ -18,8 +18,6 @@ module Vedeu
                    :visible?
 
     def_delegators :border,
-                   :bx,
-                   :by,
                    :height,
                    :width
 
@@ -158,6 +156,16 @@ module Vedeu
       @border ||= Vedeu.borders.by_name(name)
     end
 
+    # @return [Fixnum]
+    def bx
+      @bx ||= border.bx
+    end
+
+    # @return [Fixnum]
+    def by
+      @by ||= border.by
+    end
+
     # Fetch the cursor associated with the interface we are drawing.
     #
     # @return (see Vedeu::Cursors#by_name)

data/lib/vedeu/repositories/registerable.rb

@@ -22,7 +22,7 @@ module Vedeu
       # @param klass [Class]
       # @return [Symbol]
       def real(klass)
-        define_method(:real_model) { klass }
+        define_method(:model) { instance_variable_set('@model', klass) }
       end
 
       # Register a repository for storing models.
@@ -48,6 +48,14 @@ module Vedeu
         @models ||= reset!
       end
 
+      # Remove all stored models from the repository.
+      #
+      # @return [void]
+      def reset!
+        @models = register
+      end
+      alias_method :reset, :reset!
+
     end # ClassMethods
 
     # When this module is included in a class, provide ClassMethods as class

data/lib/vedeu/repositories/repositories/borders.rb

@@ -13,17 +13,6 @@ module Vedeu
 
       alias_method :borders, :repository
 
-      # Remove all stored models from the repository.
-      #
-      # @example
-      #   Vedeu.borders.reset!
-      #
-      # @return [Vedeu::Borders]
-      def reset!
-        @borders = register(Vedeu::Border)
-      end
-      alias_method :reset, :reset!
-
     end # Eigenclass
 
     null Vedeu::Null::Border

data/lib/vedeu/repositories/repositories/buffers.rb

@@ -12,17 +12,6 @@ module Vedeu
 
       alias_method :buffers, :repository
 
-      # Remove all stored models from the repository.
-      #
-      # @example
-      #   Vedeu.buffers.reset!
-      #
-      # @return [Vedeu::Buffers]
-      def reset!
-        @buffers = register(Vedeu::Buffer)
-      end
-      alias_method :reset, :reset!
-
     end # Eigenclass
 
     null Vedeu::Null::Buffer

data/lib/vedeu/repositories/repositories/cursors.rb

@@ -1,3 +1,5 @@
+require 'vedeu/cursor/cursor'
+
 module Vedeu
 
   # Allows the storing of each interface's cursor.
@@ -15,19 +17,10 @@ module Vedeu
         cursors.by_name(Vedeu.focus) if Vedeu.focus
       end
 
-      # Remove all stored models from the repository.
-      #
-      # @example
-      #   Vedeu.cursors.reset!
-      #
-      # @return [Vedeu::Cursors]
-      def reset!
-        @cursors = register(Vedeu::Cursor)
-      end
-      alias_method :reset, :reset!
-
     end # Eigenclass
 
+    real Vedeu::Cursor
+
     # @example
     #   Vedeu.cursors.by_name('some_name')
     #

data/lib/vedeu/repositories/repositories/geometries.rb

@@ -13,17 +13,6 @@ module Vedeu
 
       alias_method :geometries, :repository
 
-      # Remove all stored models from the repository.
-      #
-      # @example
-      #   Vedeu.geometries.reset!
-      #
-      # @return [Vedeu::Geometries]
-      def reset!
-        @geometries = register(Vedeu::Geometry)
-      end
-      alias_method :reset, :reset!
-
     end # Eigenclass
 
     null Vedeu::Null::Geometry

data/lib/vedeu/repositories/repositories/groups.rb

@@ -1,3 +1,5 @@
+require 'vedeu/models/group'
+
 module Vedeu
 
   # Allows the storing of view groups.
@@ -9,19 +11,10 @@ module Vedeu
 
       alias_method :groups, :repository
 
-      # Remove all stored models from the repository.
-      #
-      # @example
-      #   Vedeu.groups.reset!
-      #
-      # @return [Vedeu::Groups]
-      def reset!
-        @groups = register(Vedeu::Group)
-      end
-      alias_method :reset, :reset!
-
     end # Eigenclass
 
+    real Vedeu::Group
+
     # @example
     #   Vedeu.groups.by_name('name')
     #

data/lib/vedeu/repositories/repositories/interfaces.rb

@@ -12,17 +12,6 @@ module Vedeu
 
       alias_method :interfaces, :repository
 
-      # Remove all stored models from the repository.
-      #
-      # @example
-      #   Vedeu.interfaces.reset!
-      #
-      # @return [Vedeu::Interfaces]
-      def reset!
-        @interfaces = register(Vedeu::Interface)
-      end
-      alias_method :reset, :reset!
-
     end # Eigenclass
 
     null Vedeu::Null::Interface

data/lib/vedeu/repositories/repositories/keymaps.rb

@@ -1,3 +1,5 @@
+require 'vedeu/input/keymap'
+
 module Vedeu
 
   # Allows the storing of keymaps.
@@ -9,19 +11,10 @@ module Vedeu
 
       alias_method :keymaps, :repository
 
-      # Remove all stored models from the repository.
-      #
-      # @example
-      #   Vedeu.keymaps.reset!
-      #
-      # @return [Vedeu::Keymaps]
-      def reset!
-        @keymaps = register(Vedeu::Keymap)
-      end
-      alias_method :reset, :reset!
-
     end # Eigenclass
 
+    real Vedeu::Keymap
+
   end # Keymaps
 
 end # Vedeu

data/lib/vedeu/repositories/repositories/menus.rb

@@ -1,3 +1,5 @@
+require 'vedeu/models/menu'
+
 module Vedeu
 
   # Allows the storing of menus by name.
@@ -9,19 +11,10 @@ module Vedeu
 
       alias_method :menus, :repository
 
-      # Remove all stored models from the repository.
-      #
-      # @example
-      #   Vedeu.menus.reset!
-      #
-      # @return [Vedeu::Menus]
-      def reset!
-        @menus = register(Vedeu::Menu)
-      end
-      alias_method :reset, :reset!
-
     end # Eigenclass
 
+    real Vedeu::Menu
+
   end # Menus
 
 end # Vedeu

data/lib/vedeu/repositories/repository.rb

@@ -112,17 +112,6 @@ module Vedeu
       "<#{self.class.name}: #{registered.inspect}>"
     end
 
-    # Returns a collection of the names of all the registered entities.
-    #
-    # @return [Array]
-    def registered
-      return []           if empty?
-      return storage.keys if storage.is_a?(Hash)
-      return storage.to_a if storage.is_a?(Set)
-
-      storage
-    end
-
     # Returns a boolean indicating whether the named model is registered.
     #
     # @param name [String]
@@ -169,6 +158,7 @@ module Vedeu
       storage[model.name] = model
     end
     alias_method :register, :store
+    alias_method :add, :store
 
     private
 

data/lib/vedeu/storage/store.rb

@@ -31,13 +31,28 @@ module Vedeu
     end
     alias_method :registered?, :exists?
 
+    # Returns a collection of the names of all the registered entities.
+    #
+    # @return [Array]
+    def registered
+      return []           if empty?
+      return storage.keys if storage.is_a?(Hash)
+      return storage.to_a if storage.is_a?(Set)
+
+      storage
+    end
+
     # Remove all currently stored data.
     #
     # @return [Array|Hash|Set]
     def reset
+      Vedeu.log(type:    :reset,
+                message: "(#{self.class.name}) #{registered.inspect}")
+
       @storage = in_memory
     end
     alias_method :reset!, :reset
+    alias_method :clear, :reset
 
     # Return the number of entries stored.
     #