vedeu 0.8.0 → 0.8.1

data/lib/vedeu/esc/mouse.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module EscapeSequences
@@ -32,22 +34,22 @@ module Vedeu
 
       # @return [String]
       def mouse_x10_on
-        "\e[?9h".freeze
+        "\e[?9h"
       end
 
       # @return [String]
       def mouse_x10_off
-        "\e[?9l".freeze
+        "\e[?9l"
       end
 
       # @return [String]
       def mouse_on
-        "\e[?1000h".freeze
+        "\e[?1000h"
       end
 
       # @return [String]
       def mouse_off
-        "\e[?1000l".freeze
+        "\e[?1000l"
       end
 
     end # Mouse

data/lib/vedeu/events/aliases.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Events
@@ -90,7 +92,7 @@ module Vedeu
         find(alias_name).map do |event_name|
           Vedeu.log(type:    :event,
                     message: "Triggering: '#{event_name}' from alias " \
-                             "'#{alias_name}'".freeze)
+                             "'#{alias_name}'")
           Vedeu::Events::Trigger.trigger(event_name, *args)
         end
       end

data/lib/vedeu/events/all.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   # Provides event driven control to Vedeu.

data/lib/vedeu/events/collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Events

data/lib/vedeu/events/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Events
@@ -84,7 +86,7 @@ module Vedeu
         #
         # @return [Boolean]
         def bind(name, options = {}, &block)
-          Vedeu.log(type: :event, message: "Binding: '#{name.inspect}'".freeze)
+          Vedeu.log(type: :event, message: "Binding: '#{name.inspect}'")
 
           new(name, block, options).bind
         end
@@ -117,7 +119,7 @@ module Vedeu
           return false unless Vedeu.bound?(name)
 
           Vedeu.log(type:    :event,
-                    message: "Unbinding: '#{name.inspect}'".freeze)
+                    message: "Unbinding: '#{name.inspect}'")
 
           Vedeu.events.remove(name)
 
@@ -194,15 +196,18 @@ module Vedeu
         @executed_at = @now # set execution time to now
         @now         = 0    # reset now
 
-        message = "Triggering: '#{name.inspect}'"
-
         if args.size > 1
-          message << " with #{args.inspect}"
+          message = "Triggering: '#{name.inspect}' with #{args.inspect}"
+
         elsif args.one?
-          message << " for #{args.first.inspect}"
+          message = "Triggering: '#{name.inspect}' for #{args.first.inspect}"
+
+        else
+          message = "Triggering: '#{name.inspect}'"
+
         end
 
-        Vedeu.log(type: :event, message: message.freeze)
+        Vedeu.log(type: :event, message: message)
 
         closure.call(*args)
       end
@@ -224,7 +229,7 @@ module Vedeu
       def throttle_expired?
         return true if (@now - @executed_at) > delay
 
-        Vedeu.log(type: :event, message: "Throttling: '#{name.inspect}'".freeze)
+        Vedeu.log(type: :event, message: "Throttling: '#{name.inspect}'")
 
         false
       end
@@ -251,7 +256,7 @@ module Vedeu
       def debounce_expired?
         return true if (@executed_at = @now) > @deadline
 
-        Vedeu.log(type: :event, message: "Debouncing: '#{name.inspect}'".freeze)
+        Vedeu.log(type: :event, message: "Debouncing: '#{name.inspect}'")
 
         false
       end
@@ -311,4 +316,11 @@ module Vedeu
                  :bound?,
                  :unbind
 
+  # :nocov:
+
+  # See {file:docs/events/system.md#\_log_}
+  Vedeu.bind(:_log_) { |msg| Vedeu.log(type: :debug, message: msg) }
+
+  # :nocov:
+
 end # Vedeu

data/lib/vedeu/events/repository.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Events

data/lib/vedeu/events/trigger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Events
@@ -40,7 +42,7 @@ module Vedeu
       def trigger
         if results.empty?
           Vedeu.log(type:    :event,
-                    message: "No action for: '#{name.inspect}'".freeze)
+                    message: "No action for: '#{name.inspect}'")
         end
 
         return results[0] if results.one?

data/lib/vedeu/geometries/all.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   # The Geometry group of classes all handle the size of interfaces in

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Geometries

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Geometries
@@ -46,38 +48,36 @@ module Vedeu
       # @option attributes maximised [Boolean]
       # @option attributes name [String|Symbol]
       # @option attributes vertical_alignment [Symbol]
-      # @option attributes x [Fixnum]
-      # @option attributes xn [Fixnum]
-      # @option attributes x_xn [Fixnum]
-      # @option attributes x_default [Fixnum]
-      # @option attributes y [Fixnum]
-      # @option attributes yn [Fixnum]
-      # @option attributes y_yn [Fixnum]
-      # @option attributes y_default [Fixnum]
+      # @option attributes x [Fixnum] The starting x coordinate.
+      # @option attributes xn [Fixnum] The ending x coordinate.
+      # @option attributes width [Fixnum]
+      # @option attributes y [Fixnum] The starting y coordinate.
+      # @option attributes yn [Fixnum] The ending y coordinate.
+      # @option attributes height [Fixnum]
       # @return [Vedeu::Geometries::Area]
       def self.from_attributes(attributes = {})
         y_attributes = {
           alignment: attributes[:vertical_alignment],
           d:         attributes[:y],
           dn:        attributes[:yn],
-          d_dn:      attributes[:y_yn],
+          d_dn:      attributes[:height],
           maximised: attributes[:maximised],
         }
         x_attributes = {
           alignment: attributes[:horizontal_alignment],
           d:         attributes[:x],
           dn:        attributes[:xn],
-          d_dn:      attributes[:x_xn],
+          d_dn:      attributes[:width],
           maximised: attributes[:maximised],
         }
-        y_yn = Vedeu::Geometries::YDimension.pair(y_attributes)
-        x_xn = Vedeu::Geometries::XDimension.pair(x_attributes)
+        height = Vedeu::Geometries::YDimension.pair(y_attributes)
+        width  = Vedeu::Geometries::XDimension.pair(x_attributes)
 
         new(name: attributes[:name],
-            y:    y_yn[0],
-            yn:   y_yn[-1],
-            x:    x_xn[0],
-            xn:   x_xn[-1])
+            y:    height[0],
+            yn:   height[-1],
+            x:    width[0],
+            xn:   width[-1])
       end
 
       # Returns a new instance of Vedeu::Area.
@@ -111,7 +111,18 @@ module Vedeu
       #
       # @return [Fixnum]
       def bordered_width
-        (bxn - bx) + 1
+        return width unless border && enabled?
+
+        if left? && right?
+          width - 2
+
+        elsif left? || right?
+          width - 1
+
+        else
+          width
+
+        end
       end
 
       # Returns the height of the interface determined by whether a
@@ -119,7 +130,18 @@ module Vedeu
       #
       # @return [Fixnum]
       def bordered_height
-        (byn - by) + 1
+        return height unless border && enabled?
+
+        if top? && bottom?
+          height - 2
+
+        elsif top? || bottom?
+          height - 1
+
+        else
+          height
+
+        end
       end
 
       # Return the column position for 1 character right of the left
@@ -183,6 +205,9 @@ module Vedeu
       # @return [Fixnum]
       def height
         (yn - y) + 1
+
+        # (yn - y) + 2
+        # (y..yn).size# + 1
       end
 
       # Returns the width of the interface.
@@ -190,6 +215,9 @@ module Vedeu
       # @return [Fixnum]
       def width
         (xn - x) + 1
+
+        # (xn - x) + 2
+        # (x..xn).size# + 1
       end
 
       # Returns the row above the top by default.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Geometries
@@ -225,18 +227,23 @@ module Vedeu
       # @return [Fixnum]
       def _dn
         if dn
+          # fail "_dn 1 v:#{d} #{dn}"
           dn
 
         elsif d.nil? && d_dn
+          # fail "_dn 2 v:#{d_dn}"
           d_dn
 
         elsif d && d_dn
+          # fail "_dn 3 v:#{d} #{d_dn}"
           (d + d_dn) - 1
 
         elsif default
+          # fail "_dn 4 v:#{default}"
           default
 
         else
+          # fail "_dn 5 v:1"
           1
 
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Geometries

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Geometries

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Geometries

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Geometries

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Geometries

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Geometries
@@ -15,7 +17,7 @@ module Vedeu
       # @return [Boolean]
       def validate_height!(value)
         fail Vedeu::Error::InvalidSyntax,
-             'No height given.'.freeze if absent?(value)
+             'No height given.' if absent?(value)
 
         true
       end
@@ -27,7 +29,7 @@ module Vedeu
       def validate_horizontal_alignment!(value)
         fail Vedeu::Error::InvalidSyntax,
              'No horizontal alignment given. Valid values are :center, ' \
-             ':centre, :left, :none, :right.'.freeze unless present?(value)
+             ':centre, :left, :none, :right.' unless present?(value)
 
         true
       end
@@ -38,7 +40,7 @@ module Vedeu
       def validate_vertical_alignment!(value)
         fail Vedeu::Error::InvalidSyntax,
              'No vertical alignment given. Valid values are :bottom, ' \
-             ':middle, :none, :top.'.freeze unless present?(value)
+             ':middle, :none, :top.' unless present?(value)
 
         true
       end
@@ -48,7 +50,7 @@ module Vedeu
       # @return [Boolean]
       def validate_width!(value)
         fail Vedeu::Error::InvalidSyntax,
-             'No width given.'.freeze if absent?(value)
+             'No width given.' if absent?(value)
 
         true
       end

data/lib/vedeu/geometries/geometry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Geometries
@@ -201,10 +203,10 @@ module Vedeu
           vertical_alignment:   vertical_alignment,
           x:                    @x.is_a?(Proc)      ? @x.call      : @x,
           xn:                   @xn.is_a?(Proc)     ? @xn.call     : @xn,
-          x_xn:                 @width.is_a?(Proc)  ? @width.call  : @width,
+          width:                @width.is_a?(Proc)  ? @width.call  : @width,
           y:                    @y.is_a?(Proc)      ? @y.call      : @y,
           yn:                   @yn.is_a?(Proc)     ? @yn.call     : @yn,
-          y_yn:                 @height.is_a?(Proc) ? @height.call : @height,
+          height:               @height.is_a?(Proc) ? @height.call : @height,
         }
       end
 

data/lib/vedeu/geometries/move.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Geometries
@@ -64,7 +66,7 @@ module Vedeu
       def defaults
         {
           direction: :none,
-          name:      ''.freeze,
+          name:      '',
           offset:    1,
         }
       end

data/lib/vedeu/geometries/position.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Vedeu
 
   module Geometries
@@ -116,7 +118,7 @@ module Vedeu
       # @yieldreturn [String] Returns the block wrapped in position
       #   escape sequences.
       def to_s(&block)
-        return "#{sequence}#{yield}".freeze if block_given?
+        return "#{sequence}#{yield}" if block_given?
 
         sequence
       end
@@ -157,7 +159,7 @@ module Vedeu
       #
       # @return [String]
       def sequence
-        "\e[#{y};#{x}H".freeze
+        "\e[#{y};#{x}H"
       end
 
     end # Position