Commit: 7587a8d995a595809929aba41a8afe4c1f108e81 - Meghsingh (git)

Never give up

Commit MetaInfo

• Révision: 7587a8d995a595809929aba41a8afe4c1f108e81 (tree)
• l'heure: 2013-11-06 02:26:25
• Auteur: HMML <hmml3939@gmai...>
• Commiter: HMML

Message de Log

Lock rubyzip to 0.9.x temporary...

Change Summary

• modified: Gemfile
• modified: Gemfile.lock
• modified: lib/paperclip_processors/voice_preview.rb

Modification

--- a/Gemfile
+++ b/Gemfile
@@ -58,7 +58,7 @@ gem 'client_side_validations-simple_form', git: 'git://github.com/saveritemedica
 gem 'responders'
 gem 'rspec-rails', group: [:development, :test]
 gem 'paperclip'
-gem 'rubyzip', require: 'zip/zip'
+gem 'rubyzip', '< 1.0.0', require: 'zip/zip'
 gem 'rails_admin', github: 'davebrace/rails_admin', branch: 'use-static-bootstrap-2'
 group :develpment do
   gem 'capistrano'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -244,7 +244,7 @@ DEPENDENCIES
   rails_autolink (~> 1.1.5)
   responders
   rspec-rails
-  rubyzip
+  rubyzip (< 1.0.0)
   sass-rails (~> 4.0.0)
   sdoc
   simple_form (~> 3.0.0.rc)

--- a/lib/paperclip_processors/voice_preview.rb
+++ b/lib/paperclip_processors/voice_preview.rb
@@ -15,26 +15,24 @@ class VoicePreview < Paperclip::Processor
 
     begin
       tfiles = []
-      Zip::ZipFile.open src.path do |zf|
-        zf.each do |ze|
-          i = nil
-          case ze.name.downcase
-          when "7.ogg"
-            i = "01"
-          when "then.ogg"
-            i = "02"
-          when "12.ogg"
-            i = "03"
-          else
-            next
-          end
-          tfiles << (tf = "#{tmpdir}/#{i}.ogg")
-          open(tf, "w") do |of|
-            of.binmode
-            zs = zf.get_input_stream(ze)
-            while buf = zs.read(ZIP_BUFSIZE)
-              of << buf
-            end
+      Zip::ZipFile.foreach(src.path) do |ze|
+        i = nil
+        case ze.name.downcase
+        when "7.ogg"
+          i = "01"
+        when "then.ogg"
+          i = "02"
+        when "12.ogg"
+          i = "03"
+        else
+          next
+        end
+        tfiles << (tf = "#{tmpdir}/#{i}.ogg")
+        open(tf, "w") do |of|
+          of.binmode
+          zs = ze.get_input_stream
+          while buf = zs.read(ZIP_BUFSIZE)
+            of << buf
           end
         end
       end
@@ -53,7 +51,7 @@ class VoicePreview < Paperclip::Processor
       end
       system(*['sox', tfiles.sort, dst_path].flatten) or raise I18n.t("voice_preview.err_concat")
     rescue => e
-      Rails.logger.error "Error: Failed to generate preview voice: #{e.message}, last error is #{$?}"
+      Rails.logger.error "Failed to generate preview voice: #{e.backtrace.first}: #{e.message}, last error is #{$?}"
       FileUtils.mkdir_p "#{Rails.root}/tmp/failed"
       failed_path = "#{Rails.root}/tmp/failed/#{Time.now.to_i}.zip"
       Rails.logger.error "Keeping failed archive to '#{failed_path}'"