Spreadsheet-HTML 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a67a6f1e2ffba722e018f7b3ddee592e1276ef92
-  data.tar.gz: d880bda077f4768e9fbf66fb0b33a33641f75aa7
+  metadata.gz: 909497deb0cfc2f1d80bceb59e60c0d1b2ce927c
+  data.tar.gz: 571876e57a241c92d48a4436551b62a2b652b78a
 SHA512:
-  metadata.gz: 0ce3cb526df8ad3e0bb38a036a92ac3cd2e26badc46619d012de551984a8a312289084c31d68ebf35293b213c211c7fd040c6a852ff77c55e22556c51c12ab66
-  data.tar.gz: c89f81f0f00415532556fcc83ec9219ecd1ffa1476665b2969c5d94b4b73c3cda408cf3963fd53f4eb1004f49924fb93a028b1e41402163ba640d3821badc333
+  metadata.gz: 145896da253dccf1fe866382349fde9c822307376c31ee2fb02139c34e8b8e81044d6588b3ac8db4f83885dae8fd779ff5f70f82a91215fcd06ad2eb1f33c6ef
+  data.tar.gz: e4acd9bd46a749ae6106f8d55fdcad930779534211d85ca00d737a7513ffbc743eb35b2a815431d2555ab36d7e81ded84f2aa5d74ef637a5ace78686f29a0d28

data/Changes

@@ -1,5 +1,10 @@
 Revision history for html-autotag-ruby
 
+0.0.6
+    - implemented empty param
+    - implemented encodes param
+    - implemented row padding and truncation
+
 0.0.5
     - moved docs to README (trying to render for rubydoc.info site)
     - just a note -- having a very hard time learning how to document ruby

data/README

@@ -10,7 +10,7 @@
 == Synopsis
     require 'Spreadsheet/HTML'
 
-    data = Array[ [1,2,3], [4,5,6] ]
+    data = Array[ [1,2,3], [4,5,6], [7,8,9] ]
     generator = Spreadsheet::HTML.new()
     puts generator.generate( data )
     puts generator.generate( 'data' => data )
@@ -27,7 +27,7 @@
     # See t/ directory for more examples
 
 == Dependencies
-    HTML-AutoTag (which requires htmlentities)
+    HTML-AutoTag
 
 == Methods
     With the exception of new, all methods return an HTML table as a string.

data/Spreadsheet-HTML.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   spec.extra_rdoc_files  = ["README"]
+  spec.required_ruby_version = '~> 1.9.2'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency 'rake'
-  spec.add_runtime_dependency 'HTML-AutoTag', '~> 1.0', '>= 1.0.1'
+  spec.add_runtime_dependency 'HTML-AutoTag', '>= 1.0.5'
 end

data/lib/Spreadsheet/HTML.rb

@@ -132,13 +132,21 @@ module Spreadsheet
             end
 
             data  = []
-            empty = params.has_key?('empty') ? params['empty'] : '&nbsp'
+            empty = params.has_key?('empty') ? params['empty'] : ' '
             tag   = ( params['matrix'] or params['headless'] ) ? 'td' : 'th'
 
             params['data'].each do |row|
+
+                unless params['_layout']
+                    (params['_max_cols'] - row.size).times { row.push( nil ) }  # pad
+                    (row.size - params['_max_cols']).times { row.pop }          # truncate
+                end
+
                 r = []
                 row.each do |col|
-                    r.push( { 'tag' => tag, 'attr' => params[tag] || {}, 'cdata' => col.to_s } )
+                    col = col.to_s
+                    col = col.gsub( /^\s*$/, empty )
+                    r.push( { 'tag' => tag, 'attr' => params[tag] || {}, 'cdata' => col } )
                 end
                 data.push( r )
                 tag = 'td'
@@ -183,7 +191,7 @@ module Spreadsheet
             end
 
             params['auto'] = Auto::Tag.new(
-                'encodes'   => params['encodes'],
+                'encodes'   => params.has_key?('encodes') ? params['encodes'] : '',
                 'indent'    => params['indent'],
                 'level'     => params['level'],
                 'sorted'    => params['attr_sort'],
@@ -194,7 +202,9 @@ module Spreadsheet
                 params['data'] = data[0]
             end
 
-            params['data'] = params['data'].clone
+            params['_max_rows'] = params['data'].size
+            params['_max_cols'] = params['data'][0].size
+            params['data']      = params['data'].clone
 
             return params
         end

data/lib/Spreadsheet/HTML/version.rb

@@ -1,5 +1,5 @@
 module Spreadsheet
   class HTML
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/readme.md

@@ -11,7 +11,7 @@ Synopsis
 ```ruby
 require 'Spreadsheet/HTML'
 
-data = Array[ [1,2,3], [4,5,6] ]
+data = Array[ [1,2,3], [4,5,6], [7,8,9] ]
 generator = Spreadsheet::HTML.new()
 puts generator.generate( data )
 puts generator.generate( 'data' => data )

data/t/09-padding.rb

@@ -3,21 +3,33 @@ require "Spreadsheet/HTML"
 
 class Test_Padding < Test::Unit::TestCase
 
-  def test_empty
+  def test_padding
+
+    gen = Spreadsheet::HTML.new
 
     data = Array[
         %w(header1 header2 header3),
-        Array[ 'foo1', 'bar1', '' ],
-        Array[ 'foo2', 'bar2', '' ],
+        Array[ 'foo1', 'bar1' ],
+        Array[ 'foo2' ],
     ]
 
-    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>&nbsp;</td></tr><tr><td>foo2</td><td>&nbsp;</td><td>&nbsp;</td></tr></table>',
+        gen.generate( 'data' => data ),
+        "empty values are padded with default"
+    )
+
+    data = Array[
+        %w(header1 header2),
+        Array[ 'foo1', 'bar1', 'baz1' ],
+        Array[ 'foo2', 'bar2', 'baz2', 'qux2' ],
+    ]
 
-#    assert_equal(
-#        '<table><tr><th>header1</th><th>header2</th><th>header3</th></tr><tr><td>foo1</td><td>bar1</td><td>&nbsp;</td></tr><tr><td>foo2</td><td>bar2</td><td>&nbsp;</td></tr></table>',
-#        gen.generate(),
-#        "empty values are padded with default"
-#    )
+    assert_equal(
+        '<table><tr><th>header1</th><th>header2</th></tr><tr><td>foo1</td><td>bar1</td></tr><tr><td>foo2</td><td>bar2</td></tr></table>',
+        gen.generate( 'data' => data ),
+        "extra values are truncated"
+    )
 
   end
 

data/t/11-empty.rb

@@ -0,0 +1,29 @@
+require "test/unit"
+require "Spreadsheet/HTML"
+
+class Test_Empty < Test::Unit::TestCase
+
+  def test_empty
+
+    data = Array[
+        %w(header1 header2 header3),
+        Array[ 'foo1', '', 'baz1' ],
+        Array[ '', 'bar2', '' ],
+    ]
+
+    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>&nbsp;</td><td>baz1</td></tr><tr><td>&nbsp;</td><td>bar2</td><td>&nbsp;</td></tr></table>',
+        gen.generate(),
+        "empty values are defaulted to &nbsp;"
+    )
+
+    assert_equal(
+        '<table><tr><th>header1</th><th>header2</th><th>header3</th></tr><tr><td>foo1</td><td> </td><td>baz1</td></tr><tr><td> </td><td>bar2</td><td> </td></tr></table>',
+        gen.generate( 'empty' => ' ' ),
+        "empty values are overriden"
+    )
+
+  end
+
+end

data/t/12-encodes.rb

@@ -0,0 +1,42 @@
+require "test/unit"
+require "Spreadsheet/HTML"
+
+class Test_Encodes < Test::Unit::TestCase
+
+  def test_encodes
+
+    data = Array[
+        %w(header1 header2 header3),
+        Array[ '<foo1>', '&bar1', '"baz1' ],
+        Array[ '<foo2>', '&bar2', '"baz2' ],
+    ]
+
+    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>',
+        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 ),
+        "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>',
+        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>',
+        gen.generate( 'encodes' => 'a&"' ),
+        "requested chars are encoded"
+    )
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Spreadsheet-HTML
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - jeffa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,22 +42,16 @@ dependencies:
   name: HTML-AutoTag
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.5
 description: Just another HTML table generator
 email:
 - jeffa@cpan.org
@@ -87,6 +81,8 @@ files:
 - t/08-tgroups.rb
 - t/09-padding.rb
 - t/10-indent.rb
+- t/11-empty.rb
+- t/12-encodes.rb
 homepage: https://github.com/jeffa/spreadsheet-html-ruby
 licenses:
 - MIT
@@ -97,9 +93,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="