exifr 1.0.4 → 1.0.5

data/CHANGELOG

@@ -1,3 +1,6 @@
+EXIF Reader 1.0.5
+* bug fix: "[GH#19] files opened by TIFF initialize were not being closed"; thanks to Joe Van Overberghe
+
 EXIF Reader 1.0.4
 * bug fix: "[GH#17] avoid library search path pollution"
 * enhancement: "[GH#18] add EXIFR::JPEG#app1s method"

data/README.rdoc

@@ -17,6 +17,10 @@ EXIF Reader is a module to read metadata from JPEG and TIFF images.
   EXIFR::TIFF.new('DSC_0218.TIF').exposure_time.to_s  # => "1/100"
   EXIFR::TIFF.new('DSC_0218.TIF').f_number.to_f       # => 5.0
 
+== XMP data access
+If you need to access XMP data you can use the xmp gem.  More info and
+examples at https://github.com/amberbit/xmp
+
 == Author
 R.W. van 't Veer
 

data/lib/exifr/tiff.rb

@@ -311,20 +311,20 @@ module EXIFR
 
     # +file+ is a filename or an IO object.  Hint: use StringIO when working with slurped data like blobs.
     def initialize(file)
-      data = Data.new(file)
+      Data.open(file) do |data|
+        @ifds = [IFD.new(data)]
+        while ifd = @ifds.last.next
+          break if @ifds.find{|i| i.offset == ifd.offset}
+          @ifds << ifd
+        end
 
-      @ifds = [IFD.new(data)]
-      while ifd = @ifds.last.next
-        break if @ifds.find{|i| i.offset == ifd.offset}
-        @ifds << ifd
+        @jpeg_thumbnails = @ifds.map do |ifd|
+          if ifd.jpeg_interchange_format && ifd.jpeg_interchange_format_length
+            start, length = ifd.jpeg_interchange_format, ifd.jpeg_interchange_format_length
+            data[start..(start + length)]
+          end
+        end.compact
       end
-
-      @jpeg_thumbnails = @ifds.map do |ifd|
-        if ifd.jpeg_interchange_format && ifd.jpeg_interchange_format_length
-          start, length = ifd.jpeg_interchange_format, ifd.jpeg_interchange_format_length
-          data[start..(start + length)]
-        end
-      end.compact
     end
 
     # Number of images.
@@ -531,10 +531,10 @@ module EXIFR
     end
 
     class Data #:nodoc:
-      attr_reader :short, :long
+      attr_reader :short, :long, :file
 
       def initialize(file)
-        @file = file.respond_to?(:read) ? file : File.open(file, 'rb')
+        @io = file.respond_to?(:read) ? file : (@file = File.open(file, 'rb'))
         @buffer = ''
         @pos = 0
 
@@ -546,6 +546,13 @@ module EXIFR
         end
       end
 
+      def self.open(file, &block)
+        data = new(file)
+        yield data
+      ensure
+        data && data.file && data.file.close
+      end
+
       def [](pos)
         unless pos.respond_to?(:begin) && pos.respond_to?(:end)
           pos = pos..pos
@@ -567,14 +574,14 @@ module EXIFR
       end
 
       def size
-        @file.seek(0, IO::SEEK_END)
-        @file.pos
+        @io.seek(0, IO::SEEK_END)
+        @io.pos
       end
 
     private
       def read_for(pos)
-        @file.seek(@pos = pos.begin)
-        @buffer = @file.read([pos.end - pos.begin, 4096].max)
+        @io.seek(@pos = pos.begin)
+        @buffer = @io.read([pos.end - pos.begin, 4096].max)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exifr
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - R.W. van 't Veer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +01:00
+date: 2011-03-24 00:00:00 +01:00
 default_executable: 
 dependencies: []