tootsie 0.9.19 → 0.9.20

data/Tootsie.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'json', ['~> 1.4.6']
+  s.add_runtime_dependency 'json', ['~> 1.6.5']
   s.add_runtime_dependency 'sinatra', ['~> 1.0']
   s.add_runtime_dependency 'activesupport', ['~>3.0.0']
   s.add_runtime_dependency 'httpclient', ['~>2.2.1']

data/lib/tootsie.rb

@@ -30,3 +30,4 @@ require 'tootsie/queues/amqp_queue'
 require 'tootsie/s3_utilities'
 require 'tootsie/runner'
 require 'tootsie/utility/backoff'
+require 'tootsie/patch/sqs'

data/lib/tootsie/image_metadata_extractor.rb

@@ -1,4 +1,3 @@
-require 'iconv'
 require 'time'
 
 module Tootsie
@@ -32,7 +31,7 @@ module Tootsie
 
       def run_exiv2(args, params, &block)
         CommandRunner.new("exiv2 #{args}",
-          :output_encoding => 'binary',
+          :output_encoding => 'ascii-8bit',
           :ignore_exit_code => true
         ).run(params, &block)
       end
@@ -54,23 +53,18 @@ module Tootsie
                   value = nil
                 end
               else
-                begin
-                  Iconv.iconv("utf-8", "utf-8", value)
-                rescue Iconv::IllegalSequence, Iconv::InvalidCharacter
+                utf8 = value.dup.force_encoding('utf-8')
+                if utf8.valid_encoding?
+                  value = utf8
+                else
                   begin
-                    value = Iconv.iconv("utf-8", "iso-8859-1", value)[0]
-                  rescue Exception => e
+                    value = value.encode('utf-8', 'iso-8859-1')
+                  rescue EncodingError
                     if @logger
-                      @logger.warn "Invalid encoding in EXIF data, ignoring value: #{value.inspect}"
+                      @logger.warn "Invalid characters in EXIF data that are neither UTF-8 nor ISO-8859-1, ignoring it: #{value.inspect}"
                     end
                     value = nil
                   end
-                else
-                  if value.respond_to?(:force_encoding)  # 1.9.
-                    value.force_encoding 'utf-8'
-                  else
-                    value
-                  end
                 end
             end
             if value

data/lib/tootsie/patch/sqs.rb

@@ -0,0 +1,10 @@
+require 'sqs'
+
+module Sqs
+  module Parser
+    def rexml_document(xml)
+      xml.force_encoding('utf-8')
+      Document.new(xml)
+    end
+  end
+end

data/lib/tootsie/version.rb

@@ -1,3 +1,3 @@
 module Tootsie
-  VERSION = '0.9.19'
+  VERSION = '0.9.20'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tootsie
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70163954053580 !ruby/object:Gem::Requirement
+  requirement: &70325833005200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70163954053580
+  version_requirements: *70325833005200
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70163954052580 !ruby/object:Gem::Requirement
+  requirement: &70325833004580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163954052580
+  version_requirements: *70325833004580
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70163954051300 !ruby/object:Gem::Requirement
+  requirement: &70325833004040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163954051300
+  version_requirements: *70325833004040
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70163954049620 !ruby/object:Gem::Requirement
+  requirement: &70325833003460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70163954049620
+  version_requirements: *70325833003460
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70163954048560 !ruby/object:Gem::Requirement
+  requirement: &70325833002620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70163954048560
+  version_requirements: *70325833002620
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70163954047500 !ruby/object:Gem::Requirement
+  requirement: &70325833001320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70163954047500
+  version_requirements: *70325833001320
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &70163954046700 !ruby/object:Gem::Requirement
+  requirement: &70325833016980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.12
   type: :runtime
   prerelease: false
-  version_requirements: *70163954046700
+  version_requirements: *70325833016980
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70163954039800 !ruby/object:Gem::Requirement
+  requirement: &70325833016200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70163954039800
+  version_requirements: *70325833016200
 - !ruby/object:Gem::Dependency
   name: s3
-  requirement: &70163954038080 !ruby/object:Gem::Requirement
+  requirement: &70325833014980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *70163954038080
+  version_requirements: *70325833014980
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70163954036280 !ruby/object:Gem::Requirement
+  requirement: &70325833013400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.7.8
   type: :runtime
   prerelease: false
-  version_requirements: *70163954036280
+  version_requirements: *70325833013400
 - !ruby/object:Gem::Dependency
   name: sqs
-  requirement: &70163954034480 !ruby/object:Gem::Requirement
+  requirement: &70325833012720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70163954034480
+  version_requirements: *70325833012720
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70163954032900 !ruby/object:Gem::Requirement
+  requirement: &70325833012120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 4.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70163954032900
+  version_requirements: *70325833012120
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70163954031420 !ruby/object:Gem::Requirement
+  requirement: &70325833011600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70163954031420
+  version_requirements: *70325833011600
 - !ruby/object:Gem::Dependency
   name: scashin133-syslog_logger
-  requirement: &70163954030040 !ruby/object:Gem::Requirement
+  requirement: &70325833011040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 1.7.3
   type: :runtime
   prerelease: false
-  version_requirements: *70163954030040
+  version_requirements: *70325833011040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70163954028800 !ruby/object:Gem::Requirement
+  requirement: &70325833010420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163954028800
+  version_requirements: *70325833010420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70163954026760 !ruby/object:Gem::Requirement
+  requirement: &70325833009500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163954026760
+  version_requirements: *70325833009500
 description: Tootsie is a simple audio/video/image transcoding/modification application.
 email:
 - alex@origo.no
@@ -212,6 +212,7 @@ files:
 - lib/tootsie/image_metadata_extractor.rb
 - lib/tootsie/input.rb
 - lib/tootsie/output.rb
+- lib/tootsie/patch/sqs.rb
 - lib/tootsie/processors/image_processor.rb
 - lib/tootsie/processors/video_processor.rb
 - lib/tootsie/queues/amqp_queue.rb