workbook 0.4.6.0 → 0.4.7

data/lib/workbook/sheet.rb

@@ -34,6 +34,10 @@ module Workbook
       first
     end
 
+    def name
+      @name ||= "Sheet #{book.index(self)+1}"
+    end
+
     # Set the first table of this sheet with a table or array of cells/values
     # @param [Workbook::Table, Array<Array>] table   The new first table of this sheet
     # @param [Hash] options                          are forwarded to Workbook::Table.new

data/lib/workbook/table.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-require 'workbook/modules/table_diff_sort'
+require 'workbook/modules/diff_sort'
 require 'workbook/writers/csv_table_writer'
 require 'workbook/writers/json_table_writer'
 require 'workbook/writers/html_writer'
@@ -29,6 +29,13 @@ module Workbook
       # Column data is considered as a 'row' with 'cells' that contain 'formatting'
     end
 
+    # Quick assessor to the book's template, if it exists
+    #
+    # @return [Workbook::Template]
+    def template
+      sheet.book.template
+    end
+
     # Returns the header of this table (typically the first row, but can be a different row).
     # The header row is also used for finding values in a aribrary row.
     #
@@ -86,18 +93,6 @@ module Workbook
       row.set_table(self)
     end
 
-    # Overrides normal Row's []=-function; automatically converting to row and setting
-    # with the label correctly
-    #
-    # @param [Fixnum] index
-    # @param [Workbook::Table, Array] row to set
-    # @return [Workbook::Cell, nil]
-    def []= (index, row)
-      row = Workbook::Row.new(row) if row.class == Array
-      super(index,row)
-      row.set_table(self)
-    end
-
     def has_contents?
       self.clone.remove_empty_lines!.count != 0
     end
@@ -157,10 +152,35 @@ module Workbook
         cell_index = alpha_index_to_number_index(match[1])
         row_index = match[2].to_i - 1
         return self[row_index][cell_index]
+      elsif index_or_string.is_a? Range
+        collection = to_a[index_or_string].collect{|a| a.clone}
+        return Workbook::Table.new collection
+      elsif index_or_string.is_a? Integer
+        return to_a[index_or_string]
+      end
+    end
+
+    # Overrides normal Row's []=-function; automatically converting to row and setting
+    # with the label correctly
+    #
+    # @example Lookup using fixnum or header value encoded as symbol
+    #   `table[0] = <Row [a,2,3,4]>` (set first row)
+    #   `table["A1"] = 2` (set first cell of first row to 2)
+    #
+    # @param [Fixnum, String] index_or_string to reference to either the row, or the cell
+    # @param [Workbook::Table, Array] new_value to set
+    # @return [Workbook::Cell, nil]
+    def []= (index_or_string, new_value)
+      if index_or_string.is_a? String
+        match = index_or_string.upcase.match(/([A-Z]*)([0-9]*)/)
+        cell_index = alpha_index_to_number_index(match[1])
+        row_index = match[2].to_i - 1
+        self[row_index][cell_index].value = new_value
       else
-        if index_or_string
-          return to_a[index_or_string]
-        end
+        row = new_value
+        row = Workbook::Row.new(row) unless row.is_a? Workbook::Row
+        super(index_or_string,row)
+        row.set_table(self)
       end
     end
 

data/lib/workbook/types/Date.rb

@@ -0,0 +1,9 @@
+require 'workbook/cell'
+
+module Workbook
+  module Types
+    class Date < Date
+      include Workbook::Cell
+    end
+  end
+end

data/lib/workbook/types/FalseClass.rb

@@ -0,0 +1,9 @@
+require 'workbook/cell'
+
+module Workbook
+  module Types
+    class FalseClass < FalseClass
+      include Workbook::Cell
+    end
+  end
+end

data/lib/workbook/types/NilClass.rb

@@ -0,0 +1,9 @@
+require 'workbook/cell'
+
+module Workbook
+  module Types
+    class NilClass < NilClass
+      include Workbook::Cell
+    end
+  end
+end

data/lib/workbook/types/Numeric.rb

@@ -0,0 +1,9 @@
+require 'workbook/cell'
+
+module Workbook
+  module Types
+    class Numeric < Numeric
+      include Workbook::Cell
+    end
+  end
+end

data/lib/workbook/types/String.rb

@@ -0,0 +1,9 @@
+require 'workbook/cell'
+
+module Workbook
+  module Types
+    class String < String
+      include Workbook::Cell
+    end
+  end
+end

data/lib/workbook/types/Time.rb

@@ -0,0 +1,9 @@
+require 'workbook/cell'
+
+module Workbook
+  module Types
+    class Time < Time
+      include Workbook::Cell
+    end
+  end
+end

data/lib/workbook/types/TrueClass.rb

@@ -0,0 +1,9 @@
+require 'workbook/cell'
+
+module Workbook
+  module Types
+    class TrueClass < TrueClass
+      include Workbook::Cell
+    end
+  end
+end

data/lib/workbook/version.rb

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

data/lib/workbook/writers/html_writer.rb

@@ -47,28 +47,50 @@ module Workbook
       # Generates an HTML table ()
       #
       # @param [Hash] options A hash with options
-      # @return [String] A String containing the HTML code
+      # @return [String] A String containing the HTML code, most importantly `:style_with_inline_css` (default false)
       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
-                    }
+          doc.table do
+            doc.thead do
+              if header
+                doc.tr do
+                  header.each do |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.th(td_options) do
+                        doc.text cell.value
+                      end
+                    end
                   end
-                }
-              }
-            }
-          }
+                end
+              end
+            end
+            doc.tbody do
+              self.each do |row|
+                unless row.header?
+                  doc.tr do
+                    row.each do |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) do
+                          doc.text cell.value
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
         end
         return builder.doc.to_xhtml
       end

data/lib/workbook/writers/xls_writer.rb

@@ -5,15 +5,16 @@ module Workbook
   module Writers
     module XlsWriter
 
-      # Generates an Spreadsheet (from the spreadsheet gem) in order to build an XlS
+      # Generates an Spreadsheet (from the spreadsheet gem) in order to build an xls
       #
       # @param [Hash] options A hash with options (unused so far)
       # @return [Spreadsheet] A Spreadsheet object, ready for writing or more lower level operations
       def to_xls options={}
         book = init_spreadsheet_template
         self.each_with_index do |s,si|
-          xls_sheet = book.worksheet si
-          xls_sheet = book.create_worksheet if xls_sheet == nil
+          xls_sheet = xls_sheet(si)
+          xls_sheet.name = s.name
+
           s.table.each_with_index do |r, ri|
             xls_sheet.row(ri).height= r.format[:height] if r.format
             r.each_with_index do |c, ci|
@@ -27,6 +28,23 @@ module Workbook
               end
             end
           end
+          (xls_sheet.last_row_index + 1 - s.table.count).times do |time|
+            row_to_remove = s.table.count+time
+            xls_sheet.row(row_to_remove).each_with_index do |c, ci|
+              xls_sheet.row(row_to_remove)[ci]=nil
+            end
+
+            xls_sheet.delete_row(row_to_remove)
+            xls_sheet.row_updated(row_to_remove, xls_sheet.row(row_to_remove))
+          end
+          xls_sheet.updated_from(s.table.count)
+          xls_sheet.dimensions
+
+        end
+        # kind of a hack, delting by popping from xls worksheet results in Excel-errors (not LibreOffice)
+        # book.worksheets.pop(book.worksheets.count - self.count) if book.worksheets and book.worksheets.count > self.count
+        book.worksheets.each_with_index do |sheet, si|
+          sheet.visibility = self[si] ? :visible : :strong_hidden
         end
         book
       end
@@ -49,13 +67,37 @@ module Workbook
           xlsfmt.number_format = strftime_to_ms_format(f[:number_format]) if f[:number_format]
           xlsfmt.text_direction = f[:text_direction] if f[:text_direction]
           xlsfmt.font.name = f[:font_family].split.first if f[:font_family]
-          xlsfmt.font.family = f[:font_family].split.last if f[:font_family]
-          xlsfmt.font.color = html_color_to_xls_color(f[:color]) if f[:color]
+          xlsfmt.font.family = parse_font_family(f) if f[:font_family]
+          color = html_color_to_xls_color(f[:color])
+          xlsfmt.font.color = color if color
           f.add_raw xlsfmt
         end
         return xlsfmt
       end
 
+      # Parses right font-family name
+      #
+      # @param [Workbook::Format, hash] format to parse
+      def parse_font_family(format)
+        font = format[:font_family].to_s.split.last
+        valid_values = [:none,:roman,:swiss,:modern,:script,:decorative]
+        if valid_values.include?(font)
+          return font
+        elsif valid_values.include?(font.to_s.downcase.to_sym)
+          return font.to_s.downcase.to_sym
+        else
+          font = font.to_s.downcase.strip
+          translation = {
+            "arial"=>:swiss,
+            "times"=>:roman,
+            "times new roman"=>:roman
+          }
+          tfont = translation[font]
+          return tfont ? tfont : :none
+        end
+      end
+
+
       # Attempt to convert html-hex color value to xls color number
       #
       # @param [String] hex color

data/lib/workbook/writers/xlsx_writer.rb

@@ -0,0 +1,123 @@
+# -*- encoding : utf-8 -*-
+require 'rubyXL'
+require 'workbook/readers/xls_shared'
+
+module Workbook
+  module Writers
+    module XlsxWriter
+
+      # Generates an Spreadsheet (from the spreadsheet gem) in order to build an XlS
+      #
+      # @param [Hash] options A hash with options (unused so far)
+      # @return [Spreadsheet] A Spreadsheet object, ready for writing or more lower level operations
+      def to_xlsx options={}
+        book = init_xlsx_spreadsheet_template
+        book.theme = RubyXL::Theme.new unless book.theme #workaround bug in rubyxl
+        book.worksheets.pop(book.worksheets.count - self.count) if book.worksheets and book.worksheets.count > self.count
+        self.each_with_index do |s,si|
+          xls_sheet = xlsx_sheet(si)
+          xls_sheet.sheet_name = s.name
+
+          s.table.each_with_index do |r, ri|
+            r.each_with_index do |c, ci|
+              xls_sheet.add_cell(ri, ci, c.value)
+
+            end
+          end
+          (xls_sheet.count + 1 - s.table.count).times do |time|
+            row_to_remove = s.table.count+time
+
+            xls_sheet.delete_row(row_to_remove)
+            # xls_sheet.row_updated(row_to_remove, xls_sheet.row(row_to_remove))
+          end
+          # xls_sheet.updated_from(s.table.count)
+          # xls_sheet.dimensions
+
+        end
+        book
+      end
+
+      # # Generates an Spreadsheet (from the spreadsheet gem) in order to build an XlS
+      # #
+      # # @param [Workbook::Format, Hash] f A Workbook::Format or hash with format-options (:font_weight, :rotation, :background_color, :number_format, :text_direction, :color, :font_family)
+      # # @return [Spreadsheet::Format] A Spreadsheet format-object, ready for writing or more lower level operations
+      # def format_to_xlsx_format f
+      #   xlsfmt = nil
+      #   unless f.is_a? Workbook::Format
+      #     f = Workbook::Format.new f
+      #   end
+      #   xlsfmt = f.return_raw_for Spreadsheet::Format
+      #   unless xlsfmt
+      #     xlsfmt=Spreadsheet::Format.new :weight=>f[:font_weight]
+      #     xlsfmt.rotation = f[:rotation] if f[:rotation]
+      #     xlsfmt.pattern_fg_color = html_color_to_xls_color(f[:background_color]) if html_color_to_xls_color(f[:background_color])
+      #     xlsfmt.pattern = 1 if html_color_to_xls_color(f[:background_color])
+      #     xlsfmt.number_format = strftime_to_ms_format(f[:number_format]) if f[:number_format]
+      #     xlsfmt.text_direction = f[:text_direction] if f[:text_direction]
+      #     xlsfmt.font.name = f[:font_family].split.first if f[:font_family]
+      #     xlsfmt.font.family = parse_font_family(f) if f[:font_family]
+      #     color = html_color_to_xls_color(f[:color])
+      #     xlsfmt.font.color = color if color
+      #     f.add_raw xlsfmt
+      #   end
+      #   return xlsfmt
+      # end
+      #
+      # # Parses right font-family name
+      # #
+      # # @param [Workbook::Format, hash] format to parse
+      # def parse_font_family(format)
+      #   font = format[:font_family].to_s.split.last
+      #   valid_values = [:none,:roman,:swiss,:modern,:script,:decorative]
+      #   if valid_values.include?(font)
+      #     return font
+      #   elsif valid_values.include?(font.to_s.downcase.to_sym)
+      #     return font.to_s.downcase.to_sym
+      #   else
+      #     font = font.to_s.downcase.strip
+      #     translation = {
+      #       "arial"=>:swiss,
+      #       "times"=>:roman,
+      #       "times new roman"=>:roman
+      #     }
+      #     tfont = translation[font]
+      #     return tfont ? tfont : :none
+      #   end
+      # end
+      #
+
+      # Write the current workbook to Microsoft Excel format (using the spreadsheet gem)
+      #
+      # @param [String] filename
+      # @param [Hash] options   see #to_xls
+      def write_to_xlsx filename="#{title}.xlsx", options={}
+        if to_xlsx(options).write(filename)
+          return filename
+        end
+      end
+
+      def xlsx_sheet a
+        if xlsx_template.worksheets[a]
+          return xlsx_template.worksheets[a]
+        else
+          xlsx_template.create_worksheet
+          self.xls_sheet a
+        end
+      end
+
+      def xlsx_template
+        return template.raws[RubyXL::Workbook]
+      end
+
+      def init_xlsx_spreadsheet_template
+        if self.xlsx_template.is_a? RubyXL::Workbook
+          return self.xlsx_template
+        else
+          t = RubyXL::Workbook.new
+          template.add_raw t
+          return t
+        end
+      end
+    end
+  end
+end