exifr 1.0.6 → 1.1.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+EXIF Reader 1.1.1
+* feature; "added gps convenience method to make accessing location data easier (degrees to float conversion)"
+* bug fix; "[GH#22] Fix warnings about uninitialized @comment"; thanks to Ryan Greenberg"
+
 EXIF Reader 1.0.6
 * bug fix: "[GH#20] `readlong': undefined method `unpack' for nil:NilClass (NoMethodError)"
 

data/README.rdoc

@@ -17,6 +17,9 @@ 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
 
+  EXIFR::JPEG.new('enkhuizen.jpg').gps.latitude       # => 52.7197888888889
+  EXIFR::JPEG.new('enkhuizen.jpg').gps.longitude      # => 5.28397777777778
+
 == 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

data/lib/exifr/jpeg.rb

@@ -42,7 +42,7 @@ module EXIFR
 
     # Return thumbnail data when available.
     def thumbnail
-      @exif && @exif.jpeg_thumbnails && @exif.jpeg_thumbnails.first
+      defined?(@exif) && @exif && @exif.jpeg_thumbnails && @exif.jpeg_thumbnails.first
     end
 
     # Get a hash presentation of the image.
@@ -56,22 +56,22 @@ module EXIFR
     # +method+ does exist for EXIF data +nil+ will be returned.
     def method_missing(method, *args)
       super unless args.empty?
-      super unless TIFF::TAGS.include?(method.to_s)
-      @exif.send method if @exif
+      super unless methods.include?(method.to_s)
+      @exif.send method if defined?(@exif) && @exif
     end
 
     def respond_to?(method) # :nodoc:
-      super || TIFF::TAGS.include?(method.to_s)
+      super || methods.include?(method.to_s)
     end
 
     def methods # :nodoc:
-      super + TIFF::TAGS
+      super + TIFF::TAGS << "gps"
     end
 
     class << self
       alias instance_methods_without_jpeg_extras instance_methods
       def instance_methods(include_super = true) # :nodoc:
-        instance_methods_without_jpeg_extras(include_super) + TIFF::TAGS
+        instance_methods_without_jpeg_extras(include_super) + TIFF::TAGS << "gps"
       end
     end
 
@@ -108,7 +108,7 @@ module EXIFR
         end
       end
 
-      @comment = @comment.first if @comment && @comment.size == 1
+      @comment = @comment.first if defined?(@comment) && @comment && @comment.size == 1
 
       if app1 = @app1s.find { |d| d[0..5] == "Exif\0\0" }
         @exif_data = app1[6..-1]

data/lib/exifr/tiff.rb

@@ -239,10 +239,12 @@ module EXIFR
     IFD_TAGS = [:image, :exif, :gps] # :nodoc:
 
     time_proc = proc do |value|
-      if value =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
-        Time.mktime($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i) rescue nil
-      else
-        value
+      value.map do |value|
+        if value =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
+          Time.mktime($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i) rescue nil
+        else
+          value
+        end
       end
     end
 
@@ -298,12 +300,27 @@ module EXIFR
       const_set("#{type}Orientation", ORIENTATIONS[index] = Orientation.new(index, type))
     end
 
+    class Degrees < Array
+      def initialize(arr)
+        raise MalformedTIFF, "expected [degrees, minutes, seconds]" unless arr.length == 3
+        super
+      end
+      
+      def to_f
+        reduce { |m,v| m * 60 + v}.to_f / 3600
+      end
+    end
+
     ADAPTERS = Hash.new { proc { |v| v } } # :nodoc:
     ADAPTERS.merge!({
       :date_time_original => time_proc,
       :date_time_digitized => time_proc,
       :date_time => time_proc,
-      :orientation => proc { |v| ORIENTATIONS[v] }
+      :orientation => proc { |v| v.map{|v| ORIENTATIONS[v]} },
+      :gps_latitude => proc { |v| Degrees.new(v) },
+      :gps_longitude => proc { |v| Degrees.new(v) },
+      :gps_dest_latitude => proc { |v| Degrees.new(v) },
+      :gps_dest_longitude => proc { |v| Degrees.new(v) }                      
     })
 
     # Names for all recognized TIFF fields.
@@ -357,7 +374,7 @@ module EXIFR
 
     def respond_to?(method) # :nodoc:
       super ||
-        (@ifds && @ifds.first && @ifds.first.respond_to?(method)) ||
+        (defined?(@ifds) && @ifds && @ifds.first && @ifds.first.respond_to?(method)) ||
         TAGS.include?(method.to_s)
     end
 
@@ -381,6 +398,17 @@ module EXIFR
     # Get a hash presentation of the (first) image.
     def to_hash; @ifds.first.to_hash; end
 
+    GPS = Struct.new(:latitude, :longitude, :altitude, :image_direction)
+
+    # Get GPS location, altitude and image direction return nil when not available.
+    def gps
+      return nil unless gps_latitude && gps_longitude
+      GPS.new(gps_latitude.to_f * (gps_latitude_ref == 'S' ? -1 : 1),
+              gps_longitude.to_f * (gps_longitude_ref == 'W' ? -1 : 1),
+              gps_altitude && (gps_altitude.to_f * (gps_altitude_ref == "\1" ? -1 : 1)),
+              gps_img_direction && gps_img_direction.to_f)
+    end
+
     def inspect # :nodoc:
       @ifds.inspect
     end
@@ -449,7 +477,7 @@ module EXIFR
         if IFD_TAGS.include? tag
           @fields[tag] = IFD.new(@data, field.offset, tag)
         else
-          value = field.value.map { |v| ADAPTERS[tag][v] } if field.value
+          value = ADAPTERS[tag][field.value]
           @fields[tag] = value.kind_of?(Array) && value.size == 1 ? value.first : value
         end
       end

data/tests/test_helper.rb

@@ -29,11 +29,17 @@ def f(fname)
 end
 
 def assert_literally_equal(expected, actual, *args)
-  assert_equal expected.to_s, actual.to_s, *args
+  assert_equal expected.to_s_literally, actual.to_s_literally, *args
 end
 
 class Hash
-  def to_s
+  def to_s_literally
     keys.map{|k| k.to_s}.sort.map{|k| "#{k.inspect} => #{self[k].inspect}" }.join(', ')
   end
 end
+
+class Object
+  def to_s_literally
+    to_s
+  end
+end

data/tests/tiff_test.rb

@@ -30,32 +30,32 @@ class TIFFTest < Test::Unit::TestCase
   end
 
   def test_multiple_images
-    assert_equal 2, @t.size
+    assert_equal(2, @t.size)
   end
 
   def test_size
-    assert_equal 269, @t.image_width
-    assert_equal 269, @t.image_length
-    assert_equal 269, @t.width
-    assert_equal 269, @t.height
-    assert_equal 120, @t[1].image_width
-    assert_equal 160, @t[1].image_length
-    assert_equal 120, @t[1].width
-    assert_equal 160, @t[1].height
+    assert_equal(269, @t.image_width)
+    assert_equal(269, @t.image_length)
+    assert_equal(269, @t.width)
+    assert_equal(269, @t.height)
+    assert_equal(120, @t[1].image_width)
+    assert_equal(160, @t[1].image_length)
+    assert_equal(120, @t[1].width)
+    assert_equal(160, @t[1].height)
 
     @t = TIFF.new(f('plain.tif'))
-    assert_equal 23, @t.image_width
-    assert_equal 24, @t.image_length
-    assert_equal 23, @t.width
-    assert_equal 24, @t.height
+    assert_equal(23, @t.image_width)
+    assert_equal(24, @t.image_length)
+    assert_equal(23, @t.width)
+    assert_equal(24, @t.height)
   end
 
   def test_enumerable
-    assert_equal @t[1], @t.find { |i| i.f_number.nil? }
+    assert_equal(@t[1], @t.find { |i| i.f_number.nil? })
   end
 
   def test_misc_fields
-    assert_equal 'Canon PowerShot G3', TIFF.new(f('canon-g3.exif')).model
+    assert_equal('Canon PowerShot G3', TIFF.new(f('canon-g3.exif')).model)
   end
 
   def test_dates
@@ -90,12 +90,14 @@ class TIFFTest < Test::Unit::TestCase
 
   def test_gps
     t = TIFF.new(f('gps.exif'))
-    assert_equal "\2\2\0\0", t.gps_version_id
-    assert_equal 'N', t.gps_latitude_ref
-    assert_equal 'W', t.gps_longitude_ref
-    assert_equal [5355537.quo(100000), 0.quo(1), 0.quo(1)], t.gps_latitude
-    assert_equal [678886.quo(100000), 0.quo(1), 0.quo(1)], t.gps_longitude
-    assert_equal 'WGS84', t.gps_map_datum
+    assert_equal("\2\2\0\0", t.gps_version_id)
+    assert_equal('N', t.gps_latitude_ref)
+    assert_equal('W', t.gps_longitude_ref)
+    assert_equal([5355537.quo(100000), 0.quo(1), 0.quo(1)], t.gps_latitude)
+    assert_equal([678886.quo(100000), 0.quo(1), 0.quo(1)], t.gps_longitude)
+    assert_equal('WGS84', t.gps_map_datum)
+    assert_equal(54, t.gps.latitude.round)
+    assert_equal(-7, t.gps.longitude.round)
 
     (all_test_exifs - %w(gps user-comment out-of-range negative-exposure-bias-value).map{|v| f("#{v}.exif")}).each do |fname|
       assert_nil TIFF.new(fname).gps_version_id
@@ -170,7 +172,7 @@ class TIFFTest < Test::Unit::TestCase
   end
 
   def test_user_comment
-    assert_equal "Manassas Battlefield", TIFF.new(f('user-comment.exif')).user_comment
+    assert_equal("Manassas Battlefield", TIFF.new(f('user-comment.exif')).user_comment)
   end
 
   def test_handle_out_of_range_offset
@@ -180,6 +182,6 @@ class TIFFTest < Test::Unit::TestCase
   end
   
   def test_negative_exposure_bias_value
-    assert_equal -1.quo(3), TIFF.new(f('negative-exposure-bias-value.exif')).exposure_bias_value
+    assert_equal(-1.quo(3), TIFF.new(f('negative-exposure-bias-value.exif')).exposure_bias_value)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exifr
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 17
   prerelease: false
   segments: 
   - 1
-  - 0
-  - 6
-  version: 1.0.6
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - R.W. van 't Veer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-23 00:00:00 +02:00
+date: 2011-09-12 00:00:00 +02:00
 default_executable: 
 dependencies: []