tootsie 0.9.15 → 0.9.16

data/lib/tootsie/image_metadata_extractor.rb

@@ -5,7 +5,8 @@ module Tootsie
 
   class ImageMetadataExtractor
 
-    def initialize
+    def initialize(options = {})
+      @logger = options[:logger]
       @metadata = {}
     end
 
@@ -44,12 +45,26 @@ module Tootsie
               when 'Short', 'Long'
                 value = value.to_i
               when 'Date'
-                value = Time.parse(value)
+                begin
+                  value = Time.parse(value)
+                rescue Exception => e
+                  if @logger
+                    @logger.warn "Invalid time format in EXIF data, ignoring value: #{value.inspect}"
+                  end
+                  value = nil
+                end
               else
                 begin
                   Iconv.iconv("utf-8", "utf-8", value)
                 rescue Iconv::IllegalSequence, Iconv::InvalidCharacter
-                  value = Iconv.iconv("utf-8", "iso-8859-1", value)[0]
+                  begin
+                    value = Iconv.iconv("utf-8", "iso-8859-1", value)[0]
+                  rescue Exception => e
+                    if @logger
+                      @logger.warn "Invalid encoding in EXIF data, ignoring value: #{value.inspect}"
+                    end
+                    value = nil
+                  end
                 else
                   if value.respond_to?(:force_encoding)  # 1.9.
                     value.force_encoding 'utf-8'
@@ -58,8 +73,10 @@ module Tootsie
                   end
                 end
             end
-            entry = {:value => value, :type => type.underscore}
-            (@metadata[key] ||= []) << entry
+            if value
+              entry = {:value => value, :type => type.underscore}
+              (@metadata[key] ||= []) << entry
+            end
           end
         end
       end

data/lib/tootsie/processors/image_processor.rb

@@ -7,6 +7,7 @@ module Tootsie
         @input_url = params[:input_url]
         @versions = [params[:versions] || {}].flatten
         @logger = Application.get.logger
+        @extractor = ImageMetadataExtractor.new(:logger => @logger)
       end
     
       def valid?
@@ -32,7 +33,7 @@ module Tootsie
               
               output = Output.new(version_options[:target_url])
               begin
-                result[:metadata] ||= ImageMetadataExtractor.new.extract_from_file(input.file_name)
+                result[:metadata] ||= @extractor.extract_from_file(input.file_name)
                 
                 original_depth = nil
                 original_width = nil

data/lib/tootsie/version.rb

@@ -1,3 +1,3 @@
 module Tootsie
-  VERSION = '0.9.15'
+  VERSION = '0.9.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tootsie
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70313006245040 !ruby/object:Gem::Requirement
+  requirement: &70283191457260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70313006245040
+  version_requirements: *70283191457260
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70313006244520 !ruby/object:Gem::Requirement
+  requirement: &70283191456740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313006244520
+  version_requirements: *70283191456740
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70313006244040 !ruby/object:Gem::Requirement
+  requirement: &70283191456260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70313006244040
+  version_requirements: *70283191456260
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70313006243560 !ruby/object:Gem::Requirement
+  requirement: &70283191455780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70313006243560
+  version_requirements: *70283191455780
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70313006243080 !ruby/object:Gem::Requirement
+  requirement: &70283191455300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70313006243080
+  version_requirements: *70283191455300
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70313006242600 !ruby/object:Gem::Requirement
+  requirement: &70283191454820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70313006242600
+  version_requirements: *70283191454820
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &70313006242120 !ruby/object:Gem::Requirement
+  requirement: &70283191454340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.12
   type: :runtime
   prerelease: false
-  version_requirements: *70313006242120
+  version_requirements: *70283191454340
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70312999850060 !ruby/object:Gem::Requirement
+  requirement: &70283191453860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70312999850060
+  version_requirements: *70283191453860
 - !ruby/object:Gem::Dependency
   name: s3
-  requirement: &70312999849580 !ruby/object:Gem::Requirement
+  requirement: &70283191453380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *70312999849580
+  version_requirements: *70283191453380
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70312999849100 !ruby/object:Gem::Requirement
+  requirement: &70283191452900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.7.8
   type: :runtime
   prerelease: false
-  version_requirements: *70312999849100
+  version_requirements: *70283191452900
 - !ruby/object:Gem::Dependency
   name: sqs
-  requirement: &70312999848620 !ruby/object:Gem::Requirement
+  requirement: &70283201355500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70312999848620
+  version_requirements: *70283201355500
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70312999848140 !ruby/object:Gem::Requirement
+  requirement: &70283201355020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 4.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70312999848140
+  version_requirements: *70283201355020
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70312999847660 !ruby/object:Gem::Requirement
+  requirement: &70283201354540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70312999847660
+  version_requirements: *70283201354540
 - !ruby/object:Gem::Dependency
   name: scashin133-syslog_logger
-  requirement: &70312999847180 !ruby/object:Gem::Requirement
+  requirement: &70283201354060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 1.7.3
   type: :runtime
   prerelease: false
-  version_requirements: *70312999847180
+  version_requirements: *70283201354060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70312999846800 !ruby/object:Gem::Requirement
+  requirement: &70283201353680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312999846800
+  version_requirements: *70283201353680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70312999846340 !ruby/object:Gem::Requirement
+  requirement: &70283201353220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312999846340
+  version_requirements: *70283201353220
 description: Tootsie is a simple audio/video/image transcoding/modification application.
 email:
 - alex@origo.no