vedeu 0.4.1 → 0.4.2

data/lib/vedeu/input/keymap.rb

@@ -22,7 +22,7 @@ module Vedeu
     # @option attributes repository [Vedeu::Repository] This model's storage.
     # @return [Vedeu::Keymap]
     def initialize(attributes = {})
-      @attributes = defaults.merge(attributes)
+      @attributes = defaults.merge!(attributes)
 
       @name       = @attributes[:name]
       @keys       = @attributes[:keys]

data/lib/vedeu/models/focus.rb

@@ -128,7 +128,7 @@ module Vedeu
     #
     # @return [Array|Hash|Set]
     def reset
-      @_storage = in_memory
+      @storage = in_memory
     end
 
     private
@@ -151,7 +151,7 @@ module Vedeu
     #
     # @return [Array]
     def storage
-      @_storage ||= in_memory
+      @storage ||= in_memory
     end
 
     # Returns an empty collection ready for the storing of interface names.

data/lib/vedeu/models/geometry.rb

@@ -1,6 +1,8 @@
 require 'vedeu/dsl/components/geometry'
 require 'vedeu/models/model'
-require 'vedeu/support/esc'
+
+require 'vedeu/geometry/limit'
+require 'vedeu/geometry/position'
 require 'vedeu/support/terminal'
 
 module Vedeu
@@ -48,7 +50,7 @@ module Vedeu
     # @option attributes yn [Fixnum]
     # @return [Geometry]
     def initialize(attributes = {})
-      @attributes = defaults.merge(attributes)
+      @attributes = defaults.merge!(attributes)
 
       @centred = @attributes[:centred]
       @height  = @attributes[:height]
@@ -61,21 +63,6 @@ module Vedeu
       @repository = Vedeu.geometries
     end
 
-    # Returns log friendly output.
-    #
-    # @note
-    #   The attribute format is (specified/calculated).
-    #
-    # @return [String]
-    def inspect
-      "<#{self.class.name} (height:(#{@height}/#{height}) " \
-                           "width:(#{@width}/#{width}) " \
-                           "top:#{top} " \
-                           "bottom:#{bottom} " \
-                           "left:#{left} " \
-                           "right:#{right})>"
-    end
-
     # Returns the row/line start position for the interface.
     #
     # @return [Fixnum]
@@ -147,16 +134,6 @@ module Vedeu
       Vedeu::Limit.apply(y, @height, Terminal.height, Terminal.origin)
     end
 
-    # Returns the position of the cursor at the top-left coordinate, relative to
-    # the interface's position.
-    #
-    # @param y_index [Fixnum]
-    # @param x_index [Fixnum]
-    # @return [Vedeu::Position]
-    def origin(y_index = 0, x_index = 0)
-      Vedeu::Position.new(virtual_y[y_index], virtual_x[x_index])
-    end
-
     # Returns the top coordinate of the interface, a fixed or dynamic value
     # depending on whether the interface is centred or not.
     #
@@ -263,30 +240,6 @@ module Vedeu
 
     private
 
-    # Provides a virtual y position within the interface's dimensions.
-    #
-    # @example
-    #   # top = 3
-    #   # bottom = 6
-    #   # virtual_y # => [3, 4, 5]
-    #
-    # @return [Array]
-    def virtual_y
-      (top...bottom).to_a
-    end
-
-    # Provides a virtual x position within the interface's dimensions.
-    #
-    # @example
-    #   # left = 9
-    #   # right = 13
-    #   # virtual_x # => [9, 10, 11, 12]
-    #
-    # @return [Array]
-    def virtual_x
-      (left...right).to_a
-    end
-
     # The default values for a new instance of this class.
     #
     # @return [Hash]

data/lib/vedeu/models/menu.rb

@@ -64,7 +64,7 @@ module Vedeu
     # @option attributes selected [Fixnum|NilClass]
     # @return [Menu]
     def initialize(attributes = {})
-      @attributes = defaults.merge(attributes)
+      @attributes = defaults.merge!(attributes)
       @collection = @attributes[:collection]
       @current    = @attributes[:current]
       @name       = @attributes[:name]

data/lib/vedeu/models/model.rb

@@ -22,7 +22,7 @@ module Vedeu
       # @param block [Proc] The block passed to the build method.
       # @return [Object] An instance of the model.
       def build(attributes = {}, &block)
-        attributes = defaults.merge(attributes)
+        attributes = defaults.merge!(attributes)
 
         model = new(attributes)
         model.deputy(attributes[:client]).instance_eval(&block) if block_given?

data/lib/vedeu/models/view/char.rb

@@ -30,23 +30,16 @@ module Vedeu
     # @option attributes border   [Boolean]
     # @return [Char]
     def initialize(attributes = {})
-      @attributes = defaults.merge(attributes)
+      @attributes = defaults.merge!(attributes)
 
       @border   = @attributes[:border]
-      @colour   = Vedeu::Colour.coerce(@attributes[:colour])
+      @colour   = @attributes[:colour]
       @parent   = @attributes[:parent]
       @position = Vedeu::Position.coerce(@attributes[:position])
       @style    = @attributes[:style]
       @value    = @attributes[:value]
     end
 
-    # Returns log friendly output.
-    #
-    # @return [String]
-    def inspect
-      "<#{self.class.name} (value:'#{@value}')>"
-    end
-
     # @param other []
     # @return [Boolean]
     def ==(other)

data/lib/vedeu/models/view/composition.rb

@@ -31,10 +31,10 @@ module Vedeu
     # @option attributes style []
     # @return [Composition]
     def initialize(attributes = {})
-      @attributes = defaults.merge(attributes)
+      @attributes = defaults.merge!(attributes)
       @interfaces = @attributes[:interfaces]
-      @colour     = Colour.coerce(@attributes[:colour])
-      @style      = Style.coerce(@attributes[:style])
+      @colour     = @attributes[:colour]
+      @style      = @attributes[:style]
     end
 
     # @param child [Vedeu::Interface]
@@ -43,13 +43,6 @@ module Vedeu
       @interfaces = interfaces.add(child)
     end
 
-    # Returns log friendly output.
-    #
-    # @return [String]
-    def inspect
-      "<#{self.class.name} (interfaces:#{interfaces.size})>"
-    end
-
     # @return [Vedeu::Interfaces]
     def interfaces
       collection.coerce(@interfaces, self)

data/lib/vedeu/models/view/interface.rb

@@ -1,4 +1,4 @@
-require 'vedeu/support/content_geometry'
+require 'vedeu/geometry/content_geometry'
 require 'vedeu/models/model'
 require 'vedeu/output/presentation'
 require 'vedeu/buffers/display_buffer'
@@ -44,8 +44,7 @@ module Vedeu
       :bottom,
       :left,
       :width,
-      :height,
-      :origin
+      :height
 
     # Return a new instance of Interface.
     #
@@ -59,16 +58,16 @@ module Vedeu
     # @option attributes style [Vedeu::Style]
     # @return [Vedeu::Interface]
     def initialize(attributes = {})
-      @attributes = defaults.merge(attributes)
+      @attributes = defaults.merge!(attributes)
 
-      @colour     = Colour.coerce(@attributes[:colour])
+      @colour     = @attributes[:colour]
       @delay      = @attributes[:delay]
       @group      = @attributes[:group]
       @lines      = @attributes[:lines]
       @name       = @attributes[:name]
       @parent     = @attributes[:parent]
       @repository = Vedeu.interfaces
-      @style      = Style.coerce(@attributes[:style])
+      @style      = @attributes[:style]
     end
 
     # @param child []
@@ -121,13 +120,6 @@ module Vedeu
       Vedeu.geometries.find(name)
     end
 
-    # Returns log friendly output.
-    #
-    # @return [String]
-    def inspect
-      "<#{self.class.name} (lines:#{lines.size})>"
-    end
-
     # @return [Vedeu::Lines]
     def lines
       collection.coerce(@lines, self)

data/lib/vedeu/models/view/line.rb

@@ -31,11 +31,11 @@ module Vedeu
     # @option attributes style [Vedeu::Style]
     # @return [Line]
     def initialize(attributes = {})
-      @attributes = defaults.merge(attributes)
-      @colour     = Colour.coerce(@attributes[:colour])
+      @attributes = defaults.merge!(attributes)
+      @colour     = @attributes[:colour]
       @parent     = @attributes[:parent]
       @streams    = @attributes[:streams]
-      @style      = Style.coerce(@attributes[:style])
+      @style      = @attributes[:style]
     end
 
     # @param child []
@@ -61,13 +61,6 @@ module Vedeu
       streams.empty?
     end
 
-    # Returns log friendly output.
-    #
-    # @return [String]
-    def inspect
-      "<#{self.class.name} (streams:#{streams.size})>"
-    end
-
     # Returns the size of the content in characters without formatting.
     #
     # @return [Fixnum]

data/lib/vedeu/models/view/stream.rb

@@ -34,10 +34,10 @@ module Vedeu
     # @option attributes client [Object]
     # @return [Vedeu::Stream]
     def initialize(attributes = {})
-      @attributes = defaults.merge(attributes)
-      @colour     = Colour.coerce(@attributes[:colour])
+      @attributes = defaults.merge!(attributes)
+      @colour     = @attributes[:colour]
       @parent     = @attributes[:parent]
-      @style      = Style.coerce(@attributes[:style])
+      @style      = @attributes[:style]
       @value      = @attributes[:value]
     end
 
@@ -57,7 +57,11 @@ module Vedeu
       return [] if value.empty?
 
       value.chars.map do |char|
-        member.new({ value: char, parent: parent, colour: colour, style: style, position: nil }).to_s
+        member.new({ value:    char,
+                     parent:   parent,
+                     colour:   colour,
+                     style:    style,
+                     position: nil }).to_s
       end
     end
 
@@ -68,13 +72,6 @@ module Vedeu
       value.empty?
     end
 
-    # Returns log friendly output.
-    #
-    # @return [String]
-    def inspect
-      "<#{self.class.name} (value:#{value}, size:#{size})>"
-    end
-
     # Returns the size of the content in characters without formatting.
     #
     # @return [Fixnum]
@@ -85,6 +82,16 @@ module Vedeu
     # @return [String]
     def value
       # Vedeu::Char.coerce(@value, parent, colour, style)
+      # @value ||= if @value.size > 1
+      #   @value.chars.map do |char|
+      #     Vedeu::Char.new(char, parent, colour, style)
+      #   end
+      # elsif @value.size == 1
+      #   Vedeu::Char.new(@value, parent, colour, style)
+      # else
+      #   # ???
+      # end
+
       @value
     end
 

data/lib/vedeu/output/background.rb

@@ -9,34 +9,19 @@ module Vedeu
 
     private
 
-    # Returns an escape sequence for a named background colour.
-    #
-    # Valid names are: `:black`, `:red`, `:green`, `:yellow`, `:blue`,
-    # `:magenta`, `:cyan`, `:white` and `:default`.
-    #
     # @return [String]
-    def named
-      ["\e[", Esc.background_codes[colour], 'm'].join
+    def named_codes
+      Esc.background_codes[colour]
     end
 
-    # Returns an escape sequence.
-    #
     # @return [String]
-    def numbered
-      ["\e[48;5;", css_to_numbered, 'm'].join
+    def numbered_prefix
+      "\e[48;5;"
     end
 
-    # Returns an escape sequence.
-    #
     # @return [String]
-    def rgb
-      if Configuration.colour_mode == 16777216
-        sprintf("\e[48;2;%s;%s;%sm", *css_to_rgb)
-
-      else
-        numbered
-
-      end
+    def rgb_prefix
+      "\e[48;2;%s;%s;%sm"
     end
 
   end # Background

data/lib/vedeu/output/border.rb

@@ -62,23 +62,22 @@ module Vedeu
     # @option attributes vertical [String] The vertical border character.
     # @return [Border]
     def initialize(attributes = {})
-      @attributes = defaults.merge(attributes)
-
-      @enabled    = @attributes[:enabled]
-      @bottom_left = @attributes[:bottom_left]
+      @attributes   = defaults.merge!(attributes)
+      @enabled      = @attributes[:enabled]
+      @bottom_left  = @attributes[:bottom_left]
       @bottom_right = @attributes[:bottom_right]
-      @show_bottom = @attributes[:show_bottom]
-      @show_left   = @attributes[:show_left]
-      @show_right  = @attributes[:show_right]
-      @show_top    = @attributes[:show_top]
-      @top_left = @attributes[:top_left]
-      @top_right = @attributes[:top_right]
-      @horizontal  = @attributes[:horizontal]
-      @vertical    = @attributes[:vertical]
-      @name       = @attributes[:name]
-      @colour     = Colour.coerce(@attributes[:colour])
-      @repository = Vedeu.borders
-      @style      = Style.coerce(@attributes[:style])
+      @show_bottom  = @attributes[:show_bottom]
+      @show_left    = @attributes[:show_left]
+      @show_right   = @attributes[:show_right]
+      @show_top     = @attributes[:show_top]
+      @top_left     = @attributes[:top_left]
+      @top_right    = @attributes[:top_right]
+      @horizontal   = @attributes[:horizontal]
+      @vertical     = @attributes[:vertical]
+      @name         = @attributes[:name]
+      @colour       = @attributes[:colour]
+      @repository   = Vedeu.borders
+      @style        = @attributes[:style]
     end
 
     # Returns the width of the interface determined by whether a left, right,
@@ -119,6 +118,11 @@ module Vedeu
       end
     end
 
+    # @return [Vedeu::Colour]
+    def colour
+      Colour.coerce(@colour)
+    end
+
     # Set the border colour.
     #
     # @return [Vedeu::Colour]
@@ -126,6 +130,11 @@ module Vedeu
       @colour = Colour.coerce(value)
     end
 
+    # @return [Vedeu::Style]
+    def style
+      Style.coerce(@style)
+    end
+
     # Set the border style.
     #
     # @return [Vedeu::Style]
@@ -209,7 +218,7 @@ module Vedeu
 
     # @return [Vedeu::Interface]
     def interface
-      @_interface ||= Vedeu.interfaces.find(name)
+      @interface ||= Vedeu.interfaces.find(name)
     end
 
     # The default values for a new instance of this class.

data/lib/vedeu/output/colour.rb

@@ -23,7 +23,7 @@ module Vedeu
     # @option attributes foreground [String]
     # @return [Colour]
     def initialize(attributes = {})
-      @attributes = defaults.merge(attributes)
+      @attributes = defaults.merge!(attributes)
 
       @background = Background.coerce(@attributes[:background])
       @foreground = Foreground.coerce(@attributes[:foreground])