vedeu 0.6.36 → 0.6.37

data/lib/vedeu/geometry/dimension.rb

@@ -6,6 +6,17 @@ module Vedeu
     #
     class Dimension
 
+      extend Forwardable
+
+      def_delegators :alignment,
+                     :bottom_aligned?,
+                     :centre_aligned?,
+                     :left_aligned?,
+                     :middle_aligned?,
+                     :right_aligned?,
+                     :top_aligned?,
+                     :unaligned?
+
       # @param (see #initialize)
       # @return [Array<Fixnum>]
       def self.pair(attributes = {})
@@ -23,9 +34,7 @@ module Vedeu
       # @option attributes default [Fixnum|NilClass]
       #   The terminal width or height.
       # @option attributes maximised [Boolean]
-      # @option attributes centered [Boolean]
-      # @option attributes horizontal_alignment [Symbol]
-      # @option attributes vertical_alignment [Symbol]
+      # @option attributes alignment [Symbol]
       # @return [Vedeu::Geometry::Dimension]
       def initialize(attributes = {})
         defaults.merge!(attributes).each do |key, value|
@@ -63,19 +72,6 @@ module Vedeu
       attr_reader :maximised
       alias_method :maximised?, :maximised
 
-      # @!attribute [r] centred
-      # @return [Boolean]
-      attr_reader :centred
-      alias_method :centred?, :centred
-
-      # @!attribute [r] horizontal_alignment
-      # @return [Symbol]
-      attr_reader :horizontal_alignment
-
-      # @!attribute [r] vertical_alignment
-      # @return [Symbol]
-      attr_reader :vertical_alignment
-
       private
 
       # @raise [Vedeu::Error::NotImplemented] Subclasses of this class
@@ -96,26 +92,14 @@ module Vedeu
         @dimension = if maximised?
                        [1, default]
 
-                     elsif bottom_aligned?
-                       [bottom_d, default]
-
-                     elsif centre_aligned?
-                       [centred_d, centred_dn]
-
-                     elsif left_aligned?
-                       [1, left_dn]
+                     elsif bottom_aligned? || right_aligned?
+                       [start_coordinate, default]
 
-                     elsif middle_aligned?
+                     elsif centre_aligned? || middle_aligned?
                        [centred_d, centred_dn]
 
-                     elsif right_aligned?
-                       [right_d, default]
-
-                     elsif top_aligned?
-                       [1, top_dn]
-
-                     elsif centred? && length?
-                       [centred_d, centred_dn]
+                     elsif left_aligned? || top_aligned?
+                       [1, end_coordinate]
 
                      else
                        [_d, _dn]
@@ -187,7 +171,7 @@ module Vedeu
       # 3) Default to the terminal width or height.
       #
       # @return [Fixnum]
-      def left_dn
+      def end_coordinate
         if d_dn
           (d_dn > default) ? default : d_dn
 
@@ -199,7 +183,6 @@ module Vedeu
 
         end
       end
-      alias_method :top_dn, :left_dn
 
       # Ascertains the starting coordinate for a right or bottom
       # aligned interface/view.
@@ -209,7 +192,7 @@ module Vedeu
       # 3) Default to 1.
       #
       # @return [Fixnum]
-      def right_d
+      def start_coordinate
         if d_dn
           (default - d_dn) < 1 ? 1 : (default - d_dn)
 
@@ -221,7 +204,6 @@ module Vedeu
 
         end
       end
-      alias_method :bottom_d, :right_d
 
       # Fetch the starting coordinate, or use 1 when not set.
       #
@@ -259,48 +241,6 @@ module Vedeu
         end
       end
 
-      # Return a boolean indicating alignment was set to :left.
-      #
-      # @return [Boolean]
-      def left_aligned?
-        alignment == :left
-      end
-
-      # Return a boolean indicating alignment was set to :middle.
-      #
-      # @return [Boolean]
-      def middle_aligned?
-        alignment == :middle
-      end
-
-      # Return a boolean indicating alignment was set to :bottom.
-      #
-      # @return [Boolean]
-      def bottom_aligned?
-        alignment == :bottom
-      end
-
-      # Return a boolean indicating alignment was set to :centre.
-      #
-      # @return [Boolean]
-      def centre_aligned?
-        alignment == :centre
-      end
-
-      # Return a boolean indicating alignment was set to :right.
-      #
-      # @return [Boolean]
-      def right_aligned?
-        alignment == :right
-      end
-
-      # Return a boolean indicating alignment was set to :top.
-      #
-      # @return [Boolean]
-      def top_aligned?
-        alignment == :top
-      end
-
       # Returns the default options/attributes for this class.
       #
       # @return [Hash<Symbol => NilClass,Boolean,Symbol>]
@@ -309,8 +249,6 @@ module Vedeu
           d:         nil,
           dn:        nil,
           d_dn:      nil,
-          default:   nil,
-          centred:   false,
           maximised: false,
         }
       end

data/lib/vedeu/geometry/dsl.rb

@@ -180,7 +180,7 @@ module Vedeu
              'No width given.'.freeze unless present?(width)
 
         model.horizontal_alignment = Vedeu::Geometry::HorizontalAlignment
-          .align(value)
+          .coerce(value)
         model.width = width
         model
       end
@@ -196,7 +196,7 @@ module Vedeu
              'No height given.'.freeze unless present?(height)
 
         model.vertical_alignment = Vedeu::Geometry::VerticalAlignment
-          .align(value)
+          .coerce(value)
         model.height = height
         model
       end
@@ -369,29 +369,6 @@ module Vedeu
         vertical_alignment(:top, height)
       end
 
-      # Instructs Vedeu to calculate x and y geometry automatically
-      # based on the centre character of the terminal, the width and
-      # the height.
-      #
-      #   Vedeu.geometry :some_interface do
-      #     centred false # or...
-      #
-      #     centred true  # or...
-      #     centred!      # or...
-      #     # ... some code
-      #   end
-      #
-      # @param value [Boolean] Any value other than nil or false will
-      #   evaluate to true.
-      # @return [Boolean]
-      def centred(value = true)
-        boolean = value ? true : false
-
-        model.centred = boolean
-      end
-      alias_method :centred!, :centred
-      alias_method :centred=, :centred
-
       # Returns the width in characters for the number of columns
       # specified.
       #

data/lib/vedeu/geometry/geometry.rb

@@ -39,10 +39,6 @@ module Vedeu
       # @return [Symbol]
       attr_accessor :vertical_alignment
 
-      # @!attribute [rw] centred
-      # @return [Boolean]
-      attr_accessor :centred
-
       # @!attribute [rw] name
       # @return [String]
       attr_accessor :name
@@ -91,7 +87,6 @@ module Vedeu
       # @param attributes [Hash]
       # @option attributes horizontal_alignment [Symbol]
       # @option attributes vertical_alignment [Symbol]
-      # @option attributes centred [Boolean]
       # @option attributes maximised [Boolean]
       # @option attributes height [Fixnum]
       # @option attributes name [String|Symbol]
@@ -112,7 +107,6 @@ module Vedeu
       def attributes
         {
           client:               @client,
-          centred:              @centred,
           height:               height,
           horizontal_alignment: @horizontal_alignment,
           maximised:            @maximised,
@@ -234,7 +228,6 @@ module Vedeu
       # @return [Hash<Symbol => Boolean, Fixnum>]
       def area_attributes
         {
-          centred:              @centred,
           horizontal_alignment: @horizontal_alignment,
           maximised:            @maximised,
           vertical_alignment:   @vertical_alignment,
@@ -248,9 +241,9 @@ module Vedeu
       end
 
       # When moving an interface;
-      # 1) Reset the alignment, centred and maximised states to false;
-      #    it wont be aligned to a side if moved, nor centred if
-      #    moved, and cannot be moved if maximised.
+      # 1) Reset the alignment and maximised states to false;
+      #    it wont be aligned to a side if moved, and cannot be moved
+      #    if maximised.
       # 2) Get the current coordinates of the interface, then:
       # 3) Override the attributes with the new coordinates for
       #    desired movement; these are usually +/- 1 of the current
@@ -265,8 +258,7 @@ module Vedeu
       # @option coordinates yn [Fixnum] The ending row/line position.
       # @return [Hash<Symbol => Boolean, Fixnum>]
       def move(coordinates = {})
-        attrs = attributes.merge!(centred:              false,
-                                  horizontal_alignment: :none,
+        attrs = attributes.merge!(horizontal_alignment: :none,
                                   maximised:            false,
                                   vertical_alignment:   :none)
                 .merge!(coordinates)
@@ -280,13 +272,12 @@ module Vedeu
       def defaults
         {
           client:               nil,
-          centred:              false,
           height:               nil,
-          horizontal_alignment: default_horizontal_alignment,
+          horizontal_alignment: :none,
           maximised:            false,
           name:                 nil,
           repository:           Vedeu.geometries,
-          vertical_alignment:   default_vertical_alignment,
+          vertical_alignment:   :none,
           width:                nil,
           x:                    nil,
           xn:                   nil,
@@ -295,16 +286,6 @@ module Vedeu
         }
       end
 
-      # @return [Symbol]
-      def default_horizontal_alignment
-        Vedeu::Geometry::HorizontalAlignment.align(:none)
-      end
-
-      # @return [Symbol]
-      def default_vertical_alignment
-        Vedeu::Geometry::VerticalAlignment.align(:none)
-      end
-
     end # Geometry
 
   end # Geometry

data/lib/vedeu/geometry/x_dimension.rb

@@ -8,24 +8,19 @@ module Vedeu
 
       private
 
-      # @return [Symbol]
+      # @return [Vedeu::Geometry::HorizontalAlignment]
       def alignment
-        horizontal_alignment
+        Vedeu::Geometry::Alignment.coerce(@alignment)
       end
 
       # @return [Hash<Symbol => NilClass,Boolean,Symbol>]
       def defaults
         super.merge!(
-          default:              Vedeu.width,
-          horizontal_alignment: default_alignment,
+          default:   Vedeu.width,
+          alignment: :none,
         )
       end
 
-      # @return [Symbol]
-      def default_alignment
-        Vedeu::Geometry::HorizontalAlignment.align(:none)
-      end
-
     end # XDimension
 
   end # Geometry

data/lib/vedeu/geometry/y_dimension.rb

@@ -8,24 +8,19 @@ module Vedeu
 
       private
 
-      # @return [Symbol]
+      # @return [Vedeu::Geometry::VerticalAlignment]
       def alignment
-        vertical_alignment
+        Vedeu::Geometry::Alignment.coerce(@alignment)
       end
 
       # @return [Hash<Symbol => NilClass,Boolean,Symbol>]
       def defaults
         super.merge!(
-          default:            Vedeu.height,
-          vertical_alignment: default_alignment,
+          default:   Vedeu.height,
+          alignment: :none,
         )
       end
 
-      # @return [Symbol]
-      def default_alignment
-        Vedeu::Geometry::VerticalAlignment.align(:none)
-      end
-
     end # YDimension
 
   end # Geometry

data/lib/vedeu/null/generic.rb

@@ -28,7 +28,6 @@ module Vedeu
       def falsy
         false
       end
-      alias_method :centred, :falsy
       alias_method :enabled?, :falsy
       alias_method :maximise, :falsy
       alias_method :maximised?, :falsy

data/lib/vedeu/output/renderers/file.rb

@@ -48,6 +48,10 @@ module Vedeu
 
       private
 
+      # Compresses the output depending on configuration.
+      #
+      # @param output [Vedeu::Models::Page]
+      # @return [String]
       def out(output)
         if compress?
           Vedeu::Output::Compressor.render(output, options)

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.36'.freeze
+  VERSION = '0.6.37'.freeze
 
 end

data/test/lib/vedeu/geometry/alignment_test.rb

@@ -21,12 +21,130 @@ module Vedeu
         it { proc { subject }.must_raise(Vedeu::Error::NotImplemented) }
       end
 
+      describe '.coerce' do
+        subject { described.coerce(_value) }
+
+        context 'when the value is a Vedeu::Geometry::Alignment' do
+          let(:_value) { Vedeu::Geometry::Alignment.new(:none) }
+
+          it { subject.must_equal(_value) }
+        end
+
+        context 'when the value is a Symbol' do
+          let(:_value) { :centre }
+
+          it { subject.must_be_instance_of(described) }
+        end
+
+        context 'when the value is nil or something else' do
+          it { subject.must_be_instance_of(described) }
+        end
+      end
+
       describe '#align' do
         subject { instance.align }
 
         it { proc { subject }.must_raise(Vedeu::Error::NotImplemented) }
       end
 
+      describe '#bottom_aligned?' do
+        subject { instance.bottom_aligned? }
+
+        context 'when the value is :bottom' do
+          let(:_value) { :bottom }
+
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the value is not :bottom' do
+          it { subject.must_equal(false) }
+        end
+      end
+
+      describe '#centre_aligned?' do
+        subject { instance.centre_aligned? }
+
+        context 'when the value is :centre' do
+          let(:_value) { :centre }
+
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the value is not :centre' do
+          it { subject.must_equal(false) }
+        end
+      end
+
+      describe '#left_aligned?' do
+        subject { instance.left_aligned? }
+
+        context 'when the value is :left' do
+          let(:_value) { :left }
+
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the value is not :left' do
+          it { subject.must_equal(false) }
+        end
+      end
+
+      describe '#middle_aligned?' do
+        subject { instance.middle_aligned? }
+
+        context 'when the value is :middle' do
+          let(:_value) { :middle }
+
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the value is not :middle' do
+          it { subject.must_equal(false) }
+        end
+      end
+
+      describe '#right_aligned?' do
+        subject { instance.right_aligned? }
+
+        context 'when the value is :right' do
+          let(:_value) { :right }
+
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the value is not :right' do
+          it { subject.must_equal(false) }
+        end
+      end
+
+      describe '#top_aligned?' do
+        subject { instance.top_aligned? }
+
+        context 'when the value is :top' do
+          let(:_value) { :top }
+
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the value is not :top' do
+          it { subject.must_equal(false) }
+        end
+      end
+
+      describe '#unaligned?' do
+        subject { instance.unaligned? }
+
+        context 'when the value is :none' do
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the value is not :none' do
+          let(:_value) { :centre }
+
+          it { subject.must_equal(false) }
+        end
+      end
+
     end # Alignment
 
   end # Geometry