axlsx 1.0.17 → 1.1.0

data/lib/axlsx/version.rb

@@ -5,6 +5,6 @@ module Axlsx
   # When using bunle exec rake and referencing the gem on github or locally
   # it will use the gemspec, which preloads this constant for the gem's version.
   # We check to make sure that it has not already been loaded
-  VERSION="1.0.17" unless Axlsx.const_defined? :VERSION
+  VERSION="1.1.0" unless defined? Axlsx::VERSION
 
 end

data/lib/axlsx/workbook/shared_strings_table.rb

@@ -3,7 +3,7 @@ module Axlsx
 
   # The Shared String Table class is responsible for managing and serializing common strings in a workbook.
   # While the ECMA-376 spec allows for both inline and shared strings it seems that at least some applications like iWorks Numbers
-  # and Google Docs require that the shared string table is populated in order to interoperate properly. 
+  # and Google Docs require that the shared string table is populated in order to interoperate properly.
   # As a developer, you should never need to directly work against this class. Simply set 'use_shared_strings'
   # on the package or workbook to generate a package that uses the shared strings table instead of inline strings.
   # @note Serialization performance is affected by using this serialization method so if you do not need interoperability
@@ -15,57 +15,55 @@ module Axlsx
     # @return [Integer]
     attr_reader :count
 
-    # The total number of unique strings in the workbook. 
+    # The total number of unique strings in the workbook.
     # @return [Integer]
     def unique_count
       @unique_cells.size
     end
 
     # An array of unique cells. Multiple attributes of the cell are used in comparison
-    # each of these unique cells is parsed into the shared string table.     
+    # each of these unique cells is parsed into the shared string table.
     # @see Cell#sharable
     attr_reader :unique_cells
 
     # Creates a new Shared Strings Table agains an array of cells
     # @param [Array] cells This is an array of all of the cells in the workbook
     def initialize(cells)
-      cells = cells.flatten.reject { |c| c.type != :string || c.value.start_with?('=') }
+      cells = cells.flatten.reject { |c| c.type != :string || c.value.nil? || c.value.start_with?('=') }
       @count = cells.size
       @unique_cells = []
+      @shared_xml_string = ""
       resolve(cells)
     end
 
-
-    # Generate the xml document for the Shared Strings Table
+    # Serializes the object
+    # @param [String] str
     # @return [String]
-    def to_xml
-      builder = Nokogiri::XML::Builder.new(:encoding => ENCODING) do |xml|
-        xml.sst(:xmlns => Axlsx::XML_NS, :count => count, :uniqueCount => unique_count) {
-          @unique_cells.each do |cell|
-            xml.si { cell.run_xml(xml) }
-          end
-        }
-      end
-      builder.to_xml(:save_with => 0)
+    def to_xml_string
+      '<?xml version="1.0" encoding="UTF-8"?><sst xmlns="' << XML_NS << '" count="' << @count.to_s << '" uniqueCount="' << unique_count.to_s << '">' << @shared_xml_string << '</sst>'
     end
 
     private
-    
-    # Interate over all of the cells in the array. 
-    # if our unique cells array does not contain a sharable cell, 
+
+    # Interate over all of the cells in the array.
+    # if our unique cells array does not contain a sharable cell,
     # add the cell to our unique cells array and set the ssti attribute on the index of this cell in the shared strings table
     # if a sharable cell already exists in our unique_cells array, set the ssti attribute of the cell and move on.
     # @return [Array] unique cells
     def resolve(cells)
       cells.each do |cell|
-        index = @unique_cells.index { |item| item.shareable(cell) }
+        cell_hash = cell.shareable_hash
+        index = @unique_cells.index do |item|
+          item == cell_hash
+        end
         if index == nil
           cell.send :ssti=, @unique_cells.size
-          @unique_cells << cell
+          @shared_xml_string << '<si>' << cell.run_xml_string << '</si>'
+          @unique_cells << cell_hash
         else
           cell.send :ssti=, index
         end
       end
-    end    
+    end
   end
 end

data/lib/axlsx/workbook/workbook.rb

@@ -1,14 +1,18 @@
 # -*- coding: utf-8 -*-
-module Axlsx 
+module Axlsx
 
+require 'axlsx/workbook/worksheet/date_time_converter.rb'
 require 'axlsx/workbook/worksheet/cell.rb'
+require 'axlsx/workbook/worksheet/page_margins.rb'
 require 'axlsx/workbook/worksheet/row.rb'
+require 'axlsx/workbook/worksheet/col.rb'
 require 'axlsx/workbook/worksheet/worksheet.rb'
 require 'axlsx/workbook/shared_strings_table.rb'
+require 'axlsx/workbook/worksheet/table.rb'
 
   # The Workbook class is an xlsx workbook that manages worksheets, charts, drawings and styles.
   # The following parts of the Office Open XML spreadsheet specification are not implimented in this version.
-  # 
+  #
   #   bookViews
   #   calcPr
   #   customWorkbookViews
@@ -38,13 +42,13 @@ require 'axlsx/workbook/shared_strings_table.rb'
     attr_reader :use_shared_strings
 
     # @see use_shared_strings
-    def use_shared_strings=(v) 
+    def use_shared_strings=(v)
       Axlsx::validate_boolean(v)
       @use_shared_strings = v
     end
 
 
-    # A collection of worksheets associated with this workbook. 
+   # A collection of worksheets associated with this workbook.
     # @note The recommended way to manage worksheets is add_worksheet
     # @see Workbook#add_worksheet
     # @see Worksheet
@@ -72,6 +76,14 @@ require 'axlsx/workbook/shared_strings_table.rb'
     # @return [SimpleTypedList]
     attr_reader :drawings
 
+    # A colllection of tables associated with this workbook
+    # @note The recommended way to manage drawings is Worksheet#add_table
+    # @see Worksheet#add_table
+    # @see Table
+    # @return [SimpleTypedList]
+    attr_reader :tables
+
+
     # The styles associated with this workbook
     # @note The recommended way to manage styles is Styles#add_style
     # @see Style#add_style
@@ -86,39 +98,35 @@ require 'axlsx/workbook/shared_strings_table.rb'
     # Indicates if the epoc date for serialization should be 1904. If false, 1900 is used.
     @@date1904 = false
 
-    # lets come back to this later when we are ready for parsing. 
+
+    # lets come back to this later when we are ready for parsing.
     #def self.parse entry
     #  io = entry.get_input_stream
     #  w = self.new
     #  w.parser_xml = Nokogiri::XML(io.read)
-    #  w.parse_string :date1904, "//xmlns:workbookPr/@date1904"      
+    #  w.parse_string :date1904, "//xmlns:workbookPr/@date1904"
     #  w
     #end
 
     # Creates a new Workbook
     # The recomended way to work with workbooks is via Package#workbook
-    # @option options [Boolean] date1904. If this is not specified, we try to determine if the platform is bsd/darwin and set date1904 to true automatically.    
+    # @option options [Boolean] date1904. If this is not specified, date1904 is set to false. Office 2011 for Mac defaults to false.
     def initialize(options={})
       @styles = Styles.new
       @worksheets = SimpleTypedList.new Worksheet
       @drawings = SimpleTypedList.new Drawing
       @charts = SimpleTypedList.new Chart
       @images = SimpleTypedList.new Pic
-      self.date1904= options[:date1904].nil? ? is_bsd? : options[:date1904]
-      yield self if block_given?      
-    end
+      @tables = SimpleTypedList.new Table
+      @use_autowidth = true
 
-    # Uses RUBY_PLATFORM constant to determine if the OS is freebsd or darwin
-    # based on this value we attempt to set date1904.
-    # @return [Boolean]
-    def is_bsd?
-      platform = RUBY_PLATFORM.downcase
-      platform.include?('freebsd') || platform.include?('darwin')
+      self.date1904= !options[:date1904].nil? && options[:date1904]
+      yield self if block_given?
     end
 
     # Instance level access to the class variable 1904
     # @return [Boolean]
-    def date1904() @@date1904; end    
+    def date1904() @@date1904; end
 
     # see @date1904
     def date1904=(v) Axlsx::validate_boolean v; @@date1904 = v; end
@@ -131,9 +139,18 @@ require 'axlsx/workbook/shared_strings_table.rb'
     # @return [Boolean]
     def self.date1904() @@date1904; end
 
+    # Indicates if the workbook should use autowidths or not.
+    # this must be set before instantiating a worksheet to avoid Rmagix inclusion
+    # @return [Boolean]
+    def use_autowidth() @use_autowidth; end
+
+    # see @use_autowidth
+    def use_autowidth=(v) Axlsx::validate_boolean v; @use_autowidth = v; end
+
     # Adds a worksheet to this workbook
     # @return [Worksheet]
     # @option options [String] name The name of the worksheet.
+    # @option options [Hash] page_margins The page margins for the worksheet.
     # @see Worksheet#initialize
     def add_worksheet(options={})
       worksheet = Worksheet.new(self, options)
@@ -147,7 +164,7 @@ require 'axlsx/workbook/shared_strings_table.rb'
       r = Relationships.new
       @worksheets.each do |sheet|
         r << Relationship.new(WORKSHEET_R, WORKSHEET_PN % (r.size+1))
-      end 
+      end
       r << Relationship.new(STYLES_R,  STYLES_PN)
       if use_shared_strings
           r << Relationship.new(SHARED_STRINGS_R,  SHARED_STRINGS_PN)
@@ -162,32 +179,39 @@ require 'axlsx/workbook/shared_strings_table.rb'
     end
 
     # returns a range of cells in a worksheet
-    # @param [String] cell_def The excel style reference defining the worksheet and cells. The range must specify the sheet to 
+    # @param [String] cell_def The excel style reference defining the worksheet and cells. The range must specify the sheet to
     # retrieve the cells from. e.g. range('Sheet1!A1:B2') will return an array of four cells [A1, A2, B1, B2] while range('Sheet1!A1') will return a single Cell.
     # @return [Cell, Array]
     def [](cell_def)
       sheet_name = cell_def.split('!')[0] if cell_def.match('!')
       worksheet =  self.worksheets.select { |s| s.name == sheet_name }.first
-      raise ArgumentError, 'Unknown Sheet' unless sheet_name && worksheet.is_a?(Worksheet) 
+      raise ArgumentError, 'Unknown Sheet' unless sheet_name && worksheet.is_a?(Worksheet)
       worksheet[cell_def.gsub(/.+!/,"")]
     end
 
-    # Serializes the workbook document
+    # Serialize the workbook
+    # @param [String] str
     # @return [String]
-    def to_xml()
+    def to_xml_string(str='')
       add_worksheet unless worksheets.size > 0
-      builder = Nokogiri::XML::Builder.new(:encoding => ENCODING) do |xml|        
-        xml.workbook(:xmlns => XML_NS, :'xmlns:r' => XML_NS_R) {
-          xml.workbookPr(:date1904=>@@date1904)
-          #<x:workbookProtection workbookPassword="xsd:hexBinary data" lockStructure="1" lockWindows="1" />
-          xml.sheets {
-            @worksheets.each_with_index do |sheet, index|              
-              xml.sheet(:name=>sheet.name, :sheetId=>index+1, :"r:id"=>sheet.rId)
-            end
-          }
-        }
-      end      
-      builder.to_xml(:save_with => 0)
+      str << '<?xml version="1.0" encoding="UTF-8"?>'
+      str << '<workbook xmlns="' << XML_NS << '" xmlns:r="' << XML_NS_R << '">'
+      str << '<workbookPr date1904="' << @@date1904.to_s << '"/>'
+      str << '<sheets>'
+      @worksheets.each_with_index do |sheet, index|
+         str << '<sheet name="' << sheet.name << '" sheetId="' << (index+1).to_s << '" r:id="' << sheet.rId << '"/>'
+      end
+      str << '</sheets>'
+      str << '<definedNames>'
+      @worksheets.each_with_index do |sheet, index|
+        if sheet.auto_filter
+          str << '<definedName name="_xlnm._FilterDatabase" localSheetId="' << index.to_s << '" hidden="1">'
+          str << sheet.abs_auto_filter << '</definedName>'
+        end
+      end
+      str << '</definedNames>'
+      str << '</workbook>'
     end
+
   end
 end