Spreadsheet-HTML 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69280b7ae0534329c562340c5d86a9bc3753ca49
-  data.tar.gz: 86a46dc59fb742b0115aaf5d1f3feeb72d476934
+  metadata.gz: 193027f607dd3ef04e4265fd03be81f3bdf75d86
+  data.tar.gz: a519f019fc77f3fca13384e64acb69d9b9231d99
 SHA512:
-  metadata.gz: 4aa64fa4375b280792b55d1a517598f9218be78ada368e1bef986dc1fbe42a6eb18c512341cdf9d456de727b6b0ab4e4da829f888217ea978f3fed58c48f84af
-  data.tar.gz: 67f8dc2ad38cd2544597471c28812e3ede9b21acd6e075e4f57b46470a9bf98966000685443f1da139160be298ef6f8f865883ebae837897e50b6a46eefd2751
+  metadata.gz: e1712621904d70a3938d4d257e3839bc2b085df25d0aeb9d20d9bc6b7ec903892005b509b873d1c17da7658c35286721ae52c67b879b19a77fe399d2c5b6b87f
+  data.tar.gz: 2c2035633f4d03f4cdbfbba0d23d515de0adc751f1d53c89fb6def0521766b02450e360db17a769fd7a451cf4402da8eae9236c688fea2cc83ba8500ea3cf49f

data/Changes

@@ -1,5 +1,9 @@
 Revision history for html-autotag-ruby
 
+0.0.11
+    - added col and colgroup params
+    - added caption param
+
 0.0.10
     - implemented lambda/proc for dynamic and tag params
 

data/README

@@ -140,6 +140,14 @@ fill
 
   'fill' => '8x12' # 8 rows, 12 columns
 
+caption
+    Caption is special in that you can either pass a string to be used as CDATA or a hash whose only
+    key is the string to be used as CDATA.
+
+  'caption' => 'Just Another Title'
+
+  'caption' => { 'A Title With Attributes' => { 'align' => 'bottom' } }
+
 == Dynamic Parameters
     Dynamic parameters provide a means to control the micro elements of the table,
     such as modifying headings by their name and rows and columns by their indices.

data/lib/Spreadsheet/HTML.rb

@@ -14,33 +14,15 @@ end
 module Spreadsheet
     class HTML
 
-        def self.gen( *args )
-            self.new.generate( *args )
-        end
-
-        def north( *args )
-            generate( *args, 'theta' => 0 )
-        end
+        def self.gen  ( *args ) self.new.generate( *args ) end
 
-        def portrait( *args )
-            generate( *args, 'theta' => 0 )
-        end
+        def portrait  ( *args ) generate( *args, 'theta' => 0 ) end
+        def landscape ( *args ) generate( *args, 'theta' => -270, 'tgroups' => 0 ) end
 
-        def west( *args )
-            generate( *args, 'theta' => -270, 'tgroups' => 0 )
-        end
-
-        def landscape( *args )
-            generate( *args, 'theta' => -270, 'tgroups' => 0 )
-        end
-
-        def east( *args )
-            generate( *args, 'theta' => 90, 'tgroups' => 0, 'pinhead' => 1 )
-        end
-
-        def south( *args )
-            generate( *args, 'theta' => -180, 'tgroups' => 0, 'pinhead' => 1 )
-        end
+        def north     ( *args ) generate( *args, 'theta' => 0 ) end
+        def west      ( *args ) generate( *args, 'theta' => -270, 'tgroups' => 0 ) end
+        def east      ( *args ) generate( *args, 'theta' =>   90, 'tgroups' => 0, 'pinhead' => 1 ) end
+        def south     ( *args ) generate( *args, 'theta' => -180, 'tgroups' => 0, 'pinhead' => 1 ) end
 
         def generate( *args )
             params = _process( args )
@@ -101,7 +83,15 @@ module Spreadsheet
         end
 
         def _make_table( params )
-            cdata = [] # TODO: insert caption and colgroup
+            cdata = Array[]
+
+            if params.has_key?( 'caption' )
+                cdata.push( _tag( 'caption', params['caption'] ) )
+            end
+
+            if params.has_key?( 'colgroup' ) or params.has_key?( 'col' )
+                cdata.concat( _colgroup( params ) )
+            end
 
             if params['tgroups'] && params['tgroups'] > 0
 
@@ -118,7 +108,7 @@ module Spreadsheet
                 cdata.push({ 'tag' => 'tbody', 'attr' => params['tbody'], 'cdata' => body_rows })
 
             else
-                cdata.push( params['data'].map { |c| { 'tag' => 'tr', 'attr' => params['tr'], 'cdata' => c } } )
+                cdata.concat( params['data'].map { |c| { 'tag' => 'tr', 'attr' => params['tr'], 'cdata' => c } } )
             end
 
             return params['auto'].tag( 'tag' => 'table', 'attr' => params['table'], 'cdata' => cdata )
@@ -260,6 +250,46 @@ module Spreadsheet
             return [ cdata, attr ]
         end
 
+        def _colgroup( params )
+            colgroup = Array[]
+            params['col'] = Array[ params['col'] ] if params['col'].kind_of?(Hash)
+
+            if params['col'].kind_of?(Array)
+                if params['colgroup'].kind_of?(Array)
+                    colgroup = params['colgroup'].map{ |cg| 
+                        {
+                            'tag'   => 'colgroup',
+                            'attr'  => cg,
+                            'cdata' => params['col'].map{ |attr| { 'tag' => 'col', 'attr' => attr } }
+                        }
+                    }
+                else
+                    colgroup = {
+                        'tag'   => 'colgroup',
+                        'attr'  => params['colgroup'],
+                        'cdata' => params['col'].map{ |attr| { 'tag' => 'col', 'attr' => attr } }
+                    }
+                end
+            else
+                params['colgroup'] = Array[ params['colgroup'] ] if params['colgroup'].kind_of?(Hash)
+                if params['colgroup'].kind_of?(Array)
+                    colgroup = params['colgroup'].map{ |attr| { 'tag' => 'colgroup', 'attr' => attr } }
+                end
+            end
+
+            colgroup = Array[colgroup] if colgroup.kind_of?(Hash)
+            return colgroup
+        end
+
+        def _tag( tag, cdata )
+            tag = { 'tag' => tag, 'cdata' => cdata }
+            if cdata.kind_of?( Hash )
+                tag['cdata'] = cdata.keys[0]
+                tag['attr']  = cdata.values[0]
+            end
+            return tag
+        end
+
     end
 
 end

data/lib/Spreadsheet/HTML/version.rb

@@ -1,5 +1,5 @@
 module Spreadsheet
   class HTML
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/readme.md

@@ -1,6 +1,6 @@
 Spreadsheet-HTML (ruby)
 =======================
-Just another HTML table generator for ruby.
+Just another HTML table generator for ruby.  [![Gem Version](https://badge.fury.io/rb/Spreadsheet-HTML.svg)](https://badge.fury.io/rb/Spreadsheet-HTML)
 
 Description
 -----------

data/t/13-caption.rb

@@ -0,0 +1,44 @@
+require "test/unit"
+require "Spreadsheet/HTML"
+
+class Test_Caption < Test::Unit::TestCase
+
+  def test_caption
+
+    data = Array[
+        %w( a b c ),
+        %w( 1 2 3 ),
+        %w( 4 5 6 ),
+    ]
+
+    gen = Spreadsheet::HTML.new( 'data' => data, 'caption' => "My Table" )
+
+    assert_equal(
+        '<table><caption>My Table</caption><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate(),
+        "caption present from generate()"
+    )
+
+    gen = Spreadsheet::HTML.new( 'data' => data, 'caption' => { "My Table" => { 'key' => 'value' } } )
+
+    assert_equal(
+        '<table><caption key="value">My Table</caption><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate(),
+        "caption present from generate()"
+    )
+
+    assert_equal(
+        '<table><caption key="value">My Table</caption><thead><tr><th>a</th><th>b</th><th>c</th></tr></thead><tfoot><tr><td>4</td><td>5</td><td>6</td></tr></tfoot><tbody><tr><td>1</td><td>2</td><td>3</td></tr></tbody></table>',
+        gen.generate( 'tgroups' => 2 ),
+        "caption present from generate() with tgroups"
+    )
+
+    assert_equal(
+        '<table><caption>0</caption><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate( 'caption' => 0 ),
+        "caption can be overriden"
+    )
+
+  end
+
+end

data/t/14-colgroup.rb

@@ -0,0 +1,99 @@
+require "test/unit"
+require "Spreadsheet/HTML"
+
+class Test_Colgroup < Test::Unit::TestCase
+
+  def test_colgroup
+
+    data = Array[
+        %w( a b c ),
+        %w( 1 2 3 ),
+        %w( 4 5 6 ),
+    ]
+
+    gen = Spreadsheet::HTML.new( 'data' => data, 'colgroup' => { 'span' => '3', 'width' => '100' }, 'attr_sort' => 1 );
+
+    assert_equal(
+        '<table><colgroup span="3" width="100" /><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate,
+        "colgroup present from generate()"
+    )
+
+    assert_equal(
+        '<table><colgroup span="3" width="100" /><thead><tr><th>a</th><th>b</th><th>c</th></tr></thead><tfoot><tr><td>4</td><td>5</td><td>6</td></tr></tfoot><tbody><tr><td>1</td><td>2</td><td>3</td></tr></tbody></table>',
+        gen.generate( 'tgroups' => 2 ),
+        "colgroup present from generate() with tgroups"
+    )
+
+    assert_equal(
+        '<table><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate( 'colgroup' => nil ),
+        "colgroup can be overriden"
+    )
+
+    assert_equal(
+        '<table><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate( 'colgroup' => 1 ),
+        "colgroup yields no-op if scalar"
+    )
+
+    assert_equal(
+        '<table><colgroup color="red" span="1" /><colgroup color="blue" span="2" /><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate( 'colgroup' => [ { 'span' => '1', 'color' => 'red' }, { 'span' => '2', 'color' => 'blue' } ] ),
+        "can specify multiple colgroups"
+    )
+
+  end
+
+  def test_col
+
+    data = Array[
+        %w( a b c ),
+        %w( 1 2 3 ),
+        %w( 4 5 6 ),
+    ]
+
+    gen = Spreadsheet::HTML.new( 'data' => data, 'colgroup' => { 'span' => '3', 'width' => '100' }, 'attr_sort' => 1 );
+
+    assert_equal(
+        '<table><colgroup span="3" width="100"><col /></colgroup><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate( 'col' => {} ),
+        "colgroup wraps col"
+    )
+
+    assert_equal(
+        '<table><colgroup span="3" width="100"><col /><col /><col /></colgroup><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate( 'col' => [{},{},{}] ),
+        "colgroup wraps multiple cols"
+    )
+
+    assert_equal(
+        '<table><colgroup><col /></colgroup><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate( 'colgroup' => nil, 'col' => {} ),
+        "colgroup can be overriden when col is present too"
+    )
+
+
+    gen = Spreadsheet::HTML.new( 'data' => data, 'col' => Array[{},{},{}] );
+
+    assert_equal(
+        '<table><colgroup><col /><col /><col /></colgroup><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate( 'colgroup' => {} ),
+        "multiple cols against single colgroup"
+    )
+
+    assert_equal(
+        '<table><colgroup /><colgroup /><colgroup /><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate( 'col' => nil, 'colgroup' => Array[{},{},{}] ),
+        "no cols against multiple colgroups"
+    )
+
+    assert_equal(
+        '<table><colgroup><col /><col /><col /></colgroup><colgroup><col /><col /><col /></colgroup><colgroup><col /><col /><col /></colgroup><tr><th>a</th><th>b</th><th>c</th></tr><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>4</td><td>5</td><td>6</td></tr></table>',
+        gen.generate( 'colgroup' => Array[{},{},{}] ),
+        "multiple cols against multiple colgroups"
+    )
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Spreadsheet-HTML
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - jeffa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,8 @@ files:
 - t/10-indent.rb
 - t/11-empty.rb
 - t/12-encodes.rb
+- t/13-caption.rb
+- t/14-colgroup.rb
 homepage: https://github.com/jeffa/spreadsheet-html-ruby
 licenses:
 - MIT