lib/delayed_paperclip/attachment.rb in delayed_paperclip-2.4.2.0 vs lib/delayed_paperclip/attachment.rb in delayed_paperclip-2.4.3.0
- old
+ new
@@ -51,11 +51,11 @@
instance.prepare_enqueueing_for name
end
end
end
- def url_with_processed style = default_style, include_updated_timestamp = @use_timestamp
+ def url_with_processed style = default_style, include_updated_timestamp = @options.use_timestamp
return url_without_processed style, include_updated_timestamp if !@instance.class.attachment_definitions[@name][:delayed].try(:[], :url_with_processing) || job_is_processing
if !@instance.respond_to?(:"#{name}_processing?")
url_without_processed style, include_updated_timestamp
else
@@ -63,10 +63,11 @@
url_without_processed style, include_updated_timestamp
else
if dirty?
url_without_processed style, include_updated_timestamp
else
- interpolate(@default_url, style)
+ default_url = @options.default_url.is_a?(Proc) ? @options.default_url.call(self) : @options.default_url
+ interpolate(default_url, style)
end
end
end
end