axlsx 1.0.15 → 1.1.1

data/test/drawing/tc_view_3D.rb

@@ -1,14 +1,13 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestView3D < Test::Unit::TestCase
-  def setup    
+  def setup
     @view  = Axlsx::View3D.new
   end
 
   def teardown
   end
-  
+
   def test_options
     v = Axlsx::View3D.new :rotX => 10, :rotY => 5, :hPercent => "30%", :depthPercent => "45%", :rAngAx => false, :perspective => 10
     assert_equal(v.rotX, 10)
@@ -18,7 +17,7 @@ class TestView3D < Test::Unit::TestCase
     assert_equal(v.rAngAx, false)
     assert_equal(v.perspective, 10)
   end
-  
+
   def test_rotX
     assert_raise(ArgumentError) {@view.rotX = "bob"}
     assert_nothing_raised {@view.rotX = -90}
@@ -44,12 +43,12 @@ class TestView3D < Test::Unit::TestCase
     assert_raise(ArgumentError) {@view.rAngAx = "bob"}
     assert_nothing_raised {@view.rAngAx = true}
   end
-  
+
   def test_perspective
     assert_raise(ArgumentError) {@view.perspective = "bob"}
     assert_nothing_raised {@view.perspective = 30}
   end
 
 
-  
+
 end

data/test/profile.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby -s
+# -*- coding: utf-8 -*-
+
+# Usage:
+# > ruby test/profile.rb
+# > pprof.rb --gif /tmp/axlsx_noautowidth > /tmp/axlsx_noautowidth.gif
+# > open /tmp/axlsx_noautowidth.gif
+
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'axlsx'
+require 'csv'
+
+# require 'benchmark'
+require 'perftools'
+row = []
+input = (32..126).to_a.pack('U*').chars.to_a
+20.times { row << input.shuffle.join}
+times = 3000
+
+PerfTools::CpuProfiler.start("/tmp/axlsx_noautowidth") do
+  p = Axlsx::Package.new
+  p.use_autowidth = false
+  p.use_shared_strings = true
+  wb = p.workbook
+  
+  #A Simple Workbook
+  
+  wb.add_worksheet do |sheet|
+    times.times do
+      sheet << row
+    end
+  end
+  p.serialize("example.xlsx")
+end

data/test/rels/tc_relationship.rb

@@ -1,16 +1,20 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestRelationships < Test::Unit::TestCase
-  def setup    
+  def setup
+  end
+
+  def teardown
   end
-  
-  def teardown    
-  end  
 
   def test_type
     assert_raise(ArgumentError) { Axlsx::Relationship.new 'type', 'target' }
     assert_nothing_raised { Axlsx::Relationship.new Axlsx::WORKSHEET_R, 'target' }
   end
 
+  def test_target_mode
+    assert_raise(ArgumentError) { Axlsx::Relationship.new 'type', 'target', :target_mode => "FISH" }
+    assert_nothing_raised { Axlsx::Relationship.new( Axlsx::WORKSHEET_R, 'target', :target_mode => :External) }
+  end
+
 end

data/test/rels/tc_relationships.rb

@@ -1,12 +1,11 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestRelationships < Test::Unit::TestCase
 
   def test_valid_document
     @rels = Axlsx::Relationships.new
     schema = Nokogiri::XML::Schema(File.open(Axlsx::RELS_XSD))
-    doc = Nokogiri::XML(@rels.to_xml)
+    doc = Nokogiri::XML(@rels.to_xml_string)
     errors = []
     schema.validate(doc).each do |error|
       puts error.message
@@ -14,14 +13,14 @@ class TestRelationships < Test::Unit::TestCase
     end
 
     @rels << Axlsx::Relationship.new(Axlsx::WORKSHEET_R, "bar")
-    doc = Nokogiri::XML(@rels.to_xml)
+    doc = Nokogiri::XML(@rels.to_xml_string)
     errors = []
     schema.validate(doc).each do |error|
       puts error.message
       errors << error
     end
 
-    assert(errors.size == 0)    
+    assert(errors.size == 0)
   end
 
 end

data/test/stylesheet/tc_border.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestBorder < Test::Unit::TestCase
-  def setup    
+  def setup
     @b = Axlsx::Border.new
   end
   def teardown
@@ -10,7 +9,7 @@ class TestBorder < Test::Unit::TestCase
   def test_initialiation
     assert_equal(@b.diagonalUp, nil)
     assert_equal(@b.diagonalDown, nil)
-    assert_equal(@b.outline, nil)    
+    assert_equal(@b.outline, nil)
     assert(@b.prs.is_a?(Axlsx::SimpleTypedList))
   end
 

data/test/stylesheet/tc_border_pr.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestBorderPr < Test::Unit::TestCase
-  def setup    
+  def setup
     @bpr = Axlsx::BorderPr.new
   end
   def teardown
@@ -10,7 +9,7 @@ class TestBorderPr < Test::Unit::TestCase
   def test_initialiation
     assert_equal(@bpr.color, nil)
     assert_equal(@bpr.style, nil)
-    assert_equal(@bpr.name, nil)    
+    assert_equal(@bpr.name, nil)
   end
 
   def test_color

data/test/stylesheet/tc_cell_alignment.rb

@@ -1,12 +1,10 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestCellAlignment < Test::Unit::TestCase
-  def setup    
+  def setup
     @item = Axlsx::CellAlignment.new
   end
-  def teardown
-  end
+
   def test_initialiation
     assert_equal(@item.horizontal, nil)
     assert_equal(@item.vertical, nil)
@@ -17,7 +15,13 @@ class TestCellAlignment < Test::Unit::TestCase
     assert_equal(@item.justifyLastLine, nil)
     assert_equal(@item.shrinkToFit, nil)
     assert_equal(@item.readingOrder, nil)
-
+    options =  { :horizontal => :left, :vertical => :top, :textRotation => 3,
+                 :wrapText => true, :indent => 2, :relativeIndent => 5,
+      :justifyLastLine => true, :shrinkToFit => true, :readingOrder => 2 }
+    ca = Axlsx::CellAlignment.new options
+    options.each do |key, value|
+      assert_equal(ca.send(key.to_sym),value)
+    end
   end
 
   def test_horizontal

data/test/stylesheet/tc_cell_protection.rb

@@ -1,9 +1,8 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestCellProtection < Test::Unit::TestCase
 
-  def setup    
+  def setup
     @item = Axlsx::CellProtection.new
   end
 

data/test/stylesheet/tc_cell_style.rb

@@ -1,9 +1,8 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestCellStyle < Test::Unit::TestCase
 
-  def setup    
+  def setup
     @item = Axlsx::CellStyle.new
   end
 

data/test/stylesheet/tc_color.rb

@@ -1,9 +1,8 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestColor < Test::Unit::TestCase
 
-  def setup    
+  def setup
     @item = Axlsx::Color.new
   end
 

data/test/stylesheet/tc_fill.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestFill < Test::Unit::TestCase
 

data/test/stylesheet/tc_font.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestFont < Test::Unit::TestCase
 
@@ -17,6 +16,7 @@ class TestFont < Test::Unit::TestCase
     assert_equal(@item.family, nil)
     assert_equal(@item.b, nil)
     assert_equal(@item.i, nil)
+    assert_equal(@item.u, nil)
     assert_equal(@item.strike, nil)
     assert_equal(@item.outline, nil)
     assert_equal(@item.shadow, nil)
@@ -28,7 +28,7 @@ class TestFont < Test::Unit::TestCase
 
 
 
-    # def name=(v) Axlsx::validate_string v; @name = v end    
+    # def name=(v) Axlsx::validate_string v; @name = v end
   def test_name
     assert_raise(ArgumentError) { @item.name = 7 }
     assert_nothing_raised { @item.name = "bob" }
@@ -48,7 +48,7 @@ class TestFont < Test::Unit::TestCase
     assert_equal(@item.family, 5)
   end
 
-    # def b=(v) Axlsx::validate_boolean v; @b = v end    
+    # def b=(v) Axlsx::validate_boolean v; @b = v end
   def test_b
     assert_raise(ArgumentError) { @item.b = -7 }
     assert_nothing_raised { @item.b = true }
@@ -62,6 +62,13 @@ class TestFont < Test::Unit::TestCase
     assert_equal(@item.i, true)
   end
 
+    # def u=(v) Axlsx::validate_boolean v; @u = v end
+  def test_u
+    assert_raise(ArgumentError) { @item.u = -7 }
+    assert_nothing_raised { @item.u = true }
+    assert_equal(@item.u, true)
+  end
+
     # def strike=(v) Axlsx::validate_boolean v; @strike = v end
   def test_strike
     assert_raise(ArgumentError) { @item.strike = -7 }
@@ -76,7 +83,7 @@ class TestFont < Test::Unit::TestCase
     assert_equal(@item.outline, true)
   end
 
-    # def shadow=(v) Axlsx::validate_boolean v; @shadow = v end    
+    # def shadow=(v) Axlsx::validate_boolean v; @shadow = v end
   def test_shadow
     assert_raise(ArgumentError) { @item.shadow = -7 }
     assert_nothing_raised { @item.shadow = true }

data/test/stylesheet/tc_gradient_fill.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestGradientFill < Test::Unit::TestCase
 

data/test/stylesheet/tc_gradient_stop.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestGradientStop < Test::Unit::TestCase
 

data/test/stylesheet/tc_num_fmt.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestNumFmt < Test::Unit::TestCase
 

data/test/stylesheet/tc_pattern_fill.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestPatternFill < Test::Unit::TestCase
 
@@ -17,13 +16,13 @@ class TestPatternFill < Test::Unit::TestCase
     assert_equal(@item.fgColor, nil)
   end
 
-  def test_bgColor    
+  def test_bgColor
     assert_raise(ArgumentError) { @item.bgColor = -1.1 }
     assert_nothing_raised { @item.bgColor = Axlsx::Color.new }
     assert_equal(@item.bgColor.rgb, "FF000000")
   end
 
-  def test_fgColor    
+  def test_fgColor
     assert_raise(ArgumentError) { @item.fgColor = -1.1 }
     assert_nothing_raised { @item.fgColor = Axlsx::Color.new }
     assert_equal(@item.fgColor.rgb, "FF000000")

data/test/stylesheet/tc_styles.rb

@@ -1,16 +1,15 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestStyles < Test::Unit::TestCase
-  def setup    
+  def setup
     @styles = Axlsx::Styles.new
   end
   def teardown
   end
-  
+
   def test_valid_document
     schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
-    doc = Nokogiri::XML(@styles.to_xml)
+    doc = Nokogiri::XML(@styles.to_xml_string)
     errors = []
     schema.validate(doc).each do |error|
       errors.push error
@@ -18,7 +17,29 @@ class TestStyles < Test::Unit::TestCase
     end
     assert(errors.size == 0)
   end
+  def test_add_style_border_hash
+    border_count = @styles.borders.size
+    s = @styles.add_style :border => {:style => :thin, :color => "FFFF0000"}
+    assert_equal(@styles.borders.size, border_count + 1)
+    assert_equal(@styles.borders.last.prs.last.color.rgb, "FFFF0000")
+    assert_raise(ArgumentError) { @styles.add_style :border => {:color => "FFFF0000"} }
+    assert_equal @styles.borders.last.prs.size, 4
+  end
+
+  def test_add_style_border_edges
+    s = @styles.add_style :border => { :style => :thin, :color => "0000FFFF", :edges => [:top, :bottom] }
+    parts = @styles.borders.last.prs
+    parts.each { |pr| assert_equal(pr.color.rgb, "0000FFFF", "Style is applied to #{pr.name} properly") }
+    assert((parts.map { |pr| pr.name.to_s }.sort && ['bottom', 'top']).size == 2, "specify two edges, and you get two border prs")
+  end
 
+  def test_do_not_alter_options_in_add_style
+    #This should test all options, but for now - just the bits that we know caused some pain
+    options = { :border => { :style => :thin, :color =>"FF000000" } }
+    @styles.add_style options
+    assert_equal options[:border][:style], :thin, 'thin style is stil in option'
+    assert_equal options[:border][:color], "FF000000", 'color is stil in option'
+  end
 
   def test_add_style
     fill_count = @styles.fills.size
@@ -42,11 +63,15 @@ class TestStyles < Test::Unit::TestCase
 
     assert(xf.alignment.is_a?(Axlsx::CellAlignment), "alignment was created")
     assert_equal(xf.alignment.horizontal, :left, "horizontal alignment applied")
-    assert_equal(xf.applyProtection, 1, "protection applied")
     assert_equal(xf.protection.hidden, true, "hidden protection set")
     assert_equal(xf.protection.locked, true, "cell locking set")
     assert_raise(ArgumentError, "should reject invalid borderId") { @styles.add_style :border => 2 }
 
+
+    assert_equal(xf.applyProtection, 1, "protection applied")
+    assert_equal(xf.applyBorder, true, "border applied")
+    assert_equal(xf.applyNumberFormat, true, "number format applied")
+    assert_equal(xf.applyAlignment, true, "alignment applied")
   end
 
 end

data/test/stylesheet/tc_table_style.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestTableStyle < Test::Unit::TestCase
 
@@ -16,7 +15,7 @@ class TestTableStyle < Test::Unit::TestCase
     assert_equal(@item.table, nil)
   end
 
-  def test_name    
+  def test_name
     assert_raise(ArgumentError) { @item.name = -1.1 }
     assert_nothing_raised { @item.name = "lovely table style" }
     assert_equal(@item.name, "lovely table style")

data/test/stylesheet/tc_table_style_element.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestTableStyleElement < Test::Unit::TestCase
 
@@ -16,7 +15,7 @@ class TestTableStyleElement < Test::Unit::TestCase
     assert_equal(@item.dxfId, nil)
   end
 
-  def test_type    
+  def test_type
     assert_raise(ArgumentError) { @item.type = -1.1 }
     assert_nothing_raised { @item.type = :blankRow }
     assert_equal(@item.type, :blankRow)

data/test/stylesheet/tc_table_styles.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestTableStyles < Test::Unit::TestCase
 
@@ -15,13 +14,13 @@ class TestTableStyles < Test::Unit::TestCase
     assert_equal(@item.defaultPivotStyle, "PivotStyleLight16")
   end
 
-  def test_defaultTableStyle    
+  def test_defaultTableStyle
     assert_raise(ArgumentError) { @item.defaultTableStyle = -1.1 }
     assert_nothing_raised { @item.defaultTableStyle = "anyones guess" }
     assert_equal(@item.defaultTableStyle, "anyones guess")
   end
 
-  def test_defaultPivotStyle    
+  def test_defaultPivotStyle
     assert_raise(ArgumentError) { @item.defaultPivotStyle = -1.1 }
     assert_nothing_raised { @item.defaultPivotStyle = "anyones guess" }
     assert_equal(@item.defaultPivotStyle, "anyones guess")

data/test/stylesheet/tc_xf.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestXf < Test::Unit::TestCase
 
@@ -28,91 +27,91 @@ class TestXf < Test::Unit::TestCase
     assert_equal(@item.applyProtection, nil)
   end
 
-  def test_alignment    
+  def test_alignment
     assert_raise(ArgumentError) { @item.alignment = -1.1 }
     assert_nothing_raised { @item.alignment = Axlsx::CellAlignment.new }
     assert(@item.alignment.is_a?(Axlsx::CellAlignment))
   end
 
-  def test_protection    
+  def test_protection
     assert_raise(ArgumentError) { @item.protection = -1.1 }
     assert_nothing_raised { @item.protection = Axlsx::CellProtection.new }
     assert(@item.protection.is_a?(Axlsx::CellProtection))
   end
 
-  def test_numFmtId    
+  def test_numFmtId
     assert_raise(ArgumentError) { @item.numFmtId = -1.1 }
     assert_nothing_raised { @item.numFmtId = 0 }
     assert_equal(@item.numFmtId, 0)
   end
 
-  def test_fillId    
+  def test_fillId
     assert_raise(ArgumentError) { @item.fillId = -1.1 }
     assert_nothing_raised { @item.fillId = 0 }
     assert_equal(@item.fillId, 0)
   end
 
-  def test_fontId    
+  def test_fontId
     assert_raise(ArgumentError) { @item.fontId = -1.1 }
     assert_nothing_raised { @item.fontId = 0 }
     assert_equal(@item.fontId, 0)
   end
 
-  def test_borderId    
+  def test_borderId
     assert_raise(ArgumentError) { @item.borderId = -1.1 }
     assert_nothing_raised { @item.borderId = 0 }
     assert_equal(@item.borderId, 0)
   end
 
-  def test_xfId    
+  def test_xfId
     assert_raise(ArgumentError) { @item.xfId = -1.1 }
     assert_nothing_raised { @item.xfId = 0 }
     assert_equal(@item.xfId, 0)
   end
 
-  def test_quotePrefix    
+  def test_quotePrefix
     assert_raise(ArgumentError) { @item.quotePrefix = -1.1 }
     assert_nothing_raised { @item.quotePrefix = false }
     assert_equal(@item.quotePrefix, false)
   end
 
-  def test_pivotButton    
+  def test_pivotButton
     assert_raise(ArgumentError) { @item.pivotButton = -1.1 }
     assert_nothing_raised { @item.pivotButton = false }
     assert_equal(@item.pivotButton, false)
   end
 
-  def test_applyNumberFormat    
+  def test_applyNumberFormat
     assert_raise(ArgumentError) { @item.applyNumberFormat = -1.1 }
     assert_nothing_raised { @item.applyNumberFormat = false }
     assert_equal(@item.applyNumberFormat, false)
   end
 
-  def test_applyFont    
+  def test_applyFont
     assert_raise(ArgumentError) { @item.applyFont = -1.1 }
     assert_nothing_raised { @item.applyFont = false }
     assert_equal(@item.applyFont, false)
   end
 
-  def test_applyFill    
+  def test_applyFill
     assert_raise(ArgumentError) { @item.applyFill = -1.1 }
     assert_nothing_raised { @item.applyFill = false }
     assert_equal(@item.applyFill, false)
   end
 
-  def test_applyBorder    
+  def test_applyBorder
     assert_raise(ArgumentError) { @item.applyBorder = -1.1 }
     assert_nothing_raised { @item.applyBorder = false }
     assert_equal(@item.applyBorder, false)
   end
 
-  def test_applyAlignment    
+  def test_applyAlignment
     assert_raise(ArgumentError) { @item.applyAlignment = -1.1 }
     assert_nothing_raised { @item.applyAlignment = false }
     assert_equal(@item.applyAlignment, false)
   end
 
-  def test_applyProtection    
+  def test_applyProtection
     assert_raise(ArgumentError) { @item.applyProtection = -1.1 }
     assert_nothing_raised { @item.applyProtection = false }
     assert_equal(@item.applyProtection, false)

data/test/tc_axlsx.rb

@@ -0,0 +1,39 @@
+require 'tc_helper.rb'
+
+class TestAxlsx < Test::Unit::TestCase
+
+  def setup_wide
+    @wide_test_points = { "A3" =>      0,
+      "Z3"    =>                      25,
+      "B3"    =>                       1,
+      "AA3"   =>             1 * 26 +  0,
+      "AAA3"  => 1 * 26**2 + 1 * 26 +  0,
+      "AAZ3"  => 1 * 26**2 + 1 * 26 + 25,
+      "ABA3"  => 1 * 26**2 + 2 * 26 +  0,
+      "BZU3"  => 2 * 26**2 + 26 * 26 + 20
+    }
+  end
+
+  def test_cell_range
+    #To do
+  end
+
+  def test_name_to_indices
+    setup_wide
+    @wide_test_points.each do |key, value|
+      assert_equal(Axlsx.name_to_indices(key), [value,2])
+    end
+  end
+
+  def test_col_ref
+    setup_wide
+    @wide_test_points.each do |key, value|
+      assert_equal(Axlsx.col_ref(value), key.gsub(/\d+/, ''))
+    end
+  end
+
+  def test_cell_r
+    # todo
+  end
+
+end

data/test/tc_helper.rb

@@ -0,0 +1,3 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'test/unit'
+require "axlsx.rb"