vedeu 0.6.19 → 0.6.20

data/lib/vedeu/bindings/movement.rb

@@ -19,6 +19,16 @@ module Vedeu
         directional!
       end
 
+      # @return [TrueClass]
+      def setup_aliases!
+        %w(down left right up).each do |direction|
+          Vedeu.bind_alias("_geometry_#{direction}_".to_sym,
+                           "_view_#{direction}_".to_sym)
+        end
+
+        Vedeu.bind_alias(:_cursor_reset_, :_cursor_origin_)
+      end
+
       private
 
       # :nocov:
@@ -40,9 +50,6 @@ module Vedeu
             Vedeu.trigger(:_clear_view_, name)
             Vedeu.trigger(:_refresh_view_, name)
           end
-
-          Vedeu.bind_alias("_geometry_#{direction}_".to_sym,
-                           "_view_#{direction}_".to_sym)
         end
       end
 
@@ -51,8 +58,6 @@ module Vedeu
         Vedeu.bind(:_cursor_origin_) do |name|
           Vedeu.cursors.by_name(name).move_origin
         end
-
-        Vedeu.bind_alias(:_cursor_reset_, :_cursor_origin_)
       end
 
       # See {file:docs/events/movement.md#\_cursor_position_}

data/lib/vedeu/bindings/refresh.rb

@@ -38,7 +38,7 @@ module Vedeu
       # See {file:docs/events/refresh.md#\_refresh_group_}
       def refresh_group!
         Vedeu.bind(:_refresh_group_) do |name|
-          Vedeu::Output::RefreshGroup.by_name(name)
+          Vedeu::Groups::Refresh.by_name(name)
         end
       end
 

data/lib/vedeu/bindings/system.rb

@@ -49,7 +49,7 @@ module Vedeu
 
       # See {file:docs/events/system.md#\_exit_}
       def exit!
-        Vedeu.bind(:_exit_) { Vedeu::Runtime::Application.stop }
+        Vedeu.bind(:_exit_) { Vedeu.exit }
       end
 
       # See {file:docs/events/system.md#\_initialize_}

data/lib/vedeu/bindings/visibility.rb

@@ -28,92 +28,75 @@ module Vedeu
         toggle_interface!
       end
 
+      # @return [TrueClass]
+      def setup_aliases!
+        Vedeu.bind_alias(:_cursor_hide_, :_hide_cursor_)
+
+        Vedeu.bind_alias(:_cursor_show_, :_show_cursor_)
+      end
+
       private
 
       # :nocov:
 
-      # See {file:docs/events/visibility.md#\_cleanup_}
+      # See {file:docs/events/visibility.md#\_clear_}
       def clear!
-        Vedeu.bind(:_clear_) { Vedeu::Terminal::Buffer.clear }
+        Vedeu.bind(:_clear_) { Vedeu.clear }
       end
 
       # See {file:docs/events/visibility.md#\_clear_group_}
       def clear_group!
-        Vedeu.bind(:_clear_group_) { |name| Vedeu::Clear::Group.render(name) }
+        Vedeu.bind(:_clear_group_) { |name| Vedeu.clear_by_group(name) }
       end
 
       # See {file:docs/events/visibility.md#\_clear_view_}
       def clear_view!
-        Vedeu.bind(:_clear_view_) do |name|
-          Vedeu::Clear::Interface.render(name)
-        end
+        Vedeu.bind(:_clear_view_) { |name| Vedeu.clear_by_name(name) }
       end
 
       # See {file:docs/events/visibility.md#\_hide_cursor_}
       def hide_cursor!
-        Vedeu.bind(:_hide_cursor_) do |name|
-          Vedeu::Cursors::Cursor.hide_cursor(name)
-        end
-
-        Vedeu.bind_alias(:_cursor_hide_, :_hide_cursor_)
+        Vedeu.bind(:_hide_cursor_) { |name| Vedeu.hide_cursor(name) }
       end
 
       # See {file:docs/events/visibility.md#\_hide_group_}
       def hide_group!
-        Vedeu.bind(:_hide_group_) do |name|
-          Vedeu::Models::Group.hide_group(name)
-        end
+        Vedeu.bind(:_hide_group_) { |name| Vedeu.hide_group(name) }
       end
 
       # See {file:docs/events/visibility.md#\_hide_interface_}
       def hide_interface!
-        Vedeu.bind(:_hide_interface_) do |name|
-          Vedeu::Models::Interface.hide_interface(name)
-        end
+        Vedeu.bind(:_hide_interface_) { |name| Vedeu.hide_interface(name) }
       end
 
       # See {file:docs/events/visibility.md#\_show_cursor_}
       def show_cursor!
-        Vedeu.bind(:_show_cursor_) do |name|
-          Vedeu::Cursors::Cursor.show_cursor(name)
-        end
-
-        Vedeu.bind_alias(:_cursor_show_, :_show_cursor_)
+        Vedeu.bind(:_show_cursor_) { |name| Vedeu.show_cursor(name) }
       end
 
       # See {file:docs/events/visibility.md#\_show_group_}
       def show_group!
-        Vedeu.bind(:_show_group_) do |name|
-          Vedeu::Models::Group.show_group(name)
-        end
+        Vedeu.bind(:_show_group_) { |name| Vedeu.show_group(name) }
       end
 
       # See {file:docs/events/visibility.md#\_show_interface_}
       def show_interface!
-        Vedeu.bind(:_show_interface_) do |name|
-          Vedeu::Models::Interface.show_interface(name)
-        end
+        Vedeu.bind(:_show_interface_) { |name| Vedeu.show_interface(name) }
       end
 
       # See {file:docs/events/visibility.md#\_toggle_cursor_}
       def toggle_cursor!
-        Vedeu.bind(:_toggle_cursor_) do |name|
-          Vedeu::Cursors::Cursor.toggle_cursor(name)
-        end
+        Vedeu.bind(:_toggle_cursor_) { |name| Vedeu.toggle_cursor(name) }
       end
 
       # See {file:docs/events/visibility.md#\_toggle_group_}
       def toggle_group!
-        Vedeu.bind(:_toggle_group_) do |name|
-          Vedeu::Models::Group.toggle_group(name)
-        end
+        Vedeu.bind(:_toggle_group_) { |name| Vedeu.toggle_group(name) }
       end
 
       # See {file:docs/events/visibility.md#\_toggle_interface_}
       def toggle_interface!
-        Vedeu.bind(:_toggle_interface_) do |name|
-          Vedeu::Models::Interface.toggle_interface(name)
-        end
+        Vedeu.bind(:_toggle_interface_) { |name| Vedeu.toggle_interface(name) }
       end
 
       # :nocov:

data/lib/vedeu/cursors/cursor.rb

@@ -165,8 +165,7 @@ module Vedeu
       alias_method :to_str, :to_s
 
       # Hide a named cursor, or without a name, the cursor of the
-      # currently
-      # focussed interface.
+      # currently focussed interface.
       #
       # @example
       #   Vedeu.hide_cursor(name)
@@ -210,18 +209,6 @@ module Vedeu
         render
       end
 
-      # Toggle the visibility of the cursor with the given name.
-      #
-      # @example
-      #   Vedeu.toggle_cursor(name)
-      #
-      # @return [Vedeu::Models::Escape]
-      def toggle
-        return hide if visible?
-
-        show
-      end
-
       # @return [Fixnum] The column/character coordinate.
       def x
         @x = bx  if @x < bx

data/lib/vedeu/dsl/all.rb

@@ -13,7 +13,6 @@ require 'vedeu/dsl/shared'
 require 'vedeu/dsl/use'
 require 'vedeu/dsl/presentation'
 require 'vedeu/dsl/composition'
-require 'vedeu/dsl/group'
 require 'vedeu/dsl/keymap'
 require 'vedeu/dsl/text'
 require 'vedeu/dsl/interface'

data/lib/vedeu/dsl/interface.rb

@@ -189,7 +189,7 @@ module Vedeu
       #
       # @param name [String] The name of the group to which this
       #   interface should belong.
-      # @return [Vedeu::Models::Group]
+      # @return [Vedeu::Groups::Group]
       def group(name)
         return false unless present?(name)
 

data/lib/vedeu/esc/colours.rb

@@ -79,7 +79,7 @@ module Vedeu
       # @return [void]
       def define_backgrounds!
         background_codes.each do |key, code|
-          define_method('on_' + key.to_s) do |&blk|
+          define_method("on_#{key}") do |&blk|
             "\e[#{code}m" + (blk ? blk.call + "\e[49m" : '')
           end
         end

data/lib/vedeu/geometry/geometry.rb

@@ -123,11 +123,9 @@ module Vedeu
 
         @maximised = true
 
-        work = store
-
-        Vedeu.trigger(:_refresh_view_, name)
-
-        work
+        store do
+          Vedeu.trigger(:_refresh_view_, name)
+        end
       end
 
       # Moves the geometry down by one row.
@@ -137,8 +135,7 @@ module Vedeu
       def move_down
         return self if yn + 1 > Vedeu.height
 
-        Vedeu::Geometry::Geometry.store(move_attributes.merge!(y:  y + 1,
-                                                               yn: yn + 1))
+        Vedeu::Geometry::Geometry.store(move_attributes(y: y + 1, yn: yn + 1))
       end
 
       # Moves the geometry left by one column.
@@ -148,8 +145,7 @@ module Vedeu
       def move_left
         return self if x - 1 < 1
 
-        Vedeu::Geometry::Geometry.store(move_attributes.merge!(x:  x - 1,
-                                                               xn: xn - 1))
+        Vedeu::Geometry::Geometry.store(move_attributes(x: x - 1, xn: xn - 1))
       end
 
       # Moves the geometry to the top left of the terminal.
@@ -158,10 +154,7 @@ module Vedeu
       # @return [Vedeu::Geometry::Geometry]
       def move_origin
         Vedeu::Geometry::Geometry.store(
-          move_attributes.merge!(x:  1,
-                                 xn: (xn - x + 1),
-                                 y:  1,
-                                 yn: (yn - y + 1)))
+          move_attributes(x: 1, xn: (xn - x + 1), y: 1, yn: (yn - y + 1)))
       end
 
       # Moves the geometry right by one column.
@@ -171,8 +164,7 @@ module Vedeu
       def move_right
         return self if xn + 1 > Vedeu.width
 
-        Vedeu::Geometry::Geometry.store(move_attributes.merge!(x:  x + 1,
-                                                               xn: xn + 1))
+        Vedeu::Geometry::Geometry.store(move_attributes(x: x + 1, xn: xn + 1))
       end
 
       # Moves the geometry up by one column.
@@ -182,8 +174,7 @@ module Vedeu
       def move_up
         return self if y - 1 < 1
 
-        Vedeu::Geometry::Geometry.store(move_attributes.merge!(y:  y - 1,
-                                                               yn: yn - 1))
+        Vedeu::Geometry::Geometry.store(move_attributes(y: y - 1, yn: yn - 1))
       end
 
       # Will unmaximise the named interface geometry. Previously, when
@@ -203,11 +194,9 @@ module Vedeu
 
         @maximised = false
 
-        work = store
-
-        Vedeu.trigger(:_refresh_)
-
-        work
+        store do
+          Vedeu.trigger(:_refresh_)
+        end
       end
 
       private
@@ -233,15 +222,20 @@ module Vedeu
         }
       end
 
+      # @param attrs [Hash<Symbol => Fixnum>]
+      # @option attrs x [Fixnum]
+      # @option attrs xn [Fixnum]
+      # @option attrs y [Fixnum]
+      # @option attrs yn [Fixnum]
       # @return [Hash<Symbol => Boolean, Fixnum>]
-      def move_attributes
-        @attributes.merge(
+      def move_attributes(attrs = {})
+        @attributes.merge!(
           centred:   false,
           maximised: false,
           x:         x,
           xn:        xn,
           y:         y,
-          yn:        yn)
+          yn:        yn).merge!(attrs)
       end
 
       # Returns the row/line start position for the interface.

data/lib/vedeu/groups/all.rb

@@ -0,0 +1,16 @@
+module Vedeu
+
+  # Views can be combined together into a group for easier
+  # manipulation.
+  #
+  module Groups
+
+  end # Groups
+
+end # Vedeu
+
+require 'vedeu/groups/clear'
+require 'vedeu/groups/dsl'
+require 'vedeu/groups/group'
+require 'vedeu/groups/refresh'
+require 'vedeu/groups/repository'

data/lib/vedeu/{output/clear/group.rb → groups/clear.rb}

@@ -1,10 +1,10 @@
 module Vedeu
 
-  module Clear
+  module Groups
 
     # Clear the interfaces belonging to the named group.
     #
-    class Group
+    class Clear
 
       class << self
 
@@ -23,17 +23,17 @@ module Vedeu
 
       end # Eigenclass
 
-      # Return a new instance of Vedeu::Clear::Group.
+      # Return a new instance of Vedeu::Groups::Clear.
       #
       # @param name [String]
-      # @return [Vedeu::Clear::Group]
+      # @return [Vedeu::Groups::Clear]
       def initialize(name)
         @name = name
       end
 
       # @return [void]
       def render
-        members.each { |name| Vedeu::Clear::Interface.render(name) }
+        members.each { |name| Vedeu.trigger(:_clear_view_, name) }
       end
 
       protected
@@ -49,8 +49,8 @@ module Vedeu
         Vedeu.groups.by_name(name).members
       end
 
-    end # Group
+    end # Clear
 
-  end # Clear
+  end # Groups
 
 end # Vedeu

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

@@ -1,6 +1,6 @@
 module Vedeu
 
-  module DSL
+  module Groups
 
     # Interfaces can be configured to be part of a named group. Once
     # an interface is a member of group, the group can be affected by
@@ -13,7 +13,7 @@ module Vedeu
     # showing or hiding the group would of course, show or hide the
     # interfaces of that group.
     #
-    class Group
+    class DSL
 
       include Vedeu::DSL
 
@@ -55,18 +55,18 @@ module Vedeu
       # @param name [String] The name of this group.
       # @param block [Proc]
       # @raise [Vedeu::Error::RequiresBlock]
-      # @return [Vedeu::Models::Group]
+      # @return [Vedeu::Groups::Group]
       def self.group(name, &block)
         fail Vedeu::Error::RequiresBlock unless block_given?
 
-        Vedeu::Models::Group.build(name: name, &block).store
+        Vedeu::Groups::Group.build(name: name, &block).store
       end
 
-      # Returns an instance of DSL::Group.
+      # Returns an instance of Groups::DSL.
       #
-      # @param model [Vedeu::Models::Group]
+      # @param model [Vedeu::Groups::Group]
       # @param client [Object]
-      # @return [Vedeu::DSL::Group]
+      # @return [Vedeu::Groups::DSL]
       def initialize(model, client = nil)
         @model  = model
         @client = client
@@ -79,7 +79,7 @@ module Vedeu
       #   end
       #
       # @param interface_name [String]
-      # @return [Vedeu::Models::Group]
+      # @return [Vedeu::Groups::Group]
       def add(interface_name)
         model.add(interface_name)
       end
@@ -98,8 +98,8 @@ module Vedeu
         interface_names.each { |name| add(name) }
       end
 
-    end # Group
+    end # DSL
 
-  end # DSL
+  end # Groups
 
 end # Vedeu