vedeu 0.6.19 → 0.6.20

data/lib/vedeu/{models → groups}/group.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
-  module Models
+  module Groups
 
     # Interfaces can be associated with one another by being members
     # of the same Group. A Group is a collection of interface names.
@@ -14,7 +14,7 @@ module Vedeu
       # @return [String]
       attr_accessor :name
 
-      # Return a new instance of Vedeu::Models::Group.
+      # Return a new instance of Vedeu::Groups::Group.
       #
       # @note
       #   A group being visible or not may not necessarily mean the
@@ -29,7 +29,7 @@ module Vedeu
       #   The storage for all Group models.
       # @option attributes visible [Boolean] Whether the group is
       #   visible or not.
-      # @return [Vedeu::Models::Group]
+      # @return [Vedeu::Groups::Group]
       def initialize(attributes = {})
         defaults.merge!(attributes).each do |key, value|
           instance_variable_set("@#{key}", value)
@@ -39,11 +39,11 @@ module Vedeu
       # Add a member to the group by name.
       #
       # @param member [String]
-      # @return [Vedeu::Models::Group]
+      # @return [Vedeu::Groups::Group]
       def add(member)
         attrs = attributes.merge!(members: members.add(member))
 
-        Vedeu::Models::Group.new(attrs).store
+        Vedeu::Groups::Group.new(attrs).store
       end
 
       # Returns the attributes of the group.
@@ -79,13 +79,11 @@ module Vedeu
       #   Vedeu.trigger(:_hide_group_, name)
       #   Vedeu.hide_group(name)
       #
-      # @return [Vedeu::Models::Group]
+      # @return [Vedeu::Groups::Group]
       def hide
         super
 
-        @members.each do |member|
-          Vedeu::Models::Interface.hide_interface(member)
-        end
+        @members.each { |member| Vedeu.trigger(:_hide_interface_, member) }
 
         self
       end
@@ -100,20 +98,20 @@ module Vedeu
       # Remove a member from the group by name.
       #
       # @param member [String]
-      # @return [Vedeu::Models::Group]
+      # @return [Vedeu::Groups::Group]
       def remove(member)
         attrs = attributes.merge!(members: members.delete(member))
 
-        Vedeu::Models::Group.new(attrs).store
+        Vedeu::Groups::Group.new(attrs).store
       end
 
       # Remove all members from the group.
       #
-      # @return [Vedeu::Models::Group]
+      # @return [Vedeu::Groups::Group]
       def reset
         attrs = defaults.merge!(name: name)
 
-        Vedeu::Models::Group.new(attrs).store
+        Vedeu::Groups::Group.new(attrs).store
       end
 
       # Show the named group of interfaces, or without a name, the
@@ -123,26 +121,11 @@ module Vedeu
       #   Vedeu.trigger(:_show_group_, name)
       #   Vedeu.show_group(name)
       #
-      # @return [Vedeu::Models::Group]
+      # @return [Vedeu::Groups::Group]
       def show
         super
 
-        @members.each do |member|
-          Vedeu::Models::Interface.show_interface(member)
-        end
-
-        self
-      end
-
-      # Toggle the visibility of the group with the given name.
-      #
-      # @example
-      #   Vedeu.trigger(:_toggle_group, name)
-      #   Vedeu.toggle_group(name)
-      #
-      # @return [Vedeu::Models::Group]
-      def toggle
-        super
+        @members.each { |member| Vedeu.trigger(:_show_interface_, member) }
 
         self
       end
@@ -170,6 +153,6 @@ module Vedeu
 
     end # Group
 
-  end # Models
+  end # Groups
 
 end # Vedeu

data/lib/vedeu/{output/refresh/refresh_group.rb → groups/refresh.rb}

@@ -1,6 +1,6 @@
 module Vedeu
 
-  module Output
+  module Groups
 
     # Refresh an interface, or collection of interfaces belonging to a
     # group.
@@ -12,7 +12,7 @@ module Vedeu
     # @example
     #   Vedeu.trigger(:_refresh_group_, group_name)
     #
-    class RefreshGroup
+    class Refresh
 
       include Vedeu::Common
 
@@ -24,10 +24,10 @@ module Vedeu
         new(name).by_name
       end
 
-      # Return a new instance of Vedeu::Output::RefreshGroup.
+      # Return a new instance of Vedeu::Groups::Refresh.
       #
       # @param name [String]
-      # @return [Vedeu::Output::RefreshGroup]
+      # @return [Vedeu::Groups::Refresh]
       def initialize(name)
         @name = name
       end
@@ -36,7 +36,7 @@ module Vedeu
       def by_name
         Vedeu.timer("Refresh Group: '#{group_name}'") do
           Vedeu.groups.by_name(group_name).by_zindex.each do |name|
-            Vedeu::Buffers::Refresh.by_name(name)
+            Vedeu.trigger(:_refresh_view_, name)
           end
         end
       end
@@ -59,8 +59,8 @@ module Vedeu
              'Cannot refresh group with an empty group name.'
       end
 
-    end # RefreshGroup
+    end # Refresh
 
-  end # Output
+  end # Groups
 
 end # Vedeu

data/lib/vedeu/groups/repository.rb

@@ -0,0 +1,24 @@
+module Vedeu
+
+  module Groups
+
+    # Allows the storing of view groups.
+    #
+    class Repository < Vedeu::Repositories::Repository
+
+      singleton_class.send(:alias_method, :groups, :repository)
+
+      null Vedeu::Groups::Group
+      real Vedeu::Groups::Group
+
+    end # Groups
+
+    class Group
+
+      repo Vedeu::Groups::Repository.repository
+
+    end # Group
+
+  end # Groups
+
+end # Vedeu

data/lib/vedeu/models/all.rb

@@ -11,7 +11,5 @@ end # Vedeu
 require 'vedeu/models/cell'
 require 'vedeu/models/escape'
 require 'vedeu/models/focus'
-require 'vedeu/models/group'
-require 'vedeu/models/groups'
 require 'vedeu/models/row'
 require 'vedeu/models/page'

data/lib/vedeu/models/interface.rb

@@ -87,18 +87,6 @@ module Vedeu
         Vedeu.buffers.by_name(name).show
       end
 
-      # Toggle the visibility of the interface with the given name.
-      #
-      # @example
-      #   Vedeu.toggle_interface(name)
-      #
-      # @return [void]
-      def toggle
-        return hide if visible?
-
-        show
-      end
-
       private
 
       # The default values for a new instance of this class.

data/lib/vedeu/models/toggleable.rb

@@ -4,7 +4,7 @@ module Vedeu
   # toggled between being shown and hidden.
   #
   # Currently using this are: {Vedeu::Cursors::Cursor},
-  # {Vedeu::Models::Group} and {Vedeu::Models::Interface}.
+  # {Vedeu::Groups::Group} and {Vedeu::Models::Interface}.
   #
   module Toggleable
 

data/lib/vedeu/output/clear/all.rb

@@ -9,5 +9,4 @@ module Vedeu
 
 end # Vedeu
 
-require 'vedeu/output/clear/group'
 require 'vedeu/output/clear/interface'

data/lib/vedeu/output/wordwrap.rb

@@ -38,10 +38,8 @@ module Vedeu
       def prune
         return text if text.size <= pruned_width
 
-        processed = if split_lines.size > 1
-          split_lines.reduce([]) do |acc, line|
-            acc << ellipsis_string(line)
-          end
+        if split_lines.size > 1
+          split_lines.reduce([]) { |a, e| a << ellipsis_string(e) }
 
         else
           ellipsis_string(text)
@@ -71,7 +69,7 @@ module Vedeu
           processed << reformatted
         end
 
-        processed.reduce([]) { |output, line| output << line.join(' ') }
+        processed.reduce([]) { |a, e| a << e.join(' ') }
       end
 
       protected

data/lib/vedeu/repositories/model.rb

@@ -107,10 +107,16 @@ module Vedeu
         Object.const_get(dsl_class).new(self, client)
       end
 
+      # @note If a block is given, store the model, return the model
+      #   after yielding.
       # @todo Perhaps some validation could be added here?
       # @return [void] The model instance stored in the repository.
       def store
-        repository.store(self) # if valid?
+        new_model = repository.store(self)
+
+        yield if block_given?
+
+        new_model
       end
 
       private
@@ -123,6 +129,7 @@ module Vedeu
         when 'Border'   then 'Vedeu::Borders::DSL'
         when 'Buffer'   then 'Vedeu::Buffers::DSL'
         when 'Geometry' then 'Vedeu::Geometry::DSL'
+        when 'Group'    then 'Vedeu::Groups::DSL'
         when 'Menu'     then 'Vedeu::Menus::DSL'
         # when 'ModelTestClass' then 'Vedeu::Repositories::ModelTestClass::DSL'
         else

data/lib/vedeu/runtime/main_loop.rb

@@ -24,11 +24,11 @@ module Vedeu
           while @loop
             yield
 
-            Vedeu::Cursors::Cursor.hide_cursor
+            Vedeu.trigger(:_hide_cursor_)
 
             Vedeu::Terminal::Buffer.render
 
-            Vedeu::Cursors::Cursor.show_cursor
+            Vedeu.trigger(:_show_cursor_)
 
             safe_exit_point!
           end

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.19'
+  VERSION = '0.6.20'
 
 end

data/test/lib/vedeu/api/external_test.rb

@@ -32,7 +32,7 @@ module Vedeu
       it { Vedeu.must_respond_to(:group) }
 
       describe 'Vedeu.height' do
-        before { Terminal.stubs(:size).returns([25, 40]) }
+        before { Vedeu::Terminal.stubs(:size).returns([25, 40]) }
 
         it { Vedeu.must_respond_to(:height) }
         it { Vedeu.height.must_equal(25) }

data/test/lib/vedeu/bindings/application_test.rb

@@ -8,6 +8,7 @@ module Vedeu
 
       context 'the application specific events are defined' do
         it { Vedeu.bound?(:_goto_).must_equal(true) }
+        it { Vedeu.bound?(:_action_).must_equal(true) }
       end
 
       describe '.goto!' do

data/test/lib/vedeu/bindings/bindings_test.rb

@@ -77,6 +77,33 @@ module Vedeu
       it { subject.must_equal(true) }
     end
 
+    describe '.setup_aliases!' do
+      before do
+        Vedeu::Bindings::Application.stubs(:setup_aliases!)
+        Vedeu::Bindings::Movement.stubs(:setup_aliases!)
+        Vedeu::Bindings::Visibility.stubs(:setup_aliases!)
+      end
+
+      subject { described.setup_aliases! }
+
+      it {
+        Vedeu::Bindings::Application.expects(:setup_aliases!)
+        subject
+      }
+
+      it {
+        Vedeu::Bindings::Movement.expects(:setup_aliases!)
+        subject
+      }
+
+      it {
+        Vedeu::Bindings::Visibility.expects(:setup_aliases!)
+        subject
+      }
+
+      it { subject.must_equal(true) }
+    end
+
   end # Bindings
 
 end # Vedeu

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

@@ -32,8 +32,6 @@ module Vedeu
       }
       let(:geometry) {}
 
-      before { Vedeu.geometries.stubs(:by_name).returns(geometry) }
-
       describe '.build' do
         subject {
           described.build(attributes) do
@@ -53,40 +51,42 @@ module Vedeu
       end
 
       describe 'accessors' do
-        it { instance.must_respond_to(:attributes) }
-        it { instance.must_respond_to(:attributes=) }
-        it { instance.must_respond_to(:bottom_left) }
-        it { instance.must_respond_to(:bottom_left=) }
-        it { instance.must_respond_to(:bottom_right) }
-        it { instance.must_respond_to(:bottom_right=) }
-        it { instance.must_respond_to(:caption) }
-        it { instance.must_respond_to(:caption=) }
-        it { instance.must_respond_to(:horizontal) }
-        it { instance.must_respond_to(:horizontal=) }
-        it { instance.must_respond_to(:show_bottom) }
-        it { instance.must_respond_to(:bottom?) }
-        it { instance.must_respond_to(:show_bottom=) }
-        it { instance.must_respond_to(:show_left) }
-        it { instance.must_respond_to(:left?) }
-        it { instance.must_respond_to(:show_left=) }
-        it { instance.must_respond_to(:show_right) }
-        it { instance.must_respond_to(:right?) }
-        it { instance.must_respond_to(:show_right=) }
-        it { instance.must_respond_to(:show_top) }
-        it { instance.must_respond_to(:top?) }
-        it { instance.must_respond_to(:show_top=) }
-        it { instance.must_respond_to(:title) }
-        it { instance.must_respond_to(:title=) }
-        it { instance.must_respond_to(:top_left) }
-        it { instance.must_respond_to(:top_left=) }
-        it { instance.must_respond_to(:top_right) }
-        it { instance.must_respond_to(:top_right=) }
-        it { instance.must_respond_to(:vertical) }
-        it { instance.must_respond_to(:vertical=) }
-        it { instance.must_respond_to(:name) }
-        it { instance.must_respond_to(:enabled) }
-        it { instance.must_respond_to(:enabled=) }
-        it { instance.must_respond_to(:enabled?) }
+        it {
+          instance.must_respond_to(:attributes)
+          instance.must_respond_to(:attributes=)
+          instance.must_respond_to(:bottom_left)
+          instance.must_respond_to(:bottom_left=)
+          instance.must_respond_to(:bottom_right)
+          instance.must_respond_to(:bottom_right=)
+          instance.must_respond_to(:caption)
+          instance.must_respond_to(:caption=)
+          instance.must_respond_to(:horizontal)
+          instance.must_respond_to(:horizontal=)
+          instance.must_respond_to(:show_bottom)
+          instance.must_respond_to(:bottom?)
+          instance.must_respond_to(:show_bottom=)
+          instance.must_respond_to(:show_left)
+          instance.must_respond_to(:left?)
+          instance.must_respond_to(:show_left=)
+          instance.must_respond_to(:show_right)
+          instance.must_respond_to(:right?)
+          instance.must_respond_to(:show_right=)
+          instance.must_respond_to(:show_top)
+          instance.must_respond_to(:top?)
+          instance.must_respond_to(:show_top=)
+          instance.must_respond_to(:title)
+          instance.must_respond_to(:title=)
+          instance.must_respond_to(:top_left)
+          instance.must_respond_to(:top_left=)
+          instance.must_respond_to(:top_right)
+          instance.must_respond_to(:top_right=)
+          instance.must_respond_to(:vertical)
+          instance.must_respond_to(:vertical=)
+          instance.must_respond_to(:name)
+          instance.must_respond_to(:enabled)
+          instance.must_respond_to(:enabled=)
+          instance.must_respond_to(:enabled?)
+        }
       end
 
       describe 'border offset methods; bx, bxn, by, byn' do
@@ -116,9 +116,11 @@ module Vedeu
                                         x:    2,
                                         xn:   6,
                                         y:    2,
-                                        yn: 6)
+                                        yn:   6)
         }
 
+        before { Vedeu.geometries.stubs(:by_name).returns(geometry) }
+
         describe '#bx' do
           subject { instance.bx }
 
@@ -213,6 +215,8 @@ module Vedeu
           Vedeu::Geometry::Geometry.new(name: 'borders', width: 8)
         }
 
+        before { Vedeu.geometries.stubs(:by_name).returns(geometry) }
+
         subject { instance.width }
 
         context 'when the border is not enabled' do
@@ -265,6 +269,8 @@ module Vedeu
           Vedeu::Geometry::Geometry.new(name: 'borders', height: 5)
         }
 
+        before { Vedeu.geometries.stubs(:by_name).returns(geometry) }
+
         subject { instance.height }
 
         context 'when the border is not enabled' do