vedeu 0.6.8 → 0.6.9

data/lib/vedeu/output/wordwrap.rb

@@ -1,176 +1,180 @@
 module Vedeu
 
-  # Wrap or prune text.
-  #
-  class Wordwrap
+  module Output
 
-    # @see Vedeu::Wordwrap#initialize
-    def self.for(text, options = {})
-      new(text, options).content
-    end
-
-    # Returns a new instance of Vedeu::Wordwrap.
+    # Wrap or prune text.
     #
-    # @param text [String]
-    # @param options [Hash]
-    # @option options ellipsis [String] See {#ellipsis}.
-    # @option options mode [Symbol] See {#mode}.
-    # @option options width [Fixnum] See {#width}.
-    # @return [Vedeu::Wordwrap]
-    def initialize(text, options = {})
-      @text    = text
-      @options = defaults.merge!(options)
-    end
-
-    # @return [Vedeu::Views::Lines]
-    def content
-      case mode
-      when :prune then to_line_objects(prune)
-      when :wrap  then to_line_objects(wrap)
-      else
-        to_line_objects(split_lines)
-      end
-    end
+    class Wordwrap
 
-    # @return [Array<String>|String]
-    def prune
-      return text if text.size <= pruned_width
+      # @see Vedeu::Output::Wordwrap#initialize
+      def self.for(text, options = {})
+        new(text, options).content
+      end
 
-      processed = []
+      # Returns a new instance of Vedeu::Output::Wordwrap.
+      #
+      # @param text [String]
+      # @param options [Hash]
+      # @option options ellipsis [String] See {#ellipsis}.
+      # @option options mode [Symbol] See {#mode}.
+      # @option options width [Fixnum] See {#width}.
+      # @return [Vedeu::Output::Wordwrap]
+      def initialize(text, options = {})
+        @text    = text
+        @options = defaults.merge!(options)
+      end
 
-      if split_lines.size > 1
-        processed = split_lines.reduce([]) do |acc, line|
-          acc << ellipsis_string(line)
+      # @return [Vedeu::Views::Lines]
+      def content
+        case mode
+        when :prune then to_line_objects(prune)
+        when :wrap  then to_line_objects(wrap)
+        else
+          to_line_objects(split_lines)
         end
+      end
+
+      # @return [Array<String>|String]
+      def prune
+        return text if text.size <= pruned_width
+
+        processed = []
+
+        if split_lines.size > 1
+          processed = split_lines.reduce([]) do |acc, line|
+            acc << ellipsis_string(line)
+          end
+
+        else
+          processed = ellipsis_string(text)
 
-      else
-        processed = ellipsis_string(text)
+        end
 
+        processed
       end
 
-      processed
-    end
+      # @return [String]
+      def wrap
+        processed = []
+        split_lines.map do |unprocessed|
+          line_length = 0
+          reformatted = []
 
-    # @return [String]
-    def wrap
-      processed = []
-      split_lines.map do |unprocessed|
-        line_length = 0
-        reformatted = []
+          unprocessed.split(/\s/).map do |word|
+            word_length = word.length + 1
 
-        unprocessed.split(/\s/).map do |word|
-          word_length = word.length + 1
+            if (line_length += word_length) >= width
+              line_length = word_length
+              processed << reformatted
+              reformatted = []
+            end
 
-          if (line_length += word_length) >= width
-            line_length = word_length
-            processed << reformatted
-            reformatted = []
+            reformatted << word
           end
 
-          reformatted << word
+          processed << reformatted
         end
 
-        processed << reformatted
+        processed.reduce([]) do |output, line|
+          output << line.join(' ')
+        end
       end
 
-      processed.reduce([]) do |output, line|
-        output << line.join(' ')
-      end
-    end
+      protected
 
-    protected
+      # @!attribute [r] text
+      # @return [String]
+      attr_reader :text
 
-    # @!attribute [r] text
-    # @return [String]
-    attr_reader :text
+      # @!attribute [r] options
+      # @return [Hash]
+      attr_reader :options
 
-    # @!attribute [r] options
-    # @return [Hash]
-    attr_reader :options
+      private
 
-    private
+      # @param text_as_lines [Array<String>]
+      # @return [Vedeu::Views::Lines]
+      def to_line_objects(text_as_lines)
+        line_objects = Array(text_as_lines).map do |text_line|
+          stream        = Vedeu::Views::Stream.new(value: text_line)
+          line          = Vedeu::Views::Line.new
+          stream.parent = line
+          line.add(stream)
+          line
+        end
+        Vedeu::Views::Lines.new(line_objects)
+      end
 
-    # @param text_as_lines [Array<String>]
-    # @return [Vedeu::Views::Lines]
-    def to_line_objects(text_as_lines)
-      line_objects = Array(text_as_lines).map do |text_line|
-        stream        = Vedeu::Views::Stream.new(value: text_line)
-        line          = Vedeu::Views::Line.new
-        stream.parent = line
-        line.add(stream)
-        line
+      # Returns the text as an array of lines, split on '\n'.
+      #
+      # @return [Array<String>]
+      def split_lines
+        text.split(/\n/)
       end
-      Vedeu::Views::Lines.new(line_objects)
-    end
 
-    # Returns the text as an array of lines, split on '\n'.
-    #
-    # @return [Array<String>]
-    def split_lines
-      text.split(/\n/)
-    end
+      # @param string [String]
+      # @return [String]
+      def ellipsis_string(string)
+        if string.size < ellipsis.size
+          prune_string(string)
 
-    # @param string [String]
-    # @return [String]
-    def ellipsis_string(string)
-      if string.size < ellipsis.size
-        prune_string(string)
+        else
+          "#{prune_string(string)}#{ellipsis}"
 
-      else
-        "#{prune_string(string)}#{ellipsis}"
+        end
+      end
 
+      # Returns the string pruned.
+      #
+      # @param string [String]
+      # @return [String]
+      def prune_string(string)
+        string.chomp.slice(0..pruned_width)
       end
-    end
 
-    # Returns the string pruned.
-    #
-    # @param string [String]
-    # @return [String]
-    def prune_string(string)
-      string.chomp.slice(0..pruned_width)
-    end
+      # Returns the width of the string minus the ellipsis.
+      #
+      # @return [Fixnum]
+      def pruned_width
+        width - ellipsis.size
+      end
 
-    # Returns the width of the string minus the ellipsis.
-    #
-    # @return [Fixnum]
-    def pruned_width
-      width - ellipsis.size
-    end
+      # For when using mode `:prune`, by default, provides '...'.
+      #
+      # @return [String]
+      def ellipsis
+        options.fetch(:ellipsis)
+      end
 
-    # For when using mode `:prune`, by default, provides '...'.
-    #
-    # @return [String]
-    def ellipsis
-      options.fetch(:ellipsis)
-    end
-
-    # Returns the word wrapping mode. One of :default, :prune or :wrap;
-    #   :default = Renders the content as is.
-    #   :prune   = Discards the remainder of the content line after width.
-    #   :wrap    = Forces the content on to a new line after width.
-    # @return [Symbol]
-    def mode
-      options.fetch(:mode)
-    end
-
-    # Returns the width to prune or wrap to.
-    #
-    # @return [Fixnum]
-    def width
-      options.fetch(:width)
-    end
+      # Returns the word wrapping mode. One of :default, :prune or :wrap;
+      #   :default = Renders the content as is.
+      #   :prune   = Discards the remainder of the content line after width.
+      #   :wrap    = Forces the content on to a new line after width.
+      # @return [Symbol]
+      def mode
+        options.fetch(:mode)
+      end
 
-    # Returns the default options/attributes for this class.
-    #
-    # @return [Hash<Symbol => Fixnum, String, Symbol>]
-    def defaults
-      {
-        ellipsis: '...',
-        mode:     :default,
-        width:    70,
-      }
-    end
-
-  end # Wordwrap
+      # Returns the width to prune or wrap to.
+      #
+      # @return [Fixnum]
+      def width
+        options.fetch(:width)
+      end
+
+      # Returns the default options/attributes for this class.
+      #
+      # @return [Hash<Symbol => Fixnum, String, Symbol>]
+      def defaults
+        {
+          ellipsis: '...',
+          mode:     :default,
+          width:    70,
+        }
+      end
+
+    end # Wordwrap
+
+  end # Output
 
 end # Vedeu

data/lib/vedeu/refresh/refresh.rb

@@ -5,7 +5,7 @@ module Vedeu
 
     # Refresh all registered interfaces.
     #
-    # @return [Array<Vedeu::Interface>]
+    # @return [Array<Vedeu::Models::Interface>]
     def self.all
       new.all
     end
@@ -17,7 +17,7 @@ module Vedeu
 
     # Refresh all registered interfaces.
     #
-    # @return [Array<Vedeu::Interface>]
+    # @return [Array<Vedeu::Models::Interface>]
     def all
       Vedeu.timer('Refreshing all') do
         Vedeu.interfaces.zindexed.each do |interface|

data/lib/vedeu/templating/helpers.rb

@@ -9,18 +9,22 @@ module Vedeu
       # @param value [String] The HTML/CSS colour.
       # @param block [Proc]
       # @return [Vedeu::Views::Stream]
-      # @raise [Vedeu::Error::InvalidSyntax] The required block was not given.
+      # @raise [Vedeu::Error::InvalidSyntax] The required block was
+      #   not given.
       def background(value, &block)
         define_stream(background: value, &block)
       end
       alias_method :bg, :background
 
       # @param attributes [Hash]
-      # @option attributes foreground [String] The HTML/CSS foreground colour.
-      # @option attributes background [String] The HTML/CSS background colour.
+      # @option attributes foreground [String] The HTML/CSS foreground
+      #   colour.
+      # @option attributes background [String] The HTML/CSS background
+      #   colour.
       # @param block [Proc]
       # @return [Vedeu::Views::Stream]
-      # @raise [Vedeu::Error::InvalidSyntax] The required block was not given.
+      # @raise [Vedeu::Error::InvalidSyntax] The required block was
+      #   not given.
       def colour(attributes = {}, &block)
         define_stream(attributes, &block)
       end
@@ -28,7 +32,8 @@ module Vedeu
       # @param value [String] The HTML/CSS colour.
       # @param block [Proc]
       # @return [Vedeu::Views::Stream]
-      # @raise [Vedeu::Error::InvalidSyntax] The required block was not given.
+      # @raise [Vedeu::Error::InvalidSyntax] The required block was
+      #   not given.
       def foreground(value, &block)
         define_stream(foreground: value, &block)
       end
@@ -50,7 +55,7 @@ module Vedeu
         encode(
           Vedeu::Views::Stream.build(
             colour: Vedeu::Colours::Colour.new(attributes),
-            style:  Vedeu::Style.new(attributes[:style]),
+            style:  Vedeu::Presentation::Style.new(attributes[:style]),
             value:  block.call))
       end
 

data/lib/vedeu/templating/view_template.rb

@@ -81,7 +81,7 @@ module Vedeu
 
       # Fetch the interface by name.
       #
-      # @return [Vedeu::Interface]
+      # @return [Vedeu::Models::Interface]
       def interface
         Vedeu.interfaces.by_name(options[:name])
       end

data/lib/vedeu/terminal/terminal.rb

@@ -207,9 +207,9 @@ module Vedeu
       IO.console
     end
 
-    # @return [Vedeu::VirtualBuffer]
+    # @return [Vedeu::Buffers::VirtualBuffer]
     def virtual
-      @virtual ||= Vedeu::VirtualBuffer.new(height, width)
+      @virtual ||= Vedeu::Buffers::VirtualBuffer.new(height, width)
     end
 
   end # Terminal

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 
 end

data/test/lib/vedeu/borders/render_test.rb

@@ -40,7 +40,7 @@ module Vedeu
           Vedeu::Geometry::Geometry.new(name: _name, x: 1, xn: 7, y: 1, yn: 4)
         }
         let(:interface) {
-          Vedeu::Interface.new(name: _name, visible: visible)
+          Vedeu::Models::Interface.new(name: _name, visible: visible)
         }
         before do
           Vedeu.geometries.stubs(:by_name).returns(geometry)

data/test/lib/vedeu/buffers/buffer_test.rb

@@ -8,6 +8,11 @@ module Vedeu
 
       let(:described)  { Vedeu::Buffers::Buffer }
       let(:instance)   { described.new(attributes) }
+      let(:_name)      { 'krypton' }
+      let(:back)       {}
+      let(:front)      {}
+      let(:previous)   {}
+      let(:interface)  {}
       let(:attributes) {
         {
           name:     _name,
@@ -16,11 +21,6 @@ module Vedeu
           previous: previous,
         }
       }
-      let(:_name)     { 'krypton' }
-      let(:back)      {}
-      let(:front)     {}
-      let(:previous)  {}
-      let(:interface) {}
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -44,7 +44,9 @@ module Vedeu
       end
 
       describe '#add' do
-        let(:content) { Vedeu::Views::View.new(value: [Vedeu::Views::Line.new]) }
+        let(:content) {
+          Vedeu::Views::View.new(value: [Vedeu::Views::Line.new])
+        }
 
         subject { instance.add(content) }
 
@@ -72,7 +74,7 @@ module Vedeu
 
         before do
           Vedeu::Clear::NamedInterface.stubs(:render).returns(emptiness)
-          Vedeu::Output.stubs(:render).returns(emptiness)
+          Vedeu::Output::Output.stubs(:render).returns(emptiness)
         end
 
         subject { instance.clear }
@@ -80,7 +82,7 @@ module Vedeu
         it {
           Vedeu::Clear::NamedInterface.expects(:render).with(_name).
             returns(emptiness)
-          Vedeu::Output.expects(:render).with(emptiness)
+          Vedeu::Output::Output.expects(:render).with(emptiness)
           subject
         }
       end
@@ -118,34 +120,34 @@ module Vedeu
       end
 
       describe '#hide' do
-        before { Vedeu::Output.stubs(:render) }
+        before { Vedeu::Output::Output.stubs(:render) }
 
         subject { instance.hide }
 
         it {
-          Vedeu::Output.expects(:render)
+          Vedeu::Output::Output.expects(:render)
           subject
         }
       end
 
       describe '#show' do
-        before { Vedeu::Output.stubs(:render) }
+        before { Vedeu::Output::Output.stubs(:render) }
 
         subject { instance.show }
 
         it {
-          Vedeu::Output.expects(:render)
+          Vedeu::Output::Output.expects(:render)
           subject
         }
       end
 
       describe '#render' do
-        before { Vedeu::Output.stubs(:render) }
+        before { Vedeu::Output::Output.stubs(:render) }
 
         subject { instance.render }
 
         it {
-          Vedeu::Output.expects(:render)
+          Vedeu::Output::Output.expects(:render)
           subject
         }
       end