axlsx 1.0.17 → 1.1.0

data/test/drawing/tc_chart.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestChart < Test::Unit::TestCase
 
@@ -16,7 +15,7 @@ class TestChart < Test::Unit::TestCase
   def test_initialization
     assert_equal(@p.workbook.charts.last,@chart, "the chart is in the workbook")
     assert_equal(@chart.title.text, "fishery", "the title option has been applied")
-    assert((@chart.series.is_a?(Axlsx::SimpleTypedList) && @chart.series.empty?), "The series is initialized and empty") 
+    assert((@chart.series.is_a?(Axlsx::SimpleTypedList) && @chart.series.empty?), "The series is initialized and empty")
   end
 
   def test_title
@@ -41,33 +40,33 @@ class TestChart < Test::Unit::TestCase
 
   end
 
-  def end_at
+  def test_end_at
     @chart.end_at 25, 90
-    assert_equal(@chart.graphic_frame.anchor.from.col, 25)
+    assert_equal(@chart.graphic_frame.anchor.to.col, 25)
     assert_equal(@chart.graphic_frame.anchor.to.row, 90)
   end
 
-  def test_add_series    
+  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  
-  
+    assert_equal(s.labels, ["one",1,"anything"], "labels option applied")
+  end
+
   def test_pn
     assert_equal(@chart.pn, "charts/chart1.xml")
   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_drawing.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestDrawing < Test::Unit::TestCase
-  def setup    
+  def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet
 
@@ -24,14 +23,14 @@ class TestDrawing < Test::Unit::TestCase
     assert_equal([anchor.to.row, anchor.to.col], [1,1], "options for start at are applied")
     assert_equal(chart.title.text, "bob", "option for title is applied")
   end
-  
+
   def test_add_image
     src = File.dirname(__FILE__) + "/../../examples/image1.jpeg"
     image = @ws.add_image(:image_src => src, :start_at=>[0,0], :width=>600, :height=>400)
     assert(@ws.drawing.anchors.last.is_a?(Axlsx::OneCellAnchor))
     assert(image.is_a?(Axlsx::Pic))
     assert_equal(600, image.width)
-    assert_equal(400, image.height)        
+    assert_equal(400, image.height)
   end
 
   def test_charts
@@ -39,7 +38,7 @@ class TestDrawing < Test::Unit::TestCase
     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])
-    assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")   
+    assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")
   end
 
   def test_pn
@@ -53,7 +52,7 @@ class TestDrawing < Test::Unit::TestCase
   def test_rId
     assert_equal(@ws.drawing.rId, "rId1")
   end
-  
+
   def test_index
     assert_equal(@ws.drawing.index, @ws.workbook.drawings.index(@ws.drawing))
   end
@@ -68,7 +67,7 @@ class TestDrawing < Test::Unit::TestCase
 
   def test_to_xml
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
-    doc = Nokogiri::XML(@ws.drawing.to_xml)
+    doc = Nokogiri::XML(@ws.drawing.to_xml_string)
     errors = []
     schema.validate(doc).each do |error|
       errors.push error

data/test/drawing/tc_graphic_frame.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestGraphicFrame < Test::Unit::TestCase
-  def setup    
+  def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet
     @chart = @ws.add_chart Axlsx::Chart
@@ -20,7 +19,7 @@ class TestGraphicFrame < Test::Unit::TestCase
   def test_rId
     assert_equal(@frame.rId, "rId1")
     chart = @ws.add_chart Axlsx::Chart
-    assert_equal(chart.graphic_frame.rId, "rId2")    
+    assert_equal(chart.graphic_frame.rId, "rId2")
   end
 
 end

data/test/drawing/tc_hyperlink.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestHyperlink < Test::Unit::TestCase
 
@@ -66,5 +65,5 @@ class TestHyperlink < Test::Unit::TestCase
     assert_raise(ArgumentError) {@hyperlink.history = "bob"}
     assert_equal(@hyperlink.history, false )
   end
-  
+
 end

data/test/drawing/tc_line_3d_chart.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestLine3DChart < Test::Unit::TestCase
 
@@ -13,7 +12,7 @@ class TestLine3DChart < Test::Unit::TestCase
   def teardown
   end
 
-  def test_initialization    
+  def test_initialization
     assert_equal(@chart.grouping, :standard, "grouping defualt incorrect")
     assert_equal(@chart.series_type, Axlsx::LineSeries, "series type incorrect")
     assert(@chart.catAxis.is_a?(Axlsx::CatAxis), "category axis not created")
@@ -36,13 +35,13 @@ class TestLine3DChart < Test::Unit::TestCase
 
   def test_to_xml
     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_line_series.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestLineSeries < Test::Unit::TestCase
 
@@ -9,11 +8,11 @@ class TestLineSeries < Test::Unit::TestCase
     chart = @ws.drawing.add_chart Axlsx::Line3DChart, :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.labels, ["zero", "one","two"], "labels option applied")
   end
 
   def test_data

data/test/drawing/tc_marker.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestMarker < Test::Unit::TestCase
-  def setup    
+  def setup
     @marker = Axlsx::Marker.new
   end
 
@@ -41,5 +40,5 @@ class TestMarker < Test::Unit::TestCase
     assert_equal(@marker.col, 5)
     assert_equal(@marker.row, 10)
   end
-  
+
 end

data/test/drawing/tc_one_cell_anchor.rb

@@ -1,9 +1,8 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestOneCellAnchor < Test::Unit::TestCase
 
-  def setup    
+  def setup
     @p = Axlsx::Package.new
     @ws = @p.workbook.add_worksheet
     @test_img =  File.dirname(__FILE__) + "/../../examples/image1.jpeg"
@@ -22,7 +21,7 @@ class TestOneCellAnchor < Test::Unit::TestCase
   end
 
   def test_from
-    assert(@anchor.from.is_a?(Axlsx::Marker))    
+    assert(@anchor.from.is_a?(Axlsx::Marker))
   end
 
   def test_object
@@ -36,13 +35,13 @@ class TestOneCellAnchor < Test::Unit::TestCase
   def test_width
     assert_raise(ArgumentError) { @anchor.width = "a" }
     assert_nothing_raised { @anchor.width = 600 }
-    assert_equal(@anchor.width, 600)   
+    assert_equal(@anchor.width, 600)
   end
 
   def test_height
     assert_raise(ArgumentError) { @anchor.height = "a" }
     assert_nothing_raised { @anchor.height = 400 }
-    assert_equal(400, @anchor.height)   
+    assert_equal(400, @anchor.height)
   end
 
   def test_ext
@@ -63,5 +62,5 @@ class TestOneCellAnchor < Test::Unit::TestCase
     assert_equal(2, i.anchor.from.row)
     assert_equal(@test_img, i.image_src)
   end
-  
+
 end

data/test/drawing/tc_pic.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestPic < Test::Unit::TestCase
 
@@ -17,7 +16,7 @@ class TestPic < Test::Unit::TestCase
     assert_equal(@p.workbook.images.first, @image)
     assert_equal(@image.image_src, @test_img)
   end
-  
+
   def test_hyperlink
     assert_equal(@image.hyperlink, nil)
     @image.hyperlink = "http://axlsx.blogspot.com"
@@ -40,13 +39,13 @@ class TestPic < Test::Unit::TestCase
   def test_width
     assert_raise(ArgumentError) { @image.width = "a" }
     assert_nothing_raised { @image.width = 600 }
-    assert_equal(@image.width, 600)   
+    assert_equal(@image.width, 600)
   end
 
   def test_height
     assert_raise(ArgumentError) { @image.height = "a" }
     assert_nothing_raised { @image.height = 600 }
-    assert_equal(600, @image.height)   
+    assert_equal(600, @image.height)
   end
 
   def test_image_src
@@ -62,16 +61,16 @@ class TestPic < Test::Unit::TestCase
     assert_nothing_raised { @image.descr = "test" }
     assert_equal(@image.descr, "test")
   end
- 
+
   def test_to_xml
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
-    doc = Nokogiri::XML(@image.anchor.drawing.to_xml)
+    doc = Nokogiri::XML(@image.anchor.drawing.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_picture_locking.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestPictureLocking < Test::Unit::TestCase
-  def setup    
+  def setup
     @item = Axlsx::PictureLocking.new
   end
   def teardown

data/test/drawing/tc_pie_3D_chart.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestPie3DChart < Test::Unit::TestCase
 
@@ -18,16 +17,16 @@ class TestPie3DChart < Test::Unit::TestCase
     assert_equal(@chart.view3D.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)
+    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_pie_series.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestPieSeries < Test::Unit::TestCase
 
@@ -9,12 +8,12 @@ class TestPieSeries < Test::Unit::TestCase
     chart = @ws.drawing.add_chart Axlsx::Pie3DChart, :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.explosion, nil, "series shape has been applied")   
+    assert_equal(@series.labels, ["zero", "one","two"], "labels option applied")
+    assert_equal(@series.explosion, nil, "series shape has been applied")
   end
 
   def test_data

data/test/drawing/tc_scaling.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestScaling < Test::Unit::TestCase
-  def setup    
+  def setup
     @scaling = Axlsx::Scaling.new
   end
 
@@ -33,5 +32,5 @@ class TestScaling < Test::Unit::TestCase
     assert_raise(ArgumentError) { @scaling.min = 1}
     assert_nothing_raised {@scaling.min = 10.5}
   end
-  
+
 end

data/test/drawing/tc_scatter_chart.rb

@@ -0,0 +1,43 @@
+require 'tc_helper.rb'
+
+class TestScatterChart < Test::Unit::TestCase
+  def setup
+    @p = Axlsx::Package.new
+    @chart = nil
+    ws = @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]
+      sheet.add_row ["",       5, 10, 15, 20]
+      sheet.add_chart(Axlsx::ScatterChart, :title => "example 7: Scatter Chart") do |chart|
+        chart.start_at 0, 4
+        chart.end_at 10, 19
+        chart.add_series :xData => sheet["B1:E1"], :yData => sheet["B2:E2"], :title => sheet["A1"]
+        chart.add_series :xData => sheet["B3:E3"], :yData => sheet["B4:E4"], :title => sheet["A3"]
+        @chart = chart
+      end
+    end
+  end
+
+  def teardown
+  end
+
+  def test_initialization
+    assert_equal(@chart.scatterStyle, :lineMarker, "scatterStyle defualt incorrect")
+    assert_equal(@chart.series_type, Axlsx::ScatterSeries, "series type incorrect")
+    assert(@chart.xValAxis.is_a?(Axlsx::ValAxis), "independant value axis not created")
+    assert(@chart.yValAxis.is_a?(Axlsx::ValAxis), "dependant value axis not created")
+  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
+    assert(errors.empty?, "error free validation")
+  end
+
+end

data/test/drawing/tc_scatter_series.rb

@@ -0,0 +1,20 @@
+require 'tc_helper.rb'
+
+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"
+  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])
+  end
+end

data/test/drawing/tc_ser_axis.rb

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

data/test/drawing/tc_series.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestSeries < Test::Unit::TestCase
 
@@ -9,16 +8,16 @@ class TestSeries < Test::Unit::TestCase
     chart = @ws.drawing.add_chart Axlsx::Chart, :title => "fishery"
     @series = chart.add_series :title=>"bob"
   end
-  
+
   def test_initialize
     assert_equal(@series.title.text, "bob", "series title has been applied")
     assert_equal(@series.order, @series.index, "order is index by default")
-    assert_equal(@series.index, @series.chart.series.index(@series), "index is applied")    
+    assert_equal(@series.index, @series.chart.series.index(@series), "index is applied")
   end
 
   def test_order
     @series.order = 2
     assert_equal(@series.order, 2)
   end
-  
+
 end

data/test/drawing/tc_series_title.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestSeriesTitle < Test::Unit::TestCase
-  def setup    
+  def setup
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @row = ws.add_row ["one", 1, Time.now]
@@ -21,7 +20,7 @@ class TestSeriesTitle < Test::Unit::TestCase
   def test_text
     assert_raise(ArgumentError, "text must be a string") { @title.text = 123 }
     @title.cell = @row.cells.first
-    @title.text = "bob"    
+    @title.text = "bob"
     assert(@title.cell == nil, "setting title with text clears the cell")
   end
 
@@ -30,5 +29,5 @@ class TestSeriesTitle < Test::Unit::TestCase
     @title.cell = @row.cells.first
     assert(@title.text == "one")
   end
-  
+
 end

data/test/drawing/tc_title.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestTitle < Test::Unit::TestCase
-  def setup    
+  def setup
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @row = ws.add_row ["one", 1, Time.now]
@@ -21,7 +20,7 @@ class TestTitle < Test::Unit::TestCase
   def test_text
     assert_raise(ArgumentError, "text must be a string") { @title.text = 123 }
     @title.cell = @row.cells.first
-    @title.text = "bob"    
+    @title.text = "bob"
     assert(@title.cell == nil, "setting title with text clears the cell")
   end
 
@@ -30,5 +29,5 @@ class TestTitle < Test::Unit::TestCase
     @title.cell = @row.cells.first
     assert(@title.text == "one")
   end
-  
+
 end

data/test/drawing/tc_two_cell_anchor.rb

@@ -1,9 +1,8 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestTwoCellAnchor < Test::Unit::TestCase
 
-  def setup    
+  def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet
     row = @ws.add_row ["one", 1, Time.now]
@@ -22,7 +21,7 @@ class TestTwoCellAnchor < Test::Unit::TestCase
     assert(@anchor.to.row == 10)
   end
 
-  
+
   def test_options
     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] }
@@ -34,5 +33,5 @@ class TestTwoCellAnchor < Test::Unit::TestCase
     assert_equal(a.graphic_frame.anchor.to.col, 90)
     assert_equal(a.graphic_frame.anchor.to.row, 45)
   end
-  
+
 end

data/test/drawing/tc_val_axis.rb

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

data/test/drawing/tc_val_axis_data.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestValAxisData < Test::Unit::TestCase
 
@@ -9,7 +8,7 @@ class TestValAxisData < Test::Unit::TestCase
     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])

data/test/drawing/tc_view_3D.rb

@@ -1,14 +1,13 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestView3D < Test::Unit::TestCase
-  def setup    
+  def setup
     @view  = Axlsx::View3D.new
   end
 
   def teardown
   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)
@@ -18,7 +17,7 @@ class TestView3D < Test::Unit::TestCase
     assert_equal(v.rAngAx, false)
     assert_equal(v.perspective, 10)
   end
-  
+
   def test_rotX
     assert_raise(ArgumentError) {@view.rotX = "bob"}
     assert_nothing_raised {@view.rotX = -90}
@@ -44,12 +43,12 @@ class TestView3D < Test::Unit::TestCase
     assert_raise(ArgumentError) {@view.rAngAx = "bob"}
     assert_nothing_raised {@view.rAngAx = true}
   end
-  
+
   def test_perspective
     assert_raise(ArgumentError) {@view.perspective = "bob"}
     assert_nothing_raised {@view.perspective = 30}
   end
 
 
-  
+
 end