vedeu 0.5.5 → 0.5.6

data/lib/vedeu/models/interface.rb

@@ -9,6 +9,10 @@ module Vedeu
     include Vedeu::Presentation
     include Vedeu::Toggleable
 
+    # @!attribute [r] attributes
+    # @return [Hash]
+    attr_reader :attributes
+
     # @!attribute [rw] client
     # @return [Fixnum|Float]
     attr_accessor :client
@@ -33,10 +37,6 @@ module Vedeu
     # @return [Fixnum]
     attr_accessor :zindex
 
-    # @!attribute [r] attributes
-    # @return [Hash]
-    attr_reader :attributes
-
     # Return a new instance of Vedeu::Interface.
     #
     # @param attributes [Hash]
@@ -70,18 +70,6 @@ module Vedeu
       Vedeu.buffers.by_name(name).hide
     end
 
-    # Override Ruby's Object#inspect method to provide a more helpful output.
-    #
-    # @return [String]
-    def inspect
-      '<Vedeu::Interface '      \
-      "name: '#{name}', "       \
-      "group: '#{group}', "     \
-      "visible: '#{visible}', " \
-      "zindex: '#{zindex}'"     \
-      '>'
-    end
-
     # Show the named interface buffer, or without a name, the buffer of the
     # currently focussed interface.
     #

data/lib/vedeu/models/views/all.rb

@@ -8,15 +8,14 @@ module Vedeu
 
 end # Vedeu
 
-require 'vedeu/models/interface_collection'
 require 'vedeu/models/views/char'
-require 'vedeu/models/views/chars'
+require 'vedeu/models/views/collections/chars'
 require 'vedeu/models/views/stream'
-require 'vedeu/models/views/streams'
+require 'vedeu/models/views/collections/streams'
 require 'vedeu/models/views/line'
-require 'vedeu/models/views/lines'
+require 'vedeu/models/views/collections/lines'
 require 'vedeu/models/interface'
 require 'vedeu/models/interfaces'
-require 'vedeu/models/views/view_collection'
+require 'vedeu/models/views/collections/view_collection'
 require 'vedeu/models/views/view'
 require 'vedeu/models/views/composition'

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

@@ -13,6 +13,10 @@ module Vedeu
       include Comparable
       include Vedeu::Presentation
 
+      # @!attribute [r] attributes
+      # @return [Hash]
+      attr_reader :attributes
+
       # @!attribute [rw] border
       # @return [NilClass|Symbol]
       attr_accessor :border
@@ -21,10 +25,6 @@ module Vedeu
       # @return [Vedeu::Views::Line]
       attr_accessor :parent
 
-      # @!attribute [r] attributes
-      # @return [Hash]
-      attr_reader :attributes
-
       # @!attribute [r] position
       # @return [Vedeu::Position]
       attr_reader :position
@@ -36,13 +36,13 @@ module Vedeu
       # Returns a new instance of Vedeu::Views::Char.
       #
       # @param attributes [Hash]
-      # @option attributes value    [String]
-      # @option attributes parent   [Vedeu::Views::Line]
-      # @option attributes colour   [Vedeu::Colour]
-      # @option attributes style    [Vedeu::Style]
-      # @option attributes position [Vedeu::Position]
-      # @option attributes border   [NilClass|Symbol] A symbol representing the
+      # @option attributes border [NilClass|Symbol] A symbol representing the
       #   border 'piece' this Vedeu::Views::Char represents.
+      # @option attributes colour [Vedeu::Colour]
+      # @option attributes parent [Vedeu::Views::Line]
+      # @option attributes position [Vedeu::Position]
+      # @option attributes style [Vedeu::Style]
+      # @option attributes value [String]
       # @return [Vedeu::Views::Char]
       def initialize(attributes = {})
         @attributes = attributes
@@ -72,13 +72,6 @@ module Vedeu
       end
       alias_method :==, :eql?
 
-      # Override Ruby's Object#inspect method to provide a more helpful output.
-      #
-      # @return [String]
-      def inspect
-        "<Vedeu::Views::Char '#{Vedeu::Esc.escape(to_s)}'>"
-      end
-
       # @return [Vedeu::Position]
       def position
         @position = Vedeu::Position.coerce(@attributes[:position])
@@ -153,11 +146,17 @@ module Vedeu
 
       # @return [Hash]
       def parent_to_hash
-        {
-          background: parent_background.to_s,
-          foreground: parent_foreground.to_s,
-          style:      parent_style.to_s,
-        }
+        if parent
+          {
+            background: parent.background.to_s,
+            foreground: parent.foreground.to_s,
+            style:      parent.style.to_s,
+          }
+
+        else
+          {}
+
+        end
       end
 
       # @return [Hash]

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

@@ -16,14 +16,17 @@ module Vedeu
       # @return [Hash]
       attr_reader :attributes
 
+      # @!attribute [r] parent
+      # @return [NilClass] Composition objects do not have a parent.
+      attr_reader :parent
+
       # Returns a new instance of Vedeu::Views::Composition.
       #
       # @param attributes [Hash]
       # @option attributes client [void]
       # @option attributes colour [Vedeu::Colour]
-      # @option attributes views [void]
-      # @option attributes repository [void]
       # @option attributes style [Vedeu::Style]
+      # @option attributes value [Vedeu::Views::ViewCollection]
       # @return [Vedeu::Views::Composition]
       def initialize(attributes = {})
         @attributes = defaults.merge!(attributes)
@@ -34,23 +37,17 @@ module Vedeu
       end
 
       # @param child [Vedeu::Views::View]
-      # @return [Vedeu::InterfaceCollection]
+      # @return [Vedeu::Views::ViewCollection]
       def add(child)
-        @views = collection.coerce(@views, self).add(child)
-      end
-
-      # @return [Vedeu::Views::Views]
-      def views
-        collection.coerce(@views, self)
+        @value = value.add(child)
       end
-      alias_method :value, :views
+      alias_method :<<, :add
 
-      # Composition objects do not have a parent.
-      #
-      # @return [NilClass]
-      def parent
-        nil
+      # @return [Vedeu::Views::ViewCollection]
+      def value
+        collection.coerce(@value, self)
       end
+      alias_method :views, :value
 
       private
 
@@ -59,10 +56,11 @@ module Vedeu
       # @return [Hash]
       def defaults
         {
-          client:     nil,
-          colour:     nil,
-          views:      [],
-          style:      nil,
+          client: nil,
+          colour: nil,
+          parent: nil,
+          style:  nil,
+          value:  [],
         }
       end
 

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

@@ -14,21 +14,21 @@ module Vedeu
       collection Vedeu::Views::Streams
       member     Vedeu::Views::Stream
 
-      # @!attribute [rw] parent
-      # @return [Vedeu::Views::View]
-      attr_accessor :parent
-
       # @!attribute [r] attributes
       # @return [Hash]
       attr_reader :attributes
 
+      # @!attribute [rw] parent
+      # @return [Vedeu::Views::View]
+      attr_accessor :parent
+
       # Returns a new instance of Vedeu::Views::Line.
       #
       # @param attributes [Hash]
-      # @option attributes streams [Vedeu::Views::Streams]
-      # @option attributes parent [Vedeu::Views::View]
       # @option attributes colour [Vedeu::Colour]
+      # @option attributes parent [Vedeu::Views::View]
       # @option attributes style [Vedeu::Style]
+      # @option attributes value [Vedeu::Views::Streams]
       # @return [Vedeu::Views::Line]
       def initialize(attributes = {})
         @attributes = defaults.merge!(attributes)
@@ -41,7 +41,7 @@ module Vedeu
       # @param child [void]
       # @return [void]
       def add(child)
-        @_streams = @streams = collection.coerce(streams, self).add(child)
+        @value = value.add(child)
       end
       alias_method :<<, :add
 
@@ -50,16 +50,9 @@ module Vedeu
       # @return [Array]
       # @see Vedeu::Views::Stream
       def chars
-        return [] if empty?
-
-        @chars ||= streams.flat_map(&:chars)
-      end
+        return [] if value.empty?
 
-      # Returns a boolean indicating whether the line has content.
-      #
-      # @return [Boolean]
-      def empty?
-        streams.empty?
+        @chars ||= value.flat_map(&:chars)
       end
 
       # An object is equal when its values are the same.
@@ -67,27 +60,22 @@ module Vedeu
       # @param other [Vedeu::Collection]
       # @return [Boolean]
       def eql?(other)
-        self.class == other.class && streams == other.streams
+        self.class == other.class && value == other.value
       end
       alias_method :==, :eql?
 
-      # @return [NilClass|String]
-      def name
-        parent.name if parent
-      end
-
       # Returns the size of the content in characters without formatting.
       #
       # @return [Fixnum]
       def size
-        streams.map(&:size).inject(0, :+)
+        value.map(&:size).inject(0, :+)
       end
 
       # @return [Vedeu::Views::Streams]
-      def streams
-        @_streams ||= collection.coerce(@streams, self)
+      def value
+        collection.coerce(@value, self)
       end
-      alias_method :value, :streams
+      alias_method :streams, :value
 
       private
 
@@ -96,11 +84,11 @@ module Vedeu
       # @return [Hash]
       def defaults
         {
-          client:  nil,
-          colour:  nil,
-          parent:  nil,
-          streams: [],
-          style:   nil,
+          client: nil,
+          colour: nil,
+          parent: nil,
+          style:  nil,
+          value:  [],
         }
       end
 

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

@@ -14,6 +14,10 @@ module Vedeu
       collection Vedeu::Views::Chars
       member     Vedeu::Views::Char
 
+      # @!attribute [r] attributes
+      # @return [Hash]
+      attr_reader :attributes
+
       # @!attribute [rw] parent
       # @return [Vedeu::Views::Line]
       attr_accessor :parent
@@ -22,20 +26,15 @@ module Vedeu
       # @return [String]
       attr_accessor :value
       alias_method :content, :value
-      alias_method :data,    :value
       alias_method :text,    :value
 
-      # @!attribute [r] attributes
-      # @return [Hash]
-      attr_reader :attributes
-
       # Returns a new instance of Vedeu::Views::Stream.
       #
       # @param attributes [Hash]
-      # @option attributes value [String]
-      # @option attributes parent [Vedeu::Views::Line]
       # @option attributes colour [Vedeu::Colour]
       # @option attributes style [Vedeu::Style]
+      # @option attributes parent [Vedeu::Views::Line]
+      # @option attributes value [String]
       # @return [Vedeu::Views::Stream]
       def initialize(attributes = {})
         @attributes = defaults.merge!(attributes)
@@ -59,7 +58,7 @@ module Vedeu
       #
       # @return [Array]
       def chars
-        return [] if empty?
+        return [] if value.empty?
 
         @chars ||= value.chars.map do |char|
           member.new(value:    char,
@@ -70,13 +69,6 @@ module Vedeu
         end
       end
 
-      # Returns a boolean indicating whether the stream has content.
-      #
-      # @return [Boolean]
-      def empty?
-        value.empty?
-      end
-
       # An object is equal when its values are the same.
       #
       # @param other [Vedeu::Views::Char]
@@ -88,11 +80,6 @@ module Vedeu
       end
       alias_method :==, :eql?
 
-      # @return [NilClass|String]
-      def name
-        parent.name if parent
-      end
-
       # Returns the size of the content in characters without formatting.
       #
       # @return [Fixnum]

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

@@ -13,6 +13,10 @@ module Vedeu
       collection Vedeu::Views::Lines
       member     Vedeu::Views::Line
 
+      # @!attribute [r] attributes
+      # @return [Hash]
+      attr_reader :attributes
+
       # @!attribute [rw] client
       # @return [Fixnum|Float]
       attr_accessor :client
@@ -25,24 +29,20 @@ module Vedeu
       # @return [Vedeu::Views::Composition]
       attr_accessor :parent
 
-      # @!attribute [rw] zindex
-      # @return [Fixnum]
-      attr_accessor :zindex
-
-      # @!attribute [r] attributes
-      # @return [Hash]
-      attr_reader :attributes
-
       # @!attribute [w] lines
       # @return [Array<Vedeu::Views::Line>]
       attr_writer :lines
 
+      # @!attribute [rw] zindex
+      # @return [Fixnum]
+      attr_accessor :zindex
+
       # Return a new instance of Vedeu::Views::View.
       #
       # @param attributes [Hash]
       # @option attributes client [Vedeu::Client]
       # @option attributes colour [Vedeu::Colour]
-      # @option attributes lines [Vedeu::Views::Lines]
+      # @option attributes value [Vedeu::Views::Lines]
       # @option attributes name [String]
       # @option attributes parent [Vedeu::Views::Composition]
       # @option attributes style [Vedeu::Style]
@@ -57,31 +57,17 @@ module Vedeu
       end
 
       # @param child [Vedeu::Views::Line]
-      # @return [void]
+      # @return [Vedeu::Views::Lines]
       def add(child)
-        @lines = lines.add(child)
+        @value = value.add(child)
       end
       alias_method :<<, :add
 
-      # Override Ruby's Object#inspect method to provide a more helpful output.
-      #
-      # @return [String]
-      def inspect
-        "<Vedeu::Views::View name: '#{name}', zindex: '#{zindex}'>"
-      end
-
       # @return [Vedeu::Views::Lines]
-      def lines
-        collection.coerce(@lines, self)
-      end
-      alias_method :value, :lines
-
-      # Returns a boolean indicating whether the interface has content.
-      #
-      # @return [Boolean]
-      def lines?
-        lines.any?
+      def value
+        collection.coerce(@value, self)
       end
+      alias_method :lines, :value
 
       # @return [Array<Array<Vedeu::Views::Char>>]
       def render
@@ -140,13 +126,14 @@ module Vedeu
       # @return [Hash]
       def defaults
         {
-          client:     nil,
-          colour:     Vedeu::Colour.coerce(background: :default,
-                                           foreground: :default),
-          name:       '',
-          parent:     nil,
-          style:      :normal,
-          zindex:     0,
+          client: nil,
+          colour: Vedeu::Colour.coerce(background: :default,
+                                       foreground: :default),
+          name:   '',
+          parent: nil,
+          style:  :normal,
+          value:  [],
+          zindex: 0,
         }
       end