vedeu 0.8.29 → 0.8.30

data/lib/vedeu/interfaces/clear.rb

@@ -11,6 +11,14 @@ module Vedeu
     class Clear
 
       include Vedeu::Common
+      extend Forwardable
+
+      def_delegators :geometry,
+                     :height,
+                     :width
+
+      def_delegators :interface,
+                     :colour
 
       class << self
 
@@ -48,29 +56,14 @@ module Vedeu
 
       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.height
-      end
-
       # @macro interface_by_name
       def interface
-        Vedeu.interfaces.by_name(name)
+        @_interface ||= Vedeu.interfaces.by_name(name)
       end
 
       # For each visible line of the interface, set the foreground and
@@ -81,40 +74,14 @@ module Vedeu
       # @return [Array<Array<Vedeu::Cells::Char>>]
       def output
         Vedeu.timer("Clearing interface: '#{name}'") do
-          @_clear ||= Array.new(height) do |iy|
-            Array.new(width) do |ix|
-              Vedeu::Cells::Clear.new(output_attributes(iy, ix))
+          @_clear ||= Array.new(height) do
+            Array.new(width) do
+              Vedeu::Cells::Clear.new(colour: colour, name: name)
             end
           end
         end
       end
 
-      # @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 ||= geometry.width
-      end
-
-      # @return [Fixnum]
-      def y
-        @_y ||= geometry.y
-      end
-
-      # @return [Fixnum]
-      def x
-        @_x ||= geometry.x
-      end
-
     end # Clear
 
   end # Interfaces

data/lib/vedeu/interfaces/clear_content.rb

@@ -11,6 +11,16 @@ module Vedeu
     class ClearContent
 
       include Vedeu::Common
+      extend Forwardable
+
+      def_delegators :geometry,
+                     :bordered_height,
+                     :bordered_width,
+                     :bx,
+                     :by
+
+      def_delegators :interface,
+                     :colour
 
       class << self
 
@@ -50,12 +60,7 @@ module Vedeu
 
       # @return [String] A string of blank characters.
       def chars
-        @_chars ||= (' ' * width)
-      end
-
-      # @return [Vedeu::Colours::Colour]
-      def colour
-        @_colour ||= interface.colour
+        @_chars ||= (' ' * bordered_width)
       end
 
       # @macro geometry_by_name
@@ -63,26 +68,19 @@ module Vedeu
         @_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)
+        @_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
+          Array.new(bordered_height) do |iy|
+            Vedeu::Geometries::Position.new(by + iy, bx).to_s +
+            colour.to_s +
+            chars
+          end.join + Vedeu::Geometries::Position.new(by, bx)
         end
       end
 
@@ -94,32 +92,14 @@ module Vedeu
       # @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)
+          @_clear ||= Array.new(bordered_height) do
+            Array.new(bordered_width) do
+              Vedeu::Cells::Clear.new(colour: colour, name: name)
             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

data/lib/vedeu/output/output.rb

@@ -52,17 +52,17 @@ module Vedeu
 
       # @return (see #render_output)
       def buffer_update
-        Vedeu::Buffers::Terminal.update(output) if present?(output)
+        Vedeu::Buffers::Terminal.update(output) if output?
       end
 
       # @return (see #render_output)
       def buffer_write
-        Vedeu::Buffers::Terminal.write(output) if present?(output)
+        Vedeu::Buffers::Terminal.write(output) if output?
       end
 
       # @return (see #render_output)
       def direct_write
-        Vedeu::Terminal.output(output.to_s) if present?(output)
+        Vedeu::Terminal.output(output.to_s) if output?
       end
 
       # Send the view to the renderers. If the output is a
@@ -92,6 +92,13 @@ module Vedeu
       #   NilClass|Vedeu::Cells::Escape|Vedeu::Cells::Cursor]
       attr_reader :output
 
+      private
+
+      # @return [Boolean]
+      def output?
+        present?(output)
+      end
+
     end # Output
 
   end # Output

data/lib/vedeu/terminal/terminal.rb

@@ -166,7 +166,13 @@ module Vedeu
   # @api public
   # @!method resize
   #   @see Vedeu::Terminal#resize
+  # @!method centre_x
+  #   @see Vedeu::Terminal#centre_x
+  # @!method centre_y
+  #   @see Vedeu::Terminal#centre_y
   def_delegators Vedeu::Terminal,
+                 :centre_x,
+                 :centre_y,
                  :resize
 
 end # Vedeu

data/lib/vedeu/version.rb

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

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

@@ -60,20 +60,31 @@ module Vedeu
           Vedeu.geometries.stubs(:by_name).returns(geometry)
           Vedeu.stubs(:direct_write)
           Vedeu.stubs(:buffer_update)
+          Vedeu.stubs(:ready?).returns(ready)
         end
 
         subject { instance.render }
 
-        # it { subject.must_be_instance_of(Vedeu::Buffers::View) }
-        it do
-          Vedeu.expects(:direct_write)
-          subject
+        context 'when Vedeu is ready' do
+          let(:ready) { true }
+
+          # 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
-        it do
-          Vedeu.expects(:buffer_update)
-          subject
+
+        context 'when Vedeu is not ready' do
+          let(:ready) { false }
+
+          it { subject.must_be_instance_of(NilClass) }
         end
-        # it { subject.must_equal(output) }
       end
 
     end # ClearContent

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

@@ -40,19 +40,15 @@ module Vedeu
         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),
+              Vedeu::Cells::Clear.new(colour: colour,
+                                      name:   _name),
             ], [
-              Vedeu::Cells::Clear.new(colour:   colour,
-                                      name:     _name,
-                                      position: [2, 1]),
-              Vedeu::Cells::Clear.new(colour:   colour,
-                                      name:     _name,
-                                      position: [2, 2]),
+              Vedeu::Cells::Clear.new(colour: colour,
+                                      name:   _name),
+              Vedeu::Cells::Clear.new(colour: colour,
+                                      name:   _name),
             ]
           ]
         }
@@ -61,16 +57,29 @@ module Vedeu
           Vedeu.interfaces.stubs(:by_name).returns(interface)
           Vedeu.geometries.stubs(:by_name).returns(geometry)
           Vedeu.stubs(:render_output).returns(output)
+          Vedeu.stubs(:ready?).returns(ready)
         end
 
         subject { instance.render }
 
-        it { subject.must_be_instance_of(Array) }
-        it do
-          Vedeu.expects(:render_output).with(output)
-          subject
+        context 'when Vedeu is ready' do
+          let(:ready) { true }
+
+          it { subject.must_be_instance_of(Array) }
+
+          it do
+            Vedeu.expects(:render_output).with(output)
+            subject
+          end
+
+          it { subject.must_equal(output) }
+        end
+
+        context 'when Vedeu is not ready' do
+          let(:ready) { false }
+
+          it { subject.must_be_instance_of(NilClass) }
         end
-        it { subject.must_equal(output) }
       end
 
     end # Clear

data/test/lib/vedeu/output/output_test.rb

@@ -18,6 +18,10 @@ module Vedeu
         it { instance.instance_variable_get('@output').must_equal(output) }
       end
 
+      describe '.buffer_update' do
+        it { described.must_respond_to(:buffer_update) }
+      end
+
       describe '.buffer_write' do
         subject { described.buffer_write(output) }
 
@@ -84,6 +88,10 @@ module Vedeu
         end
       end
 
+      describe '#buffer_update' do
+        it { instance.must_respond_to(:buffer_update) }
+      end
+
       describe '#buffer_write' do
         it { instance.must_respond_to(:buffer_write) }
       end

data/test/lib/vedeu_test.rb

@@ -17,6 +17,8 @@ describe Vedeu do
   it { Vedeu.must_respond_to(:buffers) }
   it { Vedeu.must_respond_to(:buffer_update) }
   it { Vedeu.must_respond_to(:buffer_write) }
+  it { Vedeu.must_respond_to(:centre_x) }
+  it { Vedeu.must_respond_to(:centre_y) }
   it { Vedeu.must_respond_to(:clear) }
   it { Vedeu.must_respond_to(:clear_by_group) }
   it { Vedeu.must_respond_to(:clear_by_name) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.8.29
+  version: 0.8.30
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -301,6 +301,8 @@ files:
 - docs/dsl/by_method/buffer_write.md
 - docs/dsl/by_method/buffers.md
 - docs/dsl/by_method/caption.md
+- docs/dsl/by_method/centre_x.md
+- docs/dsl/by_method/centre_y.md
 - docs/dsl/by_method/clear.md
 - docs/dsl/by_method/clear_by_group.md
 - docs/dsl/by_method/clear_by_name.md
@@ -582,6 +584,7 @@ files:
 - integrations/dsl_app_geometry_002.rb
 - integrations/dsl_app_geometry_003.rb
 - integrations/dsl_app_geometry_004.rb
+- integrations/dsl_app_geometry_005.rb
 - integrations/expected/342_streams.out
 - integrations/expected/dsl_app_001.out
 - integrations/expected/dsl_app_002.out
@@ -620,6 +623,7 @@ files:
 - integrations/expected/dsl_app_geometry_002.out
 - integrations/expected/dsl_app_geometry_003.out
 - integrations/expected/dsl_app_geometry_004.out
+- integrations/expected/dsl_app_geometry_005.out
 - integrations/support/test_interface.rb
 - integrations/support/test_interface_021.rb
 - integrations/support/test_interface_022.rb