Merge pull request #234 from gavinlaking/twerks

Various improvements;

Rakefile

@@ -8,7 +8,7 @@ Rake::TestTask.new(:test) do |task|
   task.libs.push 'test'
   task.pattern = 'test/**/*_test.rb'
   task.verbose = false
-  task.warning = true # set to true for Ruby warnings (ruby -w)
+  task.warning = false # set to true for Ruby warnings (ruby -w)
 end
 
 YARD::Rake::YardocTask.new(:yard) do |task|

docs/events/system.md

@@ -43,7 +43,7 @@ to 'do things'. If the `escape` key is pressed, then `key` is triggered
 with the argument `:escape`, also an internal event `_mode_switch_` is
 triggered. Vedeu recognises most key presses and some 'extended'
 keypress (eg. Ctrl+J), a list of supported keypresses can be found here:
-{Vedeu::Input::Input#specials} and {Vedeu::Input::Input#f_keys}.
+{Vedeu::Input::Input}.
 
     Vedeu.trigger(:_keypress_, key)
 

lib/vedeu/all.rb

@@ -12,8 +12,6 @@
 require 'vedeu/terminal/all'
 require 'vedeu/repositories/all'
 
-require 'vedeu/input/keys'
-
 require 'vedeu/models/toggleable'
 
 require 'vedeu/output/presentation/presentation'

lib/vedeu/dsl/text.rb

@@ -11,9 +11,8 @@ module Text
       # string (or object responding to `to_s`), and add it as a Line
       # or to the Stream.
       #
-      # @note If using the convenience methods; {left}, {centre},
-      #   {center} or {right}, then a specified anchor will be
-      #   ignored.
+      # @note If using the convenience methods; left, centre, center
+      #   or right, then a specified anchor will be ignored.
       #
       # @example
       #   lines do

lib/vedeu/events/aliases.rb

@@ -89,7 +89,7 @@ def storage
       def trigger(alias_name, *args)
         return [] unless registered?(alias_name)
 
-        storage[alias_name].map do |event_name|
+        find(alias_name).map do |event_name|
           Vedeu.log(type: :debug, message: "#{event_name}")
           Vedeu::Events::Trigger.trigger(event_name, *args)
         end

lib/vedeu/geometry/geometry.rb

@@ -135,31 +135,21 @@ def maximise
       # TODO: Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_down
-        if yn + 1 > Vedeu.height
-          dy  = y
-          dyn = yn
-        else
-          dy  = y + 1
-          dyn = yn + 1
-        end
+        return self if yn + 1 > Vedeu.height
 
-        Vedeu::Geometry::Geometry.store(move_attributes.merge!(y: dy, yn: dyn))
+        Vedeu::Geometry::Geometry.store(move_attributes.merge!(y:  y + 1,
+                                                               yn: yn + 1))
       end
 
       # Moves the geometry left by one column.
       #
       # TODO: Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_left
-        if x - 1 < 1
-          dx  = x
-          dxn = xn
-        else
-          dx  = x - 1
-          dxn = xn - 1
-        end
+        return self if x - 1 < 1
 
-        Vedeu::Geometry::Geometry.store(move_attributes.merge!(x: dx, xn: dxn))
+        Vedeu::Geometry::Geometry.store(move_attributes.merge!(x:  x - 1,
+                                                               xn: xn - 1))
       end
 
       # Moves the geometry to the top left of the terminal.
@@ -179,31 +169,21 @@ def move_origin
       # TODO: Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_right
-        if xn + 1 > Vedeu.width
-          dx  = x
-          dxn = xn
-        else
-          dx  = x + 1
-          dxn = xn + 1
-        end
+        return self if xn + 1 > Vedeu.width
 
-        Vedeu::Geometry::Geometry.store(move_attributes.merge!(x: dx, xn: dxn))
+        Vedeu::Geometry::Geometry.store(move_attributes.merge!(x:  x + 1,
+                                                               xn: xn + 1))
       end
 
       # Moves the geometry up by one column.
       #
       # TODO: Move cursor also.
       # @return [Vedeu::Geometry::Geometry]
       def move_up
-        if y - 1 < 1
-          dy  = y
-          dyn = yn
-        else
-          dy  = y - 1
-          dyn = yn - 1
-        end
+        return self if y - 1 < 1
 
-        Vedeu::Geometry::Geometry.store(move_attributes.merge!(y: dy, yn: dyn))
+        Vedeu::Geometry::Geometry.store(move_attributes.merge!(y:  y - 1,
+                                                               yn: yn - 1))
       end
 
       # Will unmaximise the named interface geometry. Previously, when

lib/vedeu/input/all.rb

@@ -9,10 +9,10 @@ module Input
 
 end # Vedeu
 
-require 'vedeu/input/input'
+require 'vedeu/input/capture'
 require 'vedeu/input/key'
 require 'vedeu/input/keymap'
 require 'vedeu/input/keymaps'
-require 'vedeu/input/keys'
 require 'vedeu/input/mapper'
+require 'vedeu/input/store'
 require 'vedeu/input/translator'

lib/vedeu/input/input.rb → lib/vedeu/input/capture.rb

@@ -5,14 +5,14 @@ module Input
     # Captures input from the user via {Vedeu::Terminal#input} and
     # translates special characters into symbols.
     #
-    class Input
+    class Capture
 
       # Instantiate Vedeu::Input::Input and capture keypress(es).
       #
       # @param (see #initialize)
       # @return [String|Symbol]
-      def self.capture(reader)
-        new(reader).capture
+      def self.read(reader)
+        new(reader).read
       end
 
       # Returns a new instance of Vedeu::Input::Input.
@@ -29,7 +29,7 @@ def initialize(reader)
       # event with the key(s) pressed.
       #
       # @return [Array|String|Symbol]
-      def capture
+      def read
         if reader.raw_mode?
           Vedeu.trigger(:_keypress_, keypress)
 

lib/vedeu/input/key.rb

@@ -2,6 +2,12 @@ module Vedeu
 
   module Input
 
+    # A collection of {Vedeu::Input::Key} instances.
+    #
+    class Keys < Vedeu::Repositories::Collection
+
+    end # Keys
+
     # A single keypress or combination of keypresses bound to a
     # specific action.
     #

lib/vedeu/input/store.rb

@@ -0,0 +1,71 @@
+module Vedeu
+
+  module Input
+
+    # Stores each keypress or command to be retrieved later.
+    #
+    class Store
+
+      def initialize
+      end
+
+      # @return [Hash<Symbol => Array<Symbol|String>>]
+      def add_command(command)
+        all_commands << command
+      end
+
+      # @return [Hash<Symbol => Array<Symbol|String>>]
+      def add_keypress(keypress)
+        all_keypresses << keypress
+      end
+
+      # @return [Hash<Symbol => Array<Symbol|String>>]
+      def all
+        storage
+      end
+
+      # @return [Array<Symbol|String>]
+      def all_commands
+        storage[:commands]
+      end
+
+      # @return [Array<Symbol|String>]
+      def all_keypresses
+        storage[:keypresses]
+      end
+
+      # @return [NilClass|Symbol|String]
+      def last_command
+        all_commands.last
+      end
+
+      # @return [NilClass|Symbol|String]
+      def last_keypress
+        all_keypresses.last
+      end
+
+      # @return [Hash<Symbol => Array<Symbol|String>>]
+      def reset
+        @storage = in_memory
+      end
+
+      private
+
+      # @return [Hash<Symbol => Array<Symbol|String>>]
+      def storage
+        @storage ||= in_memory
+      end
+
+      # @return [Hash<Symbol => Array<Symbol|String>>]
+      def in_memory
+        {
+          commands:   [],
+          keypresses: [],
+        }
+      end
+
+    end # Store
+
+  end # Input
+
+end # Vedeu

lib/vedeu/models/group.rb

@@ -31,9 +31,7 @@ class Group
       #   visible or not.
       # @return [Vedeu::Models::Group]
       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

lib/vedeu/output/wordwrap.rb

@@ -38,19 +38,15 @@ def content
       def prune
         return text if text.size <= pruned_width
 
-        processed = []
-
-        if split_lines.size > 1
-          processed = split_lines.reduce([]) do |acc, line|
+        processed = if split_lines.size > 1
+          split_lines.reduce([]) do |acc, line|
             acc << ellipsis_string(line)
           end
 
         else
-          processed = ellipsis_string(text)
+          ellipsis_string(text)
 
         end
-
-        processed
       end
 
       # @return [String]
@@ -75,9 +71,7 @@ def wrap
           processed << reformatted
         end
 
-        processed.reduce([]) do |output, line|
-          output << line.join(' ')
-        end
+        processed.reduce([]) { |output, line| output << line.join(' ') }
       end
 
       protected

lib/vedeu/runtime/application.rb

@@ -102,7 +102,7 @@ def runner
       # @return [void]
       def main_sequence
         if configuration.interactive?
-          Vedeu::Input::Input.capture(Terminal)
+          Vedeu::Input::Capture.read(Terminal)
 
         else
           Vedeu.trigger(:_standalone_)

test/lib/vedeu/bindings/drb_test.rb

@@ -6,6 +6,10 @@ module Bindings
 
     describe DRB do
 
+      before do
+        Vedeu.stubs(:log)
+      end
+
       context 'the drb specific events are defined' do
         it { Vedeu.bound?(:_drb_input_).must_equal(true) }
         it { Vedeu.bound?(:_drb_retrieve_output_).must_equal(true) }

test/lib/vedeu/buffers/buffer_test.rb

@@ -114,6 +114,7 @@ module Buffers
 
       describe '#show' do
         before do
+          Vedeu.stubs(:log)
           # Vedeu::Clear::Interface.stubs(:render)
           Vedeu::Output::Output.stubs(:render)
         end
@@ -127,7 +128,10 @@ module Buffers
       end
 
       describe '#render' do
-        before { Vedeu::Output::Output.stubs(:render) }
+        before {
+          Vedeu.stubs(:log)
+          Vedeu::Output::Output.stubs(:render)
+        }
 
         subject { instance.render }
 

test/lib/vedeu/cursors/refresh_test.rb

@@ -20,6 +20,7 @@ module Cursors
 
       describe '.by_name' do
         before do
+          Vedeu.stubs(:log)
           Vedeu.geometry 'refresh_cursor' do
             x  1
             xn 3

test/lib/vedeu/distributed/client_test.rb

@@ -12,6 +12,7 @@ module Distributed
       let(:server)    {}
 
       before do
+        Vedeu.stubs(:log)
         $stdout.stubs(:puts)
         DRbObject.stubs(:new_with_uri).returns(server)
       end

test/lib/vedeu/distributed/server_test.rb

@@ -13,6 +13,7 @@ module Distributed
       let(:running)       { false }
 
       before do
+        Vedeu.stubs(:log)
         Vedeu::Configuration.stubs(:drb?).returns(enabled)
         DRb.stubs(:thread).returns(running)
       end

test/lib/vedeu/events/aliases_test.rb

@@ -111,6 +111,7 @@ module Events
 
         context 'when the alias name is registered' do
           before do
+            Vedeu.stubs(:log)
             Vedeu::Events::Trigger.stubs(:trigger)
 
             described.add(:some_alias, :some_event)

test/lib/vedeu/events/event_test.rb

@@ -13,6 +13,8 @@ module Events
       let(:options)    { {} }
 
       describe '.bind' do
+        before { Vedeu.stubs(:log) }
+
         subject { described.bind(event_name, options) { :event_triggered } }
 
         it { described.must_respond_to(:event) }
@@ -95,6 +97,8 @@ module Events
       end
 
       describe '#unbind' do
+        before { Vedeu.stubs(:log) }
+
         context 'when the event exists' do
           before { Vedeu.bind(:gallium) { :some_action } }