write_xlsx 0.64.1 → 0.65.0

data/lib/write_xlsx/chartsheet.rb

@@ -24,7 +24,7 @@ module Writexlsx
       @chart             = nil
       @charts            = [1]
       @zoom_scale_normal = 0
-      @print_style.orientation = false
+      @page_setup.orientation = false
     end
 
     #
@@ -134,6 +134,26 @@ module Writexlsx
       @chart.show_hidden_data(*args)
     end
 
+    def set_size(*args)
+      @chart.set_size(*args)
+    end
+
+    def set_table(*args)
+      @chart.set_table(*args)
+    end
+
+    def set_up_down_bars(*args)
+      @chart.set_up_down_bars(*args)
+    end
+
+    def set_drop_lines(*args)
+      @chart.set_drop_lines(*args)
+    end
+
+    def set_high_low_lines(*args)
+      @chart.set_high_low_lines(*args)
+    end
+
     #
     # Set up chart/drawings.
     #
@@ -142,13 +162,17 @@ module Writexlsx
 
       drawing = Drawing.new
       @drawing = drawing
-      @drawing.orientation = @print_style.orientation
+      @drawing.orientation = @page_setup.orientation
 
       @external_drawing_links << [ '/drawing', "../drawings/drawing#{drawing_id}.xml" ]
 
       @drawing_links << [ '/chart', "../charts/chart#{chart_id}.xml"]
     end
 
+    def external_links
+      [@external_drawing_links]
+    end
+
     private
 
     #

data/lib/write_xlsx/format.rb

@@ -174,9 +174,8 @@ module Writexlsx
     attr_accessor :dxf_bg_color, :dxf_fg_color   # :nodoc:
     attr_reader :rotation, :bold, :italic, :font_strikeout
 
-    def initialize(xf_format_indices = {}, dxf_format_indices = {}, params = {})   # :nodoc:
-      @xf_format_indices = xf_format_indices
-      @dxf_format_indices = dxf_format_indices
+    def initialize(formats, params = {})   # :nodoc:
+      @formats = formats
 
       @xf_index       = nil
       @dxf_index      = nil
@@ -250,7 +249,6 @@ module Writexlsx
       reserve = [
                  :xf_index,
                  :dxf_index,
-                 :xf_format_indices,
                  :xdf_format_indices,
                  :palette
                 ]
@@ -446,18 +444,10 @@ module Writexlsx
     def get_xf_index
       if @xf_index
         @xf_index
+      elsif @formats.xf_index_by_key(get_format_key)
+        @formats.xf_index_by_key(get_format_key)
       else
-        key = get_format_key
-        indices_href = @xf_format_indices
-
-        if indices_href[key]
-          indices_href[key]
-        else
-          index = 1 + indices_href.keys.size
-          indices_href[key] = index
-          @xf_index = index
-          index
-        end
+        @xf_index = @formats.set_xf_index_by_key(get_format_key)
       end
     end
 
@@ -466,19 +456,11 @@ module Writexlsx
     #
     def get_dxf_index
       if @dxf_index
-          @dxf_index
+        @dxf_index
+      elsif @formats.dxf_index_by_key(get_format_key)
+        @formats.dxf_index_by_key(get_format_key)
       else
-        key  = get_format_key
-        indices = @dxf_format_indices
-
-        if indices[key]
-          indices[key]
-        else
-          index = indices.size
-          indices[key] = index
-          @dxf_index = index
-          index
-        end
+        @dxf_index = @formats.set_dxf_index_by_key(get_format_key)
       end
     end
 
@@ -752,5 +734,46 @@ module Writexlsx
     def [](attr)
       self.instance_variable_get("@#{attr}")
     end
+
+    def write_font(writer, worksheet) #:nodoc:
+      writer.tag_elements('rPr') do
+        writer.empty_tag('b')       if bold?
+        writer.empty_tag('i')       if italic?
+        writer.empty_tag('strike')  if strikeout?
+        writer.empty_tag('outline') if outline?
+        writer.empty_tag('shadow')  if shadow?
+
+        # Handle the underline variants.
+        write_underline(writer, underline) if underline?
+
+        write_vert_align(writer, 'superscript') if font_script == 1
+        write_vert_align(writer, 'subscript')   if font_script == 2
+
+        writer.empty_tag('sz', ['val', size])
+
+        if ptrue?(theme)
+          write_color(writer, 'theme', theme)
+        elsif ptrue?(@color)
+          color = worksheet.get_palette_color(@color)
+          write_color(writer, 'rgb', color)
+        else
+          write_color(writer, 'theme', 1)
+        end
+
+        writer.empty_tag('rFont',  ['val', font])
+        writer.empty_tag('family', ['val', font_family])
+
+        if font == 'Calibri' && hyperlink == 0
+          writer.empty_tag('scheme', ['val', font_scheme])
+        end
+      end
+    end
+
+    #
+    # Write the <vertAlign> font sub-element.
+    #
+    def write_vert_align(writer, val) #:nodoc:
+      writer.empty_tag('vertAlign', ['val', val])
+    end
   end
 end

data/lib/write_xlsx/formats.rb

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+require 'write_xlsx/package/xml_writer_simple'
+
+module Writexlsx
+  class Formats
+    include Writexlsx::Utility
+
+    attr_reader :formats, :xf_format_indices, :dxf_format_indices
+
+    def initialize
+      @formats = []
+      @xf_format_indices = {}
+      @dxf_format_indices = {}
+    end
+
+    def xf_index_by_key(key)
+      @xf_format_indices[key]
+    end
+
+    def set_xf_index_by_key(key)
+      @xf_format_indices[key] ||= 1 + @xf_format_indices.size
+    end
+
+    def dxf_index_by_key(key)
+      @dxf_format_indices[key]
+    end
+
+    def set_dxf_index_by_key(key)
+      @dxf_format_indices[key] ||= @dxf_format_indices.size
+    end
+  end
+end

data/lib/write_xlsx/package/packager.rb

@@ -18,43 +18,17 @@ module Writexlsx
 
       include Writexlsx::Utility
 
-      def initialize
-        @package_dir       = ''
-        @workbook         = nil
-        @sheet_names      = []
-        @worksheet_count  = 0
-        @chartsheet_count = 0
-        @chart_count      = 0
-        @drawing_count    = 0
-        @table_count      = 0
-        @named_ranges     = []
+      def initialize(workbook)
+        @workbook     = workbook
+        @package_dir  = ''
+        @table_count  = @workbook.worksheets.tables_count
+        @named_ranges = []
       end
 
       def set_package_dir(package_dir)
         @package_dir = package_dir
       end
 
-      #
-      # Add the Workbook object to the package.
-      #
-      def add_workbook(workbook)
-        @workbook          = workbook
-        @sheet_names       = workbook.sheetnames
-        @chart_count       = workbook.charts.size
-        @drawing_count     = workbook.drawings.size
-        @num_vml_files     = workbook.num_vml_files
-        @num_comment_files = workbook.num_comment_files
-        @named_ranges      = workbook.named_ranges
-
-        workbook.worksheets.each do |worksheet|
-          if worksheet.is_chartsheet?
-            @chartsheet_count += 1
-          else
-            @worksheet_count += 1
-          end
-        end
-      end
-
       #
       # Write the xml files that make up the XLXS OPC package.
       #
@@ -98,27 +72,12 @@ module Writexlsx
       # Write the worksheet files.
       #
       def write_worksheet_files
-        FileUtils.mkdir_p("#{@package_dir}/xl/worksheets")
-
-        index = 1
-        @workbook.worksheets.each do |worksheet|
-          next if worksheet.is_chartsheet?
-          worksheet.set_xml_writer("#{@package_dir}/xl/worksheets/sheet#{index}.xml")
-          index += 1
-          worksheet.assemble_xml_file
-        end
+        @workbook.worksheets.write_worksheet_files(@package_dir)
       end
 
       #
       def write_chartsheet_files
-        index = 1
-        @workbook.worksheets.each do |worksheet|
-          next unless worksheet.is_chartsheet?
-          FileUtils.mkdir_p("#{@package_dir}/xl/chartsheets")
-          worksheet.set_xml_writer("#{@package_dir}/xl/chartsheets/sheet#{index}.xml")
-          index += 1
-          worksheet.assemble_xml_file
-        end
+        @workbook.worksheets.write_chartsheet_files(@package_dir)
       end
 
       #
@@ -136,14 +95,11 @@ module Writexlsx
       end
 
       def write_chart_or_drawing_files(objects, filename)
-        return if objects.empty?
-
-        FileUtils.mkdir_p("#{@package_dir}/xl/#{filename}s")
+        dir = "#{@package_dir}/xl/#{filename}s"
 
-        index = 1
-        objects.each do |object|
-          object.set_xml_writer("#{@package_dir}/xl/#{filename}s/#{filename}#{index}.xml")
-          index += 1
+        objects.each_with_index do |object, index|
+          FileUtils.mkdir_p(dir)
+          object.set_xml_writer("#{dir}/#{filename}#{index+1}.xml")
           object.assemble_xml_file
         end
       end
@@ -152,33 +108,14 @@ module Writexlsx
       # Write the comment VML files.
       #
       def write_vml_files
-        index = 1
-        @workbook.worksheets.each do |worksheet|
-          next unless worksheet.has_vml?
-          FileUtils.mkdir_p("#{@package_dir}/xl/drawings")
-
-          vml = Package::Vml.new
-          vml.set_xml_writer("#{@package_dir}/xl/drawings/vmlDrawing#{index}.vml")
-          index += 1
-          vml.assemble_xml_file(worksheet)
-        end
+        @workbook.worksheets.write_vml_files(@package_dir)
       end
 
       #
       # Write the comment files.
       #
       def write_comment_files
-        index = 1
-        @workbook.worksheets.each do |worksheet|
-          next unless worksheet.has_comments?
-
-          FileUtils.mkdir_p("#{@package_dir}/xl/drawings")
-
-          worksheet.comments_xml_writer = "#{@package_dir}/xl/comments#{index}.xml"
-          index += 1
-
-          worksheet.comments_assemble_xml_file
-        end
+        @workbook.worksheets.write_comment_files(@package_dir)
       end
 
       #
@@ -206,31 +143,27 @@ module Writexlsx
         FileUtils.mkdir_p("#{@package_dir}/docProps")
 
         # Add the Worksheet heading pairs.
-        app.add_heading_pair(['Worksheets', @worksheet_count])
+        app.add_heading_pair(['Worksheets', @workbook.worksheets.reject {|s| s.is_chartsheet?}.count])
 
         # Add the Chartsheet heading pairs.
-        app.add_heading_pair(['Charts', @chartsheet_count])
+        app.add_heading_pair(['Charts', @workbook.chartsheet_count])
 
         # Add the Worksheet parts.
-        @workbook.worksheets.each do |worksheet|
-          next if worksheet.is_chartsheet?
-          app.add_part_name(worksheet.name)
-        end
+        @workbook.worksheets.reject { |sheet| sheet.is_chartsheet? }.
+          each { |sheet| app.add_part_name(sheet.name) }
 
         # Add the Chartsheet parts.
-        @workbook.worksheets.each do |worksheet|
-          next unless worksheet.is_chartsheet?
-          app.add_part_name(worksheet.name)
-        end
+        @workbook.worksheets.select { |sheet| sheet.is_chartsheet? }.
+          each { |sheet| app.add_part_name(sheet.name) }
 
         # Add the Named Range heading pairs.
-        range_count = @named_ranges.size
+        range_count = @workbook.named_ranges.size
         if range_count != 0
           app.add_heading_pair([ 'Named Ranges', range_count ])
         end
 
         # Add the Named Ranges parts.
-        @named_ranges.each { |named_range| app.add_part_name(named_range) }
+        @workbook.named_ranges.each { |named_range| app.add_part_name(named_range) }
 
         app.set_properties(properties)
 
@@ -258,27 +191,23 @@ module Writexlsx
         content = Package::ContentTypes.new
 
         content.add_image_types(@workbook.image_types)
-
-        worksheet_index  = 1
-        chartsheet_index = 1
-        @workbook.worksheets.each do |worksheet|
-          if worksheet.is_chartsheet?
-            content.add_chartsheet_name("sheet#{chartsheet_index}")
-            chartsheet_index += 1
-          else
-            content.add_worksheet_name("sheet#{worksheet_index}")
-            worksheet_index += 1
-          end
+        @workbook.worksheets.reject { |sheet| sheet.is_chartsheet? }.
+          each_with_index do |sheet, index|
+          content.add_worksheet_name("sheet#{index+1}")
+        end
+        @workbook.worksheets.select { |sheet| sheet.is_chartsheet? }.
+          each_with_index do |sheet, index|
+          content.add_chartsheet_name("sheet#{index+1}")
         end
 
-        (1 .. @chart_count).each { |i| content.add_chart_name("chart#{i}") }
-        (1 .. @drawing_count).each { |i| content.add_drawing_name("drawing#{i}") }
+        (1 .. @workbook.charts.size).each { |i| content.add_chart_name("chart#{i}") }
+        (1 .. @workbook.drawings.size).each { |i| content.add_drawing_name("drawing#{i}") }
 
-        content.add_vml_name if @num_vml_files > 0
+        content.add_vml_name if @workbook.num_vml_files > 0
 
         (1 .. @table_count).each { |i| content.add_table_name("table#{i}") }
 
-        (1 .. @num_comment_files).each { |i| content.add_comment_name("comments#{i}") }
+        (1 .. @workbook.num_comment_files).each { |i| content.add_comment_name("comments#{i}") }
 
         # Add the sharedString rel if there is string data in the workbook.
         content.add_shared_strings unless @workbook.shared_strings_empty?
@@ -294,32 +223,15 @@ module Writexlsx
       # Write the style xml file.
       #
       def write_styles_file
-        dir              = @package_dir
-        xf_formats       = @workbook.xf_formats
-        palette          = @workbook.palette
-        font_count       = @workbook.font_count
-        num_format_count = @workbook.num_format_count
-        border_count     = @workbook.border_count
-        fill_count       = @workbook.fill_count
-        custom_colors    = @workbook.custom_colors
-        dxf_formats      = @workbook.dxf_formats
+        dir              = "#{@package_dir}/xl"
 
         rels = Package::Styles.new
 
-        FileUtils.mkdir_p("#{@package_dir}/xl")
+        FileUtils.mkdir_p(dir)
 
-        rels.set_style_properties(
-            xf_formats,
-            palette,
-            font_count,
-            num_format_count,
-            border_count,
-            fill_count,
-            custom_colors,
-            dxf_formats
-        )
-
-        rels.set_xml_writer("#{@package_dir}/xl/styles.xml" )
+        rels.set_style_properties(*@workbook.style_properties)
+
+        rels.set_xml_writer("#{dir}/styles.xml" )
         rels.assemble_xml_file
       end
 
@@ -339,23 +251,7 @@ module Writexlsx
       # Write the table files.
       #
       def write_table_files
-        dir = @package_dir
-
-        index = 1
-        @workbook.worksheets.each do |worksheet|
-          table_props = worksheet.tables
-
-          next if table_props.empty?
-
-          FileUtils.mkdir_p("#{dir}/xl/tables")
-
-          table_props.each do |table|
-            table.set_xml_writer("#{dir}/xl/tables/table#{index}.xml")
-            table.assemble_xml_file
-            index += 1
-            @table_count += 1
-          end
-        end
+        @workbook.worksheets.write_table_files(@package_dir)
       end
 
       #
@@ -415,103 +311,21 @@ module Writexlsx
       # data such as hyperlinks or drawings.
       #
       def write_worksheet_rels_files
-        existing_rels_dir = false
-
-        index = 0
-        @workbook.worksheets.each do |worksheet|
-          next if worksheet.is_chartsheet?
-
-          index += 1
-
-          external_links = [
-            worksheet.external_hyper_links,
-            worksheet.external_drawing_links,
-            worksheet.external_vml_links,
-            worksheet.external_table_links,
-            worksheet.external_comment_links
-          ].select {|a| a != []}
-
-          next if external_links.size == 0
-
-          # Create the worksheet .rels dir if required.
-          if !existing_rels_dir
-            FileUtils.mkdir_p("#{@package_dir}/xl/worksheets")
-            FileUtils.mkdir_p("#{@package_dir}/xl/worksheets/_rels")
-            existing_rels_dir = true
-          end
-
-          rels = Package::Relationships.new
-
-          external_links.each do |link_datas|
-            link_datas.each do |link_data|
-              type, target, target_mode = link_data
-              rels.add_worksheet_relationship(type, target, target_mode)
-            end
-          end
-
-          # Create the .rels file such as /xl/worksheets/_rels/sheet1.xml.rels.
-          rels.set_xml_writer(
-            "#{@package_dir}/xl/worksheets/_rels/sheet#{index}.xml.rels")
-          rels.assemble_xml_file
-        end
+        @workbook.worksheets.write_worksheet_rels_files(@package_dir)
       end
 
       #
       # Write the chartsheet .rels files for links to drawing files.
       #
       def write_chartsheet_rels_files
-        existing_rels_dir = false
-        index = 0
-        @workbook.worksheets.each do |worksheet|
-          next unless worksheet.is_chartsheet?
-          index += 1
-
-          external_links = worksheet.external_drawing_links
-
-          next if external_links.empty?
-
-          # Create the chartsheet .rels dir if required.
-          if !existing_rels_dir
-            FileUtils.mkdir_p("#{@package_dir}/xl/chartsheets/_rels")
-            existing_rels_dir = true
-          end
-
-          rels = Package::Relationships.new
-
-          external_links.each do |link_data|
-            rels.add_worksheet_relationship(*link_data)
-          end
-
-          # Create the .rels file such as /xl/chartsheets/_rels/sheet1.xml.rels.
-          rels.set_xml_writer(
-              "#{@package_dir}/xl/chartsheets/_rels/sheet#{index}.xml.rels")
-          rels.assemble_xml_file
-        end
+        @workbook.worksheets.write_chartsheet_rels_files(@package_dir)
       end
 
       #
       # Write the drawing .rels files for worksheets that contain charts or drawings.
       #
       def write_drawing_rels_files
-        index = 0
-        @workbook.worksheets.each do |worksheet|
-          next if worksheet.drawing_links.empty?
-          index += 1
-
-          # Create the drawing .rels dir if required.
-          FileUtils.mkdir_p("#{@package_dir}/xl/drawings/_rels")
-
-          rels = Package::Relationships.new
-
-          worksheet.drawing_links.each do |drawing_data|
-            rels.add_document_relationship(*drawing_data)
-          end
-
-          # Create the .rels file such as /xl/drawings/_rels/sheet1.xml.rels.
-          rels.set_xml_writer(
-                              "#{@package_dir}/xl/drawings/_rels/drawing#{index}.xml.rels")
-          rels.assemble_xml_file
-        end
+        @workbook.worksheets.write_drawing_rels_files(@package_dir)
       end
 
 
@@ -519,18 +333,11 @@ module Writexlsx
       # Write the /xl/media/image?.xml files.
       #
       def add_image_files
-        return if @workbook.images.empty?
-
-        index    = 1
-
-        FileUtils.mkdir_p("#{@package_dir}/xl/media")
-
-        @workbook.images.each do |image|
-          filename  = image[0]
-          extension = ".#{image[1]}"
+        dir = "#{@package_dir}/xl/media"
 
-          FileUtils.cp(filename, "#{@package_dir}/xl/media/image#{index}#{extension}")
-          index += 1
+        @workbook.images.each_with_index do |image, index|
+          FileUtils.mkdir_p(dir)
+          FileUtils.cp(image[0], "#{dir}/image#{index+1}.#{image[1]}")
         end
       end
 

data/lib/write_xlsx/package/table.rb

@@ -24,7 +24,7 @@ module Writexlsx
         end
       end
 
-      attr_reader :id
+#      attr_reader :id
 
       def initialize(worksheet, id, *args)
         @worksheet = worksheet
@@ -61,16 +61,11 @@ module Writexlsx
       def assemble_xml_file
         write_xml_declaration
         # Write the table element.
-        write_table
-        # Write the autoFilter element.
-        write_auto_filter
-        # Write the tableColumns element.
-        write_table_columns
-        # Write the tableStyleInfo element.
-        write_table_style_info
-
-        # Close the table tag
-        @writer.end_tag('table')
+        @writer.tag_elements('table', write_table_attributes) do
+          write_auto_filter
+          write_table_columns
+          write_table_style_info
+        end
 
         # Close the XML writer object and filehandle.
         @writer.crlf
@@ -290,7 +285,7 @@ module Writexlsx
           @name = @param[:name]
         else
           # Set a default name.
-          @name = "Table#{id}"
+          @name = "Table#{@id}"
         end
       end
 
@@ -310,16 +305,13 @@ module Writexlsx
         @writer.xml_decl('UTF-8', 1)
       end
 
-      #
-      # Write the <table> element.
-      #
-      def write_table
+      def write_table_attributes
         schema           = 'http://schemas.openxmlformats.org/'
         xmlns            = "#{schema}spreadsheetml/2006/main"
 
         attributes = [
                       'xmlns',       xmlns,
-                      'id',          id,
+                      'id',          @id,
                       'name',        @name,
                       'displayName', @name,
                       'ref',         @range
@@ -334,7 +326,6 @@ module Writexlsx
         else
           attributes << 'totalsRowShown' << 0
         end
-        @writer.start_tag('table', attributes)
       end
 
       #