vedeu 0.4.15 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c8865f24cef3c2543a91eb50d836dbc561e25d4
-  data.tar.gz: 36c470985cca56b3ce4971da527483b67371121b
+  metadata.gz: 4a9751fe9473165039b61060cd75848373362b2e
+  data.tar.gz: f26036519a3f79b436bbe48dc6ff56c0be95ee5e
 SHA512:
-  metadata.gz: 6fd140c4261e97199d0ac05f7d1cd45bbbd6132b4fb34db4359786c35d5f2a2fdbb4957946647cded9fcc5eecf18b7eab4a57ade8aabfb47957661e04f6d7f09
-  data.tar.gz: 5b123a4c23bc9600064f974c2326c0b699747c689388ff096eb3e9cfd6417fb88d04168d392ea4c76717bc6beefb4508f0606f68fdf69b1138a6f80f97eb6630
+  metadata.gz: a6cf213571c0d78127d30f13d5b7371e6f35ed841e5df29943082c43ecf2be8e6254a0959acfeddf119f1f4807a30540948d420399d727c8e3b365da2628c80c
+  data.tar.gz: 65f8b8ab0fe4bfec7074ac7d1c54294b04a764f9e9303fc2da3c27fec296c6c87897ee402f5d04e3289bd46efdc34de635eb6210ed06e1865516f78ddee3e7dd

data/.gitignore

@@ -16,6 +16,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor/bundle
 .gemtags
 .tags
 .tags_sorted_by_file

data/examples/borders_app.rb

@@ -16,8 +16,6 @@ class VedeuBordersApp
     log '/tmp/vedeu_borders_app.log'
   end
 
-  bind(:_initialize_) { Vedeu.trigger(:_refresh_) }
-
   interface 'default_border' do
     geometry do
       x      2

data/examples/colours_app.rb

@@ -16,8 +16,6 @@ class VedeuColoursApp
     log '/tmp/vedeu_colours_app.log'
   end
 
-  bind(:_initialize_) { Vedeu.trigger(:_refresh_) }
-
   interface 'colours_256' do
     geometry do
       centred!

data/examples/cursor_app.rb

@@ -17,8 +17,6 @@ class VedeuCursorApp
     log '/tmp/vedeu_cursor_app.log'
   end
 
-  bind(:_initialize_) { Vedeu.trigger(:_refresh_) }
-
   interface 'main_interface' do
     colour foreground: '#ff0000', background: '#000000'
     cursor!

data/examples/drb_app.rb

@@ -40,8 +40,6 @@ class VedeuTestApplication
     # stderr File.open("/tmp/vedeu_error.log", "w+")
   end
 
-  Vedeu.bind(:_initialize_) { Vedeu.trigger(:_refresh_) }
-
   Vedeu.border 'test_interface' do
     # Define colour and style of border
     colour foreground: '#ffff00', background: '#0000ff'

data/examples/focus_app.rb

@@ -20,8 +20,6 @@ class VedeuFocusApp
     log '/tmp/vedeu_focus_app.log'
   end
 
-  Vedeu.bind(:_initialize_) { Vedeu.trigger(:_refresh_) }
-
   update = proc do
     Vedeu.focus_next
 

data/examples/geometry_app.rb

@@ -16,8 +16,6 @@ class VedeuGeometryApp
     log '/tmp/vedeu_geometry_app.log'
   end
 
-  bind(:_initialize_) { Vedeu.trigger(:_refresh_) }
-
   interface 'main_interface' do
     colour foreground: '#ff0000', background: '#000000'
     cursor!

data/examples/hello_world.rb

@@ -19,8 +19,6 @@ class HelloWorldApp
     log '/tmp/vedeu_hello_world.log'
   end
 
-  bind(:_initialize_) { Vedeu.trigger(:_refresh_) }
-
   interface 'messages' do
     background '#000000'
     foreground '#00ff00'

data/examples/lines_app.rb

@@ -16,8 +16,6 @@ class VedeuLinesApp
     log '/tmp/vedeu_lines_app.log'
   end
 
-  bind(:_initialize_) { Vedeu.trigger(:_refresh_) }
-
   interface 'ruthenium' do
     geometry do
       centred true

data/examples/material_colours_app.rb

@@ -17,8 +17,6 @@ class VedeuMaterialColoursApp
     renderers Vedeu::FileRenderer
   end
 
-  # bind(:_initialize_) { Vedeu.trigger(:_refresh_) }
-
   interface 'main_interface' do
     border 'main_interface' do
       colour foreground: '#ffffff', background: '#000000'

data/lib/vedeu/bindings.rb

@@ -176,7 +176,8 @@ module Vedeu
     # if given.
     Vedeu.bind(:_clear_) do |name|
       if name && Vedeu.interfaces.registered?(name)
-        Vedeu::Clear.clear(Vedeu.interfaces.find(name))
+        Vedeu::Clear.clear(Vedeu.interfaces.find(name), clear_border: true,
+          use_terminal_colours: true)
 
       else
         Vedeu::Terminal.virtual.clear if Vedeu::Configuration.drb?

data/lib/vedeu/buffers/buffer.rb

@@ -110,21 +110,18 @@ module Vedeu
     #
     # @return [void]
     def clear
-      buffer = if content_for?(:front)
-                 front.clear.clear
+      Vedeu::Output.render(clear_buffer) unless clear_buffer.empty?
 
-               else
-                 interface.clear.clear
-
-               end
-
-      Vedeu::Output.render(buffer) unless buffer.empty?
-
-      buffer
+      clear_buffer
     end
 
     private
 
+    # @return [void]
+    def clear_buffer
+      @clear_buffer ||= Vedeu::Clear.new(view).clear
+    end
+
     # @return [Hash<Symbol => NilClass, String>]
     def defaults
       {
@@ -164,6 +161,17 @@ module Vedeu
       @interface ||= Vedeu.interfaces.find(name)
     end
 
+    # @return [Vedeu::Interface]
+    def view
+      if content_for?(:front)
+        front
+
+      else
+        interface
+
+      end
+    end
+
   end # Buffer
 
 end # Vedeu

data/lib/vedeu/debug.rb

@@ -5,7 +5,8 @@ module Vedeu
   # execution upon exiting.
   #
   # @param filename [String]
-  # @param block [Proc]
+  # @return [void]
+  # @yieldreturn [void] The section of the application to debug.
   def self.debug(filename = 'profile.html')
     return nil unless block_given?
 

data/lib/vedeu/distributed/server.rb

@@ -66,17 +66,23 @@ module Vedeu
 
       # @return [void]
       def restart
-        Vedeu.log(type: :drb, message: 'Attempting to restart')
+       log('Attempting to restart')
 
         return not_enabled unless drb?
 
-        log('Not running') unless drb_running?
+        if drb_running?
+          log('Restarting')
+
+          stop
 
-        log('Restarting')
+          start
 
-        stop
+        else
+          log('Not running')
 
-        start
+          start
+
+        end
       end
 
       # When called will stop the DRb server and attempt to terminate the client
@@ -99,7 +105,7 @@ module Vedeu
 
       # @return [Vedeu::Distributed::Server]
       def start
-        Vedeu.log(type: :drb, message: 'Attempting to start')
+        log('Attempting to start')
 
         return not_enabled unless drb?
 
@@ -117,7 +123,7 @@ module Vedeu
 
       # @return [Symbol]
       def status
-        Vedeu.log(type: :drb, message: 'Fetching status')
+        log('Fetching status')
 
         return not_enabled unless drb?
 
@@ -136,7 +142,7 @@ module Vedeu
 
       # @return [void]
       def stop
-        Vedeu.log(type: :drb, message: 'Attempting to stop')
+        log('Attempting to stop')
 
         return not_enabled unless drb?
 

data/lib/vedeu/dsl/composition.rb

@@ -94,20 +94,13 @@ module Vedeu
       # @param name [String] The name of the interface.
       # @return [Hash]
       def new_attributes(name)
-        attributes.merge!(existing_interface_attributes(name))
+        attributes.merge!(existing_attributes(name))
       end
 
       # @param name [String] The name of the interface.
       # @return [Hash]
-      def existing_interface_attributes(name)
-        if model.repository.registered?(name)
-          stored = model.repository.find(name)
-          stored.attributes
-
-        else
-          { name: name }
-
-        end
+      def existing_attributes(name)
+        Vedeu.interfaces.by_name(name).attributes
       end
 
       # @return [Hash]

data/lib/vedeu/dsl/line.rb

@@ -66,22 +66,19 @@ module Vedeu
       # @raise [InvalidSyntax] When no block or value is provided.
       # @return [Vedeu::Lines]
       def line(value = '', &block)
-        content = if block_given?
-                    Vedeu::Line.build({ client: client,
+        if block_given?
+          content = Vedeu::Line.build({ client: client,
                                         parent: model.parent }, &block)
 
-                  elsif value
-                    stream = Vedeu::Stream.build(client: client,
-                                                 parent: model,
-                                                 value: value)
-                    Vedeu::Line.build(client:  client,
+        elsif value
+          content = Vedeu::Line.build(client:  client,
                                       parent:  model.parent,
-                                      streams: [stream])
+                                      streams: [build_stream(value)])
 
-                  else
-                    fail InvalidSyntax, 'block not given'
+        else
+          fail InvalidSyntax, 'block not given'
 
-                  end
+        end
 
         model.parent.add(content)
       end
@@ -129,6 +126,12 @@ module Vedeu
         }
       end
 
+      # @param value [String]
+      # @return [Vedeu::Stream]
+      def build_stream(value)
+        Vedeu::Stream.build(client: client, parent: model, value: value)
+      end
+
     end # Line
 
   end # DSL

data/lib/vedeu/dsl/shared/colour.rb

@@ -70,13 +70,12 @@ module Vedeu
       #         colour background: '#000000', foreground: '#ffffff'
       #         # ...
       #
-      # @return [Hash]
+      # @return [Vedeu::Colour]
       def colour(attributes = {})
         attributes.delete_if do |k, v|
           [:background, :foreground].include?(k) == false || v.nil? || v.empty?
         end
-
-        model.colour = Vedeu::Colour.new(attributes)
+        model.colour = Vedeu::Colour.coerce(attributes)
       end
 
     end # Colour

data/lib/vedeu/geometry/coordinate.rb

@@ -250,10 +250,6 @@ module Vedeu
     # @return [String]
     attr_reader :name
 
-    def border
-      @border ||= Vedeu.borders.by_name(name)
-    end
-
   end # Coordinate
 
 end # Vedeu

data/lib/vedeu/geometry/position.rb

@@ -56,8 +56,9 @@ module Vedeu
     # point on the screen. When passed a block, will do the aforementioned,
     # call the block and then reposition to this location.
     #
-    # @param block [Proc]
     # @return [String]
+    # @yieldreturn [void] Returns the block wrapped in position escape
+    #   sequences.
     def to_s
       if block_given?
         [sequence, yield, sequence].join

data/lib/vedeu/main_loop.rb

@@ -15,8 +15,8 @@ module Vedeu
     # :nocov:
     # Start the main loop.
     #
-    # @param block [Proc]
     # @return [void]
+    # @yieldreturn [void] The client application.
     def self.start!
       @started = true
       @loop    = true

data/lib/vedeu/models/all.rb

@@ -1,6 +1,8 @@
 require 'vedeu/repositories/all'
 
 require_relative 'null'
+require_relative 'null_interface'
+
 require_relative 'cell'
 require_relative 'char'
 require_relative 'stream'

data/lib/vedeu/models/char.rb

@@ -23,6 +23,10 @@ module Vedeu
     # @return [Vedeu::Line]
     attr_accessor :parent
 
+    # @!attribute [r] attributes
+    # @return [Hash]
+    attr_reader :attributes
+
     # @!attribute [w] value
     # @return [String]
     attr_writer :value
@@ -42,9 +46,7 @@ module Vedeu
       @attributes = defaults.merge!(attributes)
 
       @border   = @attributes[:border]
-      @colour   = @attributes[:colour]
       @parent   = @attributes[:parent]
-      @style    = @attributes[:style]
       @value    = @attributes[:value]
     end
 
@@ -139,10 +141,6 @@ module Vedeu
 
     private
 
-    # @!attribute [r] attributes
-    # @return [Hash]
-    attr_reader :attributes
-
     # @return [Hash]
     def colour_to_hash
       {

data/lib/vedeu/models/composition.rb

@@ -15,6 +15,10 @@ module Vedeu
     collection Vedeu::Interfaces
     member     Vedeu::Interface
 
+    # @!attribute [r] attributes
+    # @return [Hash]
+    attr_reader :attributes
+
     # Returns a new instance of Vedeu::Composition.
     #
     # @param attributes [Hash]
@@ -25,10 +29,8 @@ module Vedeu
     def initialize(attributes = {})
       @attributes = defaults.merge!(attributes)
 
-      @colour     = @attributes[:colour]
       @interfaces = @attributes[:interfaces]
       @repository = Vedeu.interfaces
-      @style      = @attributes[:style]
     end
 
     # @param child [Vedeu::Interface]

data/lib/vedeu/models/interface.rb

@@ -42,6 +42,10 @@ module Vedeu
     attr_accessor :visible
     alias_method :visible?, :visible
 
+    # @!attribute [r] attributes
+    # @return [Hash]
+    attr_reader :attributes
+
     # @!attribute [w] lines
     # @return [Array<Vedeu::Line>]
     attr_writer :lines
@@ -81,14 +85,12 @@ module Vedeu
     def initialize(attributes = {})
       @attributes = defaults.merge!(attributes)
 
-      @colour     = @attributes[:colour]
       @delay      = @attributes[:delay]
       @group      = @attributes[:group]
       @lines      = @attributes[:lines]
       @name       = @attributes[:name]
       @parent     = @attributes[:parent]
       @repository = Vedeu.interfaces
-      @style      = @attributes[:style]
       @visible    = @attributes[:visible]
     end
 
@@ -98,22 +100,6 @@ module Vedeu
       @lines = lines.add(child)
     end
 
-    # @note
-    #   This may be unused. (GL 2015-02-20)
-    #
-    # @return [Hash]
-    def attributes
-      {
-        colour:  colour,
-        delay:   delay,
-        group:   group,
-        name:    name,
-        parent:  parent,
-        style:   style,
-        visible: true,
-      }
-    end
-
     # Returns the border object belonging to the interface.
     #
     # @return [Vedeu::Border|NilClass]