vedeu 0.4.46 → 0.4.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea321b7c3e36486983857a9d6ceeeecb333a17fd
-  data.tar.gz: 5e52ca03e9336ced28a58cc062d680f2dab4b0fc
+  metadata.gz: 32f9ff175fb990493d886e0e0b121b50d45e8829
+  data.tar.gz: 78f1802b9c3c208a08947d4ea91a6c393f17214f
 SHA512:
-  metadata.gz: f1097844c65d4242aa77ac45844005483b2a9f425a2e0a7469371c89126882a386c8cf708b96c42a8046762366249530aedbb19a7056132c0129f6ef824be583
-  data.tar.gz: 83dc5668eacf4c40b1384345ba34ef0ac2845be750be21d94b7480666239eeda748e619e767139d967e1506ec425f34b8e7a0840d3e52e07b330539a9b5cca05
+  metadata.gz: 883b22230cf46167bb986ee49549dfe151ab43108f9d1bdd71fc77a2cc9de0fa9d819b9f6365dd059c443ab09ca3da01a43c01b6c5d21599e399f92073dd342f
+  data.tar.gz: aefa345c4db2d5123ce8c54569f301a3e812cf3b3109ece81d47d86dcb857baf761450fe49a5ad7cd3a3561f4ed74e600a9be5ea61f4a640ba0ca8f5951574c0

data/lib/vedeu/api.rb

@@ -8,7 +8,7 @@ require 'vedeu/models/all'
 require 'vedeu/input/all'
 require 'vedeu/dsl/all'
 require 'vedeu/application'
-require 'vedeu/output/clear'
+require 'vedeu/output/clear/all'
 
 module Vedeu
 
@@ -239,11 +239,11 @@ module Vedeu
 
     # @!method clear_by_name
     #   @see Vedeu::Clear.by_name
-    def_delegators Vedeu::Clear, :clear_by_name
+    def_delegators Vedeu::Clear::NamedInterface, :clear_by_name
 
     # @!method clear_by_group
     #   @see Vedeu::Clear.by_group
-    def_delegators Vedeu::Clear, :clear_by_group
+    def_delegators Vedeu::Clear::NamedGroup, :clear_by_group
 
     # @!method hide_cursor
     #   @see Vedeu::Visibility.hide_cursor

data/lib/vedeu/bindings/bindings.rb

@@ -15,6 +15,7 @@ module Vedeu
   #
   # @api public
   # {include:file:docs/events/main.md}
+  # :nocov:
   module Bindings
 
     include Vedeu::Bindings::DRB
@@ -30,6 +31,16 @@ module Vedeu
       Vedeu.trigger(:cleanup)
     end
 
+    Vedeu.bind(:_clear_) do |name|
+      if name
+        Vedeu::Clear::NamedInterface.render(name)
+
+      else
+        Vedeu::Terminal.clear
+
+      end
+    end
+    Vedeu.bind(:_clear_group_) { |name| Vedeu::Clear::NamedGroup.render(name) }
 
     Vedeu.bind(:_exit_) { Vedeu::Application.stop }
 
@@ -43,6 +54,8 @@ module Vedeu
     Vedeu.bind(:_command_) { |command| Vedeu.trigger(:command, command) }
     Vedeu.bind(:_log_) { |msg| Vedeu.log(type: :debug, message: msg) }
 
+    Vedeu.bind(:_maximise_) { |name| Vedeu.geometries.by_name(name).maximise }
+
     # When triggered (after the user presses `escape`), Vedeu switches from a
     # "raw mode" terminal to a "cooked mode" terminal. The idea here being that
     # the raw mode is for single keypress actions, whilst cooked mode allows the
@@ -56,21 +69,18 @@ module Vedeu
     Vedeu.bind(:_focus_by_name_) { |name| Vedeu.focus_by_name(name) }
     Vedeu.bind(:_focus_next_) { Vedeu.focus_next }
     Vedeu.bind(:_focus_prev_) { Vedeu.focus_previous }
-    Vedeu.bind(:_clear_) { |name| Vedeu::Clear.by_name(name) }
 
     Vedeu.bind(:_refresh_) do |name|
       name ? Vedeu::Refresh.by_name(name) : Vedeu::Refresh.all
     end
-
     Vedeu.bind(:_refresh_cursor_) { |name| Vedeu::RefreshCursor.render(name) }
     Vedeu.bind(:_refresh_group_) { |name| Vedeu::Refresh.by_group(name) }
-    Vedeu.bind(:_clear_group_) { |name| Vedeu::Clear.by_group(name) }
-    Vedeu.bind(:_maximise_) { |name| Vedeu.geometries.by_name(name).maximise }
 
     Vedeu.bind(:_unmaximise_) do |name|
       Vedeu.geometries.by_name(name).unmaximise
     end
 
   end # Bindings
+  # :nocov:
 
 end # Vedeu

data/lib/vedeu/bindings/drb.rb

@@ -6,6 +6,7 @@ module Vedeu
     #
     # @api public
     # {include:file:docs/events/drb.md}
+    # :nocov:
     module DRB
 
       Vedeu.bind(:_drb_input_) do |data, type|
@@ -30,6 +31,7 @@ module Vedeu
       Vedeu.bind(:_drb_stop_) { Vedeu::Distributed::Server.stop }
 
     end # DRB
+    # :nocov:
 
   end # Bindings
 

data/lib/vedeu/bindings/menus.rb

@@ -7,6 +7,7 @@ module Vedeu
     #
     # @api public
     # {include:file:docs/events/menus.md}
+    # :nocov:
     module Menus
 
       Vedeu.bind(:_menu_bottom_) { |name| Vedeu.menus.find(name).bottom_item }
@@ -29,6 +30,7 @@ module Vedeu
       Vedeu.bind(:_menu_view_) { |name| Vedeu.menus.find(name).view }
 
     end # Menus
+    # :nocov:
 
   end # Bindings
 

data/lib/vedeu/bindings/movement.rb

@@ -6,6 +6,7 @@ module Vedeu
     #
     # @api public
     # {include:file:docs/events/movement.md}
+    # :nocov:
     module Movement
 
       Vedeu.bind(:_cursor_down_) do |name|
@@ -58,6 +59,7 @@ module Vedeu
       end
 
     end # Movement
+    # :nocov:
 
   end # Bindings
 

data/lib/vedeu/bindings/visibility.rb

@@ -6,6 +6,7 @@ module Vedeu
     #
     # @api public
     # {include:file:docs/events/visibility.md}
+    # :nocov:
     module Visibility
 
       Vedeu.bind(:_hide_cursor_) { |name| Vedeu::Visibility.hide_cursor(name) }
@@ -26,6 +27,7 @@ module Vedeu
       end
 
     end # Visibility
+    # :nocov:
 
   end # Bindings
 

data/lib/vedeu/buffers/buffer.rb

@@ -214,7 +214,7 @@ module Vedeu
     #
     # @return [void]
     def clear_buffer
-      @clear_buffer ||= Vedeu::Clear.new(view).clear
+      @clear_buffer ||= Vedeu::Clear::NamedInterface.render(name)
     end
 
     # Returns the default options/attributes for this class.

data/lib/vedeu/cursor/cursor.rb

@@ -63,7 +63,7 @@ module Vedeu
 
       @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
 
-      @position   = Vedeu::Position.new(@y, @x)
+      @position   = Vedeu::Position[@y, @x]
     end
 
     # Override Ruby's Object#inspect method to provide a more helpful output.
@@ -103,7 +103,7 @@ module Vedeu
     #
     # @return [Vedeu::Position]
     def position
-      @position ||= Vedeu::Position.new(y, x)
+      @position ||= Vedeu::Position[y, x]
     end
 
     # @return [Vedeu::EscapeChar]

data/lib/vedeu/geometry/dimension.rb

@@ -21,11 +21,9 @@ module Vedeu
     # @option attributes options [Hash]
     # @return [Vedeu::Dimension]
     def initialize(attributes = {})
-      @d       = attributes[:d]
-      @dn      = attributes[:dn]
-      @d_dn    = attributes[:d_dn]
-      @default = attributes[:default]
-      @options = attributes.fetch(:options, {})
+      @attributes = defaults.merge!(attributes)
+
+      @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
     # @return [Fixnum]
@@ -61,6 +59,10 @@ module Vedeu
     # @return [Fixnum|NilClass]
     attr_reader :default
 
+    # @!attribute [r] options
+    # @return [Hash<Symbol => Boolean]
+    attr_reader :options
+
     private
 
     # @return [Array<Fixnum>]
@@ -138,18 +140,19 @@ module Vedeu
       options[:maximised]
     end
 
-    # @return [Hash<Symbol => Boolean>]
-    def options
-      defaults.merge!(@options)
-    end
-
     # Returns the default options/attributes for this class.
     #
-    # @return [Hash<Symbol => Boolean>]
+    # @return [Hash<Symbol => NilClass,Boolean>]
     def defaults
       {
-        centred:   false,
-        maximised: false,
+        d:       nil,
+        dn:      nil,
+        d_dn:    nil,
+        default: nil,
+        options: {
+          centred:   false,
+          maximised: false,
+        },
       }
     end
 

data/lib/vedeu/geometry/geometry.rb

@@ -115,6 +115,8 @@ module Vedeu
     def maximise
       return self if maximised?
 
+      Vedeu.trigger(:_clear_)
+
       @maximised = true
 
       work = store
@@ -136,7 +138,7 @@ module Vedeu
     def unmaximise
       return self unless maximised?
 
-      Vedeu.trigger(:_clear_, name)
+      Vedeu.trigger(:_clear_)
 
       @maximised = false
 

data/lib/vedeu/geometry/index_position.rb

@@ -30,7 +30,7 @@ module Vedeu
 
     # @return [Vedeu::Position]
     def []
-      Vedeu::Position.new(y, x)
+      Vedeu::Position[y, x]
     end
     alias_method :to_position, :[]
 

data/lib/vedeu/geometry/position_index.rb

@@ -43,7 +43,7 @@ module Vedeu
     #
     # @return [Vedeu::Position]
     def to_position
-      Vedeu::Position.new(y, x)
+      Vedeu::Position[y, x]
     end
 
     # Returns the x index.

data/lib/vedeu/input/input.rb

@@ -70,6 +70,7 @@ module Vedeu
     def specials
       {
         "\r"      => :enter,
+        "\n"      => :enter,
         "\t"      => :tab,
         "\e"      => :escape,
         "\e[A"    => :up,
@@ -95,7 +96,7 @@ module Vedeu
         "\u0007"  => :ctrl_g,
         "\u0008"  => :ctrl_h,
         # "\u0009"  => :ctrl_i, # duplicates tab
-        "\u0010"  => :ctrl_j,
+        "\u0010"  => :ctrl_j, # produces "\n"
         "\u0011"  => :ctrl_k,
         "\u0012"  => :ctrl_l,
         "\u0013"  => :ctrl_m,

data/lib/vedeu/input/keymap.rb

@@ -1,3 +1,4 @@
+require 'vedeu/input/key'
 require 'vedeu/dsl/keymap'
 
 module Vedeu

data/lib/vedeu/models/char.rb

@@ -29,6 +29,10 @@ module Vedeu
     # @return [Hash]
     attr_reader :attributes
 
+    # @!attribute [r] position
+    # @return [Vedeu::Position]
+    attr_reader :position
+
     # @!attribute [w] value
     # @return [String]
     attr_writer :value
@@ -50,6 +54,7 @@ module Vedeu
       @border   = @attributes[:border]
       @parent   = @attributes[:parent]
       @value    = @attributes[:value]
+      @position = Vedeu::Position.coerce(@attributes[:position])
     end
 
     # When {Vedeu::Viewport#padded_lines} has less lines that required to fill
@@ -68,7 +73,8 @@ module Vedeu
     # @param other [Vedeu::Char]
     # @return [Boolean]
     def eql?(other)
-      self.class == other.class && value == other.value
+      self.class == other.class && value == other.value &&
+        position == other.position
     end
     alias_method :==, :eql?
 
@@ -79,11 +85,6 @@ module Vedeu
       "<Vedeu::Char '#{Vedeu::Esc.escape(to_s)}'>"
     end
 
-    # @return [Vedeu::Position]
-    def position
-      @position ||= Vedeu::Position.coerce(@attributes[:position])
-    end
-
     # Sets the position of the Char.
     #
     # @param value [Vedeu::Position]

data/lib/vedeu/models/interface.rb

@@ -12,8 +12,6 @@ module Vedeu
   # @api private
   class Interface
 
-    extend Forwardable
-
     include Vedeu::Model
     include Vedeu::Presentation
     include Vedeu::DisplayBuffer
@@ -76,15 +74,7 @@ module Vedeu
     def initialize(attributes = {})
       @attributes = defaults.merge!(attributes)
 
-      @client     = @attributes[:client]
-      @delay      = @attributes[:delay]
-      @group      = @attributes[:group]
-      @lines      = @attributes[:lines]
-      @name       = @attributes[:name]
-      @parent     = @attributes[:parent]
-      @repository = @attributes[:repository]
-      @visible    = @attributes[:visible]
-      @zindex     = @attributes[:zindex]
+      @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
     # @param child [Vedeu::Line]
@@ -121,7 +111,7 @@ module Vedeu
       Vedeu.trigger(:_cursor_hide_, name)
 
       output = [
-        Vedeu::Clear.new(self).render,
+        Vedeu::Clear::NamedInterface.render(name),
         Vedeu.borders.by_name(name).render,
         Vedeu::Viewport.render(self),
       ]

data/lib/vedeu/models/line.rb

@@ -31,8 +31,8 @@ module Vedeu
     # @return [Vedeu::Line]
     def initialize(attributes = {})
       @attributes = defaults.merge!(attributes)
-      @parent     = @attributes[:parent]
-      @streams    = @attributes[:streams]
+
+      @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
     # @param child []

data/lib/vedeu/models/stream.rb

@@ -38,8 +38,8 @@ module Vedeu
     # @return [Vedeu::Stream]
     def initialize(attributes = {})
       @attributes = defaults.merge!(attributes)
-      @parent     = @attributes[:parent]
-      @value      = @attributes[:value]
+
+      @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
     # @param child [Vedeu::Stream]

data/lib/vedeu/null/geometry.rb

@@ -48,20 +48,17 @@ module Vedeu
       end
 
       # @return [FalseClass]
-      def maximise
+      def maximised?
         false
       end
+      alias_method :maximise, :maximised?
+      alias_method :unmaximise, :maximised?
 
       # @return [Vedeu::Null::Geometry]
       def store
         self
       end
 
-      # @return [FalseClass]
-      def unmaximise
-        false
-      end
-
       private
 
       # @return [Vedeu::Area]

data/lib/vedeu/output/all.rb

@@ -6,7 +6,7 @@ require_relative 'presentation'
 require_relative 'border'
 require_relative 'colour'
 require_relative 'compressor'
-require_relative 'clear'
+require_relative 'clear/all'
 require_relative 'style'
 require_relative 'text'
 require_relative 'virtual_buffer'

data/lib/vedeu/output/border.rb

@@ -122,22 +122,22 @@ module Vedeu
 
     # @return [Fixnum]
     def bx
-      @bx ||= (enabled? && left?) ? x + 1 : x
+      (enabled? && left?) ? x + 1 : x
     end
 
     # @return [Fixnum]
     def bxn
-      @bxn ||= (enabled? && right?) ? xn - 1 : xn
+      (enabled? && right?) ? xn - 1 : xn
     end
 
     # @return [Fixnum]
     def by
-      @by ||= (enabled? && top?) ? y + 1 : y
+      (enabled? && top?) ? y + 1 : y
     end
 
     # @return [Fixnum]
     def byn
-      @byn ||= (enabled? && bottom?) ? yn - 1 : yn
+      (enabled? && bottom?) ? yn - 1 : yn
     end
 
     # Returns the width of the interface determined by whether a left, right,
@@ -158,7 +158,7 @@ module Vedeu
 
     # @return [Array<Array<Vedeu::Char>>]
     def render
-      @render ||= Vedeu::RenderBorder.with(self)
+      Vedeu::RenderBorder.with(self)
     end
 
     # @return [String]