workbook 0.4.5 → 0.4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0a6519a54a39e28ff553a4c91ed323bc1ea26cb
-  data.tar.gz: 2fc5bc899ed4347d5010b98224f9eb28d6895df8
+  metadata.gz: 41cf688387503bb0c1f49447b808e8bdec45b9c4
+  data.tar.gz: 10002b13a02821e187fc333fd0d500a3e5764f34
 SHA512:
-  metadata.gz: c62b71197742c0b0e4d99890e7e695daaa4b22b3a91dc575c085fe4ab4309d731d3e03539e0995bc15201ebf90c75c925a3cd84f60cb0ff8e48fc67bb6c4d88a
-  data.tar.gz: 11b95b6db274135ea696380bca9d0b35e939cca6182fcf368b1b10b56d91886d5fc30a3b5ab06c03c60676fff348d9a66b2fe3a04cde0603ad6a22a661b2965b
+  metadata.gz: 7cb62c5b99200c4c6960b4154de58251f5b4b407cf28f9c130d4752f6119c4193c0bba9017f80822225e4c165030b004f615e7c5faabde6cc507e143442b78be
+  data.tar.gz: 797ea713f1a703172a571ff977c1351dbe3a11911eec2c25f8b818ca9bd93c4cf57127c1cd6539ad05e160d167b16b8f1c8c23bc393e40203f5a17792972b1b2

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 1.8.7
-  - jruby-18mode
   - 2.0.0
+  - 2.1.0
 #  - jruby-19mode

data/lib/workbook/book.rb

@@ -117,7 +117,7 @@ module Workbook
     #
     # @param [String] filename   a string with a reference to the file to be written to
     # @param [Hash] options  depends on the writer chosen by the file's filetype
-    def write filename, options
+    def write filename, options={}
       extension = file_extension(filename)
       send("write_to_#{extension}".to_sym, filename, options)
     end

data/lib/workbook/table.rb

@@ -2,6 +2,7 @@
 require 'workbook/modules/table_diff_sort'
 require 'workbook/writers/csv_table_writer'
 require 'workbook/writers/json_table_writer'
+require 'workbook/writers/html_writer'
 
 
 module Workbook
@@ -10,6 +11,8 @@ module Workbook
     include Workbook::Modules::TableDiffSort
     include Workbook::Writers::CsvTableWriter
     include Workbook::Writers::JsonTableWriter
+    include Workbook::Writers::HtmlTableWriter
+
     attr_accessor :sheet
     attr_accessor :name
 
@@ -59,6 +62,9 @@ module Workbook
       r
     end
 
+    # Removes all empty lines. This function is particularly useful if you typically add lines to the end of a template-table, which sometimes has unremovable empty lines.
+    #
+    # @return [Workbook::Table] self
     def remove_empty_lines!
       self.delete_if{|r| r.nil? or r.compact.empty?}
       self

data/lib/workbook/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Workbook
-  VERSION = '0.4.5'
+  VERSION = '0.4.5.1'
 end

data/lib/workbook/writers/html_writer.rb

@@ -22,24 +22,7 @@ module Workbook
                   doc.h2 {
                     doc.text table.name
                   }
-                  doc.table {
-                    table.each{|row|
-                      doc.tr {
-                        row.each {|cell|
-                          classnames = cell.format.all_names.join(" ").strip
-                          td_options = classnames != "" ? {:class=>classnames} : {}
-                          td_options = td_options.merge({:style=>cell.format.to_css}) if options[:style_with_inline_css] and cell.format.to_css != ""
-                          td_options = td_options.merge({:colspan=>cell.colspan}) if cell.colspan
-                          td_options = td_options.merge({:rowspan=>cell.rowspan}) if cell.rowspan
-                          unless cell.value.class == Workbook::NilValue
-                            doc.td(td_options) {
-                              doc.text cell.value
-                            }
-                          end
-                        }
-                      }
-                    }
-                  }
+                  doc << table.to_html(options)
                 }
               }
             }
@@ -48,8 +31,6 @@ module Workbook
         return builder.doc.to_xhtml
       end
 
-
-
       # Write the current workbook to HTML format
       #
       # @param [String] filename
@@ -61,5 +42,36 @@ module Workbook
         return filename
       end
     end
+
+    module HtmlTableWriter
+      # Generates an HTML table ()
+      #
+      # @param [Hash] options A hash with options
+      # @return [String] A String containing the HTML code
+      def to_html options={}
+        options = {:style_with_inline_css=>false}.merge(options)
+        builder = Nokogiri::XML::Builder.new do |doc|
+          doc.table {
+            self.each{|row|
+              doc.tr {
+                row.each {|cell|
+                  classnames = cell.format.all_names.join(" ").strip
+                  td_options = classnames != "" ? {:class=>classnames} : {}
+                  td_options = td_options.merge({:style=>cell.format.to_css}) if options[:style_with_inline_css] and cell.format.to_css != ""
+                  td_options = td_options.merge({:colspan=>cell.colspan}) if cell.colspan
+                  td_options = td_options.merge({:rowspan=>cell.rowspan}) if cell.rowspan
+                  unless cell.value.class == Workbook::NilValue
+                    doc.td(td_options) {
+                      doc.text cell.value
+                    }
+                  end
+                }
+              }
+            }
+          }
+        end
+        return builder.doc.to_xhtml
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.5.1
 platform: ruby
 authors:
 - Maarten Brouwers