caxlsx 3.1.1 → 3.3.0

data/lib/axlsx/workbook/worksheet/worksheet.rb

@@ -1,4 +1,7 @@
 # encoding: UTF-8
+
+require_relative "border_creator"
+
 module Axlsx
 
   # The Worksheet class represents a worksheet in the workbook.
@@ -168,7 +171,7 @@ module Axlsx
     # @return Boolean
     # @see #page_setup
     def fit_to_page?
-      return false unless self.instance_values.keys.include?('page_setup')
+      return false unless Axlsx.instance_values_for(self).keys.include?('page_setup')
       page_setup.fit_to_page?
     end
 
@@ -303,7 +306,8 @@ module Axlsx
     end
 
     # The name of the worksheet
-    # The name of a worksheet must be unique in the workbook, and must not exceed 31 characters
+    # The name of a worksheet must be unique in the workbook, and must not exceed the number
+    # of characters defined in Axlsx::WORKSHEET_MAX_NAME_LENGTH
     # @param [String] name
     def name=(name)
       validate_sheet_name name
@@ -559,6 +563,41 @@ module Axlsx
       cells.each { |cell| cell.style = style }
     end
 
+    # Set the style for cells in a specific column
+    # @param [String|Array] cell references
+    # @param [Hash] styles
+    def add_style(cell_refs, *styles)
+      if !cell_refs.is_a?(Array)
+        cell_refs = [cell_refs]
+      end
+
+      cell_refs.each do |cell_ref|
+        item = self[cell_ref]
+
+        cells = item.is_a?(Array) ? item : [item]
+
+        cells.each do |cell|
+          styles.each do |style|
+            cell.add_style(style)
+          end
+        end
+      end
+    end
+
+    # Set the style for cells in a specific column
+    # @param [String|Array] cell references
+    # @param [Hash|Array|Symbol] border options
+    def add_border(cell_refs, options = Axlsx::Border::EDGES)
+      if !cell_refs.is_a?(Array)
+        cell_refs = [cell_refs]
+      end
+
+      cell_refs.each do |cell_ref|
+        cells = self[cell_ref]
+        Axlsx::BorderCreator.new(self, cells, options).draw
+      end
+    end
+
     # Returns a sheet node serialization for this sheet in the workbook.
     def to_sheet_node_xml_string(str='')
       add_autofilter_defined_name_to_workbook
@@ -599,10 +638,20 @@ module Axlsx
     # @return [Cell, Array]
     def [](cell_def)
       return rows[cell_def] if cell_def.is_a?(Integer)
+
       parts = cell_def.split(':').map{ |part| name_to_cell part }
+
       if parts.size == 1
         parts.first
       else
+        if parts.size > 2
+          raise ArgumentError, (ERR_CELL_REFERENCE_INVALID % cell_def)
+        elsif parts.first.nil?
+          raise ArgumentError, (ERR_CELL_REFERENCE_MISSING_CELL % [cell_def.split(":").first, cell_def])
+        elsif parts.last.nil?
+          raise ArgumentError, (ERR_CELL_REFERENCE_MISSING_CELL % [cell_def.split(":").last, cell_def])
+        end
+
         range(*parts)
       end
     end
@@ -612,11 +661,16 @@ module Axlsx
     # @return [Cell]
     def name_to_cell(name)
       col_index, row_index = *Axlsx::name_to_indices(name)
+
       r = rows[row_index]
-      r[col_index] if r
+
+      if r
+        return r[col_index]
+      end
     end
 
-    # shortcut method to access styles direclty from the worksheet
+    # Shortcut method to access workbook styles
+    #
     # This lets us do stuff like:
     # @example
     #     p = Axlsx::Package.new
@@ -625,6 +679,9 @@ module Axlsx
     #       sheet.add_row ['Oh No!'], :styles => my_style
     #     end
     #     p.serialize 'foo.xlsx'
+    #
+    # @note The XLSX format does not support worksheet-specific styles. Even when using this method
+    #     you're still working with the single global {Axlsx::Styles} object in the workbook.
     def styles
       @styles ||= self.workbook.styles
     end
@@ -668,9 +725,10 @@ module Axlsx
     def validate_sheet_name(name)
       DataTypeValidator.validate :worksheet_name, String, name
       # ignore first character (BOM) after encoding to utf16 because Excel does so, too.
+      raise ArgumentError, (ERR_SHEET_NAME_EMPTY) if name.empty?
       character_length = name.encode("utf-16")[1..-1].encode("utf-16").bytesize / 2
-      raise ArgumentError, (ERR_SHEET_NAME_TOO_LONG % name) if character_length > 31
-      raise ArgumentError, (ERR_SHEET_NAME_CHARACTER_FORBIDDEN % name) if '[]*/\?:'.chars.any? { |char| name.include? char }
+      raise ArgumentError, (ERR_SHEET_NAME_TOO_LONG % name) if character_length > WORKSHEET_MAX_NAME_LENGTH
+      raise ArgumentError, (ERR_SHEET_NAME_CHARACTER_FORBIDDEN % name) if WORKSHEET_NAME_FORBIDDEN_CHARS.any? { |char| name.include? char }
       name = Axlsx::coder.encode(name)
       sheet_names = @workbook.worksheets.reject { |s| s == self }.map { |s| s.name }
       raise ArgumentError, (ERR_DUPLICATE_SHEET_NAME % name) if sheet_names.include?(name)
@@ -688,11 +746,13 @@ module Axlsx
     def range(*cell_def)
       first, last = cell_def
       cells = []
+
       rows[(first.row.row_index..last.row.row_index)].each do |r|
         r[(first.index..last.index)].each do |c|
           cells << c
         end
       end
+
       cells
     end
 
@@ -746,11 +806,12 @@ module Axlsx
 
     def workbook=(v) DataTypeValidator.validate "Worksheet.workbook", Workbook, v; @workbook = v; end
 
-    def update_column_info(cells, widths=nil)
+    def update_column_info(cells, widths = nil)
       cells.each_with_index do |cell, index|
         width = widths ? widths[index] : nil
         col = find_or_create_column_info(index)
         next if width == :ignore
+
         col.update_width(cell, width, workbook.use_autowidth)
       end
     end

data/lib/axlsx.rb

@@ -28,16 +28,15 @@ require 'zip'
 
 #core dependencies
 require 'bigdecimal'
+require 'set'
 require 'time'
 
-#if object does not have this already, I am borrowing it from active_support.
-# I am a very big fan of activesupports instance_values method, but do not want to require nor include the entire
-# library just for this one method.
-if !Object.respond_to?(:instance_values)
-  Object.send :public  # patch for 1.8.7 as it uses private scope
-  Object.send :define_method, :instance_values do
-    Hash[instance_variables.map { |name| [name.to_s[1..-1], instance_variable_get(name)] }]
+begin
+  if Gem.loaded_specs.has_key?("axlsx_styler")
+    raise StandardError.new("Please remove `axlsx_styler` from your Gemfile, the associated functionality is now built-in to `caxlsx` directly.")
   end
+rescue
+  # Do nothing
 end
 
 # xlsx generation with charts, images, automated column width, customizable styles
@@ -47,6 +46,13 @@ end
 # Best of all, you can validate your xlsx file before serialization so you know
 # for sure that anything generated is going to load on your client's machine.
 module Axlsx
+  # I am a very big fan of activesupports instance_values method, but do not want to require nor include the entire
+  # library just for this one method.
+  #
+  # Defining as a class method on Axlsx to refrain from monkeypatching Object for all users of this gem.
+  def self.instance_values_for(object)
+    Hash[object.instance_variables.map { |name| [name.to_s[1..-1], object.instance_variable_get(name)] }]
+  end
 
   # determines the cell range for the items provided
   def self.cell_range(cells, absolute=true)
@@ -79,11 +85,25 @@ module Axlsx
   # returns the x, y position of a cell
   def self.name_to_indices(name)
     raise ArgumentError, 'invalid cell name' unless name.size > 1
+
+    letters_str = name[/[A-Z]+/]
+
     # capitalization?!?
-    v = name[/[A-Z]+/].reverse.chars.reduce({:base=>1, :i=>0}) do  |val, c|
-      val[:i] += ((c.bytes.first - 64) * val[:base]); val[:base] *= 26; val
+    v = letters_str.reverse.chars.reduce({:base=>1, :i=>0}) do  |val, c|
+      val[:i] += ((c.bytes.first - 64) * val[:base])
+
+      val[:base] *= 26
+
+      next val
     end
-    [v[:i]-1, ((name[/[1-9][0-9]*/]).to_i)-1]
+
+    col_index = (v[:i] - 1)
+
+    numbers_str = name[/[1-9][0-9]*/]
+
+    row_index = (numbers_str.to_i - 1)
+
+    return [col_index, row_index]
   end
 
   # converts the column index into alphabetical values.
@@ -155,6 +175,19 @@ module Axlsx
     end
   end
 
+  # utility method for performing a deep merge on a Hash
+  # @param [Hash] Hash to merge into
+  # @param [Hash] Hash to be added
+  def self.hash_deep_merge(first_hash, second_hash)
+    first_hash.merge(second_hash) do |key, this_val, other_val|
+      if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+        Axlsx.hash_deep_merge(this_val, other_val)
+      else
+        other_val
+      end
+    end
+  end
+
   # Instructs the serializer to not try to escape cell value input.
   # This will give you a huge speed bonus, but if you content has <, > or other xml character data
   # the workbook will be invalid and excel will complain.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caxlsx
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Randy Morgan
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -119,14 +119,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
 description: "    xlsx spreadsheet generation with charts, images, automated column
   width, customizable styles and full schema validation. Axlsx helps you create beautiful
   Office Open XML Spreadsheet documents ( Excel, Google Spreadsheets, Numbers, LibreOffice)
@@ -236,6 +236,7 @@ files:
 - lib/axlsx/workbook/worksheet/auto_filter/auto_filter.rb
 - lib/axlsx/workbook/worksheet/auto_filter/filter_column.rb
 - lib/axlsx/workbook/worksheet/auto_filter/filters.rb
+- lib/axlsx/workbook/worksheet/border_creator.rb
 - lib/axlsx/workbook/worksheet/break.rb
 - lib/axlsx/workbook/worksheet/cell.rb
 - lib/axlsx/workbook/worksheet/cell_serializer.rb
@@ -324,130 +325,6 @@ files:
 - lib/schema/vml-wordprocessingDrawing.xsd
 - lib/schema/wml.xsd
 - lib/schema/xml.xsd
-- test/benchmark.rb
-- test/content_type/tc_content_type.rb
-- test/content_type/tc_default.rb
-- test/content_type/tc_override.rb
-- test/doc_props/tc_app.rb
-- test/doc_props/tc_core.rb
-- test/drawing/tc_area_chart.rb
-- test/drawing/tc_area_series.rb
-- test/drawing/tc_axes.rb
-- test/drawing/tc_axis.rb
-- test/drawing/tc_bar_3D_chart.rb
-- test/drawing/tc_bar_chart.rb
-- test/drawing/tc_bar_series.rb
-- test/drawing/tc_bubble_chart.rb
-- test/drawing/tc_bubble_series.rb
-- test/drawing/tc_cat_axis.rb
-- test/drawing/tc_cat_axis_data.rb
-- test/drawing/tc_chart.rb
-- test/drawing/tc_d_lbls.rb
-- test/drawing/tc_data_source.rb
-- test/drawing/tc_drawing.rb
-- test/drawing/tc_graphic_frame.rb
-- test/drawing/tc_hyperlink.rb
-- test/drawing/tc_line_3d_chart.rb
-- test/drawing/tc_line_chart.rb
-- test/drawing/tc_line_series.rb
-- test/drawing/tc_marker.rb
-- test/drawing/tc_named_axis_data.rb
-- test/drawing/tc_num_data.rb
-- test/drawing/tc_num_val.rb
-- test/drawing/tc_one_cell_anchor.rb
-- test/drawing/tc_pic.rb
-- test/drawing/tc_picture_locking.rb
-- test/drawing/tc_pie_3D_chart.rb
-- test/drawing/tc_pie_series.rb
-- test/drawing/tc_scaling.rb
-- test/drawing/tc_scatter_chart.rb
-- test/drawing/tc_scatter_series.rb
-- test/drawing/tc_ser_axis.rb
-- test/drawing/tc_series.rb
-- test/drawing/tc_series_title.rb
-- test/drawing/tc_str_data.rb
-- test/drawing/tc_str_val.rb
-- test/drawing/tc_title.rb
-- test/drawing/tc_two_cell_anchor.rb
-- test/drawing/tc_val_axis.rb
-- test/drawing/tc_view_3D.rb
-- test/drawing/tc_vml_drawing.rb
-- test/drawing/tc_vml_shape.rb
-- test/fixtures/image1.gif
-- test/fixtures/image1.jpeg
-- test/fixtures/image1.jpg
-- test/fixtures/image1.png
-- test/fixtures/image1_fake.jpg
-- test/profile.rb
-- test/rels/tc_relationship.rb
-- test/rels/tc_relationships.rb
-- test/stylesheet/tc_border.rb
-- test/stylesheet/tc_border_pr.rb
-- test/stylesheet/tc_cell_alignment.rb
-- test/stylesheet/tc_cell_protection.rb
-- test/stylesheet/tc_cell_style.rb
-- test/stylesheet/tc_color.rb
-- test/stylesheet/tc_dxf.rb
-- test/stylesheet/tc_fill.rb
-- test/stylesheet/tc_font.rb
-- test/stylesheet/tc_gradient_fill.rb
-- test/stylesheet/tc_gradient_stop.rb
-- test/stylesheet/tc_num_fmt.rb
-- test/stylesheet/tc_pattern_fill.rb
-- test/stylesheet/tc_styles.rb
-- test/stylesheet/tc_table_style.rb
-- test/stylesheet/tc_table_style_element.rb
-- test/stylesheet/tc_table_styles.rb
-- test/stylesheet/tc_xf.rb
-- test/tc_axlsx.rb
-- test/tc_helper.rb
-- test/tc_package.rb
-- test/util/tc_mime_type_utils.rb
-- test/util/tc_serialized_attributes.rb
-- test/util/tc_simple_typed_list.rb
-- test/util/tc_validators.rb
-- test/workbook/tc_defined_name.rb
-- test/workbook/tc_shared_strings_table.rb
-- test/workbook/tc_workbook.rb
-- test/workbook/tc_workbook_view.rb
-- test/workbook/worksheet/auto_filter/tc_auto_filter.rb
-- test/workbook/worksheet/auto_filter/tc_filter_column.rb
-- test/workbook/worksheet/auto_filter/tc_filters.rb
-- test/workbook/worksheet/tc_break.rb
-- test/workbook/worksheet/tc_cell.rb
-- test/workbook/worksheet/tc_cfvo.rb
-- test/workbook/worksheet/tc_col.rb
-- test/workbook/worksheet/tc_color_scale.rb
-- test/workbook/worksheet/tc_comment.rb
-- test/workbook/worksheet/tc_comments.rb
-- test/workbook/worksheet/tc_conditional_formatting.rb
-- test/workbook/worksheet/tc_data_bar.rb
-- test/workbook/worksheet/tc_data_validation.rb
-- test/workbook/worksheet/tc_date_time_converter.rb
-- test/workbook/worksheet/tc_header_footer.rb
-- test/workbook/worksheet/tc_icon_set.rb
-- test/workbook/worksheet/tc_outline_pr.rb
-- test/workbook/worksheet/tc_page_margins.rb
-- test/workbook/worksheet/tc_page_set_up_pr.rb
-- test/workbook/worksheet/tc_page_setup.rb
-- test/workbook/worksheet/tc_pane.rb
-- test/workbook/worksheet/tc_pivot_table.rb
-- test/workbook/worksheet/tc_pivot_table_cache_definition.rb
-- test/workbook/worksheet/tc_print_options.rb
-- test/workbook/worksheet/tc_protected_range.rb
-- test/workbook/worksheet/tc_rich_text.rb
-- test/workbook/worksheet/tc_rich_text_run.rb
-- test/workbook/worksheet/tc_row.rb
-- test/workbook/worksheet/tc_selection.rb
-- test/workbook/worksheet/tc_sheet_calc_pr.rb
-- test/workbook/worksheet/tc_sheet_format_pr.rb
-- test/workbook/worksheet/tc_sheet_pr.rb
-- test/workbook/worksheet/tc_sheet_protection.rb
-- test/workbook/worksheet/tc_sheet_view.rb
-- test/workbook/worksheet/tc_table.rb
-- test/workbook/worksheet/tc_table_style_info.rb
-- test/workbook/worksheet/tc_worksheet.rb
-- test/workbook/worksheet/tc_worksheet_hyperlink.rb
 homepage: https://github.com/caxlsx/caxlsx
 licenses:
 - MIT
@@ -471,128 +348,4 @@ rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Excel OOXML (xlsx) with charts, styles, images and autowidth columns.
-test_files:
-- test/drawing/tc_num_data.rb
-- test/drawing/tc_two_cell_anchor.rb
-- test/drawing/tc_view_3D.rb
-- test/drawing/tc_series_title.rb
-- test/drawing/tc_cat_axis.rb
-- test/drawing/tc_chart.rb
-- test/drawing/tc_num_val.rb
-- test/drawing/tc_axis.rb
-- test/drawing/tc_line_chart.rb
-- test/drawing/tc_marker.rb
-- test/drawing/tc_bubble_series.rb
-- test/drawing/tc_d_lbls.rb
-- test/drawing/tc_str_val.rb
-- test/drawing/tc_bar_chart.rb
-- test/drawing/tc_line_3d_chart.rb
-- test/drawing/tc_cat_axis_data.rb
-- test/drawing/tc_area_chart.rb
-- test/drawing/tc_line_series.rb
-- test/drawing/tc_scatter_series.rb
-- test/drawing/tc_bar_series.rb
-- test/drawing/tc_hyperlink.rb
-- test/drawing/tc_pic.rb
-- test/drawing/tc_named_axis_data.rb
-- test/drawing/tc_bubble_chart.rb
-- test/drawing/tc_str_data.rb
-- test/drawing/tc_drawing.rb
-- test/drawing/tc_scatter_chart.rb
-- test/drawing/tc_series.rb
-- test/drawing/tc_title.rb
-- test/drawing/tc_ser_axis.rb
-- test/drawing/tc_picture_locking.rb
-- test/drawing/tc_pie_series.rb
-- test/drawing/tc_vml_shape.rb
-- test/drawing/tc_axes.rb
-- test/drawing/tc_vml_drawing.rb
-- test/drawing/tc_pie_3D_chart.rb
-- test/drawing/tc_area_series.rb
-- test/drawing/tc_graphic_frame.rb
-- test/drawing/tc_one_cell_anchor.rb
-- test/drawing/tc_data_source.rb
-- test/drawing/tc_val_axis.rb
-- test/drawing/tc_scaling.rb
-- test/drawing/tc_bar_3D_chart.rb
-- test/util/tc_simple_typed_list.rb
-- test/util/tc_mime_type_utils.rb
-- test/util/tc_validators.rb
-- test/util/tc_serialized_attributes.rb
-- test/tc_axlsx.rb
-- test/stylesheet/tc_fill.rb
-- test/stylesheet/tc_border.rb
-- test/stylesheet/tc_gradient_stop.rb
-- test/stylesheet/tc_gradient_fill.rb
-- test/stylesheet/tc_table_style.rb
-- test/stylesheet/tc_font.rb
-- test/stylesheet/tc_pattern_fill.rb
-- test/stylesheet/tc_color.rb
-- test/stylesheet/tc_num_fmt.rb
-- test/stylesheet/tc_styles.rb
-- test/stylesheet/tc_border_pr.rb
-- test/stylesheet/tc_cell_protection.rb
-- test/stylesheet/tc_xf.rb
-- test/stylesheet/tc_cell_style.rb
-- test/stylesheet/tc_table_styles.rb
-- test/stylesheet/tc_dxf.rb
-- test/stylesheet/tc_table_style_element.rb
-- test/stylesheet/tc_cell_alignment.rb
-- test/tc_helper.rb
-- test/doc_props/tc_core.rb
-- test/doc_props/tc_app.rb
-- test/content_type/tc_override.rb
-- test/content_type/tc_content_type.rb
-- test/content_type/tc_default.rb
-- test/rels/tc_relationship.rb
-- test/rels/tc_relationships.rb
-- test/profile.rb
-- test/fixtures/image1_fake.jpg
-- test/fixtures/image1.jpeg
-- test/fixtures/image1.gif
-- test/fixtures/image1.png
-- test/fixtures/image1.jpg
-- test/benchmark.rb
-- test/tc_package.rb
-- test/workbook/tc_workbook_view.rb
-- test/workbook/tc_defined_name.rb
-- test/workbook/worksheet/tc_data_bar.rb
-- test/workbook/worksheet/tc_worksheet_hyperlink.rb
-- test/workbook/worksheet/tc_data_validation.rb
-- test/workbook/worksheet/tc_pivot_table_cache_definition.rb
-- test/workbook/worksheet/tc_protected_range.rb
-- test/workbook/worksheet/tc_selection.rb
-- test/workbook/worksheet/tc_rich_text.rb
-- test/workbook/worksheet/tc_date_time_converter.rb
-- test/workbook/worksheet/tc_table_style_info.rb
-- test/workbook/worksheet/tc_conditional_formatting.rb
-- test/workbook/worksheet/tc_page_setup.rb
-- test/workbook/worksheet/tc_comments.rb
-- test/workbook/worksheet/tc_sheet_view.rb
-- test/workbook/worksheet/tc_sheet_calc_pr.rb
-- test/workbook/worksheet/tc_color_scale.rb
-- test/workbook/worksheet/tc_worksheet.rb
-- test/workbook/worksheet/tc_rich_text_run.rb
-- test/workbook/worksheet/tc_sheet_pr.rb
-- test/workbook/worksheet/auto_filter/tc_filters.rb
-- test/workbook/worksheet/auto_filter/tc_auto_filter.rb
-- test/workbook/worksheet/auto_filter/tc_filter_column.rb
-- test/workbook/worksheet/tc_cell.rb
-- test/workbook/worksheet/tc_sheet_protection.rb
-- test/workbook/worksheet/tc_pane.rb
-- test/workbook/worksheet/tc_header_footer.rb
-- test/workbook/worksheet/tc_table.rb
-- test/workbook/worksheet/tc_page_margins.rb
-- test/workbook/worksheet/tc_cfvo.rb
-- test/workbook/worksheet/tc_col.rb
-- test/workbook/worksheet/tc_pivot_table.rb
-- test/workbook/worksheet/tc_break.rb
-- test/workbook/worksheet/tc_sheet_format_pr.rb
-- test/workbook/worksheet/tc_print_options.rb
-- test/workbook/worksheet/tc_comment.rb
-- test/workbook/worksheet/tc_outline_pr.rb
-- test/workbook/worksheet/tc_row.rb
-- test/workbook/worksheet/tc_icon_set.rb
-- test/workbook/worksheet/tc_page_set_up_pr.rb
-- test/workbook/tc_shared_strings_table.rb
-- test/workbook/tc_workbook.rb
+test_files: []

data/test/benchmark.rb

@@ -1,72 +0,0 @@
-#!/usr/bin/env ruby -s
-$:.unshift "#{File.dirname(__FILE__)}/../lib"
-require 'axlsx'
-require 'csv'
-require 'benchmark'
-Axlsx::trust_input = true
-row = []
-input = (32..126).to_a.pack('U*').chars.to_a
-20.times { row << input.shuffle.join}
-times = 3000
-Benchmark.bmbm(30) do |x|
-
-  x.report('axlsx_noautowidth') {
-    p = Axlsx::Package.new
-    p.workbook do |wb|
-      wb.add_worksheet do |sheet|
-        times.times do
-          sheet << row
-        end
-      end
-    end
-    p.use_autowidth = false
-    p.serialize("example_noautowidth.xlsx")
-  }
-
-  x.report('axlsx') {
-    p = Axlsx::Package.new
-    p.workbook do |wb|
-      wb.add_worksheet do |sheet|
-        times.times do
-          sheet << row
-        end
-      end
-    end
-    p.serialize("example_autowidth.xlsx")
-  }
-
-  x.report('axlsx_shared') {
-    p = Axlsx::Package.new
-    p.workbook do |wb|
-      wb.add_worksheet do |sheet|
-        times.times do
-          sheet << row
-        end
-      end
-    end
-    p.use_shared_strings = true
-    p.serialize("example_shared.xlsx")
-  }
-
-  x.report('axlsx_stream') {
-    p = Axlsx::Package.new
-    p.workbook do |wb|
-      wb.add_worksheet do |sheet|
-        times.times do
-          sheet << row
-        end
-      end
-    end
-    s = p.to_stream()
-    File.open('example_streamed.xlsx', 'w') { |f| f.write(s.read) }
-  }
-
-  x.report('csv') {
-    CSV.open("example.csv", "wb") do |csv|
-      times.times do
-        csv << row
-      end
-    end
-  }
-end
-File.delete("example.csv", "example_streamed.xlsx", "example_shared.xlsx", "example_autowidth.xlsx", "example_noautowidth.xlsx")

data/test/content_type/tc_content_type.rb

@@ -1,76 +0,0 @@
-# encoding: UTF-8
-require 'tc_helper.rb'
-
-class TestContentType < Test::Unit::TestCase
-  def setup
-    @package = Axlsx::Package.new
-    @doc = Nokogiri::XML(@package.send(:content_types).to_xml_string)
-  end
-
-  def test_valid_document
-    schema = Nokogiri::XML::Schema(File.open(Axlsx::CONTENT_TYPES_XSD))
-    assert(schema.validate(@doc).map{ |e| puts e.message; e.message }.empty?)
-  end
-
-  def test_pre_built_types
-
-    o_path = "//xmlns:Override[@ContentType='%s']"
-    d_path = "//xmlns:Default[@ContentType='%s']"
-
-    #default
-    assert_equal(@doc.xpath("//xmlns:Default").size, 2, "There should be 2 default types")
-
-    node = @doc.xpath(d_path % Axlsx::XML_CT).first
-    assert_equal(node["Extension"], "#{Axlsx::XML_EX}", "xml content type invalid")
-
-    node = @doc.xpath(d_path % Axlsx::RELS_CT).first
-    assert_equal(node["Extension"],"#{Axlsx::RELS_EX}", "relationships content type invalid")
-
-    #overrride
-    assert_equal(@doc.xpath("//xmlns:Override").size, 4, "There should be 4 Override types")
-
-    node = @doc.xpath(o_path % Axlsx::APP_CT).first
-    assert_equal(node["PartName"], "/#{Axlsx::APP_PN}", "App part name invalid")
-
-    node = @doc.xpath(o_path % Axlsx::CORE_CT).first
-    assert_equal(node["PartName"], "/#{Axlsx::CORE_PN}", "Core part name invalid")
-
-    node = @doc.xpath(o_path % Axlsx::STYLES_CT).first
-    assert_equal(node["PartName"], "/xl/#{Axlsx::STYLES_PN}", "Styles part name invalid")
-
-    node = @doc.xpath(o_path % Axlsx::WORKBOOK_CT).first
-    assert_equal(node["PartName"], "/#{Axlsx::WORKBOOK_PN}", "Workbook part invalid")
-  end
-
-  def test_should_get_worksheet_for_worksheets
-    o_path = "//xmlns:Override[@ContentType='%s']"
-
-    ws = @package.workbook.add_worksheet
-    doc = Nokogiri::XML(@package.send(:content_types).to_xml_string)
-    assert_equal(doc.xpath("//xmlns:Override").size, 5, "adding a worksheet should add another type")
-    assert_equal(doc.xpath(o_path % Axlsx::WORKSHEET_CT).last["PartName"], "/xl/#{ws.pn}", "Worksheet part invalid")
-
-    ws = @package.workbook.add_worksheet
-    doc = Nokogiri::XML(@package.send(:content_types).to_xml_string)
-    assert_equal(doc.xpath("//xmlns:Override").size, 6, "adding workship should add another type")
-    assert_equal(doc.xpath(o_path % Axlsx::WORKSHEET_CT).last["PartName"], "/xl/#{ws.pn}", "Worksheet part invalid")
-
-  end
-
-  def test_drawings_and_charts_need_content_types
-    o_path = "//xmlns:Override[@ContentType='%s']"
-    ws = @package.workbook.add_worksheet
-
-    c = ws.add_chart Axlsx::Pie3DChart
-    doc = Nokogiri::XML(@package.send(:content_types).to_xml_string)
-    assert_equal(doc.xpath("//xmlns:Override").size, 7, "expected 7 types got #{doc.css("Types Override").size}")
-    assert_equal(doc.xpath(o_path % Axlsx::DRAWING_CT).first["PartName"], "/xl/#{ws.drawing.pn}", "Drawing part name invlid")
-    assert_equal(doc.xpath(o_path % Axlsx::CHART_CT).last["PartName"], "/xl/#{c.pn}", "Chart part name invlid")
-
-    c = ws.add_chart Axlsx::Pie3DChart
-    doc = Nokogiri::XML(@package.send(:content_types).to_xml_string)
-    assert_equal(doc.xpath("//xmlns:Override").size, 8, "expected 7 types got #{doc.css("Types Override").size}")
-    assert_equal(doc.xpath(o_path % Axlsx::CHART_CT).last["PartName"], "/xl/#{c.pn}", "Chart part name invlid")
-  end
-
-end