Spreadsheet-HTML 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f558c4bcf25e70a61bbdc29d284f17e5afb8c59
-  data.tar.gz: 0a6712cf86da45d7a362b1b940edd8be94617f61
+  metadata.gz: 536fbb8dbff6d3a46e7c42fa8be4345067abfd6d
+  data.tar.gz: 3c1e0820a66d5147d27b872a59fb78de7e2e6a1c
 SHA512:
-  metadata.gz: 0885ae9d8f60181e5cee408afa3c76aef07c99efb2abad894d6bd59c66ee3eb03e8865f9727b391e425b6de6b17bdc89df13f41e109a5ccb3a967e3fdb6727b2
-  data.tar.gz: 0a66a9626171da040c3af986e76e4c3ef20497ad8d57bf2bae2a4eec050bc72c2bdddfa57b3c7c64bd08b864c949336450e4c115ff2b09c11a6785393e4ea429
+  metadata.gz: 7fd20c220637862ce21c526c43ec3ef196679ced8120188de92b974d5401a4da2966a62676ea178d99d2fe18cac0420259a99608e1ab7ceb4f8d9afb8fd9da40
+  data.tar.gz: 8c81843c873153648487b1880fbcd55ef3240dc9364be9fea7fc307f8bd0c5cd010b03b3c393f78cf4631e0784caac0ee0f3d71e37a276fece9897c3e0ba3ae5

data/Changes

@@ -1,5 +1,11 @@
 Revision history for html-autotag-ruby
 
+0.0.8
+    - implemented fill param
+    - "defactored" HTML Encoding into this module
+    - refactored out default {} for attrs (HTML::AutoAttr handles them)
+    - require HTML::AutoTag v1.0.6
+
 0.0.7
     - fix Ruby dependecy
 

data/README

@@ -17,7 +17,7 @@
 
     generator = Spreadsheet::HTML.new( 'data' => data )
     puts generator.portrait( 'indent' => "\t" )
-    puts generator.landscape( 'encodes' => 1 )
+    puts generator.landscape( 'encode' => 1 )
 
     puts generator.generate( 'tgroups' => 1 )
     puts generator.generate( 'tgroups' => 2 )
@@ -77,9 +77,12 @@ level
 empty
     String. Render any empty cells with this value. Defaults to &nbps; 
 
+encode
+    Boolean. Whether or not to Encode entities.
+
 encodes
-    Boolean. Uses htmlentities rubygem to encode any HTML entities found in a cell's data.
-    (TODO: this value will be a string containing the characters to HTML encode.)
+    String. Encode these HTML entities. Pass string with chars you want encoded
+    or leave blank for default control and high bit chars and <>!'"
 
 matrix
     Boolean. Render the headings row with only <td> tags, no <th> tags.
@@ -100,6 +103,11 @@ pinhead
     Works in conjunction with theta to ensure reporting readability. Without it, south() and east()
     would have data cells arranged in reverse order.
 
+fill
+    Can be used instead of data to create a "blank" table or with data to pad rows and cells.
+
+  fill => '8x12' # 8 rows, 12 columns
+
 == Dynamic Parameters
     There currently are no Dynamic Parameters, but they will be implemented soon enough.
     They will allow the client to modify headings by name and row/columns by their indices.

data/Spreadsheet-HTML.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency 'rake'
-  spec.add_runtime_dependency 'HTML-AutoTag', '>= 1.0.5'
+  spec.add_runtime_dependency 'HTML-AutoTag', '>= 1.0.6'
 end

data/lib/Spreadsheet/HTML.rb

@@ -1,11 +1,15 @@
 require "Spreadsheet/HTML/version"
 require "HTML/AutoTag"
 
-# i cannot hasa instantiate HTML::AutoTag inside Spreadsheet::HTML?!?
+# i cannot instantiate any HTML::foo inside any bar::HTML?!?
 module Auto
     class Tag < HTML::AutoTag
     end
 end
+module Enco
+    class Der < HTML::Encoder
+    end
+end
 
 module Spreadsheet
     class HTML
@@ -105,19 +109,19 @@ module Spreadsheet
                 head = body.shift() unless params['matrix'] && data.size() > 2
                 foot = body.pop() if !params['matrix'] && params['tgroups'] > 1 and data.size() > 2
 
-                head_row  = { 'tag' => 'tr', 'attr' => params['thead.tr'] || {}, 'cdata' => head }
-                foot_row  = { 'tag' => 'tr', 'attr' => params['tfoot.tr'] || {}, 'cdata' => foot }
-                body_rows = body.map{ |r| { 'tag' => 'tr', 'attr' => params['tr'] || {}, 'cdata' => r } }
+                head_row  = { 'tag' => 'tr', 'attr' => params['thead.tr'], 'cdata' => head }
+                foot_row  = { 'tag' => 'tr', 'attr' => params['tfoot.tr'], 'cdata' => foot }
+                body_rows = body.map{ |r| { 'tag' => 'tr', 'attr' => params['tr'], 'cdata' => r } }
 
-                cdata.push({ 'tag' => 'thead', 'attr' => params['thead'] || {}, 'cdata' => head_row }) if head
-                cdata.push({ 'tag' => 'tfoot', 'attr' => params['tfoot'] || {}, 'cdata' => foot_row }) if foot
-                cdata.push({ 'tag' => 'tbody', 'attr' => params['tbody'] || {}, 'cdata' => body_rows })
+                cdata.push({ 'tag' => 'thead', 'attr' => params['thead'], 'cdata' => head_row }) if head
+                cdata.push({ 'tag' => 'tfoot', 'attr' => params['tfoot'], 'cdata' => foot_row }) if foot
+                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.push( params['data'].map { |c| { 'tag' => 'tr', 'attr' => params['tr'], 'cdata' => c } } )
             end
 
-            return params['auto'].tag( 'tag' => 'table', 'attr' => params['table'] || {}, 'cdata' => cdata )
+            return params['auto'].tag( 'tag' => 'table', 'attr' => params['table'], 'cdata' => cdata )
         end
 
         def _process( args )
@@ -131,24 +135,27 @@ module Spreadsheet
                 # implement index mapping
             end
 
-            data  = []
+            data  = params['data']
             empty = params.has_key?('empty') ? params['empty'] : '&nbsp;'
             tag   = ( params['matrix'] or params['headless'] ) ? 'td' : 'th'
 
-            params['data'].each do |row|
+            encoder = Enco::Der.new
+            for i in 0 .. params['_max_rows'] - 1
 
+                data[i] ||= []
                 unless params['_layout']
-                    (params['_max_cols'] - row.size).times { row.push( nil ) }  # pad
-                    (row.size - params['_max_cols']).times { row.pop }          # truncate
+                    (params['_max_cols'] - data[i].size).times { data[i].push( nil ) }  # pad
+                    (data[i].size - params['_max_cols']).times { data[i].pop }          # truncate
                 end
 
                 r = []
-                row.each do |col|
+                data[i].each do |col|
                     col = col.to_s
+                    col = encoder.encode( col, params['encodes'] ) if params['encode'] or !params['encodes'].to_s.empty?
                     col = col.gsub( /^\s*$/, empty )
-                    r.push( { 'tag' => tag, 'attr' => params[tag] || {}, 'cdata' => col } )
+                    r.push( { 'tag' => tag, 'attr' => params[tag], 'cdata' => col } )
                 end
-                data.push( r )
+                data[i] = r
                 tag = 'td'
             end
 
@@ -191,7 +198,6 @@ module Spreadsheet
             end
 
             params['auto'] = Auto::Tag.new(
-                'encodes'   => params.has_key?('encodes') ? params['encodes'] : '',
                 'indent'    => params['indent'],
                 'level'     => params['level'],
                 'sorted'    => params['attr_sort'],
@@ -202,10 +208,18 @@ module Spreadsheet
                 params['data'] = data[0]
             end
 
-            params['_max_rows'] = params['data'].size
-            params['_max_cols'] = params['data'][0].size
+            params['data'] = [ [ nil ] ] if params['data'].nil?
+
+            params['_max_rows'] = params['data'].size    || 1
+            params['_max_cols'] = params['data'][0].size || 1
             params['data']      = params['data'].clone
 
+            if params['fill']
+                (row,col) = params['fill'].split(/\D/)    
+                params['_max_rows'] = row.to_i if row.to_i > params['_max_rows']
+                params['_max_cols'] = col.to_i if col.to_i > params['_max_cols']
+            end
+
             return params
         end
 

data/lib/Spreadsheet/HTML/version.rb

@@ -1,5 +1,5 @@
 module Spreadsheet
   class HTML
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/t/09-padding.rb

@@ -33,4 +33,42 @@ class Test_Padding < Test::Unit::TestCase
 
   end
 
+  def test_fill
+
+    gen = Spreadsheet::HTML.new
+
+    data = Array[
+        %w(header1 header2),
+        Array[ 'foo1', 'bar1' ],
+        Array[ 'foo2', 'bar2' ],
+    ]
+
+    assert_equal(
+        '<table><tr><th>&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr></table>',
+        gen.generate( 'fill' => '3x5' ),
+        "fill works with no data"
+    )
+
+    assert_equal(
+        '<table><tr><th>&nbsp;</th></tr></table>',
+        gen.generate( 'fill' => '0x0' ),
+        "fill defaults to 1x1 with with invalid data (zero)"
+    )
+
+    assert_equal(
+        '<table><tr><th>&nbsp;</th></tr></table>',
+        gen.generate( 'fill' => 'axb' ),
+        "fill defaults to 1x1 with with invalid data (letters)"
+    )
+
+    assert_equal(
+        '<table><tr><th>header1</th><th>header2</th><th>&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th></tr><tr><td>foo1</td><td>bar1</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr><tr><td>foo2</td><td>bar2</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr></table>',
+        gen.generate( 'fill' => '3x5', 'data' => data ),
+        "fill works with valid data"
+    )
+
+
+
+  end
+
 end

data/t/12-encodes.rb

@@ -9,30 +9,37 @@ class Test_Encodes < Test::Unit::TestCase
         %w(header1 header2 header3),
         Array[ '<foo1>', '&bar1', '"baz1' ],
         Array[ '<foo2>', '&bar2', '"baz2' ],
+        Array[ '', '0', '' ],
     ]
 
     gen = Spreadsheet::HTML.new( 'data' => data )
 
     assert_equal(
-        '<table><tr><th>header1</th><th>header2</th><th>header3</th></tr><tr><td><foo1></td><td>&bar1</td><td>"baz1</td></tr><tr><td><foo2></td><td>&bar2</td><td>"baz2</td></tr></table>',
+        '<table><tr><th>header1</th><th>header2</th><th>header3</th></tr><tr><td><foo1></td><td>&bar1</td><td>"baz1</td></tr><tr><td><foo2></td><td>&bar2</td><td>"baz2</td></tr><tr><td>&nbsp;</td><td>0</td><td>&nbsp;</td></tr></table>',
         gen.generate(),
         "nothing encoded by default"
     )
 
     assert_equal(
-        '<table><tr><th>header1</th><th>header2</th><th>header3</th></tr><tr><td>&lt;foo1&gt;</td><td>&amp;bar1</td><td>&quot;baz1</td></tr><tr><td>&lt;foo2&gt;</td><td>&amp;bar2</td><td>&quot;baz2</td></tr></table>',
-        gen.generate( 'encodes' => nil ),
+        '<table><tr><th>header1</th><th>header2</th><th>header3</th></tr><tr><td>&lt;foo1&gt;</td><td>&amp;bar1</td><td>&quot;baz1</td></tr><tr><td>&lt;foo2&gt;</td><td>&amp;bar2</td><td>&quot;baz2</td></tr><tr><td>&nbsp;</td><td>0</td><td>&nbsp;</td></tr></table>',
+        gen.generate( 'encode' => 1 ),
         "default encoding works"
     )
 
     assert_equal(
-        '<table><tr><th>header1</th><th>header2</th><th>header3</th></tr><tr><td><foo1></td><td>&amp;bar1</td><td>"baz1</td></tr><tr><td><foo2></td><td>&amp;bar2</td><td>"baz2</td></tr></table>',
+        '<table><tr><th>header1</th><th>header2</th><th>header3</th></tr><tr><td><foo1></td><td>&amp;bar1</td><td>"baz1</td></tr><tr><td><foo2></td><td>&amp;bar2</td><td>"baz2</td></tr><tr><td>&nbsp;</td><td>0</td><td>&nbsp;</td></tr></table>',
         gen.generate( 'encodes' => '&' ),
         "only requested char is encoded"
     )
 
     assert_equal(
-        '<table><tr><th>he&#97;der1</th><th>he&#97;der2</th><th>he&#97;der3</th></tr><tr><td><foo1></td><td>&amp;b&#97;r1</td><td>&quot;b&#97;z1</td></tr><tr><td><foo2></td><td>&amp;b&#97;r2</td><td>&quot;b&#97;z2</td></tr></table>',
+        '<table><tr><th>header1</th><th>header2</th><th>header3</th></tr><tr><td><foo1></td><td>&bar1</td><td>"baz1</td></tr><tr><td><foo2></td><td>&bar2</td><td>"baz2</td></tr><tr><td>&nbsp;</td><td>&#48;</td><td>&nbsp;</td></tr></table>',
+        gen.generate( 'encodes' => '0' ),
+        "zero as requested char is encoded"
+    )
+
+    assert_equal(
+        '<table><tr><th>he&#97;der1</th><th>he&#97;der2</th><th>he&#97;der3</th></tr><tr><td><foo1></td><td>&amp;b&#97;r1</td><td>&quot;b&#97;z1</td></tr><tr><td><foo2></td><td>&amp;b&#97;r2</td><td>&quot;b&#97;z2</td></tr><tr><td>&nbsp;</td><td>0</td><td>&nbsp;</td></tr></table>',
         gen.generate( 'encodes' => 'a&"' ),
         "requested chars are encoded"
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Spreadsheet-HTML
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - jeffa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
 description: Just another HTML table generator
 email:
 - jeffa@cpan.org