vedeu 0.8.4 → 0.8.5

data/lib/vedeu/terminal/terminal.rb

@@ -8,8 +8,16 @@ module Vedeu
   module Terminal
 
     include Vedeu::Terminal::Mode
+    extend Forwardable
     extend self
 
+    def_delegators Vedeu::Configuration,
+                   :height,
+                   :width
+
+    alias_method :tyn, :height
+    alias_method :txn, :width
+
     # Opens a terminal screen in either `raw` or `cooked` mode. On
     # exit, attempts to restore the screen. See
     # {Vedeu::Terminal#restore_screen}.
@@ -132,59 +140,15 @@ module Vedeu
     def origin
       1
     end
-    alias_method :x, :origin
-    alias_method :y, :origin
     alias_method :tx, :origin
     alias_method :ty, :origin
 
-    # {include:file:docs/dsl/by_method/width.md}
-    # @return [Fixnum]
-    def width
-      return Vedeu.config.drb_width if Vedeu.config.drb?
-      return Vedeu.config.width     if Vedeu.config.width
-
-      size[-1]
-    end
-    alias_method :xn, :width
-    alias_method :txn, :width
-
-    # {include:file:docs/dsl/by_method/height.md}
-    # @return [Fixnum]
-    def height
-      return Vedeu.config.drb_height if Vedeu.config.drb?
-      return Vedeu.config.height     if Vedeu.config.height
-
-      size[0]
-    end
-    alias_method :yn, :height
-    alias_method :tyn, :height
-
     # Returns a tuple containing the height and width of the current
     # terminal.
     #
-    # @note
-    #   If the terminal is a odd number of characters in height or
-    #   width, then 1 is deducted from the dimension to make it even.
-    #   For example; the actual terminal is height: 37, width: 145,
-    #   then the reported size will be 36, 144 respectively.
-    #
-    #   This is done to make it easier for client applications to
-    #   divide the terminal space up when defining interfaces or
-    #   views, leading to more consistent rendering.
-    #
-    #   If the client application is using the
-    #   {Vedeu::Geometries::Grid#rows} or
-    #   {Vedeu::Geometries::Grid#columns} helpers, the dimensions are
-    #   made more consistent using this approach.
-    #
-    # @return [Array]
+    # @return [Array<Fixnum>]
     def size
-      h, w = console.winsize
-
-      h = (h.even? ? h : h - 1)
-      w = (w.even? ? w : w - 1)
-
-      [h, w]
+      console.winsize
     end
 
     # Provides our gateway into the wonderful rainbow-filled world of
@@ -197,16 +161,10 @@ module Vedeu
 
   end # Terminal
 
-  # @!method height
-  #   @see Vedeu::Terminal#height
   # @!method resize
   #   @see Vedeu::Terminal#resize
-  # @!method width
-  #   @see Vedeu::Terminal#width
   def_delegators Vedeu::Terminal,
-                 :height,
-                 :resize,
-                 :width
+                 :resize
 
   # :nocov:
 

data/lib/vedeu/version.rb

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

data/lib/vedeu/views/composition.rb

@@ -43,7 +43,7 @@ module Vedeu
       end
       alias_method :<<, :add
 
-      # @return [Hash]
+      # @return [Hash<Symbol => void>]
       def attributes
         {
           client: client,
@@ -54,6 +54,16 @@ module Vedeu
         }
       end
 
+      # @param refresh [Boolean] Should the buffer(s) of the view(s)
+      #   in this composition be refreshed once stored? Default:
+      #   false.
+      # @return [Vedeu::Views::Composition]
+      def update_buffers(refresh = false)
+        views.each { |view| view.update_buffer(refresh) } if views?
+
+        self
+      end
+
       private
 
       # The default values for a new instance of this class.

data/lib/vedeu/views/default_attributes.rb

@@ -23,6 +23,7 @@ module Vedeu
       # @!attribute [r] truncate
       # @return [Boolean]
       attr_reader :truncate
+      alias_method :truncate?, :truncate
 
       # @!attribute [r] width
       # @return [Fixnum|NilClass]
@@ -31,6 +32,7 @@ module Vedeu
       # @!attribute [r] wordwrap
       # @return [Boolean]
       attr_reader :wordwrap
+      alias_method :wordwrap?, :wordwrap
 
       # @return [Hash<Symbol => void>]
       def attributes

data/lib/vedeu/views/line.rb

@@ -26,7 +26,6 @@ module Vedeu
       extend Forwardable
       include Vedeu::Views::DefaultAttributes
       include Vedeu::Repositories::Model
-      include Vedeu::Repositories::Parent
       include Vedeu::Presentation
       include Vedeu::Views::Value
 
@@ -84,6 +83,22 @@ module Vedeu
       end
       alias_method :==, :eql?
 
+      # @return [NilClass|String|Symbol]
+      def name
+        if present?(@name)
+          @name
+
+        elsif parent && present?(parent.name)
+          parent.name
+
+        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

@@ -27,7 +27,6 @@ module Vedeu
       extend Forwardable
       include Vedeu::Views::DefaultAttributes
       include Vedeu::Repositories::Model
-      include Vedeu::Repositories::Parent
       include Vedeu::Presentation
 
       include Vedeu::Views::Value
@@ -88,6 +87,22 @@ module Vedeu
       end
       alias_method :==, :eql?
 
+      # @return [NilClass|String|Symbol]
+      def name
+        if present?(@name)
+          @name
+
+        elsif parent && present?(parent.name)
+          parent.name
+
+        end
+      end
+
+      # @return [NilClass|void]
+      def parent
+        present?(@parent) ? @parent : nil
+      end
+
     end # Stream
 
   end # Views

data/lib/vedeu/views/view.rb

@@ -28,7 +28,6 @@ module Vedeu
 
       extend Forwardable
       include Vedeu::Repositories::Model
-      include Vedeu::Repositories::Parent
       include Vedeu::Presentation
       include Vedeu::Views::Value
 
@@ -94,29 +93,38 @@ module Vedeu
         }
       end
 
-      # Store the view and immediately refresh it; causing to be
-      # pushed to the Terminal. Called by {Vedeu::DSL::Views.renders}.
-      #
-      # @return [Vedeu::Views::View]
-      def store_immediate
-        store_deferred
+      # @return [NilClass|String|Symbol]
+      def name
+        if present?(@name)
+          @name
 
-        Vedeu.trigger(:_refresh_view_, name)
+        elsif parent && present?(parent.name)
+          parent.name
 
-        self
+        end
       end
 
-      # When a name is given, the view is stored with this name. This
-      # view will be shown next time a refresh event is triggered with
-      # this name. Called by {Vedeu::DSL::Views.views}.
+      # @return [NilClass|void]
+      def parent
+        present?(@parent) ? @parent : nil
+      end
+
+      # Store the view in its respective buffer.
       #
-      # @raise [Vedeu::Error::InvalidSyntax] The name is not defined.
+      # @param refresh [Boolean] Should the buffer of the view be
+      #   refreshed once stored? Default: false.
+      # @raise [Vedeu::Error::MissingRequired] When the name of the
+      #   view is not defined.
       # @return [Vedeu::Views::View]
-      def store_deferred
-        fail Vedeu::Error::InvalidSyntax,
-             'Cannot store an interface without a name.' unless present?(name)
+      def update_buffer(refresh = false)
+        if present?(name)
+          buffer.add(self, refresh)
 
-        buffer.add(self)
+        else
+          fail Vedeu::Error::MissingRequired,
+               'Cannot store a view without a name.'
+
+        end
 
         self
       end

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

@@ -83,7 +83,16 @@ module Vedeu
       end
 
       describe '#caption=' do
-        it { instance.must_respond_to(:caption=) }
+        let(:_value) { 'some caption' }
+
+        subject { instance.caption=(_value) }
+
+        it {
+          instance.caption.must_equal('')
+          instance.expects(:store)
+          subject
+          instance.caption.must_equal(_value)
+        }
       end
 
       describe '#horizontal' do
@@ -147,7 +156,16 @@ module Vedeu
       end
 
       describe '#title=' do
-        it { instance.must_respond_to(:title=) }
+        let(:_value) { 'some title' }
+
+        subject { instance.title=(_value) }
+
+        it {
+          instance.title.must_equal('')
+          instance.expects(:store)
+          subject
+          instance.title.must_equal(_value)
+        }
       end
 
       describe '#top_horizontal=' do

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

@@ -64,13 +64,26 @@ module Vedeu
       end
 
       describe '#add' do
+        let(:refresh) { false }
         let(:content) {
-          Vedeu::Views::View.new(value: [Vedeu::Views::Line.new])
+          Vedeu::Views::View.new(name:  :vedeu_buffers_buffer,
+                                 value: [Vedeu::Views::Line.new])
         }
 
-        subject { instance.add(content) }
+        subject { instance.add(content, refresh) }
 
         it { subject.must_equal(true) }
+
+        context 'when refresh is true' do
+          let(:refresh) { true }
+
+          before { Vedeu.stubs(:trigger) }
+
+          it do
+            Vedeu.expects(:trigger).with(:_refresh_view_, :vedeu_buffers_buffer)
+            subject
+          end
+        end
       end
 
       describe '#back?' do

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

@@ -15,49 +15,74 @@ module Vedeu
           height: height,
           name:   _name,
           width:  width,
+          x:      x,
+          y:      y,
         }
       }
-      let(:height) { 3 }
-      let(:_name)  {}
+      let(:height) { 4 }
+      let(:_name)  { :vedeu_buffers_empty }
       let(:width)  { 9 }
+      let(:x)      { 3 }
+      let(:y)      { 2 }
+
+      let(:term_height) { 8 }
+      let(:term_width)  { 15 }
 
       before do
-        Vedeu.stubs(:height).returns(4)
-        Vedeu.stubs(:width).returns(12)
+        Vedeu.stubs(:height).returns(term_height)
+        Vedeu.stubs(:width).returns(term_width)
       end
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
 
         context 'when the height is given' do
-          it { instance.instance_variable_get('@height').must_equal(3) }
+          it { instance.instance_variable_get('@height').must_equal(height) }
         end
 
         context 'when the height not is given' do
           let(:height) {}
 
-          it { instance.instance_variable_get('@height').must_equal(4) }
+          it do
+            instance.instance_variable_get('@height').must_equal(term_height)
+          end
         end
 
         it { instance.instance_variable_get('@name').must_equal(_name) }
 
         context 'when the width is given' do
-          it { instance.instance_variable_get('@width').must_equal(9) }
+          it { instance.instance_variable_get('@width').must_equal(width) }
         end
 
         context 'when the width not is given' do
           let(:width) {}
 
-          it { instance.instance_variable_get('@width').must_equal(12) }
+          it { instance.instance_variable_get('@width').must_equal(term_width) }
         end
-      end
 
-      describe '#name' do
-        it { instance.must_respond_to(:name) }
+        context 'when x is given' do
+          it { instance.instance_variable_get('@x').must_equal(x) }
+        end
+
+        context 'when x not is given' do
+          let(:x) {}
+
+          it { instance.instance_variable_get('@x').must_equal(1) }
+        end
+
+        context 'when y is given' do
+          it { instance.instance_variable_get('@y').must_equal(y) }
+        end
+
+        context 'when y not is given' do
+          let(:y) {}
+
+          it { instance.instance_variable_get('@y').must_equal(1) }
+        end
       end
 
       describe '#buffer' do
-        let(:position) { Vedeu::Geometries::Position.new(1, 1) }
+        let(:position) { Vedeu::Geometries::Position.new(y, x) }
 
         subject { instance.buffer }
 
@@ -65,21 +90,29 @@ module Vedeu
         it { subject.first.must_be_instance_of(Array) }
         it { subject.first.first.must_be_instance_of(Vedeu::Cells::Empty) }
 
-        it { subject.size.must_equal(3) }
-        it { subject.first.size.must_equal(9) }
+        it { subject.size.must_equal(height) }
+        it { subject.first.size.must_equal(width) }
         it { subject.first.first.position.must_equal(position) }
       end
 
       describe '#height' do
-        subject { instance.height }
+        it { instance.must_respond_to(:height) }
+      end
 
-        it { subject.must_equal(height + 1) }
+      describe '#name' do
+        it { instance.must_respond_to(:name) }
       end
 
       describe '#width' do
-        subject { instance.width }
+        it { instance.must_respond_to(:width) }
+      end
+
+      describe '#x' do
+        it { instance.must_respond_to(:x) }
+      end
 
-        it { subject.must_equal(width + 1) }
+      describe '#y' do
+        it { instance.must_respond_to(:y) }
       end
 
     end # Empty