caxlsx 2.0.2 → 3.0.0

data/test/workbook/worksheet/tc_header_footer.rb

@@ -109,7 +109,7 @@ class TestHeaderFooter < Test::Unit::TestCase
     )
 
     doc = Nokogiri::XML.parse(@hf.to_xml_string)
-    assert_equal(1, doc.xpath(".//headerFooter[@differentFirst='true'][@differentOddEven='true']").size)
+    assert_equal(1, doc.xpath(".//headerFooter[@differentFirst=1][@differentOddEven=1]").size)
 
     assert_equal(1, doc.xpath(".//headerFooter/oddHeader").size)
     assert_equal('oh', doc.xpath(".//headerFooter/oddHeader").text)
@@ -134,7 +134,7 @@ class TestHeaderFooter < Test::Unit::TestCase
     )
 
     doc = Nokogiri::XML.parse(@hf.to_xml_string)
-    assert_equal(1, doc.xpath(".//headerFooter[@differentOddEven='false']").size)
+    assert_equal(1, doc.xpath(".//headerFooter[@differentOddEven=0]").size)
     assert_equal(0, doc.xpath(".//headerFooter[@differentFirst]").size)
 
     assert_equal(1, doc.xpath(".//headerFooter/oddHeader").size)

data/test/workbook/worksheet/tc_icon_set.rb

@@ -38,7 +38,7 @@ class TestIconSet < Test::Unit::TestCase
 
   def test_to_xml_string
     doc = Nokogiri::XML.parse(@icon_set.to_xml_string)
-    assert_equal(doc.xpath(".//iconSet[@iconSet='3TrafficLights1'][@percent='true'][@reverse='false'][@showValue='true']").size, 1)
+    assert_equal(doc.xpath(".//iconSet[@iconSet='3TrafficLights1'][@percent=1][@reverse=0][@showValue=1]").size, 1)
     assert_equal(doc.xpath(".//iconSet//cfvo").size, 3)
   end
 

data/test/workbook/worksheet/tc_outline_pr.rb

@@ -0,0 +1,19 @@
+require 'tc_helper.rb'
+
+class TestOutlinePr < Test::Unit::TestCase
+ def setup
+   @outline_pr = Axlsx::OutlinePr.new(:summary_below => false, :summary_right => true, :apply_styles => false)
+ end
+
+ def test_summary_below
+   assert_equal false, @outline_pr.summary_below
+ end
+
+ def test_summary_right
+   assert_equal true, @outline_pr.summary_right
+ end
+ 
+ def test_apply_styles
+   assert_equal false, @outline_pr.apply_styles
+ end
+end

data/test/workbook/worksheet/tc_page_setup.rb

@@ -63,7 +63,7 @@ class TestPageSetup < Test::Unit::TestCase
     assert(@ps.fit_to_width == nil && @ps.fit_to_height == nil)
     assert(@ps.fit_to_page? == false)
   end
-  
+
   def test_with_height_fit_to_page?
     assert(@ps.fit_to_width == nil && @ps.fit_to_height == nil)
     @ps.set(:fit_to_height => 1)
@@ -131,9 +131,9 @@ class TestPageSetup < Test::Unit::TestCase
 
   def test_fit_to
     fits = @ps.fit_to(:width => 1)
-    assert_equal([1, 9999], fits)
+    assert_equal([1, 999], fits)
     fits = @ps.fit_to :height => 1
-    assert_equal(fits, [9999,1])
+    assert_equal(fits, [999 ,1])
     fits = @ps.fit_to :height => 7, :width => 2
     assert_equal(fits, [2, 7])
     assert_raise(ArgumentError) { puts @ps.fit_to(:width => true)}

data/test/workbook/worksheet/tc_pivot_table.rb

@@ -67,6 +67,26 @@ class TestPivotTable < Test::Unit::TestCase
     assert_equal([{:ref=>"Sales", :subtotal => 'average'}], pivot_table.data)
   end
 
+  def test_add_pivot_table_with_style_info
+    style_info_data = { :name=>"PivotStyleMedium9", :showRowHeaders=>"1", :showLastColumn=>"0"}
+    pivot_table = @ws.add_pivot_table('G5:G6', 'A1:E5', {:style_info=>style_info_data}) do |pt|
+      pt.rows = ['Year', 'Month']
+      pt.columns = ['Type']
+      pt.data = ['Sales']
+      pt.pages = ['Region']
+    end
+    assert_equal(style_info_data, pivot_table.style_info)
+    shared_test_pivot_table_xml_validity(pivot_table)
+  end
+
+  def test_add_pivot_table_with_row_without_subtotals
+    pivot_table = @ws.add_pivot_table('G5:G6', 'A1:D5', {:no_subtotals_on_headers=>['Year']}) do |pt|
+      pt.data = ['Sales']
+      pt.rows = ['Year','Month']
+    end
+    assert_equal(['Year'], pivot_table.no_subtotals_on_headers)
+  end
+
   def test_header_indices
     pivot_table = @ws.add_pivot_table('G5:G6', 'A1:E5')
     assert_equal(0,   pivot_table.header_index_of('Year'   ))
@@ -97,12 +117,7 @@ class TestPivotTable < Test::Unit::TestCase
   end
 
   def test_to_xml_string
-    pivot_table = @ws.add_pivot_table('G5:G6', 'A1:D5')
-    shared_test_pivot_table_xml_validity(pivot_table)
-  end
-
-  def test_to_xml_string_with_configuration
-    pivot_table = @ws.add_pivot_table('G5:G6', 'A1:E5') do |pt|
+    pivot_table = @ws.add_pivot_table('G5:G6', 'A1:E5', {:no_subtotals_on_headers=>['Year']}) do |pt|
       pt.rows = ['Year', 'Month']
       pt.columns = ['Type']
       pt.data = ['Sales']

data/test/workbook/worksheet/tc_print_options.rb

@@ -42,7 +42,7 @@ class TestPrintOptions < Test::Unit::TestCase
   def test_to_xml
     @po.set(:grid_lines => true, :headings => true, :horizontal_centered => true, :vertical_centered => true)
     doc = Nokogiri::XML.parse(@po.to_xml_string)
-    assert_equal(1, doc.xpath(".//printOptions[@gridLines='true'][@headings='true'][@horizontalCentered='true'][@verticalCentered='true']").size)
+    assert_equal(1, doc.xpath(".//printOptions[@gridLines=1][@headings=1][@horizontalCentered=1][@verticalCentered=1]").size)
   end
 
   def test_grid_lines

data/test/workbook/worksheet/tc_rich_text.rb

@@ -0,0 +1,44 @@
+require 'tc_helper.rb'
+
+class RichText < Test::Unit::TestCase
+  def setup
+    p = Axlsx::Package.new
+    @ws = p.workbook.add_worksheet :name => "hmmmz"
+    p.workbook.styles.add_style :sz => 20
+    @rt = Axlsx::RichText.new
+    b = true
+    (0..26).each do |r|
+      @rt.add_run "run #{r}, ", :b => (b=!b), :i => !b
+    end
+    @row = @ws.add_row [@rt]
+    @c = @row.first
+  end
+
+  def test_initialize
+    assert_equal(@c.value, @rt)
+    rt_direct = Axlsx::RichText.new('hi', :i => true)
+    rt_indirect = Axlsx::RichText.new()
+    rt_indirect.add_run('hi', :i => true)
+    assert_equal(rt_direct.runs.length, 1)
+    assert_equal(rt_indirect.runs.length, 1)
+    row = @ws.add_row [rt_direct, rt_indirect]
+    assert_equal(row[0].to_xml_string(0,0), row[1].to_xml_string(0,0))
+  end
+  
+  def test_textruns
+    runs = @rt.runs
+    assert_equal(runs.length, 27)
+    assert_equal(runs.first.b, false)
+    assert_equal(runs.first.i, true)
+    assert_equal(runs[1].b, true)
+    assert_equal(runs[1].i, false)
+  end
+  
+  def test_implicit_richtext
+    rt = Axlsx::RichText.new('a', :b => true)
+    row_rt = @ws.add_row [rt]
+    row_imp = @ws.add_row ['a']
+    row_imp[0].b = true
+    assert_equal(row_rt[0].to_xml_string(0,0), row_imp[0].to_xml_string(0,0))
+  end
+end

data/test/workbook/worksheet/tc_rich_text_run.rb

@@ -0,0 +1,172 @@
+require 'tc_helper.rb'
+
+class RichTextRun < Test::Unit::TestCase
+  def setup
+    @p = Axlsx::Package.new
+    @ws = @p.workbook.add_worksheet :name => "hmmmz"
+    @p.workbook.styles.add_style :sz => 20
+    @rtr = Axlsx::RichTextRun.new('hihihi', b: true, i: false)
+    @rtr2 = Axlsx::RichTextRun.new('hihi2hi2', b: false, i: true)
+    @rt = Axlsx::RichText.new
+    @rt.runs << @rtr
+    @rt.runs << @rtr2
+    @row = @ws.add_row [@rt]
+    @c = @row.first
+  end
+
+  def test_initialize
+    assert_equal(@rtr.value, 'hihihi')
+    assert_equal(@rtr.b, true)
+    assert_equal(@rtr.i, false)
+  end
+
+  def test_font_size_with_custom_style_and_no_sz
+    @c.style = @c.row.worksheet.workbook.styles.add_style :bg_color => 'FF00FF'
+    sz = @rtr.send(:font_size)
+    assert_equal(sz, @c.row.worksheet.workbook.styles.fonts.first.sz * 1.5)
+    sz = @rtr2.send(:font_size)
+    assert_equal(sz, @c.row.worksheet.workbook.styles.fonts.first.sz)
+  end
+
+  def test_font_size_with_bolding
+    @c.style = @c.row.worksheet.workbook.styles.add_style :b => true
+    assert_equal(@c.row.worksheet.workbook.styles.fonts.first.sz * 1.5, @rtr.send(:font_size))
+    assert_equal(@c.row.worksheet.workbook.styles.fonts.first.sz * 1.5, @rtr2.send(:font_size)) # is this the correct behaviour?
+  end
+
+  def test_font_size_with_custom_sz
+    @c.style = @c.row.worksheet.workbook.styles.add_style :sz => 52
+    sz = @rtr.send(:font_size)
+    assert_equal(sz, 52 * 1.5)
+    sz2 = @rtr2.send(:font_size)
+    assert_equal(sz2, 52)
+  end
+
+  def test_rtr_with_sz
+    @rtr.sz = 25
+    assert_equal(25, @rtr.send(:font_size))
+  end
+
+  def test_color
+    assert_raise(ArgumentError) { @rtr.color = -1.1 }
+    assert_nothing_raised { @rtr.color = "FF00FF00" }
+    assert_equal(@rtr.color.rgb, "FF00FF00")
+  end
+
+  def test_scheme
+    assert_raise(ArgumentError) { @rtr.scheme = -1.1 }
+    assert_nothing_raised { @rtr.scheme = :major }
+    assert_equal(@rtr.scheme, :major)
+  end
+
+  def test_vertAlign
+    assert_raise(ArgumentError) { @rtr.vertAlign = -1.1 }
+    assert_nothing_raised { @rtr.vertAlign = :baseline }
+    assert_equal(@rtr.vertAlign, :baseline)
+  end
+
+  def test_sz
+    assert_raise(ArgumentError) { @rtr.sz = -1.1 }
+    assert_nothing_raised { @rtr.sz = 12 }
+    assert_equal(@rtr.sz, 12)
+  end
+
+  def test_extend
+    assert_raise(ArgumentError) { @rtr.extend = -1.1 }
+    assert_nothing_raised { @rtr.extend = false }
+    assert_equal(@rtr.extend, false)
+  end
+
+  def test_condense
+    assert_raise(ArgumentError) { @rtr.condense = -1.1 }
+    assert_nothing_raised { @rtr.condense = false }
+    assert_equal(@rtr.condense, false)
+  end
+
+  def test_shadow
+    assert_raise(ArgumentError) { @rtr.shadow = -1.1 }
+    assert_nothing_raised { @rtr.shadow = false }
+    assert_equal(@rtr.shadow, false)
+  end
+
+  def test_outline
+    assert_raise(ArgumentError) { @rtr.outline = -1.1 }
+    assert_nothing_raised { @rtr.outline = false }
+    assert_equal(@rtr.outline, false)
+  end
+
+  def test_strike
+    assert_raise(ArgumentError) { @rtr.strike = -1.1 }
+    assert_nothing_raised { @rtr.strike = false }
+    assert_equal(@rtr.strike, false)
+  end
+
+  def test_u
+    @c.type = :string
+    assert_raise(ArgumentError) { @c.u = -1.1 }
+    assert_nothing_raised { @c.u = :single }
+    assert_equal(@c.u, :single)
+    doc = Nokogiri::XML(@c.to_xml_string(1,1))
+    assert(doc.xpath('//u[@val="single"]'))
+  end
+
+  def test_i
+    assert_raise(ArgumentError) { @c.i = -1.1 }
+    assert_nothing_raised { @c.i = false }
+    assert_equal(@c.i, false)
+  end
+
+  def test_rFont
+    assert_raise(ArgumentError) { @c.font_name = -1.1 }
+    assert_nothing_raised { @c.font_name = "Arial" }
+    assert_equal(@c.font_name, "Arial")
+  end
+
+  def test_charset
+    assert_raise(ArgumentError) { @c.charset = -1.1 }
+    assert_nothing_raised { @c.charset = 1 }
+    assert_equal(@c.charset, 1)
+  end
+
+  def test_family
+    assert_raise(ArgumentError) { @rtr.family = 0 }
+    assert_nothing_raised { @rtr.family = 1 }
+    assert_equal(@rtr.family, 1)
+  end
+
+  def test_b
+    assert_raise(ArgumentError) { @c.b = -1.1 }
+    assert_nothing_raised { @c.b = false }
+    assert_equal(@c.b, false)
+  end
+
+  def test_multiline_autowidth
+    wrap = @p.workbook.styles.add_style({:alignment => {:wrap_text => true}})
+    awtr = Axlsx::RichTextRun.new('I\'m bold' + "\n", :b => true)
+    rt = Axlsx::RichText.new
+    rt.runs << awtr
+    @ws.add_row [rt], :style => wrap
+    ar = [0]
+    awtr.autowidth(ar)
+    assert_equal(ar.length, 2)
+    assert_equal(ar.last, 0)
+  end
+
+  def test_to_xml
+    schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
+    doc = Nokogiri::XML(@ws.to_xml_string)
+    errors = []
+    schema.validate(doc).each do |error|
+      puts error.message
+      errors.push error
+    end
+    assert(errors.empty?, "error free validation")
+
+    assert(doc.xpath('//rPr/b[@val=1]'))
+    assert(doc.xpath('//rPr/i[@val=0]'))
+    assert(doc.xpath('//rPr/b[@val=0]'))
+    assert(doc.xpath('//rPr/i[@val=1]'))
+    assert(doc.xpath('//is//t[contains(text(), "hihihi")]'))
+    assert(doc.xpath('//is//t[contains(text(), "hihi2hi2")]'))
+  end
+end

data/test/workbook/worksheet/tc_row.rb

@@ -27,9 +27,14 @@ class TestRow < Test::Unit::TestCase
     r.cells.each { |c| assert_equal(c.style,1) }
   end
 
+  def test_color
+    r = @ws.add_row([1,2,3,4,5])
+    r.color = "FF00FF00"
+    r.cells.each { |c| assert_equal(c.color.rgb, "FF00FF00") }
+  end
 
   def test_index
-    assert_equal(@row.index, @row.worksheet.rows.index(@row))
+    assert_equal(@row.row_index, @row.worksheet.rows.index(@row))
   end
 
   def test_add_cell
@@ -111,7 +116,7 @@ class TestRow < Test::Unit::TestCase
     @row.add_cell 1
     @row.height = 20
     r_s_xml = Nokogiri::XML(@row.to_xml_string(0, ''))
-    assert_equal(r_s_xml.xpath(".//row[@r=1][@ht=20][@customHeight='true']").size, 1)
+    assert_equal(r_s_xml.xpath(".//row[@r=1][@ht=20][@customHeight=1]").size, 1)
   end
 
 end

data/test/workbook/worksheet/tc_sheet_calc_pr.rb

@@ -13,6 +13,6 @@ class TestSheetCalcPr < Test::Unit::TestCase
 
   def test_to_xml_string
     doc = Nokogiri::XML(@sheet_calc_pr.to_xml_string)
-    assert_equal 1, doc.xpath('//sheetCalcPr[@fullCalcOnLoad="false"]').size
+    assert_equal 1, doc.xpath('//sheetCalcPr[@fullCalcOnLoad=0]').size
   end
 end

data/test/workbook/worksheet/tc_sheet_format_pr.rb

@@ -74,13 +74,13 @@ class TestSheetFormatPr < Test::Unit::TestCase
 
   def test_to_xml_string
     doc = Nokogiri::XML(@sheet_format_pr.to_xml_string)
-    assert doc.xpath("sheetFormatPr[@thickBottom='true']")
+    assert doc.xpath("sheetFormatPr[@thickBottom=1]")
     assert doc.xpath("sheetFormatPr[@baseColWidth=5]")
     assert doc.xpath("sheetFormatPr[@default_col_width=7.2]")
     assert doc.xpath("sheetFormatPr[@default_row_height=5.2]")
-    assert doc.xpath("sheetFormatPr[@custom_height='true']")
-    assert doc.xpath("sheetFormatPr[@zero_height='false']")
-    assert doc.xpath("sheetFormatPr[@thick_top='true']")
+    assert doc.xpath("sheetFormatPr[@custom_height=1]")
+    assert doc.xpath("sheetFormatPr[@zero_height=0]")
+    assert doc.xpath("sheetFormatPr[@thick_top=1]")
     assert doc.xpath("sheetFormatPr[@outline_level_row=0]")
     assert doc.xpath("sheetFormatPr[@outline_level_col=0]")
   end

data/test/workbook/worksheet/tc_sheet_pr.rb

@@ -5,23 +5,45 @@ class TestSheetPr < Test::Unit::TestCase
 
   def setup
     worksheet = Axlsx::Package.new.workbook.add_worksheet
-    @options = { 
+    @options = {
       :sync_horizontal => false,
       :sync_vertical => false,
-      :transtion_evaluation => true,
+      :transition_evaluation => true,
       :transition_entry => true,
       :published => false,
       :filter_mode => true,
       :enable_format_conditions_calculation => false,
       :code_name => '007',
-      :sync_ref => 'foo'
+      :sync_ref => 'foo',
+      :tab_color => 'FFFF6666'
     }
     @sheet_pr = Axlsx::SheetPr.new(worksheet, @options)
   end
 
   def test_initialization
     @options.each do |key, value|
-      assert_equal value, @sheet_pr.send(key)
+      if key==:tab_color
+        stored_value = @sheet_pr.send(key)
+        assert_equal Axlsx::Color, stored_value.class
+        assert_equal value, stored_value.rgb
+      else
+        assert_equal value, @sheet_pr.send(key)
+      end
     end
   end
+
+  def test_to_xml_string
+    doc = Nokogiri::XML(@sheet_pr.to_xml_string)
+    assert_equal(doc.xpath("//sheetPr[@syncHorizontal='0']").size, 1)
+    assert_equal(doc.xpath("//sheetPr[@syncVertical='0']").size, 1)
+    assert_equal(doc.xpath("//sheetPr[@transitionEvaluation='1']").size, 1)
+    assert_equal(doc.xpath("//sheetPr[@transitionEntry='1']").size, 1)
+    assert_equal(doc.xpath("//sheetPr[@published='0']").size, 1)
+    assert_equal(doc.xpath("//sheetPr[@filterMode='1']").size, 1)
+    assert_equal(doc.xpath("//sheetPr[@enableFormatConditionsCalculation='0']").size, 1)
+    assert_equal(doc.xpath("//sheetPr[@codeName='007']").size, 1)
+    assert_equal(doc.xpath("//sheetPr[@syncRef='foo']").size, 1)
+    assert_equal(doc.xpath("//sheetPr/tabColor[@rgb='FFFF6666']").size, 1)
+    assert_equal(doc.xpath("//sheetPr/pageSetUpPr[@fitToPage='0']").size, 1)
+  end
 end

data/test/workbook/worksheet/tc_sheet_protection.rb

@@ -2,9 +2,9 @@
 require 'tc_helper.rb'
 
 # <xsd:complexType name="CT_SheetProtection">
-# <xsd:attribute name="sheet" type="xsd:boolean" use="optional" default="false"/>
-# <xsd:attribute name="objects" type="xsd:boolean" use="optional" default="false"/>
-# <xsd:attribute name="scenarios" type="xsd:boolean" use="optional" default="false"/>
+# <xsd:attribute name="sheet" type="xsd:boolean" use="optional" default=0/>
+# <xsd:attribute name="objects" type="xsd:boolean" use="optional" default=0/>
+# <xsd:attribute name="scenarios" type="xsd:boolean" use="optional" default=0/>
 # <xsd:attribute name="formatCells" type="xsd:boolean" use="optional" default="true"/>
 # <xsd:attribute name="formatColumns" type="xsd:boolean" use="optional" default="true"/>
 # <xsd:attribute name="formatRows" type="xsd:boolean" use="optional" default="true"/>
@@ -13,11 +13,11 @@ require 'tc_helper.rb'
 # <xsd:attribute name="insertHyperlinks" type="xsd:boolean" use="optional" default="true"/>
 # <xsd:attribute name="deleteColumns" type="xsd:boolean" use="optional" default="true"/>
 # <xsd:attribute name="deleteRows" type="xsd:boolean" use="optional" default="true"/>
-# <xsd:attribute name="selectLockedCells" type="xsd:boolean" use="optional" default="false"/>
+# <xsd:attribute name="selectLockedCells" type="xsd:boolean" use="optional" default=0/>
 # <xsd:attribute name="sort" type="xsd:boolean" use="optional" default="true"/>
 # <xsd:attribute name="autoFilter" type="xsd:boolean" use="optional" default="true"/>
 # <xsd:attribute name="pivotTables" type="xsd:boolean" use="optional" default="true"/>
-# <xsd:attribute name="selectUnlockedCells" type="xsd:boolean" use="optional" default="false"/>
+# <xsd:attribute name="selectUnlockedCells" type="xsd:boolean" use="optional" default=0/>
 # <xsd:attribute name="password" type="xsd:string" use="optional" default="nil"/>
 # </xsd:complexType>