axlsx 1.3.6 → 2.0.1

data/test/workbook/worksheet/tc_pivot_table.rb

@@ -1,5 +1,17 @@
 require 'tc_helper.rb'
 
+
+def shared_test_pivot_table_xml_validity(pivot_table)
+  schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
+  doc = Nokogiri::XML(pivot_table.to_xml_string)
+  errors = []
+  schema.validate(doc).each do |error|
+    errors.push error
+    puts error.message
+  end
+  assert(errors.empty?, "error free validation")
+end
+
 class TestPivotTable < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
@@ -24,8 +36,18 @@ class TestPivotTable < Test::Unit::TestCase
     assert_equal(@ws.pivot_tables.last, pivot_table, "must be added to worksheet pivot tables collection")
   end
 
+  def test_set_pivot_table_data_sheet
+    pivot_table = @ws.add_pivot_table('G5:G6', 'A1:D5')
+    data_sheet = @ws.clone
+    data_sheet.name = "Pivot Table Data Source"
+
+    assert_equal(pivot_table.data_sheet.name, @ws.name, "must default to the same sheet the pivot table is added to")
+    pivot_table.data_sheet = data_sheet
+    assert_equal(pivot_table.data_sheet.name, data_sheet.name, "data sheet assigned to pivot table")
+  end
+
   def test_add_pivot_table_with_config
-    pivot_table = @ws.add_pivot_table('G5:G6', 'A1:D5') do |pt|
+    pivot_table = @ws.add_pivot_table('G5:G6', 'A1:E5') do |pt|
       pt.rows = ['Year', 'Month']
       pt.columns = ['Type']
       pt.data = ['Sales']
@@ -33,8 +55,16 @@ class TestPivotTable < Test::Unit::TestCase
     end
     assert_equal(['Year', 'Month'], pivot_table.rows)
     assert_equal(['Type'], pivot_table.columns)
-    assert_equal(['Sales'], pivot_table.data)
+    assert_equal([{:ref=>"Sales"}], pivot_table.data)
     assert_equal(['Region'], pivot_table.pages)
+    shared_test_pivot_table_xml_validity(pivot_table)
+  end
+
+  def test_add_pivot_table_with_options_on_data_field
+    pivot_table = @ws.add_pivot_table('G5:G6', 'A1:D5') do |pt|
+      pt.data = [{:ref=>"Sales", :subtotal => 'average'}]
+    end
+    assert_equal([{:ref=>"Sales", :subtotal => 'average'}], pivot_table.data)
   end
 
   def test_header_indices
@@ -53,11 +83,6 @@ class TestPivotTable < Test::Unit::TestCase
     assert_equal(@ws.pivot_tables.first.pn, "pivotTables/pivotTable1.xml")
   end
 
-  def test_rId
-    @ws.add_pivot_table('G5:G6', 'A1:D5')
-    assert_equal(@ws.pivot_tables.first.rId, "rId1")
-  end
-
   def test_index
     @ws.add_pivot_table('G5:G6', 'A1:D5')
     assert_equal(@ws.pivot_tables.first.index, @ws.workbook.pivot_tables.index(@ws.pivot_tables.first))
@@ -73,14 +98,7 @@ class TestPivotTable < Test::Unit::TestCase
 
   def test_to_xml_string
     pivot_table = @ws.add_pivot_table('G5:G6', 'A1:D5')
-    schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
-    doc = Nokogiri::XML(pivot_table.to_xml_string)
-    errors = []
-    schema.validate(doc).each do |error|
-      errors.push error
-      puts error.message
-    end
-    assert(errors.empty?, "error free validation")
+    shared_test_pivot_table_xml_validity(pivot_table)
   end
 
   def test_to_xml_string_with_configuration
@@ -90,13 +108,13 @@ class TestPivotTable < Test::Unit::TestCase
       pt.data = ['Sales']
       pt.pages = ['Region']
     end
-    schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
-    doc = Nokogiri::XML(pivot_table.to_xml_string)
-    errors = []
-    schema.validate(doc).each do |error|
-      errors.push error
-      puts error.message
+    shared_test_pivot_table_xml_validity(pivot_table)
+  end
+
+  def test_to_xml_string_with_options_on_data_field
+    pivot_table = @ws.add_pivot_table('G5:G6', 'A1:E5') do |pt|
+      pt.data = [{:ref=>"Sales", :subtotal => 'average'}]
     end
-    assert(errors.empty?, "error free validation")
+    shared_test_pivot_table_xml_validity(pivot_table)
   end
 end

data/test/workbook/worksheet/tc_pivot_table_cache_definition.rb

@@ -21,7 +21,7 @@ class TestPivotTableCacheDefinition < Test::Unit::TestCase
   end
 
   def test_rId
-    assert_equal('rId1', @cache_definition.rId)
+    assert_equal @pivot_table.relationships.for(@cache_definition).Id, @cache_definition.rId
   end
 
   def test_index
@@ -32,6 +32,14 @@ class TestPivotTableCacheDefinition < Test::Unit::TestCase
     assert_equal(1, @cache_definition.cache_id)
   end
 
+  def test_data_sheet
+    data_sheet = @ws.clone
+    data_sheet.name = "Pivot Table Data Source"
+    @pivot_table.data_sheet = data_sheet
+
+    assert(@cache_definition.to_xml_string.include?(data_sheet.name), "must set the data source correctly")
+  end
+
   def test_to_xml_string
     schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
     doc = Nokogiri::XML(@cache_definition.to_xml_string)

data/test/workbook/worksheet/tc_sheet_view.rb

@@ -5,207 +5,207 @@ require 'tc_helper.rb'
 class TestSheetView < Test::Unit::TestCase
   def setup
     #inverse defaults for booleans
-    @boolean_options = { :right_to_left => true, :show_formulas => true, :show_outline_symbols => true, 
+    @boolean_options = { :right_to_left => true, :show_formulas => true, :show_outline_symbols => true,
       :show_white_space => true, :tab_selected => true, :default_grid_color => false, :show_grid_lines => false,
       :show_row_col_headers => false, :show_ruler => false, :show_zeros => false, :window_protection => true }
     @symbol_options = { :view => :page_break_preview }
     @nil_options = { :color_id => 2, :top_left_cell => 'A2' }
     @int_0 = { :zoom_scale_normal => 100, :zoom_scale_page_layout_view => 100, :zoom_scale_sheet_layout_view => 100, :workbook_view_id => 2 }
     @int_100 = { :zoom_scale => 10 }
-    
+
     @integer_options = { :color_id => 2, :workbook_view_id => 2 }.merge(@int_0).merge(@int_100)
     @string_options = { :top_left_cell => 'A2' }
-    
-    
+
+
     @options = @boolean_options.merge(@boolean_options).merge(@symbol_options).merge(@nil_options).merge(@int_0).merge(@int_100)
-    
+
     @sv = Axlsx::SheetView.new(@options)
   end
-  
+
   def test_initialize
     sv = Axlsx::SheetView.new
-    
+
     @boolean_options.each do |key, value|
       assert_equal(!value, sv.send(key.to_sym), "initialized default #{key} should be #{!value}")
       assert_equal(value, @sv.send(key.to_sym), "initialized options #{key} should be #{value}")
     end
-    
+
     @nil_options.each do |key, value|
       assert_equal(nil, sv.send(key.to_sym), "initialized default #{key} should be nil")
       assert_equal(value, @sv.send(key.to_sym), "initialized options #{key} should be #{value}")
     end
-    
+
     @int_0.each do |key, value|
       assert_equal(0, sv.send(key.to_sym), "initialized default #{key} should be 0")
       assert_equal(value, @sv.send(key.to_sym), "initialized options #{key} should be #{value}")
     end
-    
+
     @int_100.each do |key, value|
       assert_equal(100, sv.send(key.to_sym), "initialized default #{key} should be 100")
       assert_equal(value, @sv.send(key.to_sym), "initialized options #{key} should be #{value}")
     end
   end
-  
+
   def test_boolean_attribute_validation
     @boolean_options.each do |key, value|
       assert_raise(ArgumentError, "#{key} must be boolean") { @sv.send("#{key}=".to_sym, 'A') }
       assert_nothing_raised { @sv.send("#{key}=".to_sym, true) }
     end
   end
-  
+
   def test_string_attribute_validation
     @string_options.each do |key, value|
       assert_raise(ArgumentError, "#{key} must be string") { @sv.send("#{key}=".to_sym, :symbol) }
       assert_nothing_raised { @sv.send("#{key}=".to_sym, "foo") }
     end
   end
-  
+
   def test_symbol_attribute_validation
     @symbol_options.each do |key, value|
       assert_raise(ArgumentError, "#{key} must be symbol") { @sv.send("#{key}=".to_sym, "foo") }
       assert_nothing_raised { @sv.send("#{key}=".to_sym, value) }
     end
   end
-  
+
   def test_integer_attribute_validation
     @integer_options.each do |key, value|
       assert_raise(ArgumentError, "#{key} must be integer") { @sv.send("#{key}=".to_sym, "foo") }
       assert_nothing_raised { @sv.send("#{key}=".to_sym, value) }
     end
   end
-  
+
   def test_color_id
     assert_raise(ArgumentError) { @sv.color_id = "10" }
     assert_nothing_raised { @sv.color_id = 2 }
     assert_equal(@sv.color_id, 2)
   end
-  
+
   def test_default_grid_color
     assert_raise(ArgumentError) { @sv.default_grid_color = "foo" }
     assert_nothing_raised { @sv.default_grid_color = false }
     assert_equal(@sv.default_grid_color, false)
   end
-  
+
   def test_right_to_left
     assert_raise(ArgumentError) { @sv.right_to_left = "foo´" }
     assert_nothing_raised { @sv.right_to_left = true }
     assert_equal(@sv.right_to_left, true)
   end
-  
+
   def test_show_formulas
     assert_raise(ArgumentError) { @sv.show_formulas = 'foo' }
     assert_nothing_raised { @sv.show_formulas = false }
     assert_equal(@sv.show_formulas, false)
   end
-  
+
   def test_show_grid_lines
     assert_raise(ArgumentError) { @sv.show_grid_lines = "foo" }
     assert_nothing_raised { @sv.show_grid_lines = false }
     assert_equal(@sv.show_grid_lines, false)
   end
-  
+
   def test_show_outline_symbols
     assert_raise(ArgumentError) { @sv.show_outline_symbols = 'foo' }
     assert_nothing_raised { @sv.show_outline_symbols = false }
     assert_equal(@sv.show_outline_symbols, false)
   end
-  
+
   def test_show_row_col_headers
     assert_raise(ArgumentError) { @sv.show_row_col_headers = "foo" }
     assert_nothing_raised { @sv.show_row_col_headers = false }
     assert_equal(@sv.show_row_col_headers, false)
   end
-  
+
   def test_show_ruler
     assert_raise(ArgumentError) { @sv.show_ruler = 'foo' }
     assert_nothing_raised { @sv.show_ruler = false }
     assert_equal(@sv.show_ruler, false)
   end
-  
+
   def test_show_white_space
     assert_raise(ArgumentError) { @sv.show_white_space = 'foo' }
     assert_nothing_raised { @sv.show_white_space = false }
     assert_equal(@sv.show_white_space, false)
   end
-  
+
   def test_show_zeros
     assert_raise(ArgumentError) { @sv.show_zeros = "foo" }
     assert_nothing_raised { @sv.show_zeros = false }
     assert_equal(@sv.show_zeros, false)
   end
-  
+
   def test_tab_selected
     assert_raise(ArgumentError) { @sv.tab_selected = "foo" }
     assert_nothing_raised { @sv.tab_selected = false }
     assert_equal(@sv.tab_selected, false)
   end
-  
+
   def test_top_left_cell
     assert_raise(ArgumentError) { @sv.top_left_cell = :cell_adress }
     assert_nothing_raised { @sv.top_left_cell = "A2" }
     assert_equal(@sv.top_left_cell, "A2")
   end
-  
+
   def test_view
     assert_raise(ArgumentError) { @sv.view = 'view' }
     assert_nothing_raised { @sv.view = :page_break_preview }
     assert_equal(@sv.view, :page_break_preview)
   end
-  
+
   def test_window_protection
     assert_raise(ArgumentError) { @sv.window_protection = "foo" }
     assert_nothing_raised { @sv.window_protection = false }
     assert_equal(@sv.window_protection, false)
   end
-  
+
   def test_workbook_view_id
     assert_raise(ArgumentError) { @sv.workbook_view_id = "1" }
     assert_nothing_raised { @sv.workbook_view_id = 1 }
     assert_equal(@sv.workbook_view_id, 1)
   end
-  
+
   def test_zoom_scale
     assert_raise(ArgumentError) { @sv.zoom_scale = "50" }
     assert_nothing_raised { @sv.zoom_scale = 50 }
     assert_equal(@sv.zoom_scale, 50)
   end
-  
+
   def test_zoom_scale_normal
     assert_raise(ArgumentError) { @sv.zoom_scale_normal = "50" }
     assert_nothing_raised { @sv.zoom_scale_normal = 50 }
     assert_equal(@sv.zoom_scale_normal, 50)
   end
-  
+
   def test_zoom_scale_page_layout_view
     assert_raise(ArgumentError) { @sv.zoom_scale_page_layout_view = "50" }
     assert_nothing_raised { @sv.zoom_scale_page_layout_view = 50 }
     assert_equal(@sv.zoom_scale_page_layout_view, 50)
   end
-  
+
   def test_zoom_scale_sheet_layout_view
     assert_raise(ArgumentError) { @sv.zoom_scale_sheet_layout_view = "50" }
     assert_nothing_raised { @sv.zoom_scale_sheet_layout_view = 50 }
     assert_equal(@sv.zoom_scale_sheet_layout_view, 50)
   end
-  
+
   def test_to_xml
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet :name => "sheetview"
     @ws.sheet_view do |vs|
       vs.view = :page_break_preview
     end
-    
+
     doc = Nokogiri::XML.parse(@ws.sheet_view.to_xml_string)
-    
+
     assert_equal(1, doc.xpath("//sheetView[@tabSelected='false']").size)
-    
+
     assert_equal(1, doc.xpath("//sheetView[@tabSelected='false'][@showWhiteSpace='false'][@showOutlineSymbols='false'][@showFormulas='false']
         [@rightToLeft='false'][@windowProtection='false'][@showZeros='true'][@showRuler='true']
         [@showRowColHeaders='true'][@showGridLines='true'][@defaultGridColor='true']
         [@zoomScale='100'][@workbookViewId='0'][@zoomScaleSheetLayoutView='0'][@zoomScalePageLayoutView='0']
-        [@zoomScaleNormal='0'][@view='page_break_preview']").size)
+        [@zoomScaleNormal='0'][@view='pageBreakPreview']").size)
   end
-  
+
   def test_add_selection
      @sv.add_selection(:top_left, :active_cell => "A1")
      assert_equal('A1', @sv.selections[:top_left].active_cell)

data/test/workbook/worksheet/tc_table.rb

@@ -36,8 +36,8 @@ class TestTable < Test::Unit::TestCase
   end
 
   def test_rId
-    @ws.add_table("A1:D5")
-    assert_equal(@ws.tables.first.rId, "rId1")
+    table = @ws.add_table("A1:D5")
+    assert_equal @ws.relationships.for(table).Id, table.rId
   end
 
   def test_index

data/test/workbook/worksheet/tc_worksheet.rb

@@ -123,9 +123,7 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_rId
-    assert_equal(@ws.rId, "rId1")
-    ws = @ws.workbook.add_worksheet
-    assert_equal(ws.rId, "rId2")
+    assert_equal @ws.workbook.relationships.for(@ws).Id, @ws.rId
   end
 
   def test_index
@@ -169,6 +167,27 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(@ws.workbook.charts.size, 1, "add_chart adds a chart to the workbook")
   end
 
+  def test_add_page_break_with_string_cell_ref
+    assert(@ws.row_breaks.empty?)
+    assert(@ws.col_breaks.empty?)
+    @ws.add_page_break("B1")
+    assert_equal(1, @ws.row_breaks.size)
+    assert_equal(1, @ws.col_breaks.size)
+  end
+
+  def test_add_page_break_with_cell
+    @ws.add_row [1, 2, 3, 4]
+    @ws.add_row [1, 2, 3, 4]
+
+
+    assert(@ws.row_breaks.empty?)
+    assert(@ws.col_breaks.empty?)
+    @ws.add_page_break(@ws.rows.last.cells[1])
+    assert_equal(1, @ws.row_breaks.size)
+    assert_equal(1, @ws.col_breaks.size)
+  end
+
+
   def test_drawing
     assert @ws.drawing == nil
     @ws.add_chart(Axlsx::Pie3DChart)
@@ -205,13 +224,20 @@ class TestWorksheet < Test::Unit::TestCase
   def test_cols
     @ws.add_row [1,2,3,4]
     @ws.add_row [1,2,3,4]
-    @ws.add_row [1,2,3,4]
+    @ws.add_row [1,2,3]
     @ws.add_row [1,2,3,4]
     c = @ws.cols[1]
     assert_equal(c.size, 4)
     assert_equal(c[0].value, 2)
   end
 
+  def test_cols_with_block
+    @ws.add_row [1,2,3]
+    @ws.add_row [1]
+    cols = @ws.cols {|row, column| :foo }
+    assert_equal(:foo, cols[1][1])
+  end
+
   def test_row_style
     @ws.add_row [1,2,3,4]
     @ws.add_row [1,2,3,4]
@@ -288,6 +314,12 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:mergeCells/xmlns:mergeCell[@ref="E1:F1"]').size, 1)
   end
 
+  def test_to_xml_string_row_breaks
+  @ws.add_page_break("A1")
+    doc = Nokogiri::XML(@ws.to_xml_string)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:rowBreaks/xmlns:brk[@id="0"]').size, 1)
+  end
+
   def test_to_xml_string_sheet_protection
     @ws.sheet_protection.password = 'fish'
     doc = Nokogiri::XML(@ws.to_xml_string)
@@ -334,16 +366,16 @@ class TestWorksheet < Test::Unit::TestCase
   def test_to_xml_string_drawing
     @ws.add_chart Axlsx::Pie3DChart
     doc = Nokogiri::XML(@ws.to_xml_string)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:drawing[@r:id="rId1"]').size, 1)
+    assert_equal @ws.send(:worksheet_drawing).relationship.Id, doc.xpath('//xmlns:worksheet/xmlns:drawing').first["r:id"]
   end
 
   def test_to_xml_string_tables
     @ws.add_row ["one", "two"]
     @ws.add_row [1, 2]
-    @ws.add_table "A1:B2"
+    table = @ws.add_table "A1:B2"
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:tableParts[@count="1"]').size, 1)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:tableParts/xmlns:tablePart[@r:id="rId1"]').size, 1)
+    assert_equal table.rId, doc.xpath('//xmlns:worksheet/xmlns:tableParts/xmlns:tablePart').first["r:id"]
   end
 
   def test_to_xml_string

data/test/workbook/worksheet/tc_worksheet_hyperlink.rb

@@ -32,22 +32,13 @@ class TestWorksheetHyperlink < Test::Unit::TestCase
     assert_equal(@options[:ref], @a.ref)
   end
 
-  def test_id
-    @a.target = :external
-
-    assert_equal("rId1", @a.id)
-    @a.target = :internal
-    assert_equal(nil, @a.id)
-  end
-
-
   def test_to_xml_string_with_non_external
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath("//xmlns:hyperlink[@ref='#{@a.ref}']").size, 1)
     assert_equal(doc.xpath("//xmlns:hyperlink[@tooltip='#{@a.tooltip}']").size, 1)
     assert_equal(doc.xpath("//xmlns:hyperlink[@location='#{@a.location}']").size, 1)
     assert_equal(doc.xpath("//xmlns:hyperlink[@display='#{@a.display}']").size, 1)
-    assert_equal(doc.xpath("//xmlns:hyperlink[@r:id='#{@a.id}']").size, 0)
+    assert_equal(doc.xpath("//xmlns:hyperlink[@r:id]").size, 0)
   end
 
   def test_to_xml_stirng_with_external
@@ -57,7 +48,7 @@ class TestWorksheetHyperlink < Test::Unit::TestCase
     assert_equal(doc.xpath("//xmlns:hyperlink[@tooltip='#{@a.tooltip}']").size, 1)
     assert_equal(doc.xpath("//xmlns:hyperlink[@display='#{@a.display}']").size, 1)
     assert_equal(doc.xpath("//xmlns:hyperlink[@location='#{@a.location}']").size, 0)
-    assert_equal(doc.xpath("//xmlns:hyperlink[@r:id='#{@a.id}']").size, 1)
+    assert_equal(doc.xpath("//xmlns:hyperlink[@r:id='#{@a.relationship.Id}']").size, 1)
   end
 end