vedeu 0.8.2 → 0.8.3

data/lib/vedeu/cells/empty.rb

@@ -27,6 +27,13 @@ module Vedeu
       # @return [String]
       attr_reader :value
 
+      # Returns the value represented as HTML.
+      #
+      # @return [String]
+      def as_html
+        ' '
+      end
+
       # @return [Boolean]
       def cell?
         true
@@ -49,27 +56,30 @@ module Vedeu
         ' '
       end
 
-      # @return [Hash]
-      def to_hash
+      # @return [Hash<Symbol => Hash<Symbol => String>, String>]
+      def to_h
         {
-          colour:   colour.to_s,
-          style:    style.to_s,
-          value:    value.to_s,
-          position: position.to_s,
-        }
+          name:  name.to_s,
+          style: style.to_s,
+          type:  type,
+          value: value.to_s,
+        }.merge!(colour.to_h).merge!(position.to_h)
       end
+      alias_method :to_hash, :to_h
 
-      # @param _options [Hash] Ignored.
+      # Returns the object represented as HTML.
+      #
+      # @param options [Hash] Options provided by
+      #   {Vedeu::Renderers::HTML}.
       # @return [String]
-      def to_html(_options = {})
-        ''
+      def to_html(options = {})
+        Vedeu::Cells::HTML.new(self, options).to_html
       end
 
-      # @return [String]
-      def to_s
-        value.to_s
+      # @return [Symbol]
+      def type
+        :empty
       end
-      alias_method :to_str, :to_s
 
       private
 

data/lib/vedeu/cells/escape.rb

@@ -40,7 +40,10 @@ module Vedeu
       #
       # @return [Hash<void>]
       def to_h
-        {}
+        {
+          type:  type,
+          value: value,
+        }
       end
       alias_method :to_hash, :to_h
 
@@ -55,15 +58,13 @@ module Vedeu
 
       # @return [String]
       def to_s
-        "#{position}#{value}"
+        value
       end
       alias_method :to_str, :to_s
 
-      private
-
-      # @return [Hash]
-      def defaults
-        super.merge!(position: [1, 1], value: '')
+      # @return [Symbol]
+      def type
+        :escape
       end
 
     end # Escape

data/lib/vedeu/cells/support/all.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require 'vedeu/cells/support/html'

data/lib/vedeu/cells/support/html.rb

@@ -0,0 +1,98 @@
+module Vedeu
+
+  module Cells
+
+    # Presents a {Vedeu::Cells} member class as a HTML string.
+    #
+    # @api private
+    #
+    class HTML
+
+      include Vedeu::Common
+
+      # @param cell [void] The {Vedeu::Cells} class to be presented as
+      #   HTML.
+      # @param options [Hash] Options provided by
+      #   {Vedeu::Renderers::HTML}.
+      # @return [Vedeu::Cells::HTML]
+      def initialize(cell, options = {})
+        @cell    = cell
+        @options = options || {}
+      end
+
+      # @return [String]
+      def to_html
+        "#{start_tag}#{style_attribute}>#{value}#{end_tag}"
+      end
+
+      protected
+
+      # @!attribute [r] cell
+      # @return [void]
+      attr_reader :cell
+
+      # @!attribute [r] options
+      # @return [Hash]
+      attr_reader :options
+
+      private
+
+      # @return [String]
+      def background
+        if cell.respond_to?(:background)
+          cell.background.to_html
+
+        else
+          ''
+
+        end
+      end
+
+      # @return [String]
+      def end_tag
+        options.fetch(:end_tag, '</td>')
+      end
+
+      # @return [String]
+      def foreground
+        if cell.respond_to?(:foreground)
+          cell.foreground.to_html
+
+        else
+          ''
+
+        end
+      end
+
+      # @return [String]
+      def start_tag
+        options.fetch(:start_tag, '<td')
+      end
+
+      # @return [String]
+      def style_attribute
+        if absent?(background) && absent?(foreground)
+          ''
+
+        else
+          " style='#{background}#{foreground}'"
+
+        end
+      end
+
+      # @return [String]
+      def value
+        if cell.respond_to?(:as_html) && present?(cell.as_html)
+          cell.as_html
+
+        else
+          '&nbsp;'
+
+        end
+      end
+
+    end # HTML
+
+  end # Cells
+
+end # Vedeu

data/lib/vedeu/colours/background.rb

@@ -17,6 +17,26 @@ module Vedeu
         present?(to_s)
       end
 
+      # @return [Hash<Symbol => String>]
+      def to_h
+        {
+          background: colour.to_s
+        }
+      end
+      alias_method :to_hash, :to_h
+
+      # @param _options [Hash] Ignored.
+      # @return [String]
+      def to_html(_options = {})
+        if rgb?
+          "background-color:#{colour};"
+
+        else
+          ''
+
+        end
+      end
+
       private
 
       # @return [String]
@@ -31,7 +51,7 @@ module Vedeu
       #   {Vedeu::EscapeSequences::Esc#valid_codes}
       #
       # @return [String]
-      def named_code
+      def named
         Vedeu.esc.background_colour(colour)
       end
 

data/lib/vedeu/colours/colour.rb

@@ -87,7 +87,7 @@ module Vedeu
 
       # An object is equal when its values are the same.
       #
-      # @param other [Vedeu::Views::Char]
+      # @param other [void]
       # @return [Boolean]
       def eql?(other)
         self.class == other.class && background == other.background &&
@@ -108,12 +108,20 @@ module Vedeu
         @_foreground = @foreground = Vedeu::Colours::Foreground.coerce(value)
       end
 
+      # @return [Hash<Symbol => Hash<Symbol => String>>]
+      def to_h
+        {
+          colour: background.to_h.merge!(foreground.to_h)
+        }
+      end
+      alias_method :to_hash, :to_h
+
       # Returns both or either of the converted attributes into a
       # single escape sequence.
       #
       # @return [String]
       def to_s
-        foreground.to_s + background.to_s
+        "#{foreground}#{background}"
       end
       alias_method :to_str, :to_s
 

data/lib/vedeu/colours/foreground.rb

@@ -17,6 +17,26 @@ module Vedeu
         present?(to_s)
       end
 
+      # @return [Hash<Symbol => String>]
+      def to_h
+        {
+          foreground: colour.to_s
+        }
+      end
+      alias_method :to_hash, :to_h
+
+      # @param _options [Hash] Ignored.
+      # @return [String]
+      def to_html(_options = {})
+        if rgb?
+          "color:#{colour};"
+
+        else
+          ''
+
+        end
+      end
+
       private
 
       # @return [String]
@@ -31,7 +51,7 @@ module Vedeu
       #   {Vedeu::EscapeSequences::Esc#valid_codes}
       #
       # @return [String]
-      def named_code
+      def named
         Vedeu.esc.foreground_colour(colour)
       end
 

data/lib/vedeu/colours/translator.rb

@@ -38,7 +38,7 @@ module Vedeu
       def_delegators :validator,
                      :named?,
                      :rgb?,
-                     :within_range?
+                     :numbered?
 
       # @!attribute [r] colour
       # @return [String]
@@ -71,7 +71,7 @@ module Vedeu
 
       # An object is equal when its values are the same.
       #
-      # @param other [Vedeu::Views::Char]
+      # @param other [void]
       # @return [Boolean]
       def eql?(other)
         self.class == other.class && colour == other.colour
@@ -89,11 +89,11 @@ module Vedeu
         elsif rgb?
           rgb
 
-        elsif within_range?
+        elsif numbered?
           numbered
 
         elsif named?
-          named_code
+          named
 
         else
           ''
@@ -103,14 +103,6 @@ module Vedeu
       alias_method :to_s, :escape_sequence
       alias_method :to_str, :escape_sequence
 
-      # @param _options [Hash] Ignored.
-      # @return [String]
-      def to_html(_options = {})
-        return colour if rgb?
-
-        ''
-      end
-
       private
 
       # Retrieves the escape sequence for the HTML/CSS colour code.
@@ -145,7 +137,14 @@ module Vedeu
       #
       # @return [String]
       def numbered
-        "#{prefix}5;#{css_to_numbered}m"
+        format(numbered_prefix, colour)
+      end
+
+      # Returns an escape sequence.
+      #
+      # @return [String]
+      def numbered_prefix
+        "#{prefix}5;%sm"
       end
 
       # Returns an escape sequence.
@@ -155,12 +154,12 @@ module Vedeu
         if registered?(colour)
           retrieve(colour)
 
+        elsif [8, 16, 256].include?(Vedeu.config.colour_mode)
+          register(colour, format(numbered_prefix, css_to_numbered))
+
         elsif Vedeu.config.colour_mode == 16_777_216
           register(colour, format(rgb_prefix, *css_to_rgb))
 
-        else
-          register(colour, numbered)
-
         end
       end
 
@@ -189,13 +188,7 @@ module Vedeu
 
       # @return [Fixnum]
       def css_to_numbered
-        if rgb?
-          [16, red, green, blue].inject(:+)
-
-        elsif within_range?
-          colour
-
-        end
+        [16, red, green, blue].inject(:+)
       end
 
       # Takes the red component of {#css_to_rgb} and converts to the
@@ -228,7 +221,7 @@ module Vedeu
       def not_implemented
         fail Vedeu::Error::NotImplemented, 'Subclasses implement this.'
       end
-      alias_method :named_code, :not_implemented
+      alias_method :named,      :not_implemented
       alias_method :repository, :not_implemented
 
       # @return [Vedeu::Colours::Validator]

data/lib/vedeu/colours/validator.rb

@@ -25,14 +25,6 @@ module Vedeu
         @value = value
       end
 
-      # Returns a boolean indicating whether the value is within the
-      # range of valid terminal numbered colours.
-      #
-      # @return [Boolean]
-      def within_range?
-        numeric?(value) && value >= 0 && value <= 255
-      end
-
       # Returns a boolean indicating whether the colour provided is a
       # valid named colour.
       #
@@ -41,6 +33,14 @@ module Vedeu
         Vedeu.esc.valid_name?(value)
       end
 
+      # Returns a boolean indicating whether the value is within the
+      # range of valid terminal numbered colours.
+      #
+      # @return [Boolean]
+      def numbered?
+        numeric?(value) && value >= 0 && value <= 255
+      end
+
       # Returns a boolean indicated whether the colour is a valid
       # HTML/CSS colour.
       #
@@ -53,7 +53,7 @@ module Vedeu
 
       # @return [Boolean]
       def valid?
-        background? || colour? || foreground? || rgb? || named? || within_range?
+        background? || colour? || foreground? || rgb? || named? || numbered?
       end
 
       protected

data/lib/vedeu/configuration/api.rb

@@ -389,7 +389,7 @@ module Vedeu
       # @param renderer [Array<Class>|Class]
       # @return [Array<Class>]
       def renderer(*renderer)
-        options[:renderers] = renderer
+        options[:renderers] = renderer.flatten
       end
       alias_method :renderers, :renderer