axlsx 1.0.17 → 1.1.0

data/lib/schema/dcmitype.xsd

@@ -5,6 +5,8 @@
            elementFormDefault="qualified"
            attributeFormDefault="unqualified">
 
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
+
   <xs:annotation>
     <xs:documentation xml:lang="en">
       DCMI Type Vocabulary XML Schema
@@ -12,7 +14,7 @@
 
       Created 2003-04-02
 
-      Created by 
+      Created by
 
       Tim Cole (t-cole3@uiuc.edu)
       Tom Habing (thabing@uiuc.edu)
@@ -24,7 +26,7 @@
       the allowable values for the DCMI Type Vocabulary.
     </xs:documentation>
 
- 
+
   </xs:annotation>
 
 
@@ -43,7 +45,7 @@
 		<xs:enumeration value="Text"/>
 		<xs:enumeration value="PhysicalObject"/>
             </xs:restriction>
-        </xs:simpleType> 
+        </xs:simpleType>
      </xs:union>
   </xs:simpleType>
 

data/lib/schema/dcterms.xsd

@@ -14,7 +14,7 @@
 
       Created 2003-04-02
 
-      Created by 
+      Created by
 
       Tim Cole (t-cole3@uiuc.edu)
       Tom Habing (thabing@uiuc.edu)
@@ -24,7 +24,7 @@
 
       This schema declares XML elements for the DC elements and
       DC element refinements from the http://purl.org/dc/terms/ namespace.
-      
+
       It reuses the complexType dc:SimpleLiteral, imported from the dc.xsd
       schema, which permits simple element content, and makes the xml:lang
       attribute available.
@@ -32,22 +32,22 @@
       This complexType permits the derivation of other complexTypes
       which would permit child elements.
 
-      DC elements are declared as substitutable for the abstract element dc:any, and 
-      DC element refinements are defined as substitutable for the base elements 
+      DC elements are declared as substitutable for the abstract element dc:any, and
+      DC element refinements are defined as substitutable for the base elements
       which they refine.
 
-      This means that the default type for all XML elements (i.e. all DC elements and 
+      This means that the default type for all XML elements (i.e. all DC elements and
       element refinements) is dc:SimpleLiteral.
 
       Encoding schemes are defined as complexTypes which are restrictions
-      of the dc:SimpleLiteral complexType. These complexTypes restrict 
+      of the dc:SimpleLiteral complexType. These complexTypes restrict
       values to an appropriates syntax or format using data typing,
       regular expressions, or enumerated lists.
-  
-      In order to specify one of these encodings an xsi:type attribute must 
+
+      In order to specify one of these encodings an xsi:type attribute must
       be used in the instance document.
 
-      Also, note that one shortcoming of this approach is that any type can be 
+      Also, note that one shortcoming of this approach is that any type can be
       applied to any of the elements or refinements.  There is no convenient way
       to restrict types to specific elements using this approach.
 
@@ -184,7 +184,7 @@
         <xs:attribute ref="xml:lang" use="prohibited"/>
     </xs:restriction>
    </xs:simpleContent>
-  </xs:complexType> 
+  </xs:complexType>
 
   <xs:complexType name="DCMIType">
    <xs:simpleContent>
@@ -217,7 +217,7 @@
         <xs:attribute ref="xml:lang" use="prohibited"/>
     </xs:restriction>
    </xs:simpleContent>
-  </xs:complexType> 
+  </xs:complexType>
 
   <xs:complexType name="ISO639-2">
    <xs:simpleContent>
@@ -300,9 +300,9 @@
   	<xs:annotation>
     	<xs:documentation xml:lang="en">
     		This group is included as a convenience for schema authors
-            who need to refer to all the DC elements and element refinements 
-            in the http://purl.org/dc/elements/1.1/ and 
-            http://purl.org/dc/terms namespaces. 
+            who need to refer to all the DC elements and element refinements
+            in the http://purl.org/dc/elements/1.1/ and
+            http://purl.org/dc/terms namespaces.
             N.B. Refinements available via substitution groups.
     	</xs:documentation>
   	</xs:annotation>
@@ -312,7 +312,7 @@
 	<xs:element ref="dc:any" />
     </xs:choice>
   </xs:sequence>
-  </xs:group>	
+  </xs:group>
 
   <xs:complexType name="elementOrRefinementContainer">
   	<xs:annotation>

data/lib/schema/opc-coreProperties.xsd

@@ -2,13 +2,17 @@
 <xs:schema targetNamespace="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
   xmlns="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
   xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:dcterms="http://purl.org/dc/terms/" elementFormDefault="qualified" blockDefault="#all">
+  xmlns:dcterms="http://purl.org/dc/terms/"
+  elementFormDefault="qualified" blockDefault="#all">
 
   <xs:import namespace="http://purl.org/dc/elements/1.1/"
     schemaLocation="dc.xsd"/>
+
   <xs:import namespace="http://purl.org/dc/terms/"
     schemaLocation="dcterms.xsd"/>
-  <xs:import id="xml" namespace="http://www.w3.org/XML/1998/namespace"/>
+
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+    schemaLocation="xml.xsd"/>
 
   <xs:element name="coreProperties" type="CT_CoreProperties"/>
 

data/lib/schema/xml.xsd

@@ -1,6 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
  <xs:annotation>
   <xs:documentation>
@@ -8,7 +7,7 @@
    http://www.w3.org/TR/REC-xml for information about this namespace.
 
     This schema document describes the XML namespace, in a form
-    suitable for import by other schema documents.  
+    suitable for import by other schema documents.
 
     Note that local names in this namespace are intended to be defined
     only by the World Wide Web Consortium or its subgroups.  The
@@ -26,16 +25,16 @@
          is a language code for the natural language of the content of
          any element; its value is inherited.  This name is reserved
          by virtue of its definition in the XML specification.
-  
+
     space (as an attribute name): denotes an attribute whose
          value is a keyword indicating what whitespace processing
          discipline is intended for the content of the element; its
          value is inherited.  This name is reserved by virtue of its
          definition in the XML specification.
 
-    Father (in any context at all): denotes Jon Bosak, the chair of 
-         the original XML Working Group.  This name is reserved by 
-         the following decision of the W3C XML Plenary and 
+    Father (in any context at all): denotes Jon Bosak, the chair of
+         the original XML Working Group.  This name is reserved by
+         the following decision of the W3C XML Plenary and
          XML Coordination groups:
 
              In appreciation for his vision, leadership and dedication
@@ -64,7 +63,7 @@
         &lt;type . . .>
          . . .
          &lt;attributeGroup ref="xml:specialAttrs"/>
- 
+
          will define a type which will schema-validate an instance
          element with any of those attributes</xs:documentation>
  </xs:annotation>

data/test/#benchmark.txt#

@@ -0,0 +1,7 @@
+
+                          user     system      total        real
+axlsx_noautowidth     1.160000   0.030000   1.190000 (  1.202237)
+axlsx                 1.710000   0.150000   1.860000 (  2.298028)
+axlsx_shared          2.650000   0.150000   2.800000 (  2.864474)
+axlsx_stream          1.650000   0.140000   1.790000 (  1.848033)
+csv                   0.270000   0.020000   0.290000 (  0.291206)

data/test/#tc_helper.rb#

@@ -0,0 +1,3 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'test/unit'
+require "axlsx.rb"

data/test/benchmark.rb

@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby -s
+# -*- coding: utf-8 -*-
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'axlsx'
+require 'csv'
+
+require 'benchmark'
+row = []
+input = (32..126).to_a.pack('U*').chars.to_a
+20.times { row << input.shuffle.join}
+times = 1000
+Benchmark.bm(100) do |x|
+  # No Autowidth
+  x.report('axlsx_noautowidth') {
+
+    p = Axlsx::Package.new
+    p.use_autowidth = false
+    wb = p.workbook
+
+    #A Simple Workbook
+
+    wb.add_worksheet do |sheet|
+      times.times do
+        sheet << row
+      end
+    end
+    p.serialize("example.xlsx")
+  }
+
+  x.report('axlsx') {
+    p = Axlsx::Package.new
+    wb = p.workbook
+
+    #A Simple Workbook
+
+    wb.add_worksheet do |sheet|
+      times.times do
+        sheet << row
+      end
+    end
+    p.serialize("example.xlsx")
+  }
+
+  x.report('axlsx_shared') {
+    p = Axlsx::Package.new
+    wb = p.workbook
+
+    #A Simple Workbook
+
+    wb.add_worksheet do |sheet|
+      times.times do
+        sheet << row
+      end
+    end
+    p.use_shared_strings = true
+    p.serialize("example.xlsx")
+  }
+
+  x.report('axlsx_stream') {
+    p = Axlsx::Package.new
+    wb = p.workbook
+
+    #A Simple Workbook
+
+    wb.add_worksheet do |sheet|
+      times.times do
+        sheet << row
+      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

data/test/benchmark.txt

@@ -0,0 +1,6 @@
+                          user     system      total        real
+axlsx_noautowidth     1.160000   0.030000   1.190000 (  1.202237)
+axlsx                 1.710000   0.150000   1.860000 (  2.298028)
+axlsx_shared          2.650000   0.150000   2.800000 (  2.864474)
+axlsx_stream          1.650000   0.140000   1.790000 (  1.848033)
+csv                   0.270000   0.020000   0.290000 (  0.291206)

data/test/benchmark.txt~

@@ -0,0 +1,6 @@
+                                                                                                           user     system      total        real
+axlsx_noautowidth                                                                                      1.160000   0.030000   1.190000 (  1.202237)
+axlsx                                                                                                  1.710000   0.150000   1.860000 (  2.298028)
+axlsx_shared                                                                                           2.650000   0.150000   2.800000 (  2.864474)
+axlsx_stream                                                                                           1.650000   0.140000   1.790000 (  1.848033)
+csv                                                                                                    0.270000   0.020000   0.290000 (  0.291206)

data/test/content_type/tc_content_type.rb

@@ -1,12 +1,10 @@
 # encoding: UTF-8
-
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestContentType < Test::Unit::TestCase
-  def setup    
+  def setup
     @package = Axlsx::Package.new
-    @doc = Nokogiri::XML(@package.send(:content_types).to_xml)
+    @doc = Nokogiri::XML(@package.send(:content_types).to_xml_string)
   end
 
   def test_valid_document
@@ -21,63 +19,63 @@ class TestContentType < Test::Unit::TestCase
 
   def test_pre_built_types
 
-    o_path = "Types Override [@ContentType='%s']"
-    d_path = "Types Default [@ContentType='%s']"
+    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")
 
-    #default 
-    assert_equal(@doc.css("Types Default").size, 2, "There should be 2 default types")
-  
-    node = @doc.css(d_path % Axlsx::XML_CT).first
+    node = @doc.xpath(d_path % Axlsx::XML_CT).first
     assert_equal(node["Extension"], "#{Axlsx::XML_EX}", "xml content type invalid")
 
-    node = @doc.css(d_path % Axlsx::RELS_CT).first
+    node = @doc.xpath(d_path % Axlsx::RELS_CT).first
     assert_equal(node["Extension"],"#{Axlsx::RELS_EX}", "relationships content type invalid")
 
     #overrride
-    assert_equal(@doc.css("Types Override").size, 4, "There should be 4 Override types")
+    assert_equal(@doc.xpath("//xmlns:Override").size, 4, "There should be 4 Override types")
 
-    node = @doc.css(o_path % Axlsx::APP_CT).first
+    node = @doc.xpath(o_path % Axlsx::APP_CT).first
     assert_equal(node["PartName"], "/#{Axlsx::APP_PN}", "App part name invalid")
 
-    node = @doc.css(o_path % Axlsx::CORE_CT).first
+    node = @doc.xpath(o_path % Axlsx::CORE_CT).first
     assert_equal(node["PartName"], "/#{Axlsx::CORE_PN}", "Core part name invalid")
 
-    node = @doc.css(o_path % Axlsx::STYLES_CT).first
+    node = @doc.xpath(o_path % Axlsx::STYLES_CT).first
     assert_equal(node["PartName"], "/xl/#{Axlsx::STYLES_PN}", "Styles part name invalid")
 
-    node = @doc.css(o_path % Axlsx::WORKBOOK_CT).first
+    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 = "Types Override [@ContentType='%s']"
+    o_path = "//xmlns:Override[@ContentType='%s']"
 
     ws = @package.workbook.add_worksheet
-    doc = Nokogiri::XML(@package.send(:content_types).to_xml)
-    assert_equal(doc.css("Types Override").size, 5, "adding a worksheet should add another type")
-    assert_equal(doc.css(o_path % Axlsx::WORKSHEET_CT).last["PartName"], "/xl/#{ws.pn}", "Worksheet part invalid")
+    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)
-    assert_equal(doc.css("Types Override").size, 6, "adding workship should add another type")
-    assert_equal(doc.css(o_path % Axlsx::WORKSHEET_CT).last["PartName"], "/xl/#{ws.pn}", "Worksheet part invalid")
+    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 = "Types Override [@ContentType='%s']"
+    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)
-    assert_equal(doc.css("Types Override").size, 7, "expected 7 types got #{doc.css("Types Override").size}")
-    assert_equal(doc.css(o_path % Axlsx::DRAWING_CT).first["PartName"], "/xl/#{ws.drawing.pn}", "Drawing part name invlid")
-    assert_equal(doc.css(o_path % Axlsx::CHART_CT).last["PartName"], "/xl/#{c.pn}", "Chart part name invlid")
+    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)
-    assert_equal(doc.css("Types Override").size, 8, "expected 7 types got #{doc.css("Types Override").size}")
-    assert_equal(doc.css(o_path % Axlsx::CHART_CT).last["PartName"], "/xl/#{c.pn}", "Chart part name invlid")
+    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

data/test/content_type/tc_default.rb

@@ -1,13 +1,8 @@
 # encoding: UTF-8
-
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestDefault < Test::Unit::TestCase
-  def setup    
-  end
-  def teardown
-  end
+
   def test_initialization_requires_Extension_and_ContentType
     assert_raise(ArgumentError, "raises argument error if Extension and/or ContentType are not specified") { Axlsx::Default.new }
     assert_raise(ArgumentError, "raises argument error if Extension and/or ContentType are not specified") { Axlsx::Default.new :Extension=>"xml" }
@@ -19,23 +14,13 @@ class TestDefault < Test::Unit::TestCase
   def test_content_type_restriction
     assert_raise(ArgumentError, "raises argument error if invlalid ContentType is") { Axlsx::Default.new :ContentType=>"asdf" }
   end
-  
-  def test_to_xml
-    schema = Nokogiri::XML::Schema(File.open(Axlsx::CONTENT_TYPES_XSD))
+
+  def test_to_xml_string
     type = Axlsx::Default.new :Extension=>"xml", :ContentType=>Axlsx::XML_CT
-    builder = Nokogiri::XML::Builder.new(:encoding => Axlsx::ENCODING) do |xml|
-      xml.Types(:xmlns => Axlsx::XML_NS_T) {
-        type.to_xml(xml)
-      }
-    end
-    doc = Nokogiri::XML(builder.to_xml)
-    errors = []
-    schema.validate(doc).each do |error|
-      puts error.message
-      errors << error
-    end
-    assert_equal(errors.size, 0, "[Content Types].xml Invalid" + errors.map{ |e| e.message }.to_s)
-    
+    doc = Nokogiri::XML(type.to_xml_string)
+    assert_equal(doc.xpath("Default[@ContentType='#{Axlsx::XML_CT}']").size, 1)
+    assert_equal(doc.xpath("Default[@Extension='xml']").size, 1)
+
   end
 
 

data/test/content_type/tc_override.rb

@@ -1,12 +1,8 @@
 # -*- coding: utf-8 -*-
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestOverride < Test::Unit::TestCase
-  def setup    
-  end
-  def teardown
-  end
+
   def test_initialization_requires_Extension_and_ContentType
     err = "requires PartName and ContentType options"
     assert_raise(ArgumentError, err) { Axlsx::Override.new }
@@ -18,23 +14,13 @@ class TestOverride < Test::Unit::TestCase
   def test_content_type_restriction
     assert_raise(ArgumentError, "requires known content type") { Axlsx::Override.new :ContentType=>"asdf" }
   end
-  
+
   def test_to_xml
-    schema = Nokogiri::XML::Schema(File.open(Axlsx::CONTENT_TYPES_XSD))
     type = Axlsx::Override.new :PartName=>"somechart.xml", :ContentType=>Axlsx::CHART_CT
-    builder = Nokogiri::XML::Builder.new(:encoding => Axlsx::ENCODING) do |xml|
-      xml.Types(:xmlns => Axlsx::XML_NS_T) {
-        type.to_xml(xml)
-      }
-    end
-    doc = Nokogiri::XML(builder.to_xml)
-    errors = []
-    schema.validate(doc).each do |error|
-      puts error.message
-      errors << error
-    end
-    assert_equal(errors.size, 0, "Override content type caused invalid content_type doc" + errors.map{ |e| e.message }.to_s)
-    
+    doc = Nokogiri::XML(type.to_xml_string)
+    assert_equal(doc.xpath("Override[@ContentType='#{Axlsx::CHART_CT}']").size, 1)
+    assert_equal(doc.xpath("Override[@PartName='somechart.xml']").size, 1)
+
   end
 
 

data/test/doc_props/tc_app.rb

@@ -1,15 +1,9 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestApp < Test::Unit::TestCase
-  def setup    
-  end
-  def teardown
-  end
-  
   def test_valid_document
     schema = Nokogiri::XML::Schema(File.open(Axlsx::APP_XSD))
-    doc = Nokogiri::XML(Axlsx::App.new.to_xml)
+    doc = Nokogiri::XML(Axlsx::App.new.to_xml_string)
     errors = []
     schema.validate(doc).each do |error|
       errors << error

data/test/doc_props/tc_core.rb

@@ -1,11 +1,10 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestCore < Test::Unit::TestCase
-  
-  def setup    
+
+  def setup
     @core = Axlsx::Core.new
-    @doc = Nokogiri::XML(@core.to_xml)
+    @doc = Nokogiri::XML(@core.to_xml_string)
   end
 
   def test_valid_document
@@ -21,14 +20,14 @@ class TestCore < Test::Unit::TestCase
   def test_populates_created
     assert_equal(@doc.xpath('//dcterms:created').text, Time.now.strftime('%Y-%m-%dT%H:%M:%S'), "dcterms:created incorrect")
   end
- 
+
   def test_populates_default_name
     assert_equal(@doc.xpath('//dc:creator').text, "axlsx", "Default name not populated")
   end
 
   def test_creator_as_option
     c = Axlsx::Core.new :creator => "some guy"
-    doc = Nokogiri::XML(c.to_xml)
+    doc = Nokogiri::XML(c.to_xml_string)
     assert(doc.xpath('//dc:creator').text == "some guy")
   end
 end

data/test/drawing/tc_axis.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestAxis < Test::Unit::TestCase
-  def setup    
+  def setup
     @axis = Axlsx::Axis.new 12345, 54321
   end
   def teardown
@@ -37,4 +36,9 @@ class TestAxis < Test::Unit::TestCase
     assert_nothing_raised("accepts valid crosses") { @axis.crosses = :min }
   end
 
+  def test_gridlines
+    assert_raise(ArgumentError, "requires valid gridlines") { @axis.gridlines = 'alice' }
+    assert_nothing_raised("accepts valid crosses") { @axis.gridlines = false }
+  end
+
 end

data/test/drawing/tc_bar_3D_chart.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestBar3DChart < Test::Unit::TestCase
 
@@ -13,7 +12,7 @@ class TestBar3DChart < Test::Unit::TestCase
   def teardown
   end
 
-  def test_initialization    
+  def test_initialization
     assert_equal(@chart.grouping, :clustered, "grouping defualt incorrect")
     assert_equal(@chart.series_type, Axlsx::BarSeries, "series type incorrect")
     assert_equal(@chart.barDir, :bar, " bar direction incorrect")
@@ -52,15 +51,15 @@ class TestBar3DChart < Test::Unit::TestCase
     assert(@chart.shape == :cone)
   end
 
-  def test_to_xml
+  def test_to_xml_string
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
-    doc = Nokogiri::XML(@chart.to_xml)
+    doc = Nokogiri::XML(@chart.to_xml_string)
     errors = []
     schema.validate(doc).each do |error|
       errors.push error
       puts error.message
     end
     assert(errors.empty?, "error free validation")
-  end  
-  
+  end
+
 end

data/test/drawing/tc_bar_series.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestBarSeries < Test::Unit::TestCase
 
@@ -9,12 +8,12 @@ class TestBarSeries < Test::Unit::TestCase
     chart = @ws.drawing.add_chart Axlsx::Bar3DChart, :title => "fishery"
     @series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob"
   end
-  
+
   def test_initialize
     assert_equal(@series.title.text, "bob", "series title has been applied")
     assert_equal(@series.data, [0,1,2], "data option applied")
-    assert_equal(@series.labels, ["zero", "one","two"], "labels option applied")    
-    assert_equal(@series.shape, :box, "series shape has been applied")   
+    assert_equal(@series.labels, ["zero", "one","two"], "labels option applied")
+    assert_equal(@series.shape, :box, "series shape has been applied")
   end
 
   def test_data

data/test/drawing/tc_cat_axis.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestCatAxis < Test::Unit::TestCase
-  def setup    
+  def setup
     @axis = Axlsx::CatAxis.new 12345, 54321
   end
   def teardown

data/test/drawing/tc_cat_axis_data.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestCatAxisData < Test::Unit::TestCase
 
@@ -9,7 +8,7 @@ class TestCatAxisData < Test::Unit::TestCase
     chart = @ws.drawing.add_chart Axlsx::Bar3DChart
     @series = chart.add_series :labels=>["zero", "one", "two"]
   end
-  
+
   def test_initialize
     assert(@series.labels.is_a?Axlsx::SimpleTypedList)
     assert_equal(@series.labels, ["zero", "one", "two"])