Commit 5aed1c5e

@@ -1,7 +1,7 @@
 module ApplicationHelper
   def avatar_for(user, size: 260, clazz: '')
-    return gravatar_for(user, size) if user.avatar == nil || !user.avatar.avatar.present?
-    image_tag(user.avatar.avatar.thumb.url, alt: user.name, class: clazz, style: "width:#{size}px;")
+    return gravatar_for(user, size) if user.avatar == nil || !user.avatar.image.present?
+    image_tag(user.avatar.url_for(:thumb), alt: user.name, class: clazz, style: "width:#{size}px;")
   end
 
   def gravatar_for(user, size)
@@ -19,7 +19,7 @@ module ApplicationHelper
 
   def disqus_auth(user = current_user)
     if user.has_avatar?
-      data = { id: user.id, username: user.name, email: user.email, :avatar => user.avatar.avatar.url, :url => "https://#{request.host_with_port}/profiles/#{user.to_param}" }.to_json
+      data = { id: user.id, username: user.name, email: user.email, :avatar => user.avatar.url_for(:thumb), :url => "https://#{request.host_with_port}/profiles/#{user.to_param}" }.to_json
     else
       data = { id: user.id, username: user.name, email: user.email, :url => "https://#{request.host_with_port}/profiles/#{user.to_param}" }.to_json
     end

@@ -1,5 +1,5 @@
 <div class="well sidebar-nav">
-  <%= link_to new_my_avatar_path(current_user), title: 'Change your avatar', data: { toggle: 'tooltip', placement: 'bottom', animation: 'true' }, class: 'tooltip-item' do %>
+  <%= link_to new_my_avatar_path, title: 'Change your avatar', data: { toggle: 'tooltip', placement: 'bottom', animation: 'true' }, class: 'tooltip-item' do %>
     <%= avatar_for(current_user) %>
   <% end %>
   <ul class="nav nav-list" data-no-turbolink>
@@ -12,7 +12,7 @@
     <li class="<%= "active" if controller?("favorites") %>"><%= link_to "<i class='fa fa-star'></i> Favorites".html_safe, my_favorites_path %></li>
     <li class="<%= 'active' if controller?('settings') %>"><%= link_to "<i class='fa fa-cog'></i> Settings".html_safe, my_settings_path %></li>
     <li class="<%= 'active' if controller?('passwords') %>"><%= link_to "<i class='fa fa-eye'></i> Password".html_safe, my_passwords_path %></li>
-    <li class="<%= 'active' if controller?('avatars') %>"><%= link_to "<i class='fa fa-picture-o'></i> Picture".html_safe, new_my_avatar_path(current_user) %></li>
+    <li class="<%= 'active' if controller?('avatars') %>"><%= link_to "<i class='fa fa-picture-o'></i> Picture".html_safe, new_my_avatar_path %></li>
     <li class="nav-header">Actions</li>
     <li>
       <%= link_to my_root_path(anchor: 'cakes/new') do %>

@@ -3,6 +3,7 @@ class ConfigureContainerCommand
     container.register(:configuration) { EnvironmentVariables.new }
     container.register(:message_handler) { |builder| builder.build(PublishCakeToTwitter) }
     container.register(:message_handler) { |builder| builder.build(ProcessPhoto) }
+    container.register(:message_handler) { |builder| builder.build(ProcessAvatar) }
     container.register(:queue) { |c| Delayed::Job }
     container.register(:message_bus) { |c| c.build(MessageBus) }.as_singleton
     container.register(:exif_parser) { |builder| ExifParser.new }