axlsx 1.3.6 → 2.0.0

data/test/workbook/worksheet/tc_break.rb

@@ -0,0 +1,49 @@
+require 'tc_helper.rb'
+
+class TestBreak < Test::Unit::TestCase
+
+  def setup
+    @break = Axlsx::Break.new(:id => 1, :min => 1, :max => 10, :man => true, :pt => false)
+  end
+
+  def test_id
+    assert_equal(1, @break.id)
+    assert_raises ArgumentError do
+      Axlsx::Break.new(:hoge, {:id => -1})
+    end
+  end
+
+  def test_min
+    assert_equal(1, @break.min)
+    assert_raises ArgumentError do
+      Axlsx::Break.new(:hoge, :min => -1)
+    end
+  end
+
+  def test_max
+    assert_equal(10, @break.max)
+    assert_raises ArgumentError do
+      Axlsx::Break.new(:hoge, :max => -1)
+    end
+  end
+
+
+  def test_man
+    assert_equal(true, @break.man)
+    assert_raises ArgumentError do
+      Axlsx::Break.new(:man => -1)
+    end
+  end
+
+  def test_pt
+    assert_equal(false, @break.pt)
+    assert_raises ArgumentError do
+      Axlsx::Break.new(:pt => -1)
+    end
+  end
+
+  def test_to_xml_string
+    doc = Nokogiri::XML(@break.to_xml_string)
+    assert_equal(doc.xpath('//brk[@id="1"][@min="1"][@max="10"][@pt="false"][@man="true"]').size, 1)
+  end
+end

data/test/workbook/worksheet/tc_comment.rb

@@ -5,7 +5,7 @@ class TestComment < Test::Unit::TestCase
     p = Axlsx::Package.new
     wb = p.workbook
     @ws = wb.add_worksheet
-    @c1 = @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank', :visible => false
+    @c1 = @ws.add_comment :ref => 'A1', :text => 'text with special char <', :author => 'author with special char <', :visible => false
     @c2 = @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO'
   end
 
@@ -14,12 +14,12 @@ class TestComment < Test::Unit::TestCase
   end
 
   def test_author
-    assert(@c1.author == 'crank')
+    assert(@c1.author == 'author with special char <')
     assert(@c2.author == 'PO')
   end
 
   def test_text
-    assert(@c1.text == 'penut machine')
+    assert(@c1.text == 'text with special char <')
     assert(@c2.text == 'rust bucket')
   end
 
@@ -49,13 +49,24 @@ class TestComment < Test::Unit::TestCase
     assert(@c1.vml_shape.bottom_row == pos[1]+4)
   end
 
-  def to_xml_string
+  def test_to_xml_string
     doc = Nokogiri::XML(@c1.to_xml_string)
     assert_equal(doc.xpath("//comment[@ref='#{@c1.ref}']").size, 1)
-    assert_equal(doc.xpath("//comment[@authorId='#{@c1.author_index.to}']").size, 1)
-    assert_equal(doc.xpath("//t[text()='#{@c1.author}']").size, 1)
+    assert_equal(doc.xpath("//comment[@authorId='#{@c1.author_index.to_s}']").size, 1)
+    assert_equal(doc.xpath("//t[text()='#{@c1.author}:\n']").size, 1)
     assert_equal(doc.xpath("//t[text()='#{@c1.text}']").size, 1)
   end
 
+  def test_comment_text_contain_author_and_text
+    comment = @ws.add_comment :ref => 'C4', :text => 'some text', :author => 'Bob'
+    doc = Nokogiri::XML(comment.to_xml_string)
+    assert_equal("Bob:\nsome text", doc.xpath("//comment/text").text)
+  end
+
+  def test_comment_text_does_not_contain_stray_colon_if_author_blank
+    comment = @ws.add_comment :ref => 'C5', :text => 'some text', :author => ''
+    doc = Nokogiri::XML(comment.to_xml_string)
+    assert_equal("some text", doc.xpath("//comment/text").text)
+  end
 end
 

data/test/workbook/worksheet/tc_conditional_formatting.rb

@@ -131,9 +131,9 @@ class TestConditionalFormatting < Test::Unit::TestCase
   end
 
   def test_multiple_formulas
-    @ws.add_conditional_formatting "B3:B3", { :type => :cellIs, :dxfId => 0, :priority => 1, :operator => :between, :formula => ["1","5"] }
+    @ws.add_conditional_formatting "B3:B3", { :type => :cellIs, :dxfId => 0, :priority => 1, :operator => :between, :formula => ["1 <> 2","5"] }
     doc = Nokogiri::XML.parse(@ws.to_xml_string)
-    assert doc.xpath("//xmlns:worksheet/xmlns:conditionalFormatting//xmlns:cfRule[@type='cellIs'][@dxfId=0][@priority=1][@operator='between']//xmlns:formula='1'")
+    assert doc.xpath("//xmlns:worksheet/xmlns:conditionalFormatting//xmlns:cfRule[@type='cellIs'][@dxfId=0][@priority=1][@operator='between']//xmlns:formula='1 <> 2'")
     assert doc.xpath("//xmlns:worksheet/xmlns:conditionalFormatting//xmlns:cfRule[@type='cellIs'][@dxfId=0][@priority=1][@operator='between']//xmlns:formula='5'")
   end
 

data/test/workbook/worksheet/tc_date_time_converter.rb

@@ -113,20 +113,12 @@ class TestDateTimeConverter < Test::Unit::TestCase
   def test_timezone
 
     utc = Time.utc 2012 # January 1st, 2012 at 0:00 UTC
-
-    # JRuby makes no assumption on time zone. randym
-    #local = begin
-    #  Time.new 2012, 1, 1, 1, 0, 0, 3600 # January 1st, 2012 at 1:00 GMT+1
-    #rescue ArgumentError
-    #  Time.parse "2012-01-01 01:00:00 +0100"
-    #end
-
-    local = Time.parse "2012-01-01 01:00:00 +0100"
+    local = Time.parse "2012-01-01 09:00:00 +0900"
 
     assert_equal local, utc
-    assert_equal Axlsx::DateTimeConverter::time_to_serial(local), Axlsx::DateTimeConverter::time_to_serial(utc)
+    assert_equal Axlsx::DateTimeConverter::time_to_serial(local) - local.utc_offset.to_f/86400,  Axlsx::DateTimeConverter::time_to_serial(utc)
     Axlsx::Workbook.date1904 = true
-    assert_equal Axlsx::DateTimeConverter::time_to_serial(local), Axlsx::DateTimeConverter::time_to_serial(utc)
+    assert_equal Axlsx::DateTimeConverter::time_to_serial(local) - local.utc_offset.to_f/86400, Axlsx::DateTimeConverter::time_to_serial(utc)
   end
 
 end

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)