Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

delayed paperclip broken under paperclip 2.5.0 #58

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

delayed paperclip broken under paperclip 2.5.0 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ source "http://rubygems.org"

gemspec

gem "paperclip", '2.4.5'
gem "paperclip", '2.5.0'

gem "appraisal"
gem "mocha"
gem "sqlite3"
gem "delayed_job", :require => false
gem "resque", :require => false
gem "json", :platforms => :ruby_18
gem "json", :platforms => :ruby_18
4 changes: 2 additions & 2 deletions lib/delayed_paperclip/attachment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def self.included(base)
base.alias_method_chain :post_processing, :delay
base.alias_method_chain :post_processing=, :delay
base.alias_method_chain :save, :prepare_enqueueing
base.alias_method_chain :most_appropriate_url, :processed
base.alias_method_chain :url, :processed
base.alias_method_chain :post_process_styles, :processing
end

Expand Down Expand Up @@ -64,7 +64,7 @@ def save_with_prepare_enqueueing
end
end

def most_appropriate_url_with_processed
def url_with_processed
if original_filename.nil? || delayed_default_url?
default_url
else
Expand Down