vedeu 0.8.24 → 0.8.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bba38d1b7b8c6befc6f778050e727f1afa5ec5aa
-  data.tar.gz: 2f92824ce2e8faafd9cad5ccd7b69dcb528d2b42
+  metadata.gz: 977f6bdee8b7a54320de8ac868a677cdea943115
+  data.tar.gz: 1bb42f91d121a6331b8fd2ee779bd9d2f47a13da
 SHA512:
-  metadata.gz: 8f685282146b350cbdff354b6990054d022812c9cf9dba3b068efc8ed28313d318a3ea23418fb2ed943f593658017f7a6588e3e46fb564b06d2b57f10235defe
-  data.tar.gz: 0253772378f8d3de47153617970963329548b5ed5021326454d4ba21e078fb51a5df3e3f0380a0760b3c12af780cbfd7ff24af04a7afcb1729b68e6d21cad4af
+  metadata.gz: f8e18b503177a2d2478a057639c480186cd82e6c3bb766d7c918e41c0129a2e0f4f143937650e3b06c567a2fcaaa8179db07215e05f0645909bb563d13ed7624
+  data.tar.gz: 661116fd7b9a6c3209698c4ffd11248d374d63741560a793ece435c0bdda8d505cb2be806f68adacf5c36e17e0e7077d06d4831993da3e6a51c0840f50bc3d7f

data/integrations/dsl_app_030.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'vedeu'
+
+TESTCASE = 'dsl_app_030'
+
+class DSLApp
+
+  Vedeu.bind(:_initialize_) do
+    Vedeu.trigger(:_refresh_)
+    sleep 0.25
+    Vedeu.trigger(:_clear_view_)
+  end
+
+  Vedeu.configure do
+    debug!
+    height 10
+    log Dir.tmpdir + '/vedeu_views_dsl.log'
+    renderers [
+                Vedeu::Renderers::Terminal.new(
+                  filename: Dir.tmpdir + "/#{TESTCASE}.out",
+                  write_file: true),
+                # Vedeu::Renderers::JSON.new(filename: Dir.tmpdir + "/#{TESTCASE}.json"),
+                # Vedeu::Renderers::HTML.new(filename: Dir.tmpdir + "/#{TESTCASE}.html"),
+                # Vedeu::Renderers::Text.new(filename: Dir.tmpdir + "/#{TESTCASE}.txt"),
+              ]
+    run_once!
+    standalone!
+  end
+
+  load File.dirname(__FILE__) + '/support/test_interface.rb'
+
+  Vedeu.render do
+    view(:test_interface) do
+      lines do
+        line 'some content'
+      end
+    end
+  end
+
+  def self.start(argv = ARGV)
+    Vedeu::Launcher.execute!(argv)
+  end
+
+end # DSLApp
+
+Vedeu.timer('Test') do
+  DSLApp.start
+end
+
+load File.dirname(__FILE__) + '/test_runner.rb'
+TestRunner.result(TESTCASE, __FILE__)

data/integrations/dsl_app_031.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'vedeu'
+
+TESTCASE = 'dsl_app_031'
+
+class DSLApp
+
+  Vedeu.bind(:_initialize_) do
+    Vedeu.trigger(:_refresh_)
+    sleep 0.25
+    Vedeu.trigger(:_clear_view_content_)
+  end
+
+  Vedeu.configure do
+    debug!
+    height 10
+    log Dir.tmpdir + '/vedeu_views_dsl.log'
+    renderers [
+                Vedeu::Renderers::Terminal.new(
+                  filename: Dir.tmpdir + "/#{TESTCASE}.out",
+                  write_file: true),
+                # Vedeu::Renderers::JSON.new(filename: Dir.tmpdir + "/#{TESTCASE}.json"),
+                # Vedeu::Renderers::HTML.new(filename: Dir.tmpdir + "/#{TESTCASE}.html"),
+                # Vedeu::Renderers::Text.new(filename: Dir.tmpdir + "/#{TESTCASE}.txt"),
+              ]
+    run_once!
+    standalone!
+  end
+
+  load File.dirname(__FILE__) + '/support/test_interface.rb'
+
+  Vedeu.render do
+    view(:test_interface) do
+      lines do
+        line 'some content'
+      end
+    end
+  end
+
+  def self.start(argv = ARGV)
+    Vedeu::Launcher.execute!(argv)
+  end
+
+end # DSLApp
+
+Vedeu.timer('Test') do
+  DSLApp.start
+end
+
+load File.dirname(__FILE__) + '/test_runner.rb'
+TestRunner.result(TESTCASE, __FILE__)

data/integrations/dsl_app_border_012.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'vedeu'
+
+TESTCASE = 'dsl_app_border_012'
+
+class DSLApp
+
+  Vedeu.bind(:_initialize_) { Vedeu.trigger(:_refresh_) }
+
+  Vedeu.configure do
+    debug!
+    height 10
+    log Dir.tmpdir + '/vedeu_views_dsl.log'
+    renderers [
+                Vedeu::Renderers::Terminal.new(
+                  filename: Dir.tmpdir + "/#{TESTCASE}.out",
+                  write_file: true),
+                # Vedeu::Renderers::JSON.new(filename: Dir.tmpdir + "/#{TESTCASE}.json"),
+                # Vedeu::Renderers::HTML.new(filename: Dir.tmpdir + "/#{TESTCASE}.html"),
+                # Vedeu::Renderers::Text.new(filename: Dir.tmpdir + "/#{TESTCASE}.txt"),
+              ]
+    run_once!
+    standalone!
+  end
+
+  load File.dirname(__FILE__) + '/support/test_interface.rb'
+
+  Vedeu.render do
+    view(:test_interface) do
+      lines do
+        line 'border on'
+      end
+    end
+  end
+
+  def self.start(argv = ARGV)
+    Vedeu::Launcher.execute!(argv)
+  end
+
+end # DSLApp
+
+Vedeu.timer('Test') do
+  DSLApp.start
+end
+
+load File.dirname(__FILE__) + '/test_runner.rb'
+TestRunner.result(TESTCASE, __FILE__)

data/integrations/expected/dsl_app_030.out

@@ -0,0 +1 @@
+                                                                                                                                                           

data/integrations/expected/dsl_app_031.out

@@ -0,0 +1 @@
+(0l(B(0q(B Test (0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0k(B(0x(B                             (0x(B(0x(B                             (0x(B(0x(B                             (0x(B(0m(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0j(B

data/integrations/expected/dsl_app_border_012.out

@@ -0,0 +1 @@
+(0l(B(0q(B Test (0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0k(B(0x(Bborder on                    (0x(B(0x(B                             (0x(B(0x(B                             (0x(B(0m(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0q(B(0j(B

data/integrations/test_runner.sh

@@ -31,6 +31,8 @@ cd "$(dirname "$0")"
 ./dsl_app_016.rb
 ./dsl_app_021.rb
 ./dsl_app_022.rb
+./dsl_app_030.rb
+./dsl_app_031.rb
 
 # Test some border functionality
 ./dsl_app_border_001.rb # border off
@@ -44,6 +46,7 @@ cd "$(dirname "$0")"
 ./dsl_app_border_009.rb # only right
 ./dsl_app_border_010.rb # only bottom
 ./dsl_app_border_011.rb # only left
+./dsl_app_border_012.rb # border on
 
 # Failing
 # ./dsl_app_017.rb

data/lib/vedeu/boolean.rb

@@ -8,12 +8,22 @@ module Vedeu
   #
   class Boolean
 
+    # @return [Boolean]
+    def self.coerce(value = nil)
+      new(value).coerce
+    end
+
     # @param value [void]
     # @return [Vedeu::Boolean]
     def initialize(value = nil)
       @value = value
     end
 
+    # @return [Boolean]
+    def coerce
+      value ? true : false
+    end
+
     # @return [Boolean]
     def false?
       value.nil? || value == false

data/lib/vedeu/borders/dsl.rb

@@ -128,9 +128,7 @@ module Vedeu
       # and false.
       # @return [Boolean]
       def bottom(value)
-        boolean = value ? true : false
-
-        model.show_bottom = boolean
+        model.show_bottom = Vedeu::Boolean.coerce(value)
       end
       alias show_bottom bottom
       alias bottom= bottom
@@ -154,9 +152,7 @@ module Vedeu
       #   and false.
       # @return [Boolean]
       def left(value)
-        boolean = value ? true : false
-
-        model.show_left = boolean
+        model.show_left = Vedeu::Boolean.coerce(value)
       end
       alias show_left left
       alias left= left
@@ -180,9 +176,7 @@ module Vedeu
       #   and false.
       # @return [Boolean]
       def right(value)
-        boolean = value ? true : false
-
-        model.show_right = boolean
+        model.show_right = Vedeu::Boolean.coerce(value)
       end
       alias show_right right
       alias right= right
@@ -224,9 +218,7 @@ module Vedeu
       #   and false.
       # @return [Boolean]
       def top(value)
-        boolean = value ? true : false
-
-        model.show_top = boolean
+        model.show_top = Vedeu::Boolean.coerce(value)
       end
       alias show_top top
       alias top= top

data/lib/vedeu/dsl/cursors.rb

@@ -16,11 +16,10 @@ module Vedeu
       #   evaluate to true.
       # @return [Vedeu::Cursors::Cursor]
       def cursor(value = true)
-        boolean = value ? true : false
+        model.cursor_visible = Vedeu::Boolean.coerce(value)
 
-        model.cursor_visible = boolean
-
-        Vedeu::Cursors::Cursor.store(name: name, visible: boolean)
+        Vedeu::Cursors::Cursor.store(name:    name,
+                                     visible: Vedeu::Boolean.coerce(value))
       end
 
       # Set the cursor to visible for the interface or view.

data/lib/vedeu/dsl/elements.rb

@@ -68,25 +68,23 @@ module Vedeu
         requires_model!
 
         attrs = Vedeu::DSL::Attributes.build(self, model, nil, opts, &block)
+        l = Vedeu::Views::Line.build(attrs, &block)
+        v = Vedeu::Views::View.build(attrs, &block)
 
         if view_model?
           if model.lines?
-            l = Vedeu::Views::Line.build(attrs, &block)
             model.add(l)
 
           else
-            l = Vedeu::Views::View.build(attrs, &block)
-            model.value = l.value
+            model.value = v.value
 
           end
 
         elsif line_model?
-          l = Vedeu::Views::Line.build(attrs, &block)
           model.value = l.value
 
         else
-          l = Vedeu::Views::View.build(attrs, &block)
-          model.value = l.value
+          model.value = v.value
 
         end
       end

data/lib/vedeu/dsl/presentation.rb

@@ -134,9 +134,7 @@ module Vedeu
       # @param value [Boolean]
       # @return [Boolean]
       def wordwrap(value = true)
-        boolean = value ? true : false
-
-        model.wordwrap = boolean
+        model.wordwrap = Vedeu::Boolean.coerce(value)
       end
       alias wordwrap! wordwrap
 

data/lib/vedeu/interfaces/all.rb

@@ -35,6 +35,7 @@ end # Vedeu
 
 require 'vedeu/interfaces/interface'
 require 'vedeu/interfaces/clear'
+require 'vedeu/interfaces/clear_content'
 require 'vedeu/interfaces/dsl'
 require 'vedeu/interfaces/null'
 require 'vedeu/interfaces/repository'

data/lib/vedeu/interfaces/clear.rb

@@ -25,45 +25,19 @@ module Vedeu
         alias clear_by_name render
         alias by_name render
 
-        # {include:file:docs/dsl/by_method/clear_content_by_name.md}
-        # @return [Array<Array<Vedeu::Cells::Char>>]
-        # @see #initialize
-        def clear_content_by_name(name = Vedeu.focus)
-          name || Vedeu.focus
-
-          new(name, content_only: true, direct: true).render
-        end
-
       end # Eigenclass
 
       # Return a new instance of Vedeu::Interfaces::Clear.
       #
       # @macro param_name
-      # @param options [Hash]
-      # @option options content_only [Boolean] Only clear the content
-      #   not the border as well. Defaults to false.
-      # @option options direct [Boolean] Write the content directly
-      #   to the terminal using a faster mechanism. The virtual buffer
-      #   will still be updated. This improves the refresh time for
-      #   Vedeu as we will not be building a grid of
-      #   {Vedeu::Cells::Char} objects.
       # @return [Vedeu::Interfaces::Clear]
-      def initialize(name, options = {})
-        @name    = present?(name) ? name : Vedeu.focus
-        @options = options
+      def initialize(name = Vedeu.focus)
+        @name = present?(name) ? name : Vedeu.focus
       end
 
       # @return [Array<Array<Vedeu::Cells::Char>>]
       def render
-        if direct?
-          Vedeu.direct_write(optimised_output)
-
-          Vedeu.buffer_update(output)
-
-        else
-          Vedeu.render_output(output)
-
-        end
+        Vedeu.render_output(output)
       end
 
       protected
@@ -84,24 +58,6 @@ module Vedeu
         @_colour ||= interface.colour
       end
 
-      # @return [Boolean]
-      def content_only?
-        options[:content_only]
-      end
-
-      # @macro defaults_method
-      def defaults
-        {
-          content_only: false,
-          direct:       false,
-        }
-      end
-
-      # @return [Boolean]
-      def direct?
-        options[:direct]
-      end
-
       # @macro geometry_by_name
       def geometry
         @_geometry ||= Vedeu.geometries.by_name(name)
@@ -109,13 +65,7 @@ module Vedeu
 
       # @return [Fixnum]
       def height
-        @_height ||= if content_only?
-                       geometry.bordered_height
-
-                     else
-                       geometry.height
-
-                     end
+        @_height ||= geometry.height
       end
 
       # @macro interface_by_name
@@ -123,24 +73,6 @@ module Vedeu
         Vedeu.interfaces.by_name(name)
       end
 
-      # @return [Hash<Symbol => Boolean>]
-      def options
-        defaults.merge!(@options)
-      end
-
-      # @return [String]
-      def optimised_output
-        Vedeu.timer("Optimised clearing #{clearing}: '#{name}'") do
-          Array.new(height) do |iy|
-            [
-              build_position(y + iy, x),
-              colour.to_s,
-              chars,
-            ].join
-          end.join + build_position(y, x)
-        end
-      end
-
       # For each visible line of the interface, set the foreground and
       # background colours to those specified when the interface was
       # defined, then starting write space characters over the area
@@ -148,68 +80,39 @@ module Vedeu
       #
       # @return [Array<Array<Vedeu::Cells::Char>>]
       def output
-        Vedeu.timer("Clearing #{clearing}: '#{name}'") do
+        Vedeu.timer("Clearing interface: '#{name}'") do
           @_clear ||= Array.new(height) do |iy|
             Array.new(width) do |ix|
-              position = Vedeu::Geometries::Position.new((y + iy), (x + ix))
-              Vedeu::Cells::Clear.new(colour:   colour,
-                                      name:     name,
-                                      position: position)
+              Vedeu::Cells::Clear.new(output_attributes(iy, ix))
             end
           end
         end
       end
 
-      # @return [String]
-      def clearing
-        @_clearing ||= if content_only?
-                         'content'
-
-                       else
-                         'interface'
-
-                       end
-      end
-
-      # @param pos_y [Fixnum]
-      # @param pos_x [Fixnum]
-      # @return [Vedeu::Geometries::Position]
-      # @todo Not sure if #to_s is required here. (GL: 2015-11-30)
-      def build_position(pos_y, pos_x)
-        Vedeu::Geometries::Position.new(pos_y, pos_x).to_s
+      # @param iy [Fixnum]
+      # @param ix [Fixnum]
+      # @return [Hash<Symbol => ]
+      def output_attributes(iy, ix)
+        {
+          colour:   colour,
+          name:     name,
+          position: Vedeu::Geometries::Position.new((y + iy), (x + ix)),
+        }
       end
 
       # @return [Fixnum]
       def width
-        @_width ||= if content_only?
-                      geometry.bordered_width
-
-                    else
-                      geometry.width
-
-                    end
+        @_width ||= geometry.width
       end
 
       # @return [Fixnum]
       def y
-        @_y ||= if content_only?
-                  geometry.by
-
-                else
-                  geometry.y
-
-                end
+        @_y ||= geometry.y
       end
 
       # @return [Fixnum]
       def x
-        @_x ||= if content_only?
-                  geometry.bx
-
-                else
-                  geometry.x
-
-                end
+        @_x ||= geometry.x
       end
 
     end # Clear
@@ -219,11 +122,7 @@ module Vedeu
   # @api public
   # @!method clear_by_name
   #   @see Vedeu::Interfaces::Clear.clear_by_name
-  # @api public
-  # @!method clear_content_by_name
-  #   @see Vedeu::Interfaces.Clear.clear_content_by_name
   def_delegators Vedeu::Interfaces::Clear,
-                 :clear_by_name,
-                 :clear_content_by_name
+                 :clear_by_name
 
 end # Vedeu

data/lib/vedeu/interfaces/clear_content.rb

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+module Vedeu
+
+  module Interfaces
+
+    # Clear the content of the named interface.
+    #
+    # @api private
+    #
+    class ClearContent
+
+      include Vedeu::Common
+
+      class << self
+
+        # {include:file:docs/dsl/by_method/clear_content_by_name.md}
+        # @return [Vedeu::Buffers::View]
+        # @see #initialize
+        def clear_content_by_name(name = Vedeu.focus)
+          new(name).render
+        end
+
+      end # Eigenclass
+
+      # Return a new instance of Vedeu::Interfaces::ClearContent.
+      #
+      # @macro param_name
+      # @return [Vedeu::Interfaces::ClearContent]
+      def initialize(name = Vedeu.focus)
+        @name = present?(name) ? name : Vedeu.focus
+      end
+
+      # @return [Vedeu::Buffers::View]
+      def render
+        Vedeu.direct_write(optimised_output)
+
+        Vedeu.buffer_update(output)
+      end
+
+      protected
+
+      # @!attribute [r] name
+      # @macro return_name
+      attr_reader :name
+
+      private
+
+      # @return [String] A string of blank characters.
+      def chars
+        @_chars ||= (' ' * width)
+      end
+
+      # @return [Vedeu::Colours::Colour]
+      def colour
+        @_colour ||= interface.colour
+      end
+
+      # @macro geometry_by_name
+      def geometry
+        @_geometry ||= Vedeu.geometries.by_name(name)
+      end
+
+      # @return [Fixnum]
+      def height
+        @_height ||= geometry.bordered_height
+      end
+
+      # @macro interface_by_name
+      def interface
+        Vedeu.interfaces.by_name(name)
+      end
+
+      # @return [String]
+      def optimised_output
+        Vedeu.timer("Optimised clearing content: '#{name}'") do
+          Array.new(height) do |iy|
+            [
+              Vedeu::Geometries::Position.new(y + iy, x).to_s,
+              colour.to_s,
+              chars,
+            ].join
+          end.join + Vedeu::Geometries::Position.new(y, x).to_s
+        end
+      end
+
+      # For each visible line of the interface, set the foreground and
+      # background colours to those specified when the interface was
+      # defined, then starting write space characters over the area
+      # which the interface occupies.
+      #
+      # @return [Array<Array<Vedeu::Cells::Char>>]
+      def output
+        Vedeu.timer("Clearing content: '#{name}'") do
+          @_clear ||= Array.new(height) do |iy|
+            Array.new(width) do |ix|
+              position = Vedeu::Geometries::Position.new((y + iy), (x + ix))
+              Vedeu::Cells::Clear.new(colour:   colour,
+                                      name:     name,
+                                      position: position)
+            end
+          end
+        end
+      end
+
+      # @return [Fixnum]
+      def width
+        @_width ||= geometry.bordered_width
+      end
+
+      # @return [Fixnum]
+      def y
+        @_y ||= geometry.by
+      end
+
+      # @return [Fixnum]
+      def x
+        @_x ||= geometry.bx
+      end
+
+    end # ClearContent
+
+  end # Interfaces
+
+  # @api public
+  # @!method clear_content_by_name
+  #   @see Vedeu::Interfaces.ClearContent.clear_content_by_name
+  def_delegators Vedeu::Interfaces::ClearContent,
+                 :clear_content_by_name
+
+end # Vedeu

data/lib/vedeu/interfaces/dsl.rb

@@ -170,11 +170,9 @@ module Vedeu
       #
       # @return [Boolean]
       def editable(value = true)
-        boolean = value ? true : false
+        cursor(true) if Vedeu::Boolean.coerce(value)
 
-        cursor(true) if boolean
-
-        model.editable = boolean
+        model.editable = Vedeu::Boolean.coerce(value)
       end
 
       # Set the interface to be editable.
@@ -292,9 +290,7 @@ module Vedeu
       #
       # @return [Boolean]
       def visible(value = true)
-        boolean = value ? true : false
-
-        model.visible = boolean
+        model.visible = Vedeu::Boolean.coerce(value)
       end
 
       # Set the zindex of the interface. This controls the render

data/lib/vedeu/presentation/all.rb

@@ -5,12 +5,15 @@ module Vedeu
   # This module allows the sharing of presentation concerns between
   # the models: Interface, View, Line and Stream.
   #
+  # @api private
+  #
   module Presentation
 
   end # Presentation
 
 end # Vedeu
 
+require 'vedeu/presentation/parent'
 require 'vedeu/presentation/colour'
 require 'vedeu/presentation/position'
 require 'vedeu/presentation/styles'

data/lib/vedeu/presentation/colour.rb

@@ -10,6 +10,8 @@ module Vedeu
     #
     module Colour
 
+      include Vedeu::Presentation::Parent
+
       # When the background colour for the model exists, return it,
       # otherwise returns the parent background colour, or an empty
       # Vedeu::Colours::Background.
@@ -100,11 +102,6 @@ module Vedeu
         @_colour = @colour = colour
       end
 
-      # @return [NilClass|void]
-      def parent
-        present?(@parent) ? @parent : nil
-      end
-
       # @return [NilClass|String|Symbol]
       def name
         if present?(@name)

data/lib/vedeu/presentation/parent.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Vedeu
+
+  module Presentation
+
+    #
+    # @api private
+    #
+    module Parent
+
+      # @return [NilClass|void]
+      def parent
+        present?(@parent) ? @parent : nil
+      end
+
+    end # Parent
+
+  end # Presentation
+
+end # Vedeu

data/lib/vedeu/presentation/styles.rb

@@ -6,9 +6,12 @@ module Vedeu
 
     # Provides style related presentation behaviour.
     #
+    # @api private
+    #
     module Styles
 
       include Vedeu::Common
+      include Vedeu::Presentation::Parent
 
       # @return [NilClass|String|Symbol]
       def name
@@ -21,11 +24,6 @@ module Vedeu
         end
       end
 
-      # @return [NilClass|void]
-      def parent
-        present?(@parent) ? @parent : nil
-      end
-
       # When the style for the model exists, return it, otherwise
       # returns the parent style, or an empty
       # {Vedeu::Presentation::Style}.

data/lib/vedeu/version.rb

@@ -3,6 +3,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.8.24'
+  VERSION = '0.8.25'
 
 end # Vedeu

data/lib/vedeu/views/line.rb

@@ -29,6 +29,7 @@ module Vedeu
       include Vedeu::Views::DefaultAttributes
       include Vedeu::Repositories::Model
       include Vedeu::Presentation
+      include Vedeu::Presentation::Parent
       include Vedeu::Presentation::Colour
       include Vedeu::Presentation::Position
       include Vedeu::Presentation::Styles
@@ -101,11 +102,6 @@ module Vedeu
         end
       end
 
-      # @return [NilClass|void]
-      def parent
-        present?(@parent) ? @parent : nil
-      end
-
       # Returns the size of the content in characters without
       # formatting.
       #

data/lib/vedeu/views/stream.rb

@@ -30,6 +30,7 @@ module Vedeu
       include Vedeu::Views::DefaultAttributes
       include Vedeu::Repositories::Model
       include Vedeu::Presentation
+      include Vedeu::Presentation::Parent
       include Vedeu::Presentation::Colour
       include Vedeu::Presentation::Position
       include Vedeu::Presentation::Styles
@@ -105,11 +106,6 @@ module Vedeu
         end
       end
 
-      # @return [NilClass|void]
-      def parent
-        present?(@parent) ? @parent : nil
-      end
-
     end # Stream
 
   end # Views

data/lib/vedeu/views/view.rb

@@ -31,6 +31,7 @@ module Vedeu
       extend Forwardable
       include Vedeu::Repositories::Model
       include Vedeu::Presentation
+      include Vedeu::Presentation::Parent
       include Vedeu::Presentation::Colour
       include Vedeu::Presentation::Position
       include Vedeu::Presentation::Styles
@@ -118,11 +119,6 @@ module Vedeu
         end
       end
 
-      # @return [NilClass|void]
-      def parent
-        present?(@parent) ? @parent : nil
-      end
-
       # Store the view in its respective buffer.
       #
       # @param refresh [Boolean] Should the buffer of the view be

data/test/lib/vedeu/boolean_test.rb

@@ -14,6 +14,24 @@ module Vedeu
       it { instance.must_be_instance_of(Vedeu::Boolean) }
     end
 
+    describe '.coerce' do
+      subject { described.coerce(_value) }
+
+      context 'when the value is falsy' do
+        it { subject.must_equal(false) }
+      end
+
+      context 'when the value is truthy' do
+        let(:_value) { 0 }
+
+        it { subject.must_equal(true) }
+      end
+    end
+
+    describe '#coerce' do
+      it { instance.must_respond_to(:coerce) }
+    end
+
     describe '#false?' do
       subject { instance.false? }
 

data/test/lib/vedeu/interfaces/clear_content_test.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Vedeu
+
+  describe 'Bindings' do
+    it { Vedeu.bound?(:_clear_view_).must_equal(true) }
+    it { Vedeu.bound?(:_clear_view_content_).must_equal(true) }
+  end
+
+  module Interfaces
+
+    describe ClearContent do
+
+      let(:described) { Vedeu::Interfaces::ClearContent }
+      let(:instance)  { described.new(_name) }
+      let(:_name)     { :vedeu_interfaces_clear }
+
+      describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@name').must_equal(_name) }
+      end
+
+      describe '.clear_content_by_name' do
+        it { described.must_respond_to(:clear_content_by_name) }
+      end
+
+      describe '#render' do
+        let(:interface) {
+          Vedeu::Interfaces::Interface.new(name: _name, visible: visible)
+        }
+        let(:colour)    { interface.colour }
+        let(:visible)   { true }
+        let(:geometry)  {
+          Vedeu::Geometries::Geometry.new(name: _name, x: 1, y: 1, xn: 2, yn: 2)
+        }
+        let(:output) {
+          [
+            [
+              Vedeu::Cells::Clear.new(colour:   colour,
+                                      name:     _name,
+                                      position: [1, 1]),
+              Vedeu::Cells::Clear.new(colour:   colour,
+                                      name:     _name,
+                                      position: [1, 2]),
+            ], [
+              Vedeu::Cells::Clear.new(colour:   colour,
+                                      name:     _name,
+                                      position: [2, 1]),
+              Vedeu::Cells::Clear.new(colour:   colour,
+                                      name:     _name,
+                                      position: [2, 2]),
+            ]
+          ]
+        }
+
+        before do
+          Vedeu.interfaces.stubs(:by_name).returns(interface)
+          Vedeu.geometries.stubs(:by_name).returns(geometry)
+          Vedeu.stubs(:direct_write)
+          Vedeu.stubs(:buffer_update)
+        end
+
+        subject { instance.render }
+
+        # it { subject.must_be_instance_of(Vedeu::Buffers::View) }
+        it do
+          Vedeu.expects(:direct_write)
+          subject
+        end
+        it do
+          Vedeu.expects(:buffer_update)
+          subject
+        end
+        # it { subject.must_equal(output) }
+      end
+
+    end # ClearContent
+
+  end # Interfaces
+
+end # Vedeu

data/test/lib/vedeu/interfaces/clear_test.rb

@@ -14,19 +14,12 @@ module Vedeu
     describe Clear do
 
       let(:described) { Vedeu::Interfaces::Clear }
-      let(:instance)  { described.new(_name, options) }
-      let(:options)   {
-        {
-          content_only: false,
-          direct:       false,
-        }
-      }
+      let(:instance)  { described.new(_name) }
       let(:_name)     { :vedeu_interfaces_clear }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@name').must_equal(_name) }
-        it { instance.instance_variable_get('@options').must_equal(options) }
       end
 
       describe '.render' do

data/test/lib/vedeu/presentation/colour_test.rb

@@ -34,7 +34,7 @@ module Vedeu
       @parent = attributes[:parent]
     end
 
-  end # PresentationTestClass
+  end # PresentationColourTestClass
 
   module Presentation
 

data/test/lib/vedeu/presentation/parent_test.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Vedeu
+
+  class PresentationParentTestClass
+
+    include Vedeu::Presentation::Parent
+
+    def initialize(attributes = {})
+      @colour = attributes[:colour]
+      @parent = attributes[:parent]
+    end
+
+  end # PresentationParentTestClass
+
+  module Presentation
+
+    describe Parent do
+
+      let(:described)          { Vedeu::Presentation::Parent }
+      let(:included_described) { Vedeu::PresentationParentTestClass }
+      let(:included_instance)  { included_described.new(attributes) }
+      let(:attributes)         {
+        {
+          parent: Vedeu::PresentationParentTestClass.new
+        }
+      }
+
+      describe '#parent' do
+        it { included_instance.must_respond_to(:parent) }
+      end
+
+    end # Parent
+
+  end # Presentation
+
+end # Vedeu

data/test/lib/vedeu/presentation/styles_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 
 module Vedeu
 
-  class ParentPresentationStyleTestClass
+  class ParentPresentationStylesTestClass
 
     include Vedeu::Presentation
     include Vedeu::Presentation::Colour
@@ -18,9 +18,9 @@ module Vedeu
       @parent = nil
     end
 
-  end # ParentPresentationStyleTestClass
+  end # ParentPresentationStylesTestClass
 
-  class PresentationStyleTestClass
+  class PresentationStylesTestClass
 
     include Vedeu::Presentation
     include Vedeu::Presentation::Colour
@@ -34,14 +34,14 @@ module Vedeu
       @parent = attributes[:parent]
     end
 
-  end # PresentationTestClass
+  end # PresentationStylesTestClass
 
   module Presentation
 
     describe Styles do
 
       let(:described)          { Vedeu::Presentation::Styles }
-      let(:included_described) { Vedeu::PresentationStyleTestClass }
+      let(:included_described) { Vedeu::PresentationStylesTestClass }
       let(:included_instance)  { included_described.new(attributes) }
       let(:attributes) {
         {
@@ -49,7 +49,7 @@ module Vedeu
           style:  style,
         }
       }
-      let(:parent) { Vedeu::ParentPresentationStyleTestClass.new }
+      let(:parent) { Vedeu::ParentPresentationStylesTestClass.new }
       let(:style)  { ['bold'] }
 
       describe '#style' do
@@ -84,7 +84,7 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Presentation::Style) }
       end
 
-    end # Style
+    end # Styles
 
   end # Presentation
 

data/test/lib/vedeu/views/line_test.rb

@@ -59,19 +59,15 @@ module Vedeu
       end
 
       describe '#client' do
-      it { instance.must_respond_to(:client) }
+        it { instance.must_respond_to(:client) }
       end
 
       describe '#client=' do
-      it { instance.must_respond_to(:client=) }
-      end
-
-      describe '#parent' do
-      it { instance.must_respond_to(:parent) }
+        it { instance.must_respond_to(:client=) }
       end
 
       describe '#parent=' do
-      it { instance.must_respond_to(:parent=) }
+        it { instance.must_respond_to(:parent=) }
       end
 
       describe '#add' do

data/test/lib/vedeu/views/stream_test.rb

@@ -45,10 +45,6 @@ module Vedeu
         it { instance.instance_variable_get('@value').must_equal(_value) }
       end
 
-      describe '#parent' do
-        it { instance.must_respond_to(:parent) }
-      end
-
       describe '#parent=' do
         it { instance.must_respond_to(:parent=) }
       end

data/test/lib/vedeu/views/view_test.rb

@@ -70,10 +70,6 @@ module Vedeu
         it { instance.must_respond_to(:name=) }
       end
 
-      describe '#parent' do
-        it { instance.must_respond_to(:parent) }
-      end
-
       describe '#parent=' do
         it { instance.must_respond_to(:parent=) }
       end

data/vedeu.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov-console',  '0.3.0'
   spec.add_development_dependency 'yard',               '0.8.7.6'
 
-  spec.add_dependency 'bundler',       '~> 1.10'
+  spec.add_dependency 'bundler',       '~> 1.11'
   spec.add_dependency 'rake',          '~> 10.5'
   spec.add_dependency 'thor',          '0.19.1'
   spec.add_dependency 'vedeu_cli',     '0.0.10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.8.24
+  version: 0.8.25
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -559,6 +559,8 @@ files:
 - integrations/dsl_app_020.rb
 - integrations/dsl_app_021.rb
 - integrations/dsl_app_022.rb
+- integrations/dsl_app_030.rb
+- integrations/dsl_app_031.rb
 - integrations/dsl_app_border_001.rb
 - integrations/dsl_app_border_002.rb
 - integrations/dsl_app_border_003.rb
@@ -570,6 +572,7 @@ files:
 - integrations/dsl_app_border_009.rb
 - integrations/dsl_app_border_010.rb
 - integrations/dsl_app_border_011.rb
+- integrations/dsl_app_border_012.rb
 - integrations/expected/342_streams.out
 - integrations/expected/dsl_app_001.out
 - integrations/expected/dsl_app_002.out
@@ -590,6 +593,8 @@ files:
 - integrations/expected/dsl_app_017.out
 - integrations/expected/dsl_app_021.out
 - integrations/expected/dsl_app_022.out
+- integrations/expected/dsl_app_030.out
+- integrations/expected/dsl_app_031.out
 - integrations/expected/dsl_app_border_001.out
 - integrations/expected/dsl_app_border_002.out
 - integrations/expected/dsl_app_border_003.out
@@ -601,6 +606,7 @@ files:
 - integrations/expected/dsl_app_border_009.out
 - integrations/expected/dsl_app_border_010.out
 - integrations/expected/dsl_app_border_011.out
+- integrations/expected/dsl_app_border_012.out
 - integrations/support/test_interface.rb
 - integrations/support/test_interface_021.rb
 - integrations/support/test_interface_022.rb
@@ -782,6 +788,7 @@ files:
 - lib/vedeu/input/translator.rb
 - lib/vedeu/interfaces/all.rb
 - lib/vedeu/interfaces/clear.rb
+- lib/vedeu/interfaces/clear_content.rb
 - lib/vedeu/interfaces/dsl.rb
 - lib/vedeu/interfaces/interface.rb
 - lib/vedeu/interfaces/null.rb
@@ -819,6 +826,7 @@ files:
 - lib/vedeu/plugins/plugins.rb
 - lib/vedeu/presentation/all.rb
 - lib/vedeu/presentation/colour.rb
+- lib/vedeu/presentation/parent.rb
 - lib/vedeu/presentation/position.rb
 - lib/vedeu/presentation/presentation.rb
 - lib/vedeu/presentation/style.rb
@@ -1015,6 +1023,7 @@ files:
 - test/lib/vedeu/input/repository_test.rb
 - test/lib/vedeu/input/store_test.rb
 - test/lib/vedeu/input/translator_test.rb
+- test/lib/vedeu/interfaces/clear_content_test.rb
 - test/lib/vedeu/interfaces/clear_test.rb
 - test/lib/vedeu/interfaces/dsl_test.rb
 - test/lib/vedeu/interfaces/interface_test.rb
@@ -1045,6 +1054,7 @@ files:
 - test/lib/vedeu/plugins/plugin_test.rb
 - test/lib/vedeu/plugins/plugins_test.rb
 - test/lib/vedeu/presentation/colour_test.rb
+- test/lib/vedeu/presentation/parent_test.rb
 - test/lib/vedeu/presentation/position_test.rb
 - test/lib/vedeu/presentation/presentation_test.rb
 - test/lib/vedeu/presentation/style_test.rb
@@ -1277,6 +1287,7 @@ test_files:
 - test/lib/vedeu/input/repository_test.rb
 - test/lib/vedeu/input/store_test.rb
 - test/lib/vedeu/input/translator_test.rb
+- test/lib/vedeu/interfaces/clear_content_test.rb
 - test/lib/vedeu/interfaces/clear_test.rb
 - test/lib/vedeu/interfaces/dsl_test.rb
 - test/lib/vedeu/interfaces/interface_test.rb
@@ -1307,6 +1318,7 @@ test_files:
 - test/lib/vedeu/plugins/plugin_test.rb
 - test/lib/vedeu/plugins/plugins_test.rb
 - test/lib/vedeu/presentation/colour_test.rb
+- test/lib/vedeu/presentation/parent_test.rb
 - test/lib/vedeu/presentation/position_test.rb
 - test/lib/vedeu/presentation/presentation_test.rb
 - test/lib/vedeu/presentation/style_test.rb