Serve up paperclip attachments in a cache friendly way

diff --git a/.gitignore b/.gitignore
index 2b8b7bd68ae25333db8773682be1566e03bcd1c7..021bc9be273ff5d4456244db843fbb58d5407cd9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 log
 public/assets
 log
 public/assets

+public/attachments

 tmp
 .DS_Store
 tmp
 .DS_Store

diff --git a/app/assets/images/anon_large.png b/app/assets/images/users/images/large.png
similarity index 100%
rename from app/assets/images/anon_large.png
rename to app/assets/images/users/images/large.png

diff --git a/app/assets/images/anon_small.png b/app/assets/images/users/images/small.png
similarity index 100%
rename from app/assets/images/anon_small.png
rename to app/assets/images/users/images/small.png

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2d78a5bf47720ce642ab6e877a6c17cd2887261a..ce0c5d67bb68d37945d0d42213e92d3ef1f08373 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -106,21 +106,13 @@ module ApplicationHelper
   def user_image(user, options = {})
     options[:class] ||= "user_image"
 
   def user_image(user, options = {})
     options[:class] ||= "user_image"
 

-    if user.image.file?
-      image_tag user.image.url, options
-    else
-      image_tag "anon_large.png", options
-    end
+    image_tag user.image.url(:large), options

   end
 
   def user_thumbnail(user, options = {})
     options[:class] ||= "user_thumbnail"
 
   end
 
   def user_thumbnail(user, options = {})
     options[:class] ||= "user_thumbnail"
 

-    if user.image.file?
-      image_tag user.image.url, options
-    else
-      image_tag "anon_small.png", options
-    end
+    image_tag user.image.url(:small), options

   end
 
   def preferred_editor
   end
 
   def preferred_editor

diff --git a/app/models/user.rb b/app/models/user.rb
index 1f8d326d5dc1c3bf9f66b5fffe3227f5595b8577..9a230898a87779160d1038cac73b1e0ef498b2a3 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -44,9 +44,9 @@ class User < ActiveRecord::Base
   after_initialize :set_creation_time
   before_save :encrypt_password
 
   after_initialize :set_creation_time
   before_save :encrypt_password
 

-  has_attached_file :image, :styles => { :thumb => "100x100>" }, 
-    :path => "#{ATTACHMENTS_DIR}/user/image/:id/:filename",
-    :url => "/user/image/:id/:filename"
+  has_attached_file :image, 
+    :default_url => "/assets/:class/:attachment/:style.png",
+    :styles => { :large => "100x100>", :small => "50x50>" }

 
   def self.authenticate(options)
     if options[:username] and options[:password]
 
   def self.authenticate(options)
     if options[:username] and options[:password]

diff --git a/config/example.application.yml b/config/example.application.yml
index 763eda8ef9474d3779f36ce7724feb5938c50a53..420278a1f87d9e8d5c6c89e5f7b990e89004364a 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -56,7 +56,7 @@ defaults: &defaults
   gpx_trace_dir: "/home/osm/traces"
   gpx_image_dir: "/home/osm/images"
   # Location of data for attachments
   gpx_trace_dir: "/home/osm/traces"
   gpx_image_dir: "/home/osm/images"
   # Location of data for attachments

-  attachments_dir: ":rails_root/public"
+  attachments_dir: ":rails_root/public/attachments"

   # Log file to use
   #log_path: ""
   # List of memcache servers to use for caching
   # Log file to use
   #log_path: ""
   # List of memcache servers to use for caching

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
new file mode 100644 (file)
index 0000000..6467348
--- /dev/null
+++ b/config/initializers/paperclip.rb
@@ -0,0 +1,20 @@
+module Paperclip
+  class AssetUrlGenerator < UrlGenerator
+    include Sprockets::Helpers::IsolatedHelper
+    include Sprockets::Helpers::RailsHelper
+
+    def for(style_name, options)
+      url = super(style_name, options)
+
+      if url =~ /^\/assets\/(.*)$/
+        asset_path($1)
+      else
+        url
+      end
+    end
+  end
+end
+
+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[:url_generator] = Paperclip::AssetUrlGenerator