exifr 1.0.2 → 1.0.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+EXIF Reader 1.0.3
+* enhancement; "raise specific exception to allow better error handling"; thanks to James Miller
+
 EXIF Reader 1.0.2
 * bug fix; "[GH#9/12] no block given"; thanks to Ian Leitch
 

data/lib/exceptions.rb

@@ -0,0 +1,5 @@
+module EXIFR
+  class MalformedImage < StandardError; end
+  class MalformedJPEG < MalformedImage; end
+  class MalformedTIFF < MalformedImage; end
+end

data/lib/exifr.rb

@@ -2,3 +2,4 @@
 
 require 'jpeg'
 require 'tiff'
+require 'exceptions'

data/lib/jpeg.rb

@@ -86,14 +86,18 @@ module EXIFR
         end
       end unless io.respond_to? :readsof
 
-      raise 'malformed JPEG' unless io.readbyte == 0xFF && io.readbyte == 0xD8 # SOI
+      unless io.readbyte == 0xFF && io.readbyte == 0xD8 # SOI
+        raise MalformedJPEG, "no start of image marker found"
+      end
 
       app1s = []
       while marker = io.next
         case marker
           when 0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF # SOF markers
             length, @bits, @height, @width, components = io.readsof
-            raise 'malformed JPEG' unless length == 8 + components * 3
+            unless length == 8 + components * 3
+              raise MalformedJPEG, "frame length does not match number of components"
+            end
           when 0xD9, 0xDA;  break # EOI, SOS
           when 0xFE;        (@comment ||= []) << io.readframe # COM
           when 0xE1;        app1s << io.readframe # APP1, may contain EXIF tag

data/lib/tiff.rb

@@ -511,7 +511,7 @@ module EXIFR
       def sign_byte(n)
         (n & 0x80) != 0 ? n - 0x100 : n
       end
-      
+
       def sign_short(n)
         (n & 0x8000) != 0 ? n - 0x10000 : n
       end
@@ -540,7 +540,8 @@ module EXIFR
         case self[0..1]
         when 'II'; @short, @long = 'v', 'V'
         when 'MM'; @short, @long = 'n', 'N'
-        else; raise 'no II or MM marker found'
+        else
+          raise MalformedTIFF, "no byte order information found"
         end
       end
 

data/tests/jpeg_test.rb

@@ -18,6 +18,12 @@ class JPEGTest < Test::Unit::TestCase
       end
     end
   end
+  
+  def test_raises_malformed_jpeg
+    assert_raise MalformedJPEG do
+      JPEG.new(StringIO.new("djibberish"))
+    end
+  end
 
   def test_size
     j = JPEG.new(f('image.jpg'))

data/tests/tiff_test.rb

@@ -22,6 +22,12 @@ class TIFFTest < Test::Unit::TestCase
       end
     end
   end
+  
+  def test_raises_malformed_tiff
+    assert_raise MalformedTIFF do
+      TIFF.new(StringIO.new("djibberish"))
+    end
+  end
 
   def test_multiple_images
     assert_equal 2, @t.size

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exifr
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - R.W. van 't Veer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 +02:00
+date: 2010-09-10 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - lib/exifr.rb
 - lib/jpeg.rb
 - lib/tiff.rb
+- lib/exceptions.rb
 - tests/data/1x1.jpg
 - tests/data/apple-aperture-1.5.exif
 - tests/data/canon-g3.exif