exiftoolr 0.0.6 → 0.0.7

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+script: bundle exec rake
+before_install:
+ - sudo apt-get update
+ - sudo apt-get install libimage-exiftool-perl
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - rbx-18mode

data/README.md

@@ -1,5 +1,7 @@
 # Ruby wrapper for ExifTool
 
+[![Build Status](https://secure.travis-ci.org/mceachen/exiftoolr.png?branch=master)](http://travis-ci.org/mceachen/exiftoolr)
+
 This gem is the simplest thing that could possibly work that
 reads the output of [exiftool](http://www.sno.phy.queensu.ca/~phil/exiftool)
 and renders it into a ruby hash, with correctly typed values and symbolized keys.
@@ -9,7 +11,7 @@ and renders it into a ruby hash, with correctly typed values and symbolized keys
 * GPS latitude and longitude are rendered as signed floats,
   where north and east are positive, and west and south are negative.
 * Values like shutter speed and exposure time are rendered as Rationals,
-  which lets the caller show them as fractions (1/250) or as comparable.
+  which lets the caller show them as fractions (1/250) or as comparable numeric instances.
 * String values like "interop" and "serial number" are kept as strings
   (which preserves zero prefixes)
 
@@ -70,10 +72,16 @@ Exiftoolr.new("Gemfile").errors?
 
 ## Change history
 
-### 0.0.4
+### 0.0.7
 
-Added support for multiple file fetching (which is *much* faster for large directories)
+* Added warning values for EXIF headers that are corrupt
+* Made initialize gracefully accept an empty array, or an array of Pathname instances
+* Added support for ruby 1.9 and exiftool v 8.15 (Ubuntu Natty)
 
 ### 0.0.5
 
 Fixed homepage URL in gemspec
+
+### 0.0.4
+
+Added support for multiple file fetching (which is *much* faster for large directories)

data/exiftoolr.gemspec

@@ -22,5 +22,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency "json"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
 end

data/lib/exiftoolr.rb

@@ -5,12 +5,16 @@ require 'json'
 require 'shellwords'
 
 class Exiftoolr
-  class NoSuchFile < StandardError; end
-  class NotAFile < StandardError; end
-  class ExiftoolNotInstalled < StandardError; end
+  class NoSuchFile < StandardError ; end
+  class NotAFile < StandardError ; end
+  class ExiftoolNotInstalled < StandardError ; end
 
   def self.exiftool_installed?
-    `exiftool -ver 2> /dev/null`.to_f > 0
+    exiftool_version > 0
+  end
+
+  def self.exiftool_version
+    @@exiftool_version ||= `exiftool -ver 2> /dev/null`.to_f
   end
 
   def self.expand_path(filename)
@@ -20,15 +24,19 @@ class Exiftoolr
   end
 
   def initialize(filenames, exiftool_opts = "")
-    escaped_filenames = filenames.to_a.collect do |f|
-      Shellwords.escape(self.class.expand_path(f))
-    end.join(" ")
-    json = `exiftool #{exiftool_opts} -j −coordFormat "%.8f" -dateFormat "%Y-%m-%d %H:%M:%S" #{escaped_filenames} 2> /dev/null`
-    raise ExiftoolNotInstalled if json == ""
-    @file2result = { }
-    JSON.parse(json).each do |raw|
-      result = Result.new(raw)
-      @file2result[result.source_file] = result
+    @file2result = {}
+    filenames = [filenames] if filenames.is_a?(String)
+    unless filenames.empty?
+      escaped_filenames = filenames.collect do |f|
+        Shellwords.escape(self.class.expand_path(f.to_s))
+      end.join(" ")
+      cmd = "exiftool #{exiftool_opts} -j -coordFormat \"%.8f\" -dateFormat \"%Y-%m-%d %H:%M:%S\" #{escaped_filenames} 2> /dev/null"
+      json = `#{cmd}`
+      raise ExiftoolNotInstalled if json == ""
+      JSON.parse(json).each do |raw|
+        result = Result.new(raw)
+        @file2result[result.source_file] = result
+      end
     end
   end
 
@@ -37,7 +45,7 @@ class Exiftoolr
   end
 
   def files_with_results
-    @file2result.values.collect{|r|r.source_file unless r.errors?}.compact
+    @file2result.values.collect { |r| r.source_file unless r.errors? }.compact
   end
 
   def to_hash

data/lib/exiftoolr/result.rb

@@ -6,7 +6,7 @@ class Exiftoolr
     attr_reader :to_hash, :to_display_hash, :symbol_display_hash
 
     WORD_BOUNDARY_RES = [/([A-Z\d]+)([A-Z][a-z])/, /([a-z\d])([A-Z])/]
-    FRACTION_RE = /\d+\/\d+/
+    FRACTION_RE = /^(\d+)\/(\d+)$/
 
     def initialize(raw_hash)
       @raw_hash = raw_hash
@@ -14,20 +14,29 @@ class Exiftoolr
       @to_display_hash = { }
       @symbol_display_hash = { }
 
-      @raw_hash.each do |k, v|
+      @raw_hash.each do |k, raw_v|
         display_key = WORD_BOUNDARY_RES.inject(k) { |key, regex| key.gsub(regex, '\1 \2') }
         sym_key = display_key.downcase.gsub(' ', '_').to_sym
-        if sym_key == :gps_latitude || sym_key == :gps_longitude
-          value, direction = v.split(" ")
-          v = value.to_f
-          v *= -1 if direction == 'S' || direction == 'W'
-        elsif display_key =~ /\bdate\b/i
-          v = Time.parse(v)
-        elsif v =~ FRACTION_RE
-          v = Rational(*v.split('/').collect { |ea| ea.to_i })
+        begin
+          if sym_key == :gps_latitude || sym_key == :gps_longitude
+            value, direction = raw_v.split(" ")
+            v = value.to_f
+            v *= -1 if direction == 'S' || direction == 'W'
+          elsif raw_v.is_a?(String)
+            if display_key =~ /\bdate\b/i
+              v = Time.parse(raw_v)
+            else
+              scan = raw_v.scan(FRACTION_RE).first
+              unless scan.nil?
+                v = Rational(*scan.collect { |ea| ea.to_i })
+              end
+            end
+          end
+        rescue StandardError => e
+          v = "Warning: Parsing '#{raw_v}' for attribute '#{k}' raised #{e.message}"
         end
-        @to_hash[sym_key] = v
-        @to_display_hash[display_key] = v
+        @to_hash[sym_key] = v || raw_v
+        @to_display_hash[display_key] = v || raw_v
         @symbol_display_hash[sym_key] = display_key
       end
     end

data/lib/exiftoolr/version.rb

@@ -1,3 +1,3 @@
 class Exiftoolr
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/Canon 20D.jpg.yaml

@@ -166,9 +166,7 @@
 :aperture: 9.0
 :easy_mode: Manual
 :nd_filter: n/a
-:exposure_level_increments: !ruby/object:Rational 
-  denominator: 3
-  numerator: 1
+:exposure_level_increments: "1/3 Stop"
 :auto_exposure_bracketing: "Off"
 :af_area_height: 78
 :flash_firing: Fires

data/test/faces.jpg.yaml

@@ -10,9 +10,6 @@
 :wb_shift_ab: 0
 :lens35efl: "17.0 - 40.0 mm (35 mm equivalent: 26.6 - 62.5 mm)"
 :thumbnail_image_valid_area: 0 159 7 112
-:"profile_description_ml-zh-cn": !binary |
-  55u45py6IFJHQiDmj4/ov7Dmlofku7Y=
-
 :current_iptc_digest: b443520a10119da99c2550175e6d0efb
 :model: Canon EOS 20D
 :af_point_selection_method: Normal
@@ -21,16 +18,12 @@
 :user_comment: ""
 :color_space: sRGB
 :focus_range: Not Known
-:"profile_description_ml-ja-jp": !binary |
-  44Kr44Oh44OpIFJHQiDjg5fjg63jg5XjgqHjgqTjg6s=
-
 :zoom_target_width: 0
 :device_model: ""
 :flash_guide_number: 0
 :focal_plane_x_size: 23.04 mm
 :saturation: Normal
 :quality: Fine
-:"profile_description_ml-it-it": Profilo RGB Fotocamera
 :focal_type: Zoom
 :iso: 400
 :sequence_number: 0
@@ -47,9 +40,6 @@
 :sensor_left_border: 84
 :sensor_red_level: 0
 :wb_rggb_levels_custom1: 1096 1023 1023 2793
-:"profile_description_ml-ko-kr": !binary |
-  7Lm066mU6528IFJHQiDtlITroZztjIzsnbw=
-
 :photo_effect: "Off"
 :af_area_x_positions: 8 -555 571 -931 8 947 -555 571 8
 :profile_version: 2.2.0
@@ -105,7 +95,6 @@
 :x_resolution: 72
 :cmm_flags: Not Embedded, Independent
 :focus_mode: One-shot AF
-:"profile_description_ml-fi-fi": Kameran RGB-profiili
 :blue_matrix_column: 0.15662 0.08336 0.71953
 :canon_image_size: Large
 :original_decision_data_offset: 3968887
@@ -129,9 +118,7 @@
 :manual_flash_output: n/a
 :y_resolution: 72
 :white_balance: Auto
-:flash_exposure_comp: !ruby/object:Rational 
-  denominator: 3
-  numerator: 2
+:flash_exposure_comp: "+2/3"
 :superimposed_display: "On"
 :date_time_original: 2005-11-26 14:20:34 -08:00
 :wb_rggb_levels_cloudy: 2087 1023 1023 1459
@@ -148,7 +135,6 @@
 :filter_effect: None
 :sensor_right_border: 3587
 :canon_exposure_mode: Depth-of-field AE
-:"profile_description_ml-es-es": "Perfil RGB para C\xC3\xA1mara"
 :profile_description_ml: Camera RGB Profile
 :resolution_unit: inches
 :region_area_w: 
@@ -185,7 +171,6 @@
 :file_permissions: rw-r--r--
 :lens: 17.0 - 40.0 mm
 :add_original_decision_data: "On"
-:"profile_description_ml-nl-nl": RGB-profiel Camera
 :profile_class: Input Device Profile
 :flash: Off, Did not fire
 :digital_gain: 0
@@ -211,9 +196,7 @@
 :set_function_when_shooting: Change quality
 :green_trc: (Binary data 14 bytes)
 :vrd_offset: 0
-:exposure_level_increments: !ruby/object:Rational 
-  denominator: 3
-  numerator: 1
+:exposure_level_increments: "1/3 Stop"
 :wb_bracket_value_gm: 0
 :region_area_h: 
 - 0.119007
@@ -238,8 +221,7 @@
 :thumbnail_offset: 4036
 :sharpness_frequency: n/a
 :wb_shift_gm: 0
-:"profile_description_ml-da-dk": RGB-beskrivelse til Kamera
-:region_name: 
+:region_name:
 - Matthew McEachen
 - Karen McEachen
 - Ruth McEachen
@@ -254,7 +236,6 @@
 :bulb_duration: 0
 :color_temp_fluorescent: 3961
 :bracket_shot_number: 0
-:"profile_description_ml-pt-br": "Perfil RGB de C\xC3\xA2mera"
 :picture_style: None
 :bits_per_sample: 8
 :region_type: 
@@ -267,9 +248,6 @@
 :sharpness: 0
 :file_number: 326-2647
 :modify_date: 2012-02-15 22:58:07 -08:00
-:"profile_description_ml-zh-tw": !binary |
-  5pW45L2N55u45qmfIFJHQiDoibLlvanmj4/ov7A=
-
 :self_timer: "Off"
 :encoding_process: Baseline DCT, Huffman coding
 :color_temp_auto: 4599
@@ -295,12 +273,10 @@
 :long_focal: 40 mm
 :file_modify_date: 2012-02-19 21:49:48 -08:00
 :flash_sync_speed_av: Auto
-:"profile_description_ml-sv-se": "RGB-profil f\xC3\xB6r Kamera"
 :profile_connection_space: "XYZ "
 :wb_rggb_levels_daylight: 1933 1023 1023 1607
 :black_mask_right_border: 0
 :camera_type: EOS Mid-range
-:"profile_description_ml-de-de": "RGB-Profil f\xC3\xBCr Kameras"
 :record_mode: JPEG
 :interop_index: R98 - DCF basic file (sRGB)
 :profile_date_time: 2003-07-01 00:00:00 -07:00
@@ -308,12 +284,10 @@
 :focal_plane_x_resolution: 3959.322034
 :flashpix_version: "0100"
 :canon_image_height: 2336
-:"profile_description_ml-no-no": RGB-kameraprofil
 :profile_description: Camera RGB Profile
 :wb_rggb_levels_tungsten: 1382 1023 1023 2574
 :black_mask_top_border: 0
 :exposure_program: Not Defined
-:"profile_description_ml-fr-fu": "Profil RVB de l\xE2\x80\x99appareil-photo"
 :blue_balance: 1.683744
 :ettlii: Evaluative
 :image_width: 3504

data/test/test_exiftoolr.rb

@@ -18,6 +18,10 @@ class TestExiftoolr < Test::Unit::TestCase
     end
   end
 
+  def test_no_files
+    assert !Exiftoolr.new([]).errors?
+  end
+
   def test_invalid_exif
     assert Exiftoolr.new("Gemfile").errors?
   end
@@ -41,11 +45,27 @@ class TestExiftoolr < Test::Unit::TestCase
     File.open(yaml_file, 'w') { |out| YAML.dump(exif, out) } if DUMP_RESULTS
     e = File.open(yaml_file) { |f| YAML::load(f) }
     exif.keys.each do |k|
-      next if [:file_modify_date, :directory, :source_file].include? k
-      assert_equal e[k], exif[k], "Key '#{k}' was incorrect for #{filename}"
+      next if ignorable_key?(k)
+      expected = e[k]
+      actual = exif[k]
+      if actual.is_a?(String)
+        expected.downcase!
+        actual.downcase!
+      end
+      assert_equal expected, actual, "Key '#{k}' was incorrect for #{filename}"
     end
   end
 
+  TRANSLATED_KEY = /.*\-ml-\w\w-\w\w$/
+
+  def ignorable_key? key
+    @ignorable_keys ||= begin
+      ignorable = [:file_modify_date, :directory, :source_file, :exif_tool_version]
+      ignorable += [:modify_date, :create_date, :date_time_original] if Exiftoolr.exiftool_version <= 8.2
+      ignorable
+    end.include?(key) || key.to_s =~ TRANSLATED_KEY
+  end
+
   def test_multi_matches
     filenames = Dir["**/*.jpg"].to_a
     e = Exiftoolr.new(filenames)
@@ -55,7 +75,7 @@ class TestExiftoolr < Test::Unit::TestCase
   def test_error_filtering
     filenames = Dir["**/*.*"].to_a
     e = Exiftoolr.new(filenames)
-    expected_files = Dir["**/*.jpg"].to_a.collect{|f|File.expand_path(f)}.sort
+    expected_files = Dir["**/*.jpg"].to_a.collect { |f| File.expand_path(f) }.sort
     assert_equal expected_files, e.files_with_results.sort
     filenames.each { |f| validate_result(e.result_for(f), f) }
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exiftoolr
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Matthew McEachen
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-26 00:00:00 Z
+date: 2012-03-28 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  prerelease: false
   name: json
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -42,23 +43,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
   name: rake
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  name: rspec
-  version_requirements: *id003
 description: Multiget ExifTool wrapper for ruby
 email: 
 - matthew-github@mceachen.org
@@ -70,6 +57,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -86,6 +74,7 @@ files:
 - test/iPhone 4S.jpg
 - test/iPhone 4S.jpg.yaml
 - test/test_exiftoolr.rb
+has_rdoc: true
 homepage: https://github.com/mceachen/exiftoolr
 licenses: []
 
@@ -115,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ExifTool (see http://www.sno.phy.queensu.ca/~phil/exiftool/)
 rubyforge_project: exiftoolr
-rubygems_version: 1.8.17
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Multiget ExifTool wrapper for ruby