vedeu 0.4.60 → 0.4.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ccce2439bd00b49d1f30c708db9f3f80c9b423a
-  data.tar.gz: bf39e8c7e0c0deeba71d696ca8f71dd051dc6a4e
+  metadata.gz: 6ceb6ac3ef4df98a7535ceeb37ae65a39d5a6645
+  data.tar.gz: 21bc34bf6d44e123fe9895603bef26832738b892
 SHA512:
-  metadata.gz: 1881880f64dbde3efd8c923a23d8dc55020d93512cefbcc9aa104909d861e75f0fbce90c7610c84bd015825cf0184c2c71a019816ad2c2ea935a638a393eb137
-  data.tar.gz: 0a972640a9811013c39909df190d6965af0f1f21197658d9a64611ba53a811193cddf89d4d1ecf734cb919b989b0c74241311babac1aada03aac428085397ed6
+  metadata.gz: 879388bbd80aff90f21b262568bda67262c509efaccda7570968bf3080a1951c2be6452fb46ef4f5fb7e36ab63e15c4e56c440effd6bea59775dfcf0e020c13d
+  data.tar.gz: 4b2e7aefea725739b77497a3133ae74efa074add21b67ee0c4591c1d646b9764fe15e13a74b8f697f620883ae0ab0168023b3d0612ada31c740192828bf64297

data/lib/vedeu.rb

@@ -1,6 +1,7 @@
 $LIB_DIR = File.dirname(__FILE__) + '/../lib'
 $LOAD_PATH.unshift($LIB_DIR) unless $LOAD_PATH.include?($LIB_DIR)
 
+require 'base64'
 require 'date'
 require 'drb'
 require 'erb'
@@ -14,6 +15,7 @@ require 'set'
 require 'singleton'
 require 'thread'
 require 'time'
+require 'zlib'
 
 require 'thor'
 

data/lib/vedeu/all.rb

@@ -101,9 +101,12 @@ require 'vedeu/models/groups'
 require 'vedeu/models/menu'
 require 'vedeu/models/menus'
 
+require 'vedeu/templating/all'
+require 'vedeu/templating/encoder'
+require 'vedeu/templating/decoder'
 require 'vedeu/templating/helpers'
 require 'vedeu/templating/directive'
-require 'vedeu/templating/preprocessor'
+require 'vedeu/templating/post_processor'
 require 'vedeu/templating/template'
 
 require 'vedeu/application/controller'
@@ -147,13 +150,14 @@ require 'vedeu/input/input'
 require 'vedeu/input/keymap'
 require 'vedeu/input/keymaps'
 
+require 'vedeu/borders/render_border'
+require 'vedeu/borders/border'
+require 'vedeu/borders/borders'
+
 require 'vedeu/output/clear/named_group'
 require 'vedeu/output/clear/named_interface'
 require 'vedeu/output/esc'
 require 'vedeu/output/presentation'
-require 'vedeu/output/render_border'
-require 'vedeu/output/border'
-require 'vedeu/output/borders'
 require 'vedeu/output/compressor'
 require 'vedeu/output/style'
 require 'vedeu/output/text'

data/lib/vedeu/{output → borders}/render_border.rb

@@ -87,22 +87,32 @@ module Vedeu
 
     # @return [Vedeu::Char]
     def build_bottom_left
-      build(bottom_left, :bottom_left, *[yn, x]) if left?
+      build(bottom_left, :bottom_left, yn, x) if left?
     end
 
     # @return [Vedeu::Char]
     def build_bottom_right
-      build(bottom_right, :bottom_right, *[yn, xn]) if right?
+      build(bottom_right, :bottom_right, yn, xn) if right?
+    end
+
+    # @return [Array<Vedeu::Char>]
+    def build_top
+      build_horizontal(:bottom_horizontal, y)
+    end
+
+    # @return [Array<Vedeu::Char>]
+    def build_bottom
+      build_horizontal(:bottom_horizontal, yn)
     end
 
     # @return [Vedeu::Char]
     def build_top_left
-      build(top_left, :top_left, *[y, x]) if left?
+      build(top_left, :top_left, y, x) if left?
     end
 
     # @return [Vedeu::Char]
     def build_top_right
-      build(top_right, :top_right, *[y, xn]) if right?
+      build(top_right, :top_right, y, xn) if right?
     end
 
     # Renders the bottom border for the interface.
@@ -111,11 +121,7 @@ module Vedeu
     def bottom
       return [] unless bottom?
 
-      [
-        build_bottom_left,
-        build_horizontal(:bottom_horizontal, yn),
-        build_bottom_right,
-      ].compact
+      [build_bottom_left, build_bottom, build_bottom_right].compact
     end
 
     # @return [Vedeu::Geometry]
@@ -128,7 +134,7 @@ module Vedeu
     # @return [Array<Vedeu::Char>]
     def build_horizontal(position, y_coordinate)
       Array.new(width) do |ix|
-        build(horizontal, position, *[y_coordinate, (bx + ix)])
+        build(horizontal, position, y_coordinate, (bx + ix))
       end
     end
 
@@ -147,7 +153,7 @@ module Vedeu
     def left(iy = 0)
       return [] unless left?
 
-      build(vertical, :left_vertical, *[(by + iy), x])
+      build(vertical, :left_vertical, (by + iy), x)
     end
 
     # Renders the right border for the interface.
@@ -157,7 +163,7 @@ module Vedeu
     def right(iy = 0)
       return [] unless right?
 
-      build(vertical, :right_vertical, *[(by + iy), xn])
+      build(vertical, :right_vertical, (by + iy), xn)
     end
 
     # Renders the top border for the interface.
@@ -179,13 +185,13 @@ module Vedeu
     #
     # @return [Array<Vedeu::Char>]
     def titlebar
-      return build_horizontal(:top_horizontal, y) unless title? && title_fits?
+      return build_top unless title? && title_fits?
+
+      build_top.each_with_index do |char, index|
+        next if index == 0 || index > title_characters.size
 
-      build_horizontal(:top_horizontal, y).each_with_index do |char, index|
-        if index >= 1 && index <= title_characters.size
-          char.border = nil
-          char.value  = title_characters[(index - 1)]
-        end
+        char.border = nil
+        char.value  = title_characters[(index - 1)]
       end
     end
 

data/lib/vedeu/cursor/move.rb

@@ -177,23 +177,9 @@ module Vedeu
 
     private
 
-    # Returns the cursors x position based on its current offset.
-    #
-    # @return [Fixnum]
-    def x_position
-      coordinate.x_position(ox)
-    end
-
-    # Returns the cursors y position based on its current offset.
-    #
-    # @return [Fixnum]
-    def y_position
-      coordinate.y_position(oy)
-    end
-
     # @return [Vedeu::Coordinate]
     def coordinate
-      @coordinate ||= Vedeu::Coordinate.new(name)
+      @coordinate ||= Vedeu::Coordinate.new(name, oy, ox)
     end
 
     # @see Vedeu::Cursors#by_name
@@ -203,7 +189,10 @@ module Vedeu
 
     # @return [Hash<Symbol => void>]
     def cursor_attributes
-      cursor.attributes.merge!(x: x_position, y: y_position, ox: ox, oy: oy)
+      cursor.attributes.merge!(x:  coordinate.x_position,
+                               y:  coordinate.y_position,
+                               ox: ox,
+                               oy: oy)
     end
 
     # @see Vedeu::Geometries#by_name

data/lib/vedeu/cursor/reposition.rb

@@ -27,8 +27,8 @@ module Vedeu
     # @return [Vedeu::Cursor]
     def to
       result = entity.new(name: name,
-                          y:    y_position,
-                          x:    x_position,
+                          y:    coordinate.y_position,
+                          x:    coordinate.x_position,
                           oy:   y,
                           ox:   x).store
 
@@ -61,21 +61,7 @@ module Vedeu
 
     # @return [Vedeu::Coordinate]
     def coordinate
-      @coordinate ||= Vedeu::Coordinate.new(name)
-    end
-
-    # Returns the cursors x position based on the desired x position.
-    #
-    # @return [Fixnum]
-    def x_position
-      coordinate.x_position(x)
-    end
-
-    # Returns the cursors y position based on the desired y position.
-    #
-    # @return [Fixnum]
-    def y_position
-      coordinate.y_position(y)
+      @coordinate ||= Vedeu::Coordinate.new(name, y, x)
     end
 
   end # Reposition

data/lib/vedeu/dsl/view.rb

@@ -163,7 +163,7 @@ module Vedeu
         # interface back buffers until a refresh event occurs. When the refresh
         # event is triggered, the back buffers are swapped into the front
         # buffers and the content here will be rendered to
-        # {Vedeu::Terminal.output}.
+        # {Vedeu::Terminal#output}.
         #
         #   Vedeu.views do
         #     view 'some_interface' do

data/lib/vedeu/geometry/coordinate.rb

@@ -19,9 +19,13 @@ module Vedeu
     # Returns a new instance of Vedeu::Coordinate.
     #
     # @param name [String]
+    # @param oy [Fixnum]
+    # @param ox [Fixnum]
     # @return [Vedeu::Coordinate]
-    def initialize(name)
+    def initialize(name, oy, ox)
       @name = name
+      @ox   = ox
+      @oy   = oy
     end
 
     # Returns the maximum y coordinate for an area.
@@ -69,17 +73,16 @@ module Vedeu
     #   y_position(2)  # => 9
     #   y_position(7)  # => 11
     #
-    # @param index [Fixnum]
     # @return [Fixnum]
-    def y_position(index = 0)
-      value = if index <= 0
+    def y_position
+      value = if oy <= 0
                 y
 
-              elsif index > yn_index
+              elsif oy > yn_index
                 yn
 
               else
-                y_range[index]
+                y_range[oy]
 
               end
 
@@ -95,17 +98,16 @@ module Vedeu
     #   x_position(2)  # => 6
     #   x_position(15) # => 13
     #
-    # @param index [Fixnum]
     # @return [Fixnum]
-    def x_position(index = 0)
-      value = if index <= 0
+    def x_position
+      value = if ox <= 0
                 x
 
-              elsif index > xn_index
+              elsif ox > xn_index
                 xn
 
               else
-                x_range[index]
+                x_range[ox]
 
               end
 
@@ -118,6 +120,14 @@ module Vedeu
     # @return [String]
     attr_reader :name
 
+    # @!attribute [r] oy
+    # @return [Fixnum]
+    attr_reader :oy
+
+    # @!attribute [r] ox
+    # @return [Fixnum]
+    attr_reader :ox
+
     private
 
     # @see Vedeu::Borders#by_name

data/lib/vedeu/geometry/geometry.rb

@@ -141,7 +141,7 @@ module Vedeu
 
       work = store
 
-      Vedeu.trigger(:_refresh_, name)
+      Vedeu.trigger(:_refresh_)
 
       work
     end

data/lib/vedeu/geometry/position.rb

@@ -87,9 +87,9 @@ module Vedeu
     # @yieldreturn [void] Returns the block wrapped in position escape
     #   sequences.
     def to_s
-      return sequence unless block_given?
+      return [sequence, yield].join if block_given?
 
-      [sequence, yield, sequence].join
+      sequence
     end
     alias_method :to_str, :to_s
 

data/lib/vedeu/output/compressor.rb

@@ -22,7 +22,8 @@ module Vedeu
       @style  = ''
     end
 
-    # @note Takes approximately ~70ms for 2100 chars. (2015-05-24)
+    # @note
+    #   Takes approximately ~25ms for 2100 chars. (2015-07-25)
     # @return [String]
     def render
       if Vedeu::Configuration.compression?
@@ -57,12 +58,7 @@ module Vedeu
     # @return [String]
     def uncompress
       out = ''
-      Array(output).flatten.each do |char|
-        out << char.position.to_s
-        out << char.colour.to_s
-        out << char.style.to_s
-        out << char.value
-      end
+      Array(output).flatten.each { |char| out << char.to_s }
       out
     end
 

data/lib/vedeu/output/style.rb

@@ -46,7 +46,7 @@ module Vedeu
 
     # Return an attributes hash for this class.
     #
-    # @return [Array<String|Symbol>|String|Symbol]
+    # @return [Hash<Symbol => Array<String|Symbol>|String|Symbol>]
     def attributes
       {
         style: value,

data/lib/vedeu/plugins.rb

@@ -13,11 +13,9 @@ module Vedeu
 
     # Loads all plugins that are not enabled.
     #
-    # @return [void]
+    # @return [Array<void>]
     def load
-      plugins.each do |plugin|
-        plugin.load! unless plugin.enabled?
-      end
+      plugins.each { |plugin| plugin.load! unless plugin.enabled? }
     end
 
     # Register plugin with name in an internal array.
@@ -26,21 +24,21 @@ module Vedeu
     # @param plugin [Vedeu::Plugin]
     # @return [void]
     def register(name, plugin = false)
-      if plugin && !loaded?(name)
-        plugins << plugin
-      end
+      plugins << plugin if plugin && not_loaded?(name)
     end
 
     # Find all installed plugins and store them.
     #
-    # @return [void]
+    # @return [Array<void>]
     def find
       Gem.refresh
 
       Gem::Specification.each do |gem|
         next unless gem.name =~ /^#{prefix}/
+
         plugin_name = gem.name[/^#{prefix}-(.*)/, 1]
-        register(plugin_name, Plugin.new(plugin_name, gem))
+
+        register(plugin_name, Vedeu::Plugin.new(plugin_name, gem))
       end
 
       plugins
@@ -48,9 +46,10 @@ module Vedeu
 
     # Return a list of all plugin names as strings.
     #
-    # @return [void]
+    # @return [Hash]
     def names
-      plugins.reduce({}) do |hash, plugin|
+      collection = {}
+      plugins.each_with_object(collection) do |hash, plugin|
         hash[plugin.name] = plugin
         hash
       end
@@ -68,8 +67,8 @@ module Vedeu
     #
     # @param name [String]
     # @return [Boolean]
-    def loaded?(name)
-      plugins.any? { |plugin| plugin.gem_name == name }
+    def not_loaded?(name)
+      plugins.empty? || plugins.any? { |plugin| plugin.gem_name != name }
     end
 
     # @return [String]

data/lib/vedeu/plugins/plugin.rb

@@ -40,9 +40,11 @@ module Vedeu
       begin
         require gem_name unless enabled?
       rescue LoadError => error
-        fail VedeuError, "Unable to load plugin #{gem_name} due to #{error}."
+        raise Vedeu::VedeuError,
+              "Unable to load plugin #{gem_name} due to #{error}."
       rescue => error
-        fail VedeuError, "require '#{gem_name}' failed with #{error}."
+        raise Vedeu::VedeuError,
+              "require '#{gem_name}' failed with #{error}."
       end
 
       @enabled = true