axlsx 1.2.0 → 1.3.3

data/test/workbook/worksheet/tc_col.rb

@@ -7,7 +7,7 @@ class TestCol < Test::Unit::TestCase
   end
 
   def test_initialize
-    options = { :width => 12, :collapsed => true, :hidden => true, :outlineLevel => 1, :phonetic => true, :style => 1} 
+    options = { :width => 12, :collapsed => true, :hidden => true, :outline_level => 1, :phonetic => true, :style => 1} 
 
     col = Axlsx::Col.new 0, 0, options
     options.each{ |key, value| assert_equal(col.send(key.to_sym), value) }
@@ -58,6 +58,16 @@ class TestCol < Test::Unit::TestCase
     assert_nothing_raised(ArgumentError, 'phonetic must be boolean(ish)') { @col.phonetic = true }
   end
 
+  def test_to_xml_string
+    @col.width = 100
+    doc = Nokogiri::XML(@col.to_xml_string)
+    assert_equal(1, doc.xpath("//col [@bestFit='#{@col.best_fit}']").size)
+    assert_equal(1, doc.xpath("//col [@max=#{@col.max}]").size)
+    assert_equal(1, doc.xpath("//col [@min=#{@col.min}]").size)
+    assert_equal(1, doc.xpath("//col [@width=#{@col.width}]").size)
+    assert_equal(1, doc.xpath("//col [@customWidth='#{@col.custom_width}']").size)
+  end
+
   def test_style
     assert_equal(@col.style, nil)
     @col.style = 1

data/test/workbook/worksheet/tc_page_set_up_pr.rb

@@ -0,0 +1,15 @@
+require 'tc_helper.rb'
+
+class TestPageSetUpPr < Test::Unit::TestCase
+ def setup
+   @page_setup_pr = Axlsx::PageSetUpPr.new(:fit_to_page => true, :auto_page_breaks => true)
+ end
+
+ def test_fit_to_page
+   assert_equal true, @page_setup_pr.fit_to_page
+ end
+
+ def test_auto_page_breaks
+   assert_equal true, @page_setup_pr.auto_page_breaks
+ end
+end

data/test/workbook/worksheet/tc_page_setup.rb

@@ -44,6 +44,11 @@ class TestPageSetup < Test::Unit::TestCase
     assert_equal(50, @ps.scale)
   end
 
+  def test_paper_size
+    assert_raise(ArgumentError) { @ps.paper_size = 119 }
+    assert_nothing_raised {  @ps.paper_size = 10 }
+  end
+
   def test_set_some_values
     @ps.set(:fit_to_width => 2, :orientation => :portrait)
     assert_equal(2, @ps.fit_to_width)
@@ -58,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)

data/test/workbook/worksheet/tc_pane.rb

@@ -7,61 +7,21 @@ class TestPane < Test::Unit::TestCase
     #inverse defaults for booleans
     @nil_options = { :active_pane => :bottom_left, :state => :frozen, :top_left_cell => 'A2' }
     @int_0_options = { :x_split => 2, :y_split => 2 }
-    
-    @string_options = { :top_left_cell => 'A2' }
-    @integer_options = { :x_split => 2, :y_split => 2 }
-    @symbol_options = { :active_pane => :bottom_left, :state => :frozen }
-    
-    @options = @nil_options.merge(@int_0_options)
-    
+   @options = @nil_options.merge(@int_0_options)
     @pane = Axlsx::Pane.new(@options)
   end
-  
-  def test_initialize
-    pane = Axlsx::Pane.new
-    
-    @nil_options.each do |key, value|
-      assert_equal(nil, pane.send(key.to_sym), "initialized default #{key} should be nil")
-      assert_equal(value, @pane.send(key.to_sym), "initialized options #{key} should be #{value}")
-    end
-    
-    @int_0_options.each do |key, value|
-      assert_equal(0, pane.send(key.to_sym), "initialized default #{key} should be 0")
-      assert_equal(value, @pane.send(key.to_sym), "initialized options #{key} should be #{value}")
-    end
-  end
-  
-  def test_string_attribute_validation
-    @string_options.each do |key, value|
-      assert_raise(ArgumentError, "#{key} must be string") { @pane.send("#{key}=".to_sym, :symbol) }
-      assert_nothing_raised { @pane.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") { @pane.send("#{key}=".to_sym, "foo") }
-      assert_nothing_raised { @pane.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") { @pane.send("#{key}=".to_sym, "foo") }
-      assert_nothing_raised { @pane.send("#{key}=".to_sym, value) }
-    end
-  end
-  
+
+
   def test_active_pane
     assert_raise(ArgumentError) { @pane.active_pane = "10" }
     assert_nothing_raised { @pane.active_pane = :top_left }
-    assert_equal(@pane.active_pane, :top_left)
+    assert_equal(@pane.active_pane, "topLeft")
   end
   
   def test_state
     assert_raise(ArgumentError) { @pane.state = "foo" }
     assert_nothing_raised { @pane.state = :frozen_split }
-    assert_equal(@pane.state, :frozen_split)
+    assert_equal(@pane.state, "frozenSplit")
   end
   
   def test_x_split

data/test/workbook/worksheet/tc_row.rb

@@ -12,13 +12,13 @@ class TestRow < Test::Unit::TestCase
     assert(@row.cells.empty?, "no cells by default")
     assert_equal(@row.worksheet, @ws, "has a reference to the worksheet")
     assert_nil(@row.height, "height defaults to nil")
-    assert(!@row.custom_height?, "no custom height by default")
+    assert(!@row.custom_height, "no custom height by default")
   end
 
   def test_initialize_with_fixed_height
     row = @ws.add_row([1,2,3,4,5], :height=>40)
     assert_equal(40, row.height)
-    assert(row.custom_height?)
+    assert(row.custom_height)
   end
 
   def test_style
@@ -57,7 +57,7 @@ class TestRow < Test::Unit::TestCase
 
   def test_custom_height
     @row.height = 20
-    assert(@row.custom_height?)
+    assert(@row.custom_height)
   end
 
   def test_height
@@ -111,7 +111,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=1]").size, 1)
+    assert_equal(r_s_xml.xpath(".//row[@r=1][@ht=20][@customHeight='true']").size, 1)
   end
 
 end

data/test/workbook/worksheet/tc_selection.rb

@@ -3,70 +3,34 @@ require 'tc_helper.rb'
 
 class TestSelection < Test::Unit::TestCase
   def setup
-    @nil_options = { :active_cell => 'A2', :active_cell_id => 1, :pane => :top_left, :sqref => 'A2'  }
-    @options = @nil_options
-    
-    @string_options = { :active_cell => 'A2', :sqref => 'A2' }
-    @integer_options = { :active_cell_id => 1 }
-    @symbol_options = { :pane => :top_left }
-    
+    @options = { :active_cell => 'A2', :active_cell_id => 1, :pane => :top_left, :sqref => 'A2'  }
     @selection = Axlsx::Selection.new(@options)
   end
-  
-  def test_initialize
-    selection = Axlsx::Selection.new
-    
-    @nil_options.each do |key, value|
-      assert_equal(nil, selection.send(key.to_sym), "initialized default #{key} should be nil")
-      assert_equal(value, @selection.send(key.to_sym), "initialized options #{key} should be #{value}")
-    end
-  end
-  
-  def test_string_attribute_validation
-    @string_options.each do |key, value|
-      assert_raise(ArgumentError, "#{key} must be string") { @selection.send("#{key}=".to_sym, :symbol) }
-      assert_nothing_raised { @selection.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") { @selection.send("#{key}=".to_sym, "foo") }
-      assert_nothing_raised { @selection.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") { @selection.send("#{key}=".to_sym, "foo") }
-      assert_nothing_raised { @selection.send("#{key}=".to_sym, value) }
-    end
-  end
-  
+
   def test_active_cell
     assert_raise(ArgumentError) { @selection.active_cell = :active_cell }
     assert_nothing_raised { @selection.active_cell = "F5" }
     assert_equal(@selection.active_cell, "F5")
   end
-  
+
   def test_active_cell_id
     assert_raise(ArgumentError) { @selection.active_cell_id = "foo" }
     assert_nothing_raised { @selection.active_cell_id = 11 }
     assert_equal(@selection.active_cell_id, 11)
   end
-  
+
   def test_pane
     assert_raise(ArgumentError) { @selection.pane = "foo´" }
     assert_nothing_raised { @selection.pane = :bottom_right }
-    assert_equal(@selection.pane, :bottom_right)
+    assert_equal(@selection.pane, "bottomRight")
   end
-  
+
   def test_sqref
     assert_raise(ArgumentError) { @selection.sqref = :sqref }
     assert_nothing_raised { @selection.sqref = "G32" }
     assert_equal(@selection.sqref, "G32")
   end
-  
+
   def test_to_xml
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet :name => "sheetview"
@@ -76,18 +40,15 @@ class TestSelection < Test::Unit::TestCase
       vs.add_selection(:bottom_left, { :active_cell => 'E55', :sqref => 'E55' })
       vs.add_selection(:bottom_right, { :active_cell => 'I57', :sqref => 'I57' })
     end
-    
+
     doc = Nokogiri::XML.parse(@ws.to_xml_string)
-    
+
     assert_equal(1, doc.xpath("//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView/xmlns:selection[@sqref='B2'][@pane='topLeft'][@activeCell='B2']").size)
     assert doc.xpath("//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView/xmlns:selection[@sqref='B2'][@pane='topLeft'][@activeCell='B2']")
-    
     assert_equal(1, doc.xpath("//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView/xmlns:selection[@sqref='I10'][@pane='topRight'][@activeCell='I10']").size)
     assert doc.xpath("//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView/xmlns:selection[@sqref='I10'][@pane='topRight'][@activeCell='I10']")
-    
     assert_equal(1, doc.xpath("//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView/xmlns:selection[@sqref='E55'][@pane='bottomLeft'][@activeCell='E55']").size)
     assert doc.xpath("//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView/xmlns:selection[@sqref='E55'][@pane='bottomLeft'][@activeCell='E55']")
-    
     assert_equal(1, doc.xpath("//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView/xmlns:selection[@sqref='I57'][@pane='bottomRight'][@activeCell='I57']").size)
     assert doc.xpath("//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView/xmlns:selection[@sqref='I57'][@pane='bottomRight'][@activeCell='I57']")
   end

data/test/workbook/worksheet/tc_sheet_calc_pr.rb

@@ -0,0 +1,18 @@
+require 'tc_helper'
+
+class TestSheetCalcPr < Test::Unit::TestCase
+
+  def setup
+    @sheet_calc_pr = Axlsx::SheetCalcPr.new(:full_calc_on_load => false)
+  end
+
+  def test_full_calc_on_load
+    assert_equal false, @sheet_calc_pr.full_calc_on_load
+    assert Axlsx::SheetCalcPr.new.full_calc_on_load
+  end
+
+  def test_to_xml_string
+    doc = Nokogiri::XML(@sheet_calc_pr.to_xml_string)
+    assert_equal 1, doc.xpath('//sheetCalcPr[@fullCalcOnLoad="false"]').size
+  end
+end

data/test/workbook/worksheet/tc_sheet_pr.rb

@@ -0,0 +1,27 @@
+require 'tc_helper.rb'
+
+
+class TestSheetPr < Test::Unit::TestCase
+
+  def setup
+    worksheet = Axlsx::Package.new.workbook.add_worksheet
+    @options = { 
+      :sync_horizontal => false,
+      :sync_vertical => false,
+      :transtion_evaluation => true,
+      :transition_entry => true,
+      :published => false,
+      :filter_mode => true,
+      :enable_format_conditions_calculation => false,
+      :code_name => '007',
+      :sync_ref => 'foo'
+    }
+    @sheet_pr = Axlsx::SheetPr.new(worksheet, @options)
+  end
+
+  def test_initialization
+    @options.each do |key, value|
+      assert_equal value, @sheet_pr.send(key)
+    end
+  end
+end

data/test/workbook/worksheet/{table/tc_table.rb → tc_table.rb}

@@ -15,6 +15,12 @@ class TestTable < Test::Unit::TestCase
 
   end
 
+  def test_table_style_info
+    table = @ws.add_table('A1:D5', :name => 'foo', :style_info => { :show_row_stripes => true, :name => "TableStyleMedium25" })
+    assert_equal('TableStyleMedium25', table.table_style_info.name)
+    assert_equal(true, table.table_style_info.show_row_stripes)
+  end
+
   def test_add_table
     name = "test"
     table = @ws.add_table("A1:D5", :name => name)
@@ -22,7 +28,6 @@ class TestTable < Test::Unit::TestCase
     assert_equal(@ws.workbook.tables.last, table, "must be added to workbook table collection")
     assert_equal(@ws.tables.last, table, "must be added to worksheet table collection")
     assert_equal(table.name, name, "options for name are applied")
-
   end
 
   def test_pn

data/test/workbook/worksheet/tc_table_style_info.rb

@@ -0,0 +1,53 @@
+require 'tc_helper.rb'
+
+class TestTableStyleInfo < Test::Unit::TestCase
+  def setup
+    p = Axlsx::Package.new
+    @ws = p.workbook.add_worksheet
+    40.times do 
+      @ws.add_row %w(aa bb cc dd ee ff gg hh ii jj kk)
+    end
+    @table = @ws.add_table(Axlsx::cell_range([@ws.rows.first.cells.first,@ws.rows.last.cells.last], false), :name => 'foo')
+    @options =  { :show_first_column => 1,
+                :show_last_column => 1,
+                :show_row_stripes => 1,
+                :show_column_stripes => 1,
+                :name => "TableStyleDark4" }
+
+
+  end
+
+  def test_initialize
+    table_style = Axlsx::TableStyleInfo.new @options
+    @options.each do |key, value|
+      assert_equal(value, table_style.send(key.to_sym))
+    end
+  end
+
+  def test_boolean_properties
+    table_style = Axlsx::TableStyleInfo.new
+    @options.keys.each do |key|
+     assert_nothing_raised { table_style.send("#{key.to_sym}=", true) }
+     assert_raises(ArgumentError) { table_style.send(key.to_sym, 'foo') }
+    end
+  end
+  def doc
+    @doc ||= Nokogiri::XML(Axlsx::TableStyleInfo.new(@options).to_xml_string)
+  end
+
+  def test_to_xml_string_first_column
+    assert(doc.xpath('//tableStyleInfo[@showLastColumn=1]'))
+  end
+
+  def test_to_xml_string_row_stripes
+    assert(doc.xpath('//tableStyleInfo[@showRowStripes=1]'))
+  end
+
+  def test_to_xml_string_column_stripes
+    assert(doc.xpath('//tableStyleInfo[@showColumnStripes=1]'))
+  end
+
+  def test_to_xml_string_name
+    assert(doc.xpath("//tableStyleInfo[@name=#{@options[:name]}]"))
+  end
+end

data/test/workbook/worksheet/tc_worksheet.rb

@@ -246,7 +246,7 @@ class TestWorksheet < Test::Unit::TestCase
 
   def test_to_xml_string_auto_filter
     @ws.add_row [1, "two"]
-    @ws.auto_filter = "A1:B1"
+    @ws.auto_filter.range = "A1:B1"
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:autoFilter[@ref="A1:B1"]').size, 1)
   end
@@ -324,13 +324,20 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(0, @ws.rows.last.cells.last.value.index("\v"))
     assert_equal(nil,@ws.to_xml_string.index("\v"))
   end
+
+  def test_to_xml_string_with_newlines
+    cell_with_newline = "foo\n\r\nbar"
+    @ws.add_row [cell_with_newline]
+    assert_equal("foo\n\r\nbar", @ws.rows.last.cells.last.value)
+    assert_not_nil(@ws.to_xml_string.index("foo\n\r\nbar"))
+  end
   # Make sure the XML for all optional elements (like pageMargins, autoFilter, ...)
   # is generated in correct order.
   def test_valid_with_optional_elements
     @ws.page_margins.set :left => 9
     @ws.page_setup.set :fit_to_width => 1
     @ws.print_options.set :headings => true
-    @ws.auto_filter = "A1:C3"
+    @ws.auto_filter.range = "A1:C3"
     @ws.merge_cells "A4:A5"
     @ws.add_chart Axlsx::Pie3DChart
     @ws.add_table "E1:F3"
@@ -417,7 +424,14 @@ class TestWorksheet < Test::Unit::TestCase
   def test_auto_filter
     assert(@ws.auto_filter.range.nil?)
     assert_raise(ArgumentError) { @ws.auto_filter = 123 }
-    @ws.auto_filter = "A1:D9"
+    @ws.auto_filter.range = "A1:D9"
     assert_equal(@ws.auto_filter.range, "A1:D9")
   end
+
+  def test_sheet_pr_for_auto_filter
+    @ws.auto_filter.range = 'A1:D9'
+    @ws.auto_filter.add_column 0, :filters, :filter_items => [1]
+    doc = Nokogiri::XML(@ws.to_xml_string)
+    assert(doc.xpath('//sheetPr[@filterMode="true"]')) 
+  end
 end

data/test/workbook/worksheet/tc_worksheet_hyperlink.rb

@@ -0,0 +1,64 @@
+require 'tc_helper.rb'
+
+class TestWorksheetHyperlink < Test::Unit::TestCase
+  def setup
+    p = Axlsx::Package.new
+    wb = p.workbook
+    @ws = wb.add_worksheet
+    @options = { :location => 'https://github.com/randym/axlsx', :tooltip => 'axlsx', :ref => 'A1', :display => 'AXSLX', :target => :internal }
+    @a = @ws.add_hyperlink @options
+  end
+
+  def test_initailize
+    assert_raise(ArgumentError) { Axlsx::WorksheetHyperlink.new }
+  end
+
+  def test_location
+    assert_equal(@options[:location], @a.location)
+  end
+
+  def test_tooltip
+    assert_equal(@options[:tooltip], @a.tooltip)
+  end
+
+  def test_target
+    assert_equal(@options[:target], @a.instance_values['target'])
+  end
+
+  def test_display
+    assert_equal(@options[:display], @a.display)
+  end
+  def test_ref
+    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)
+  end
+
+  def test_to_xml_stirng_with_external
+    @a.target = :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[@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)
+  end
+end
+
+