Skip to content

Commit

Permalink
Merge pull request #3 from vanderhoorn/master
Browse files Browse the repository at this point in the history
Fix bug in sanitize_worksheets if 'sheets' is empty + add a test
  • Loading branch information
zdavatz committed Nov 29, 2011
2 parents dbb7915 + 6a1860e commit 1a40355
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 5 deletions.
1 change: 1 addition & 0 deletions lib/spreadsheet/excel/writer/workbook.rb
Expand Up @@ -96,6 +96,7 @@ def number_format_index workbook, format
@number_formats[workbook][format] || 0 @number_formats[workbook][format] || 0
end end
def sanitize_worksheets sheets def sanitize_worksheets sheets
return sheets if sheets.empty?
found_selected = false found_selected = false
sheets.each do |sheet| sheets.each do |sheet|
found_selected ||= sheet.selected found_selected ||= sheet.selected
Expand Down
23 changes: 23 additions & 0 deletions 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
2 changes: 1 addition & 1 deletion test/excel/writer/worksheet.rb
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby #!/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 'test/unit'
require 'spreadsheet/excel/writer/worksheet' require 'spreadsheet/excel/writer/worksheet'
Expand Down
2 changes: 1 addition & 1 deletion test/integration.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
# encoding: utf-8 # 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__)) $: << File.expand_path('../lib', File.dirname(__FILE__))


Expand Down
3 changes: 2 additions & 1 deletion test/suite.rb
Expand Up @@ -2,13 +2,14 @@
# suite.rb -- oddb -- 08.01.2009 -- hwyss@ywesee.com # suite.rb -- oddb -- 08.01.2009 -- hwyss@ywesee.com


require 'find' require 'find'
require 'rubygems'


here = File.dirname(__FILE__) here = File.dirname(__FILE__)


$: << here $: << here


Find.find(here) do |file| Find.find(here) do |file|
if /(?<!suite)\.rb$/o.match(file) if /[^suite\W]\.rb$/o.match(file)
require file require file
end end
end end
2 changes: 1 addition & 1 deletion test/workbook.rb
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby #!/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__)) $: << File.expand_path('../lib', File.dirname(__FILE__))


Expand Down
2 changes: 1 addition & 1 deletion test/worksheet.rb
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby #!/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__)) $: << File.expand_path('../lib', File.dirname(__FILE__))


Expand Down

0 comments on commit 1a40355

Please sign in to comment.