vedeu 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9fe2d78e6318aca74ab320786c9074d8b745eff
-  data.tar.gz: 824f82bca58a42308ad10bec73fd49fbd1c20884
+  metadata.gz: bd5267f472bd0bcb05b29671a3e36b44ea4ec8d7
+  data.tar.gz: 1781dce30836a25b700ca8598728b5733f31ff1d
 SHA512:
-  metadata.gz: 103b80280897cd8904924011ef77a0060256f60a5475c1725ad118a0b606861eaa7c0f4938fe2b4c1e06fb6edd9ff84809ee209aa57b07a73b49f8b12ba61c8f
-  data.tar.gz: d39f7987ca6a1f517ad469d3be912d7748e2f7592128689eb3aace31cc5e59c57f5c2d62200d4c4f9abc009e91b017f6ecb8a2de5c420ac28983649c42356925
+  metadata.gz: b9a413311537e668d1a65a28a21e5b20b1dc11bfe5446a502cd2c6735e7c7db28ca758ce8842155974742a9d6a6e7f1cae3212e685477e40b35f37e747aef3d3
+  data.tar.gz: cd9da8bd56aa811eaa945a24940e91056cfda503246877f287b27e73e19959fd16faf00f404a382e5efcc0a564b8f3e30f6164d9504ab244259030c34edf1dde

data/examples/cursor_app.rb

@@ -22,8 +22,8 @@ class VedeuCursorApp
 
     geometry do
       centred true
-      height  8
-      width   8
+      height  10
+      width   10
     end
   end
 
@@ -38,6 +38,7 @@ class VedeuCursorApp
     view 'main_interface' do
       border do
         colour foreground: '#aadd00', background: '#000000'
+        title 'Move!'
       end
       lines do
         streams do

data/lib/vedeu/cursor/refresh_cursor.rb

@@ -33,8 +33,7 @@ module Vedeu
 
     # @return [Boolean]
     def refresh_view?
-      new_cursor.ox >= interface_width ||
-      new_cursor.oy >= interface_height
+      new_cursor.ox >= interface_width || new_cursor.oy >= interface_height
     end
 
     # @return [Vedeu::Cursor]
@@ -64,24 +63,12 @@ module Vedeu
 
     # @return [Fixnum]
     def interface_height
-      if interface.border?
-        interface.border.height
-
-      else
-        interface.height
-
-      end
+      interface.border.height
     end
 
     # @return [Fixnum]
     def interface_width
-      if interface.border?
-        interface.border.width
-
-      else
-        interface.width
-
-      end
+      interface.border.width
     end
 
     # @return [Vedeu::Interface]

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

@@ -195,6 +195,24 @@ module Vedeu
         right(true)
       end
 
+      # If you have you are showing a top border, you could add a title.
+      #
+      # @example
+      #   Vedeu.renders do
+      #     view 'border_demo' do
+      #       geometry { width: 50 }
+      #       border do
+      #         title 'My Cool Title'
+      #         # ...
+      #
+      #   +- My Cool Title --------------------------------+
+      #
+      # @param value [String] The title.
+      # @return [String]
+      def title(value)
+        model.title = value
+      end
+
       # Enable/disable the top border.
       #
       # @example

data/lib/vedeu/models/char.rb

@@ -23,9 +23,9 @@ module Vedeu
     # @return [Vedeu::Line]
     attr_accessor :parent
 
-    # @!attribute [r] value
+    # @!attribute [rw] value
     # @return [String]
-    attr_reader :value
+    attr_accessor :value
 
     # Returns a new instance of Vedeu::Char.
     #

data/lib/vedeu/output/border.rb

@@ -13,6 +13,7 @@ module Vedeu
   #
   class Border
 
+    include Vedeu::Common
     include Vedeu::Model
 
     # @!attribute [rw] attributes
@@ -51,6 +52,10 @@ module Vedeu
     attr_accessor :show_top
     alias_method :top?, :show_top
 
+    # @!attribute [rw] title
+    # @return [String]
+    attr_accessor :title
+
     # @!attribute [rw] top_left
     # @return [String]
     attr_accessor :top_left
@@ -90,7 +95,8 @@ module Vedeu
     # @option attributes enabled [Boolean] Indicate whether the border is to be
     #   shown for this interface.
     # @option attributes horizontal [String] The horizontal border character.
-    # @option attributes name [String]
+    # @option attributes name [String] The name of the interface to which this
+    #   border relates.
     # @option attributes style []
     # @option attributes show_bottom [Boolean] Indicate whether the bottom
     #   border is to be shown.
@@ -100,6 +106,8 @@ module Vedeu
     #   is to be shown.
     # @option attributes show_top [Boolean] Indicate whether the top border is
     #   to be shown.
+    # @option attributes title [String] A title bar for when the top border is
+    #   to be shown.
     # @option attributes top_left [String] The top left border character.
     # @option attributes top_right [String] The top right border character.
     # @option attributes vertical [String] The vertical border character.
@@ -113,6 +121,7 @@ module Vedeu
       @show_left    = @attributes[:show_left]
       @show_right   = @attributes[:show_right]
       @show_top     = @attributes[:show_top]
+      @title        = @attributes[:title]
       @top_left     = @attributes[:top_left]
       @top_right    = @attributes[:top_right]
       @horizontal   = @attributes[:horizontal]
@@ -125,46 +134,30 @@ module Vedeu
 
     # @return [Fixnum]
     def bx
-      if enabled? && left?
-        interface.x + 1
+      bo = (enabled? && left?) ? 1 : 0
 
-      else
-        interface.x
-
-      end
+      interface.x + bo
     end
 
     # @return [Fixnum]
     def bxn
-      if enabled? && right?
-        interface.xn - 1
+      bo = (enabled? && right?) ? 1 : 0
 
-      else
-        interface.xn
-
-      end
+      interface.xn - bo
     end
 
     # @return [Fixnum]
     def by
-      if enabled? && top?
-        interface.y + 1
-
-      else
-        interface.y
+      bo = (enabled? && top?) ? 1 : 0
 
-      end
+      interface.y + bo
     end
 
     # @return [Fixnum]
     def byn
-      if enabled? && bottom?
-        interface.yn - 1
+      bo = (enabled? && bottom?) ? 1 : 0
 
-      else
-        interface.yn
-
-      end
+      interface.yn - bo
     end
 
     # Returns the width of the interface determined by whether a left, right,
@@ -172,18 +165,7 @@ module Vedeu
     #
     # @return [Fixnum]
     def width
-      return interface.width unless enabled?
-
-      if left? && right?
-        interface.width - 2
-
-      elsif left? || right?
-        interface.width - 1
-
-      else
-        interface.width
-
-      end
+      (bx..bxn).size
     end
 
     # Returns the height of the interface determined by whether a top, bottom,
@@ -191,18 +173,7 @@ module Vedeu
     #
     # @return [Fixnum]
     def height
-      return interface.height unless enabled?
-
-      if top? && bottom?
-        interface.height - 2
-
-      elsif top? || bottom?
-        interface.height - 1
-
-      else
-        interface.height
-
-      end
+      (by..byn).size
     end
 
     # @return [Vedeu::Colour]
@@ -246,17 +217,7 @@ module Vedeu
     #
     # @return [String]
     def bottom
-      return [] unless bottom?
-
-      out = []
-
-      out << border(bottom_left, :bottom_left) if left?
-      width.times do |ix|
-        out << border(horizontal, :bottom_horizontal, nil, ix)
-      end
-      out << border(bottom_right, :bottom_right) if right?
-
-      out.flatten
+      top_or_bottom('bottom')
     end
 
     # Renders the left border for the interface.
@@ -283,20 +244,50 @@ module Vedeu
     #
     # @return [String]
     def top
-      return [] unless top?
+      top_or_bottom('top')
+    end
+
+    private
+
+    # @param prefix [String]
+    # @return [String]
+    def top_or_bottom(prefix)
+      predicate   = (prefix + '?').to_sym
+      _left       = (prefix + '_left').to_sym
+      _right      = (prefix + '_right').to_sym
+      _horizontal = (prefix + '_horizontal').to_sym
+
+      return [] unless send(predicate)
 
       out = []
-      out << border(top_left, :top_left) if left?
-      width.times do |ix|
-        out << border(horizontal, :top_horizontal, nil, ix)
+      out << border(send(_left), _left) if left?
+
+      if prefix == 'top' && defined_value?(title)
+        title_out = []
+        width.times do |ix|
+          title_out << border(horizontal, _horizontal, nil, ix)
+        end
+
+        truncate = title.chomp.slice(0..(width - 5))
+        pad      = truncate.center(truncate.size + 2).chars
+        out << title_out.each_with_index do |b, i|
+          if i >= 1 && i <= pad.size
+            b.border = nil
+            b.value  = pad[(i - 1)]
+          end
+        end
+
+      else
+        width.times do |ix|
+          out << border(horizontal, _horizontal, nil, ix)
+        end
+
       end
-      out << border(top_right, :top_right) if right?
 
-      out.flatten
+      out << border(send(_right), _right) if right?
+      out
     end
 
-    private
-
     # @param value [String]
     # @param type [Symbol|NilClass]
     # @param iy [Fixnum]
@@ -311,6 +302,11 @@ module Vedeu
                         border:   type })
     end
 
+    # @return [Vedeu::Interface]
+    def interface
+      @interface ||= Vedeu.interfaces.find(name)
+    end
+
     # The default values for a new instance of this class.
     #
     # @return [Hash]
@@ -328,6 +324,7 @@ module Vedeu
         show_right:   true,
         show_top:     true,
         style:        [],
+        title:        '',
         top_left:     "\x6C", # ┌
         top_right:    "\x6B", # ┐
         vertical:     "\x78", # │

data/test/lib/vedeu/dsl/components/border_test.rb

@@ -172,6 +172,15 @@ module Vedeu
         it { subject.must_be_instance_of(TrueClass) }
       end
 
+      describe '#title' do
+        let(:value) { 'Some title'}
+
+        subject { instance.title(value) }
+
+        it { subject.must_be_instance_of(String) }
+        it { subject.must_equal('Some title') }
+      end
+
       describe '#top_left' do
         let(:char) { 'A' }
 

data/test/lib/vedeu/output/border_test.rb

@@ -57,6 +57,7 @@ module Vedeu
           show_right:   true,
           show_top:     true,
           style:        [],
+          title:        '',
           top_left:     'l',
           top_right:    'k',
           vertical:     'x',

data/vedeu.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'vedeu'
-  spec.version       = '0.4.10'
+  spec.version       = '0.4.11'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = %q{A terminal case of wonderland.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba