write_xlsx 0.0.2 → 0.0.3

data/lib/write_xlsx/workbook.rb

@@ -15,13 +15,13 @@ module Writexlsx
 
     include Writexlsx::Utility
 
-    attr_accessor :str_total, :str_unique
     attr_writer :firstsheet
     attr_reader :palette
     attr_reader :font_count, :num_format_count, :border_count, :fill_count, :custom_colors
     attr_reader :worksheets, :sheetnames, :charts, :drawings, :num_comment_files, :named_ranges
-    attr_reader :str_array, :doc_properties
+    attr_reader :doc_properties
     attr_reader :image_types, :images
+    attr_reader :shared_strings
 
     #
     # A new Excel workbook is created using the new() constructor which accepts either a filename
@@ -101,10 +101,7 @@ module Writexlsx
       @images              = []
 
       # Structures for the shared strings data.
-      @str_total  = 0
-      @str_unique = 0
-      @str_table  = {}
-      @str_array  = []
+      @shared_strings = Package::SharedStrings.new
 
       add_format(default_formats.merge(:xf_index => 0))
       set_color_palette
@@ -209,7 +206,7 @@ module Writexlsx
     def assemble_xml_file  #:nodoc:
       return unless @writer
 
-      # Prepare format object for passing to Style.pm.
+      # Prepare format object for passing to Style.rb.
       prepare_format_properties
 
       write_xml_declaration
@@ -634,14 +631,15 @@ module Writexlsx
     # return the string index.
     #
     def shared_string_index(str) #:nodoc:
-      # Add the string to the shared string table.
-      unless @str_table[str]
-        @str_table[str] = @str_unique
-        @str_unique += 1
-      end
+      @shared_strings.index(str)
+    end
+
+    def str_unique
+      @shared_strings.unique_count
+    end
 
-      @str_total += 1
-      @str_table[str]
+    def shared_strings_empty?
+      @shared_strings.empty?
     end
 
     def xf_formats     # :nodoc:
@@ -755,7 +753,7 @@ module Writexlsx
       end
 
       # Check that sheet name is <= 31. Excel limit.
-      raise "Sheetname #{name} must be <= 31 chars" if name.bytesize > 31
+      raise "Sheetname #{name} must be <= #{SHEETNAME_MAX} chars" if name.length > SHEETNAME_MAX
 
       # Check that sheetname doesn't contain any invalid characters
       if name =~ invalid_char
@@ -869,7 +867,7 @@ module Writexlsx
       str = @writer.start_tag('sheets')
       id_num = 1
       @worksheets.each do |sheet|
-        str << write_sheet(sheet.name, id_num, sheet.hidden)
+        str << write_sheet(sheet.name, id_num, sheet.hidden?)
         id_num += 1
       end
       str << @writer.end_tag('sheets')
@@ -962,9 +960,6 @@ module Writexlsx
       # Set the active sheet.
       @worksheets.each { |sheet| sheet.activate if sheet.index == @activesheet }
 
-      # Convert the SST strings data structure.
-      prepare_sst_string_data
-
       # Prepare the worksheet cell comments.
       prepare_comments
 
@@ -992,20 +987,7 @@ module Writexlsx
     end
 
     #
-    # Convert the SST string data from a hash to an array.
-    #
-    def prepare_sst_string_data #:nodoc:
-      strings = []
-
-      @str_table.each_key { |key| strings[@str_table[key]] = key }
-
-      # The SST data could be very large, free some memory (maybe).
-      @str_table = nil
-      @str_array = strings
-    end
-
-    #
-    # Prepare all of the format properties prior to passing them to Styles.pm.
+    # Prepare all of the format properties prior to passing them to Styles.rb.
     #
     def prepare_format_properties #:nodoc:
       # Separate format objects into XF and DXF formats.
@@ -1271,11 +1253,13 @@ module Writexlsx
         next unless sheet.has_comments?
 
         comment_id += 1
-        count = sheet.prepare_comments( vml_data_id, vml_shape_id, comment_id)
+        sheet.set_external_comment_links(comment_id)
+        sheet.set_vml_data_id(vml_data_id)
+        sheet.vml_shape_id = vml_shape_id
 
         # Each VML file should start with a shape id incremented by 1024.
-        vml_data_id  +=    1 * ( ( 1024 + count ) / 1024.0 ).to_i
-        vml_shape_id += 1024 * ( ( 1024 + count ) / 1024.0 ).to_i
+        vml_data_id  +=    1 * ( ( 1024 + sheet.comments_count ) / 1024.0 ).to_i
+        vml_shape_id += 1024 * ( ( 1024 + sheet.comments_count ) / 1024.0 ).to_i
       end
 
       @num_comment_files = comment_id
@@ -1343,7 +1327,7 @@ module Writexlsx
           # Convert shared string indexes to strings.
           data.collect! do |token|
             if token.kind_of?(Hash)
-              token = @str_array[token[:sst_id]]
+              token = @shared_strings.string(token[:sst_id])
 
               # Ignore rich strings for now. Deparse later if necessary.
               token = '' if token =~ %r!^<r>! && token =~ %r!</r>$!