Spreadsheet-HTML 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 536fbb8dbff6d3a46e7c42fa8be4345067abfd6d
-  data.tar.gz: 3c1e0820a66d5147d27b872a59fb78de7e2e6a1c
+  metadata.gz: 74459c74abf314da4530023e49d8fe8215d4749b
+  data.tar.gz: 831d56fd9fa50caa9fde4549e299b0f12a8f0fe7
 SHA512:
-  metadata.gz: 7fd20c220637862ce21c526c43ec3ef196679ced8120188de92b974d5401a4da2966a62676ea178d99d2fe18cac0420259a99608e1ab7ceb4f8d9afb8fd9da40
-  data.tar.gz: 8c81843c873153648487b1880fbcd55ef3240dc9364be9fea7fc307f8bd0c5cd010b03b3c393f78cf4631e0784caac0ee0f3d71e37a276fece9897c3e0ba3ae5
+  metadata.gz: 1ea3934540e350a44509d2f3cc7e8dc2c302b8d1c578464467a5cc781a502f750678d0a7d2f543b2c46ba936e8b8b8c97c8d66dc420cdbe77c976b5fae2455b8
+  data.tar.gz: 4b71690518be878ec820a4cc0349a29d2c5601d4fbd2ad9b814a3c518eb7ce80d3d737a9f954a1f8a896686e140cbfe4d230ae077c97129655224638bf5b967b

data/Changes

@@ -1,5 +1,9 @@
 Revision history for html-autotag-ruby
 
+0.0.9
+    - implemented Dynamic Tags by headings
+    - handle invalid fill params more gracefully
+
 0.0.8
     - implemented fill param
     - "defactored" HTML Encoding into this module

data/README

@@ -109,8 +109,23 @@ fill
   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.
+    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.
+    They contain leading underscores to seperate them from literal and tag parameters.
+
+_rX
+    Hash. Apply these attributes to row X (zero index based).
+
+_cX
+    Hash. Apply these attributes to colum X (zero index based). You can also alias any
+    column by the value of the heading name in that column prepended with underscore (_)
+
+  _occupation => { 'class' => 'foo' }
+
+  _salary => { 'class' => 'foo' }
+
+_rXcY
+    Hash. Apply these attributes to colum Y in row X (zero index based).
 
 == Tag Parameters
     Tag Parameters provide a means to control the attributes of the table's tags, and in

data/lib/Spreadsheet/HTML.rb

@@ -127,39 +127,56 @@ module Spreadsheet
         def _process( args )
             params = _args( args )
 
-            # headings is an alias for -r0
-            params['-r0'] = params['headings']
+            # headings is an alias for _r0
+            params['_r0'] = params['headings']
 
             index = {}
             if params['data'][0].size()
-                # implement index mapping
+                for i in 0 .. params['data'][0].size() - 1
+                    key = params['data'][0][i] || ''
+                    index["_#{key}"] = i
+                end
+
+                params.keys.grep( /^_/ ) do |key|
+                    k = index[key] 
+                    params["_c#{k}"] = params[key] if index.has_key?( key )
+                end
             end
 
-            data  = params['data']
-            empty = params.has_key?('empty') ? params['empty'] : ' '
+            empty = params['empty'] || ' '
             tag   = ( params['matrix'] or params['headless'] ) ? 'td' : 'th'
 
             encoder = Enco::Der.new
-            for i in 0 .. params['_max_rows'] - 1
+            for r in 0 .. params['_max_rows'] - 1
 
-                data[i] ||= []
                 unless params['_layout']
-                    (params['_max_cols'] - data[i].size).times { data[i].push( nil ) }  # pad
-                    (data[i].size - params['_max_cols']).times { data[i].pop }          # truncate
+                    params['data'][r] ||= []
+                    (params['_max_cols'] - params['data'][r].size).times { params['data'][r].push( nil ) }  # pad
+                    (params['data'][r].size - params['_max_cols']).times { params['data'][r].pop }          # truncate
                 end
 
-                r = []
-                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 } )
+                row = []
+                for c in 0 .. params['_max_cols'] - 1
+
+                    attr  = params[tag] || {}
+                    cdata = params['data'][r][c].to_s
+
+                    [ tag, "_c#{c}", "_r#{r}", "_r#{r}c#{c}" ].each do |dyna_param|
+                        if params.has_key?( dyna_param )
+                            ( cdata, attr ) = _extrapolate( cdata, attr, params[dyna_param] );
+                        end
+                    end 
+
+                    cdata = encoder.encode( cdata, params['encodes'] ) if params['encode'] or !params['encodes'].to_s.empty?
+                    cdata = cdata.gsub( /^\s*$/, empty.to_s )
+                    row.push( { 'tag' => tag, 'attr' => attr, 'cdata' => cdata } )
+
                 end
-                data[i] = r
+
+                params['data'][r] = row
                 tag = 'td'
             end
 
-            params['data'] = data
             params['data'].shift if params['headless']
 
             return params
@@ -216,13 +233,33 @@ module Spreadsheet
 
             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']
+                if row.to_i > 0 && col.to_i > 0
+                    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
             end
 
             return params
         end
 
+        def _extrapolate( cdata, orig_attr, thingy )
+            new_attr = {}
+            thingy = [ thingy ] unless thingy.kind_of?(Array)
+            thingy.each do |t|
+                if t.kind_of?(Hash)
+                    new_attr = t
+                #elsif t.kind_of?(Code)
+                #    puts "What now?"
+                end
+            end
+
+            attr = {}
+            orig_attr.each { |key,val| attr[key] = val }
+            new_attr.each  { |key,val| attr[key] = val }
+
+            return [ cdata, attr ]
+        end
+
     end
 
 end

data/lib/Spreadsheet/HTML/version.rb

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

data/t/04-headless.rb

@@ -40,6 +40,12 @@ class Test_Headless < Test::Unit::TestCase
         "one named arg"
     )
 
+    assert_equal(
+        '<table><tr><th>1</th><th>a</th></tr><tr><td>2</td><td>b</td></tr><tr><td>3</td><td>c</td></tr></table>',
+        gen.generate( 'data' => data ),
+        "headless does not change orig data"
+    )
+
   end
 
   def test_class

data/t/07-attrs.rb

@@ -181,4 +181,117 @@ class Test_Attributes < Test::Unit::TestCase
     )
 
   end
+
+  def test_headings
+
+    data = Array[
+        %w(header1 header2 header3 header4),
+        %w(foo1 bar1 baz1 qux1),
+        %w(foo2 bar2 baz2 qux2),
+        %w(foo3 bar3 baz3 qux3),
+        %w(foo4 bar4 baz4 qux4)
+    ]
+
+    html = '<table><tr><th style="color: red;">header1</th><th style="color: green;">header2</th><th style="color: blue;">header3</th><th style="color: red;">header4</th></tr><tr><td>foo1</td><td>bar1</td><td>baz1</td><td>qux1</td></tr><tr><td>foo2</td><td>bar2</td><td>baz2</td><td>qux2</td></tr><tr><td>foo3</td><td>bar3</td><td>baz3</td><td>qux3</td></tr><tr><td>foo4</td><td>bar4</td><td>baz4</td><td>qux4</td></tr></table>'
+
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new( 'data' => data, 'headings' => { 'style' => { 'color' => %w{ red green blue } } } ).generate(),
+        "via constructor only"
+    )
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new().generate( 'data' => data, 'headings' => { 'style' => { 'color' => %w{ red green blue } } } ),
+        "via method only"
+    )
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new( 'data' => data ).generate( 'headings' => { 'style' => { 'color' => %w{ red green blue } } } ),
+        "via constructor and method"
+    )
+
+    html = '<table><tr><th>header1</th><th style="color: red;">header2</th><th>header3</th><th>header4</th></tr><tr><td>foo1</td><td style="color: green;">bar1</td><td>baz1</td><td>qux1</td></tr><tr><td>foo2</td><td style="color: blue;">bar2</td><td>baz2</td><td>qux2</td></tr><tr><td>foo3</td><td style="color: red;">bar3</td><td>baz3</td><td>qux3</td></tr><tr><td>foo4</td><td style="color: green;">bar4</td><td>baz4</td><td>qux4</td></tr></table>'
+
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new( 'data' => data, '_header2' => { 'style' => { 'color' => %w{ red green blue } } } ).generate(),
+        "via constructor only"
+    )
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new().generate( 'data' => data, '_header2' => { 'style' => { 'color' => %w{ red green blue } } } ),
+        "via method only"
+    )
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new( 'data' => data ).generate( '_header2' => { 'style' => { 'color' => %w{ red green blue } } } ),
+        "via constructor and method"
+    )
+
+  end
+
+  def test_dynamic_params
+
+    data = Array[
+        %w(header1 header2 header3),
+        %w(foo1 bar1 baz1),
+        %w(foo2 bar2 baz2),
+    ]
+
+    html = '<table><tr><th>header1</th><th style="color: red;">header2</th><th>header3</th></tr><tr><td>foo1</td><td style="color: green;">bar1</td><td>baz1</td></tr><tr><td>foo2</td><td style="color: blue;">bar2</td><td>baz2</td></tr></table>';
+
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new( 'data' => data, '_c1' => { 'style' => { 'color' => %w{ red green blue } } } ).generate(),
+        "_c1 via constructor only"
+    )
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new().generate( 'data' => data, '_c1' => { 'style' => { 'color' => %w{ red green blue } } } ),
+        "_c1 via method only"
+    )
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new( 'data' => data ).generate( '_c1' => { 'style' => { 'color' => %w{ red green blue } } } ),
+        "_c1 via constructor and method"
+    )
+
+    html = '<table><tr><th>header1</th><th>header2</th><th>header3</th></tr><tr><td style="color: red;">foo1</td><td style="color: green;">bar1</td><td style="color: blue;">baz1</td></tr><tr><td>foo2</td><td>bar2</td><td>baz2</td></tr></table>';
+
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new( 'data' => data, '_r1' => { 'style' => { 'color' => %w{ red green blue } } } ).generate(),
+        "_r1 via constructor only"
+    )
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new().generate( 'data' => data, '_r1' => { 'style' => { 'color' => %w{ red green blue } } } ),
+        "_r1 via method only"
+    )
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new( 'data' => data ).generate( '_r1' => { 'style' => { 'color' => %w{ red green blue } } } ),
+        "_r1 via constructor and method"
+    )
+
+    html = '<table><tr><th>header1</th><th>header2</th><th>header3</th></tr><tr><td>foo1</td><td>bar1</td><td style="color: red;">baz1</td></tr><tr><td>foo2</td><td>bar2</td><td>baz2</td></tr></table>';
+
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new( 'data' => data, '_r1c2' => { 'style' => { 'color' => %w{ red green blue } } } ).generate(),
+        "_r1c2 via constructor only"
+    )
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new().generate( 'data' => data, '_r1c2' => { 'style' => { 'color' => %w{ red green blue } } } ),
+        "_r1c2 via method only"
+    )
+    assert_equal(
+        html,
+        Spreadsheet::HTML.new( 'data' => data ).generate( '_r1c2' => { 'style' => { 'color' => %w{ red green blue } } } ),
+        "_r1c2 via constructor and method"
+    )
+
+  end
+
 end

data/t/09-padding.rb

@@ -49,12 +49,42 @@ class Test_Padding < Test::Unit::TestCase
         "fill works with no data"
     )
 
+    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( 'fill' => '1x2', 'data' => data ),
+        "fill does not truncate larger data"
+    )
+
+    assert_equal(
+        '<table><tr><th>&nbsp;</th></tr></table>',
+        gen.generate( 'fill' => nil ),
+        "fill defaults to 1x1 with with invalid data (nil)"
+    )
+
+    assert_equal(
+        '<table><tr><th>&nbsp;</th></tr></table>',
+        gen.generate( 'fill' => '' ),
+        "fill defaults to 1x1 with with invalid data (empty)"
+    )
+
     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' => '-2x4' ),
+        "fill defaults to 1x1 with with invalid data (first negative)"
+    )
+
+    assert_equal(
+        '<table><tr><th>&nbsp;</th></tr></table>',
+        gen.generate( 'fill' => '1x-3' ),
+        "fill defaults to 1x1 with with invalid data (second negative)"
+    )
+
     assert_equal(
         '<table><tr><th>&nbsp;</th></tr></table>',
         gen.generate( 'fill' => 'axb' ),

data/t/11-empty.rb

@@ -21,7 +21,13 @@ class Test_Empty < Test::Unit::TestCase
     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"
+        "empty values can be overriden (space)"
+    )
+
+    assert_equal(
+        '<table><tr><th>header1</th><th>header2</th><th>header3</th></tr><tr><td>foo1</td><td>0</td><td>baz1</td></tr><tr><td>0</td><td>bar2</td><td>0</td></tr></table>',
+        gen.generate( 'empty' => 0 ),
+        "empty values can be overriden (zero)"
     )
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Spreadsheet-HTML
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - jeffa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler