exifr 1.1.1 → 1.1.2

data/lib/exifr/tiff.rb

@@ -305,23 +305,34 @@ module EXIFR
         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
 
+    def self.rational(n, d)
+      Rational.respond_to?(:reduce) ? Rational.reduce(n, d) : 1.quo(d)
+    end
+
+    def self.round(f, n)
+      q = (10 ** n)
+      (f * q).round.to_f / q
+    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| 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) }                      
-    })
+                      :date_time_original => time_proc,
+                      :date_time_digitized => time_proc,
+                      :date_time => time_proc,
+                      :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) },
+                      :shutter_speed_value => proc { |v| v.map { |v| rational(1, (2 ** v).to_i) } },
+                      :aperture_value => proc { |v| v.map { |v| round(1.4142 ** v, 1) } }
+                    })
 
     # Names for all recognized TIFF fields.
     TAGS = ([TAG_MAPPING.keys, TAG_MAPPING.values.map{|v|v.values}].flatten.uniq - IFD_TAGS).map{|v|v.to_s}

data/tests/jpeg_test.rb

@@ -18,7 +18,7 @@ class JPEGTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_raises_malformed_jpeg
     assert_raise MalformedJPEG do
       JPEG.new(StringIO.new("djibberish"))
@@ -43,6 +43,24 @@ class JPEGTest < Test::Unit::TestCase
     assert_equal JPEG.new(f('image.jpg')).comment, "Here's a comment!"
   end
 
+  def test_shutter_speed_value
+    {
+      'canon-g3.exif' => Rational(1, 1244),
+      'Canon_PowerShot_A85.exif' => Rational(1, 806)
+    }.each do |file, expected|
+      assert_equal expected, TIFF.new(f(file)).shutter_speed_value
+    end
+  end
+
+  def test_aperture_value
+    {
+      'canon-g3.exif' => 4.5,
+      'Canon_PowerShot_A85.exif' => 2.8
+    }.each do |file, expected|
+      assert_equal expected, TIFF.new(f(file)).aperture_value
+    end
+  end
+
   def test_exif
     assert ! JPEG.new(f('image.jpg')).exif?
     assert JPEG.new(f('exif.jpg')).exif?
@@ -99,4 +117,5 @@ class JPEGTest < Test::Unit::TestCase
 
     assert count > 0, 'no thumbnails found'
   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exifr
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - R.W. van 't Veer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 +02:00
+date: 2012-02-20 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: EXIF Reader is a module to read EXIF from JPEG images.