vedeu 0.8.6 → 0.8.7

data/lib/vedeu/events/event.rb

@@ -90,8 +90,8 @@ module Vedeu
 
           new(name, block, options).bind
         end
-        alias_method :event, :bind
-        alias_method :register, :bind
+        alias event bind
+        alias register bind
 
         # {include:file:docs/dsl/by_method/bound.md}
         # @param name [Symbol]
@@ -138,13 +138,13 @@ module Vedeu
 
       # @see Vedeu::Events::Event.bind
       def bind
-        if repository.registered?(name)
-          new_collection = repository.find(name).add(self)
+        new_collection = if repository.registered?(name)
+                           repository.find(name).add(self)
 
-        else
-          new_collection = Vedeu::Events::Collection.new([self], nil, name)
+                         else
+                           Vedeu::Events::Collection.new([self], nil, name)
 
-        end
+                         end
 
         repository.store(new_collection)
 
@@ -185,16 +185,16 @@ module Vedeu
         @executed_at = @now # set execution time to now
         @now         = 0    # reset now
 
-        if args.size > 1
-          message = "Triggering: '#{name.inspect}' with #{args.inspect}"
+        message = if args.size > 1
+                    "Triggering: '#{name.inspect}' with #{args.inspect}"
 
-        elsif args.one?
-          message = "Triggering: '#{name.inspect}' for #{args.first.inspect}"
+                  elsif args.one?
+                    "Triggering: '#{name.inspect}' for #{args.first.inspect}"
 
-        else
-          message = "Triggering: '#{name.inspect}'"
+                  else
+                    "Triggering: '#{name.inspect}'"
 
-        end
+                  end
 
         Vedeu.log(type: :event, message: message)
 

data/lib/vedeu/events/repository.rb

@@ -21,7 +21,7 @@ module Vedeu
         def reset!
           @events = new(Vedeu::Events::Collection)
         end
-        alias_method :reset, :reset!
+        alias reset reset!
 
       end # Eigenclass
 

data/lib/vedeu/geometries/area/area.rb

@@ -23,25 +23,25 @@ module Vedeu
       # @return [Fixnum] Returns the top coordinate (row/line start
       #   position) of the interface.
       attr_reader :y
-      alias_method :top, :y
+      alias top y
 
       # @!attribute [r] yn
       # @return [Fixnum] Returns the bottom coordinate (row/line end
       #   position) of the interface.
       attr_reader :yn
-      alias_method :bottom, :yn
+      alias bottom yn
 
       # @!attribute [r] x
       # @return [Fixnum] Returns the left coordinate (column/character
       #   start position) of the interface.
       attr_reader :x
-      alias_method :left, :x
+      alias left x
 
       # @!attribute [r] xn
       # @return [Fixnum] Returns the right coordinate (column/
       #   character end position) of the interface.
       attr_reader :xn
-      alias_method :right, :xn
+      alias right xn
 
       # @param attributes [Hash<Symbol => Boolean|Fixnum|Symbol>]
       # @option attributes horizontal_alignment [Symbol]
@@ -104,7 +104,7 @@ module Vedeu
         self.class == other.class && y == other.y && yn == other.yn &&
           x == other.x && xn == other.xn
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # Returns the width of the interface determined by whether a
       # left, right, both or neither borders are shown.

data/lib/vedeu/geometries/area/dimension.rb

@@ -93,7 +93,7 @@ module Vedeu
       # @!attribute [r] maximised
       # @return [Boolean]
       attr_reader :maximised
-      alias_method :maximised?, :maximised
+      alias maximised? maximised
 
       private
 

data/lib/vedeu/geometries/dsl/dsl.rb

@@ -175,7 +175,7 @@ module Vedeu
       def align_centre(width = nil)
         horizontal_alignment(:centre, width)
       end
-      alias_method :align_center, :align_centre
+      alias align_center align_centre
 
       # Horizontally align the interface/view to the left.
       #
@@ -311,7 +311,7 @@ module Vedeu
       def height(value)
         model.height = proc { value }
       end
-      alias_method :height=, :height
+      alias height= height
 
       # Returns the height in characters for the number of rows
       # specified.
@@ -345,7 +345,7 @@ module Vedeu
       def width(value)
         model.width = proc { value }
       end
-      alias_method :width=, :width
+      alias width= width
 
       # Specify the starting x position (column) of the interface.
       #
@@ -366,7 +366,7 @@ module Vedeu
 
         model.x = value
       end
-      alias_method :x=, :x
+      alias x= x
 
       # Specify the ending x position (column) of the interface.
       # This value will override `width`.
@@ -388,7 +388,7 @@ module Vedeu
 
         model.xn = value
       end
-      alias_method :xn=, :xn
+      alias xn= xn
 
       # Specify the starting y position (row/line) of the interface.
       #
@@ -409,7 +409,7 @@ module Vedeu
 
         model.y = value
       end
-      alias_method :y=, :y
+      alias y= y
 
       # Specify the ending y position (row/line) of the interface.
       # This value will override `height`.
@@ -431,7 +431,7 @@ module Vedeu
 
         model.yn = value
       end
-      alias_method :yn=, :yn
+      alias yn= yn
 
     end # DSL
 

data/lib/vedeu/geometries/geometry.rb

@@ -58,7 +58,7 @@ module Vedeu
       # @!attribute [rw] maximised
       # @return [Boolean]
       attr_accessor :maximised
-      alias_method :maximised?, :maximised
+      alias maximised? maximised
 
       # @!attribute [w] width
       # @return [Fixnum]
@@ -145,7 +145,7 @@ module Vedeu
       def eql?(other)
         self.class == other.class && name == other.name
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # Will maximise the named interface geometry. This means it will
       # occupy all of the available space on the terminal window.

data/lib/vedeu/geometries/position.rb

@@ -14,12 +14,12 @@ module Vedeu
       # @!attribute [r] y
       # @return [Fixnum]
       attr_reader :y
-      alias_method :first, :y
+      alias first y
 
       # @!attribute [r] x
       # @return [Fixnum]
       attr_reader :x
-      alias_method :last, :x
+      alias last x
 
       # Convenience constructor for Vedeu::Geometries::Position.
       #
@@ -92,7 +92,7 @@ module Vedeu
       def eql?(other)
         self.class == other.class && x == other.x && y == other.y
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # Return a tuple containing the y and x coordinates.
       #
@@ -114,10 +114,10 @@ module Vedeu
           position: {
             y: y,
             x: x,
-          }
+          },
         }
       end
-      alias_method :to_hash, :to_h
+      alias to_hash to_h
 
       # Return the escape sequence required to position the cursor at
       # a particular point on the screen. When passed a block, will do
@@ -133,7 +133,7 @@ module Vedeu
 
         sequence
       end
-      alias_method :to_str, :to_s
+      alias to_str to_s
 
       # Increase y coordinate; moves down.
       #

data/lib/vedeu/groups/clear.rb

@@ -21,8 +21,8 @@ module Vedeu
         def render(name)
           new(name).render
         end
-        alias_method :clear_by_group, :render
-        alias_method :by_group, :render
+        alias clear_by_group render
+        alias by_group render
 
       end # Eigenclass
 

data/lib/vedeu/groups/group.rb

@@ -89,7 +89,7 @@ module Vedeu
         self.class == other.class && name == other.name &&
           members == other.members
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # Hide the named group of interfaces, or without a name, the
       # group of the currently focussed interface. Useful for hiding
@@ -138,7 +138,7 @@ module Vedeu
 
         Vedeu::Groups::Group.store(attrs)
       end
-      alias_method :reset, :reset!
+      alias reset reset!
 
       # Show the named group of interfaces, or without a name, the
       # group of the currently focussed interface.

data/lib/vedeu/input/dsl.rb

@@ -100,7 +100,7 @@ module Vedeu
           model.add(Vedeu::Input::Key.new(value, &block))
         end
       end
-      alias_method :key=, :key
+      alias key= key
 
     end # DSL
 

data/lib/vedeu/input/key.rb

@@ -12,7 +12,7 @@ module Vedeu
       # @!attribute [r] input
       # @return [String|Symbol] Returns the key defined.
       attr_reader :input
-      alias_method :key, :input
+      alias key input
 
       # Returns a new instance of Vedeu::Input::Key.
       #
@@ -33,8 +33,8 @@ module Vedeu
       def output
         @output.call
       end
-      alias_method :action, :output
-      alias_method :press, :output
+      alias action output
+      alias press output
 
     end # Key
 

data/lib/vedeu/input/mapper.rb

@@ -91,7 +91,7 @@ module Vedeu
       def key_defined?(named = name)
         keymap?(named) && keymap(named).key_defined?(key)
       end
-      alias_method :registered?, :key_defined?
+      alias registered? key_defined?
 
       # Returns a boolean indicating that the key is not registered to
       # the current keymap, or the global keymap.
@@ -158,7 +158,7 @@ module Vedeu
       def name
         @name || Vedeu.focus
       end
-      alias_method :interface, :name
+      alias interface name
 
     end # Mapper
 

data/lib/vedeu/input/read.rb

@@ -69,7 +69,7 @@ module Vedeu
       # @return [Hash<Symbol => Symbol>]
       def defaults
         {
-          mode: :cooked
+          mode: :cooked,
         }
       end
 
@@ -97,9 +97,7 @@ module Vedeu
                       console.gets.chomp
 
                     elsif raw?
-                      keys = Vedeu::Input::Raw.read
-
-                      Vedeu::Input::Translator.translate(keys)
+                      Vedeu::Input::Translator.translate(Vedeu::Input::Raw.read)
 
                     elsif fake?
                       console.cooked do

data/lib/vedeu/input/store.rb

@@ -9,6 +9,7 @@ module Vedeu
     module Store
 
       extend self
+      extend Vedeu::Repositories::Storage
 
       # {include:file:docs/dsl/by_method/add_command.md}
       # @param command [Symbol|String]
@@ -48,23 +49,6 @@ module Vedeu
         all_keypresses[-1]
       end
 
-      # Remove all stored entries. Any commands or keypresses entered
-      # before calling this method will be removed.
-      #
-      # @return [Hash<Symbol => Array<Symbol|String>>]
-      def reset!
-        @storage = in_memory
-      end
-      alias_method :reset, :reset!
-
-      # Access all commands and keypresses stored.
-      #
-      # @return [Hash<Symbol => Array<Symbol|String>>]
-      def storage
-        @storage ||= in_memory
-      end
-      alias_method :all, :storage
-
       private
 
       # @return [Hash<Symbol => Array<Symbol|String>>]

data/lib/vedeu/input/translator.rb

@@ -38,7 +38,13 @@ module Vedeu
 
   end # Input
 
+  # Maps keypress escape sequences to symbols for special keys.
+  #
+  # @api private
+  # @return [Hash<String => Symbol>]
   KEY_TABLE = {
+    # "\u0020" => :ctrl_t, # duplicates spacebar
+    # "\u0009" => :ctrl_i, # duplicates tab
     "\u0001" => :ctrl_a,
     "\u0002" => :ctrl_b,
     "\u0003" => :ctrl_c,
@@ -49,8 +55,7 @@ module Vedeu
     "\u0006" => :ctrl_f,
     "\u0007" => :ctrl_g,
     "\u0008" => :ctrl_h,
-    # "\u0009" => :ctrl_i, # duplicates tab
-    "\u0010" => :ctrl_j, # produces "\n"
+    "\u0010" => :ctrl_j,
     "\u0011" => :ctrl_k,
     "\u0012" => :ctrl_l,
     "\u0013" => :ctrl_m,
@@ -61,17 +66,16 @@ module Vedeu
     "\u0018" => :ctrl_r,
     "\u2412" => :ctrl_r,
     "\u0019" => :ctrl_s,
-    # "\u0020" => :ctrl_t, # duplicates spacebar
-    "\u0021" => :ctrl_u,
-    "\u0022" => :ctrl_v,
-    "\u0023" => :ctrl_w,
-    "\u0024" => :ctrl_x,
-    "\u0025" => :ctrl_y,
-    "\u0026" => :ctrl_z,
-    "\eOP" => :f1,
-    "\eOQ" => :f2,
-    "\eOR" => :f3,
-    "\eOS" => :f4,
+    %(\u0021) => :ctrl_u,
+    %(\u0022) => :ctrl_v,
+    %(\u0023) => :ctrl_w,
+    %(\u0024) => :ctrl_x,
+    %(\u0025) => :ctrl_y,
+    %(\u0026) => :ctrl_z,
+    "\eOP"   => :f1,
+    "\eOQ"   => :f2,
+    "\eOR"   => :f3,
+    "\eOS"   => :f4,
     "\e[15~" => :f5,
     "\e[17~" => :f6,
     "\e[18~" => :f7,
@@ -96,37 +100,37 @@ module Vedeu
     "\e[21;5~" => :ctrl_f10,
     "\e[23;5~" => :ctrl_f11,
     "\e[24;5~" => :ctrl_f12,
-    "\e[B" => :down,
-    "\u2193" => :down,
-    "\e[D" => :left,
-    "\u2190" => :left,
-    "\e[C" => :right,
-    "\u2192" => :right,
-    "\e[A" => :up,
-    "\u2191" => :up,
-    "\u007F" => :backspace,
-    "\u2408" => :backspace,
-    "\u23CE" => :carriage_return,
-    "\e[3~" => :delete,
-    "\u232B" => :delete,
-    "\e[F" => :end,
-    "\eOF" => :end,
-    "\r" => :enter,
-    "\n" => :enter,
-    "\e" => :escape,
-    "\u238B" => :escape,
-    "\e[H" => :home,
-    "\eOH" => :home,
-    "\e[2~" => :insert,
-    "\u240A" => :line_feed,
-    "\e[5~" => :page_up,
-    "\e[6~" => :page_down,
-    "\e[1;2R" => :pause_break,
-    "\e[1;2P" => :print_screen,
-    "\e[1;2Q" => :scroll_lock,
-    "\e[Z" => :shift_tab,
-    "\t" => :tab,
-    "\u21B9" => :tab,
-  }
+    "\e[B"     => :down,
+    "\u2193"   => :down,
+    "\e[D"     => :left,
+    "\u2190"   => :left,
+    "\e[C"     => :right,
+    "\u2192"   => :right,
+    "\e[A"     => :up,
+    "\u2191"   => :up,
+    "\u007F"   => :backspace,
+    "\u2408"   => :backspace,
+    "\u23CE"   => :carriage_return,
+    "\e[3~"    => :delete,
+    "\u232B"   => :delete,
+    "\e[F"     => :end,
+    "\eOF"     => :end,
+    "\r"       => :enter,
+    "\n"       => :enter,
+    "\e"       => :escape,
+    "\u238B"   => :escape,
+    "\e[H"     => :home,
+    "\eOH"     => :home,
+    "\e[2~"    => :insert,
+    "\u240A"   => :line_feed,
+    "\e[5~"    => :page_up,
+    "\e[6~"    => :page_down,
+    "\e[1;2R"  => :pause_break,
+    "\e[1;2P"  => :print_screen,
+    "\e[1;2Q"  => :scroll_lock,
+    "\e[Z"     => :shift_tab,
+    "\t"       => :tab,
+    "\u21B9"   => :tab,
+  }.freeze
 
 end # Vedeu