vedeu 0.6.69 → 0.6.70

data/lib/vedeu/views/chars.rb

@@ -0,0 +1,15 @@
+module Vedeu
+
+  module Views
+
+    # A collection of {Vedeu::Views::Char} instances.
+    #
+    # @api private
+    #
+    class Chars < Vedeu::Repositories::Collection
+
+    end # Chars
+
+  end # Views
+
+end # Vedeu

data/lib/vedeu/{models/views → views}/line.rb

@@ -2,14 +2,6 @@ module Vedeu
 
   module Views
 
-    # A collection of {Vedeu::Views::Line} instances.
-    #
-    # @api private
-    #
-    class Lines < Vedeu::Repositories::Collection
-
-    end # Lines
-
     # Represents a single row of the terminal. It is a container for
     # {Vedeu::Views::Stream} objects. A line's width is determined by
     # the {Vedeu::Geometries::Geometry} it belongs to.
@@ -17,15 +9,12 @@ module Vedeu
     class Line
 
       include Vedeu::Repositories::Model
+      include Vedeu::Repositories::Parent
       include Vedeu::Presentation
 
       collection Vedeu::Views::Streams
       member     Vedeu::Views::Stream
 
-      # @!attribute [r] attributes
-      # @return [Hash]
-      attr_reader :attributes
-
       # @!attribute [rw] parent
       # @return [Vedeu::Views::View]
       attr_accessor :parent
@@ -35,14 +24,13 @@ module Vedeu
       # @param attributes [Hash]
       # @option attributes client [void]
       # @option attributes colour [Vedeu::Colours::Colour]
+      # @option attributes name [String|Symbol]
       # @option attributes parent [Vedeu::Views::View]
       # @option attributes style [Vedeu::Presentation::Style]
       # @option attributes value [Vedeu::Views::Streams]
       # @return [Vedeu::Views::Line]
       def initialize(attributes = {})
-        @attributes = defaults.merge!(attributes)
-
-        @attributes.each do |key, value|
+        defaults.merge!(attributes).each do |key, value|
           instance_variable_set("@#{key}", value)
         end
       end
@@ -54,6 +42,18 @@ module Vedeu
       end
       alias_method :<<, :add
 
+      # @return [Hash<Symbol => void>]
+      def attributes
+        {
+          client: @client,
+          colour: @colour,
+          name:   name,
+          parent: parent,
+          style:  @style,
+          value:  value,
+        }
+      end
+
       # Returns an array of all the characters with formatting for
       # this line.
       #
@@ -86,11 +86,6 @@ module Vedeu
       end
       alias_method :==, :eql?
 
-      # @return [NilClass|String|Symbol]
-      def name
-        parent.name if parent
-      end
-
       # Returns the size of the content in characters without
       # formatting.
       #
@@ -109,11 +104,12 @@ module Vedeu
 
       # The default values for a new instance of this class.
       #
-      # @return [Hash<Symbol => void>]
+      # @return [Hash<Symbol => Array<void>|NilClass>]
       def defaults
         {
           client: nil,
           colour: nil,
+          name:   nil,
           parent: nil,
           style:  nil,
           value:  [],

data/lib/vedeu/views/lines.rb

@@ -0,0 +1,15 @@
+module Vedeu
+
+  module Views
+
+    # A collection of {Vedeu::Views::Line} instances.
+    #
+    # @api private
+    #
+    class Lines < Vedeu::Repositories::Collection
+
+    end # Lines
+
+  end # Views
+
+end # Vedeu

data/lib/vedeu/{models/views → views}/stream.rb

@@ -2,30 +2,20 @@ module Vedeu
 
   module Views
 
-    # A collection of {Vedeu::Views::Stream} instances.
-    #
-    # @api private
-    #
-    class Streams < Vedeu::Repositories::Collection
-
-    end # Streams
-
     # Represents a character or collection of characters as part of a
     # {Vedeu::Views::Line} which you wish to colour and style
     # independently of the other characters in that line.
     #
     class Stream
 
+      include Vedeu::Common
       include Vedeu::Repositories::Model
+      include Vedeu::Repositories::Parent
       include Vedeu::Presentation
 
       collection Vedeu::Views::Chars
       member     Vedeu::Views::Char
 
-      # @!attribute [r] attributes
-      # @return [Hash]
-      attr_reader :attributes
-
       # @!attribute [rw] parent
       # @return [Vedeu::Views::Line]
       attr_accessor :parent
@@ -46,9 +36,7 @@ module Vedeu
       # @option attributes value [String]
       # @return [Vedeu::Views::Stream]
       def initialize(attributes = {})
-        @attributes = defaults.merge!(attributes)
-
-        @attributes.each do |key, value|
+        defaults.merge!(attributes).each do |key, value|
           instance_variable_set("@#{key}", value)
         end
       end
@@ -60,6 +48,18 @@ module Vedeu
       end
       alias_method :<<, :add
 
+      # @return [Hash<Symbol => void>]
+      def attributes
+        {
+          client: @client,
+          colour: colour,
+          name:   name,
+          parent: parent,
+          style:  style,
+          value:  value,
+        }
+      end
+
       # Returns an array of characters, each element is the escape
       # sequences of colours and styles for this stream, the character
       # itself, and the escape sequences of colours and styles for the
@@ -102,11 +102,6 @@ module Vedeu
       end
       alias_method :==, :eql?
 
-      # @return [NilClass|String|Symbol]
-      def name
-        parent.name if parent
-      end
-
       # Returns the size of the content in characters without
       # formatting.
       #
@@ -124,6 +119,7 @@ module Vedeu
         {
           client: nil,
           colour: nil,
+          name:   nil,
           parent: nil,
           style:  nil,
           value:  '',

data/lib/vedeu/views/streams.rb

@@ -0,0 +1,15 @@
+module Vedeu
+
+  module Views
+
+    # A collection of {Vedeu::Views::Stream} instances.
+    #
+    # @api private
+    #
+    class Streams < Vedeu::Repositories::Collection
+
+    end # Streams
+
+  end # Views
+
+end # Vedeu

data/lib/vedeu/{models/views → views}/view.rb

@@ -2,29 +2,18 @@ module Vedeu
 
   module Views
 
-    # A collection of {Vedeu::Views::View} instances.
-    #
-    # @api private
-    #
-    class ViewCollection < Vedeu::Repositories::Collection
-
-    end # ViewCollection
-
     # Represents a container for {Vedeu::Views::Line} and
     # {Vedeu::Views::Stream} objects.
     #
     class View
 
       include Vedeu::Repositories::Model
+      include Vedeu::Repositories::Parent
       include Vedeu::Presentation
 
       collection Vedeu::Views::Lines
       member     Vedeu::Views::Line
 
-      # @!attribute [r] attributes
-      # @return [Hash]
-      attr_reader :attributes
-
       # @!attribute [rw] client
       # @return [Fixnum|Float]
       attr_accessor :client
@@ -63,9 +52,7 @@ module Vedeu
       # @option attributes zindex [Fixnum]
       # @return [Vedeu::Views::View]
       def initialize(attributes = {})
-        @attributes = defaults.merge!(attributes)
-
-        @attributes.each do |key, value|
+        defaults.merge!(attributes).each do |key, value|
           instance_variable_set("@#{key}", value)
         end
       end
@@ -77,6 +64,20 @@ module Vedeu
       end
       alias_method :<<, :add
 
+      # @return [Hash]
+      def attributes
+        {
+          client:         @client,
+          colour:         colour,
+          cursor_visible: cursor_visible,
+          name:           name,
+          parent:         parent,
+          style:          style,
+          value:          value,
+          zindex:         zindex,
+        }
+      end
+
       # Returns a DSL instance responsible for defining the DSL
       # methods of this model.
       #
@@ -118,7 +119,7 @@ module Vedeu
              'Cannot store an interface ' \
              'without a name.'.freeze unless present?(name)
 
-        Vedeu.buffers.by_name(name).add(self)
+        buffer.add(self)
 
         self
       end
@@ -127,11 +128,16 @@ module Vedeu
       #
       # @return [Boolean]
       def visible?
-        Vedeu.interfaces.by_name(name).visible?
+        interface.visible?
       end
 
       private
 
+      # @return [Vedeu::Buffers::Buffer]
+      def buffer
+        Vedeu.buffers.by_name(name)
+      end
+
       # The default values for a new instance of this class.
       #
       # @return [Hash]
@@ -148,6 +154,11 @@ module Vedeu
         }
       end
 
+      # @return [Vedeu::Interfaces::Interface]
+      def interface
+        Vedeu.interfaces.by_name(name)
+      end
+
     end # View
 
   end # Views

data/lib/vedeu/views/view_collection.rb

@@ -0,0 +1,15 @@
+module Vedeu
+
+  module Views
+
+    # A collection of {Vedeu::Views::View} instances.
+    #
+    # @api private
+    #
+    class ViewCollection < Vedeu::Repositories::Collection
+
+    end # ViewCollection
+
+  end # Views
+
+end # Vedeu

data/lib/vedeu.rb

@@ -1,3 +1,4 @@
+# Ruby standard libraries
 require 'base64'
 require 'date'
 require 'drb'
@@ -13,6 +14,7 @@ require 'thread'
 require 'time'
 require 'zlib'
 
+# Gem dependencies
 require 'thor'
 
 # Vedeu is a GUI framework for terminal/console applications written

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

@@ -0,0 +1,62 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Borders
+
+    describe SetAttribute do
+
+      let(:described) { Vedeu::Borders::SetAttribute }
+      let(:instance)  { described.new(_name, attribute, _value) }
+      let(:_name)     {}
+      let(:attribute) {}
+      let(:_value)    {}
+      let(:border)    {
+        Vedeu::Borders::Border.new(name: _name)
+      }
+
+      describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@name').must_equal(_name) }
+        it { instance.instance_variable_get('@attribute').must_equal(attribute) }
+        it { instance.instance_variable_get('@value').must_equal(_value) }
+      end
+
+      describe '.update' do
+        let(:_name)     { 'Vedeu::Borders::SetAttribute' }
+        let(:attribute) { :title }
+
+        subject { described.update(_name, attribute, _value) }
+
+        it { subject.must_be_instance_of(Vedeu::Borders::Border) }
+
+        context 'when a name is given' do
+          context 'when an attribute is given' do
+            context 'when a value is given' do
+              let(:_value) { 'Other value' }
+
+              it { subject.send(attribute).must_equal(_value) }
+            end
+
+            context 'when a value is not given' do
+              it { subject.send(attribute).must_equal('') }
+            end
+          end
+
+          context 'when an attribute is not given' do
+            let(:attribute) {}
+
+            it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
+          end
+        end
+      end
+
+      describe '#update' do
+        it { instance.must_respond_to(:update) }
+      end
+
+    end # SetAttribute
+
+  end # Borders
+
+end # Vedeu

data/test/lib/vedeu/common_test.rb

@@ -83,6 +83,12 @@ module Vedeu
         it { subject.must_equal(true) }
       end
 
+      context 'when the variable is a Symbol' do
+        let(:_value) { :some_value }
+
+        it { subject.must_equal(true) }
+      end
+
       context 'when the variable is not nil or empty' do
         let(:_value) { 'not empty' }
 

data/test/lib/vedeu/cursors/cursor_test.rb

@@ -135,8 +135,6 @@ module Vedeu
         let(:ox) { 3 }
         let(:oy) { 2 }
 
-        before { Vedeu.stubs(:trigger).with(:_refresh_cursor_, _name) }
-
         subject { instance.move_down }
 
         it { subject.must_be_instance_of(described) }
@@ -153,8 +151,6 @@ module Vedeu
         let(:ox) { 3 }
         let(:oy) { 2 }
 
-        before { Vedeu.stubs(:trigger).with(:_refresh_cursor_, _name) }
-
         subject { instance.move_left }
 
         it { subject.must_be_instance_of(described) }
@@ -187,8 +183,6 @@ module Vedeu
         let(:ox) { 3 }
         let(:oy) { 2 }
 
-        before { Vedeu.stubs(:trigger).with(:_refresh_cursor_, _name) }
-
         subject { instance.move_right }
 
         it { subject.must_be_instance_of(described) }
@@ -205,8 +199,6 @@ module Vedeu
         let(:ox) { 3 }
         let(:oy) { 2 }
 
-        before { Vedeu.stubs(:trigger).with(:_refresh_cursor_, _name) }
-
         subject { instance.move_up }
 
         it { subject.must_be_instance_of(described) }

data/test/lib/vedeu/cursors/move_test.rb

@@ -0,0 +1,73 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Cursors
+
+    describe Move do
+
+      let(:described) { Vedeu::Cursors::Move }
+      let(:instance)  { described.new(_name, direction) }
+      let(:_name)     {}
+      let(:direction) {}
+      let(:visible)   { true }
+
+      describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@name').must_equal(_name) }
+        it { instance.instance_variable_get('@direction').must_equal(direction) }
+      end
+
+      describe '.move' do
+        let(:cursor) {
+          Vedeu::Cursors::Cursor.new(name: _name, visible: visible)
+        }
+
+        before do
+          Vedeu.stubs(:trigger).with(:_refresh_cursor_, _name)
+        end
+
+        subject { described.move(_name, direction) }
+
+        context 'when a name is given' do
+          let(:_name) { 'Vedeu::Cursors::Move' }
+
+          before do
+            Vedeu.cursors.stubs(:by_name).returns(cursor)
+          end
+
+          context 'when the cursor is visible' do
+            context 'when a valid direction is given' do
+              let(:direction) { :move_left }
+
+              it { subject.must_be_instance_of(Vedeu::Cursors::Cursor) }
+            end
+
+            context 'when an invalid direction is given' do
+              let(:direction) { :invalid }
+
+              it { subject.must_equal(nil) }
+            end
+          end
+
+          context 'when the cursor is not visible' do
+            let(:visible) { false }
+
+            it { subject.must_equal(nil) }
+          end
+        end
+
+        context 'when a name is not given' do
+          it { subject.must_equal(nil) }
+        end
+      end
+
+      describe '#move' do
+        it { instance.must_respond_to(:move) }
+      end
+
+    end # Move
+
+  end # Cursors
+
+end # Vedeu

data/test/lib/vedeu/cursors/repository_test.rb

@@ -39,7 +39,9 @@ module Vedeu
         end
 
         context 'when there are no interfaces or views defined' do
-          it { proc { subject }.must_raise(Vedeu::Error::Fatal) }
+          it 'returns an unnamed cursor' do
+            subject.must_be_instance_of(Vedeu::Cursors::Cursor)
+          end
         end
       end
 

data/test/lib/vedeu/dsl/lines_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+module Vedeu
+
+  module DSL
+
+    describe Lines do
+    end # Lines
+
+  end # DSL
+
+end # Vedeu

data/test/lib/vedeu/dsl/streams_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+module Vedeu
+
+  module DSL
+
+    describe Streams do
+
+    end # Streams
+
+  end # DSL
+
+end # Vedeu

data/test/lib/vedeu/events/aliases_test.rb

@@ -8,7 +8,7 @@ module Vedeu
 
       let(:described) { Vedeu::Events::Aliases }
 
-      before { described.reset }
+      before { described.reset! }
 
       describe '.add' do
         let(:alias_name) { :alias_test }
@@ -88,10 +88,10 @@ module Vedeu
         end
       end
 
-      describe '.reset' do
-        subject { described.reset }
+      describe '.reset!' do
+        subject { described.reset! }
 
-        it { described.must_respond_to(:reset!) }
+        it { described.must_respond_to(:reset) }
 
         it { subject.must_equal({}) }
       end

data/test/lib/vedeu/groups/refresh_test.rb

@@ -45,12 +45,6 @@ module Vedeu
 
             it { proc { subject }.must_raise(Vedeu::Error::MissingRequired) }
           end
-
-          context 'when no interfaces/views have been registered' do
-            before { Vedeu::Models::Focus.reset }
-
-            it { proc { subject }.must_raise(Vedeu::Error::Fatal) }
-          end
         end
 
         context 'when the name is present' do

data/test/lib/vedeu/input/store_test.rb

@@ -8,7 +8,7 @@ module Vedeu
 
       let(:described) { Vedeu::Input::Store }
 
-      before { described.reset }
+      before { described.reset! }
 
       describe '#add_command' do
         let(:command) { 'command_1' }
@@ -99,7 +99,7 @@ module Vedeu
       end
 
       describe '#reset' do
-        subject { described.reset }
+        subject { described.reset! }
 
         it { subject.must_equal({ commands: [], keypresses: [] }) }
       end

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

@@ -76,10 +76,15 @@ module Vedeu
           instance.must_respond_to(:visible)
           instance.must_respond_to(:visible=)
           instance.must_respond_to(:visible?)
-          instance.must_respond_to(:attributes)
         }
       end
 
+      describe '#attributes' do
+        subject { instance.attributes }
+
+        it { subject.must_be_instance_of(Hash) }
+      end
+
       describe '#deputy' do
         subject { instance.deputy }