html-table 1.2.2 → 1.3.0

data/lib/html/body.rb

@@ -2,22 +2,25 @@ module HTML
 
    # This class represents an HTML table body (<tbody>).  It is a
    # subclass of Table::TableSection.
+   #
    class Table::Body < Table::TableSection
       @indent_level = 3
       @end_tags     = true
 
       # Returns a new Table::Body object.  Optionally takes a block.  If
       # an argument is provided, it is treated as content.
-      def initialize(arg=nil)
+      #
+      def initialize(arg = nil, &block)
          @html_begin = "<tbody"
          @html_end   = "</tbody>"
-         yield self if block_given?
+         instance_eval(&block) if block_given?
          self.content = arg if arg
       end
       
       # Returns a boolean indicating whether or not end tags, </tbody>, are
       # included for each Body object in the final HTML output.  The
       # default is true.
+      #
       def self.end_tags?
          @end_tags
       end
@@ -25,6 +28,7 @@ module HTML
       # Sets whether or not end tags are included for each Body 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

data/lib/html/caption.rb

@@ -2,34 +2,40 @@ module HTML
 
    # This class represents an HTML Caption.  Despite the name, it is not
    # a subclass of Table.  Note that end tags for this class are mandatory.
+   #
    class Table::Caption
       include AttributeHandler
       include HtmlHandler
+
       undef_method :configure
       @indent_level = 3
 
       # Returns a new Table::Caption object.  Optionally takes a block.  If
       # an argument is provided it is treated as content.
-      def initialize(arg=nil)
+      #
+      def initialize(arg = nil, &block)
          @html_begin = '<caption'
          @html_body  = ''
          @html_end   = '</caption>'
-         yield self if block_given?
+         instance_eval(&block) if block_given?
          self.content = arg if arg
       end
       
       # Adds content to the Table::Caption object.
+      #
       def content=(arg)
-         @html_body = arg.to_s
+         @html_body = Table::Content.new(arg.to_s)
       end
       
       # Returns the number of spaces that tags for this class are indented.
       # For the Table::Caption class, the indention level defaults to 3.
+      #
       def self.indent_level
          @indent_level
       end
 
       # Sets the number of spaces that tags for this class are indented.
+      #
       def self.indent_level=(num)
          expect(num,Integer)
          raise ArgumentError, "indent level must be >= 0" if num < 0

data/lib/html/col.rb

@@ -1,29 +1,34 @@
 module HTML
    # This class represents an HTML ColGroup column (<col>).  Despite the
    # name, it is not a subclass of ColGroup or Table.
+   #
    class Table::ColGroup::Col
       include AttributeHandler
       include HtmlHandler
+
       undef_method :configure, :content
       @indent_level = 6
 
       # Creates and returns a new ColGroup object.  Optionally takes a block.
-      # Note that it does not accept an argument - col tags do not have content
-      def initialize
+      # Note that it does not accept an argument - col tags do not have content.
+      #
+      def initialize(&block)
          @html_begin = '<col'
          @html_body  = ''
          @html_end   = ''
-         yield self if block_given?
+         instance_eval(&block) if block_given?
       end
 
       # Returns the indentation level for the tags of this class.  The
       # default is 6.
+      #
       def self.indent_level
          @indent_level
       end
 
       # Sets the indentation level for the tags of this class.  The default
       # is 6.
+      #
       def self.indent_level=(num)
          expect(num,Integer)
          raise ArgumentError, "num must be >= 0" if num < 0

data/lib/html/colgroup.rb

@@ -2,9 +2,11 @@ module HTML
    # This class represents an HTML column group (<colgroup>).  It is a
    # subclass of Array.  The only elements it may contain are instances
    # of the ColGroup::Col class.
+   #
    class Table::ColGroup < Array
       include AttributeHandler
       include HtmlHandler
+
       @indent_level = 3
       @end_tags     = true
 
@@ -12,22 +14,25 @@ module HTML
 
       # Returns a new ColGroup object. Optionally takes a block. If an
       # argument is provided, it is treated as content.
-      def initialize(arg = nil)
+      #
+      def initialize(arg = nil, &block)
          @html_begin = '<colgroup'
          @html_body  = ''
          @html_end   = '</colgroup>'
-         yield self if block_given?
+         instance_eval(&block) if block_given?
          self.push(arg) if arg
       end
 
       # Returns the indentation level for the tags of this class.  The
       # default is 3.
+      #
       def self.indent_level
          @indent_level
       end
 
       # Sets the indentation level for the tags of this class.  The default
       # is 3.
+      #
       def self.indent_level=(num)
          expect(num,Integer)
          raise ArgumentError,"indent_level must be >= 0" if num < 0
@@ -36,6 +41,7 @@ module HTML
 
       # This method has been redefined to only allow ColGroup::Col objects
       # to be assigned.
+      #
       def []=(index,obj)
          if obj.kind_of?(Array)
             expect(obj.first,Col) # In case of 0 length Array
@@ -50,6 +56,7 @@ module HTML
 
       # This method has been redefined to only allow ColGroup::Col objects
       # to be pushed onto a ColGroup instance.
+      #
       def push(*args)
          args.each do |obj|
             unless obj.kind_of?(Table::ColGroup::Col)
@@ -63,6 +70,7 @@ module HTML
 
       # This method has been redefined to only allow ColGroup::Col objects
       # to be pushed onto a ColGroup instance.
+      #
       def <<(obj)
          unless obj.kind_of?(Table::ColGroup::Col)
             msg = "Can only assign Col objects to ColGroup class"
@@ -74,6 +82,7 @@ module HTML
 
       # This method has been redefined to only allow ColGroup::Col objects
       # to be unshifted onto a ColGroup instance.
+      #
       def unshift(obj)
          unless obj.kind_of?(Table::ColGroup::Col)
             msg = "Can only assign Data and Header objects to Row class"
@@ -84,6 +93,7 @@ module HTML
       
       # Returns a boolean indicating whether or not end tags are included for
       # each ColGroup object in the final HTML output.  The default is true.
+      #
       def self.end_tags?
          @end_tags
       end
@@ -91,6 +101,7 @@ module HTML
       # Sets whether or not end tags are included for each ColGroup 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

data/lib/html/content.rb

@@ -0,0 +1,18 @@
+########################################################################
+# content.rb
+#
+# This class handles content for Table::Row::Data, Table::Row::Header,
+# and Table::Row::Caption objects.
+########################################################################
+require 'tag_handler'
+
+module HTML
+   class Table::Content < String
+      include TagHandler
+
+      def initialize(string, &block)
+         super(string)
+         instance_eval(&block) if block_given?
+      end
+   end
+end

data/lib/html/data.rb

@@ -2,36 +2,43 @@ module HTML
 
    # This class represents HTML table data, <td>.  Despite the name
    # it is not a subclass of Table::Row or Table.
+   #
    class Table::Row::Data
       include AttributeHandler
       include HtmlHandler
+
       undef_method :configure
+
       @indent_level = 6
       @end_tags     = true
 
       # Creates and returns a Data object.  Optionally takes a block.  If
       # an argument is provided, it is treated as content.
-      def initialize(arg = nil)
+      #
+      def initialize(arg = nil, &block)
          @html_begin = '<td'
          @html_body  = ''
          @html_end   = '</td>'
-         yield self if block_given?
+         instance_eval(&block) if block_given?
          self.content = arg if arg
       end
-      
+
       # Adds content to the Table::Row::Data object.
+      #
       def content=(arg)
-         @html_body = arg.to_s
+         @html_body = Table::Content.new(arg.to_s)
       end
 
       # Returns the indentation level for the tags of this class.  The
       # default is 6.
+      #
       def self.indent_level
          @indent_level
       end
 
       # Sets the indentation level for the tags of this class.  The default
       # is 6.
+      #
       def self.indent_level=(num)
          expect(num,Integer)
          raise ArgumentError,"indent_level must be >= 0" if num < 0
@@ -41,6 +48,7 @@ module HTML
       # Returns a boolean indicating whether or not end tags, </td>, are
       # included for each Data object in the final HTML output.  The
       # default is true.
+      #
       def self.end_tags?
          @end_tags
       end
@@ -48,6 +56,7 @@ module HTML
       # Sets whether or not end tags are included for each Data 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

data/lib/html/foot.rb

@@ -2,8 +2,10 @@ 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
@@ -11,22 +13,25 @@ module HTML
       # 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 = 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>"
-         yield self if block_given?
+         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
@@ -34,6 +39,7 @@ module HTML
       # 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

data/lib/html/head.rb

@@ -2,31 +2,37 @@ 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
+      #
+      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)
+      #
+      def initialize(arg, &block)
          @html_begin = "<thead"
          @html_end   = "</thead>"
-         yield self if block_given?
+         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
@@ -34,6 +40,7 @@ module HTML
       # 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

data/lib/html/header.rb

@@ -2,36 +2,43 @@ module HTML
 
    # This class represents an HTML table header (<th>).  Despite the name
    # it is not a subclass of Table or Table::Row.
+   #
    class Table::Row::Header
       include AttributeHandler
       include HtmlHandler
+
       undef_method :configure
+
       @indent_level = 6
-      @end_tags = true
+      @end_tags     = true
 
       # Creates and returns a new Header object.  Optionally takes a block.
       # If an argument is provided, it is treated as content.
-      def initialize(arg = nil)
+      #
+      def initialize(arg = nil, &block)
          @html_begin = '<th'
          @html_body  = ''
          @html_end   = '</th>'
-         yield self if block_given?
+         instance_eval(&block) if block_given?
          self.content = arg if arg
       end
       
       # Adds content to the Table::Row::Header object.
+      #
       def content=(arg)
-         @html_body = arg.to_s
+         @html_body = Table::Content.new(arg.to_s)
       end
 
       # Returns the indentation level for the tags of this class.  The
       # default is 6.
+      #
       def self.indent_level
          @indent_level
       end
 
       # Sets the indentation level for the tags of this class.  The default
       # is 6.
+      #
       def self.indent_level=(num)
          expect(num,Integer)
          raise ArgumentError,"indent_level must be >= 0" if num < 0
@@ -40,6 +47,7 @@ module HTML
 
       # Returns a boolean indicating whether or not end tags are included for
       # each Header object in the final HTML output.  The default is true.
+      #
       def self.end_tags?
          @end_tags
       end
@@ -47,6 +55,7 @@ module HTML
       # Sets whether or not end tags are included for each Header 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