axlsx 1.3.3 → 1.3.4

data/lib/axlsx/workbook/worksheet/worksheet_hyperlink.rb

@@ -73,7 +73,7 @@ module Axlsx
     # r:id should only be specified for external targets.
     # @return [Hash]
     def location_or_id
-      @target == :external ?  { :"r:id" => id } : { :location => location }
+      @target == :external ?  { :"r:id" => id } : { :location => Axlsx::coder.encode(location) }
     end
   end
 end

data/test/benchmark.rb

@@ -4,11 +4,10 @@ $:.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'axlsx'
 require 'csv'
 require 'benchmark'
-
 row = []
 input = (32..126).to_a.pack('U*').chars.to_a
 20.times { row << input.shuffle.join}
-times = 2000
+times = 3000
 Benchmark.bmbm(30) do |x|
 
   x.report('axlsx_noautowidth') {

data/test/profile.rb

@@ -1,31 +1,22 @@
 #!/usr/bin/env ruby -s
-# -*- coding: utf-8 -*-
 
 # Usage:
 # > ruby test/profile.rb
-# > pprof.rb --gif /tmp/axlsx_noautowidth > /tmp/axlsx_noautowidth.gif
+# > pprof.rb --gif /tmp/axlsx > /tmp/axlsx.gif
 # > open /tmp/axlsx_noautowidth.gif
 
 $:.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'axlsx'
-require 'csv'
-
-# require 'benchmark'
 require 'perftools'
 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}
 times = 3000
 
-PerfTools::CpuProfiler.start("/tmp/axlsx_noautowidth") do
+PerfTools::CpuProfiler.start("/tmp/axlsx") 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|
+  p.workbook.add_worksheet do |sheet|
     times.times do
       sheet << row
     end

data/test/rels/tc_relationship.rb

@@ -18,4 +18,9 @@ class TestRelationships < Test::Unit::TestCase
     assert_nothing_raised { Axlsx::Relationship.new( Axlsx::WORKSHEET_R, 'target', :target_mode => :External) }
   end
 
+  def test_ampersand_escaping_in_target
+    r = Axlsx::Relationship.new(Axlsx::HYPERLINK_R, "http://example.com?foo=1&bar=2", :target_mod => :External)
+    doc = Nokogiri::XML(r.to_xml_string(1))
+    assert_equal(doc.xpath("//Relationship[@Target='http://example.com?foo=1&bar=2']").size, 1)
+  end
 end

data/test/tc_helper.rb

@@ -1,4 +1,8 @@
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
-require 'cover_me' unless RUBY_VERSION == '1.8.7'
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/test/"
+end
+
 require 'test/unit'
 require "axlsx.rb"

data/test/workbook/worksheet/tc_color_scale.rb

@@ -5,6 +5,37 @@ class TestColorScale < Test::Unit::TestCase
     @color_scale = Axlsx::ColorScale.new
   end
 
+  def test_three_tone
+    color_scale = Axlsx::ColorScale.three_tone
+    assert_equal 3, color_scale.value_objects.size
+    assert_equal 3, color_scale.colors.size
+  end
+
+  def test_two_tone
+    color_scale = Axlsx::ColorScale.two_tone
+    assert_equal 2, color_scale.value_objects.size
+    assert_equal 2, color_scale.colors.size
+  end
+  def test_default_cfvo
+    first = Axlsx::ColorScale.default_cfvos.first
+    second = Axlsx::ColorScale.default_cfvos.last
+    assert_equal 'FFFF7128', first[:color]
+    assert_equal :min,first[:type]
+    assert_equal 0, first[:val]
+
+    assert_equal 'FFFFEF9C', second[:color]
+    assert_equal :max, second[:type]
+    assert_equal 0, second[:val]
+  end
+
+  def test_partial_default_cfvo_override
+    first_def = {:type => :percent, :val => "10.0", :color => 'FF00FF00'}
+    color_scale = Axlsx::ColorScale.new(first_def)
+    assert_equal color_scale.value_objects.first.val, first_def[:val]
+    assert_equal color_scale.value_objects.first.type, first_def[:type]
+    assert_equal color_scale.colors.first.rgb, first_def[:color]
+  end
+
   def test_add
     @color_scale.add :type => :max, :val => 5, :color => "FFDEDEDE"
     assert_equal(@color_scale.value_objects.size,3)
@@ -12,8 +43,6 @@ class TestColorScale < Test::Unit::TestCase
   end
 
   def test_delete_at
-    assert_raise(ArgumentError, "minimum two are protected") { @color_scale.delete_at 0 }
-    assert_raise(ArgumentError, "minimum two are protected") { @color_scale.delete_at 1 }
     @color_scale.add :type => :max, :val => 5, :color => "FFDEDEDE"
     assert_nothing_raised {@color_scale.delete_at 2}
     assert_equal(@color_scale.value_objects.size,2)

data/test/workbook/worksheet/tc_data_bar.rb

@@ -11,6 +11,13 @@ class TestDataBar < Test::Unit::TestCase
     assert_equal @data_bar.showValue, true
   end
 
+  def test_override_default_cfvos
+    data_bar = Axlsx::DataBar.new({:color => 'FF00FF00'}, {:type => :min, :val => "20"})
+    assert_equal("20", data_bar.value_objects.first.val)
+    assert_equal("0", data_bar.value_objects.last.val)
+  end
+
+
   def test_minLength
     assert_raise(ArgumentError) { @data_bar.minLength = :invalid_type }
     assert_nothing_raised { @data_bar.minLength =  0}

data/test/workbook/worksheet/tc_header_footer.rb

@@ -0,0 +1,151 @@
+require 'tc_helper'
+
+class TestHeaderFooter < Test::Unit::TestCase
+
+  def setup
+    @p = Axlsx::Package.new
+    ws = @p.workbook.add_worksheet :name => 'test'
+    @hf = ws.header_footer
+  end
+
+  def test_initialize
+    assert_equal(nil, @hf.odd_header)
+    assert_equal(nil, @hf.odd_footer)
+
+    assert_equal(nil, @hf.even_header)
+    assert_equal(nil, @hf.even_footer)
+
+    assert_equal(nil, @hf.first_header)
+    assert_equal(nil, @hf.first_footer)
+
+    assert_equal(nil, @hf.different_first)
+    assert_equal(nil, @hf.different_odd_even)
+  end
+
+  def test_initialize_with_options
+    header_footer = {
+      :odd_header => 'oh',
+      :odd_footer => 'of',
+
+      :even_header => 'eh',
+      :even_footer => 'ef',
+
+      :first_header => 'fh',
+      :first_footer => 'ff',
+
+      :different_first => true,
+      :different_odd_even => true
+    }
+    optioned = @p.workbook.add_worksheet(:name => 'optioned', :header_footer => header_footer).header_footer
+
+    assert_equal('oh', optioned.odd_header)
+    assert_equal('of', optioned.odd_footer)
+
+    assert_equal('eh', optioned.even_header)
+    assert_equal('ef', optioned.even_footer)
+
+    assert_equal('fh', optioned.first_header)
+    assert_equal('ff', optioned.first_footer)
+
+    assert_equal(true, optioned.different_first)
+    assert_equal(true, optioned.different_odd_even)
+  end
+
+  def test_string_attributes
+    %w(odd_header odd_footer even_header even_footer first_header first_footer).each do |attr|
+      assert_raise(ArgumentError, 'only strings allowed in string attributes') { @hf.send("#{attr}=", 1) }
+      assert_nothing_raised { @hf.send("#{attr}=", 'test_string') }
+    end
+  end
+
+  def test_boolean_attributes
+   %w(different_first different_odd_even).each do |attr|
+      assert_raise(ArgumentError, 'only booleanish allowed in string attributes') { @hf.send("#{attr}=", 'foo') }
+      assert_nothing_raised { @hf.send("#{attr}=", 1) }
+    end
+  end
+
+  def test_set_all_values
+    @hf.set(
+      :odd_header => 'oh',
+      :odd_footer => 'of',
+
+      :even_header => 'eh',
+      :even_footer => 'ef',
+
+      :first_header => 'fh',
+      :first_footer => 'ff',
+
+      :different_first => true,
+      :different_odd_even => true
+    )
+
+    assert_equal('oh', @hf.odd_header)
+    assert_equal('of', @hf.odd_footer)
+
+    assert_equal('eh', @hf.even_header)
+    assert_equal('ef', @hf.even_footer)
+
+    assert_equal('fh', @hf.first_header)
+    assert_equal('ff', @hf.first_footer)
+
+    assert_equal(true, @hf.different_first)
+    assert_equal(true, @hf.different_odd_even)
+  end
+
+  def test_to_xml_all_values
+    @hf.set(
+      :odd_header => 'oh',
+      :odd_footer => 'of',
+
+      :even_header => 'eh',
+      :even_footer => 'ef',
+
+      :first_header => 'fh',
+      :first_footer => 'ff',
+
+      :different_first => true,
+      :different_odd_even => true
+    )
+
+    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/oddHeader").size)
+    assert_equal('oh', doc.xpath(".//headerFooter/oddHeader").text)
+    assert_equal(1, doc.xpath(".//headerFooter/oddFooter").size)
+    assert_equal('of', doc.xpath(".//headerFooter/oddFooter").text)
+
+    assert_equal(1, doc.xpath(".//headerFooter/evenHeader").size)
+    assert_equal('eh', doc.xpath(".//headerFooter/evenHeader").text)
+    assert_equal(1, doc.xpath(".//headerFooter/evenFooter").size)
+    assert_equal('ef', doc.xpath(".//headerFooter/evenFooter").text)
+
+    assert_equal(1, doc.xpath(".//headerFooter/firstHeader").size)
+    assert_equal('fh', doc.xpath(".//headerFooter/firstHeader").text)
+    assert_equal(1, doc.xpath(".//headerFooter/firstFooter").size)
+    assert_equal('ff', doc.xpath(".//headerFooter/firstFooter").text)
+  end
+
+  def test_to_xml_some_values
+    @hf.set(
+      :odd_header => 'oh',
+      :different_odd_even => false
+    )
+
+    doc = Nokogiri::XML.parse(@hf.to_xml_string)
+    assert_equal(1, doc.xpath(".//headerFooter[@differentOddEven='false']").size)
+    assert_equal(0, doc.xpath(".//headerFooter[@differentFirst]").size)
+
+    assert_equal(1, doc.xpath(".//headerFooter/oddHeader").size)
+    assert_equal('oh', doc.xpath(".//headerFooter/oddHeader").text)
+    assert_equal(0, doc.xpath(".//headerFooter/oddFooter").size)
+
+    assert_equal(0, doc.xpath(".//headerFooter/evenHeader").size)
+    assert_equal(0, doc.xpath(".//headerFooter/evenFooter").size)
+
+    assert_equal(0, doc.xpath(".//headerFooter/firstHeader").size)
+    assert_equal(0, doc.xpath(".//headerFooter/firstFooter").size)
+  end
+end
+

data/test/workbook/worksheet/tc_worksheet.rb

@@ -55,6 +55,17 @@ class TestWorksheet < Test::Unit::TestCase
     end
   end
 
+  def test_header_footer
+    assert(@ws.header_footer.is_a? Axlsx::HeaderFooter)
+  end
+
+  def test_header_footer_yield
+    @ws.header_footer do |hf|
+      assert(hf.is_a? Axlsx::HeaderFooter)
+      assert(@ws.header_footer == hf)
+    end
+  end
+
   def test_no_autowidth
     @ws.workbook.use_autowidth = false
     @ws.add_row [1,2,3,4]
@@ -65,7 +76,8 @@ class TestWorksheet < Test::Unit::TestCase
     page_margins = {:left => 2, :right => 2, :bottom => 2, :top => 2, :header => 2, :footer => 2}
     page_setup = {:fit_to_height => 1, :fit_to_width => 1, :orientation => :landscape, :paper_width => "210mm", :paper_height => "297mm", :scale => 80}
     print_options = {:grid_lines => true, :headings => true, :horizontal_centered => true, :vertical_centered => true}
-    optioned = @ws.workbook.add_worksheet(:name => 'bob', :page_margins => page_margins, :page_setup => page_setup, :print_options => print_options, :selected => true, :show_gridlines => false)
+    header_footer = {:different_first => false, :different_odd_even => false, :odd_header => 'Header'}
+    optioned = @ws.workbook.add_worksheet(:name => 'bob', :page_margins => page_margins, :page_setup => page_setup, :print_options => print_options, :header_footer => header_footer, :selected => true, :show_gridlines => false)
     page_margins.keys.each do |key|
       assert_equal(page_margins[key], optioned.page_margins.send(key))
     end
@@ -75,6 +87,9 @@ class TestWorksheet < Test::Unit::TestCase
     print_options.keys.each do |key|
       assert_equal(print_options[key], optioned.print_options.send(key))
     end
+    header_footer.keys.each do |key|
+      assert_equal(header_footer[key], optioned.header_footer.send(key))
+    end
     assert_equal(optioned.name, 'bob')
     assert_equal(optioned.selected, true)
     assert_equal(optioned.show_gridlines, false)
@@ -293,6 +308,16 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:printOptions[@gridLines="true"][@horizontalCentered="true"]').size, 1)
   end
 
+  def test_to_xml_string_header_footer
+    @ws.header_footer do |hf|
+      hf.different_first = false
+      hf.different_odd_even = false
+      hf.odd_header = 'Test Header'
+    end
+    doc = Nokogiri::XML(@ws.to_xml_string)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:headerFooter[@differentFirst="false"][@differentOddEven="false"]').size, 1)
+  end
+
   def test_to_xml_string_drawing
     @ws.add_chart Axlsx::Pie3DChart
     doc = Nokogiri::XML(@ws.to_xml_string)
@@ -317,7 +342,7 @@ class TestWorksheet < Test::Unit::TestCase
   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]
@@ -400,7 +425,7 @@ class TestWorksheet < Test::Unit::TestCase
     @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
     @ws.add_row [1,2,3]
@@ -412,7 +437,7 @@ class TestWorksheet < Test::Unit::TestCase
     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
     10.times do |i|
       @ws.add_row [i]
@@ -420,7 +445,7 @@ class TestWorksheet < Test::Unit::TestCase
     @ws.merge_cells [@ws.rows[8].cells.first, @ws.rows[9].cells.first]
     assert_equal "A9:A10", @ws.send(:merged_cells).first
   end
-  
+
   def test_auto_filter
     assert(@ws.auto_filter.range.nil?)
     assert_raise(ArgumentError) { @ws.auto_filter = 123 }
@@ -432,6 +457,6 @@ class TestWorksheet < Test::Unit::TestCase
     @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"]')) 
+    assert(doc.xpath('//sheetPr[@filterMode="true"]'))
   end
 end

data/test/workbook/worksheet/tc_worksheet_hyperlink.rb

@@ -5,7 +5,7 @@ class TestWorksheetHyperlink < Test::Unit::TestCase
     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 }
+    @options = { :location => 'https://github.com/randym/axlsx?foo=1&bar=2', :tooltip => 'axlsx', :ref => 'A1', :display => 'AXSLX', :target => :internal }
     @a = @ws.add_hyperlink @options
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: axlsx
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cover_me
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -214,6 +214,7 @@ files:
 - lib/axlsx/workbook/worksheet/data_validations.rb
 - lib/axlsx/workbook/worksheet/date_time_converter.rb
 - lib/axlsx/workbook/worksheet/dimension.rb
+- lib/axlsx/workbook/worksheet/header_footer.rb
 - lib/axlsx/workbook/worksheet/icon_set.rb
 - lib/axlsx/workbook/worksheet/merged_cells.rb
 - lib/axlsx/workbook/worksheet/page_margins.rb
@@ -284,57 +285,14 @@ files:
 - examples/conditional_formatting/scaled_colors.rb
 - examples/conditional_formatting/stop_and_go.rb
 - examples/data_validation.rb
-- examples/doc/_index.html
-- examples/doc/class_list.html
-- examples/doc/css/common.css
-- examples/doc/css/full_list.css
-- examples/doc/css/style.css
-- examples/doc/file_list.html
-- examples/doc/frames.html
-- examples/doc/index.html
-- examples/doc/js/app.js
-- examples/doc/js/full_list.js
-- examples/doc/js/jquery.js
-- examples/doc/method_list.html
-- examples/doc/top-level-namespace.html
 - examples/example.rb
-- examples/extractive.pdf
 - examples/extractive.rb
-- examples/finance.rb
-- examples/hyperlinks.rb
-- examples/image1.gif
-- examples/image1.jpeg
-- examples/image1.jpg
-- examples/image1.png
 - examples/page_setup.rb
-- examples/sample.png
-- examples/scraping_html.rb
 - examples/sheet_protection.rb
-- examples/sheet_view.rb
-- examples/skydrive/axlsx.csv
-- examples/skydrive/axlsx.xlsx
 - examples/skydrive/real_example.rb
-- examples/sprk2012/basics.rb
-- examples/sprk2012/basics.xlsx
-- examples/sprk2012/gravatar.jpeg
-- examples/sprk2012/hair_club.jpg
-- examples/sprk2012/images.rb
-- examples/sprk2012/images.xlsx
-- examples/sprk2012/line_chart.rb
-- examples/sprk2012/line_chart.xlsx
-- examples/sprk2012/Screen Shot 2012-09-11 at 10.42.06 PM.png
-- examples/sprk2012/Screen Shot 2012-09-11 at 11.07.48 PM.png
-- examples/sprk2012/Screen Shot 2012-09-11 at 8.31.50 PM.png
-- examples/sprk2012/Screen Shot 2012-09-11 at 9.23.27 PM.png
-- examples/sprk2012/Screen Shot 2012-09-11 at 9.32.06 PM.png
-- examples/sprk2012/Screen Shot 2012-09-11 at 9.33.35 PM.png
-- examples/sprk2012/Screen Shot 2012-09-11 at 9.46.44 PM.png
-- examples/sprk2012/Screen Shot 2012-09-12 at 5.07.23 PM.png
-- examples/sprk2012/sprk2012.key
-- examples/sprk2012/styles.rb
-- examples/sprk2012/styles.xlsx
 - examples/styles.rb
-- examples/two_cell_anchor_image.rb
+- examples/wrap_text.rb
+- examples/image1.jpeg
 - LICENSE
 - README.md
 - Rakefile
@@ -382,6 +340,7 @@ files:
 - test/drawing/tc_view_3D.rb
 - test/drawing/tc_vml_drawing.rb
 - test/drawing/tc_vml_shape.rb
+- test/example.xlsx
 - test/profile.rb
 - test/rels/tc_relationship.rb
 - test/rels/tc_relationships.rb
@@ -424,6 +383,7 @@ files:
 - test/workbook/worksheet/tc_data_bar.rb
 - test/workbook/worksheet/tc_data_validation.rb
 - test/workbook/worksheet/tc_date_time_converter.rb
+- test/workbook/worksheet/tc_header_footer.rb
 - test/workbook/worksheet/tc_icon_set.rb
 - test/workbook/worksheet/tc_page_margins.rb
 - test/workbook/worksheet/tc_page_set_up_pr.rb
@@ -461,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1544206805148567481
+      hash: 3556182461904299335
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -511,6 +471,7 @@ test_files:
 - test/drawing/tc_view_3D.rb
 - test/drawing/tc_vml_drawing.rb
 - test/drawing/tc_vml_shape.rb
+- test/example.xlsx
 - test/profile.rb
 - test/rels/tc_relationship.rb
 - test/rels/tc_relationships.rb
@@ -553,6 +514,7 @@ test_files:
 - test/workbook/worksheet/tc_data_bar.rb
 - test/workbook/worksheet/tc_data_validation.rb
 - test/workbook/worksheet/tc_date_time_converter.rb
+- test/workbook/worksheet/tc_header_footer.rb
 - test/workbook/worksheet/tc_icon_set.rb
 - test/workbook/worksheet/tc_page_margins.rb
 - test/workbook/worksheet/tc_page_set_up_pr.rb