exiftool 0.6.0 → 0.7.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjVlYjBlMzMxZDcwYTgxODkyYzBlNmM1NjczZDYyMDRkOGEzNGNkNA==
-  data.tar.gz: !binary |-
-    NWQ1NjliOTM4NTVlNDYwODBkMmIxNzQyN2EyMTNkZDkxNWNkMDlmZQ==
+SHA1:
+  metadata.gz: 98d9e0ee7c86532f33548687b8fb945837823118
+  data.tar.gz: 8e4b81b3700c9671df2d413604d8b1f823027ce0
 SHA512:
-  metadata.gz: !binary |-
-    M2FhZmFhY2MwYzg3YzU5Y2MyYWFkNGU5NzdiZjQ1YjJlODRmMzc3Y2QxMWIw
-    NmIxM2JkMjE4NTcwMzg5MjY3YmYzNjdlZjMzMWJjODc5NGZhY2NlMjJlNDUw
-    NDY1M2JiYmM3YWE5NjE0MGFjODc2ZjUzMGFmNTU1ODFhMTlkNDY=
-  data.tar.gz: !binary |-
-    MDdiMTAxNWI5YjkwZWZmYjViOTQwNWNjODlhNDI1ZGIwZTUyYzZiYmRhMGRj
-    YzAwMTkwMDFmOWU4ZDAxMTU3NjNiNWIyZDYyNTI4ZTg5ZmMxYjZlMWFlNzQ1
-    OWUxYjdhNzgyY2ZiODczZGNiYTc2MmJkNjJiNzExODJjNjk0M2M=
+  metadata.gz: fbbe8ee348fc62382aad388602186ace54cf1527df8e5a90cef20b15bc3e347b8420e52977719026117e9aab35ee1f560bb7e31cbc54050849bced76018bca6a
+  data.tar.gz: b62e43cdcfd58cc7f18805050c4b0818fbb901659b2e000f4bdc936c6f14ccf183400c9689b6f1d646bcceaafed2d6339229bf2b5868ad8045c1b689eac03db5

data/lib/exiftool/field_parser.rb

@@ -6,6 +6,8 @@ class Exiftool
 
     WORD_BOUNDARY_RES = [/([A-Z\d]+)([A-Z][a-z])/, /([a-z\d])([A-Z])/]
     FRACTION_RE = /^(\d+)\/(\d+)$/
+    YMD_RE = /\A(\d{4}):(\d{2}):(\d{2})\b/
+    ZERO_DATE_RE = /\A[+:0 ]+\z/
 
     attr_reader :key, :display_key, :sym_key, :raw_value
 
@@ -17,43 +19,51 @@ class Exiftool
     end
 
     def value
-      for_lat_long ||
-        for_date ||
-        for_fraction ||
+      @value ||= if lat_long?
+        as_lat_long
+      elsif date?
+        as_date
+      elsif fraction?
+        as_fraction
+      else
         raw_value
+      end
     rescue StandardError => e
       "Warning: Parsing '#{raw_value}' for attribute '#{key}' raised #{e.message}"
     end
 
-    YMD_RE = /\A(\d{4}):(\d{2}):(\d{2})\b/
-
     def civil_date
-      if datish?
+      if date? && !zero_date?
         ymd = raw_value.scan(YMD_RE).first
-        Date.civil(*ymd.map{|ea|ea.to_i}) if ymd
+        Date.civil(*ymd.map { |ea| ea.to_i }) if ymd
       end
     end
 
     private
 
-    def for_lat_long
-      if sym_key == :gps_latitude || sym_key == :gps_longitude
-        value, direction = raw_value.split(" ")
-        if value =~ /\A\d+\.?\d*\z/
-          value.to_f * (['S', 'W'].include?(direction) ? -1 : 1)
-        end
+    def lat_long?
+      sym_key == :gps_latitude || sym_key == :gps_longitude
+    end
+
+    def as_lat_long
+      value, direction = raw_value.split(' ')
+      if value =~ /\A\d+\.?\d*\z/
+        value.to_f * (['S', 'W'].include?(direction) ? -1 : 1)
       end
     end
 
-    def datish?
+    def date?
       raw_value.is_a?(String) && display_key =~ /\bdate\b/i
     end
 
-    def for_date
-      if datish?
-        try_parse { Time.strptime(raw_value, '%Y:%m:%d %H:%M:%S%z') } ||
-          try_parse { Time.strptime(raw_value, '%Y:%m:%d %H:%M:%S.%L%z') }
-      end
+    def zero_date?
+      raw_value =~ ZERO_DATE_RE
+    end
+
+    def as_date
+      try_parse { Time.strptime(raw_value, '%Y:%m:%d %H:%M:%S%z') } ||
+        try_parse { Time.strptime(raw_value, '%Y:%m:%d %H:%M:%S.%L%z') } ||
+        raw_value
     end
 
     def try_parse
@@ -62,11 +72,13 @@ class Exiftool
       nil
     end
 
-    def for_fraction
-      if raw_value.is_a?(String)
-        scan = raw_value.scan(FRACTION_RE).first
-        v = Rational(*scan.map { |ea| ea.to_i }) unless scan.nil?
-      end
+    def fraction?
+      raw_value.is_a?(String) && raw_value =~ FRACTION_RE
+    end
+
+    def as_fraction
+      scan = raw_value.scan(FRACTION_RE).first
+      Rational(*scan.map { |ea| ea.to_i }) unless scan.nil?
     end
   end
 end

data/lib/exiftool/version.rb

@@ -1,3 +1,3 @@
 class Exiftool
-  VERSION = Gem::Version.new('0.6.0')
+  VERSION = Gem::Version.new('0.7.0')
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: exiftool
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: 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
@@ -129,18 +129,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - ExifTool (see http://www.sno.phy.queensu.ca/~phil/exiftool/)
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Multiget ExifTool wrapper for ruby