vedeu 0.5.5 → 0.5.6

data/lib/vedeu/output/html_char.rb

@@ -45,11 +45,19 @@ module Vedeu
     def tag_style
       return '' unless border || present?(value)
 
-      " style='" \
-      "background:#{bg};" \
-      "color:#{fg};" \
-      "border:1px #{bg} solid;" \
-      "#{border_style}'"
+      out = " style='"
+
+      unless char.background.empty?
+        out << "border:1px #{char.background.to_html} solid;"
+        out << "background:#{char.background.to_html};"
+      end
+
+      unless char.foreground.empty?
+        out << "color:#{char.foreground.to_html};"
+        out << "#{border_style}"
+      end
+
+      out << "'"
     end
 
     # @return [String]
@@ -77,39 +85,41 @@ module Vedeu
 
     # @return [String]
     def css(direction = '')
-      "border-#{direction}:1px #{fg} solid;"
+      "border-#{direction}:1px #{char.foreground.to_html} solid;"
     end
 
-    # @return [String]
-    def fg
-      @fg ||= colour(char, 'foreground', '#222')
-    end
+    # # @return [String]
+    # def fg
+    #   @fg ||= colour(char, 'foreground', '#222')
+    # end
 
-    # @return [String]
-    def bg
-      @bg ||= colour(char, 'background', '#000')
-    end
+    # # @return [String]
+    # def bg
+    #   @bg ||= colour(char, 'background', '#000')
+    # end
 
     # @param char [Vedeu::Views::Char]
-    # @param type [String]
-    # @param default [String]
+    # @param type [String] 'background' or 'foreground'
+    # @param default [String] A default colour (CSS style; e.g. '#b2adf2')
     # @return [String]
-    def colour(char, type, default)
-      parent_type         = ('parent_' + type).to_sym
-      type_to_html        = char.send(type).send(:to_html)
-      parent_type_to_html = char.send(parent_type).send(:to_html)
+    # def colour(char, type, default)
+    #   parent_type         = char.send(:parent).send(type).send(:to_html)
+    #   #parent_type         = ('parent_' + type).to_sym
+    #   type_to_html        = char.send(type).send(:to_html)
+    #   #parent_type_to_html = char.send(parent_type).send(:to_html)
 
-      if present?(type_to_html)
-        type_to_html
+    #   if present?(type_to_html)
+    #     type_to_html
 
-      elsif present?(parent_type_to_html)
-        parent_type_to_html
+    #   elsif char.parent
+    #     parent_type
+    #     #char.parent.send(type).send(:to_html)
 
-      else
-        default
+    #   else
+    #     default
 
-      end
-    end
+    #   end
+    # end
 
     # @return [Symbol|NilClass]
     def border

data/lib/vedeu/output/presentation/colour.rb

@@ -14,8 +14,11 @@ module Vedeu
         @background ||= if colour
                           colour.background
 
+                        elsif parent
+                          parent.background
+
                         else
-                          parent_background
+                          Vedeu::Background.new
 
                         end
       end
@@ -25,7 +28,7 @@ module Vedeu
       #
       # @return [Vedeu::Background]
       def background=(value)
-        self.colour = Vedeu::Colour.coerce(
+        @colour = Vedeu::Colour.coerce(
           background: Vedeu::Background.coerce(value),
           foreground: colour.foreground)
       end
@@ -35,8 +38,8 @@ module Vedeu
         @colour ||= if attributes[:colour]
                       Vedeu::Colour.coerce(attributes[:colour])
 
-                    elsif parent_colour
-                      Vedeu::Colour.coerce(parent_colour)
+                    elsif parent
+                      Vedeu::Colour.coerce(parent.colour)
 
                     else
                       Vedeu::Colour.new
@@ -49,7 +52,7 @@ module Vedeu
       #
       # @return [Vedeu::Colour]
       def colour=(value)
-        @colour = attributes[:colour] = Vedeu::Colour.coerce(value)
+        @colour = Vedeu::Colour.coerce(value)
       end
 
       # When the foreground colour for the model exists, return it, otherwise
@@ -60,8 +63,11 @@ module Vedeu
         @foreground ||= if colour
                           colour.foreground
 
+                        elsif parent
+                          parent.foreground
+
                         else
-                          parent_foreground
+                          Vedeu::Foreground.new
 
                         end
       end
@@ -71,44 +77,9 @@ module Vedeu
       #
       # @return [Vedeu::Foreground]
       def foreground=(value)
-        self.colour = Vedeu::Colour.coerce(
-          foreground: Vedeu::Foreground.coerce(value),
-          background: colour.background)
-      end
-
-      # When a parent colour is available, returns the parent background colour,
-      # otherwise an empty Vedeu::Background.
-      #
-      # @return [Vedeu::Background]
-      def parent_background
-        if parent_colour
-          parent_colour.background
-
-        else
-          Vedeu::Background.new
-
-        end
-      end
-
-      # Returns the parent colour when available or NilClass.
-      #
-      # @return [String|NilClass]
-      def parent_colour
-        parent.colour if parent
-      end
-
-      # When a parent colour is available, returns the parent foreground colour,
-      # otherwise an empty Vedeu::Foreground.
-      #
-      # @return [Vedeu::Foreground]
-      def parent_foreground
-        if parent_colour
-          parent_colour.foreground
-
-        else
-          Vedeu::Foreground.new
-
-        end
+        @colour = Vedeu::Colour.coerce(
+          background: colour.background,
+          foreground: Vedeu::Foreground.coerce(value))
       end
 
     end # Colour

data/lib/vedeu/output/presentation/style.rb

@@ -6,26 +6,16 @@ module Vedeu
     #
     module Style
 
-      # Returns the parent style when available or NilClass.
+      # When the style for the model exists, return it, otherwise returns the
+      # parent style, or an empty Vedeu::Style.
       #
-      # @return [String|NilClass]
-      def parent_style
-        if parent
-          parent.style
-
-        else
-          Vedeu::Style.new
-
-        end
-      end
-
       # @return [Vedeu::Style]
       def style
         @style ||= if attributes[:style]
                      Vedeu::Style.coerce(attributes[:style])
 
-                   elsif parent_style
-                     Vedeu::Style.coerce(parent_style)
+                   elsif parent
+                     Vedeu::Style.coerce(parent.style)
 
                    else
                      Vedeu::Style.new
@@ -33,6 +23,9 @@ module Vedeu
                    end
       end
 
+      # Allows the setting of the style by coercing the given value into a
+      # Vedeu::Style.
+      #
       # @return [Vedeu::Style]
       def style=(value)
         @style = Vedeu::Style.coerce(value)

data/lib/vedeu/output/viewport.rb

@@ -12,7 +12,6 @@ module Vedeu
 
     def_delegators :view,
                    :lines,
-                   :lines?,
                    :name,
                    :visible?
 
@@ -83,8 +82,6 @@ module Vedeu
     #
     # @return [Array]
     def show
-      return [] unless lines?
-
       (lines[rows] || []).map { |line| (line.chars[columns] || []) }
     end
 

data/lib/vedeu/output/virtual_terminal.rb

@@ -48,7 +48,7 @@ module Vedeu
     # @param x [Fixnum] The column/character coordinate.
     # @return [Vedeu::Views::Char]
     def read(y, x)
-      cy, cx = Vedeu::PositionIndex[y, x]
+      cy, cx = Vedeu::Position[y, x].as_indices
 
       row  = fetch(cells, cy)
       cell = fetch(row, cx)
@@ -96,7 +96,7 @@ module Vedeu
     def write(y, x, data)
       return false unless read(y, x).is_a?(Vedeu::Cell)
 
-      cy, cx = Vedeu::PositionIndex[y, x]
+      cy, cx = Vedeu::Position[y, x].as_indices
       cells[cy][cx] = data
 
       true

data/lib/vedeu/repositories/repository.rb

@@ -113,13 +113,6 @@ module Vedeu
       end
     end
 
-    # Override Ruby's Object#inspect method to provide a more helpful output.
-    #
-    # @return [String]
-    def inspect
-      "<#{self.class.name}: #{registered.inspect}>"
-    end
-
     # Returns a boolean indicating whether the named model is registered.
     #
     # @param name [String]

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 
 end

data/test/lib/vedeu/buffers/buffer_test.rb

@@ -42,7 +42,7 @@ module Vedeu
     end
 
     describe '#add' do
-      let(:content) { Vedeu::Views::View.new(lines: [Vedeu::Views::Line.new]) }
+      let(:content) { Vedeu::Views::View.new(value: [Vedeu::Views::Line.new]) }
 
       subject { instance.add(content) }
 
@@ -54,7 +54,7 @@ module Vedeu
 
       context 'with content' do
         let(:back) {
-          Vedeu::Views::View.new(lines: [Vedeu::Views::Line.new])
+          Vedeu::Views::View.new(value: [Vedeu::Views::Line.new])
         }
 
         it { subject.must_equal(true) }
@@ -70,7 +70,7 @@ module Vedeu
 
       context 'with content' do
         let(:front) {
-          Vedeu::Views::View.new(lines: [Vedeu::Views::Line.new])
+          Vedeu::Views::View.new(value: [Vedeu::Views::Line.new])
         }
 
         it { subject.must_equal(true) }
@@ -86,7 +86,7 @@ module Vedeu
 
       context 'with content' do
         let(:previous) {
-          Vedeu::Views::View.new(lines: [Vedeu::Views::Line.new])
+          Vedeu::Views::View.new(value: [Vedeu::Views::Line.new])
         }
 
         it { subject.must_equal(true) }

data/test/lib/vedeu/colours/colour_translator_test.rb

@@ -56,6 +56,20 @@ module Vedeu
       end
     end
 
+    describe '#empty?' do
+      subject { instance.empty? }
+
+      context 'when there is no colour' do
+        let(:colour) {}
+
+        it { subject.must_equal(true) }
+      end
+
+      context 'when there is a colour' do
+        it { subject.must_equal(false) }
+      end
+    end
+
     describe '#eql?' do
       let(:other) { instance }
 

data/test/lib/vedeu/cursor/cursor_test.rb

@@ -80,15 +80,6 @@ module Vedeu
       it { subject.must_be_instance_of(Vedeu::Escape) }
     end
 
-    describe '#inspect' do
-      subject { instance.inspect }
-
-      it { subject.must_be_instance_of(String) }
-      it { subject.must_equal(
-        '<Vedeu::Cursor (silver, true, x:19, y:8, ox:3, oy:2)>'
-      ) }
-    end
-
     describe '#position' do
       subject { instance.position }
 

data/test/lib/vedeu/dsl/line_test.rb

@@ -6,22 +6,24 @@ module Vedeu
 
     describe Line do
 
-      let(:described) { Vedeu::DSL::Line }
-      let(:instance)  { described.new(model) }
-      let(:model)     { Vedeu::Views::Line.new(attributes) }
-      let(:attributes){
+      let(:described)  { Vedeu::DSL::Line }
+      let(:instance)   { described.new(model) }
+      let(:model)      { Vedeu::Views::Line.new(attributes) }
+      let(:client)     {}
+      let(:colour)     { Vedeu::Colour.new }
+      let(:parent)     { Vedeu::Views::View.new }
+      let(:style)      { Vedeu::Style.new }
+      let(:_value)     { [] }
+      let(:attributes) {
         {
-          streams: streams,
-          parent:  parent,
-          colour:  colour,
-          style:   style,
+          client: client,
+          value:  _value,
+          parent: parent,
+          colour: colour,
+          style:  style,
         }
       }
-      let(:client)    {}
-      let(:streams)   { [] }
-      let(:parent)    { Vedeu::Views::View.new }
-      let(:colour)    { Vedeu::Colour.new }
-      let(:style)     { Vedeu::Style.new }
+
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }

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

@@ -67,19 +67,6 @@ module Vedeu
       it { instance.must_respond_to(:yn=) }
     end
 
-    describe '#inspect' do
-      before { Terminal.stubs(:size).returns([12, 40]) }
-
-      subject { instance.inspect }
-
-      it { subject.must_be_instance_of(String) }
-
-      it { subject.must_equal(
-        '<Vedeu::Geometry x:1 xn:40 y:1 yn:12 centred:false maximise:false>'
-        )
-      }
-    end
-
     describe '#maximise' do
       let(:attributes) {
         {

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

@@ -139,6 +139,24 @@ module Vedeu
       end
     end
 
+    describe '#as_indices' do
+      subject { instance.as_indices }
+
+      it { subject.must_equal([11, 18]) }
+
+      context 'when y is less than 1' do
+        let(:y) { -3 }
+
+        it { subject.must_equal([0, 18]) }
+      end
+
+      context 'when x is less than 1' do
+        let(:x) { -9 }
+
+        it { subject.must_equal([11, 0]) }
+      end
+    end
+
   end # Position
 
 end # Vedeu