Move more api-only methods into api_controller

[rails.git] / config / initializers / paperclip.rb

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 64673487a432031505b2832ed378929283314a5e..3aa1d003e354107cc672209daf8477bbe6827569 100644 (file)
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -1,13 +1,12 @@
 module Paperclip
   class AssetUrlGenerator < UrlGenerator
 module Paperclip
   class AssetUrlGenerator < UrlGenerator

-    include Sprockets::Helpers::IsolatedHelper
-    include Sprockets::Helpers::RailsHelper
+    include Sprockets::Rails::Helper

 
     def for(style_name, options)
       url = super(style_name, options)
 
 
     def for(style_name, options)
       url = super(style_name, options)
 

-      if url =~ /^\/assets\/(.*)$/
-        asset_path($1)
+      if url =~ %r{^/assets/(.*)$}
+        asset_path(Regexp.last_match(1))

       else
         url
       end
       else
         url
       end


@@ -15,6 +14,12 @@ module Paperclip
   end
 end
 
   end
 end
 

+Rails.application.config.after_initialize do |_app|
+  Paperclip::AssetUrlGenerator::VIEW_ACCESSORS.each do |attr|
+    Paperclip::AssetUrlGenerator.send("#{attr}=", ActionView::Base.send(attr))
+  end
+end
+

 Paperclip::Attachment.default_options[:url] = "/attachments/:class/:attachment/:id_partition/:style/:fingerprint.:extension"
 Paperclip::Attachment.default_options[:url] = "/attachments/:class/:attachment/:id_partition/:style/:fingerprint.:extension"

-Paperclip::Attachment.default_options[:path] = "#{ATTACHMENTS_DIR}/:class/:attachment/:id_partition/:style/:fingerprint.:extension"
+Paperclip::Attachment.default_options[:path] = "#{Settings.attachments_dir}/:class/:attachment/:id_partition/:style/:fingerprint.:extension"

 Paperclip::Attachment.default_options[:url_generator] = Paperclip::AssetUrlGenerator
 Paperclip::Attachment.default_options[:url_generator] = Paperclip::AssetUrlGenerator