html-table 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c16e81619ec4b291134f688af1fdd97893bc6507f8e26872e0f24d02485b739b
-  data.tar.gz: 7b5b86cffbf78afeddec8636183092ccfa7ce8a4da7ddc7a50bc358456c299fb
+  metadata.gz: 8dcf90352a433480ee5b19102791f1897a923bbcac3a316666cecc4784cedddb
+  data.tar.gz: a5a92ff433261a804227f7c7218e33e5d901bc6e42321436897f2b4b2ab7f764
 SHA512:
-  metadata.gz: 638ccaafa51cd29b6933e736c0b563ba04040552d639e1fbe34846a35fec8994f900419994f698b26e65a0fd59cee590bea24392e72fea536fcadbdc66182599
-  data.tar.gz: 9832d0be34fc3fc21116e522c93d257f2bb24169d3ff30ae1a455e62b863eb33ba801516477ce91774e6fd64b93de9d6f3aac5f3a56bfd6a5a19d407517e9fec
+  metadata.gz: 5632bbaa8a8d67f0869d5a27a2e0d4fe74092d722dcb8acfa6e9957e92d6d988b9811d1df92e63c3b15ab7715bc8a22e8d2d8c6444be488382d78a2ea0d899f2
+  data.tar.gz: d0bd601be5f296ac9aa7ecdc48239db33d2a3aa59c75df28cfc221a8c9afd2e19a228aab5812d4ad30979010b332d210d56b650b05dc6f6d85e935a01359d103

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.6.1 - 24-Feb-2019
+* Namespace all the modules under HTML::Mixin to prevent potential clashes,
+  especially for the StrongTyping module. Thanks go to mistoo for the report.
+
 == 1.6.0 - 16-Jan-2019
 * Changed license to Apache 2.0.
 * Removed strongtyping dependency, now comes bundled with a pure Ruby

data/README

@@ -1,9 +1,6 @@
 == Description
   An interface for generating HTML Tables with Ruby.
 
-== Prerequisites
-  * structured_warnings 0.3.0 or later
-
 == Installation
   gem install html-table
    

data/html-table.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'html-table'
-  spec.version    = '1.6.0'
+  spec.version    = '1.6.1'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'

data/lib/html/caption.rb

@@ -4,8 +4,8 @@ module HTML
   # a subclass of Table.  Note that end tags for this class are mandatory.
   #
   class Table::Caption
-    include AttributeHandler
-    include HtmlHandler
+    include HTML::Mixin::AttributeHandler
+    include HTML::Mixin::HtmlHandler
 
     undef_method :configure
     @indent_level = 3

data/lib/html/col.rb

@@ -3,8 +3,8 @@ module HTML
    # name, it is not a subclass of ColGroup or Table.
    #
    class Table::ColGroup::Col
-      include AttributeHandler
-      include HtmlHandler
+      include HTML::Mixin::AttributeHandler
+      include HTML::Mixin::HtmlHandler
 
       undef_method :configure, :content
       @indent_level = 6

data/lib/html/colgroup.rb

@@ -4,8 +4,8 @@ module HTML
    # of the ColGroup::Col class.
    #
    class Table::ColGroup < Array
-      include AttributeHandler
-      include HtmlHandler
+      include HTML::Mixin::AttributeHandler
+      include HTML::Mixin::HtmlHandler
 
       @indent_level = 3
       @end_tags     = true
@@ -89,8 +89,8 @@ module HTML
             raise TypeError, msg
          end
          super
-      end   
-      
+      end
+
       # Returns a boolean indicating whether or not end tags are included for
       # each ColGroup object in the final HTML output.  The default is true.
       #

data/lib/html/content.rb

@@ -4,11 +4,11 @@
 # This class handles content for Table::Row::Data, Table::Row::Header,
 # and Table::Row::Caption objects.
 ########################################################################
-require File.join(File.dirname(__FILE__), 'tag_handler')
+require_relative 'mixin/tag_handler'
 
 module HTML
   class Table::Content < String
-    include TagHandler
+    include HTML::Mixin::TagHandler
 
     def initialize(string, &block)
       super(string)

data/lib/html/data.rb

@@ -4,8 +4,8 @@ module HTML
   # it is not a subclass of Table::Row or Table.
   #
   class Table::Row::Data
-    include AttributeHandler
-    include HtmlHandler
+    include HTML::Mixin::AttributeHandler
+    include HTML::Mixin::HtmlHandler
 
     undef_method :configure
 

data/lib/html/header.rb

@@ -4,8 +4,8 @@ module HTML
   # it is not a subclass of Table or Table::Row.
   #
   class Table::Row::Header
-    include AttributeHandler
-    include HtmlHandler
+    include HTML::Mixin::AttributeHandler
+    include HTML::Mixin::HtmlHandler
 
     undef_method :configure
 

data/lib/html/mixin/attribute_handler.rb

@@ -0,0 +1,407 @@
+# 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.
+#
+module HTML
+  module Mixin
+    module AttributeHandler
+      def abbr(string = nil)
+        @abbr ||= nil
+        self.abbr = string if string
+        @abbr
+      end
+
+      def abbr=(string)
+        @abbr = string
+        modify_html("abbr", string)
+      end
+
+      def align(position = nil)
+        @align ||= nil
+        self.align = position if position
+        @align
+      end
+
+      def align=(position)
+        valid = %w/top bottom left center right/
+        raise ArgumentError unless valid.include?(position.downcase)
+        @align = position
+        modify_html("align", position)
+      end
+
+      def axis(string = nil)
+        @axis ||= nil
+        self.axis = string if string
+        @axis
+      end
+
+      def axis=(string)
+        @axis = string
+        modify_html("axis", string)
+      end
+
+      def background(url = nil)
+        @background ||= nil
+        self.background = url if url
+        @background
+      end
+
+      def background=(url)
+        raise TypeError unless url.kind_of?(String)
+        msg =  "'background' is a non-standard extension"
+        warn NonStandardExtensionWarning, msg
+        @background = url
+        modify_html("background", url)
+      end
+
+      def bgcolor(color = nil)
+        @bgcolor ||= nil
+        self.bgcolor = color if color
+        @bgcolor
+      end
+
+      def bgcolor=(color)
+        @bgcolor = color
+        modify_html("bgcolor", color)
+      end
+
+      def border(num = nil)
+        @border ||= nil
+        self.border = num if num
+        @border
+      end
+
+      # 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)
+        end
+      end
+
+      def bordercolor(color = nil)
+        @bordercolor ||= nil
+        self.bordercolor = color if color
+        @bordercolor
+      end
+
+      def bordercolor=(color)
+        @bordercolor = color
+        msg =  "'bordercolor' is a non-standard extension"
+        warn NonStandardExtensionWarning, msg
+        modify_html("bordercolor", color)
+      end
+
+      def bordercolordark(color = nil)
+        @bordercolordark ||= nil
+        self.bordercolordark = color if color
+        @bordercolordark
+      end
+
+      def bordercolordark=(color)
+        @bordercolordark = color
+        msg = "'bordercolordark' is a non-standard extension"
+        warn NonStandardExtensionWarning, msg
+        modify_html("bordercolordark", color)
+      end
+
+      def bordercolorlight(color = nil)
+        @bordercolorlight ||= nil
+        self.bordercolorlight = color if color
+        @bordercolorlight
+      end
+
+      def bordercolorlight=(color)
+        @bordercolorlight = color
+        msg = "'bordercolorlight' is a non-standard extension"
+        warn NonStandardExtensionWarning, msg
+        modify_html("bordercolorlight", @bordercolorlight)
+      end
+
+      def cellpadding(num = nil)
+        @cellpadding ||= nil
+        self.cellpadding = num if num
+        @cellpadding
+      end
+
+      def cellpadding=(num)
+        raise ArgumentError if num.to_i < 0
+        @cellpadding = num.to_i
+        modify_html("cellpadding", @cellpadding)
+      end
+
+      def cellspacing(num = nil)
+        @cellspacing ||= nil
+        self.cellspacing = num if num
+        @cellspacing
+      end
+
+      def cellspacing=(num)
+        raise ArgumentError if num.to_i < 0
+        @cellspacing = num.to_i
+        modify_html("cellspacing", @cellspacing)
+      end
+
+      def char(character = nil)
+        @char ||= nil
+        self.char = character if character
+        @char
+      end
+
+      def char=(character)
+        raise ArgumentError if character.to_s.length > 1
+        @char = character.to_s
+        modify_html("char", character.to_s)
+      end
+
+      def charoff(offset = nil)
+        @charoff ||= nil
+        self.charoff = offset if offset
+        @charoff
+      end
+
+      def charoff=(offset)
+        raise ArgumentError if offset.to_i < 0
+        @charoff = offset
+        modify_html("charoff", offset)
+      end
+
+      # Returns the CSS class. The trailing underscore is necessary in order
+      # to avoid conflict with the 'class' keyword.
+      #
+      def class_(klass = nil)
+        @class ||= nil
+        self.class_ = klass if klass
+        @class
+      end
+
+      # Returns the CSS class.  The trailing underscore is necessary in order
+      # to avoid conflict with the 'class' keyword.
+      #
+      def class_=(klass)
+        modify_html('class', klass)
+        @class = klass
+      end
+
+      def col(num = nil)
+        @col ||= nil
+        self.col = num if num
+        @col
+      end
+
+      def col=(num)
+        raise ArgumentError if num.to_i < 0
+        @col = num.to_i
+        modify_html("col", @col)
+      end
+
+      def colspan(span = nil)
+        @colspan ||= nil
+        self.colspan = span if span
+        @colspan
+      end
+
+      def colspan=(span)
+        raise ArgumentError if span.to_i < 0
+        @colspan = span.to_i
+        modify_html("colspan", @colspan)
+      end
+
+      # Allows you to configure various attributes by row or row + column.
+      #
+      def configure(row, col=nil, &block)
+        if col
+          begin
+            yield self[row][col]
+          rescue NameError
+            msg = "No column to configure in a " + self.class.to_s + " class"
+            raise ArgumentError, msg
+          end
+        else
+          yield self[row]
+        end
+      end
+
+      # Returns the HTML content (i.e. text).
+      #
+      def content(arg = nil, &block)
+        case arg
+          when String
+            self.content = Table::Content.new(arg, &block)
+          when Array
+            arg.each{ |e|
+              if e.kind_of?(Array)
+                row = Table::Row.new
+                e.each{ |element| row.push(Table::Content.new(element, &block)) }
+                self.push(row)
+              else
+                self.content = Table::Content.new(e, &block)
+              end
+            }
+          else
+            self.content = arg if arg
+        end
+        @html_body
+      end
+
+      alias data content
+
+      def frame(type = nil)
+        @frame ||= nil
+        self.frame = type if type
+        @frame
+      end
+
+      def frame=(type)
+        valid = %w/border void above below hsides lhs rhs vsides box/
+        raise ArgumentError unless valid.include?(type.downcase)
+        @frame = type
+        modify_html("frame", @frame)
+      end
+
+      def height(num = nil)
+        @height ||= nil
+        self.height = num if num
+        @height
+      end
+
+      def height=(num)
+        raise ArgumentError if num.to_i < 0
+        @height = num.to_i
+        modify_html("height", @height)
+      end
+
+      def hspace(num = nil)
+        @hspace ||= nil
+        self.hspace = num if num
+        @hspace
+      end
+
+      def hspace=(num)
+        raise ArgumentError if num.to_i < 0
+        @hspace = num.to_i
+        modify_html("hspace", @hspace)
+      end
+
+      def nowrap(bool = nil)
+        @nowrap ||= nil
+        self.nowrap = bool if bool
+        @nowrap
+      end
+
+      def nowrap=(bool)
+        unless bool.kind_of?(TrueClass) || bool.kind_of?(FalseClass)
+           raise TypeError
+        end
+        @nowrap = bool
+        modify_html("nowrap", @nowrap)
+      end
+
+      def rowspan(num = nil)
+        @rowspan ||= nil
+        self.rowspan = num if num
+        @rowspan
+      end
+
+      def rowspan=(num)
+        raise ArgumentError if num.to_i < 0
+        @rowspan = num.to_i
+        modify_html("rowspan", @rowspan)
+      end
+
+      def rules(edges = nil)
+        @rules ||= nil
+        self.rules = edges if edges
+        @rules
+      end
+
+      def rules=(edges)
+        valid = %w/all groups rows cols none/
+        raise ArgumentError unless valid.include?(edges.to_s.downcase)
+        @rules = edges
+        modify_html("rules", @rules)
+      end
+
+      def span(num = nil)
+        @span ||= nil
+        self.span = num if num
+        @span
+      end
+
+      def span=(num)
+        raise ArgumentError if num.to_i < 0
+        @span = num.to_i
+        modify_html("span", @span)
+      end
+
+      def style(string = nil)
+        @style ||= nil
+        self.style = string if string
+        @style
+      end
+
+      def style=(string)
+        @style = string.to_s
+        modify_html("style", @style)
+      end
+
+      def summary(string = nil)
+        @summary ||= nil
+        self.summary = string if string
+        @summary
+      end
+
+      def summary=(string)
+        @summary = string.to_s
+        modify_html("summary", @summary)
+      end
+
+      def valign(position = nil)
+        @valign ||= nil
+        self.valign = position if position
+        @valign
+      end
+
+      def valign=(position)
+        valid = %w/top center bottom baseline/
+        raise ArgumentError unless valid.include?(position.to_s.downcase)
+        @valign = position
+        modify_html("valign", @valign)
+      end
+
+      def vspace(num = nil)
+        @vspace ||= nil
+        self.vspace = num if num
+        @vspace
+      end
+
+      def vspace=(num)
+        raise ArgumentError if num.to_i < 0
+        @vspace = num.to_i
+        modify_html("vspace", @vspace)
+      end
+
+      def width(num = nil)
+        @width ||= nil
+        self.width = num if num
+        @width
+      end
+
+      def width=(num)
+        if num =~ /%/
+          @width = num
+        else
+          raise ArgumentError if num.to_i < 0
+          @width = num.to_i
+        end
+        modify_html("width", @width)
+      end
+    end
+  end
+end