html-table 1.6.3 → 1.7.1

data/lib/html/data.rb

@@ -1,3 +1,4 @@
+# The HTML module serves as a namespace only.
 module HTML
 
   # This class represents HTML table data, <td>.  Despite the name
@@ -6,6 +7,7 @@ module HTML
   class Table::Row::Data
     include HTML::Mixin::AttributeHandler
     include HTML::Mixin::HtmlHandler
+    extend HTML::Mixin::StrongTyping
 
     undef_method :configure
 
@@ -42,7 +44,7 @@ module HTML
     #
     def self.indent_level=(num)
       expect(num, Integer)
-      raise ArgumentError,"indent_level must be >= 0" if num < 0
+      raise ArgumentError, 'indent_level must be >= 0' if num < 0
       @indent_level = num
     end
 

data/lib/html/foot.rb

@@ -1,49 +1,57 @@
+require 'singleton'
+
+# The HTML module serves as a namespace only.
 module HTML
 
-   # This class represents an HTML table foot (<tfoot>).  It is a
-   # subclass of Table::TableSection.  It is a singleton class.
-   #
-   class Table::Foot < Table::TableSection
-      private_class_method :new
-
-      @@foot        = nil
-      @indent_level = 3
-      @end_tags     = true
-
-      # This is our constructor for Foot objects because it is a singleton
-      # class.  Optionally, a block may be provided.  If an argument is 
-      # provided it is treated as content.
-      #
-      def self.create(arg=nil, &block)
-         @@foot = new(arg, &block) unless @@foot
-         @@foot
-      end      
-      
-      # Called by create() instead of new().  This initializes the Foot class.
-      #
-      def initialize(arg, &block)
-         @html_begin = "<tfoot"
-         @html_end   = "</tfoot>"
-         instance_eval(&block) if block_given?
-         self.content = arg if arg
-      end
-      
-      # Returns a boolean indicating whether or not end tags, </tfoot>, are
-      # included for each Foot object in the final HTML output.  The
-      # default is true.
-      #
-      def self.end_tags?
-         @end_tags
-      end
-      
-      # Sets whether or not end tags are included for each Foot object in
-      # the final HTML output.  The default is true.  Only true or false are
-      # valid arguments.
-      #
-      def self.end_tags=(bool)
-         expect(bool, [TrueClass,FalseClass])
-         @end_tags = bool
-      end
-   end
+  # This class represents an HTML table foot (<tfoot>). It is a
+  # subclass of Table::TableSection. It is a singleton class.
+  #
+  class Table::Foot < Table::TableSection
+    include Singleton
+    extend HTML::Mixin::StrongTyping
+
+    @indent_level = 3
+    @end_tags     = true
+
+    # This is our constructor for Foot objects because it is a singleton
+    # class. Optionally, a block may be provided. If an argument is
+    # provided it is treated as content.
+    #
+    def self.create(arg = nil, &block)
+      instance(arg, &block)
+    end
+
+    # Part of the singleton interface.
+    #
+    def self.instance(arg = nil, &block)
+      @instance ||= new(arg, &block)
+    end
+
+    # Called by create() instead of new(). This initializes the Foot class.
+    #
+    def initialize(arg, &block)
+      @html_begin = '<tfoot'
+      @html_end   = '</tfoot>'
+      super(&block)
+      self.content = arg if arg
+    end
+
+    # Returns a boolean indicating whether or not end tags, </tfoot>, are
+    # included for each Foot object in the final HTML output.  The
+    # default is true.
+    #
+    def self.end_tags?
+      @end_tags
+    end
+
+    # Sets whether or not end tags are included for each Foot object in
+    # the final HTML output.  The default is true.  Only true or false are
+    # valid arguments.
+    #
+    def self.end_tags=(bool)
+      expect(bool, [TrueClass, FalseClass])
+      @end_tags = bool
+    end
+  end
 
 end

data/lib/html/head.rb

@@ -1,49 +1,56 @@
+require 'singleton'
+
+# The HTML module serves only as a namespace.
 module HTML
-   
-   # This class represents an HTML table head (<thead>).  It is a
-   # subclass of Table::TableSection.  It is a singleton class.
-   #
-   class Table::Head < Table::TableSection
-      private_class_method :new
-
-      @@head = nil
-
-      @indent_level = 3
-      @end_tags     = true
-
-      # This is our constructor for Head objects because it is a singleton
-      # class.  Optionally, a block may be provided.  If an argument is 
-      # provided it is treated as content.
-      #
-      def self.create(arg=nil, &block)
-         @@head = new(arg, &block) unless @@head
-         @@head
-      end      
-
-      # Called by create() instead of new().  This initializes the Head class.
-      #
-      def initialize(arg, &block)
-         @html_begin = "<thead"
-         @html_end   = "</thead>"
-         instance_eval(&block) if block_given?
-         self.content = arg if arg
-      end
-      
-      # Returns a boolean indicating whether or not end tags, </thead>, are
-      # included for each Head object in the final HTML output.  The
-      # default is true.
-      #
-      def self.end_tags?
-         @end_tags
-      end
-      
-      # Sets whether or not end tags are included for each Head object in
-      # the final HTML output.  The default is true.  Only true or false are
-      # valid arguments.
-      #
-      def self.end_tags=(bool)
-         expect(bool,[TrueClass,FalseClass])
-         @end_tags = bool
-      end
-   end
+
+  # This class represents an HTML table head (<thead>). It is a
+  # subclass of Table::TableSection. It is a singleton class.
+  #
+  class Table::Head < Table::TableSection
+    include Singleton
+    extend HTML::Mixin::StrongTyping
+
+    @indent_level = 3
+    @end_tags     = true
+
+    # This is our constructor for Head objects because it is a singleton
+    # class. Optionally, a block may be provided. If an argument is
+    # provided it is treated as content.
+    #
+    def self.create(arg = nil, &block)
+      instance(arg, &block)
+    end
+
+    # Part of the singleton interface.
+    #
+    def self.instance(arg = nil, &block)
+      @instance ||= new(arg, &block)
+    end
+
+    # Called by create() instead of new(). This initializes the Head class.
+    #
+    def initialize(arg, &block)
+      @html_begin = '<thead'
+      @html_end   = '</thead>'
+      super(&block)
+      self.content = arg if arg
+    end
+
+    # Returns a boolean indicating whether or not end tags, </thead>, are
+    # included for each Head object in the final HTML output.  The
+    # default is true.
+    #
+    def self.end_tags?
+      @end_tags
+    end
+
+    # Sets whether or not end tags are included for each Head object in
+    # the final HTML output.  The default is true.  Only true or false are
+    # valid arguments.
+    #
+    def self.end_tags=(bool)
+      expect(bool, [TrueClass, FalseClass])
+      @end_tags = bool
+    end
+  end
 end

data/lib/html/header.rb

@@ -1,3 +1,4 @@
+# The HTML module serves as a namespace only.
 module HTML
 
   # This class represents an HTML table header (<th>).  Despite the name
@@ -6,6 +7,7 @@ module HTML
   class Table::Row::Header
     include HTML::Mixin::AttributeHandler
     include HTML::Mixin::HtmlHandler
+    extend HTML::Mixin::StrongTyping
 
     undef_method :configure
 
@@ -41,8 +43,8 @@ module HTML
     # is 6.
     #
     def self.indent_level=(num)
-      expect(num,Integer)
-      raise ArgumentError,"indent_level must be >= 0" if num < 0
+      expect(num, Integer)
+      raise ArgumentError, 'indent_level must be >= 0' if num < 0
       @indent_level = num
     end
 
@@ -58,7 +60,7 @@ module HTML
     # valid arguments.
     #
     def self.end_tags=(bool)
-      expect(bool,[TrueClass,FalseClass])
+      expect(bool, [TrueClass, FalseClass])
       @end_tags = bool
     end
   end

data/lib/html/mixin/attribute_handler.rb

@@ -1,11 +1,14 @@
-# This module creates methods for each of the various attributes associated
-# with HTML tables.  In some cases validation is done on the setters.
-#--
+##########################################################################
 # The seemingly redundant writer methods were left here for backwards
-# compatibility and for those who may not prefer the DSI.
-#
+# compatibility and for those who may not prefer the DSL.
+##########################################################################
+
+# The HTML module serves as a namespace only.
 module HTML
+  # The Mixin module serves as a namespace to prevent collisions.
   module Mixin
+    # The AttributeHandler module creates methods for each of the various attributes
+    # associated with HTML tables. In some cases validation is done on the setters.
     module AttributeHandler
       def abbr(string = nil)
         @abbr ||= nil
@@ -15,7 +18,7 @@ module HTML
 
       def abbr=(string)
         @abbr = string
-        modify_html("abbr", string)
+        modify_html('abbr', string)
       end
 
       def align(position = nil)
@@ -25,10 +28,10 @@ module HTML
       end
 
       def align=(position)
-        valid = %w/top bottom left center right/
+        valid = %w[top bottom left center right]
         raise ArgumentError unless valid.include?(position.downcase)
         @align = position
-        modify_html("align", position)
+        modify_html('align', position)
       end
 
       def axis(string = nil)
@@ -39,7 +42,7 @@ module HTML
 
       def axis=(string)
         @axis = string
-        modify_html("axis", string)
+        modify_html('axis', string)
       end
 
       def background(url = nil)
@@ -49,11 +52,11 @@ module HTML
       end
 
       def background=(url)
-        raise TypeError unless url.kind_of?(String)
-        msg =  "'background' is a non-standard extension"
+        raise TypeError unless url.is_a?(String)
+        msg = "'background' is a non-standard extension"
         warn NonStandardExtensionWarning, msg
         @background = url
-        modify_html("background", url)
+        modify_html('background', url)
       end
 
       def bgcolor(color = nil)
@@ -64,7 +67,7 @@ module HTML
 
       def bgcolor=(color)
         @bgcolor = color
-        modify_html("bgcolor", color)
+        modify_html('bgcolor', color)
       end
 
       def border(num = nil)
@@ -75,13 +78,14 @@ module HTML
 
       # Allow either true/false or an integer
       def border=(num)
-        if num.kind_of?(TrueClass)
-          modify_html("border", true)
-        elsif num.kind_of?(FalseClass)
-          # Do nothing
-        else
-          @border = num.to_i
-          modify_html("border", num.to_i)
+        case num
+          when TrueClass
+            modify_html('border', true)
+          when FalseClass
+            # Do nothing
+          else
+            @border = num.to_i
+            modify_html('border', num.to_i)
         end
       end
 
@@ -93,9 +97,9 @@ module HTML
 
       def bordercolor=(color)
         @bordercolor = color
-        msg =  "'bordercolor' is a non-standard extension"
+        msg = "'bordercolor' is a non-standard extension"
         warn NonStandardExtensionWarning, msg
-        modify_html("bordercolor", color)
+        modify_html('bordercolor', color)
       end
 
       def bordercolordark(color = nil)
@@ -108,7 +112,7 @@ module HTML
         @bordercolordark = color
         msg = "'bordercolordark' is a non-standard extension"
         warn NonStandardExtensionWarning, msg
-        modify_html("bordercolordark", color)
+        modify_html('bordercolordark', color)
       end
 
       def bordercolorlight(color = nil)
@@ -121,7 +125,7 @@ module HTML
         @bordercolorlight = color
         msg = "'bordercolorlight' is a non-standard extension"
         warn NonStandardExtensionWarning, msg
-        modify_html("bordercolorlight", @bordercolorlight)
+        modify_html('bordercolorlight', @bordercolorlight)
       end
 
       def cellpadding(num = nil)
@@ -133,7 +137,7 @@ module HTML
       def cellpadding=(num)
         raise ArgumentError if num.to_i < 0
         @cellpadding = num.to_i
-        modify_html("cellpadding", @cellpadding)
+        modify_html('cellpadding', @cellpadding)
       end
 
       def cellspacing(num = nil)
@@ -145,7 +149,7 @@ module HTML
       def cellspacing=(num)
         raise ArgumentError if num.to_i < 0
         @cellspacing = num.to_i
-        modify_html("cellspacing", @cellspacing)
+        modify_html('cellspacing', @cellspacing)
       end
 
       def char(character = nil)
@@ -157,7 +161,7 @@ module HTML
       def char=(character)
         raise ArgumentError if character.to_s.length > 1
         @char = character.to_s
-        modify_html("char", character.to_s)
+        modify_html('char', character.to_s)
       end
 
       def charoff(offset = nil)
@@ -169,7 +173,7 @@ module HTML
       def charoff=(offset)
         raise ArgumentError if offset.to_i < 0
         @charoff = offset
-        modify_html("charoff", offset)
+        modify_html('charoff', offset)
       end
 
       # Returns the CSS class. The trailing underscore is necessary in order
@@ -198,7 +202,7 @@ module HTML
       def col=(num)
         raise ArgumentError if num.to_i < 0
         @col = num.to_i
-        modify_html("col", @col)
+        modify_html('col', @col)
       end
 
       def colspan(span = nil)
@@ -210,17 +214,17 @@ module HTML
       def colspan=(span)
         raise ArgumentError if span.to_i < 0
         @colspan = span.to_i
-        modify_html("colspan", @colspan)
+        modify_html('colspan', @colspan)
       end
 
       # Allows you to configure various attributes by row or row + column.
       #
-      def configure(row, col=nil, &block)
+      def configure(row, col = nil)
         if col
           begin
             yield self[row][col]
           rescue NameError
-            msg = "No column to configure in a " + self.class.to_s + " class"
+            msg = "No column to configure in a #{self.class} class"
             raise ArgumentError, msg
           end
         else
@@ -235,15 +239,15 @@ module HTML
           when String
             self.content = Table::Content.new(arg, &block)
           when Array
-            arg.each{ |e|
-              if e.kind_of?(Array)
+            arg.each do |e|
+              if e.is_a?(Array)
                 row = Table::Row.new
-                e.each{ |element| row.push(Table::Content.new(element, &block)) }
-                self.push(row)
+                e.each { |element| row.push(Table::Content.new(element, &block)) }
+                push(row)
               else
                 self.content = Table::Content.new(e, &block)
               end
-            }
+            end
           else
             self.content = arg if arg
         end
@@ -259,10 +263,10 @@ module HTML
       end
 
       def frame=(type)
-        valid = %w/border void above below hsides lhs rhs vsides box/
+        valid = %w[border void above below hsides lhs rhs vsides box]
         raise ArgumentError unless valid.include?(type.downcase)
         @frame = type
-        modify_html("frame", @frame)
+        modify_html('frame', @frame)
       end
 
       def height(num = nil)
@@ -274,7 +278,7 @@ module HTML
       def height=(num)
         raise ArgumentError if num.to_i < 0
         @height = num.to_i
-        modify_html("height", @height)
+        modify_html('height', @height)
       end
 
       def hspace(num = nil)
@@ -286,7 +290,7 @@ module HTML
       def hspace=(num)
         raise ArgumentError if num.to_i < 0
         @hspace = num.to_i
-        modify_html("hspace", @hspace)
+        modify_html('hspace', @hspace)
       end
 
       def nowrap(bool = nil)
@@ -296,11 +300,11 @@ module HTML
       end
 
       def nowrap=(bool)
-        unless bool.kind_of?(TrueClass) || bool.kind_of?(FalseClass)
-           raise TypeError
+        unless bool.is_a?(TrueClass) || bool.is_a?(FalseClass)
+          raise TypeError
         end
         @nowrap = bool
-        modify_html("nowrap", @nowrap)
+        modify_html('nowrap', @nowrap)
       end
 
       def rowspan(num = nil)
@@ -312,7 +316,7 @@ module HTML
       def rowspan=(num)
         raise ArgumentError if num.to_i < 0
         @rowspan = num.to_i
-        modify_html("rowspan", @rowspan)
+        modify_html('rowspan', @rowspan)
       end
 
       def rules(edges = nil)
@@ -322,10 +326,10 @@ module HTML
       end
 
       def rules=(edges)
-        valid = %w/all groups rows cols none/
+        valid = %w[all groups rows cols none]
         raise ArgumentError unless valid.include?(edges.to_s.downcase)
         @rules = edges
-        modify_html("rules", @rules)
+        modify_html('rules', @rules)
       end
 
       def span(num = nil)
@@ -337,7 +341,7 @@ module HTML
       def span=(num)
         raise ArgumentError if num.to_i < 0
         @span = num.to_i
-        modify_html("span", @span)
+        modify_html('span', @span)
       end
 
       def style(string = nil)
@@ -348,7 +352,7 @@ module HTML
 
       def style=(string)
         @style = string.to_s
-        modify_html("style", @style)
+        modify_html('style', @style)
       end
 
       def summary(string = nil)
@@ -359,7 +363,7 @@ module HTML
 
       def summary=(string)
         @summary = string.to_s
-        modify_html("summary", @summary)
+        modify_html('summary', @summary)
       end
 
       def valign(position = nil)
@@ -369,10 +373,10 @@ module HTML
       end
 
       def valign=(position)
-        valid = %w/top center bottom baseline/
+        valid = %w[top center bottom baseline]
         raise ArgumentError unless valid.include?(position.to_s.downcase)
         @valign = position
-        modify_html("valign", @valign)
+        modify_html('valign', @valign)
       end
 
       def vspace(num = nil)
@@ -384,7 +388,7 @@ module HTML
       def vspace=(num)
         raise ArgumentError if num.to_i < 0
         @vspace = num.to_i
-        modify_html("vspace", @vspace)
+        modify_html('vspace', @vspace)
       end
 
       def width(num = nil)
@@ -394,13 +398,13 @@ module HTML
       end
 
       def width=(num)
-        if num =~ /%/
+        if num.to_s =~ /%/
           @width = num
         else
           raise ArgumentError if num.to_i < 0
           @width = num.to_i
         end
-        modify_html("width", @width)
+        modify_html('width', @width)
       end
     end
   end