vedeu 0.6.56 → 0.6.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c92681933a1db2bfff9701b5eb7150bce03b6390
-  data.tar.gz: 3fbf5744728ed37c2557d0301a29bb82e4a255ae
+  metadata.gz: f6b535e5cb8b4ba8c6bc115745981c6934a899e4
+  data.tar.gz: 448638ef6471487754a32e81594054b6dae011e6
 SHA512:
-  metadata.gz: 3a558c37500d76ca3b937ed1e051e31d073d402f3ac84b8b95457676bc3ca96eaa7b21ff1c2dd5e16d194690494da767a144771edb199d24f6fa5752ef256201
-  data.tar.gz: 0f3d5c4c7decf8180d13c12911d54088090d72bcfd931b4fbb1a198b5ae1fb2dcb682d6dd74ea046f6f3b3649ba201f3f8fca953be62db00c0aa65efe3818e01
+  metadata.gz: e62418c3701fd759daa1f2fce52692c92ed9d2c8b8c476acfaa1ab1e40d215d5c14247ba3c1e8b2c940a0201e9707fa0bc91e5ac62e58826cfd11106ba044f30
+  data.tar.gz: 02b5e88a20ee7b1c7e1f04395ba533c34e9325c9a84d7b2b5257f82fd73010fdcf9186e613b13c742c4e815e450273d6569cc86d67e69a39c38c563a28debf62

data/.rubocop.yml

@@ -97,6 +97,9 @@ Style/Next:
     - skip_modifier_ifs
     - always
 
+Style/RescueModifier:
+  Enabled: false
+
 Style/SpaceAroundOperators:
   Enabled: false
 

data/Guardfile

@@ -1,4 +1,4 @@
-if ENV['RUBOCOP'] == 1
+if ENV['RUBOCOP'].to_i == 1
   guard :rubocop do
     watch(/.+\.rb$/)
     watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }

data/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 if ENV['WARNINGS'] == 1
+  task.warning = true if ENV['WARNINGS'].to_i == 1
 end
 
 YARD::Rake::YardocTask.new(:yard) do |task|
@@ -51,7 +51,7 @@ RuboCop::RakeTask.new(:rubocop) do |task|
 end
 
 tasks_to_run = [:test]
-tasks_to_run << :rubocop if ENV['RUBOCOP'] == 1
-tasks_to_run << :yard if ENV['YARD'] == 1
+tasks_to_run << :rubocop if ENV['RUBOCOP'].to_i == 1
+tasks_to_run << :yard if ENV['YARD'].to_i == 1
 
 task default: tasks_to_run

data/lib/vedeu/borders/all.rb

@@ -34,6 +34,7 @@ module Vedeu
 end # Vedeu
 
 require 'vedeu/borders/title'
+require 'vedeu/borders/caption'
 require 'vedeu/borders/border'
 require 'vedeu/borders/dsl'
 require 'vedeu/borders/null'

data/lib/vedeu/borders/border.rb

@@ -22,6 +22,10 @@ module Vedeu
       include Vedeu::Presentation
 
       def_delegators :geometry,
+                     :bx,
+                     :bxn,
+                     :by,
+                     :byn,
                      :x,
                      :xn,
                      :y,
@@ -37,6 +41,11 @@ module Vedeu
       #   border if enabled.
       attr_accessor :bottom_right
 
+      # @!attribute [rw] caption
+      # @return [String] An optional caption for when the bottom
+      #   border is to be shown.
+      attr_accessor :caption
+
       # @!attribute [rw] horizontal
       # @return [String] The character to be used for the horizontal
       #   side border.
@@ -66,15 +75,10 @@ module Vedeu
       attr_accessor :show_top
       alias_method :top?, :show_top
 
-      # # @!attribute [rw] caption
-      # # @return [String] An optional caption for when the bottom
-      #   border is to be shown.
-      # attr_accessor :caption
-
       # @!attribute [rw] title
-      # @return [String] An optional title for when the top
-      #   border is to be shown.
-      # attr_accessor :title
+      # @return [String] An optional title for when the top border is
+      #   to be shown.
+      attr_accessor :title
 
       # @!attribute [rw] top_left
       # @return [String] The character to be used for the top left
@@ -92,8 +96,8 @@ module Vedeu
       attr_accessor :vertical
 
       # @!attribute [r] name
-      # @return [String] Associates the border with the same-named
-      #   interface/view.
+      # @return [String|Symbol] Associates the border with the
+      #   same-named interface/view.
       attr_reader :name
 
       # @!attribute [r] parent
@@ -175,60 +179,6 @@ module Vedeu
         }
       end
 
-      # Return the column position for 1 character right of the left
-      #   border.
-      #
-      # @return [Fixnum]
-      def bx
-        (enabled? && left?) ? x + 1 : x
-      end
-
-      # Return the column position for 1 character left of the right
-      #   border.
-      #
-      # @return [Fixnum]
-      def bxn
-        (enabled? && right?) ? xn - 1 : xn
-      end
-
-      # Return the row position for 1 character under of the top
-      #   border.
-      #
-      # @return [Fixnum]
-      def by
-        (enabled? && top?) ? y + 1 : y
-      end
-
-      # Return the column position for 1 character above of the bottom
-      #   border.
-      #
-      # @return [Fixnum]
-      def byn
-        (enabled? && bottom?) ? yn - 1 : yn
-      end
-
-      # @return [Vedeu::Borders::Caption]
-      def caption
-        Vedeu::Borders::Caption.coerce(@caption, width)
-      end
-
-      # @param value [String]
-      # @return [Vedeu::Borders::Caption]
-      def caption=(value)
-        @caption = Vedeu::Borders::Caption.coerce(value, width)
-      end
-
-      # @return [Vedeu::Borders::Title]
-      def title
-        Vedeu::Borders::Title.coerce(@title, width)
-      end
-
-      # @param value [String]
-      # @return [Vedeu::Borders::Title]
-      def title=(value)
-        @title = Vedeu::Borders::Title.coerce(value, width)
-      end
-
       # Returns a DSL instance responsible for defining the DSL
       # methods of this model.
       #
@@ -241,22 +191,6 @@ module Vedeu
         Vedeu::Borders::DSL.new(self, client)
       end
 
-      # Returns the width of the interface determined by whether a
-      # left, right, both or neither borders are shown.
-      #
-      # @return [Fixnum]
-      def width
-        (bx..bxn).size
-      end
-
-      # Returns the height of the interface determined by whether a
-      # top, bottom, both or neither borders are shown.
-      #
-      # @return [Fixnum]
-      def height
-        (by..byn).size
-      end
-
       private
 
       # Returns the geometry for the interface.

data/lib/vedeu/borders/caption.rb

@@ -0,0 +1,17 @@
+module Vedeu
+
+  module Borders
+
+    # When a {Vedeu::Borders::Border} has a caption, truncate it if
+    # the caption is longer than the interface is wide, and pad with a
+    # space either side.
+    #
+    # @api private
+    #
+    class Caption < Title
+
+    end # Caption
+
+  end # Borders
+
+end # Vedeu

data/lib/vedeu/borders/dsl.rb

@@ -233,7 +233,7 @@ module Vedeu
       #   +- My Cool Title --------------------------------+
       #
       # @param value [String] The title.
-      # @return [Vedeu::Borders::Title]
+      # @return [String]
       def title(value)
         model.title = value
         model.title
@@ -253,7 +253,7 @@ module Vedeu
       #   +------------------------------ My Cool Caption -+
       #
       # @param value [String] The caption.
-      # @return [Vedeu::Borders::Caption]
+      # @return [String]
       def caption(value)
         model.caption = value
         model.caption

data/lib/vedeu/borders/null.rb

@@ -9,6 +9,20 @@ module Vedeu
     #
     class Null
 
+      extend Forwardable
+
+      def_delegators :geometry,
+                     :bordered_width,
+                     :bordered_height,
+                     :bx,
+                     :bxn,
+                     :by,
+                     :byn,
+                     :x,
+                     :xn,
+                     :y,
+                     :yn
+
       # @!attribute [r] name
       # @return [String|Symbol|NilClass]
       attr_reader :name
@@ -23,50 +37,16 @@ module Vedeu
         @name       = @attributes[:name]
       end
 
-      # @return [Fixnum]
-      def bx
-        geometry.x
-      end
-      alias_method :x, :bx
-
-      # @return [Fixnum]
-      def bxn
-        geometry.xn
-      end
-      alias_method :xn, :bxn
-
-      # @return [Fixnum]
-      def by
-        geometry.y
-      end
-      alias_method :y, :by
-
-      # @return [Fixnum]
-      def byn
-        geometry.yn
-      end
-      alias_method :yn, :byn
-
       # @return [Boolean]
       def enabled?
         false
       end
 
-      # @return [Fixnum]
-      def height
-        (by..byn).size
-      end
-
       # @return [Array]
       def render
         []
       end
 
-      # @return [Fixnum]
-      def width
-        (bx..bxn).size
-      end
-
       private
 
       # Returns the geometry for the interface.

data/lib/vedeu/borders/refresh.rb

@@ -15,14 +15,9 @@ module Vedeu
                      :bottom?,
                      :bottom_left,
                      :bottom_right,
-                     :bx,
-                     :bxn,
-                     :by,
-                     :byn,
                      :caption,
                      :colour,
                      :enabled?,
-                     :height,
                      :horizontal,
                      :left?,
                      :right?,
@@ -31,10 +26,17 @@ module Vedeu
                      :top?,
                      :top_left,
                      :top_right,
-                     :width,
                      :vertical
 
       def_delegators :geometry,
+                     :bordered_height,
+                     :bordered_width,
+                     :bx,
+                     :bxn,
+                     :by,
+                     :byn,
+                     :height,
+                     :width,
                      :x,
                      :xn,
                      :y,
@@ -89,12 +91,24 @@ module Vedeu
         Vedeu.timer("Drawing border: '#{name}'".freeze) do
           out = [top, bottom]
 
-          height.times { |y| out << [left(y), right(y)] }
+          bordered_height.times { |y| out << [left(y), right(y)] }
 
           out.flatten
         end
       end
 
+      # @return [Vedeu::Borders::Caption] An optional caption for when
+      #   the bottom border is to be shown.
+      def render_caption
+        @_caption ||= Vedeu::Borders::Caption.coerce(caption, width)
+      end
+
+      # @return [Vedeu::Borders::Title] An optional title for when the
+      #   top border is to be shown.
+      def render_title
+        @_title ||= Vedeu::Borders::Title.coerce(title, width)
+      end
+
       # @param value [String]
       # @param type [Symbol|NilClass]
       # @param iy [Fixnum]
@@ -178,7 +192,7 @@ module Vedeu
       # @param y_coordinate [Fixnum] The value of either y or yn.
       # @return [Array<Vedeu::Views::Char>]
       def build_horizontal(position, y_coordinate)
-        Array.new(width) do |ix|
+        Array.new(bordered_width) do |ix|
           build(horizontal, position, y_coordinate, (bx + ix))
         end
       end
@@ -233,16 +247,16 @@ module Vedeu
       #
       # @return [Array<Vedeu::Views::Char>]
       def captionbar
-        return build_bottom if caption.empty?
+        return build_bottom if render_caption.empty?
 
-        caption_starts_at = (width - caption.size) - 2
+        caption_starts_at = (width - render_caption.size) - 2
 
         caption_index = 0
         build_bottom.each_with_index do |char, index|
           next if index <= caption_starts_at || index > (width - 2)
 
           char.border   = nil
-          char.value    = caption.characters[caption_index]
+          char.value    = render_caption.characters[caption_index]
           caption_index += 1
         end
       end
@@ -252,13 +266,13 @@ module Vedeu
       #
       # @return [Array<Vedeu::Views::Char>]
       def titlebar
-        return build_top if title.empty?
+        return build_top if render_title.empty?
 
         build_top.each_with_index do |char, index|
-          next if index == 0 || index > title.size
+          next if index == 0 || index > render_title.size
 
           char.border = nil
-          char.value  = title.characters[index - 1]
+          char.value  = render_title.characters[index - 1]
         end
       end
 

data/lib/vedeu/borders/title.rb

@@ -127,16 +127,6 @@ module Vedeu
 
     end # Title
 
-    # When a {Vedeu::Borders::Border} has a caption, truncate it if
-    # the caption is longer than the interface is wide, and pad with a
-    # space either side.
-    #
-    # @api private
-    #
-    class Caption < Title
-
-    end # Caption
-
   end # Borders
 
 end # Vedeu

data/lib/vedeu/buffers/buffer.rb

@@ -31,7 +31,7 @@ module Vedeu
       attr_accessor :previous
 
       # @!attribute [r] name
-      # @return [String]
+      # @return [String|Symbol]
       attr_reader :name
 
       # Return a new instance of Buffer. Generally a Buffer is

data/lib/vedeu/buffers/view.rb

@@ -21,16 +21,17 @@ module Vedeu
 
       private
 
-      # @return [Vedeu::Borders::Border]
-      def border
-        Vedeu.borders.by_name(name)
+      # @return [Vedeu::Geometry::Geometry]
+      def geometry
+        Vedeu.geometries.by_name(name)
       end
 
       # @return [Vedeu::Buffers::Empty]
       def buffer
-        @_buffer ||= Vedeu::Buffers::Empty.new(height: border.height,
-                                               name:   name,
-                                               width:  border.width).buffer
+        @_buffer ||= Vedeu::Buffers::Empty
+                       .new(height: geometry.bordered_height,
+                            name:   name,
+                            width:  geometry.bordered_width).buffer
       end
 
       # @return [Vedeu::Buffers::Empty]