db/migrate/20090105025406_add_auto_subscribe_to_user.rb
db/migrate/20090107065715_add_avatar_stuff.rb
vendor/plugins/paperclip/.gitignore
vendor/plugins/paperclip/LICENSE
vendor/plugins/paperclip/README.rdoc
vendor/plugins/paperclip/Rakefile
vendor/plugins/paperclip/generators/paperclip/USAGE
vendor/plugins/paperclip/generators/paperclip/paperclip_generator.rb
vendor/plugins/paperclip/generators/paperclip/templates/paperclip_migration.rb.erb
vendor/plugins/paperclip/init.rb
vendor/plugins/paperclip/lib/paperclip.rb
vendor/plugins/paperclip/lib/paperclip/attachment.rb
vendor/plugins/paperclip/lib/paperclip/geometry.rb
vendor/plugins/paperclip/lib/paperclip/iostream.rb
vendor/plugins/paperclip/lib/paperclip/storage.rb
vendor/plugins/paperclip/lib/paperclip/thumbnail.rb
vendor/plugins/paperclip/lib/paperclip/upfile.rb
vendor/plugins/paperclip/paperclip.gemspec
vendor/plugins/paperclip/shoulda_macros/paperclip.rb
vendor/plugins/paperclip/tasks/paperclip_tasks.rake
@@ -12,4 +12,4 @@ coverage/*
config/*.sphinx.conf
config/deploy.rb
.gitignore.swp
-
+public/avatars
.gitignore
@@ -30,7 +30,7 @@ class TopicsController < ApplicationController
@topic = current_user.topics.build(params[:topic].merge(:forum => @forum, :ip => @ip))
@post = @topic.posts.build(params[:post].merge(:user => current_user, :ip => @ip))
@topic.sticky = true if params[:topic][:sticky] == 1 && current_user.admin?
- @topic.subscriptions.create(:user => current_user)
+ @topic.subscriptions.build(:user => current_user) if current_user.auto_subscribe?
if @topic.save
flash[:notice] = t(:topic_created)
redirect_to forum_topic_path(@topic.forum, @topic)
app/controllers/topics_controller.rb
@@ -28,6 +28,8 @@ class User < ActiveRecord::Base
has_many :subscribed_topics, :through => :subscriptions
has_many :topics
has_many :unread_messages, :class_name => "Message", :foreign_key => "to_id", :conditions => ["to_read = ? AND to_deleted = ?", false, false]
+
+ has_attached_file :avatar, :styles => { :thumbnail => "100>" }
belongs_to :banned_by, :class_name => "User", :foreign_key => "banned_by"
belongs_to :style
@@ -84,6 +86,10 @@ class User < ActiveRecord::Base
ban_time.nil? ? false : ban_time > Time.now
end
+ def has_avatar?
+ !avatar_file_name.blank?
+ end
+
# Authenticates a user by their login name and unencrypted password. Returns the user or nil.
def self.authenticate(login, password)
u = find_by_login(login) # need to get the salt
app/models/user.rb
@@ -11,7 +11,9 @@
<% end %>
<br />
- <% if !@user.email.blank? %>
+ <% if @user.has_avatar? %>
+ <%= image_tag @user.avatar(:thumb) %>
+ <% elsif !@user.email.blank? %>
<%= image_tag("http://www.gravatar.com/avatar.php?gravatar_id=" + Digest::MD5.hexdigest(@user.email) + "&default=") %><br />
<% end %>
app/views/admin/users/show.html.erb
@@ -28,7 +28,9 @@
<tr>
<td valign='top' width='20%'>
<b><%= post.user.rank %><br /></b>
- <% if !post.user.email.blank? %>
+ <% if post.user.has_avatar? %>
+ <%= image_tag post.user.avatar(:thumb) %>
+ <% elsif !post.user.email.blank? %>
<%= image_tag("http://www.gravatar.com/avatar.php?gravatar_id=" + Digest::MD5.hexdigest(post.user.email) + "&default=") %><br />
<% end %>
<b><%= t(:Posts) %>:</b> <%= post.user.posts.size %><br />
app/views/posts/_post.html.erb
@@ -1,4 +1,4 @@
-<% form_for current_user do |f| %>
+<% form_for current_user, :html => { :multipart => true } do |f| %>
<table cellspacing='0' cellpadding='2' class='action-box' width='100%'>
<thead><tr><td colspan='2'><h2><%= t(:Editing_your_profile) %></h2></td></tr></thead>
<tbody>
@@ -12,32 +12,32 @@
</tr>
<tr>
- <td valign='top'><%= f.label "password", "New Password" %></td>
+ <td valign='top'><%= f.label "password", t(:New_Password) %></td>
<td><%= f.password_field "password", :value => "" %></td>
</tr>
<tr>
- <td valign='top'><%= f.label "password_confirmation", "New Password Confirmation" %></td>
+ <td valign='top'><%= f.label "password_confirmation", t(:New_Password_Confirmation) %></td>
<td><%= f.password_field "password_confirmation", :value => "" %></td>
</tr>
<tr>
- <td valign='top'><%= f.label "signature" %></td>
+ <td valign='top'><%= f.label "signature", t(:Signature) %></td>
<td><%= f.text_area "signature", :cols => 80, :rows => 5 %></td>
</tr>
<tr>
- <td valign='top'><%= f.label "email" %></td>
+ <td valign='top'><%= f.label "email", t(:Email) %></td>
<td><%= f.text_field "email" %></td>
</tr>
<tr>
- <td valign='top'><%= f.label "time_zone" %></td>
+ <td valign='top'><%= f.label "time_zone", t(:Time_Zone) %></td>
<td><%= f.time_zone_select "time_zone" %></td>
</tr>
<tr>
- <td valign='top'><%= f.label "date_display", "Date & Time Display" %></b></td>
+ <td valign='top'><%= f.label "date_display", t(:Date_and_Time_Display) %></b></td>
<td>
<%= f.text_field "date_display", :size => 10 %>
<%= f.text_field "time_display", :size => 10 %>
@@ -63,13 +63,34 @@
</tr>
<% if current_user.email %>
- <tr><td valign='top'>
- <b><%= t(:Current) %> <a href='http://gravatar.com/'><%= t(:Gravatar) %></a></b></td>
+ <tr>
+ <td valign='top'>
+ <b><%= t(:Current) %> <a href='http://gravatar.com/'><%= t(:Gravatar) %></a></b>
+ </td>
<td>
<%= image_tag "http://www.gravatar.com/avatar.php?gravatar_id=" + Digest::MD5.hexdigest(current_user.email) %>
</td>
</tr>
<% end %>
+ <% if current_user.has_avatar? %>
+ <tr>
+ <td valign='top'>
+ <b><%= t(:Current_avatar) %></b>
+ </td>
+ <td>
+ <%= image_tag current_user.avatar(:thumbnail) %>
+ </td>
+ </tr>
+ <% end %>
+ <tr>
+ <td valign='top'>
+ <b><%= t(:Upload_new_avatar) %></b>
+ </td>
+ <td>
+ <%= f.file_field :avatar %>
+ </td>
+
+
</tbody>
<tfoot>
<tr>
app/views/users/edit.html.erb
@@ -11,10 +11,11 @@
<tbody>
<tr>
<td valign='top' width='20%'><b><%= @user %></b><br />
-
- <% if !@user.email.blank? %>
- <%= image_tag("http://www.gravatar.com/avatar.php?gravatar_id=" + Digest::MD5.hexdigest(@user.email) + "&default=") %><br />
- <% end %>
+ <% if @user.has_avatar? %>
+ <%= image_tag @user.avatar(:thumb) %>
+ <% elsif !@user.email.blank? %>
+ <%= image_tag("http://www.gravatar.com/avatar.php?gravatar_id=" + Digest::MD5.hexdigest(@user.email) + "&default=") %><br />
+ <% end %>
</td>
<td valign='top'>
app/views/users/show.html.erb
@@ -159,8 +159,10 @@
:Creating_a_rank => "Creating a rank",
:Creating_a_topic => "Creating a topic",
:Current => "Current",
+ :Current_avatar => "Current avatar",
:custom_rank => "custom rank",
:Custom_Rank => "Custom Rank",
+ :Date_and_Time_Display => "Date and Time Display",
:Date_joined => "Date joined",
:Delete => "Delete",
:Description => "Description",
@@ -222,7 +224,7 @@
:Last_IP => "Last IP",
:Last_Post => "Last Post",
:Last_updated => "Last updated",
- :Leave_redirect => "Leave redirect?",
+ :Leave_redirect? => "Leave redirect?",
:Lock => "Lock",
:Lock_this_topic => "Lock this topic",
:Locked! => "Locked!",
@@ -254,7 +256,9 @@
:Next_post => "Next post",
:New_Category => "New Category",
:New_Forum => "New Forum",
+ :New_Password => "New Password",
:New_password => "New password",
+ :New_Password_Confirmation => "New Password Confirmation",
:New_Rank => "New Rank",
:New_Reply => "New Reply",
:New_subject => "New subject",
@@ -339,6 +343,7 @@
:set_by => "set by",
:Signup => "Signup",
:signature => "signature",
+ :Signature => "Signature",
:silent_edit => "silent edit",
:Split => "Split",
:split_into_new_topic => "Split with new topic",
@@ -357,6 +362,7 @@
:This_post_was_edited_by => "This post was edited by",
:time_now => "The time is now",
:Time_sent => "Time sent",
+ :Time_Zone => "Time Zone",
:Times_banned => "Times banned",
:times => "times",
:Timestamp => "Timestamp",
@@ -367,6 +373,8 @@
:topic_deleted => "Topic has been deleted.",
:topic_has_been_split => "Topic has been split.",
:topic_not_updated => "Topic could not be updated.",
+ :topic_subscription => "You have subscribed to this topic.",
+ :topic_unsubscription => "You have unscribed from this topic.",
:topic_updated => "Topic was updated.",
:topics_moved => "All selected topics have been moved.",
:topic_locked_or_unlocked => "Topic has been {{status}}.",
@@ -388,6 +396,7 @@
:Unsticky => "Unsticky",
:Unsubscribe => "Unsubscribe",
:Update => "Update",
+ :Upload_new_avatar => "Upload new avatar",
:User => "User",
:user_not_found => "The user you were looking for could not be found.",
:user_should_create => "Maybe you could create one.",
config/locales/en.rb
@@ -9,7 +9,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20090105020743) do
+ActiveRecord::Schema.define(:version => 20090107065715) do
create_table "banned_ips", :force => true do |t|
t.string "ip"
@@ -195,6 +195,10 @@ ActiveRecord::Schema.define(:version => 20090105020743) do
t.string "time_zone"
t.string "display_name"
t.string "permalink"
+ t.boolean "auto_subscribe", :default => true
+ t.string "avatar_file_name"
+ t.string "avatar_content_type"
+ t.integer "avatar_file_size"
end
add_index "users", ["id", "user_level_id"], :name => "index_users_on_id_and_user_level_id"
db/schema.rb
@@ -1,19 +1,19 @@
class Array
def all_previous(element, included=false)
- (included ? self[0..index(element)] : self[0..(index(element)-1)]) if index(element) && !index(element).zero?
+ (included ? self[0..index(element)] : self[0..(index(element)-1)]) if !empty? && include?(element) && !index(element).zero?
end
# For finding the element before another in an array.
def previous(element)
- self[index(element)-1]
+ self[index(element)-1] if !empty? && include?(element) && !index(element).zero?
end
# For finding the element after another in an array.
def next(element)
- self[index(element)+1] if index(element) && last != element
+ self[index(element)+1] if !empty? && include?(element) && last != element
end
def all_next(element, included=false)
- (included ? self[index(element)..-1] : self[(index(element)+1)..-1]) if index(element) && last != element
+ (included ? self[index(element)..-1] : self[(index(element)+1)..-1]) if !empty? && include?(element) && last != element
end
end
lib/array_ext.rb
@@ -13,10 +13,18 @@ describe Array do
[1,2,3,4,5].previous(3).should eql(2)
end
+ it "should be able to find no previous element for the first" do
+ [1,2,3,4,5].previous(1).should eql(nil)
+ end
+
it "should be able to find the next element in the array" do
[1,2,3,4,5].next(3).should eql(4)
end
+ it "should be able to find no next element for the first" do
+ [1,2,3,4,5].next(5).should eql(nil)
+ end
+
it "should be able to find the susequent elements in an array" do
[1,2,3,4,5].all_next(3).should eql([4,5])
end
spec/array_ext_spec.rb
827863076a16f79b58e927d01c92538077c63dc5
Ryan Bigg
radarlistener@gmail.com
http://github.com/radar/rboard/commit/c6c1e39bbe319a9a01bed2b3d9befe6222aaf299
c6c1e39bbe319a9a01bed2b3d9befe6222aaf299
2009-01-06T23:07:07-08:00
2009-01-06T23:07:07-08:00
Add support for "real, hosted" avatar uploading. This takes precendence over the gravatar based.
Fixed bug where calling previous on an array's first element would return the array's last element.
20b497d68e29f6817ed2861f02790729113084c7
Ryan Bigg
radarlistener@gmail.com