greentable 0.9.2 → 0.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    greentable (0.9.2)
+    greentable (0.9.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -94,14 +94,14 @@ will produce
 <table class="a aa" style="b:c">
     <thead>
         <tr class="d">
-            <th onclick="e();" class="h i ee">col0</th>
+            <th onclick="e();" class="ee h i">col0</th>
             <th onclick="e();" class="ee">col1</th>
         </tr>
     </thead>
     <tbody>
         <tr class="d">
-            <td data-target="f" class="h ff">0</td>
-            <td data-target="f" class="j ff">0</td>
+            <td data-target="f" class="ff h">0</td>
+            <td data-target="f" class="ff j">0</td>
         </tr>
     </tbody>
 </table>
@@ -247,7 +247,7 @@ will produce
     </tbody>
     <tfoot>
         <tr class='footer_tr_class'>
-            <td class='a' style: 'border-top: 2px solid black;'>Total</td>
+            <td class='a' style='border-top: 2px solid black;'>Total</td>
             <td class='a' style='border-top: 2px solid black; font-weight: bold;'>$3.14</td>
         </tr>
     </tfoot>

data/greentable.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |spec|
   spec.name          = "greentable"
   spec.version     = Greentable::VERSION
   spec.authors       = ["Wael Chatila"]
-  spec.description = "Greentable produces HTML tables from an array without you having to deal with any HTML elements."
-  spec.summary     = "Rails declarative html tables with export features"
+  spec.description = "Greentable automatically produces HTML tables from an array in a succinct way. It also provides an easy way to export and print a particular table"
+  spec.summary     = "Rails declarative html tables with export and print features"
   spec.homepage    = "https://github.com/waelchatila/greentable"
   spec.license = 'LGPLv3+'
 

data/lib/greentable/export.rb

@@ -23,12 +23,15 @@ module Greentable
           doc = Nokogiri(body.to_s)
           if greentable_export == 'csv'
             ret= ""
-            (doc/"##{greentable_id}//tr").each do |tr|
+            (doc/"##{greentable_id} / * / tr").each do |tr|
               row = []
               col = 0
               (tr/"./th | ./td").each do |x|
-                colspan = (x.attributes['colspan'] || 1).to_i
-                colspan = [colspan,1].max
+                colspan = x.attributes['colspan']
+                if colspan
+                  colspan = colspan.value.to_i rescue nil
+                end
+                colspan ||= 1
                 row[col] = (x.inner_text || '').strip
                 col += colspan
               end

data/lib/greentable/version.rb

@@ -1,3 +1,3 @@
 module Greentable
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/test/dummy/app/views/application/home.html.erb

@@ -10,6 +10,24 @@ hello world
         <% footer.col(style: 'background-color: #ccc;') do %>
             footer td
         <% end %>
+        <% footer.col(colspan: 2) do %>
+            colspan=2
+        <% end %>
+        <% footer.col(style: 'background-color: #ccc;') do %>
+            <table>
+                <tr>
+                    <td>I</td>
+                    <td>contain</td>
+                </tr>
+                <tr>
+                    <td colspan="2">a</td>
+                </tr>
+                <tr>
+                    <td>sub</td>
+                    <td>table</td>
+                </tr>
+            </table>
+        <% end %>
     <% end %>
     <% gt.col('x') do %>
         <%= el %>

data/test/export_test.rb

@@ -41,6 +41,19 @@ class ExportTest < ActionController::TestCase
     assert body !~ /table id=.+greentable_id.+/, body
     assert body !~ /window.print/, body
     assert content_type =~ /text\/csv/
+
+    expected =<<-END
+x,x+1,i,first?,last?,odd?,even?
+100,101,0,true,false,true,false
+101,102,1,false,false,false,true
+102,103,2,false,true,true,false
+footer td,colspan=2,,"I
+                    contain
+                a
+                sub
+                    table"
+    END
+    assert_equal expected, body
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greentable
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,8 +155,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Greentable produces HTML tables from an array without you having to deal
-  with any HTML elements.
+description: Greentable automatically produces HTML tables from an array in a succinct
+  way. It also provides an easy way to export and print a particular table
 email: 
 executables: []
 extensions: []
@@ -247,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2946809728237935580
+      hash: -3412082307347015687
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -256,13 +256,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2946809728237935580
+      hash: -3412082307347015687
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Rails declarative html tables with export features
+summary: Rails declarative html tables with export and print features
 test_files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css