axlsx 1.1.0 → 1.2.0

data/test/drawing/tc_chart.rb

@@ -22,11 +22,16 @@ class TestChart < Test::Unit::TestCase
     @chart.title.text = 'wowzer'
     assert_equal(@chart.title.text, "wowzer", "the title text via a string")
     assert_equal(@chart.title.cell, nil, "the title cell is nil as we set the title with text.")
-    @chart.title.cell = @row.cells.first
+    @chart.title = @row.cells.first
     assert_equal(@chart.title.text, "one", "the title text was set via cell reference")
     assert_equal(@chart.title.cell, @row.cells.first)
   end
 
+  def test_to_from_marker_access
+    assert(@chart.to.is_a?(Axlsx::Marker))
+    assert(@chart.from.is_a?(Axlsx::Marker))
+  end
+
   def test_style
     assert_raise(ArgumentError) { @chart.style = 49 }
     assert_nothing_raised { @chart.style = 2 }
@@ -34,38 +39,51 @@ class TestChart < Test::Unit::TestCase
   end
 
   def test_start_at
-    @chart.start_at 15,25
+    @chart.start_at 15, 25
     assert_equal(@chart.graphic_frame.anchor.from.col, 15)
     assert_equal(@chart.graphic_frame.anchor.from.row, 25)
-
+    @chart.start_at @row.cells.first
+    assert_equal(@chart.graphic_frame.anchor.from.col, 0)
+    assert_equal(@chart.graphic_frame.anchor.from.row, 0)
+    @chart.start_at [5,6]
+    assert_equal(@chart.graphic_frame.anchor.from.col, 5)
+    assert_equal(@chart.graphic_frame.anchor.from.row, 6)
+    
   end
 
   def test_end_at
     @chart.end_at 25, 90
     assert_equal(@chart.graphic_frame.anchor.to.col, 25)
     assert_equal(@chart.graphic_frame.anchor.to.row, 90)
+    @chart.end_at @row.cells.last
+    assert_equal(@chart.graphic_frame.anchor.to.col, 2)
+    assert_equal(@chart.graphic_frame.anchor.to.row, 0)
+    @chart.end_at [10,11]
+    assert_equal(@chart.graphic_frame.anchor.to.col, 10)
+    assert_equal(@chart.graphic_frame.anchor.to.row, 11)
+  
   end
 
   def test_add_series
     s = @chart.add_series :data=>[0,1,2,3], :labels => ["one", 1, "anything"], :title=>"bob"
     assert_equal(@chart.series.last, s, "series has been added to chart series collection")
     assert_equal(s.title.text, "bob", "series title has been applied")
-    assert_equal(s.data, [0,1,2,3], "data option applied")
-    assert_equal(s.labels, ["one",1,"anything"], "labels option applied")
   end
 
   def test_pn
     assert_equal(@chart.pn, "charts/chart1.xml")
   end
-
+  
+  def test_d_lbls
+    assert_equal(nil, @chart.instance_values[:d_lbls])
+    @chart.d_lbls.d_lbl_pos = :t
+    assert(@chart.d_lbls.is_a?(Axlsx::DLbls), 'DLbls instantiated on access')
+  end
+  
   def test_to_xml_string
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
     doc = Nokogiri::XML(@chart.to_xml_string)
-    errors = []
-    schema.validate(doc).each do |error|
-      errors.push error
-      puts error.message
-    end
+    errors = schema.validate(doc).map { |error| puts error.message; error }
     assert(errors.empty?, "error free validation")
   end
 

data/test/drawing/tc_d_lbls.rb

@@ -0,0 +1,47 @@
+require 'tc_helper'
+
+class TestDLbls < Test::Unit::TestCase
+
+  def setup
+    @d_lbls = Axlsx::DLbls.new(Axlsx::Pie3DChart)
+  end
+
+  def test_initialization
+    assert_equal(:bestFit, @d_lbls.d_lbl_pos)
+    Axlsx::DLbls::BOOLEAN_ATTRIBUTES.each do |attr|
+      assert_equal(false, @d_lbls.send(attr))
+    end
+  end
+
+  def test_initialization_with_optoins
+    options_hash = Hash[*[Axlsx::DLbls::BOOLEAN_ATTRIBUTES.map { |name| [name, true] }] ]
+    d_lbls = Axlsx::DLbls.new(Axlsx::Pie3DChart, options_hash.merge( { :d_lbl_pos => :t }))
+    Axlsx::DLbls::BOOLEAN_ATTRIBUTES.each do |attr|
+      assert_equal(true, d_lbls.send(attr), "boolean attributes set by options")
+    end
+    assert_equal(:t, d_lbls.d_lbl_pos, "d_lbl_pos set by options")
+  end
+  def test_d_lbl_pos
+    assert_raise(ArgumentError, 'invlaid label positions are rejected') { @d_lbls.d_lbl_pos = :upside_down }
+    assert_nothing_raised('accepts valid label position') { @d_lbls.d_lbl_pos = :ctr }
+  end
+
+  def test_boolean_attributes
+    Axlsx::DLbls::BOOLEAN_ATTRIBUTES.each do |attr|
+      assert_raise(ArgumentError, "rejects non boolean value for #{attr}") { @d_lbls.send("#{attr}=", :foo) }
+      assert_nothing_raised("accepts boolean value for #{attr}") { @d_lbls.send("#{attr}=", true) }
+      assert_nothing_raised("accepts boolean value for #{attr}") { @d_lbls.send("#{attr}=", false) }
+    end
+  end
+
+  def test_to_xml_string
+      str = '<?xml version="1.0" encoding="UTF-8"?>'
+      str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '" xmlns:a="' << Axlsx::XML_NS_A << '" xmlns:r="' << Axlsx::XML_NS_R << '">'
+      @d_lbls.to_xml_string(str) 
+      str << '</c:chartSpace>'
+      doc = Nokogiri::XML(str)
+      @d_lbls.instance_values.each do |name, value|
+        assert(doc.xpath("//c:#{Axlsx::camel(name, false)}[@val='#{value}']"), "#{name} is properly serialized")
+      end
+  end
+end

data/test/drawing/tc_data_source.rb

@@ -0,0 +1,17 @@
+ require 'tc_helper.rb'
+
+ class TestNumDataSource < Test::Unit::TestCase
+
+  def setup
+    @data_source = Axlsx::NumDataSource.new :data => ["1", "2", "3"]
+  end
+
+  def test_to_xml_string_strLit
+    str = '<?xml version="1.0" encoding="UTF-8"?>'
+    str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '">'
+    str << @data_source.to_xml_string
+    doc = Nokogiri::XML(str)
+    assert_equal(doc.xpath("//c:val").size, 1)
+  end
+
+ end

data/test/drawing/tc_drawing.rb

@@ -9,8 +9,6 @@ class TestDrawing < Test::Unit::TestCase
 
   def test_initialization
     assert(@ws.workbook.drawings.empty?)
-    assert_equal(@ws.drawing, @ws.workbook.drawings.last, "drawing is added to workbook")
-    assert(@ws.drawing.anchors.is_a?(Axlsx::SimpleTypedList) && @ws.drawing.anchors.empty?, "anchor list is created and empty")
   end
 
   def test_add_chart
@@ -32,9 +30,13 @@ class TestDrawing < Test::Unit::TestCase
     assert_equal(600, image.width)
     assert_equal(400, image.height)
   end
-
+  def test_add_two_cell_anchor_image
+     src = File.dirname(__FILE__) + "/../../examples/image1.jpeg"
+     image = @ws.add_image(:image_src => src, :start_at=>[0,0], :end_at => [15,0])
+    assert(@ws.drawing.anchors.last.is_a?(Axlsx::TwoCellAnchor))
+    assert(image.is_a?(Axlsx::Pic))
+  end
   def test_charts
-    assert(@ws.drawing.charts.empty?)
     chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"bob", :start_at=>[0,0], :end_at=>[1,1])
     assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")
     chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"nancy", :start_at=>[1,5], :end_at=>[5,10])
@@ -42,23 +44,26 @@ class TestDrawing < Test::Unit::TestCase
   end
 
   def test_pn
+    @ws.add_chart(Axlsx::Pie3DChart)
     assert_equal(@ws.drawing.pn, "drawings/drawing1.xml")
   end
 
   def test_rels_pn
+    @ws.add_chart(Axlsx::Pie3DChart)
     assert_equal(@ws.drawing.rels_pn, "drawings/_rels/drawing1.xml.rels")
   end
 
   def test_rId
+    @ws.add_chart(Axlsx::Pie3DChart)
     assert_equal(@ws.drawing.rId, "rId1")
   end
 
   def test_index
+    @ws.add_chart(Axlsx::Pie3DChart)
     assert_equal(@ws.drawing.index, @ws.workbook.drawings.index(@ws.drawing))
   end
 
   def test_relationships
-    assert(@ws.drawing.relationships.empty?)
     chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"bob", :start_at=>[0,0], :end_at=>[1,1])
     assert_equal(@ws.drawing.relationships.size, 1, "adding a chart adds a relationship")
     chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"nancy", :start_at=>[1,5], :end_at=>[5,10])
@@ -67,6 +72,7 @@ class TestDrawing < Test::Unit::TestCase
 
   def test_to_xml
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
+    @ws.add_chart(Axlsx::Pie3DChart)
     doc = Nokogiri::XML(@ws.drawing.to_xml_string)
     errors = []
     schema.validate(doc).each do |error|

data/test/drawing/tc_hyperlink.rb

@@ -19,11 +19,6 @@ class TestHyperlink < Test::Unit::TestCase
     assert_equal(@hyperlink.href, "http://axlsx.blogspot.com")
   end
 
-  def test_invalidUrl
-    assert_nothing_raised { @hyperlink.invalidUrl = "http://axlsx.blogspot.com" }
-    assert_equal(@hyperlink.invalidUrl, "http://axlsx.blogspot.com")
-  end
-
   def test_tgtFrame
     assert_nothing_raised { @hyperlink.tgtFrame = "http://axlsx.blogspot.com" }
     assert_equal(@hyperlink.tgtFrame, "http://axlsx.blogspot.com")
@@ -66,4 +61,8 @@ class TestHyperlink < Test::Unit::TestCase
     assert_equal(@hyperlink.history, false )
   end
 
+  def test_to_xml_string
+    doc = Nokogiri::XML(@p.workbook.worksheets.first.drawing.to_xml_string)
+    assert(doc.xpath("//a:hlinkClick"))
+  end
 end

data/test/drawing/tc_line_series.rb

@@ -5,22 +5,20 @@ class TestLineSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet :name=>"hmmm"
-    chart = @ws.drawing.add_chart Axlsx::Line3DChart, :title => "fishery"
-    @series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob"
+    chart = @ws.add_chart Axlsx::Line3DChart, :title => "fishery"
+    @series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob", :color => "#FF0000"
   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")
-  end
+    assert_equal(@series.labels.class, Axlsx::AxDataSource)
+    assert_equal(@series.data.class, Axlsx::NumDataSource)
 
-  def test_data
-    assert_equal(@series.data, [0,1,2])
   end
-
-  def test_labels
-    assert_equal(@series.labels, ["zero", "one", "two"])
+  
+  def test_to_xml_string
+    doc = Nokogiri::XML(@series.to_xml_string)
+    assert(doc.xpath("//srgbClr[@val='#{@series.color}']"))
   end
-
+  #TODO serialization testing
 end

data/test/drawing/tc_named_axis_data.rb

@@ -0,0 +1,27 @@
+# require 'tc_helper.rb'
+
+# class TestNamedAxisData < Test::Unit::TestCase
+
+#   def setup
+#     p = Axlsx::Package.new
+#     @ws = p.workbook.add_worksheet
+#     @chart = @ws.drawing.add_chart Axlsx::Line3DChart
+#     @series = @chart.add_series :data=>[0,1,2]
+#   end
+
+#   def test_initialize
+#     assert(@series.data.is_a?Axlsx::SimpleTypedList)
+#     assert_equal(@series.data, [0,1,2])
+#   end
+
+#   def test_to_xml_string
+#     doc = Nokogiri::XML(@chart.to_xml_string)
+#     assert_equal(doc.xpath("//c:val/c:numRef/c:f").size,1)
+#     assert_equal(doc.xpath("//c:numCache/c:ptCount[@val='#{@series.data.size}']").size,1)
+#     @series.data.each_with_index do |datum, index|
+#       assert_equal(doc.xpath("//c:numCache/c:pt[@idx='#{index}']").size,1)
+#       assert_equal(doc.xpath("//c:numCache/c:pt/c:v[text()='#{datum}']").size,1)
+#     end
+#   end
+
+# end

data/test/drawing/tc_num_data.rb

@@ -0,0 +1,31 @@
+require 'tc_helper.rb'
+
+class TestNumData < Test::Unit::TestCase
+
+  def setup
+    @num_data = Axlsx::NumData.new :data => [1, 2, 3]
+  end
+
+  def test_initialize
+    assert_equal(@num_data.format_code, "General")
+  end
+ 
+  def test_formula_based_cell
+  
+  end
+ 
+  def test_format_code
+    assert_raise(ArgumentError) {@num_data.format_code = 7}
+    assert_nothing_raised {@num_data.format_code = 'foo_bar'}
+  end
+
+  def test_to_xml_string
+    str = '<?xml version="1.0" encoding="UTF-8"?>'
+    str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '">'
+    str << @num_data.to_xml_string
+    doc = Nokogiri::XML(str)
+    assert_equal(doc.xpath("//c:numLit/c:ptCount[@val=3]").size, 1)
+    assert_equal(doc.xpath("//c:numLit/c:pt/c:v[text()='1']").size, 1)
+  end
+
+end

data/test/drawing/tc_num_val.rb

@@ -0,0 +1,29 @@
+require 'tc_helper.rb'
+
+class TestNumVal < Test::Unit::TestCase
+
+  def setup
+    @num_val = Axlsx::NumVal.new :v => 1
+  end
+
+  def test_initialize
+    assert_equal(@num_val.format_code, "General")
+    assert_equal(@num_val.v, "1")
+  end
+
+  def test_format_code
+    assert_raise(ArgumentError) {@num_val.format_code = 7}
+    assert_nothing_raised {@num_val.format_code = 'foo_bar'}
+  end
+
+  def test_to_xml_string
+    str = '<?xml version="1.0" encoding="UTF-8"?>'
+    str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '">'
+    str << @num_val.to_xml_string(0)
+    doc = Nokogiri::XML(str)
+    # lets see if this works?
+    assert_equal(doc.xpath("//c:pt/c:v[text()='1']").size, 1)
+
+  end
+
+end

data/test/drawing/tc_pic.rb

@@ -6,7 +6,7 @@ class TestPic < Test::Unit::TestCase
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @test_img =  File.dirname(__FILE__) + "/../../examples/image1.jpeg"
-    @image = ws.add_image :image_src => @test_img
+    @image = ws.add_image :image_src => @test_img, :hyperlink => 'https://github.com/randym', :tooltip => "What's up doc?"
   end
 
   def teardown
@@ -14,11 +14,31 @@ class TestPic < Test::Unit::TestCase
 
   def test_initialization
     assert_equal(@p.workbook.images.first, @image)
+    assert_equal(@image.file_name, 'image1.jpeg')
     assert_equal(@image.image_src, @test_img)
   end
 
+  def test_anchor_swapping
+    #swap from one cell to two cell when end_at is specified
+    assert(@image.anchor.is_a?(Axlsx::OneCellAnchor))
+    start_at = @image.anchor.from 
+    @image.end_at 10,5
+    assert(@image.anchor.is_a?(Axlsx::TwoCellAnchor))
+    assert_equal(start_at.col, @image.anchor.from.col)
+    assert_equal(start_at.row, @image.anchor.from.row)
+    assert_equal(10,@image.anchor.to.col)
+    assert_equal(5, @image.anchor.to.row)
+  
+    #swap from two cell to one cell when width or height are specified
+    @image.width = 200
+    assert(@image.anchor.is_a?(Axlsx::OneCellAnchor))
+    assert_equal(start_at.col, @image.anchor.from.col)
+    assert_equal(start_at.row, @image.anchor.from.row)
+    assert_equal(200, @image.width)
+  
+  end
   def test_hyperlink
-    assert_equal(@image.hyperlink, nil)
+    assert_equal(@image.hyperlink.href, "https://github.com/randym")
     @image.hyperlink = "http://axlsx.blogspot.com"
     assert_equal(@image.hyperlink.href, "http://axlsx.blogspot.com")
   end

data/test/drawing/tc_pie_3D_chart.rb

@@ -6,26 +6,22 @@ class TestPie3DChart < Test::Unit::TestCase
     p = Axlsx::Package.new
     ws = p.workbook.add_worksheet
     @row = ws.add_row ["one", 1, Time.now]
-    @chart = ws.drawing.add_chart Axlsx::Pie3DChart, :title => "fishery"
+    @chart = ws.add_chart Axlsx::Pie3DChart, :title => "fishery"
   end
 
   def teardown
   end
 
   def test_initialization
-    assert_equal(@chart.view3D.rotX, 30, "view 3d default rotX incorrect")
-    assert_equal(@chart.view3D.perspective, 30, "view 3d default perspective incorrect")
+    assert_equal(@chart.view_3D.rot_x, 30, "view 3d default rot_x incorrect")
+    assert_equal(@chart.view_3D.perspective, 30, "view_3d default perspective incorrect")
     assert_equal(@chart.series_type, Axlsx::PieSeries, "series type incorrect")
   end
 
   def test_to_xml
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
     doc = Nokogiri::XML(@chart.to_xml_string)
-    errors = []
-    schema.validate(doc).each do |error|
-      errors.push error
-      puts error.message
-    end
+    errors = schema.validate(doc).map {|error| puts error.message; error }
     assert(errors.empty?, "error free validation")
   end
 

data/test/drawing/tc_pie_series.rb

@@ -5,30 +5,28 @@ class TestPieSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet :name=>"hmmm"
-    chart = @ws.drawing.add_chart Axlsx::Pie3DChart, :title => "fishery"
-    @series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob"
+    chart = @ws.add_chart Axlsx::Pie3DChart, :title => "fishery"
+    @series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob", :colors => ["FF0000", "00FF00", "0000FF"]
   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.labels.class, Axlsx::AxDataSource)
+    assert_equal(@series.data.class, Axlsx::NumDataSource)
     assert_equal(@series.explosion, nil, "series shape has been applied")
   end
 
-  def test_data
-    assert_equal(@series.data, [0,1,2])
-  end
-
-  def test_labels
-    assert_equal(@series.labels, ["zero", "one", "two"])
-
-  end
-
   def test_explosion
     assert_raise(ArgumentError, "require valid explosion") { @series.explosion = :lots }
     assert_nothing_raised("allow valid explosion") { @series.explosion = 20 }
     assert(@series.explosion == 20)
   end
 
+  def test_to_xml_string
+    doc = Nokogiri::XML(@series.to_xml_string)
+    assert(doc.xpath("//srgbClr[@val='#{@series.colors[0]}']"))
+
+  end
+  #TODO test unique serialization parts
+
 end

data/test/drawing/tc_scatter_chart.rb

@@ -4,7 +4,7 @@ class TestScatterChart < Test::Unit::TestCase
   def setup
     @p = Axlsx::Package.new
     @chart = nil
-    ws = @p.workbook.add_worksheet do |sheet|
+    @p.workbook.add_worksheet do |sheet|
       sheet.add_row ["First",  1,  5,  7,  9]
       sheet.add_row ["",       1, 25, 49, 81]
       sheet.add_row ["Second", 5,  2, 14,  9]
@@ -22,6 +22,11 @@ class TestScatterChart < Test::Unit::TestCase
   def teardown
   end
 
+  def test_scatter_style
+    @chart.scatterStyle = :marker
+    assert(@chart.scatterStyle == :marker)
+    assert_raise(ArgumentError) { @chart.scatterStyle = :buckshot }
+  end
   def test_initialization
     assert_equal(@chart.scatterStyle, :lineMarker, "scatterStyle defualt incorrect")
     assert_equal(@chart.series_type, Axlsx::ScatterSeries, "series type incorrect")

data/test/drawing/tc_scatter_series.rb

@@ -5,16 +5,17 @@ class TestScatterSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet :name=>"hmmm"
-    chart = @ws.drawing.add_chart Axlsx::ScatterChart, :title => "Scatter Chart"
-    @series = chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"exponents"
+    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "Scatter Chart"
+    @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"exponents", :color => 'FF0000'
   end
 
   def test_initialize
     assert_equal(@series.title.text, "exponents", "series title has been applied")
   end
 
-  def test_data
-    assert_equal(@series.xData, [1,2,4])
-    assert_equal(@series.yData, [1,3,9])
+  def test_to_xml_string
+    doc = Nokogiri::XML(@chart.to_xml_string)
+    assert_equal(doc.xpath("//a:srgbClr[@val='#{@series.color}']").size,4)
   end
+
 end

data/test/drawing/tc_series.rb

@@ -5,7 +5,7 @@ class TestSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet :name=>"hmmm"
-    chart = @ws.drawing.add_chart Axlsx::Chart, :title => "fishery"
+    chart = @ws.add_chart Axlsx::Chart, :title => "fishery"
     @series = chart.add_series :title=>"bob"
   end
 

data/test/drawing/tc_str_data.rb

@@ -0,0 +1,18 @@
+require 'tc_helper.rb'
+
+class TestStrData < Test::Unit::TestCase
+
+  def setup
+    @str_data = Axlsx::StrData.new :data => ["1", "2", "3"]
+  end
+
+  def test_to_xml_string_strLit
+    str = '<?xml version="1.0" encoding="UTF-8"?>'
+    str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '">'
+    str << @str_data.to_xml_string
+    doc = Nokogiri::XML(str)
+    assert_equal(doc.xpath("//c:strLit/c:ptCount[@val=3]").size, 1)
+    assert_equal(doc.xpath("//c:strLit/c:pt/c:v[text()='1']").size, 1)
+  end
+
+end

data/test/drawing/tc_str_val.rb

@@ -0,0 +1,21 @@
+require 'tc_helper.rb'
+
+class TestStrVal < Test::Unit::TestCase
+
+  def setup
+    @str_val = Axlsx::StrVal.new :v => "1"
+  end
+
+  def test_initialize
+    assert_equal(@str_val.v, "1")
+  end
+
+  def test_to_xml_string
+    str = '<?xml version="1.0" encoding="UTF-8"?>'
+    str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '">'
+    str << @str_val.to_xml_string(0)
+    doc = Nokogiri::XML(str)
+    assert_equal(doc.xpath("//c:pt/c:v[text()='1']").size, 1)
+  end
+
+end

data/test/drawing/tc_title.rb

@@ -1,3 +1,5 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../"
+
 require 'tc_helper.rb'
 
 class TestTitle < Test::Unit::TestCase
@@ -30,4 +32,18 @@ class TestTitle < Test::Unit::TestCase
     assert(@title.text == "one")
   end
 
+  def test_to_xml_string_text
+    @chart.title.text = 'foo'
+    doc = Nokogiri::XML(@chart.to_xml_string)
+    assert_equal(1, doc.xpath('//c:rich').size)
+    assert_equal(1, doc.xpath("//a:t[text()='foo']").size)
+  end
+
+  def test_to_xml_string_cell
+    @chart.title.cell = @row.cells.first
+    doc = Nokogiri::XML(@chart.to_xml_string)
+    assert_equal(1, doc.xpath('//c:strCache').size)
+    assert_equal(1, doc.xpath('//c:v[text()="one"]').size)
+  end
+
 end

data/test/drawing/tc_two_cell_anchor.rb

@@ -5,8 +5,7 @@ class TestTwoCellAnchor < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet
-    row = @ws.add_row ["one", 1, Time.now]
-    title = Axlsx::Title.new
+    @ws.add_row ["one", 1, Time.now]
     chart = @ws.add_chart Axlsx::Bar3DChart
     @anchor = chart.graphic_frame.anchor
   end
@@ -23,7 +22,7 @@ class TestTwoCellAnchor < Test::Unit::TestCase
 
 
   def test_options
-    assert_raise(ArgumentError, 'invalid start_at') { @ws.add_chart Axlsx::Chart, :start_at=>[1] }
+    assert_raise(ArgumentError, 'invalid start_at') { @ws.add_chart Axlsx::Chart, :start_at=>"1" }
     assert_raise(ArgumentError, 'invalid end_at') { @ws.add_chart Axlsx::Chart, :start_at=>[1,2], :end_at => ["a", 4] }
     # this is actually raised in the graphic frame
     assert_raise(ArgumentError, 'invalid Chart') { @ws.add_chart Axlsx::TwoCellAnchor }

data/test/drawing/tc_view_3D.rb

@@ -9,33 +9,33 @@ class TestView3D < Test::Unit::TestCase
   end
 
   def test_options
-    v = Axlsx::View3D.new :rotX => 10, :rotY => 5, :hPercent => "30%", :depthPercent => "45%", :rAngAx => false, :perspective => 10
-    assert_equal(v.rotX, 10)
-    assert_equal(v.rotY, 5)
-    assert_equal(v.hPercent, "30%")
-    assert_equal(v.depthPercent, "45%")
-    assert_equal(v.rAngAx, false)
+    v = Axlsx::View3D.new :rot_x => 10, :rot_y => 5, :h_percent => "30%", :depth_percent => "45%", :r_ang_ax => false, :perspective => 10
+    assert_equal(v.rot_x, 10)
+    assert_equal(v.rot_y, 5)
+    assert_equal(v.h_percent, "30%")
+    assert_equal(v.depth_percent, "45%")
+    assert_equal(v.r_ang_ax, false)
     assert_equal(v.perspective, 10)
   end
 
-  def test_rotX
-    assert_raise(ArgumentError) {@view.rotX = "bob"}
-    assert_nothing_raised {@view.rotX = -90}
+  def test_rot_x
+    assert_raise(ArgumentError) {@view.rot_x = "bob"}
+    assert_nothing_raised {@view.rot_x = -90}
   end
 
-  def test_rotY
-    assert_raise(ArgumentError) {@view.rotY = "bob"}
-    assert_nothing_raised {@view.rotY = 90}
+  def test_rot_y
+    assert_raise(ArgumentError) {@view.rot_y = "bob"}
+    assert_nothing_raised {@view.rot_y = 90}
   end
 
-  def test_hPercent
-    assert_raise(ArgumentError) {@view.hPercent = "bob"}
-    assert_nothing_raised {@view.hPercent = "500%"}
+  def test_h_percent
+    assert_raise(ArgumentError) {@view.h_percent = "bob"}
+    assert_nothing_raised {@view.h_percent = "500%"}
   end
 
-  def test_depthPercent
-    assert_raise(ArgumentError) {@view.depthPercent = "bob"}
-    assert_nothing_raised {@view.depthPercent = "20%"}
+  def test_depth_percent
+    assert_raise(ArgumentError) {@view.depth_percent = "bob"}
+    assert_nothing_raised {@view.depth_percent = "20%"}
   end