axlsx 1.1.0 → 1.2.0

data/test/drawing/tc_vml_drawing.rb

@@ -0,0 +1,25 @@
+require 'tc_helper.rb'
+
+class TestVmlDrawing < Test::Unit::TestCase
+
+  def setup
+    p = Axlsx::Package.new
+    wb = p.workbook
+    @ws = wb.add_worksheet
+    @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank'
+    @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO'
+    @vml_drawing = @ws.comments.vml_drawing
+  end
+
+  def test_initialize
+    assert_raise(ArgumentError) { Axlsx::VmlDrawing.new }
+  end
+
+  def test_to_xml_string
+    str = @vml_drawing.to_xml_string()
+    doc = Nokogiri::XML(str)
+    assert_equal(doc.xpath("//v:shape").size, 2)
+    assert(doc.xpath("//o:idmap[@o:data='#{@ws.index+1}']"))
+  end
+
+end

data/test/drawing/tc_vml_shape.rb

@@ -0,0 +1,100 @@
+require 'tc_helper.rb'
+
+class TestVmlShape < Test::Unit::TestCase
+
+  def setup
+    p = Axlsx::Package.new
+    wb = p.workbook
+    @ws = wb.add_worksheet
+    @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank'
+    @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO'
+    @comments = @ws.comments
+  end
+
+  def test_initialize
+    assert_raise(ArgumentError) { Axlsx::VmlDrawing.new }
+  end
+
+  def test_row
+    shape = @comments.first.vml_shape
+    assert_equal(shape.row, 0)
+    shape = @comments.last.vml_shape
+    assert_equal(shape.row, 2)
+  end
+
+  def test_column
+    shape = @comments.first.vml_shape
+    assert_equal(shape.column, 0)
+    shape = @comments.last.vml_shape
+    assert_equal(shape.column, 2)
+  end
+
+  def test_left_column
+    shape = @comments.first.vml_shape
+    shape.left_column = 3
+    assert(shape.left_column == 3)
+    assert_raise(ArgumentError) { shape.left_column = [] }
+  end
+
+  def test_left_offset
+    shape = @comments.first.vml_shape
+    shape.left_offset = 3
+    assert(shape.left_offset == 3)
+    assert_raise(ArgumentError) { shape.left_offset = [] }
+  end
+
+  def test_right_column
+    shape = @comments.first.vml_shape
+    shape.right_column = 3
+    assert(shape.right_column == 3)
+    assert_raise(ArgumentError) { shape.right_column = [] }
+  end
+
+  def test_right_offset
+    shape = @comments.first.vml_shape
+    shape.right_offset = 3
+    assert(shape.right_offset == 3)
+    assert_raise(ArgumentError) { shape.right_offset = [] }
+  end
+
+  def test_top_offset
+    shape = @comments.first.vml_shape
+    shape.top_offset = 3
+    assert(shape.top_offset == 3)
+    assert_raise(ArgumentError) { shape.top_offset = [] }
+  end
+
+  def test_bottom_offset
+    shape = @comments.first.vml_shape
+    shape.bottom_offset = 3
+    assert(shape.bottom_offset == 3)
+    assert_raise(ArgumentError) { shape.bottom_offset = [] }
+  end
+
+  def test_bottom_row
+    shape = @comments.first.vml_shape
+    shape.bottom_row = 3
+    assert(shape.bottom_row == 3)
+    assert_raise(ArgumentError) { shape.bottom_row = [] }
+  end
+
+  def test_top_row
+    shape = @comments.first.vml_shape
+    shape.top_row = 3
+    assert(shape.top_row == 3)
+    assert_raise(ArgumentError) { shape.top_row = [] }
+  end
+
+  def test_to_xml_string
+    str = @comments.vml_drawing.to_xml_string()
+    doc = Nokogiri::XML(str)
+    assert_equal(doc.xpath("//v:shape").size, 2)
+    @comments.each do |comment|
+      shape = comment.vml_shape
+      assert(doc.xpath("//v:shape/x:ClientData/x:Row[text()='#{shape.row}']").size == 1)
+      assert(doc.xpath("//v:shape/x:ClientData/x:Column[text()='#{shape.column}']").size == 1)
+      assert(doc.xpath("//v:shape/x:ClientData/x:Anchor[text()='#{shape.left_column}, #{shape.left_offset}, #{shape.top_row}, #{shape.top_offset}, #{shape.right_column}, #{shape.right_offset}, #{shape.bottom_row}, #{shape.bottom_offset}']").size == 1)
+    end
+  end
+
+end

data/test/profile.rb

@@ -15,11 +15,12 @@ require 'perftools'
 row = []
 input = (32..126).to_a.pack('U*').chars.to_a
 20.times { row << input.shuffle.join}
-times = 1000
+times = 3000
 
 PerfTools::CpuProfiler.start("/tmp/axlsx_noautowidth") do
   p = Axlsx::Package.new
   p.use_autowidth = false
+  p.use_shared_strings = true
   wb = p.workbook
   
   #A Simple Workbook

data/test/rels/tc_relationship.rb

@@ -10,6 +10,7 @@ class TestRelationships < Test::Unit::TestCase
   def test_type
     assert_raise(ArgumentError) { Axlsx::Relationship.new 'type', 'target' }
     assert_nothing_raised { Axlsx::Relationship.new Axlsx::WORKSHEET_R, 'target' }
+    assert_nothing_raised { Axlsx::Relationship.new Axlsx::COMMENT_R, 'target' }
   end
 
   def test_target_mode

data/test/stylesheet/tc_dxf.rb

@@ -0,0 +1,81 @@
+require 'tc_helper.rb'
+
+class TestDxf < Test::Unit::TestCase
+
+  def setup
+    @item = Axlsx::Dxf.new
+    @styles = Axlsx::Styles.new    
+  end
+
+  def teardown
+  end
+
+  def test_initialiation
+    assert_equal(@item.alignment, nil)
+    assert_equal(@item.protection, nil)
+    assert_equal(@item.numFmt, nil)
+    assert_equal(@item.font, nil)
+    assert_equal(@item.fill, nil)
+    assert_equal(@item.border, nil)
+  end
+
+  def test_alignment
+    assert_raise(ArgumentError) { @item.alignment = -1.1 }
+    assert_nothing_raised { @item.alignment = Axlsx::CellAlignment.new }
+    assert(@item.alignment.is_a?(Axlsx::CellAlignment))
+  end
+
+  def test_protection
+    assert_raise(ArgumentError) { @item.protection = -1.1 }
+    assert_nothing_raised { @item.protection = Axlsx::CellProtection.new }
+    assert(@item.protection.is_a?(Axlsx::CellProtection))
+  end
+
+  def test_numFmt
+    assert_raise(ArgumentError) { @item.numFmt = 1 }
+    assert_nothing_raised { @item.numFmt = Axlsx::NumFmt.new }
+    assert @item.numFmt.is_a? Axlsx::NumFmt
+  end
+
+  def test_fill
+    assert_raise(ArgumentError) { @item.fill =  1 }
+    assert_nothing_raised { @item.fill = Axlsx::Fill.new(Axlsx::PatternFill.new(:patternType =>:solid, :fgColor=> Axlsx::Color.new(:rgb => "FF000000"))) }
+    assert @item.fill.is_a? Axlsx::Fill
+  end
+
+  def test_font
+    assert_raise(ArgumentError) { @item.font = 1 }
+    assert_nothing_raised { @item.font = Axlsx::Font.new }
+    assert @item.font.is_a? Axlsx::Font 
+  end
+
+  def test_border
+    assert_raise(ArgumentError) { @item.border = 1 }
+    assert_nothing_raised { @item.border = Axlsx::Border.new }
+    assert @item.border.is_a? Axlsx::Border
+  end
+
+  def test_to_xml
+    @item.border = Axlsx::Border.new
+    doc = Nokogiri::XML.parse(@item.to_xml_string)
+    assert_equal(1, doc.xpath(".//dxf//border").size)
+    assert_equal(0, doc.xpath(".//dxf//font").size)    
+  end
+
+  def test_many_options_xml
+    @item.border = Axlsx::Border.new
+    @item.alignment = Axlsx::CellAlignment.new
+    @item.fill = Axlsx::Fill.new(Axlsx::PatternFill.new(:patternType =>:solid, :fgColor=> Axlsx::Color.new(:rgb => "FF000000")))
+    @item.font = Axlsx::Font.new
+    @item.protection = Axlsx::CellProtection.new
+    @item.numFmt = Axlsx::NumFmt.new
+    
+    doc = Nokogiri::XML.parse(@item.to_xml_string)
+    assert_equal(1, doc.xpath(".//dxf//fill//patternFill[@patternType='solid']//fgColor[@rgb='FF000000']").size)
+    assert_equal(1, doc.xpath(".//dxf//font").size)
+    assert_equal(1, doc.xpath(".//dxf//protection").size)
+    assert_equal(1, doc.xpath(".//dxf//numFmt[@numFmtId='0'][@formatCode='']").size)
+    assert_equal(1, doc.xpath(".//dxf//alignment").size)
+    assert_equal(1, doc.xpath(".//dxf//border").size)    
+  end
+end

data/test/stylesheet/tc_gradient_fill.rb

@@ -61,4 +61,12 @@ class TestGradientFill < Test::Unit::TestCase
     assert(@item.stop.size == 1)
     assert(@item.stop.last.is_a?(Axlsx::GradientStop))
   end
+
+  def test_to_xml_string
+    @item.stop << Axlsx::GradientStop.new(Axlsx::Color.new(:rgb => "000000"), 0.5)
+    @item.stop << Axlsx::GradientStop.new(Axlsx::Color.new(:rgb => "FFFFFF"), 0.5)
+    @item.type = :path
+    doc = Nokogiri::XML(@item.to_xml_string)
+    assert(doc.xpath("//color[@rgb='FF000000']"))
+  end
 end

data/test/stylesheet/tc_pattern_fill.rb

@@ -33,5 +33,11 @@ class TestPatternFill < Test::Unit::TestCase
     assert_nothing_raised { @item.patternType = :lightUp }
     assert_equal(@item.patternType, :lightUp)
   end
-
+ 
+  def test_to_xml_string
+    @item = Axlsx::PatternFill.new :bgColor => Axlsx::Color.new(:rgb => "FF0000"), :fgColor => Axlsx::Color.new(:rgb=>"00FF00") 
+    doc = Nokogiri::XML(@item.to_xml_string)
+    assert(doc.xpath('//color[@rgb="FFFF0000"]'))
+    assert(doc.xpath('//color[@rgb="FF00FF00"]'))
+  end
 end

data/test/stylesheet/tc_styles.rb

@@ -19,11 +19,130 @@ class TestStyles < Test::Unit::TestCase
   end
   def test_add_style_border_hash
     border_count = @styles.borders.size
-    s = @styles.add_style :border => {:style=>:thin, :color => "FFFF0000"}
+    @styles.add_style :border => {:style => :thin, :color => "FFFF0000"}
     assert_equal(@styles.borders.size, border_count + 1)
     assert_equal(@styles.borders.last.prs.last.color.rgb, "FFFF0000")
     assert_raise(ArgumentError) { @styles.add_style :border => {:color => "FFFF0000"} }
+    assert_equal @styles.borders.last.prs.size, 4
+  end
+
+  def test_add_style_border_edges
+    @styles.add_style :border => { :style => :thin, :color => "0000FFFF", :edges => [:top, :bottom] }
+    parts = @styles.borders.last.prs
+    parts.each { |pr| assert_equal(pr.color.rgb, "0000FFFF", "Style is applied to #{pr.name} properly") }
+    assert((parts.map { |pr| pr.name.to_s }.sort && ['bottom', 'top']).size == 2, "specify two edges, and you get two border prs")
+  end
+
+  def test_do_not_alter_options_in_add_style
+    #This should test all options, but for now - just the bits that we know caused some pain
+    options = { :border => { :style => :thin, :color =>"FF000000" } }
+    @styles.add_style options
+    assert_equal options[:border][:style], :thin, 'thin style is stil in option'
+    assert_equal options[:border][:color], "FF000000", 'color is stil in option'
+  end
+
+  def test_parse_num_fmt
+    f_code = {:format_code => "YYYY/MM"}
+    num_fmt = {:num_fmt => 5}
+    assert_equal(@styles.parse_num_fmt_options, nil, 'noop if neither :format_code or :num_fmt exist')
+    max = @styles.numFmts.map{ |nf| nf.numFmtId }.max
+    @styles.parse_num_fmt_options(f_code)
+    assert_equal(@styles.numFmts.last.numFmtId, max + 1, "new numfmts gets next available id")
+    assert(@styles.parse_num_fmt_options(num_fmt).is_a?(Integer), "Should return the provided num_fmt if not dxf")
+    assert(@styles.parse_num_fmt_options(num_fmt.merge({:type => :dxf})).is_a?(Axlsx::NumFmt), "Makes a new NumFmt if dxf")
+  end
+
+  def test_parse_border_options_hash_required_keys
+    assert_raise(ArgumentError, "Require color key") { @styles.parse_border_options(:border => { :style => :thin }) }
+    assert_raise(ArgumentError, "Require style key") { @styles.parse_border_options(:border => { :color => "FF0d0d0d" }) }
+    assert_nothing_raised { @styles.parse_border_options(:border => { :style => :thin, :color => "FF000000"} ) }
+  end
+
+  def test_parse_border_basic_options
+    b_opts = {:border => { :diagonalUp => 1, :edges => [:left, :right], :color => "FFDADADA", :style => :thick } }
+    b = @styles.parse_border_options b_opts
+    assert(b.is_a? Integer)
+    assert_equal(@styles.parse_border_options(b_opts.merge({:type => :dxf})).class,Axlsx::Border)
+    assert(@styles.borders.last.diagonalUp == 1, "border options are passed in to the initializer")
+  end
+
+  def test_parse_border_options_edges
+    b_opts = {:border => { :diagonalUp => 1, :edges => [:left, :right], :color => "FFDADADA", :style => :thick } }
+    @styles.parse_border_options b_opts
+    b = @styles.borders.last
+    left = b.prs.select { |bpr| bpr.name == :left }[0]
+    right = b.prs.select { |bpr| bpr.name == :right }[0]
+    top = b.prs.select { |bpr| bpr.name == :top }[0]
+    bottom = b.prs.select { |bpr| bpr.name == :bottom }[0]
+    assert_equal(top, nil, "unspecified top edge should not be created")
+    assert_equal(bottom, nil, "unspecified bottom edge should not be created")
+    assert(left.is_a?(Axlsx::BorderPr), "specified left edge is set")
+    assert(right.is_a?(Axlsx::BorderPr), "specified right edge is set")
+    assert_equal(left.style,right.style, "edge parts have the same style")
+    assert_equal(left.style, :thick, "the style is THICK")
+    assert_equal(right.color.rgb,left.color.rgb, "edge parts are colors are the same")
+    assert_equal(right.color.rgb,"FFDADADA", "edge color rgb is correct")
+  end
+
+  def test_parse_border_options_noop
+    assert_equal(@styles.parse_border_options({}), nil, "noop if the border key is not in options")
+  end
+
+  def test_parse_border_options_integer_xf
+    assert_equal(@styles.parse_border_options(:border => 1), 1)
+    assert_raise(ArgumentError, "unknown border index") {@styles.parse_border_options(:border => 100) }
+  end
+
+  def test_parse_border_options_integer_dxf
+    b_opts = { :border => { :edges => [:left, :right], :color => "FFFFFFFF", :style=> :thick } }
+    b = @styles.parse_border_options(b_opts)
+    b2 = @styles.parse_border_options(:border => b, :type => :dxf)
+    assert(b2.is_a?(Axlsx::Border), "Cloned existing border object")
+  end
+
+  def test_parse_alignment_options
+    assert_equal(@styles.parse_alignment_options {}, nil, "noop if :alignment is not set")
+    assert(@styles.parse_alignment_options(:alignment => {}).is_a?(Axlsx::CellAlignment))
+  end
+
+  def test_parse_font_options
+    options = {
+      :fg_color => "FF050505",
+      :sz => 20,
+      :b => 1,
+      :i => 1,
+      :u => 1,
+      :strike => 1,
+      :outline => 1,
+      :shadow => 1,
+      :charset => 9,
+      :family => 1,
+      :font_name => "woot font"
+    }
+    assert_equal(@styles.parse_font_options {}, nil, "noop if no font keys are set")
+    assert_equal(@styles.parse_font_options(:b=>1).class, Fixnum, "return index of font if not :dxf type")
+    assert_equal(@styles.parse_font_options(:b=>1, :type => :dxf).class, Axlsx::Font, "return font object if :dxf type")
+
+    f = @styles.parse_font_options(options.merge(:type => :dxf))
+    color = options.delete(:fg_color)
+    options[:name] = options.delete(:font_name)
+    options.each do |key, value|
+      assert_equal(f.send(key), value, "assert that #{key} was parsed")
+    end
+    assert_equal(f.color.rgb, color)
+  end
 
+  def test_parse_fill_options
+    assert_equal(@styles.parse_fill_options {}, nil, "noop if no fill keys are set")
+    assert_equal(@styles.parse_fill_options(:bg_color => "DE").class, Fixnum, "return index of fill if not :dxf type")
+    assert_equal(@styles.parse_fill_options(:bg_color => "DE", :type => :dxf).class, Axlsx::Fill, "return fill object if :dxf type")
+    f = @styles.parse_fill_options(:bg_color => "DE", :type => :dxf)
+    assert(f.fill_type.fgColor.rgb == "FFDEDEDE")
+  end
+
+  def test_parse_protection_options
+    assert_equal(@styles.parse_protection_options {}, nil, "noop if no protection keys are set")
+    assert_equal(@styles.parse_protection_options(:hidden => 1).class, Axlsx::CellProtection, "creates a new cell protection object")
   end
 
   def test_add_style
@@ -53,10 +172,51 @@ class TestStyles < Test::Unit::TestCase
     assert_raise(ArgumentError, "should reject invalid borderId") { @styles.add_style :border => 2 }
 
 
-    assert_equal(xf.applyProtection, 1, "protection applied")
+    assert_equal(xf.applyProtection, true, "protection applied")
     assert_equal(xf.applyBorder, true, "border applied")
-    assert_equal(xf.applyNumberFormat, true, "number format applied")
+    assert_equal(xf.applyNumberFormat,true, "number format applied")
     assert_equal(xf.applyAlignment, true, "alignment applied")
   end
 
+  def test_basic_add_style_dxf
+    border_count = @styles.borders.size
+    @styles.add_style :border => {:style => :thin, :color => "FFFF0000"}, :type => :dxf
+    assert_equal(@styles.borders.size, border_count, "styles borders not affected")
+    assert_equal(@styles.dxfs.last.border.prs.last.color.rgb, "FFFF0000")
+    assert_raise(ArgumentError) { @styles.add_style :border => {:color => "FFFF0000"}, :type => :dxf }
+    assert_equal @styles.borders.last.prs.size, 4
+  end
+
+  def test_add_style_dxf
+    fill_count = @styles.fills.size
+    font_count = @styles.fonts.size
+    dxf_count = @styles.dxfs.size
+
+    style = @styles.add_style :bg_color=>"FF000000", :fg_color=>"FFFFFFFF", :sz=>13, :alignment=>{:horizontal=>:left}, :border=>{:style => :thin, :color => "FFFF0000"}, :hidden=>true, :locked=>true, :type => :dxf
+    assert_equal(@styles.dxfs.size, dxf_count+1)
+    assert_equal(0, style, "returns the zero-based dxfId")
+
+    dxf = @styles.dxfs.last
+    assert_equal(@styles.dxfs.last.fill.fill_type.fgColor.rgb, "FF000000", "fill created with color")
+
+    assert_equal(font_count, (@styles.fonts.size), "font not created under styles")
+    assert_equal(fill_count, (@styles.fills.size), "fill not created under styles")
+
+    assert(dxf.border.is_a?(Axlsx::Border), "border is set")
+    assert_equal(nil, dxf.numFmt, "number format is not set")
+
+    assert(dxf.alignment.is_a?(Axlsx::CellAlignment), "alignment was created")
+    assert_equal(dxf.alignment.horizontal, :left, "horizontal alignment applied")
+    assert_equal(dxf.protection.hidden, true, "hidden protection set")
+    assert_equal(dxf.protection.locked, true, "cell locking set")
+    assert_raise(ArgumentError, "should reject invalid borderId") { @styles.add_style :border => 3 }
+  end
+
+  def test_multiple_dxf
+    # add a second style
+    style = @styles.add_style :bg_color=>"00000000", :fg_color=>"FFFFFFFF", :sz=>13, :alignment=>{:horizontal=>:left}, :border=>{:style => :thin, :color => "FFFF0000"}, :hidden=>true, :locked=>true, :type => :dxf
+    assert_equal(0, style, "returns the first dxfId")
+    style = @styles.add_style :bg_color=>"FF000000", :fg_color=>"FFFFFFFF", :sz=>13, :alignment=>{:horizontal=>:left}, :border=>{:style => :thin, :color => "FFFF0000"}, :hidden=>true, :locked=>true, :type => :dxf
+    assert_equal(1, style, "returns the second dxfId")
+  end
 end

data/test/stylesheet/tc_table_style.rb

@@ -13,6 +13,10 @@ class TestTableStyle < Test::Unit::TestCase
     assert_equal(@item.name, "fisher")
     assert_equal(@item.pivot, nil)
     assert_equal(@item.table, nil)
+    ts = Axlsx::TableStyle.new 'price', :pivot => true, :table => true
+    assert_equal(ts.name, 'price')
+    assert_equal(ts.pivot, true)
+    assert_equal(ts.table, true)
   end
 
   def test_name
@@ -33,4 +37,8 @@ class TestTableStyle < Test::Unit::TestCase
     assert_equal(@item.table, true)
   end
 
+  def test_to_xml_string
+    doc = Nokogiri::XML(@item.to_xml_string)
+    assert(doc.xpath("//tableStyle[@name='#{@item.name}']"))
+  end
 end

data/test/stylesheet/tc_table_style_element.rb

@@ -13,6 +13,10 @@ class TestTableStyleElement < Test::Unit::TestCase
     assert_equal(@item.type, nil)
     assert_equal(@item.size, nil)
     assert_equal(@item.dxfId, nil)
+    options = { :type => :headerRow, :size => 10, :dxfId => 1 }
+
+    tse = Axlsx::TableStyleElement.new options
+    options.each { |key, value| assert_equal(tse.send(key.to_sym), value) }
   end
 
   def test_type
@@ -32,5 +36,10 @@ class TestTableStyleElement < Test::Unit::TestCase
     assert_nothing_raised { @item.dxfId = 7 }
     assert_equal(@item.dxfId, 7)
   end
-
+  
+  def test_to_xml_string
+    doc = Nokogiri::XML(@item.to_xml_string)
+   @item.type = :headerRow
+    assert(doc.xpath("//tableStyleElement[@type='#{@item.type.to_s}']"))
+  end
 end

data/test/tc_helper.rb

@@ -1,3 +1,4 @@
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'cover_me' unless RUBY_VERSION == '1.8.7'
 require 'test/unit'
 require "axlsx.rb"

data/test/tc_package.rb

@@ -1,13 +1,78 @@
+# encoding: UTF-8
 require 'tc_helper.rb'
 
 class TestPackage < Test::Unit::TestCase
   def setup
     @package = Axlsx::Package.new
     ws = @package.workbook.add_worksheet
-    chart = ws.add_chart Axlsx::Pie3DChart
-    chart.add_series :data=>[1,2,3], :labels=>["a", "b", "c"]
+    ws.add_row ['Can', 'we', 'build it?']
+    ws.add_row ['Yes!', 'We', 'can!']
+    ws.workbook.add_defined_name("#{ws.name}!A1:C2", :name => '_xlnm.Print_Titles', :hidden => true)
+    ws.protect_range('A1:C1')
+    ws.protect_range(ws.rows.last.cells)
+    ws.add_comment :author => 'alice', :text => 'Hi Bob', :ref => 'A12'
+    ws.add_comment :author => 'bob', :text => 'Hi Alice', :ref => 'F19'
+    ws.sheet_view do |vs|
+      vs.pane do |p|
+        p.active_pane = :top_right
+        p.state = :split
+        p.x_split = 11080
+        p.y_split = 5000
+        p.top_left_cell = 'C44'
+      end
+
+      vs.add_selection(:top_left, { :active_cell => 'A2', :sqref => 'A2' })
+      vs.add_selection(:top_right, { :active_cell => 'I10', :sqref => 'I10' })
+      vs.add_selection(:bottom_left, { :active_cell => 'E55', :sqref => 'E55' })
+      vs.add_selection(:bottom_right, { :active_cell => 'I57', :sqref => 'I57' })
+    end
+
+    ws.add_chart(Axlsx::Pie3DChart, :title => "これは？", :start_at => [0,3]) do |chart|
+      chart.add_series :data=>[1,2,3], :labels=>["a", "b", "c"]
+      chart.d_lbls.show_val = true
+      chart.d_lbls.d_lbl_pos = :outEnd
+      chart.d_lbls.show_percent = true
+    end
+
+    ws.add_chart(Axlsx::Line3DChart, :title => "axis labels") do |chart|
+      chart.valAxis.title = 'bob'
+      chart.d_lbls.show_val = true
+    end 
+    
+    ws.add_chart(Axlsx::Bar3DChart, :title => 'bar chart') do |chart|
+      chart.add_series :data => [1,4,5], :labels => %w(A B C)
+      chart.d_lbls.show_percent = true
+    end
+
+    ws.add_chart(Axlsx::ScatterChart, :title => 'scat man') do |chart|
+      chart.add_series :xData => [1,2,3,4], :yData => [4,3,2,1] 
+      chart.d_lbls.show_val = true
+    end
+
     @fname = 'axlsx_test_serialization.xlsx'
+    img = File.expand_path('../../examples/image1.jpeg', __FILE__)
+    ws.add_image(:image_src => img, :noSelect => true, :noMove => true, :hyperlink=>"http://axlsx.blogspot.com") do |image|
+      image.width=720
+      image.height=666
+      image.hyperlink.tooltip = "Labeled Link"
+      image.start_at 5, 5
+    end
+    ws.add_image :image_src => File.expand_path('../../examples/image1.gif', __FILE__) do |image|
+      image.start_at 0, 20
+      image.width=360
+      image.height=333 
+    end
+    ws.add_image :image_src => File.expand_path('../../examples/image1.png', __FILE__) do |image|
+      image.start_at 9, 20
+      image.width = 180
+      image.height = 167
+    end
+    ws.add_table 'A1:C1'
+  end
 
+  def test_use_autowidth
+    @package.use_autowidth = false
+    assert(@package.workbook.use_autowidth == false)
   end
 
   def test_core_accessor
@@ -35,30 +100,26 @@ class TestPackage < Test::Unit::TestCase
   end
 
   def test_serialization
-    fname = 'axlsx_test_serialization.xlsx'
     assert_nothing_raised do
       begin
-         z= @package.serialize(@fname)
-         zf = Zip::ZipFile.open(@fname)
-         @package.send(:parts).each{ |part| zf.get_entry(part[:entry]) }
-         File.delete(@fname)
+        @package.serialize(@fname)
+        zf = Zip::ZipFile.open(@fname)
+        @package.send(:parts).each{ |part| zf.get_entry(part[:entry]) }
+        File.delete(@fname)
       rescue Errno::EACCES
-         puts "WARNING:: test_serialization requires write access."
+        puts "WARNING:: test_serialization requires write access."
       end
-     end
-   end
+    end
+  end
 
   def test_validation
     assert_equal(@package.validate.size, 0, @package.validate)
-    #how to test for failure? the internal validations on the models are so strict I cant break anthing.....
+    Axlsx::Workbook.send(:class_variable_set, :@@date1904, 9900)
+    assert(@package.validate.size > 0)
   end
 
   def test_parts
     p = @package.send(:parts)
-    p.each do |part|
-      #all parts must have :doc, :entry, :schema
-      assert(part.keys.size == 3 && part.keys.reject{ |k| [:doc, :entry, :schema].include? k}.empty?)
-    end
     #all parts have an entry
     assert_equal(p.select{ |part| part[:entry] =~ /_rels\/\.rels/ }.size, 1, "rels missing")
     assert_equal(p.select{ |part| part[:entry] =~ /docProps\/core\.xml/ }.size, 1, "core missing")
@@ -72,9 +133,11 @@ class TestPackage < Test::Unit::TestCase
     assert_equal(p.select{ |part| part[:entry] =~ /xl\/charts\/chart\d\.xml/ }.size, @package.workbook.charts.size, "one or more charts missing")
     assert_equal(p.select{ |part| part[:entry] =~ /xl\/worksheets\/sheet\d\.xml/ }.size, @package.workbook.worksheets.size, "one or more sheet missing")
     assert_equal(p.select{ |part| part[:entry] =~ /xl\/worksheets\/_rels\/sheet\d\.xml\.rels/ }.size, @package.workbook.worksheets.size, "one or more sheet rels missing")
+    assert_equal(p.select{ |part| part[:entry] =~ /xl\/comments\d\.xml/ }.size, @package.workbook.worksheets.size, "one or more sheet rels missing")
+
 
     #no mystery parts
-    assert_equal(p.size, 12)
+    assert_equal(p.size, 21)
 
   end
 
@@ -102,11 +165,24 @@ class TestPackage < Test::Unit::TestCase
   def test_content_type_added_with_shared_strings
     @package.use_shared_strings = true
     ct = @package.send(:content_types)
-    assert(ct.select { |ct| ct.ContentType == Axlsx::SHARED_STRINGS_CT }.size == 1)
+    assert(ct.select { |type| type.ContentType == Axlsx::SHARED_STRINGS_CT }.size == 1)
   end
 
   def test_name_to_indices
     assert(Axlsx::name_to_indices('A1') == [0,0])
     assert(Axlsx::name_to_indices('A100') == [0,99], 'needs to axcept rows that contain 0')
   end
+
+  def test_to_stream
+    stream = @package.to_stream
+    assert(stream.is_a?(StringIO))
+    # this is just a roundabout guess for a package as it is build now
+    # in testing.
+    assert(stream.size > 80000)
+  end
+
+  def test_encrypt
+    # this is no where near close to ready yet
+    assert(@package.encrypt('your_mom.xlsxl', 'has a password') == false)
+  end
 end

data/test/util/tc_simple_typed_list.rb

@@ -61,5 +61,18 @@ class TestSimpleTypedList < Test::Unit::TestCase
     assert_nothing_raised { @list.delete 0 }
     assert_nothing_raised { @list.delete 9 }
   end
+  
+  def test_delete
+    @list.push 1
+    assert(@list.size == 1)
+    @list.delete 1
+    assert(@list.empty?)
+  end
 
+  def test_equality
+    @list.push 1
+    @list.push 2
+    assert_equal(@list, [1,2])
+    
+  end
 end