vedeu 0.4.22 → 0.4.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d79ec97271163d2a5714da17bb182a5b10e8364
-  data.tar.gz: 8103b05cdd5a5bc0b9936963ac0d4685d0a316ff
+  metadata.gz: 365b29b26543c213bcb8ca54063e55261dca7d47
+  data.tar.gz: 8fbbb26db13f252b6cdba3ccaaf851718335a854
 SHA512:
-  metadata.gz: 8d6349acfc3ebb738025f2f52604ac2a731a3174ebad8556437110e747c0d6392f976c28d1808b6552edcbfded5316031694d264436f20c4fd1b633cc225166c
-  data.tar.gz: 23fe6d51808b2b699632574ab8f4aedd79974ac057ccf59ac85b6e78a7e47fa1df8344ff7b24c5896f259dc7ea8399a9b97bef5eee148de79887f45bb46070d5
+  metadata.gz: 224fd3df8947ad37738184011a53c1814530cb8ee923f3e634a8e398710b42399aa15d9ad95cc57c2356da16208fb3c972dc9b0a92c0c2e9cb73d059074f1c86
+  data.tar.gz: 2d99311229522afc70142dbca1f15d05f2cce5954548cf1f05d275a51545d7b729e67748c48b9ead6578457d503097418239826fd658501a8d2c5c59c1a5cec9

data/Rakefile

@@ -1,14 +1,14 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
-require 'cucumber'
-require 'cucumber/rake/task'
+# require 'cucumber'
+# require 'cucumber/rake/task'
 require 'inch/rake'
 require 'yard'
 require 'rubocop/rake_task'
 
-Cucumber::Rake::Task.new(:cucumber) do |t|
-  t.cucumber_opts = 'features --format progress'
-end
+# Cucumber::Rake::Task.new(:cucumber) do |t|
+#   t.cucumber_opts = 'features --format progress'
+# end
 
 Rake::TestTask.new(:test) do |t|
   t.libs.push 'lib'

data/examples/geometry_app.rb

@@ -21,7 +21,7 @@ class VedeuGeometryApp
 
     # Geometry can be defined within the interface.
     geometry do
-      height  8
+      height  rows(4)
       width   8
       x       2
       y       2
@@ -36,7 +36,7 @@ class VedeuGeometryApp
   # Geometry can be defined either before or after the interface.
   geometry 'second' do
     height  8
-    width   8
+    width   columns(1)
     x       12
     y       2
   end

data/lib/vedeu/bindings.rb

@@ -60,7 +60,6 @@ module Vedeu
     # `_mode_switch_` is triggered.
     Vedeu.bind(:_keypress_) do |key|
       Vedeu.trigger(:key, key)
-
       Vedeu.keypress(key)
     end
 
@@ -82,12 +81,8 @@ module Vedeu
     # events. Please see those events for their behaviour.
     Vedeu.bind(:_resize_, delay: 0.15) { Vedeu.resize }
 
-    Vedeu.bind(:tick) do |time|
-      Vedeu.log(type: :debug, message: "Tick: #{time}")
-    end
-    Vedeu.bind(:tock) do |time|
-      Vedeu.log(type: :debug, message: "Tock: #{time}")
-    end
+    Vedeu.bind(:tick) { |t| Vedeu.log(type: :debug, message: "Tick: #{t}") }
+    Vedeu.bind(:tock) { |t| Vedeu.log(type: :debug, message: "Tock: #{t}") }
 
     # Hide the cursor of the named interface or interface currently in focus.
     Vedeu.bind(:_cursor_hide_) do |name|
@@ -175,7 +170,6 @@ module Vedeu
 
       else
         Vedeu::Terminal.virtual.clear if Vedeu::Configuration.drb?
-
         Vedeu::Terminal.clear
       end
     end
@@ -206,7 +200,6 @@ module Vedeu
     # the named group.
     Vedeu.bind(:_show_group_) do |name|
       Vedeu.trigger(:_clear_)
-
       Vedeu.trigger(:_refresh_group_, name)
     end
 
@@ -266,8 +259,6 @@ module Vedeu
     # of the available space on the terminal window.
     Vedeu.bind(:_maximise_) do |name|
       Vedeu.geometries.by_name(name).maximise
-
-      Vedeu.trigger(:_refresh_, name)
     end
 
     # Will unmaximise the named interface geometry. Previously, if a geometry
@@ -275,11 +266,7 @@ module Vedeu
     # usual defined size (terminal size permitting: if the terminal has been
     # resized, then the new geometry size should adapt).
     Vedeu.bind(:_unmaximise_) do |name|
-      Vedeu.trigger(:_clear_, name)
-
       Vedeu.geometries.by_name(name).unmaximise
-
-      Vedeu.trigger(:_refresh_, name)
     end
 
   end # Bindings

data/lib/vedeu/buffers/buffer.rb

@@ -72,9 +72,7 @@ module Vedeu
     #
     # @return [void]
     def clear
-      unless clear_buffer.empty?
-        Vedeu::Output.render(clear_buffer)
-      end
+      Vedeu::Output.render(clear_buffer)
     end
 
     # Hide this buffer.
@@ -100,9 +98,7 @@ module Vedeu
     #
     # @return [Array<Array<Array<Vedeu::Char>>>]
     def render
-      Vedeu::Output.render(buffer) unless buffer.empty?
-
-      buffer
+      Vedeu::Output.render(buffer)
     end
     alias_method :content, :render
 

data/lib/vedeu/configuration/cli.rb

@@ -124,7 +124,7 @@ module Vedeu
       def drb_height
         parser.on('--drb-height',
                   'Set the height for fake terminal.') do |height|
-          # options[:drb]      = true
+          options[:drb]        = true
           options[:drb_height] = height
         end
       end
@@ -133,7 +133,7 @@ module Vedeu
       def drb_host
         parser.on('--drb-host',
                   'Set the hostname/IP for the DRb server.') do |hostname|
-          # options[:drb]      = true
+          options[:drb]      = true
           options[:drb_host] = hostname
         end
       end
@@ -141,7 +141,7 @@ module Vedeu
       # @return [OptionParser]
       def drb_port
         parser.on('--drb-port', 'Set the port for the DRb server.') do |port|
-          # options[:drb]    = true
+          options[:drb]      = true
           options[:drb_port] = port
         end
       end
@@ -150,7 +150,7 @@ module Vedeu
       def drb_width
         parser.on('--drb-width',
                   'Set the width for fake terminal.') do |width|
-          # options[:drb]     = true
+          options[:drb]       = true
           options[:drb_width] = width
         end
       end

data/lib/vedeu/dsl/components/border.rb

@@ -130,12 +130,16 @@ module Vedeu
       end
       alias_method :show_bottom, :bottom
 
-      # @see #bottom
+      # Disable the bottom border.
+      #
+      # @see Vedeu::DSL::Border#bottom
       def hide_bottom!
         bottom(false)
       end
 
-      # @see #bottom
+      # Enable the bottom border.
+      #
+      # @see Vedeu::DSL::Border#bottom
       def show_bottom!
         bottom(true)
       end
@@ -162,12 +166,16 @@ module Vedeu
       end
       alias_method :show_left, :left
 
-      # @see #left
+      # Disable the left border.
+      #
+      # @see Vedeu::DSL::Border#left
       def hide_left!
         left(false)
       end
 
-      # @see #left
+      # Enable the left border.
+      #
+      # @see Vedeu::DSL::Border#left
       def show_left!
         left(true)
       end
@@ -194,12 +202,16 @@ module Vedeu
       end
       alias_method :show_right, :right
 
-      # @see #right
+      # Disable the right border.
+      #
+      # @see Vedeu::DSL::Border#right
       def hide_right!
         right(false)
       end
 
-      # @see #right
+      # Enable the right border.
+      #
+      # @see Vedeu::DSL::Border#right
       def show_right!
         right(true)
       end
@@ -244,12 +256,16 @@ module Vedeu
       end
       alias_method :show_top, :top
 
-      # @see #top
+      # Disable the top border.
+      #
+      # @see Vedeu::DSL::Border#top
       def hide_top!
         top(false)
       end
 
-      # @see #top
+      # Enable the top border.
+      #
+      # @see Vedeu::DSL::Border#top
       def show_top!
         top(true)
       end

data/lib/vedeu/dsl/components/geometry.rb

@@ -58,6 +58,11 @@ module Vedeu
       end
       alias_method :centred!, :centred
 
+      # @see Vedeu::Grid.columns
+      def columns(value)
+        Vedeu::Grid.columns(value)
+      end
+
       # Specify the number of characters/rows/lines tall the interface will be.
       #
       # @example
@@ -74,6 +79,11 @@ module Vedeu
         model.height = value
       end
 
+      # @see Vedeu::Grid.columns
+      def rows(value)
+        Vedeu::Grid.rows(value)
+      end
+
       # Specify the number of characters/columns wide the interface will be.
       #
       # @param value [Fixnum]

data/lib/vedeu/events/event.rb

@@ -123,8 +123,7 @@ module Vedeu
     # @see Vedeu::Event.bind
     def bind
       if repository.registered?(name)
-        collection     = repository.find(name)
-        new_collection = collection.add(self)
+        new_collection = repository.find(name).add(self)
 
       else
         new_collection = Vedeu::Events.new([self], nil, name)

data/lib/vedeu/geometry/area.rb

@@ -51,7 +51,10 @@ module Vedeu
     # @param xn [Fixnum]
     # @return [Vedeu::Area]
     def initialize(y:, yn:, x:, xn:)
-      @y, @yn, @x, @xn  = y, yn, x, xn
+      @y  = y
+      @yn = yn
+      @x  = x
+      @xn = xn
     end
 
     # An object is equal when its values are the same.

data/lib/vedeu/geometry/geometry.rb

@@ -61,6 +61,7 @@ module Vedeu
     # @!attribute [rw] maximised
     # @return [Boolean]
     attr_accessor :maximised
+    alias_method :maximised?, :maximised
 
     # @!attribute [w] width
     # @return [Fixnum]
@@ -109,16 +110,30 @@ module Vedeu
 
     # @return [Vedeu::Geometry]
     def maximise
-      @maximised = true
+      unless maximised?
+        @maximised = true
 
-      store
+        work = store
+
+        Vedeu.trigger(:_refresh_, name)
+
+        work
+      end
     end
 
     # @return [Vedeu::Geometry]
     def unmaximise
-      @maximised = false
+      if maximised?
+        Vedeu.trigger(:_clear_, name)
+
+        @maximised = false
+
+        work = store
+
+        Vedeu.trigger(:_refresh_, name)
 
-      store
+        work
+      end
     end
 
     private
@@ -128,26 +143,44 @@ module Vedeu
       @area = Vedeu::Area.from_dimensions(y_yn: y_yn, x_xn: x_xn)
     end
 
+    # @return [Hash<Symbol => Fixnum, Hash]
+    def height_attributes
+      {
+        d:       _y,
+        dn:      _yn,
+        d_dn:    @height,
+        default: Vedeu::Terminal.height,
+        options: dimension_options,
+      }
+    end
+
+    # @return [Hash<Symbol => Fixnum, Hash]
+    def width_attributes
+      {
+        d:        _x,
+        dn:      _xn,
+        d_dn:    @width,
+        default: Vedeu::Terminal.width,
+        options: dimension_options,
+      }
+    end
+
+    # @return [Hash<Symbol => Boolean>]
+    def dimension_options
+      {
+        centred:   centred,
+        maximised: maximised,
+      }
+    end
+
     # @return [Array<Fixnum>]
     def x_xn
-      @x_xn = Vedeu::Dimension.pair(d:        _x,
-                                    dn:      _xn,
-                                    d_dn:    @width,
-                                    default: Vedeu::Terminal.width,
-                                    options: {
-                                      centred:   centred,
-                                      maximised: maximised })
+      @x_xn = Vedeu::Dimension.pair(width_attributes)
     end
 
     # @return [Array<Fixnum>]
     def y_yn
-      @y_yn = Vedeu::Dimension.pair(d:       _y,
-                                    dn:      _yn,
-                                    d_dn:    @height,
-                                    default: Vedeu::Terminal.height,
-                                    options: {
-                                      centred:   centred,
-                                      maximised: maximised })
+      @y_yn = Vedeu::Dimension.pair(height_attributes)
     end
 
     # Returns the row/line start position for the interface.

data/lib/vedeu/geometry/grid.rb

@@ -1,29 +1,3 @@
-# Monkey-patch Ruby's Fixnum to provide a columns method.
-# @todo Don't monkey-patch because it is naughty.
-class Fixnum
-
-  # Augment Fixnum to calculate column width in a grid-based layout.
-  #
-  # The grid system splits the terminal height and width into 12 equal parts, by
-  # dividing the available height and width by 12. If the terminal height or
-  # width is not a multiple of 12, then Grid chooses the maximum value which
-  # will fit.
-  #
-  # Used primarily at interface creation time:
-  #
-  #   width: 9.columns  # (Terminal width / 12) * 9 characters wide; e.g.
-  #                     # Terminal is 92 characters wide, maximum value is
-  #                     # therefore 84, meaning a column is 7 characters wide.
-  def columns
-    Vedeu::Grid.columns(self)
-  end
-
-  def rows
-    Vedeu::Grid.rows(self)
-  end
-
-end # Fixnum
-
 module Vedeu
 
   # Augment Fixnum to calculate column width or row height in a grid-based
@@ -36,13 +10,15 @@ module Vedeu
   #
   # Used primarily whilst defining geometry:
   #
-  #   width: 9.columns  # (Terminal width / 12) * 9 characters wide; e.g.
+  #   width: columns(9) # (Terminal width / 12) * 9 characters wide; e.g.
   #                     # Terminal is 92 characters wide, maximum value is
   #                     # therefore 84, meaning a column is 7 characters wide.
+  #                     # (And width is therefore 63 characters wide.)
   #
-  #   height: 3.columns # (Terminal height / 12) * 3 rows high; e.g.
+  #   height: rows(3)   # (Terminal height / 12) * 3 rows high; e.g.
   #                     # Terminal is 38 characters wide, maximum value is
   #                     # therefore 36, meaning a row is 3 characters tall.
+  #                     # (And height is therefore 9 characters tall.)
   class Grid
 
     # @see #initialize

data/lib/vedeu/launcher.rb

@@ -58,7 +58,9 @@ module Vedeu
 
     # @return [void]
     def execute!
-      $stdin, $stdout, $stderr = @stdin, @stdout, @stderr
+      $stdin  = @stdin
+      $stdout = @stdout
+      $stderr = @stderr
 
       Vedeu::Application.start(configuration)
 
@@ -83,7 +85,9 @@ module Vedeu
     def terminate!
       Vedeu.log(type: :info, message: 'Exiting gracefully.')
 
-      $stdin, $stdout, $stderr = STDIN, STDOUT, STDERR
+      $stdin  = STDIN
+      $stdout = STDOUT
+      $stderr = STDERR
 
       @kernel.exit(exit_code)
     end