diff options
| author | Jurriaan Pruis <[email protected]> | 2015-03-14 16:01:39 +0100 |
|---|---|---|
| committer | Jurriaan Pruis <[email protected]> | 2015-03-14 16:01:39 +0100 |
| commit | 7d642038ddef2f78f826b86fee75180ffe17d215 (patch) | |
| tree | 6e405da6b91c216b36f29d338e75583228c0f08f | |
| parent | 98613199f6b398a85f1744eafde710959372143b (diff) | |
| parent | e71164242ff4012a1ebbae75300a3527b1fc84a0 (diff) | |
| download | caxlsx-7d642038ddef2f78f826b86fee75180ffe17d215.tar.gz caxlsx-7d642038ddef2f78f826b86fee75180ffe17d215.zip | |
Merge pull request #375 from ebeigarts/fix-upcased-images
Fix content types for uppercased image file extensions
| -rw-r--r-- | lib/axlsx/package.rb | 2 | ||||
| -rw-r--r-- | test/drawing/tc_pic.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/axlsx/package.rb b/lib/axlsx/package.rb index cd03a173..8a4f29dc 100644 --- a/lib/axlsx/package.rb +++ b/lib/axlsx/package.rb @@ -314,7 +314,7 @@ module Axlsx c_types << Axlsx::Override.new(:PartName => "/xl/#{sheet.pn}", :ContentType => WORKSHEET_CT) end - exts = workbook.images.map { |image| image.extname } + exts = workbook.images.map { |image| image.extname.downcase } exts.uniq.each do |ext| ct = if ['jpeg', 'jpg'].include?(ext) JPEG_CT diff --git a/test/drawing/tc_pic.rb b/test/drawing/tc_pic.rb index b8bd2c36..3cea49c0 100644 --- a/test/drawing/tc_pic.rb +++ b/test/drawing/tc_pic.rb @@ -79,6 +79,10 @@ class TestPic < Test::Unit::TestCase def test_image_src_downcase assert_nothing_raised { @image.image_src = @test_img_up } + ct = @p.send(:content_types).detect do |t| + t.respond_to?(:extension) && t.extension.downcase == @image.extname.downcase + end + assert_equal("image/jpeg", ct.content_type) end def test_descr |