vedeu 0.6.15 → 0.6.16

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

@@ -92,39 +92,6 @@ module Vedeu
         "border-#{direction}:1px #{char.foreground.to_html} solid;"
       end
 
-      # # @return [String]
-      # def fg
-      #   @fg ||= colour(char, 'foreground', '#222')
-      # end
-
-      # # @return [String]
-      # def bg
-      #   @bg ||= colour(char, 'background', '#000')
-      # end
-
-      # @param char [Vedeu::Views::Char]
-      # @param type [String] 'background' or 'foreground'
-      # @param default [String] A default colour (CSS style; e.g. '#b2adf2')
-      # @return [String]
-      # def colour(char, type, default)
-      #   parent_type         = char.send(:parent).send(type).send(:to_html)
-      #   #parent_type         = ('parent_' + type).to_sym
-      #   type_to_html        = char.send(type).send(:to_html)
-      #   #parent_type_to_html = char.send(parent_type).send(:to_html)
-
-      #   if present?(type_to_html)
-      #     type_to_html
-
-      #   elsif char.parent
-      #     parent_type
-      #     #char.parent.send(type).send(:to_html)
-
-      #   else
-      #     default
-
-      #   end
-      # end
-
       # @return [Symbol|NilClass]
       def border
         char.border

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

@@ -10,8 +10,8 @@ module Vedeu
     end # Streams
 
     # Represents a character or collection of characters as part of a
-    # {Vedeu::Views::Line} which you wish to colour and style independently of
-    # the other characters in that line.
+    # {Vedeu::Views::Line} which you wish to colour and style
+    # independently of the other characters in that line.
     #
     class Stream
 
@@ -58,10 +58,10 @@ module Vedeu
       end
       alias_method :<<, :add
 
-      # Returns an array of characters, each element is the escape sequences of
-      # colours and styles for this stream, the character itself, and the escape
-      # sequences of colours and styles for the parent of the stream
-      # ({Vedeu::Views::Line}).
+      # Returns an array of characters, each element is the escape
+      # sequences of colours and styles for this stream, the character
+      # itself, and the escape sequences of colours and styles for the
+      # parent of the stream ({Vedeu::Views::Line}).
       #
       # @return [Array]
       def chars
@@ -87,7 +87,8 @@ module Vedeu
       end
       alias_method :==, :eql?
 
-      # Returns the size of the content in characters without formatting.
+      # Returns the size of the content in characters without
+      # formatting.
       #
       # @return [Fixnum]
       def size

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

@@ -9,8 +9,8 @@ module Vedeu
 
     end # ViewCollection
 
-    # Represents a container for {Vedeu::Views::Line} and {Vedeu::Views::Stream}
-    # objects.
+    # Represents a container for {Vedeu::Views::Line} and
+    # {Vedeu::Views::Stream} objects.
     #
     class View
 
@@ -80,7 +80,7 @@ module Vedeu
       def render
         return [] unless visible?
 
-        Vedeu.trigger(:_clear_, name)
+        Vedeu.trigger(:_clear_view_, name)
 
         output = [
           Vedeu::Output::Viewport.render(self),
@@ -90,21 +90,21 @@ module Vedeu
         output
       end
 
-      # Store the view and immediately refresh it; causing to be pushed to the
-      # Terminal. Called by {Vedeu::DSL::View.renders}.
+      # Store the view and immediately refresh it; causing to be
+      # pushed to the Terminal. Called by {Vedeu::DSL::View.renders}.
       #
       # @return [Vedeu::Views::View]
       def store_immediate
         store_deferred
 
-        Vedeu.trigger(:_refresh_, name)
+        Vedeu.trigger(:_refresh_view_, name)
 
         self
       end
 
-      # When a name is given, the view is stored with this name. This view will
-      # be shown next time a refresh event is triggered with this name.
-      # Called by {Vedeu::DSL::View.views}.
+      # When a name is given, the view is stored with this name. This
+      # view will be shown next time a refresh event is triggered with
+      # this name. Called by {Vedeu::DSL::View.views}.
       #
       # @raise [Vedeu::Error::InvalidSyntax] The name is not defined.
       # @return [Vedeu::Views::View]

data/lib/vedeu/options.rb

@@ -8,7 +8,7 @@ module Vedeu
     # @param options [Hash]
     # @param defaults [Hash]
     def initialize(options = {}, defaults = {})
-      @options  = options  || {}
+      @options  = options || {}
       @defaults = defaults || {}
 
       @defaults.merge!(@options).each do |key, value|

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

@@ -0,0 +1,13 @@
+module Vedeu
+
+  # Provides the mechanisms to clear an interface or group of
+  # interfaces.
+  #
+  module Clear
+
+  end # Clear
+
+end # Vedeu
+
+require 'vedeu/output/clear/group'
+require 'vedeu/output/clear/interface'

data/lib/vedeu/output/clear/{named_group.rb → group.rb}

@@ -1,13 +1,10 @@
 module Vedeu
 
-  # Provides the mechanisms to clear an interface or group of
-  # interfaces.
-  #
   module Clear
 
     # Clear the interfaces belonging to the named group.
     #
-    class NamedGroup
+    class Group
 
       class << self
 
@@ -26,17 +23,17 @@ module Vedeu
 
       end # Eigenclass
 
-      # Return a new instance of Vedeu::Clear::NamedGroup.
+      # Return a new instance of Vedeu::Clear::Group.
       #
       # @param name [String]
-      # @return [Vedeu::Clear::NamedGroup]
+      # @return [Vedeu::Clear::Group]
       def initialize(name)
         @name = name
       end
 
       # @return [void]
       def render
-        members.each { |name| Vedeu::Clear::NamedInterface.render(name) }
+        members.each { |name| Vedeu::Clear::Interface.render(name) }
       end
 
       protected

data/lib/vedeu/output/clear/{named_interface.rb → interface.rb}

@@ -1,13 +1,10 @@
 module Vedeu
 
-  # Provides the mechanisms to clear an interface or group of
-  # interfaces.
-  #
   module Clear
 
     # Clear the named interface.
     #
-    class NamedInterface
+    class Interface
 
       class << self
 
@@ -26,10 +23,10 @@ module Vedeu
 
       end # Eigenclass
 
-      # Return a new instance of Vedeu::Clear::NamedInterface.
+      # Return a new instance of Vedeu::Clear::Interface.
       #
       # @param name [String] The name of the interface to clear.
-      # @return [Vedeu::Clear::NamedInterface]
+      # @return [Vedeu::Clear::Interface]
       def initialize(name)
         @name = name
       end
@@ -81,7 +78,7 @@ module Vedeu
         end
       end
 
-    end # NamedInterface
+    end # Interface
 
   end # Clear
 

data/lib/vedeu/output/direct.rb

@@ -22,8 +22,8 @@ module Vedeu
       # @return [Vedeu::Output::Direct]
       def initialize(value:, x:, y:)
         @value = value || ''
-        @x     = x     || 1
-        @y     = y     || 1
+        @x     = x || 1
+        @y     = y || 1
       end
 
       # @return [String]

data/lib/vedeu/output/presentation/presentation.rb

@@ -24,6 +24,14 @@ module Vedeu
 
     private
 
+    # Returns a boolean indicating the model has a position
+    # attribute.
+    #
+    # @return [Boolean]
+    def position?
+      self.respond_to?(:position) && position.is_a?(Vedeu::Geometry::Position)
+    end
+
     # Renders the colour attributes of the receiver and yields (to
     # then render the styles).
     #
@@ -34,14 +42,9 @@ module Vedeu
 
     # @return [String]
     def render_position
-      if self.respond_to?(:position) &&
-         position.is_a?(Vedeu::Geometry::Position)
-        position.to_s { yield }
-
-      else
-        yield
+      return yield unless position?
 
-      end
+      position.to_s { yield }
     end
 
     # Renders the style attributes of the receiver and yields (to

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

@@ -82,14 +82,14 @@ module Vedeu
     #
     # @return [Set]
     def reset
-      @storage = Set.new
+      @storage = in_memory
     end
 
     private
 
     # @return [Set]
-    def storage
-      @storage ||= reset
+    def in_memory
+      Set.new
     end
 
     # @return [Mutex]
@@ -97,11 +97,16 @@ module Vedeu
       @mutex ||= Mutex.new
     end
 
+    # @return [Set]
+    def storage
+      @storage ||= in_memory
+    end
+
   end # Renderers
 
 end # Vedeu
 
-require 'vedeu/output/renderers/renderer_options'
+require 'vedeu/output/renderers/options'
 require 'vedeu/output/renderers/escape_sequence'
 require 'vedeu/output/renderers/file'
 require 'vedeu/output/renderers/html'

data/lib/vedeu/output/renderers/escape_sequence.rb

@@ -6,7 +6,7 @@ module Vedeu
     #
     class EscapeSequence
 
-      include Vedeu::Renderers::RendererOptions
+      include Vedeu::Renderers::Options
 
       # Returns a new instance of Vedeu::Renderers::EscapeSequence.
       #

data/lib/vedeu/output/renderers/file.rb

@@ -6,7 +6,7 @@ module Vedeu
     #
     class File
 
-      include Vedeu::Renderers::RendererOptions
+      include Vedeu::Renderers::Options
 
       # Returns a new instance of Vedeu::Renderers::File.
       #

data/lib/vedeu/output/renderers/null.rb

@@ -6,7 +6,7 @@ module Vedeu
     #
     class Null
 
-      include Vedeu::Renderers::RendererOptions
+      include Vedeu::Renderers::Options
 
       # Returns a new instance of Vedeu::Renderers::Null.
       #

data/lib/vedeu/output/renderers/{renderer_options.rb → options.rb}

@@ -5,7 +5,7 @@ module Vedeu
     # Provides shared functionality to Vedeu::Renderer classes.
     #
     # :nocov:
-    module RendererOptions
+    module Options
 
       private
 
@@ -24,7 +24,7 @@ module Vedeu
         {}
       end
 
-    end # RendererOptions
+    end # Options
     # :nocov:
 
   end # Renderers

data/lib/vedeu/output/renderers/terminal.rb

@@ -7,7 +7,7 @@ module Vedeu
     #
     class Terminal
 
-      include Vedeu::Renderers::RendererOptions
+      include Vedeu::Renderers::Options
 
       # Returns a new instance of Vedeu::Renderers::Terminal.
       #

data/lib/vedeu/output/renderers/text.rb

@@ -7,7 +7,7 @@ module Vedeu
     #
     class Text
 
-      include Vedeu::Renderers::RendererOptions
+      include Vedeu::Renderers::Options
 
       # Returns a new instance of Vedeu::Renderers::Text.
       #

data/lib/vedeu/output/text.rb

@@ -102,15 +102,11 @@ module Vedeu
       #
       # @return [Vedeu::Views::Line|Vedeu::Views::Stream]
       def content
-        if model.is_a?(Vedeu::Views::View)
-          stream.parent = line
-          line.add(stream)
-          line
+        return stream unless model.is_a?(Vedeu::Views::View)
 
-        else
-          stream
-
-        end
+        stream.parent = line
+        line.add(stream)
+        line
       end
 
       # The default values for a new instance of this class.

data/lib/vedeu/output/viewport.rb

@@ -137,13 +137,9 @@ module Vedeu
       # @param dimension [Fixnum] Either the height or width.
       # @return [Fixnum]
       def content_offset(offset, dimension)
-        if offset >= dimension
-          offset - dimension
+        return 0 unless offset >= dimension
 
-        else
-          0
-
-        end
+        offset - dimension
       end
 
       # Return the border associated with the interface/view we are

data/lib/vedeu/output/wordwrap.rb

@@ -115,13 +115,9 @@ module Vedeu
       # @param string [String]
       # @return [String]
       def ellipsis_string(string)
-        if string.size < ellipsis.size
-          prune_string(string)
+        return prune_string(string) if string.size < ellipsis.size
 
-        else
-          "#{prune_string(string)}#{ellipsis}"
-
-        end
+        "#{prune_string(string)}#{ellipsis}"
       end
 
       # Returns the string pruned.

data/lib/vedeu/repositories/repository.rb

@@ -65,13 +65,9 @@ module Vedeu
       def by_name(name)
         name ||= Vedeu.focus
 
-        if registered?(name)
-          find(name)
+        return find(name) if registered?(name)
 
-        else
-          null_model.new(name: name)
-
-        end
+        null_model.new(name: name)
       end
 
       # Return the model for the interface currently in focus.
@@ -107,16 +103,12 @@ module Vedeu
       # @param name [String]
       # @return [void]
       def find_or_create(name)
-        if registered?(name)
-          find(name)
+        return find(name) if registered?(name)
 
-        else
-          Vedeu.log(type: :store,
-                    message: "Model (#{model}) not found, " \
-                             "registering: '#{name}'")
+        Vedeu.log(type:    :store,
+                  message: "Model (#{model}) not found, registering: '#{name}'")
 
-          model.new(name).store
-        end
+        model.new(name).store
       end
 
       # @return [String]
@@ -143,15 +135,10 @@ module Vedeu
       # @return [Hash|FalseClass]
       def remove(name)
         return false if empty?
+        return false unless registered?(name)
 
-        if registered?(name)
-          storage.delete(name)
-          storage unless storage.is_a?(Set)
-
-        else
-          false
-
-        end
+        storage.delete(name)
+        storage unless storage.is_a?(Set)
       end
       alias_method :destroy,    :remove
       alias_method :delete,     :remove