axlsx 1.1.7 → 1.2.0

data/test/workbook/worksheet/table/tc_table.rb

@@ -25,14 +25,6 @@ class TestTable < Test::Unit::TestCase
 
   end
 
-  def test_charts
-    assert(@ws.drawing.charts.empty?)
-    chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"bob", :start_at=>[0,0], :end_at=>[1,1])
-    assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")
-    chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"nancy", :start_at=>[1,5], :end_at=>[5,10])
-    assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")
-  end
-
   def test_pn
     @ws.add_table("A1:D5")
     assert_equal(@ws.tables.first.pn, "tables/table1.xml")

data/test/workbook/worksheet/tc_cell.rb

@@ -197,19 +197,17 @@ class TestCell < Test::Unit::TestCase
   end
 
   def test_merge_with_string
-    assert_equal(@c.row.worksheet.merged_cells.size, 0)
     @c.row.add_cell 2
     @c.row.add_cell 3
     @c.merge "A2"
-    assert_equal(@c.row.worksheet.merged_cells.last, "A1:A2")
+    assert_equal(@c.row.worksheet.send(:merged_cells).last, "A1:A2")
   end
 
   def test_merge_with_cell
-    assert_equal(@c.row.worksheet.merged_cells.size, 0)
     @c.row.add_cell 2
     @c.row.add_cell 3
     @c.merge @row.cells.last
-    assert_equal(@c.row.worksheet.merged_cells.last, "A1:C1")
+    assert_equal(@c.row.worksheet.send(:merged_cells).last, "A1:C1")
   end
 
   def test_ssti

data/test/workbook/worksheet/tc_page_setup.rb

@@ -54,6 +54,23 @@ class TestPageSetup < Test::Unit::TestCase
     assert_equal(nil, @ps.scale)
   end
 
+  def test_default_fit_to_page?
+    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)
+    assert(@ps.fit_to_page?)
+  end
+
+  def test_with_width_fit_to_page?
+    assert(@ps.fit_to_width == nil && @ps.fit_to_height == nil)
+    @ps.set(:fit_to_width => 1)
+    assert(@ps.fit_to_page?)
+  end
+
   def test_to_xml_all_values
     @ps.set(:fit_to_height => 1, :fit_to_width => 2, :orientation => :landscape, :paper_height => "297mm", :paper_width => "210mm", :scale => 50)
     doc = Nokogiri::XML.parse(@ps.to_xml_string)
@@ -106,7 +123,7 @@ class TestPageSetup < Test::Unit::TestCase
     assert_nothing_raised { @ps.scale = 99 }
     assert_equal(99, @ps.scale)
   end
-  
+
   def test_fit_to
     fits = @ps.fit_to(:width => 1)
     assert_equal([1, 9999], fits)
@@ -115,7 +132,7 @@ class TestPageSetup < Test::Unit::TestCase
     fits = @ps.fit_to :height => 7, :width => 2
     assert_equal(fits, [2, 7])
     assert_raise(ArgumentError) { puts @ps.fit_to(:width => true)}
-    
-    
+
+
   end
 end

data/test/workbook/worksheet/tc_protected_range.rb

@@ -0,0 +1,17 @@
+# encoding: UTF-8
+require 'tc_helper.rb'
+class TestProtectedRange < Test::Unit::TestCase
+def setup
+  @p = Axlsx::Package.new
+  @ws = @p.workbook.add_worksheet { |sheet| sheet.add_row [1,2,3,4,5,6,7,8,9] }
+end
+
+def test_initialize_options
+  assert_nothing_raised {Axlsx::ProtectedRange.new(:sqref => 'A1:B1', :name => "only bob")}
+end
+
+def test_range
+  r = @ws.protect_range('A1:B1')
+  assert_equal('A1:B1', r.sqref)
+end
+end

data/test/workbook/worksheet/tc_row.rb

@@ -38,8 +38,8 @@ class TestRow < Test::Unit::TestCase
   end
 
   def test_add_cell_autowidth_info
-    width = @ws.send :calculate_width, 'this is the cell of cells', @ws.workbook.styles.fonts.first.sz
-    @row.add_cell("this is the cell of cells")
+    cell = @row.add_cell("this is the cell of cells")
+    width = cell.send(:autowidth)
     assert_equal(@ws.column_info.last.width, width)
   end
 

data/test/workbook/worksheet/tc_selection.rb

@@ -91,4 +91,4 @@ class TestSelection < Test::Unit::TestCase
     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
-end
+end

data/test/workbook/worksheet/tc_worksheet.rb

@@ -14,6 +14,14 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(ws.pn, "worksheets/sheet2.xml")
   end
 
+  def test_name_is_html_encoded
+    @ws.name = '<foo> & <bar>'
+    assert_equal(@ws.name, '&lt;foo&gt; &amp; &lt;bar&gt;')
+  end
+
+  def test_name_exception_on_colon
+    assert_raises(ArgumentError) { @ws.name = 'foo:bar' }
+  end
   def test_page_margins
     assert(@ws.page_margins.is_a? Axlsx::PageMargins)
   end
@@ -105,7 +113,12 @@ class TestWorksheet < Test::Unit::TestCase
   def test_dimension
     @ws.add_row [1, 2, 3]
     @ws.add_row [4, 5, 6]
-    assert_equal @ws.dimension, "A1:C2"
+    assert_equal @ws.dimension.sqref, "A1:C2"
+  end
+
+  def test_dimension_with_empty_row
+    @ws.add_row
+    assert_equal "A1:AA200", @ws.dimension.sqref
   end
 
   def test_referencing
@@ -135,7 +148,9 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_drawing
-    assert @ws.drawing.is_a? Axlsx::Drawing
+    assert @ws.drawing == nil
+    @ws.add_chart(Axlsx::Pie3DChart)
+    assert @ws.drawing.is_a?(Axlsx::Drawing)
   end
 
   def test_col_style
@@ -201,8 +216,8 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_fit_to_page_assignation_does_nothing
-    @ws.fit_to_page = false
-    assert_equal(@ws.fit_to_page, false)
+    @ws.fit_to_page = true
+    assert_equal(@ws.fit_to_page?, false)
   end
 
   def test_to_xml_string_selected
@@ -248,7 +263,7 @@ class TestWorksheet < Test::Unit::TestCase
   def test_to_xml_string_sheet_protection
     @ws.sheet_protection.password = 'fish'
     doc = Nokogiri::XML(@ws.to_xml_string)
-    assert(doc.xpath('//sheetProtection'))
+    assert(doc.xpath('//xmlns:sheetProtection'))
   end
 
   def test_to_xml_string_page_margins
@@ -293,23 +308,22 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:tableParts/xmlns:tablePart[@r:id="rId1"]').size, 1)
   end
 
-  def test_abs_auto_filter
-    @ws.add_row [1, "two", 3]
-    @ws.auto_filter = "A1:C1"
-    assert_equal(@ws.abs_auto_filter, "'Sheet1'!$A$1:$C$1")
-  end
-
   def test_to_xml_string
     schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
     doc = Nokogiri::XML(@ws.to_xml_string)
-    errors = []
-    schema.validate(doc).each do |error|
-      errors.push error
-      puts error.message
-    end
-    assert(errors.empty?, "error free validation")
+    assert(schema.validate(doc).map{ |e| puts e.message; e }.empty?, "error free validation")
   end
 
+  def test_styles
+    assert(@ws.styles.is_a?(Axlsx::Styles), 'worksheet provides access to styles')
+  end
+  
+  def test_to_xml_string_with_illegal_chars
+    nasties =  "\v\u2028\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u001f"
+    @ws.add_row [nasties]
+    assert_equal(0, @ws.rows.last.cells.last.value.index("\v"))
+    assert_equal(nil,@ws.to_xml_string.index("\v"))
+  end
   # Make sure the XML for all optional elements (like pageMargins, autoFilter, ...)
   # is generated in correct order.
   def test_valid_with_optional_elements
@@ -322,13 +336,7 @@ class TestWorksheet < Test::Unit::TestCase
     @ws.add_table "E1:F3"
     schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
     doc = Nokogiri::XML(@ws.to_xml_string)
-    errors = []
-    schema.validate(doc).each do |error|
-      errors.push error
-      puts error.message
-    end
-    assert(errors.empty?, "error free validation")
-
+    assert(schema.validate(doc).map { |e| puts e.message; e }.empty?, schema.validate(doc).map { |e| e.message }.join('\n'))
   end
 
   def test_relationships
@@ -350,14 +358,14 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_name_size
-    assert_raise(ArgumentError, "name too long!") { @ws.name = Array.new(32, "A").join('') }
-    assert_nothing_raised { @ws.name = Array.new(31, "A").join('') }
+    assert_raise(ArgumentError, "name too long!") { @ws.name = Array.new(32, "A").join() }
+    assert_nothing_raised { @ws.name = Array.new(31, "A").join() }
   end
 
   def test_set_fixed_width_column
     @ws.add_row ["mule", "donkey", "horse"], :widths => [20, :ignore, nil]
     assert(@ws.column_info.size == 3, "a data item for each column")
-    assert_equal(@ws.column_info[0].width, 20, "adding a row with fixed width updates :fixed attribute")
+    assert_equal(20, @ws.column_info[0].width, "adding a row with fixed width updates :fixed attribute")
     assert_equal(@ws.column_info[1].width, nil, ":ignore does not set any data")
   end
 
@@ -374,17 +382,28 @@ class TestWorksheet < Test::Unit::TestCase
     assert_raise(ArgumentError, 'only accept Integer, Float or Fixnum') { @ws.column_widths 2, 7, "-1" }
   end
 
+  def test_protect_range
+    assert(@ws.send(:protected_ranges).is_a?(Axlsx::SimpleTypedList))
+    assert_equal(0, @ws.send(:protected_ranges).size)
+    @ws.protect_range('A1:A3')
+    assert_equal('A1:A3', @ws.send(:protected_ranges).last.sqref)
+  end
+
+  def test_protect_range_with_cells
+    @ws.add_row [1, 2, 3]
+    assert_nothing_raised {@ws.protect_range(@ws.rows.first.cells) }
+    assert_equal('A1:C1', @ws.send(:protected_ranges).last.sqref)
+    
+  end
   def test_merge_cells
-    assert(@ws.merged_cells.is_a?(Array))
-    assert_equal(@ws.merged_cells.size, 0)
     @ws.add_row [1,2,3]
     @ws.add_row [4,5,6]
     @ws.add_row [7,8,9]
     @ws.merge_cells "A1:A2"
     @ws.merge_cells "B2:C3"
     @ws.merge_cells @ws.rows.last.cells[(0..1)]
-    assert_equal(@ws.merged_cells.size, 3)
-    assert_equal(@ws.merged_cells.last, "A3:B3")
+    assert_equal(@ws.send(:merged_cells).size, 3)
+    assert_equal(@ws.send(:merged_cells).last, "A3:B3")
   end
   
   def test_merge_cells_sorts_correctly_by_row_when_given_array
@@ -392,13 +411,13 @@ class TestWorksheet < Test::Unit::TestCase
       @ws.add_row [i]
     end
     @ws.merge_cells [@ws.rows[8].cells.first, @ws.rows[9].cells.first]
-    assert_equal "A9:A10", @ws.merged_cells.first
+    assert_equal "A9:A10", @ws.send(:merged_cells).first
   end
   
   def test_auto_filter
-    assert(@ws.auto_filter.nil?)
+    assert(@ws.auto_filter.range.nil?)
     assert_raise(ArgumentError) { @ws.auto_filter = 123 }
     @ws.auto_filter = "A1:D9"
-    assert_equal(@ws.auto_filter, "A1:D9")
+    assert_equal(@ws.auto_filter.range, "A1:D9")
   end
 end