exifr 1.0.3 → 1.0.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+EXIF Reader 1.0.4
+* bug fix: "[GH#17] avoid library search path pollution"
+* enhancement: "[GH#18] add EXIFR::JPEG#app1s method"
+
 EXIF Reader 1.0.3
 * enhancement; "raise specific exception to allow better error handling"; thanks to James Miller
 

data/README.rdoc

@@ -21,4 +21,4 @@ EXIF Reader is a module to read metadata from JPEG and TIFF images.
 R.W. van 't Veer
 
 == Copyright
-Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
+Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer

data/Rakefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
 
 require 'rake/rdoctask'
 require 'rake/testtask'

data/lib/exifr.rb

@@ -1,5 +1,10 @@
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
 
-require 'jpeg'
-require 'tiff'
-require 'exceptions'
+module EXIFR
+  class MalformedImage < StandardError; end
+  class MalformedJPEG < MalformedImage; end
+  class MalformedTIFF < MalformedImage; end
+end
+
+require 'exifr/jpeg'
+require 'exifr/tiff'

data/lib/{jpeg.rb → exifr/jpeg.rb}

@@ -1,5 +1,6 @@
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
 
+require 'exifr'
 require 'stringio'
 
 module EXIFR
@@ -22,6 +23,8 @@ module EXIFR
     attr_reader :exif
     # raw EXIF data
     attr_reader :exif_data # :nodoc:
+    # raw APP1 frames
+    attr_reader :app1s
 
     # +file+ is a filename or an IO object.  Hint: use StringIO when working with slurped data like blobs.
     def initialize(file)
@@ -90,7 +93,7 @@ module EXIFR
         raise MalformedJPEG, "no start of image marker found"
       end
 
-      app1s = []
+      @app1s = []
       while marker = io.next
         case marker
           when 0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF # SOF markers
@@ -100,14 +103,14 @@ module EXIFR
             end
           when 0xD9, 0xDA;  break # EOI, SOS
           when 0xFE;        (@comment ||= []) << io.readframe # COM
-          when 0xE1;        app1s << io.readframe # APP1, may contain EXIF tag
+          when 0xE1;        @app1s << io.readframe # APP1, may contain EXIF tag
           else              io.readframe # ignore frame
         end
       end
 
       @comment = @comment.first if @comment && @comment.size == 1
 
-      if app1 = app1s.find { |d| d[0..5] == "Exif\0\0" }
+      if app1 = @app1s.find { |d| d[0..5] == "Exif\0\0" }
         @exif_data = app1[6..-1]
         @exif = TIFF.new(StringIO.new(@exif_data))
       end

data/lib/{tiff.rb → exifr/tiff.rb}

@@ -1,5 +1,6 @@
-# Copyright (c) 2007, 2008, 2009, 2010 - R.W. van 't Veer
+# Copyright (c) 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
 
+require 'exifr'
 require 'rational'
 require 'enumerator'
 

data/tests/jpeg_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
 
 require 'test_helper'
 

data/tests/test_helper.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
 
 require 'test/unit'
 require 'stringio'

data/tests/tiff_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 - R.W. van 't Veer
 
 require 'test_helper'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exifr
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - R.W. van 't Veer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +02:00
+date: 2011-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -32,9 +32,8 @@ files:
 - Rakefile
 - bin/exifr
 - lib/exifr.rb
-- lib/jpeg.rb
-- lib/tiff.rb
-- lib/exceptions.rb
+- lib/exifr/jpeg.rb
+- lib/exifr/tiff.rb
 - tests/data/1x1.jpg
 - tests/data/apple-aperture-1.5.exif
 - tests/data/canon-g3.exif

data/lib/exceptions.rb

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