exiftoolr 0.0.9 → 0.1.0

data/test/iPhone 4S.jpg.yaml

@@ -1,80 +1,82 @@
---- 
-:gps_latitude_ref: North
-:model: iPhone 4S
-:color_space: sRGB
-:components_configuration: Y, Cb, Cr, -
-:exif_byte_order: Big-endian (Motorola, MM)
-:sensing_method: One-chip color area
-:create_date: 2011-11-23 09:39:52 -08:00
-:bits_per_sample: 8
-:date_time_original: 2011-11-23 09:39:52 -08:00
-:source_file: test/iPhone 4S.jpg
-:gps_img_direction: 121.9838275
-:thumbnail_length: 5987
-:exif_image_width: 3264
-:exposure_program: Program AE
-:compression: JPEG (old-style)
-:image_size: 3264x2448
+---
+:source_file: /Users/mrm/Dropbox/code/exiftoolr/test/iPhone 4S.jpg
+:exif_tool_version: 9.31
+:file_name: iPhone 4S.jpg
+:directory: /Users/mrm/Dropbox/code/exiftoolr/test
+:file_size: 1954 kB
+:file_modify_date: 2012-02-23 05:22:18.000000000 +00:00
+:file_access_date: 2013-07-14 20:25:41.000000000 +00:00
+:file_inode_change_date: 2013-02-16 19:21:57.000000000 +00:00
+:file_permissions: rw-r--r--
+:file_type: JPEG
 :mime_type: image/jpeg
-:gps_longitude: -122.47566667
-:x_resolution: 72
+:exif_byte_order: Big-endian (Motorola, MM)
+:make: Apple
+:model: iPhone 4S
 :orientation: Horizontal (normal)
+:x_resolution: 72
+:y_resolution: 72
+:resolution_unit: inches
 :software: 5.0.1
-:thumbnail_offset: 914
-:gps_altitude_ref: Above Sea Level
-:shutter_speed: !ruby/object:Rational 
+:modify_date: 2011-11-23 09:39:52.000000000 +00:00
+:y_cb_cr_positioning: Centered
+:exposure_time: !ruby/object:Rational
   denominator: 6135
   numerator: 1
-:directory: test
-:flashpix_version: "0100"
-:y_cb_cr_positioning: Centered
-:flash: Auto, Did not fire
 :f_number: 2.4
-:gps_altitude: 14.2 m Above Sea Level
-:file_modify_date: 2012-02-19 21:49:48 -08:00
-:y_resolution: 72
-:encoding_process: Baseline DCT, Huffman coding
-:thumbnail_image: (Binary data 5987 bytes)
-:exposure_mode: Auto
-:white_balance: Auto
-:circle_of_confusion: 0.004 mm
-:metering_mode: Multi-segment
-:gps_latitude: 37.50233333
-:color_components: 3
-:image_height: 2448
-:exif_tool_version: 8.59
-:exposure_time: !ruby/object:Rational 
+:exposure_program: Program AE
+:iso: 64
+:exif_version: '0221'
+:date_time_original: 2011-11-23 09:39:52.000000000 +00:00
+:create_date: 2011-11-23 09:39:52.000000000 +00:00
+:components_configuration: Y, Cb, Cr, -
+:shutter_speed_value: !ruby/object:Rational
   denominator: 6135
   numerator: 1
-:gps_longitude_ref: West
-:resolution_unit: inches
-:scene_capture_type: Standard
-:gps_position: 37.50233333 N, 122.47566667 W
-:file_name: iPhone 4S.jpg
-:hyperfocal_distance: 2.08 m
-:focal_length35efl: "4.3 mm (35 mm equivalent: 35.0 mm)"
-:y_cb_cr_sub_sampling: YCbCr4:2:0 (2 2)
-:aperture: 2.4
-:fov: 54.4 deg
-:brightness_value: 11.27442702
-:file_permissions: rw-r--r--
-:gps_img_direction_ref: True North
-:exif_version: "0221"
-:sharpness: Normal
-:gps_time_stamp: "19:03:32"
 :aperture_value: 2.4
-:exif_image_height: 2448
+:brightness_value: 11.27442702
+:metering_mode: Multi-segment
+:flash: Auto, Did not fire
 :focal_length: 4.3 mm
-:light_value: 15.8
-:modify_date: 2011-11-23 09:39:52 -08:00
-:shutter_speed_value: !ruby/object:Rational 
-  denominator: 6135
-  numerator: 1
-:make: Apple
-:file_size: 1954 kB
 :subject_area: 1631 1223 881 881
+:flashpix_version: '0100'
+:color_space: sRGB
+:exif_image_width: 3264
+:exif_image_height: 2448
+:sensing_method: One-chip color area
+:exposure_mode: Auto
+:white_balance: Auto
 :focal_length_in35mm_format: 35 mm
+:scene_capture_type: Standard
+:sharpness: Normal
+:gps_latitude_ref: North
+:gps_longitude_ref: West
+:gps_altitude_ref: Above Sea Level
+:gps_time_stamp: '19:03:32'
+:gps_img_direction_ref: True North
+:gps_img_direction: 121.9838275
+:compression: JPEG (old-style)
+:thumbnail_offset: 914
+:thumbnail_length: 5987
 :image_width: 3264
-:file_type: JPEG
+:image_height: 2448
+:encoding_process: Baseline DCT, Huffman coding
+:bits_per_sample: 8
+:color_components: 3
+:y_cb_cr_sub_sampling: YCbCr4:2:0 (2 2)
+:aperture: 2.4
+:gps_altitude: 14.2 m Above Sea Level
+:gps_latitude: 37.50233333
+:gps_longitude: -122.47566667
+:gps_position: 37.50233333 N, 122.47566667 W
+:image_size: 3264x2448
 :scale_factor35efl: 8.2
-:iso: 64
+:shutter_speed: !ruby/object:Rational
+  denominator: 6135
+  numerator: 1
+:thumbnail_image: (Binary data 5987 bytes)
+:circle_of_confusion: 0.004 mm
+:fov: 54.4 deg
+:focal_length35efl: '4.3 mm (35 mm equivalent: 35.0 mm)'
+:hyperfocal_distance: 2.08 m
+:light_value: 15.8

data/test/parser_test.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+
+describe Exiftoolr::Parser do
+  it 'creates snake-case symbolic keys properly' do
+    p = Exiftoolr::Parser.new('HyperfocalDistance', '')
+    p.sym_key.must_equal :hyperfocal_distance
+  end
+
+  it 'creates display keys properly' do
+    p = Exiftoolr::Parser.new('InternalSerialNumber', '')
+    p.display_key.must_equal 'Internal Serial Number'
+  end
+
+  it 'parses date flags without warnings' do
+    p = Exiftoolr::Parser.new('DateStampMode', 'Off')
+    p.value.must_equal 'Off'
+  end
+
+  it 'parses dates without timezones' do
+    p = Exiftoolr::Parser.new('CreateDate', '2004:09:19 12:25:20')
+    p.value.must_equal Time.parse('2004-09-19 12:25:20')
+  end
+
+  it 'parses sub-second times' do
+    p = Exiftoolr::Parser.new('SubSecDateTimeOriginal', '2011:09:25 20:08:09.00')
+    p.value.must_equal Time.parse('2011-09-25 20:08:09')
+  end
+
+  it 'parses dates with timezones' do
+    p = Exiftoolr::Parser.new('FileAccessDate', '2013:07:14 10:50:33-07:00')
+    p.value.must_equal Time.parse('2013-07-14 10:50:33-07:00')
+  end
+
+  it 'parses fractions properly' do
+    p = Exiftoolr::Parser.new('ShutterSpeedValue', '1/6135')
+    p.value.must_equal Rational(1, 6135)
+  end
+
+  it 'parses N GPS coords' do
+    p = Exiftoolr::Parser.new('GPSLatitude', '37.50233333 N')
+    p.value.must_be_close_to 37.50233333
+  end
+
+  it 'parses S GPS coords' do
+    p = Exiftoolr::Parser.new('GPSLatitude', '37.50233333 S')
+    p.value.must_be_close_to -37.50233333
+  end
+
+  it 'parses E GPS coords' do
+    p = Exiftoolr::Parser.new('GPSLongitude', '122.47566667 E')
+    p.value.must_be_close_to 122.47566667
+  end
+
+  it 'parses W GPS coords' do
+    p = Exiftoolr::Parser.new('GPSLongitude', '122.47566667 W')
+    p.value.must_be_close_to -122.47566667
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,14 @@
+require 'minitest/autorun'
+require 'minitest/great_expectations'
+require 'yaml'
+require 'exiftoolr'
+
+# We need a predictable timezone offset so non-tz-offset timestamps are comparable:
+ENV['TZ'] = 'UTC'
+
+unless ENV['CI']
+  require 'minitest/reporters'
+  MiniTest::Reporters.use!
+end
+
+puts "Exiftoolr.exiftool_version = #{Exiftoolr.exiftool_version}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftoolr
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -38,6 +38,76 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-great_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Multiget ExifTool wrapper for ruby
 email:
 - matthew-github@mceachen.org
@@ -52,17 +122,22 @@ files:
 - Rakefile
 - exiftoolr.gemspec
 - lib/exiftoolr.rb
+- lib/exiftoolr/parser.rb
 - lib/exiftoolr/result.rb
 - lib/exiftoolr/version.rb
 - test/Canon 20D.jpg
 - test/Canon 20D.jpg.yaml
 - test/Droid X.jpg
 - test/Droid X.jpg.yaml
+- test/IMG_2452.jpg
+- test/IMG_2452.jpg.yaml
+- test/exiftoolr_test.rb
 - test/faces.jpg
 - test/faces.jpg.yaml
 - test/iPhone 4S.jpg
 - test/iPhone 4S.jpg.yaml
-- test/test_exiftoolr.rb
+- test/parser_test.rb
+- test/test_helper.rb
 homepage: https://github.com/mceachen/exiftoolr
 licenses:
 - MIT
@@ -83,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ExifTool (see http://www.sno.phy.queensu.ca/~phil/exiftool/)
-rubyforge_project: exiftoolr
+rubyforge_project: 
 rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
@@ -93,8 +168,13 @@ test_files:
 - test/Canon 20D.jpg.yaml
 - test/Droid X.jpg
 - test/Droid X.jpg.yaml
+- test/IMG_2452.jpg
+- test/IMG_2452.jpg.yaml
+- test/exiftoolr_test.rb
 - test/faces.jpg
 - test/faces.jpg.yaml
 - test/iPhone 4S.jpg
 - test/iPhone 4S.jpg.yaml
-- test/test_exiftoolr.rb
+- test/parser_test.rb
+- test/test_helper.rb
+has_rdoc: 

data/test/test_exiftoolr.rb

@@ -1,82 +0,0 @@
-require "test/unit"
-require "exiftoolr"
-require "yaml"
-
-class TestExiftoolr < Test::Unit::TestCase
-
-  DUMP_RESULTS = false
-
-  def test_missing
-    assert_raise Exiftoolr::NoSuchFile do
-      Exiftoolr.new("no/such/file")
-    end
-  end
-
-  def test_directory
-    assert_raise Exiftoolr::NotAFile do
-      Exiftoolr.new("lib")
-    end
-  end
-
-  def test_no_files
-    assert !Exiftoolr.new([]).errors?
-  end
-
-  def test_invalid_exif
-    assert Exiftoolr.new("Gemfile").errors?
-  end
-
-  def test_matches
-    Dir["**/*.jpg"].each do |filename|
-      e = Exiftoolr.new(filename)
-      validate_result(e, filename)
-    end
-  end
-
-  def validate_result(result, filename)
-    yaml_file = "#{filename}.yaml"
-    if File.exist?(yaml_file)
-      assert !result.errors?
-    else
-      assert result.errors?
-      return
-    end
-    exif = result.to_hash
-    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 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, :nd_filter] 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)
-    filenames.each { |f| validate_result(e.result_for(f), f) }
-  end
-
-  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
-    assert_equal expected_files, e.files_with_results.sort
-    filenames.each { |f| validate_result(e.result_for(f), f) }
-  end
-end