exiftoolr 0.0.7 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3965c4ea2139723c1b307ae602ba6d154994295f
+  data.tar.gz: 132c7534e8e9a96b30cdaeb318bf85b5231f530d
+SHA512:
+  metadata.gz: 8d0400394a42eb066765d2a525bf5dcbc0b999ecd100bfdc422fbf91abb1e7cb1d28135b640135c65f3cd1cad1f5afcb4a2c72d85df0d839f57c5cd47c589da2
+  data.tar.gz: 9dd74f21da6de5ae17f85dd78f49e28302a05ae741df8743033088513f34fe10fef45d1de4ab20753b57f70908acc7523991acff10c2aa5dd06033265021a1da

data/.travis.yml

@@ -4,6 +4,5 @@ before_install:
  - sudo apt-get update
  - sudo apt-get install libimage-exiftool-perl
 rvm:
-  - 1.8.7
   - 1.9.3
-  - rbx-18mode
+  - 2.0.0

data/README.md

@@ -1,12 +1,14 @@
 # Ruby wrapper for ExifTool
 
 [![Build Status](https://secure.travis-ci.org/mceachen/exiftoolr.png?branch=master)](http://travis-ci.org/mceachen/exiftoolr)
+[![Gem Version](https://badge.fury.io/rb/exiftoolr.png)](http://rubygems.org/gems/exiftoolr)
+[![Code Climate](https://codeclimate.com/github/mceachen/exiftoolr.png)](https://codeclimate.com/github/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.
 
-## Want constitutes "correct"?
+## What constitutes "correct"?
 
 * GPS latitude and longitude are rendered as signed floats,
   where north and east are positive, and west and south are negative.
@@ -72,11 +74,15 @@ Exiftoolr.new("Gemfile").errors?
 
 ## Change history
 
+### 0.0.8
+
+* Extracted methods in parsing to make the code complexity lower. FOUR DOT OH GPA
+
 ### 0.0.7
 
 * 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)
+* Added support for ruby 1.9.3 and exiftool v8.15 (Ubuntu Natty) and v8.85 (current stable version)
 
 ### 0.0.5
 

data/lib/exiftoolr.rb

@@ -18,8 +18,8 @@ class Exiftoolr
   end
 
   def self.expand_path(filename)
-    raise NoSuchFile, filename unless File.exist?(filename)
-    raise NotAFile, filename unless File.file?(filename)
+    raise(NoSuchFile, filename) unless File.exist?(filename)
+    raise(NotAFile, filename) unless File.file?(filename)
     File.expand_path(filename)
   end
 

data/lib/exiftoolr/result.rb

@@ -5,39 +5,16 @@ class Exiftoolr
   class Result
     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+)$/
-
     def initialize(raw_hash)
       @raw_hash = raw_hash
-      @to_hash = { }
-      @to_display_hash = { }
-      @symbol_display_hash = { }
-
-      @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
-        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 || raw_v
-        @to_display_hash[display_key] = v || raw_v
-        @symbol_display_hash[sym_key] = display_key
+      @to_hash = {}
+      @to_display_hash = {}
+      @symbol_display_hash = {}
+      @raw_hash.each do |key, raw_value|
+        p = Parser.new(key, raw_value)
+        @to_hash[p.sym_key] = p.value
+        @to_display_hash[p.display_key] = p.value
+        @symbol_display_hash[p.sym_key] = p.display_key
       end
     end
 
@@ -53,4 +30,48 @@ class Exiftoolr
       self[:error] == "Unknown file type" || self[:warning] == "Unsupported file type"
     end
   end
+
+  class Parser
+    WORD_BOUNDARY_RES = [/([A-Z\d]+)([A-Z][a-z])/, /([a-z\d])([A-Z])/]
+    FRACTION_RE = /^(\d+)\/(\d+)$/
+
+    attr_reader :display_key, :sym_key, :raw_value
+
+    def initialize(key, raw_value)
+      @display_key = WORD_BOUNDARY_RES.inject(key) { |k, regex| k.gsub(regex, '\1 \2') }
+      @sym_key = display_key.downcase.gsub(' ', '_').to_sym
+      @raw_value = raw_value
+    end
+
+    def value
+      for_lat_long ||
+        for_date ||
+        for_fraction ||
+        raw_value
+    rescue StandardError => e
+      v = "Warning: Parsing '#{raw_value}' for attribute '#{k}' raised #{e.message}"
+    end
+
+    private
+
+    def for_lat_long
+      if sym_key == :gps_latitude || sym_key == :gps_longitude
+        value, direction = raw_value.split(" ")
+        value.to_f * (['S', 'W'].include?(direction) ? -1 : 1)
+      end
+    end
+
+    def for_date
+      if raw_value.is_a?(String) && display_key =~ /\bdate\b/i
+        Time.parse(raw_value)
+      end
+    end
+
+    def for_fraction
+      if raw_value.is_a?(String)
+        scan = raw_value.scan(FRACTION_RE).first
+        v = Rational(*scan.collect { |ea| ea.to_i }) unless scan.nil?
+      end
+    end
+  end
 end

data/lib/exiftoolr/version.rb

@@ -1,3 +1,3 @@
 class Exiftoolr
-  VERSION = "0.0.7"
+  VERSION = Gem::Version.new("0.0.8")
 end

data/test/test_exiftoolr.rb

@@ -61,7 +61,7 @@ class TestExiftoolr < Test::Unit::TestCase
   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 += [: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

metadata

@@ -1,61 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: exiftoolr
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-28 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-14 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
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  name: json
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  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
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  name: rake
-  version_requirements: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Multiget ExifTool wrapper for ruby
-email: 
+email:
 - matthew-github@mceachen.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -74,41 +63,31 @@ files:
 - test/iPhone 4S.jpg
 - test/iPhone 4S.jpg.yaml
 - test/test_exiftoolr.rb
-has_rdoc: true
 homepage: https://github.com/mceachen/exiftoolr
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+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: exiftoolr
-rubygems_version: 1.6.2
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Multiget ExifTool wrapper for ruby
-test_files: 
+test_files:
 - test/Canon 20D.jpg
 - test/Canon 20D.jpg.yaml
 - test/Droid X.jpg