From fe902fae39ed3c27132cde283c3f5aef490ab9ac Mon Sep 17 00:00:00 2001 From: Roel van der Hoorn Date: Wed, 20 Jul 2011 12:21:04 +0200 Subject: [PATCH 1/6] Fix typos --- test/excel/writer/worksheet.rb | 2 +- test/integration.rb | 2 +- test/workbook.rb | 2 +- test/worksheet.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/excel/writer/worksheet.rb b/test/excel/writer/worksheet.rb index 14354aa..4acb98d 100644 --- a/test/excel/writer/worksheet.rb +++ b/test/excel/writer/worksheet.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# Excel::Writer::TestWorksheet -- Spreadheet -- 21.11.2007 -- hwyss@ywesee.com +# Excel::Writer::TestWorksheet -- Spreadsheet -- 21.11.2007 -- hwyss@ywesee.com require 'test/unit' require 'spreadsheet/excel/writer/worksheet' diff --git a/test/integration.rb b/test/integration.rb index a6083f3..25ebc29 100644 --- a/test/integration.rb +++ b/test/integration.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby # encoding: utf-8 -# TestIntegration -- Spreadheet -- 08.10.2007 -- hwyss@ywesee.com +# TestIntegration -- Spreadsheet -- 08.10.2007 -- hwyss@ywesee.com $: << File.expand_path('../lib', File.dirname(__FILE__)) diff --git a/test/workbook.rb b/test/workbook.rb index edc731e..8869e76 100644 --- a/test/workbook.rb +++ b/test/workbook.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# TestWorkbook -- Spreadheet -- 24.09.2008 -- hwyss@ywesee.com +# TestWorkbook -- Spreadsheet -- 24.09.2008 -- hwyss@ywesee.com $: << File.expand_path('../lib', File.dirname(__FILE__)) diff --git a/test/worksheet.rb b/test/worksheet.rb index 7ec35f9..91cc401 100644 --- a/test/worksheet.rb +++ b/test/worksheet.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# TestWorksheet -- Spreadheet -- 30.09.2008 -- hwyss@ywesee.com +# TestWorksheet -- Spreadsheet -- 30.09.2008 -- hwyss@ywesee.com $: << File.expand_path('../lib', File.dirname(__FILE__)) From c79ab14dcf40dee1d6d5ad2b174f3fe31414ca28 Mon Sep 17 00:00:00 2001 From: Roel van der Hoorn Date: Wed, 20 Jul 2011 12:25:13 +0200 Subject: [PATCH 2/6] Fix bug in sanitize_worksheets if 'sheets' is empty + add a test. --- lib/spreadsheet/excel/writer/workbook.rb | 1 + test/excel/writer/workbook.rb | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 test/excel/writer/workbook.rb diff --git a/lib/spreadsheet/excel/writer/workbook.rb b/lib/spreadsheet/excel/writer/workbook.rb index ae650da..9119717 100644 --- a/lib/spreadsheet/excel/writer/workbook.rb +++ b/lib/spreadsheet/excel/writer/workbook.rb @@ -96,6 +96,7 @@ def number_format_index workbook, format @number_formats[workbook][format] || 0 end def sanitize_worksheets sheets + return sheets if sheets.empty? found_selected = false sheets.each do |sheet| found_selected ||= sheet.selected diff --git a/test/excel/writer/workbook.rb b/test/excel/writer/workbook.rb new file mode 100644 index 0000000..b658619 --- /dev/null +++ b/test/excel/writer/workbook.rb @@ -0,0 +1,23 @@ +#!/usr/bin/env ruby +# Excel::Writer::TestWorkbook -- Spreadsheet -- 20.07.2011 + +$: << File.expand_path('../../../lib', File.dirname(__FILE__)) + +require 'test/unit' +require 'spreadsheet' + +module Spreadsheet + module Excel + module Writer + class TestWorkbook < Test::Unit::TestCase + def test_sanitize_worksheets + book = Spreadsheet::Excel::Workbook.new + assert_instance_of Excel::Workbook, book + assert_equal book.worksheets.size, 0 + workbook_writer = Excel::Writer::Workbook.new book + assert_nothing_raised { workbook_writer.sanitize_worksheets book.worksheets } + end + end + end + end +end From 77b5bee11989b97b66fef5ab91e8ae89a2888c7d Mon Sep 17 00:00:00 2001 From: Roel van der Hoorn Date: Wed, 20 Jul 2011 14:57:40 +0200 Subject: [PATCH 3/6] Fix suite.rb so it no longer uses look behind. --- test/suite.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/suite.rb b/test/suite.rb index 6a71f05..e4114cb 100755 --- a/test/suite.rb +++ b/test/suite.rb @@ -8,7 +8,7 @@ $: << here Find.find(here) do |file| - if /(? Date: Wed, 20 Jul 2011 15:09:15 +0200 Subject: [PATCH 4/6] Use look behind again. --- test/suite.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/suite.rb b/test/suite.rb index e4114cb..6a71f05 100755 --- a/test/suite.rb +++ b/test/suite.rb @@ -8,7 +8,7 @@ $: << here Find.find(here) do |file| - if /[^suite\W]\.rb$/o.match(file) + if /(? Date: Wed, 20 Jul 2011 15:10:30 +0200 Subject: [PATCH 5/6] Fix suite.rb so it no longer uses look behind. --- test/suite.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/suite.rb b/test/suite.rb index 6a71f05..f9d1d04 100755 --- a/test/suite.rb +++ b/test/suite.rb @@ -2,13 +2,14 @@ # suite.rb -- oddb -- 08.01.2009 -- hwyss@ywesee.com require 'find' +require 'rubygems' here = File.dirname(__FILE__) $: << here Find.find(here) do |file| - if /(? Date: Wed, 20 Jul 2011 15:12:25 +0200 Subject: [PATCH 6/6] Fix again. :P --- test/suite.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/suite.rb b/test/suite.rb index f9d1d04..47c5e6d 100755 --- a/test/suite.rb +++ b/test/suite.rb @@ -9,7 +9,7 @@ $: << here Find.find(here) do |file| - if /[^suite]\.rb$/o.match(file) + if /[^suite\W]\.rb$/o.match(file) require file end end