caxlsx 3.1.1 → 3.2.0

data/test/drawing/tc_vml_shape.rb

@@ -1,106 +1,106 @@
-require 'tc_helper.rb'
-
-class TestVmlShape < Test::Unit::TestCase
-
-  def setup
-    p = Axlsx::Package.new
-    wb = p.workbook
-    @ws = wb.add_worksheet
-    @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank', :visible => true
-    @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO', :visible => false
-    @comments = @ws.comments
-  end
-
-  def test_initialize
-    assert_raise(ArgumentError) { Axlsx::VmlDrawing.new }
-  end
-
-  def test_row
-    shape = @comments.first.vml_shape
-    assert_equal(shape.row, 0)
-    shape = @comments.last.vml_shape
-    assert_equal(shape.row, 2)
-  end
-
-  def test_column
-    shape = @comments.first.vml_shape
-    assert_equal(shape.column, 0)
-    shape = @comments.last.vml_shape
-    assert_equal(shape.column, 2)
-  end
-
-  def test_left_column
-    shape = @comments.first.vml_shape
-    shape.left_column = 3
-    assert(shape.left_column == 3)
-    assert_raise(ArgumentError) { shape.left_column = [] }
-  end
-
-  def test_left_offset
-    shape = @comments.first.vml_shape
-    shape.left_offset = 3
-    assert(shape.left_offset == 3)
-    assert_raise(ArgumentError) { shape.left_offset = [] }
-  end
-
-  def test_right_column
-    shape = @comments.first.vml_shape
-    shape.right_column = 3
-    assert(shape.right_column == 3)
-    assert_raise(ArgumentError) { shape.right_column = [] }
-  end
-
-  def test_right_offset
-    shape = @comments.first.vml_shape
-    shape.right_offset = 3
-    assert(shape.right_offset == 3)
-    assert_raise(ArgumentError) { shape.right_offset = [] }
-  end
-
-  def test_top_offset
-    shape = @comments.first.vml_shape
-    shape.top_offset = 3
-    assert(shape.top_offset == 3)
-    assert_raise(ArgumentError) { shape.top_offset = [] }
-  end
-
-  def test_bottom_offset
-    shape = @comments.first.vml_shape
-    shape.bottom_offset = 3
-    assert(shape.bottom_offset == 3)
-    assert_raise(ArgumentError) { shape.bottom_offset = [] }
-  end
-
-  def test_bottom_row
-    shape = @comments.first.vml_shape
-    shape.bottom_row = 3
-    assert(shape.bottom_row == 3)
-    assert_raise(ArgumentError) { shape.bottom_row = [] }
-  end
-
-  def test_top_row
-    shape = @comments.first.vml_shape
-    shape.top_row = 3
-    assert(shape.top_row == 3)
-    assert_raise(ArgumentError) { shape.top_row = [] }
-  end
-  def test_visible
-    shape = @comments.first.vml_shape
-    shape.visible = false
-    assert(shape.visible == false)
-    assert_raise(ArgumentError) { shape.visible = 'foo' }
-  end
-  def test_to_xml_string
-    str = @comments.vml_drawing.to_xml_string()
-    doc = Nokogiri::XML(str)
-    assert_equal(doc.xpath("//v:shape").size, 2)
-    assert_equal(1, doc.xpath("//x:Visible").size, 'ClientData/x:Visible element rendering')
-    @comments.each do |comment|
-      shape = comment.vml_shape
-      assert(doc.xpath("//v:shape/x:ClientData/x:Row[text()='#{shape.row}']").size == 1)
-      assert(doc.xpath("//v:shape/x:ClientData/x:Column[text()='#{shape.column}']").size == 1)
-      assert(doc.xpath("//v:shape/x:ClientData/x:Anchor[text()='#{shape.left_column}, #{shape.left_offset}, #{shape.top_row}, #{shape.top_offset}, #{shape.right_column}, #{shape.right_offset}, #{shape.bottom_row}, #{shape.bottom_offset}']").size == 1)
-    end
-  end
-
-end
+require 'tc_helper.rb'
+
+class TestVmlShape < Test::Unit::TestCase
+
+  def setup
+    p = Axlsx::Package.new
+    wb = p.workbook
+    @ws = wb.add_worksheet
+    @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank', :visible => true
+    @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO', :visible => false
+    @comments = @ws.comments
+  end
+
+  def test_initialize
+    assert_raise(ArgumentError) { Axlsx::VmlDrawing.new }
+  end
+
+  def test_row
+    shape = @comments.first.vml_shape
+    assert_equal(shape.row, 0)
+    shape = @comments.last.vml_shape
+    assert_equal(shape.row, 2)
+  end
+
+  def test_column
+    shape = @comments.first.vml_shape
+    assert_equal(shape.column, 0)
+    shape = @comments.last.vml_shape
+    assert_equal(shape.column, 2)
+  end
+
+  def test_left_column
+    shape = @comments.first.vml_shape
+    shape.left_column = 3
+    assert(shape.left_column == 3)
+    assert_raise(ArgumentError) { shape.left_column = [] }
+  end
+
+  def test_left_offset
+    shape = @comments.first.vml_shape
+    shape.left_offset = 3
+    assert(shape.left_offset == 3)
+    assert_raise(ArgumentError) { shape.left_offset = [] }
+  end
+
+  def test_right_column
+    shape = @comments.first.vml_shape
+    shape.right_column = 3
+    assert(shape.right_column == 3)
+    assert_raise(ArgumentError) { shape.right_column = [] }
+  end
+
+  def test_right_offset
+    shape = @comments.first.vml_shape
+    shape.right_offset = 3
+    assert(shape.right_offset == 3)
+    assert_raise(ArgumentError) { shape.right_offset = [] }
+  end
+
+  def test_top_offset
+    shape = @comments.first.vml_shape
+    shape.top_offset = 3
+    assert(shape.top_offset == 3)
+    assert_raise(ArgumentError) { shape.top_offset = [] }
+  end
+
+  def test_bottom_offset
+    shape = @comments.first.vml_shape
+    shape.bottom_offset = 3
+    assert(shape.bottom_offset == 3)
+    assert_raise(ArgumentError) { shape.bottom_offset = [] }
+  end
+
+  def test_bottom_row
+    shape = @comments.first.vml_shape
+    shape.bottom_row = 3
+    assert(shape.bottom_row == 3)
+    assert_raise(ArgumentError) { shape.bottom_row = [] }
+  end
+
+  def test_top_row
+    shape = @comments.first.vml_shape
+    shape.top_row = 3
+    assert(shape.top_row == 3)
+    assert_raise(ArgumentError) { shape.top_row = [] }
+  end
+  def test_visible
+    shape = @comments.first.vml_shape
+    shape.visible = false
+    assert(shape.visible == false)
+    assert_raise(ArgumentError) { shape.visible = 'foo' }
+  end
+  def test_to_xml_string
+    str = @comments.vml_drawing.to_xml_string()
+    doc = Nokogiri::XML(str)
+    assert_equal(doc.xpath("//v:shape").size, 2)
+    assert_equal(1, doc.xpath("//x:Visible").size, 'ClientData/x:Visible element rendering')
+    @comments.each do |comment|
+      shape = comment.vml_shape
+      assert(doc.xpath("//v:shape/x:ClientData/x:Row[text()='#{shape.row}']").size == 1)
+      assert(doc.xpath("//v:shape/x:ClientData/x:Column[text()='#{shape.column}']").size == 1)
+      assert(doc.xpath("//v:shape/x:ClientData/x:Anchor[text()='#{shape.left_column}, #{shape.left_offset}, #{shape.top_row}, #{shape.top_offset}, #{shape.right_column}, #{shape.right_offset}, #{shape.bottom_row}, #{shape.bottom_offset}']").size == 1)
+    end
+  end
+
+end

data/test/profile.rb

@@ -1,24 +1,24 @@
-#!/usr/bin/env ruby -s
-
-$:.unshift "#{File.dirname(__FILE__)}/../lib"
-require 'axlsx'
-require 'ruby-prof'
-#RubyProf.measure_mode = RubyProf::MEMORY
-#
-row = []
-# Taking worst case scenario of all string data
-input = (32..126).to_a.pack('U*').chars.to_a
-20.times { row << input.shuffle.join}
-
-profile = RubyProf.profile do
-  p = Axlsx::Package.new
-  p.workbook.add_worksheet do |sheet|
-    10000.times do
-      sheet << row
-    end
-  end
-  p.to_stream
-end
-
-printer = RubyProf::FlatPrinter.new(profile)
-printer.print(STDOUT, {})
+#!/usr/bin/env ruby -s
+
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'axlsx'
+require 'ruby-prof'
+#RubyProf.measure_mode = RubyProf::MEMORY
+#
+row = []
+# Taking worst case scenario of all string data
+input = (32..126).to_a.pack('U*').chars.to_a
+20.times { row << input.shuffle.join}
+
+profile = RubyProf.profile do
+  p = Axlsx::Package.new
+  p.workbook.add_worksheet do |sheet|
+    10000.times do
+      sheet << row
+    end
+  end
+  p.to_stream
+end
+
+printer = RubyProf::FlatPrinter.new(profile)
+printer.print(STDOUT, {})

data/test/rels/tc_relationship.rb

@@ -1,52 +1,52 @@
-require 'tc_helper.rb'
-
-class TestRelationships < Test::Unit::TestCase
-  
-  def test_instances_with_different_attributes_have_unique_ids
-    rel_1 = Axlsx::Relationship.new(Object.new, Axlsx::WORKSHEET_R, 'target')
-    rel_2 = Axlsx::Relationship.new(Object.new, Axlsx::COMMENT_R, 'foobar')
-    assert_not_equal rel_1.Id, rel_2.Id
-  end
-  
-  def test_instances_with_same_attributes_share_id
-    source_obj = Object.new
-    instance = Axlsx::Relationship.new(source_obj, Axlsx::WORKSHEET_R, 'target')
-    assert_equal instance.Id, Axlsx::Relationship.new(source_obj, Axlsx::WORKSHEET_R, 'target').Id
-  end
-
-  def test_ids_cache_is_thread_safe
-    cache1, cache2 = nil
-    t1 = Thread.new { cache1 = Axlsx::Relationship.ids_cache }
-    t2 = Thread.new { cache2 = Axlsx::Relationship.ids_cache }
-    [t1, t2].each(&:join)
-    assert_not_same(cache1, cache2)
-  end
-  
-  def test_target_is_only_considered_for_same_attributes_check_if_target_mode_is_external
-    source_obj = Object.new
-    rel_1 = Axlsx::Relationship.new(source_obj, Axlsx::WORKSHEET_R, 'target')
-    rel_2 = Axlsx::Relationship.new(source_obj, Axlsx::WORKSHEET_R, '../target')
-    assert_equal rel_1.Id, rel_2.Id
-    
-    rel_3 = Axlsx::Relationship.new(source_obj, Axlsx::HYPERLINK_R, 'target', :target_mode => :External)
-    rel_4 = Axlsx::Relationship.new(source_obj, Axlsx::HYPERLINK_R, '../target', :target_mode => :External)
-    assert_not_equal rel_3.Id, rel_4.Id
-  end
-  
-  def test_type
-    assert_raise(ArgumentError) { Axlsx::Relationship.new nil, 'type', 'target' }
-    assert_nothing_raised { Axlsx::Relationship.new nil, Axlsx::WORKSHEET_R, 'target' }
-    assert_nothing_raised { Axlsx::Relationship.new nil, Axlsx::COMMENT_R, 'target' }
-  end
-
-  def test_target_mode
-    assert_raise(ArgumentError) { Axlsx::Relationship.new nil, 'type', 'target', :target_mode => "FISH" }
-    assert_nothing_raised { Axlsx::Relationship.new( nil, Axlsx::WORKSHEET_R, 'target', :target_mode => :External) }
-  end
-
-  def test_ampersand_escaping_in_target
-    r = Axlsx::Relationship.new(nil, Axlsx::HYPERLINK_R, "http://example.com?foo=1&bar=2", :target_mod => :External)
-    doc = Nokogiri::XML(r.to_xml_string)
-    assert_equal(doc.xpath("//Relationship[@Target='http://example.com?foo=1&bar=2']").size, 1)
-  end
-end
+require 'tc_helper.rb'
+
+class TestRelationships < Test::Unit::TestCase
+  
+  def test_instances_with_different_attributes_have_unique_ids
+    rel_1 = Axlsx::Relationship.new(Object.new, Axlsx::WORKSHEET_R, 'target')
+    rel_2 = Axlsx::Relationship.new(Object.new, Axlsx::COMMENT_R, 'foobar')
+    assert_not_equal rel_1.Id, rel_2.Id
+  end
+  
+  def test_instances_with_same_attributes_share_id
+    source_obj = Object.new
+    instance = Axlsx::Relationship.new(source_obj, Axlsx::WORKSHEET_R, 'target')
+    assert_equal instance.Id, Axlsx::Relationship.new(source_obj, Axlsx::WORKSHEET_R, 'target').Id
+  end
+
+  def test_ids_cache_is_thread_safe
+    cache1, cache2 = nil
+    t1 = Thread.new { cache1 = Axlsx::Relationship.ids_cache }
+    t2 = Thread.new { cache2 = Axlsx::Relationship.ids_cache }
+    [t1, t2].each(&:join)
+    assert_not_same(cache1, cache2)
+  end
+  
+  def test_target_is_only_considered_for_same_attributes_check_if_target_mode_is_external
+    source_obj = Object.new
+    rel_1 = Axlsx::Relationship.new(source_obj, Axlsx::WORKSHEET_R, 'target')
+    rel_2 = Axlsx::Relationship.new(source_obj, Axlsx::WORKSHEET_R, '../target')
+    assert_equal rel_1.Id, rel_2.Id
+    
+    rel_3 = Axlsx::Relationship.new(source_obj, Axlsx::HYPERLINK_R, 'target', :target_mode => :External)
+    rel_4 = Axlsx::Relationship.new(source_obj, Axlsx::HYPERLINK_R, '../target', :target_mode => :External)
+    assert_not_equal rel_3.Id, rel_4.Id
+  end
+  
+  def test_type
+    assert_raise(ArgumentError) { Axlsx::Relationship.new nil, 'type', 'target' }
+    assert_nothing_raised { Axlsx::Relationship.new nil, Axlsx::WORKSHEET_R, 'target' }
+    assert_nothing_raised { Axlsx::Relationship.new nil, Axlsx::COMMENT_R, 'target' }
+  end
+
+  def test_target_mode
+    assert_raise(ArgumentError) { Axlsx::Relationship.new nil, 'type', 'target', :target_mode => "FISH" }
+    assert_nothing_raised { Axlsx::Relationship.new( nil, Axlsx::WORKSHEET_R, 'target', :target_mode => :External) }
+  end
+
+  def test_ampersand_escaping_in_target
+    r = Axlsx::Relationship.new(nil, Axlsx::HYPERLINK_R, "http://example.com?foo=1&bar=2", :target_mod => :External)
+    doc = Nokogiri::XML(r.to_xml_string)
+    assert_equal(doc.xpath("//Relationship[@Target='http://example.com?foo=1&bar=2']").size, 1)
+  end
+end

data/test/rels/tc_relationships.rb

@@ -1,37 +1,37 @@
-require 'tc_helper.rb'
-
-class TestRelationships < Test::Unit::TestCase
-
-  def test_for
-    source_obj_1, source_obj_2 = Object.new, Object.new
-    rel_1 = Axlsx::Relationship.new(source_obj_1, Axlsx::WORKSHEET_R, "bar")
-    rel_2 = Axlsx::Relationship.new(source_obj_2, Axlsx::WORKSHEET_R, "bar")
-    rels = Axlsx::Relationships.new
-    rels << rel_1 
-    rels << rel_2
-    assert_equal rel_1, rels.for(source_obj_1)
-    assert_equal rel_2, rels.for(source_obj_2)
-  end
-  
-  def test_valid_document
-    @rels = Axlsx::Relationships.new
-    schema = Nokogiri::XML::Schema(File.open(Axlsx::RELS_XSD))
-    doc = Nokogiri::XML(@rels.to_xml_string)
-    errors = []
-    schema.validate(doc).each do |error|
-      puts error.message
-      errors << error
-    end
-
-    @rels << Axlsx::Relationship.new(nil, Axlsx::WORKSHEET_R, "bar")
-    doc = Nokogiri::XML(@rels.to_xml_string)
-    errors = []
-    schema.validate(doc).each do |error|
-      puts error.message
-      errors << error
-    end
-
-    assert(errors.size == 0)
-  end
-
-end
+require 'tc_helper.rb'
+
+class TestRelationships < Test::Unit::TestCase
+
+  def test_for
+    source_obj_1, source_obj_2 = Object.new, Object.new
+    rel_1 = Axlsx::Relationship.new(source_obj_1, Axlsx::WORKSHEET_R, "bar")
+    rel_2 = Axlsx::Relationship.new(source_obj_2, Axlsx::WORKSHEET_R, "bar")
+    rels = Axlsx::Relationships.new
+    rels << rel_1 
+    rels << rel_2
+    assert_equal rel_1, rels.for(source_obj_1)
+    assert_equal rel_2, rels.for(source_obj_2)
+  end
+  
+  def test_valid_document
+    @rels = Axlsx::Relationships.new
+    schema = Nokogiri::XML::Schema(File.open(Axlsx::RELS_XSD))
+    doc = Nokogiri::XML(@rels.to_xml_string)
+    errors = []
+    schema.validate(doc).each do |error|
+      puts error.message
+      errors << error
+    end
+
+    @rels << Axlsx::Relationship.new(nil, Axlsx::WORKSHEET_R, "bar")
+    doc = Nokogiri::XML(@rels.to_xml_string)
+    errors = []
+    schema.validate(doc).each do |error|
+      puts error.message
+      errors << error
+    end
+
+    assert(errors.size == 0)
+  end
+
+end

data/test/stylesheet/tc_border.rb

@@ -1,37 +1,37 @@
-require 'tc_helper.rb'
-
-class TestBorder < Test::Unit::TestCase
-  def setup
-    @b = Axlsx::Border.new
-  end
-  def teardown
-  end
-  def test_initialiation
-    assert_equal(@b.diagonalUp, nil)
-    assert_equal(@b.diagonalDown, nil)
-    assert_equal(@b.outline, nil)
-    assert(@b.prs.is_a?(Axlsx::SimpleTypedList))
-  end
-
-  def test_diagonalUp
-    assert_raise(ArgumentError) { @b.diagonalUp = :red }
-    assert_nothing_raised { @b.diagonalUp = true }
-    assert_equal(@b.diagonalUp, true )
-  end
-
-  def test_diagonalDown
-    assert_raise(ArgumentError) { @b.diagonalDown = :red }
-    assert_nothing_raised { @b.diagonalDown = true }
-    assert_equal(@b.diagonalDown, true )
-  end
-
-  def test_outline
-    assert_raise(ArgumentError) { @b.outline = :red }
-    assert_nothing_raised { @b.outline = true }
-    assert_equal(@b.outline, true )
-  end
-
-  def test_prs
-    assert_nothing_raised { @b.prs << Axlsx::BorderPr.new(:name=>:top, :style=>:thin, :color => Axlsx::Color.new(:rgb=>"FF0000FF")) }
-  end
-end
+require 'tc_helper.rb'
+
+class TestBorder < Test::Unit::TestCase
+  def setup
+    @b = Axlsx::Border.new
+  end
+  def teardown
+  end
+  def test_initialiation
+    assert_equal(@b.diagonalUp, nil)
+    assert_equal(@b.diagonalDown, nil)
+    assert_equal(@b.outline, nil)
+    assert(@b.prs.is_a?(Axlsx::SimpleTypedList))
+  end
+
+  def test_diagonalUp
+    assert_raise(ArgumentError) { @b.diagonalUp = :red }
+    assert_nothing_raised { @b.diagonalUp = true }
+    assert_equal(@b.diagonalUp, true )
+  end
+
+  def test_diagonalDown
+    assert_raise(ArgumentError) { @b.diagonalDown = :red }
+    assert_nothing_raised { @b.diagonalDown = true }
+    assert_equal(@b.diagonalDown, true )
+  end
+
+  def test_outline
+    assert_raise(ArgumentError) { @b.outline = :red }
+    assert_nothing_raised { @b.outline = true }
+    assert_equal(@b.outline, true )
+  end
+
+  def test_prs
+    assert_nothing_raised { @b.prs << Axlsx::BorderPr.new(:name=>:top, :style=>:thin, :color => Axlsx::Color.new(:rgb=>"FF0000FF")) }
+  end
+end

data/test/stylesheet/tc_border_pr.rb

@@ -1,32 +1,32 @@
-require 'tc_helper.rb'
-
-class TestBorderPr < Test::Unit::TestCase
-  def setup
-    @bpr = Axlsx::BorderPr.new
-  end
-  def teardown
-  end
-  def test_initialiation
-    assert_equal(@bpr.color, nil)
-    assert_equal(@bpr.style, nil)
-    assert_equal(@bpr.name, nil)
-  end
-
-  def test_color
-    assert_raise(ArgumentError) { @bpr.color = :red }
-    assert_nothing_raised { @bpr.color = Axlsx::Color.new :rgb=>"FF000000" }
-    assert(@bpr.color.is_a?(Axlsx::Color))
-  end
-
-  def test_style
-    assert_raise(ArgumentError) { @bpr.style = :red }
-    assert_nothing_raised { @bpr.style = :thin }
-    assert_equal(@bpr.style, :thin)
-  end
-
-  def test_name
-    assert_raise(ArgumentError) { @bpr.name = :red }
-    assert_nothing_raised { @bpr.name = :top }
-    assert_equal(@bpr.name, :top)
-  end
-end
+require 'tc_helper.rb'
+
+class TestBorderPr < Test::Unit::TestCase
+  def setup
+    @bpr = Axlsx::BorderPr.new
+  end
+  def teardown
+  end
+  def test_initialiation
+    assert_equal(@bpr.color, nil)
+    assert_equal(@bpr.style, nil)
+    assert_equal(@bpr.name, nil)
+  end
+
+  def test_color
+    assert_raise(ArgumentError) { @bpr.color = :red }
+    assert_nothing_raised { @bpr.color = Axlsx::Color.new :rgb=>"FF000000" }
+    assert(@bpr.color.is_a?(Axlsx::Color))
+  end
+
+  def test_style
+    assert_raise(ArgumentError) { @bpr.style = :red }
+    assert_nothing_raised { @bpr.style = :thin }
+    assert_equal(@bpr.style, :thin)
+  end
+
+  def test_name
+    assert_raise(ArgumentError) { @bpr.name = :red }
+    assert_nothing_raised { @bpr.name = :top }
+    assert_equal(@bpr.name, :top)
+  end
+end