You are currently browsing the Subversion repository.
Changesets can be listed by changeset number.
The Git repository is here.

Changesets
» Changeset 173

Changeset 173

Updated to latest release of Beast according to the "getting started with
Beast" guide at:

http://beast.caboo.se/forums/1/topics/381

This check-in includes frozen Edge Rails and has the beginnings of
configuration for the ROOL site included.

Comitted by: rool
Date: Friday March 02 15:59:12 2007 (over 17 years ago)

Affected files:

rool/rails/beast/trunk/app/controllers/application.rb:

prev.	current

		class ApplicationController < ActionController::Base
2		~~[ExceptionLoggable, BrowserFilters, AuthenticationSystem].each { \|mod\| include mod }~~
	2	include ExceptionLoggable, BrowserFilters, AuthenticationSystem
		session :session_key => '_beast_session_id'

5		~~helper_method :current_user, :logged_in?, :admin?, :last_login~~
	5	helper_method :current_user, :logged_in?, :admin?, :last_active
		before_filter :login_by_token

		protected
9		~~def last_login; session[:last_active] ? session[:last_active] : Time.now.utc ; end~~
	9	def last_active
	10	session[:last_active] \|\|= Time.now.utc
	11	end

		def rescue_action(exception)
		exception.is_a?(ActiveRecord::RecordInvalid) ? render_invalid_record(exception.record) : super
...	...
		def render_invalid_record(record)
		render :action => (record.new_record? ? 'new' : 'edit')
		end
18
		end

rool/rails/beast/trunk/app/controllers/forums_controller.rb:

prev.	current

		class ForumsController < ApplicationController
		before_filter :login_required, :only => [:new, :create, :edit, :update, :destroy]
3		~~before_filter :find_forum, :except => [:index, :new, :create]~~
	3	before_filter :find_or_initialize_forum, :except => :index
	4
		def index
		@forums = Forum.find(:all, :order => "position")
	7	respond_to do \|format\|
	8	format.html
	9	format.xml { render :xml => @forums.to_xml }
	10	end
		end

		def show
9		~~# keep track of when we last viewed this forum for activity indicators~~
10		~~(session[:forums] \|\|= {})[@forum.id] = Time.now.utc if logged_in?~~
11		~~@topic_pages, @topics = paginate(:topics, :per_page => 25, :conditions => ['forum_id = ?', params[:id]], :include => :replied_by_user, :order => 'sticky desc, replied_at desc')~~
	14	respond_to do \|format\|
	15	format.html do
	16	# keep track of when we last viewed this forum for activity indicators
	17	(session[:forums] \|\|= {})[@forum.id] = Time.now.utc if logged_in?
	18	@topic_pages, @topics = paginate(:topics, :per_page => 25, :conditions => ['forum_id = ?', params[:id]], :include => :replied_by_user, :order => 'sticky desc, replied_at desc')
	19	end
	20
	21	format.xml do
	22	render :xml => @forum.to_xml
	23	end
	24	end
		end

14		~~def new~~
15		~~@forum = Forum.new~~
16		~~end~~
	27	# new renders new.rhtml

		def create
19		~~@forum = Forum.new(params[:forum])~~
	30	@forum.attributes = params[:forum]
		@forum.save!
21		~~redirect_to forums_path~~
	32	respond_to do \|format\|
	33	format.html { redirect_to forums_path }
	34	format.xml { head :created, :location => formatted_forum_url(:id => @forum, :format => :xml) }
	35	end
		end
23
	37
		def update
		@forum.attributes = params[:forum]
		@forum.save!
27		~~redirect_to forums_path~~
	41	respond_to do \|format\|
	42	format.html { redirect_to forums_path }
	43	format.xml { head 200 }
	44	end
		end

		def destroy
		@forum.destroy
32		~~redirect_to forums_path~~
	49	respond_to do \|format\|
	50	format.html { redirect_to forums_path }
	51	format.xml { head 200 }
	52	end
		end

		protected
36		~~def find_forum() @forum = Forum.find(params[:id]) end~~
	56	def find_or_initialize_forum
	57	@forum = params[:id] ? Forum.find(params[:id]) : Forum.new
	58	end
	59
		alias authorized? admin?
		end

rool/rails/beast/trunk/app/controllers/moderators_controller.rb:

prev.	current

		class ModeratorsController < ApplicationController
		before_filter :login_required
	3
		def destroy
		Moderatorship.delete_all ['id = ?', params[:id]]
		redirect_to user_path(params[:user_id])

rool/rails/beast/trunk/app/controllers/monitorships_controller.rb:

prev.	current

		def create
		@monitorship = Monitorship.find_or_initialize_by_user_id_and_topic_id(current_user.id, params[:topic_id])
		@monitorship.update_attribute :active, true
	7	respond_to do \|format\|
	8	format.html { redirect_to topic_path(params[:forum_id], params[:topic_id]) }
	9	format.js
	10	end
		end

		def destroy
		Monitorship.update_all ['active = ?', false], ['user_id = ? and topic_id = ?', current_user.id, params[:topic_id]]
	15	respond_to do \|format\|
	16	format.html { redirect_to topic_path(params[:forum_id], params[:topic_id]) }
	17	format.js
	18	end
		end
		end

rool/rails/beast/trunk/app/controllers/posts_controller.rb:

prev.	current

		class PostsController < ApplicationController
2		~~before_filter :find_post, :except => [:index, :create, :monitored]~~
3		~~before_filter :login_required, :except => [:index, :monitored]~~
4		~~before_filter(:only => [:index, :monitored]) { \|c\| c.params[:page] = 1 if c.params[:format] == 'rss' }~~
	2	before_filter :find_post, :except => [:index, :create, :monitored, :search]
	3	before_filter :login_required, :except => [:index, :monitored, :search, :show]
	4	@@query_options = { :per_page => 25, :select => 'posts.*, topics.title as topic_title, forums.name as forum_name', :joins => 'inner join topics on posts.topic_id = topics.id inner join forums on topics.forum_id = forums.id', :order => 'posts.created_at desc' }

		def index
		conditions = []
		[:user_id, :forum_id].each { \|attr\| conditions << Post.send(:sanitize_sql, ["posts.#{attr} = ?", params[attr]]) if params[attr] }
9		~~conditions << Post.send(:sanitize_sql, ['LOWER(posts.body) LIKE ?', "%#{params[:q]}%"]) unless params[:q].blank?~~
10		~~@post_pages, @posts = paginate(:posts, :per_page => 25, :select => 'posts.*, topics.title as topic_title', :joins => 'inner join topics on posts.topic_id = topics.id',~~
11		~~:conditions => conditions.any? ? conditions.collect { \|c\| "(#{c})" }.join(' AND ') : nil, :order => 'posts.created_at desc, posts.id desc')~~
	9	conditions = conditions.any? ? conditions.collect { \|c\| "(#{c})" }.join(' AND ') : nil
	10	@post_pages, @posts = paginate(:posts, @@query_options.merge(:conditions => conditions))
	11	@users = User.find(:all, :select => 'distinct *', :conditions => ['id in (?)', @posts.collect(&:user_id).uniq]).index_by(&:id)
		render_posts_or_xml
		end

	15	def search
	16	conditions = params[:q].blank? ? nilil : Post.send(:sanitize_sql, ['LOWER(posts.body) LIKE ?', "%#{params[:q]}%"])
	17	@post_pages, @posts = paginate(:posts, @@query_options.merge(:conditions => conditions))
	18	@users = User.find(:all, :select => 'distinct *', :conditions => ['id in (?)', @posts.collect(&:user_id).uniq]).index_by(&:id)
	19	render_posts_or_xml :index
	20	end
	21
		def monitored
		@user = User.find params[:user_id]
17		@post_pages, @posts = paginate(:posts, :per_page => 25, :select => 'posts.*, topics.title as topic_title', :joins => 'inner join topics on posts.topic_id = topics.id inner join monitorships on monitorships.topic_id = topics.id',
18		~~:conditions => ['monitorships.user_id = ? and posts.user_id != ?', params[:user_id], @user.id], :order => 'posts.created_at desc, posts.id desc')~~
	24	options = @@query_options.merge(:conditions => ['monitorships.user_id = ? and posts.user_id != ?', params[:user_id], @user.id])
	25	options[:joins] += ' inner join monitorships on monitorships.topic_id = topics.id'
	26	@post_pages, @posts = paginate(:posts, options)
		render_posts_or_xml
		end

	30	def show
	31	respond_to do \|format\|
	32	format.html { redirect_to topic_path(@post.forum_id, @post.topic_id) }
	33	format.xml { render :xml => @post.to_xml }
	34	end
	35	end
	36
		def create
		@topic = Topic.find_by_id_and_forum_id(params[:topic_id],params[:forum_id], :include => :forum)
		if @topic.locked?
25		~~flash[:notice] = 'This topic is locked.'~~
26		~~return redirect_to(topic_path(:forum_id => params[:forum_id], :id => params[:topic_id]))~~
	40	respond_to do \|format\|
	41	format.html do
	42	flash[:notice] = 'This topic is locked.'
	43	redirect_to(topic_path(:forum_id => params[:forum_id], :id => params[:topic_id]))
	44	end
	45	format.xml do
	46	render :text => 'This topic is locked.', :status => 400
	47	end
	48	end
	49	return
		end
		@forum = @topic.forum
		@post = @topic.posts.build(params[:post])
		@post.user = current_user
		@post.save!
32		~~redirect_to topic_path(:forum_id => params[:forum_id], :id => params[:topic_id], :anchor => @post.dom_id, :page => params[:page] \|\| '1')~~
	55	respond_to do \|format\|
	56	format.html do
	57	redirect_to topic_path(:forum_id => params[:forum_id], :id => params[:topic_id], :anchor => @post.dom_id, :page => params[:page] \|\| '1')
	58	end
	59	format.xml { head :created, :location => formatted_post_url(:forum_id => params[:forum_id], :topic_id => params[:topic_id], :id => @post, :format => :xml) }
	60	end
		rescue ActiveRecord::RecordInvalid
		flash[:bad_reply] = 'Please post something at least...'
35		~~redirect_to topic_path(:forum_id => params[:forum_id], :id => params[:topic_id], :anchor => 'reply-form', :page => params[:page] \|\| '1')~~
	63	respond_to do \|format\|
	64	format.html do
	65	redirect_to topic_path(:forum_id => params[:forum_id], :id => params[:topic_id], :anchor => 'reply-form', :page => params[:page] \|\| '1')
	66	end
	67	format.xml { render :xml => @post.errors.to_xml, :status => 400 }
	68	end
		end

		def edit
39		~~respond_to { \|format\| format.html; format.js }~~
	72	respond_to do \|format\|
	73	format.html
	74	format.js
	75	end
		end

		def update
...	...
		format.html do
		redirect_to topic_path(:forum_id => params[:forum_id], :id => params[:topic_id], :anchor => @post.dom_id, :page => params[:page] \|\| '1')
		end
52		~~format.js~~
	88	format.js
	89	format.xml { head 200 }
		end
		end

...	...
		flash[:notice] = "Post of '#{CGI::escapeHTML @post.topic.title}' was deleted."
		# check for posts_count == 1 because its cached and counting the currently deleted post
		@post.topic.destroy and redirect_to forum_path(params[:forum_id]) if @post.topic.posts_count == 1
61		~~redirect_to topic_path(:forum_id => params[:forum_id], :id => params[:topic_id], :page => params[:page]) unless performed?~~
	98	respond_to do \|format\|
	99	format.html do
	100	redirect_to topic_path(:forum_id => params[:forum_id], :id => params[:topic_id], :page => params[:page]) unless performed?
	101	end
	102	format.xml { head 200 }
	103	end
		end

		protected
...	...
		@post = Post.find_by_id_and_topic_id_and_forum_id(params[:id], params[:topic_id], params[:forum_id]) \|\| raise(ActiveRecord::RecordNotFound)
		end

73		~~def render_posts_or_xml~~
	115	def render_posts_or_xml(template_name = action_name)
		respond_to do \|format\|
75		~~format.html~~
76		~~format.rss { render :action => "#{action_name}.rxml", :layout => false }~~
	117	format.html { render :action => "#{template_name}.rhtml" }
	118	format.rss { render :action => "#{template_name}.rxml", :layout => false }
	119	format.xml { render :xml => @posts.to_xml }
		end
		end
		end

rool/rails/beast/trunk/app/controllers/topics_controller.rb:

prev.	current

		# before_filter :update_last_seen_at, :only => :show

		def index
7		~~redirect_to forum_path(params[:forum_id])~~
	7	respond_to do \|format\|
	8	format.html { redirect_to forum_path(params[:forum_id]) }
	9	format.xml do
	10	@topics = Topic.find_all_by_forum_id(params[:forum_id], :order => 'sticky desc, replied_at desc', :limit => 25)
	11	render :xml => @topics.to_xml
	12	end
	13	end
		end

		def new
...	...
		@voices = @posts.map(&:user) ; @voices.uniq!
		@post = Post.new
		end
	33	format.xml do
	34	render :xml => @topic.to_xml
	35	end
		format.rss do
		@posts = @topic.posts.find(:all, :order => 'created_at desc', :limit => 25)
		render :action => 'show.rxml', :layout => false
...	...
		@post.user = current_user
		@post.save!
		end
44		~~redirect_to topic_path(@forum, @topic)~~
	53	respond_to do \|format\|
	54	format.html { redirect_to topic_path(@forum, @topic) }
	55	format.xml { head :created, :location => formatted_topic_url(:forum_id => @forum, :id => @topic, :format => :xml) }
	56	end
		end

		def update
		@topic.attributes = params[:topic]
		assign_protected
		@topic.save!
51		~~redirect_to topic_path(@topic.forum, @topic)~~
	63	respond_to do \|format\|
	64	format.html { redirect_to topic_path(@forum, @topic) }
	65	format.xml { head 200 }
	66	end
		end

		def destroy
		@topic.destroy
		flash[:notice] = "Topic '#{CGI::escapeHTML @topic.title}' was deleted."
57		~~redirect_to forum_path(@forum)~~
	72	respond_to do \|format\|
	73	format.html { redirect_to forum_path(@forum) }
	74	format.xml { head 200 }
	75	end
		end

		protected

rool/rails/beast/trunk/app/controllers/users_controller.rb:

prev.	current

		before_filter :find_user, :only => [:edit, :update, :destroy, :admin]

		def index
6		~~@user_pages, @users = paginate(:users, :per_page => 50, :order => "display_name", :conditions => (params[:q] && ['LOWER(display_name) LIKE :q OR LOWER(login) LIKE :q', {:q => "%#{params[:q]}%"}]))~~
	6	respond_to do \|format\|
	7	format.html do
	8	@user_pages, @users = paginate(:users, :per_page => 50, :order => "display_name", :conditions => User.build_search_conditions(params[:q]))
	9	@user_count = User.count
	10	@active = User.count(:all, :conditions => "posts_count > 0")
	11	end
	12	format.xml do
	13	@users = User.search(params[:q], :limit => 25)
	14	render :xml => @users.to_xml
	15	end
	16	end
		end

		def show
		@user = User.find(params[:id])
	21	respond_to do \|format\|
	22	format.html
	23	format.xml { render :xml => @user.to_xml }
	24	end
		end

		def new
...	...
		end

		def create
18		~~@user = params[:user].blank? ? User.find_by_email(params[:email]) : User.new(params[:user])~~
19		~~flash[:error] = "I could not find an account with the email address '#{CGI.escapeHTML params[:email]}'. Did you type it correctly?" if params[:email] and not @user~~
20		~~redirect_to login_path and return unless @user~~
21		~~@user.login = params[:user][:login] unless params[:user].blank?~~
22		~~@user.reset_login_key!~~
23		~~UserMailer.deliver_signup(@user, request.host_with_port)~~
24		~~flash[:notice] = "#{params[:user].blank? ? "An account activation" : "A temporary login"} email has been sent to '#{CGI.escapeHTML @user.email}'."~~
25		~~redirect_to login_path~~
	32	respond_to do \|format\|
	33	format.html do
	34	@user = params[:user].blank? ? User.find_by_email(params[:email]) : User.new(params[:user])
	35	flash[:error] = "I could not find an account with the email address '#{CGI.escapeHTML params[:email]}'. Did you type it correctly?" if params[:email] and not @user
	36	redirect_to login_path and return unless @user
	37	@user.login = params[:user][:login] unless params[:user].blank?
	38	@user.reset_login_key!
	39	UserMailer.deliver_signup(@user, request.host_with_port)
	40	flash[:notice] = "#{params[:user].blank? ? "An account activation" : "A temporary login"} email has been sent to '#{CGI.escapeHTML @user.email}'."
	41	redirect_to login_path
	42	end
	43	end
		end

		def activate
29		~~self.current_user = User.find_by_login_key(params[:key])~~
30		~~if logged_in? && !current_user.activated?~~
31		~~current_user.toggle! :activated~~
32		~~flash[:notice] = "Signup complete!"~~
	47	respond_to do \|format\|
	48	format.html do
	49	self.current_user = User.find_by_login_key(params[:key])
	50	if logged_in? && !current_user.activated?
	51	current_user.toggle! :activated
	52	flash[:notice] = "Signup complete!"
	53	end
	54	redirect_to home_path
	55	end
		end
34		~~redirect_to home_path~~
		end

		def update
		@user.attributes = params[:user]
		# temp fix to let people with dumb usernames change them
		@user.login = params[:user][:login] if not @user.valid? and @user.errors.on(:login)
41		~~@user.save!~~
42		~~redirect_to user_path(@user)~~
	63	@user.save! and flash[:notice]="Your settings have been saved."
	64	respond_to do \|format\|
	65	format.html { redirect_to edit_user_path(@user) }
	66	format.xml { head 200 }
	67	end
		end

		def admin
46		~~@user.admin = params[:user][:admin] == '1'~~
47		~~@user.save~~
48		~~@user.forums << Forum.find(params[:moderator]) unless params[:moderator].blank? \|\| params[:moderator] == '-'~~
49		~~redirect_to user_path(@user)~~
	71	respond_to do \|format\|
	72	format.html do
	73	@user.admin = params[:user][:admin] == '1'
	74	@user.save
	75	@user.forums << Forum.find(params[:moderator]) unless params[:moderator].blank? \|\| params[:moderator] == '-'
	76	redirect_to user_path(@user)
	77	end
	78	end
		end

		def destroy
		@user.destroy
54		~~redirect_to users_path~~
	83	respond_to do \|format\|
	84	format.html { redirect_to users_path }
	85	format.xml { head 200 }
	86	end
		end

		protected

rool/rails/beast/trunk/app/helpers/application_helper.rb:

prev.	current

		require 'md5'

		module ApplicationHelper
4
		def submit_tag(value = "Save Changes", options={} )
		or_option = options.delete(:or)
		return super + "<span class='button_or'>or " + or_option + "</span>" if or_option
...	...

		def feed_icon_tag(title, url)
		(@feed_icons \|\|= []) << { :url => url, :title => title }
21		~~link_to image_tag('feed-icon', :size => '14x14', :alt => "Subscribe to #{title}"), url~~
	20	link_to image_tag('feed-icon.png', :size => '14x14', :alt => "Subscribe to #{title}"), url
		end

24		~~def format_text(text)~~
25		~~white_list(RedCloth.new(auto_link(text.to_s)).to_html)~~
26		~~end~~
27
		def search_posts_title
29		~~returning (params[:q].blank? ? 'Recent Posts' : "Searching for '#{h params[:q]}'") do \|title\|~~
	24	returning(params[:q].blank? ? 'Recent Posts' : "Searching for '#{h params[:q]}'") do \|title\|
		title << " by #{h User.find(params[:user_id]).display_name}" if params[:user_id]
		title << " in #{h Forum.find(params[:forum_id]).name}" if params[:forum_id]
		end
...	...

		def search_posts_path(rss = false)
		options = params[:q].blank? ? {} : {:q => params[:q]}
	32	prefix = rss ? 'formatted_' : ''
		options[:format] = 'rss' if rss
		[[:user, :user_id], [:forum, :forum_id]].each do \|(route_key, param_key)\|
39		~~return send("#{route_key}_posts_path", options.update(param_key => params[param_key])) if params[param_key]~~
	35	return send("#{prefix}#{route_key}_posts_path", options.update(param_key => params[param_key])) if params[param_key]
		end
41		~~all_posts_path(options)~~
	37	options[:q] ? all_search_posts_path(options) : send("#{prefix}all_posts_path", options)
		end

		def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)

rool/rails/beast/trunk/app/helpers/forums_helper.rb:

prev.	current

		# used to know if a topic has changed since we read it last
		def recent_topic_activity(topic)
		return false if not logged_in?
6		~~return topic.replied_at > (session[:topics][topic.id] \|\| last_login)~~
	6	return topic.replied_at > (session[:topics][topic.id] \|\| last_active)
		end

		# used to know if a forum has changed since we read it last
		def recent_forum_activity(forum)
11		~~return false if forum.topics.empty? or not logged_in?~~
12		~~return forum.topics.first.replied_at > (session[:forums][forum.id] \|\| last_login)~~
	11	return false unless logged_in? && forum.topics.first
	12	return forum.topics.first.replied_at > (session[:forums][forum.id] \|\| last_active)
		end

		end

rool/rails/beast/trunk/app/models/forum.rb:

prev.	current


		has_many :posts, :order => 'posts.created_at desc' do
		def last
17		~~@last_post \|\|= find(:first, :include => :user, :limit => 1)~~
	17	@last_post \|\|= find(:first, :include => :user)
		end
		end

	21	format_attribute :description
		end

rool/rails/beast/trunk/app/models/post.rb:

prev.	current

		class Post < ActiveRecord::Base
		belongs_to :forum, :counter_cache => true
		belongs_to :user, :counter_cache => true
4		~~belongs_to :topic, :counter_cache => true~~
5
	4	belongs_to :topic, :counter_cache => true
	5
	6	format_attribute :body
		before_create { \|r\| r.forum_id = r.topic.forum_id }
7		~~before_save { \|r\| r.body.strip! }~~
		after_create { \|r\| Topic.update_all(['replied_at = ?, replied_by = ?, last_post_id = ?', r.created_at, r.user_id, r.id], ['id = ?', r.topic_id]) }
	9	after_destroy { \|r\| t = Topic.find(r.topic_id) ; Topic.update_all(['replied_at = ?, replied_by = ?, last_post_id = ?', t.posts.last.created_at, t.posts.last.user_id, t.posts.last.id], ['id = ?', t.id]) if t.posts.last }

		validates_presence_of :user_id, :body
		attr_accessible :body
...	...
		def editable_by?(user)
		user && (user.id == user_id \|\| user.admin? \|\| user.moderator_of?(topic.forum_id))
		end
	17
	18	def to_xml(options = {})
	19	options[:except] \|\|= []
	20	options[:except] << :topic_title << :forum_name
	21	super
	22	end
		end

rool/rails/beast/trunk/app/models/session.rb:

prev.	current

		Session = CGI::Session::ActiveRecordStore::Session
		Session.class_eval do
3
4		~~def self.active_guests~~
5		~~count(:all, :conditions => ["user_id is NULL and updated_at > ?", 5.minutes.ago.utc])~~
6		~~end~~
7
		def self.sweep!
		delete_all ['updated_at < ?', 15.minutes.ago.utc]
		end

rool/rails/beast/trunk/app/models/topic.rb:

prev.	current

		has_many :monitorships
		has_many :monitors, :through => :monitorships, :conditions => ['monitorships.active = ?', true], :source => :user, :order => 'users.login'

7		~~has_many :posts, :order => 'posts.created_at', :dependent => :destroy~~
	7	has_many :posts, :order => 'posts.created_at', :dependent => :destroy do
	8	def last
	9	@last_post \|\|= find(:first, :order => 'posts.created_at desc')
	10	end
	11	end
	12
		belongs_to :replied_by_user, :foreign_key => "replied_by", :class_name => "User"

		validates_presence_of :forum, :user, :title
11		~~before_create { \|r\| r.replied_at = Time.now.utc }~~
	16	before_create :set_default_replied_at_and_sticky
	17	after_save :set_post_topic_id
	18
		attr_accessible :title
		# to help with the create form
		attr_accessor :body
...	...
		user && (user.id == user_id \|\| user.admin? \|\| user.moderator_of?(forum_id))
		end

	45	protected
	46	def set_default_replied_at_and_sticky
	47	self.replied_at = Time.now.utc
	48	self.sticky \|\|= 0
	49	end
	50
	51	def set_post_topic_id
	52	Post.update_all ['forum_id = ?', forum_id], ['topic_id = ?', id]
	53	end
		end

rool/rails/beast/trunk/app/models/user.rb:

prev.	current

		require 'digest/sha1'
	2
		class User < ActiveRecord::Base
		has_many :moderatorships, :dependent => :destroy
		has_many :forums, :through => :moderatorships, :order => 'forums.name'

		has_many :posts
	8	has_many :topics
		has_many :monitorships
		has_many :monitored_topics, :through => :monitorships, :conditions => ['monitorships.active = ?', true], :order => 'topics.replied_at desc', :source => :topic

		validates_presence_of :login, :email, :password_hash
11		~~validates_uniqueness_of :login, :email, :case_sensitive => false~~
12		~~# names that start with #s really upset me for some reason~~
13		~~validates_format_of :login, :with => /^[a-zA-Z]{2}(?:\w+)?$/~~
		validates_length_of :login, :minimum => 2
	14	validates_length_of :password, :minimum => 5, :allow_nil => true
	15	validates_confirmation_of :password, :on => :create

		# names that start with #s really upset me for some reason
17		~~validates_format_of :display_name, :with => /^[a-zA-Z]{2}(?:[.'\-\w ]+)?$/~~
18		~~validates_uniqueness_of :display_name, :case_sensitive => false~~
	18	validates_format_of :login, :with => /^[a-z]{2}(?:\w+)?$/i

20		~~validates_confirmation_of :password, :on => :create~~
	20	# names that start with #s really upset me for some reason
	21	validates_format_of :display_name, :with => /^[a-z]{2}(?:[.'\-\w ]+)?$/i
	22
	23	validates_uniqueness_of :login, :email, :display_name, :case_sensitive => false
		before_validation { \|u\| u.display_name = u.login if u.display_name.blank? }
		# first user becomes admin automatically
23		~~before_create { \|u\| u.admin = true if User.count == 0 }~~
24
	26	before_create { \|u\| u.admin = u.activated = true if User.count == 0 }
	27	format_attribute :bio
	28
		attr_reader :password
		attr_protected :admin, :posts_count, :login, :created_at, :updated_at, :last_login_at, :topics_count, :activated

		def self.currently_online
29		~~user_ids = Session.find(:all, :select => "user_id", :conditions => ["user_id is NOT NULL and sessions.updated_at > ?", Time.now.utc-5.minutes]).map(&:user_id).uniq~~
30		~~User.find(user_ids)~~
	33	User.find(:all, :conditions => ["last_seen_at > ?", Time.now.utc-5.minutes])
		end

		# we allow false to be passed in so a failed login can check
...	...
		find_by_login_and_password_hash_and_activated(login, Digest::SHA1.hexdigest(password + PASSWORD_SALT), activated)
		end

	42	def self.search(query, options = {})
	43	with_scope :find => { :conditions => build_search_conditions(query) } do
	44	find :all, options
	45	end
	46	end
	47
	48	def self.build_search_conditions(query)
	49	query && ['LOWER(display_name) LIKE :q OR LOWER(login) LIKE :q', {:q => "%#{query}%"}]
	50	end
	51
		def password=(value)
	53	return if value.blank?
		write_attribute :password_hash, Digest::SHA1.hexdigest(value + PASSWORD_SALT)
		@password = value
		end

		def reset_login_key!
45		~~self.login_key = Digest::SHA1.hexdigest(Time.now.to_s + password_hash + rand(123456789).to_s).to_s~~
	59	self.login_key = Digest::SHA1.hexdigest(Time.now.to_s + password_hash.to_s + rand(123456789).to_s).to_s
		# this is not currently honored
		self.login_key_expires_at = Time.now.utc+1.year
		save!
...	...
		moderatorships.count(:all, :conditions => ['forum_id = ?', (forum.is_a?(Forum) ? forum.id : forum)]) == 1
		end

	70	def to_xml(options = {})
	71	options[:except] \|\|= []
	72	options[:except] << :email << :login_key << :login_key_expires_at << :password_hash
	73	super
	74	end
		end

rool/rails/beast/trunk/app/views/forums/_form.rhtml:

prev.	current


		<p id="forum_name">

6		~~<table border="0" cellspacing="0" cellpadding="0" class="noborder nopad">~~
	6	<table border="0" cellspacing="0" cellpadding="0" class="noborder nopad wide">
		<td>
		<label>Title</label><br />
9		~~<%= f.text_field :name %>~~
	9	<%= form.text_field :name %>
		</td>
11		~~<td>~~
	11	<td style="text-align:right">
		<label>Position</label><br />
13		~~<%= f.text_field :position, :size => 5 %>~~
	13	<%= form.text_field :position, :size => 5 %>

		</td>
		</table>
...	...
		</p>
		<p id="forum_descripion">
		<label>Description</label><br />
21		~~<%= f.text_area :description, :rows => 7 %></p>~~

	22	<%= form.text_area :description, :rows => 7 %></p>

rool/rails/beast/trunk/app/views/forums/edit.rhtml:

prev.	current

	1	<div class="crumbs">
	2	<%= link_to "Forums", home_path %> <span class="arrow">→</span>
	3	</div>
	4
		<h1>Edit Forum</h1>

		<% form_for :forum,
...	...
		:url => forum_path(@forum),
		:html => { :method => :put } do \|f\| -%>
5		~~<%= render :partial => "form", :locals => { :f => f } %>~~
6		~~<%= submit_tag 'Save Forum', :or => link_to('cancel', forum_path(@forum)) %>~~
	9	<%= render :partial => "form", :object => f %>
	10	<%= submit_tag 'Save Forum', :or => link_to('Cancel', forum_path(@forum)) %>
		<% end -%>

rool/rails/beast/trunk/app/views/forums/index.rhtml:

prev.	current

		<h1 style="margin-top:0;">Forums</h1>
		<p class="subtitle">
		<%= feed_icon_tag "Recent Posts", formatted_all_posts_path(:format => 'rss') %>
19		~~<%= number_with_delimiter(Post.count(:conditions => "id=topic_id")) %> topics, <%= number_with_delimiter(Post.count) %> posts,~~
	19	<%= number_with_delimiter(Topic.count) %> topics, <%= number_with_delimiter(Post.count) %> posts,
		<%= number_with_delimiter(User.count(:conditions => "posts_count>0")) %> voices

		</p>
...	...
		<% end %>
		</td>
		<td class="c2">
44		~~<%= link_to "Edit", edit_forum_path(forum), :class => "tiny", :rel => "directory", :style => "float:right" %>~~
	44	<%= link_to "Edit", edit_forum_path(forum), :class => "tiny", :rel => "directory", :style => "float:right" if admin? %>

		<%= link_to h(forum.name), forum_path(forum), :class => "title" %>
		<div class="posts">
		<%= number_with_delimiter(forum.topics_count) %> topics,
		<%= number_with_delimiter(forum.posts_count) %> posts
		</div>
51		~~<p class="desc"><%= h forum.description %>~~
	51	<p class="desc"><%= forum.description_html %>
		</p>
		</td>
		<!--
...	...
		<% if forum.posts.last %>
		<%= time_ago_in_words(forum.posts.last.created_at) %><br />
		by <strong><%= h(forum.posts.last.user.display_name) %></strong>
63		~~<span>(<%= link_to 'view', topic_path(:forum_id => forum, :id => forum.posts.last.topic_id, :page => forum.posts.last.topic.last_page) %>)</span>~~
	63	<span>(<%= link_to 'view', topic_path(:forum_id => forum, :id => forum.posts.last.topic_id, :page => forum.posts.last.topic.last_page, :anchor => forum.posts.last.dom_id) %>)</span>
		<% end %>
		</td>
		</tr>
...	...
		<%= link_to "Recent posts", all_posts_path %>
		</p>

	74	<% online_users = User.currently_online -%>
	75	<% unless online_users.empty? %>
		<div class="stats">
75
76		<%
77		~~=begin~~
78		%>
79		~~<div class="posts">~~
80		~~Total users: <strong><%= number_with_delimiter(User.count) %></strong><br />~~
81		~~Total topics: <strong><%= number_with_delimiter(Post.count(:conditions => "id=topic_id")) %></strong><br />~~
82		~~Total posts: <strong><%= number_with_delimiter(Post.count) %></strong>~~
83		~~</div>~~
84		<%
85		~~=end~~
86		%>
87
		<div class="users">
89		~~<% online_users = User.currently_online -%>~~
		<% unless online_users.empty? %>
		Users online: <%= online_users.map { \|u\| link_to "<strong>#{h u.display_name}</strong>", user_path(u) } * ", " %><br />
		<% end %>
93		~~<% if (guests=Session.active_guests)>0 %>~~
94		~~Guests online: <%= guests %>~~
95		~~<% end %>~~
		</div>
97
		</div>
	83	<% end %>

rool/rails/beast/trunk/app/views/forums/new.rhtml:

prev.	current

	1	<div class="crumbs">
	2	<%= link_to "Forums", home_path %> <span class="arrow">→</span>
	3	</div>
	4
		<h1>New Forum</h1>

		<% form_for :forum, :url => forums_path do \|f\| -%>
4		~~<%= render :partial => "form", :locals => { :f => f } %>~~
5		~~<%= submit_tag 'Create' %> or <%= link_to 'cancel', forums_path %>~~
	8	<%= render :partial => "form", :object => f %>
	9	<%= submit_tag 'Create' %> or <%= link_to 'Cancel', forums_path %>
		<% end -%>

rool/rails/beast/trunk/app/views/forums/show.rhtml:

prev.	current

		<% content_for :right do %>

		<% unless @forum.description.blank? %>
4		~~<p><%= @forum.description %></p>~~
	4	<%= @forum.description_html %>
		<hr />
		<% end %>

...	...
		<% @page_title = @forum.name %>

		<div class="crumbs">
26		~~<%= link_to "Index", "/forums/" %> <span class="arrow">→</span>~~
	26	<%= link_to "Forums", home_path %> <span class="arrow">→</span>
		</div>
		<h1 style="margin-top:0.5em">
		<%= h @forum.name %>
...	...


		<% if @topic_pages.page_count > 1 -%>
	40	<% if logged_in? %>
		<p style="float:right; margin-top:0;"><%= link_to 'New topic', new_topic_path(@forum), :class => "utility" %></p>
	42	<% end %>
		<p class="pages">Pages: <strong><%= pagination_links @topic_pages, :window_size => 10 %></strong></p>
		<% end -%>

...	...
		<p class="pages">Pages: <strong><%= pagination_links @topic_pages, :window_size => 10 %></strong></p>
		<% end -%>

	98	<% if logged_in? %>
		<p><%= link_to 'New topic', new_topic_path(@forum), :class => "utility" %></p>
	100	<% end%>

rool/rails/beast/trunk/app/views/layouts/_post.rxml:

prev.	current

		xm.item do
		xm.title "#{h(post.respond_to?(:topic_title) ? post.topic_title : post.topic.title)}, replied by #{h post.user.login} @ #{post.created_at.rfc822}"
3		~~xm.description format_text(post.body.to_s)~~
	3	xm.description post.body_html
		xm.pubDate post.created_at.rfc822
		xm.guid [request.host_with_port, post.forum_id.to_s, post.topic_id.to_s, post.id.to_s].join(":"), "isPermaLink" => "false"
		xm.author "#{post.user.login}"

rool/rails/beast/trunk/app/views/layouts/application.rhtml:

prev.	current

1		~~<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"~~
2		~~"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">~~
	1	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

		<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
		<head>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
		<title><%= "#{h @page_title} - " if @page_title %>Beast</title>
		<%= stylesheet_link_tag 'display' %>
9		~~<%= javascript_include_tag "prototype", "effects", "application" %>~~
	8	<%= javascript_include_tag "prototype", "effects", "lowpro", "application" %>
		<% unless @feed_icons.blank? -%>
		<% @feed_icons.each do \|feed\| -%>
		<%= auto_discovery_link_tag :rss, feed[:url], :title => "Subscribe to '#{feed[:title]}'" %>
		<% end -%>
		<% end -%>
	14	<link rel="search" type="application/opensearchdescription+xml" href="http://<%= request.host_with_port %>/open_search.xml" />
		</head>
		<body>

...	...
		<ul id="nav">
		<li><%= link_to 'Forums', home_path, :rel => 'home' %></li>
		<li><%= link_to 'Users', users_path %></li>
23		~~<li id="search" style="display:none;">~~
24		~~<%= start_form_tag all_posts_path, :method => 'get' %>~~
	23	<li id="search">
	24	<% form_tag all_search_posts_path, :method => 'get' do -%>
		<%= text_field_tag :q, params[:q], :size => 15, :id => :search_box %>
26		~~</form>~~
	26	<% end -%>
		</li>
28		~~<li><%= link_to_function :Search, "$('search').toggle(); $('search').focus();" %></li>~~
	28	<li><%= link_to_function :Search, "$('search').toggle(); $('search_box').focus();", :href => home_path %></li>

		<% if logged_in? %>
		<li class="login"><%= link_to current_user.login, user_path(current_user) %></li>
...	...
		<%= content_tag 'p', h(flash[:notice]), :class => 'notice' if flash[:notice] %>
		<%= content_tag 'p', h(flash[:error]), :class => 'notice error' if flash[:error] %>

52		~~<%= yield %>~~
	52	<%= @content_for_layout %>
		</div>

		<div id="right">
56		~~<%= yield :right %>~~
	56	<%= @content_for_right %>
		</div>

		<br style="clear:both;" />

rool/rails/beast/trunk/app/views/monitorships/create.rjs:

prev.	current

1		~~page["monitorship-topics-#{params[:topic_id]}"].hide~~
2		~~page["delete-monitorship-topics-#{params[:topic_id]}"].show~~

	2	#page["monitorship-icon-topics-#{params[:topic_id]}"].remove_class_name(:grey)
	3	#page["monitorship-icon-topics-#{params[:topic_id]}"].add_class_name(:green)
	4
	5	page[:monitor_label].innerHTML="Watching topic"

rool/rails/beast/trunk/app/views/monitorships/destroy.rjs:

prev.	current

1		~~page["monitorship-topics-#{params[:topic_id]}"].show~~
2		~~page["delete-monitorship-topics-#{params[:topic_id]}"].hide~~

	2	#page["monitorship-icon-topics-#{params[:topic_id]}"].remove_class_name(:green)
	3	#page["monitorship-icon-topics-#{params[:topic_id]}"].add_class_name(:darkgrey)
	4
	5	page[:monitor_label].innerHTML="Watch topic"

rool/rails/beast/trunk/app/views/posts/_edit.rhtml:

prev.	current

		<div id="edit" class="editbox">
	2	<div class="container">
		<% remote_form_for :post, :url => post_path(:forum_id => @post.forum_id, :topic_id => @post.topic_id, :id => @post),
		:html => { :method => :put }, :before => "$('editbox_spinner').show();" do \|f\| -%>
4		~~<table width="85%" border="0">~~
	5
	6	<table width="100%" border="0" cellpadding="0" cellspacing="0">
		<tr>
6		~~<td rowspan="2">~~
	8	<td rowspan="2" width="70%">
		<%= f.text_area :body, :rows => 10, :id => "edit_post_body" %>
		</td>
		<td valign="top">

	13	<%= link_to('delete post', post_path(:forum_id => @post.topic.forum, :topic_id => @post.topic, :id => @post, :page => params[:page]),
	14	:class => "utility", :method => :delete, :confirm => "Delete this post? Are you sure?") %>
	15
	16
		<h5>Formatting Help</h5>
12
	18
		<ul class="help">
		<li>bold</li>
		<li>_italics_</li>
		<li>bq. <span>(quotes)</span></li>
17		~~<li>"IBM":http://www.ibm.com <span>(links)</span></li>~~
	23	<li>"IBM":http://www.ibm.com</li>
		<li>* or # <span>(lists)</span></li>
		</ul>

...	...
		</tr>
		</table>
		<% end -%>
	37	</div>
		</div>

rool/rails/beast/trunk/app/views/posts/edit.rhtml:

prev.	current

		<h1>Edit Post</h1>

3		~~<%= link_to('Delete post', post_path(:forum_id => @post.topic.forum, :topic_id => @post.topic, :id => @post, :page => params[:page]),~~
	3	<h2><%= link_to h(@post.topic.title), topic_path(@post.forum_id, @post.topic) %></h2>
	4
	5	<%= link_to('Delete post', post_path(:forum_id => @post.forum_id, :topic_id => @post.topic, :id => @post, :page => params[:page]),
		:class => "utility", :method => :delete, :confirm => "Delete this post forever?") %>

		<%= error_messages_for :topic %>

rool/rails/beast/trunk/app/views/posts/index.rhtml:

prev.	current

		</abbr>
		</div>

38		~~<%= avatar_for post.user %>~~
39		~~<span class="fn"><%= link_to truncate(h(post.user.display_name), 15), user_path(post.user), :class => (post.user == @posts.first.user ? "admin" : nil) %></span>~~
40		~~<span class="posts"><%= pluralize post.user.posts_count, 'post' %></span>~~
	38	<%= avatar_for @users[post.user_id] %>
	39	<span class="fn"><%= link_to truncate(h(@users[post.user_id].display_name), 15), user_path(post.user_id), :class => (@users[post.user_id] == @users[@posts.first.user_id] ? "admin" : nil) %></span>
	40	<span class="posts"><%= pluralize @users[post.user_id].posts_count, 'post' %></span>
		</td>
		<td class="body entry-content">
43		~~<p class="topic">Topic: <%= link_to h(post.topic_title), topic_path(post.forum_id, post.topic_id) %></p>~~
	43	<p class="topic">
	44	Topic: <%= link_to h(post.forum_name), forum_path(post.forum_id) %> /
	45	<%= link_to h(post.topic_title), topic_path(post.forum_id, post.topic_id) %>
	46	</p>

45		~~<%= format_text(post.body) %>~~
	48	<%= post.body_html %>
		</td>
		</tr>

rool/rails/beast/trunk/app/views/posts/index.rxml:

prev.	current

1		~~xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"~~
	1	xml.instruct! :xml, :version => "1.0", :encoding => "UTF-8"

3		~~xml.rss "version" => "2.0" do~~
	3	xml.rss "version" => "2.0",
	4	'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
	5	'xmlns:atom' => "http://www.w3.org/2005/Atom" do
		xml.channel do
		xml.title "#{search_posts_title} \| Beast"
		xml.link "http://#{request.host_with_port}#{search_posts_path}"
		xml.language "en-us"
		xml.ttl "60"
9
	11	xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => "http://#{request.host_with_port}/open_search.xml"
	12	unless params[:q].blank?
	13	xml.tag! "opensearch:totalResults", @post_pages.item_count
	14	xml.tag! "opensearch:startIndex", (((params[:page] \|\| 1).to_i - 1) * @post_pages.items_per_page)
	15	xml.tag! "opensearch:itemsPerPage", @post_pages.items_per_page
	16	xml.tag! "opensearch:Query", :role => 'request', :searchTerms => params[:q], :startPage => (params[:page] \|\| 1)
	17	end
		render :partial => "layouts/post", :collection => @posts, :locals => {:xm => xml}
		end
		end

rool/rails/beast/trunk/app/views/posts/monitored.rhtml:

prev.	current

		<td class="body entry-content">
		<p class="topic">Topic: <%= link_to h(post.topic_title), topic_path(post.forum_id, post.topic_id) %></p>

50		~~<%= format_text(post.body) %>~~
	50	<%= post.body_html %>
		</td>
		</tr>

rool/rails/beast/trunk/app/views/posts/monitored.rxml:

prev.	current

		xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"

3		~~xml.rss "version" => "2.0" do~~
	3	xml.rss "version" => "2.0",
	4	'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
	5	'xmlns:atom' => "http://www.w3.org/2005/Atom" do
		xml.channel do
		xml.title "Posts that #{@user.display_name} is monitoring \| Beast"
		xml.link monitored_posts_url(@user)
		xml.language "en-us"
		xml.ttl "60"
	11	xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => "http://#{request.host_with_port}/open_search.xml"

		render :partial => "layouts/post", :collection => @posts, :locals => {:xm => xml}
		end

rool/rails/beast/trunk/app/views/posts/update.rjs:

prev.	current

		page.edit_form.cancel
2		~~page.replace_html "post-body-#{@post.id}", format_text(@post.body)~~
	2	page.replace_html "post-body-#{@post.id}", @post.body_html
		page.visual_effect :highlight, "post-body-#{@post.id}", :duration => 1.5

rool/rails/beast/trunk/app/views/sessions/new.rhtml:

prev.	current

		<h1>Login</h1>

3		~~<%= start_form_tag sessions_path %>~~
	3	<% form_tag sessions_path do -%>
		<p>
		<label for="login">Login</label><br />
		<%= text_field_tag :login, params[:login] %>
...	...
		<p><label><%= check_box_tag "remember_me", "1", true %> Remember me on this computer</label></p>

		<p><%= submit_tag 'Login', :or => link_to_function('reset password', "$('reset-password').toggle();") %></p>
17		~~</form>~~
	17	<% end -%>

19		~~<%= start_form_tag users_path, :id => 'reset-password', :style => 'display:none' %>~~
	19	<% form_tag users_path, :id => 'reset-password', :style => 'display:none' do -%>

		<hr />

...	...
		<p><%= text_field_tag :email, "", :size => 30 %>
		<br />
		<%= submit_tag "E-mail me the link", :or => link_to_function('cancel', "$('reset-password').hide()") %></p>
29		~~</form>~~
	29	<% end -%>

		<%= javascript_tag "$('login').focus();"%>

rool/rails/beast/trunk/app/views/topics/_form.rhtml:

prev.	current

		<p>
		<label for="topic_title">Title</label><br />
3		~~<%= f.text_field :title, :onchange => "TopicForm.editNewTitle(this);" %>~~
	3	<%= form.text_field :title, :onchange => "TopicForm.editNewTitle(this);" %>

		<% if admin? or current_user.moderator_of?(@topic.forum) %>
		<label style="margin-left:1em;">
7		~~<%= f.check_box :sticky %> Sticky~~
	7	<%= form.check_box :sticky %> Sticky
		</label>

		<label style="margin-left:1em;">
11		~~<%= f.check_box :locked %> Locked~~
	11	<%= form.check_box :locked %> Locked
		</label>

		<% end %>
...	...
		<% if @topic.new_record? %>
		<p>
		<label for="topic_body">Body</label><br />
20		~~<%= f.text_area :body, :rows => 12 %></p>~~
	20	<%= form.text_area :body, :rows => 12 %></p>
		<% end %>

		<% if admin? and not @topic.new_record? %>
		<p id="topic_forum_id">
		<label for="topic_forum_id">Forum</label><br />
26		~~<%= f.select :forum_id, Forum.find(:all).map {\|x\| [x.name, x.id] } %></p>~~
	26	<%= form.select :forum_id, Forum.find(:all, :order => "position").map {\|x\| [x.name, x.id] } %></p>
		</p>
		<% end %>

rool/rails/beast/trunk/app/views/topics/edit.rhtml:

prev.	current

		<% form_for :topic,
		:url => topic_path(@forum, @topic),
		:html => { :method => :put } do \|f\| -%>
7		~~<%= render :partial => "form", :locals => { :f => f } %>~~
	7	<%= render :partial => "form", :object => f %>
		<br />
		<%= submit_tag 'Save Changes', :or => link_to('Cancel', topic_path(@forum, @topic)) %>
		<% end -%>

rool/rails/beast/trunk/app/views/topics/new.rhtml:

prev.	current

	1	<div class="crumbs" xstyle="margin-top:1.1em;">
	2	<%= link_to "Forums", home_path %> <span class="arrow">→</span>
	3	<%= link_to h(@forum.name), forum_path(@forum) %> <span class="arrow">→</span>
	4	</div>
	5
		<h1 id="new_topic">New Topic</h1>
		<p class="subtitle">by <%= current_user.display_name %></p>

...	...
		<%= error_messages_for :topic %>
		<% form_for :topic,
		:url => topics_path(@forum) do \|f\| -%>
7		~~<%= render :partial => "form", :locals => { :f => f } %>~~
	12	<%= render :partial => "form", :object => f %>
		<%= submit_tag 'Post Topic', :or => link_to('Cancel', forum_path(@forum)) %>
		<% end -%>

rool/rails/beast/trunk/app/views/topics/show.rhtml:

prev.	current

		<% @page_title = @topic.title %>
		<% @monitoring = logged_in? && !Monitorship.count(:all, :conditions => ['user_id = ? and topic_id = ? and active = ?', current_user.id, @topic.id, true]).zero? %>

4		~~<% content_for :right do %>~~
	4	<% content_for :right do -%>

6		~~<h4>Voices</h4>~~
	6	<h5>Voices</h5>
		<ul class="flat talking">
		<% @voices.each do \| user \| %>
		<li><%= link_to h(user.display_name), user_path(user) %></li>
		<% end %>
		</ul>

13		~~<% end %>~~

	14	<% end # right content -%>
	15
	16	<% if logged_in? %>
	17
	18	<% form_tag monitorships_path(@forum, @topic), :style => 'margin-top:0em; float:right;' do -%>
	19	<div>
	20	<input id="monitor_checkbox" type="checkbox" <%= "checked='checked'" if @monitoring %>
	21	onclick="if (this.checked) {<%= remote_function :url => monitorships_path(@forum, @topic) %>} else {<%= remote_function :url => monitorships_path(@forum, @topic), :method => :delete %>}" />
	22	<label id="monitor_label" for="monitor_checkbox">Watch<%= "ing" if @monitoring %> topic</label>
	23	<%= hidden_field_tag '_method', 'delete' if @monitoring %>
	24	<%= submit_tag :Set, :id => 'monitor_submit' %>
	25	</div>
	26	<% end -%>
	27
	28	<% end -%>
	29
	30
		<div class="crumbs">
16		~~<%= link_to "Index", home_path %> <span class="arrow">→</span>~~
	32	<%= link_to "Forums", home_path %> <span class="arrow">→</span>
		<%= link_to h(@topic.forum.name), forum_path(@topic.forum) %> <span class="arrow">→</span>
		</div>

...	...
		<% end %>
		<% if logged_in? %>
		<span style="display:none;" id="topic_mod">
29		~~<strong>~~
30		~~<%= link_to_remote('watch', {:url => monitorships_path(@forum, @topic)},~~
31		~~{ :id => "monitorship-#{@topic.dom_id}", :style => (@monitoring && 'display:none') }) %>~~
32		~~<%= link_to_remote('unwatch', {:url => monitorships_path(@forum, @topic), :method => :delete},~~
33		~~{ :id => "delete-monitorship-#{@topic.dom_id}", :style => (!@monitoring && 'display:none') }) %>~~
34		~~</strong> \|~~
		<% if @topic.editable_by?(current_user) -%>
		<%= link_to('edit', edit_topic_path(@forum, @topic), :class => "utility") %> \|
		<%= link_to('delete', topic_path(@forum, @topic), :class => "utility", :method => :delete, :confirm => "Delete this topic forever?") %>
...	...
		<%= link_to_remote('Edit post',
		{:url => edit_post_path(:forum_id => @forum, :topic_id => @topic, :id => post), :method => :get,
		:before => "EditForm.init(#{post.id});", :condition => "!EditForm.isEditing(#{post.id})" },
84		~~{:action => edit_post_path(:forum_id => @forum, :topic_id => @topic, :id => post, :page => params[:page]), :class => "utility"}) %>~~
	94	{:href => edit_post_path(:forum_id => @forum, :topic_id => @topic, :id => post, :page => params[:page]), :class => "utility"}) %>
		</span>
		</p>
		<% end -%>
...	...
		<!--
		<%= link_to_function image_tag('clearbits/comment.gif', :class => 'icon reply'), "$('reply').toggle()" if logged_in? %>
		-->
95		~~<%= format_text(post.body) %>~~
	105	<%= post.body_html %>
		</td>
		</tr>

...	...
		<p><%= link_to_function "Reply to topic", "ReplyForm.init()", :class => "utility" %></p>

		<div id="reply" class="editbox">
	133	<div class="container">
		<%= content_tag 'p', h(flash[:bad_reply]), :class => 'notice' if flash[:bad_reply] %>
		<% form_for :post, :url => posts_path(:forum_id => @forum, :topic_id => @topic, :page => @topic.last_page) do \|f\| -%>
125		~~<table width="85%" border="0">~~
	136	<table width="100%" border="0" cellpadding="0" cellspacing="0">
		<tr>
127		~~<td rowspan="2">~~
128		~~<%= f.text_area :body, :rows => 7 %>~~
	138	<td rowspan="2" width="70%">
	139	<%= f.text_area :body, :rows => 8 %>
		</td>
		<td valign="top">

...	...
		<li>bold

		_italics_
139		~~     ~~
	150	<br />
		bq. <span>(quotes)</span></li>
141		~~<li>"IBM":http://www.ibm.com <span>(links)</span></li>~~
	152	<li>"IBM":http://www.ibm.com</li>
		<li>* or # <span>(lists)</span></li>
143		~~</p>~~
	154	</ul>

		</td>
		</tr>
...	...
		</table>
		<% end -%>
		</div>
	166	</div>
		<%= javascript_tag "$('reply').hide();"%>
		<% end %>
		<% end %>

		<div class="crumbs" style="margin-top:1.1em;">
160		~~<%= link_to "Index", home_path %> <span class="arrow">→</span>~~
	172	<%= link_to "Forums", home_path %> <span class="arrow">→</span>
		<%= link_to h(@topic.forum.name), forum_path(@topic.forum) %> <span class="arrow">→</span>
		</div>

rool/rails/beast/trunk/app/views/topics/show.rxml:

prev.	current

		xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"

3		~~xml.rss "version" => "2.0" do~~
	3	xml.rss "version" => "2.0",
	4	'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
	5	'xmlns:atom' => "http://www.w3.org/2005/Atom" do
		xml.channel do
		xml.title "Recent Posts in '#{@topic.title}' \| Beast"
		xml.link topic_url(@forum, @topic)
		xml.language "en-us"
		xml.ttl "60"
	11	xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => "http://#{request.host_with_port}/open_search.xml"
		xml.description @topic.body

		render :partial => "layouts/post", :collection => @posts, :locals => {:xm => xml}

rool/rails/beast/trunk/app/views/users/_contact_info.rhtml:

prev.	current

1		~~<h2>Contact Info</h2>~~
	1	<h3>User Profile</h3>

3		~~<p>Only fields you enter will be shown on your user profile.</p>~~
	3	<p>
	4	<label for="display_name">Display Name</label><br />
	5	<%= settings.text_field :display_name %>
	6	</p>

		<p>
		<label for="user_website">Website</label><br />
7		~~<%= settings.text_field :website %>~~
	10	<%= settings.text_field :website %>
	11	<span class="entryhelp">
	12	(without http://)
	13	</span>
		</p>

		<p>
		<label for="user_bio">Bio</label><br />
12		~~<%= settings.text_area :bio %>~~
	18	<%= settings.text_area :bio, :rows => 10, :style => "width:99%" %>
		</p>

rool/rails/beast/trunk/app/views/users/_form.rhtml:

prev.	current

	1	<p class="help">Logins should start with least 2 characters and may consist of letters, numbers, or the underscore.</p>
	2
		<p>
2		~~<label for="user_login">Login</label>~~
3
4		~~<p class="help">Logins should start with least 2 characters and may consist of letters, numbers, or the underscore.</p>~~
5
	4	<label for="user_login">Login</label><br />
		<%= form.text_field :login %>
		</p>

		<p>
10		~~<label for="display_name">Display Name</label><br />~~
11		~~<%= form.text_field :display_name %>~~
12		~~</p>~~
13
14		~~<p>~~
		<label for="user_email">Email</label><br />
		<%= form.text_field :email %>
		</p>

		<p>
20		~~<label for="user_password">Password</label><br />~~
21		~~<%= form.password_field :password %>~~
	14	<label for="display_name">Display Name (optional)</label><br />
	15	<%= form.text_field :display_name %>
		</p>

24		~~<p>~~
25		~~<label for="user_password_confirmation">Password Confirmation</label><br />~~
	18	<div>
	19	<label for="user_password">Password</label><br />
	20	<p class="help">Enter your desired password twice. It must be at least 5 characters.</span></p>
	21
	22	<%= form.password_field :password %>
	23	<span class="entryhelp">(once)</span><br />
		<%= form.password_field :password_confirmation %>
27		~~</p>~~

	26	<span class="entryhelp">(and then again)</span>
	27	</div>

rool/rails/beast/trunk/app/views/users/_settings.rhtml:

prev.	current


2		~~<h2>Basics</h2>~~
	2	<h3>Basics</h3>


		<% if not @user.valid? and @user.errors.on(:login) %>
...	...
		<% end %>

		<p>
17		~~<label for="display_name">Display Name (optional)</label><br />~~
18		~~<%= settings.text_field :display_name %>~~
19		~~</p>~~
20
21		~~<p>~~
		<label for="user_email">Email</label><br />
		<%= settings.text_field :email %>
		</p>

26		~~<p>~~
27		~~<label for="user_password">Password</label><br />~~
28		~~<%= settings.password_field :password %>~~
29		~~</p>~~
	21	<div>
	22	<label for="user_password">Password</label><br />
	23	<p class="entryhelp" style="margin-top:0.5em;">Enter a new password twice to change your password. (must be longer than 5 characters)</p>
	24	<%= settings.password_field :password, :size => 16 %>
	25	<span class="entryhelp">(once)</span><br />
	26
	27	<%= settings.password_field :password_confirmation, :size => 16 %>
	28	<span class="entryhelp">(and again)</span>
	29	</div>

31		~~<p>~~
32		~~<label for="user_password_confirmation">Password Confirmation</label><br />~~
33		~~<%= settings.password_field :password_confirmation %>~~
34		~~</p>~~




	35

rool/rails/beast/trunk/app/views/users/edit.rhtml:

prev.	current


		<h5>Avatars</h5>

5		~~<p>To have your very own avatar displayed on this forum visit <a href="http://www.gravatar.com/">gravatar.com</a> and sign up for free gravatar.</p>~~
	5	<p>To have your very own avatar displayed on this forum visit <a href="http://www.gravatar.com/">gravatar.com</a> and sign up for a free gravatar.</p>

		<% end %>

		<h1>Settings</h1>
10		~~<p class="subtitle">for <%= @user.display_name %></p>~~

	11	<p class="subtitle">for <%= @user.display_name %>
	12	<% if @user.login!=@user.display_name %>
	13	(<%= @user.login %>)
	14	<% end %>
	15	</p>
	16
	17	<%= error_messages_for :user %>
	18
		<% form_for :user, :url => user_path(@user),
		:html => { :method => :put } do \|f\| -%>
		<%= render :partial => "settings", :object => f %>
15		~~<p><%= submit_tag 'Save settings' %></p>~~
	22	<p><%= submit_tag 'Change e-mail or password', :or => link_to( "cancel", "/") %></p>
	23	<% end -%>
	24
	25	<br />
	26
	27	<% form_for :user, :url => user_path(@user),
	28	:html => { :method => :put } do \|f\| -%>
		<%= render :partial => "contact_info", :locals => { :settings => f } %>
17		~~<p><%= submit_tag 'Save settings' %></p>~~
	30	<p><%= submit_tag 'Update Profile', :or => link_to( "cancel", "/") %></p>
		<% end -%>

rool/rails/beast/trunk/app/views/users/index.rhtml:

prev.	current

		<% content_for :right do %>
		<h5>Find a User</h5>

4		~~<%= start_form_tag nil, :method => 'get' %>~~
	4	<% form_tag nil, :method => 'get' do -%>
		<p>
		<label>Display name or login</label>
		<%= text_field_tag :q, params[:q] %>
		<%= submit_tag "Search" %></p>
9		~~</form>~~
	9	<% end -%>

11		~~<% end %>~~
	11	<% end -%>

		<h1 style="margin-top:0;">Users</h1>
		<p class="subtitle">
15		<%
16		~~@user_count=User.count~~
17		~~@active=User.count(:conditions => "posts_count>0")~~
18		%>
		<%= number_with_delimiter(@user_count) %> users, <%= @active %> active, <%= @user_count-@active %> lurking
		</p>

rool/rails/beast/trunk/app/views/users/show.rhtml:

prev.	current

		<% @page_title = @user.display_name -%>

	3	<% content_for :right do %>
	4	<% if admin? %>
	5	<% form_for :user, :url => admin_user_path(@user), :html => {:class => "xdialog"} do \|f\| -%>
	6	<h6>Admin & Moderation</h6>
	7
	8	<% if @user.forums.any? -%>
	9
	10	<p>This user can moderate the following forums. Click one to remove.</p>
	11
	12	<ul class="flat">
	13	<% @user.forums.find(:all, :select => 'forums.*, moderatorships.id as moderatorship_id').each do \|forum\| -%>
	14	<li>
	15	<%#= link_to forum.name, forum_path(forum), :class => "hidden" %>
	16	<%#= link_to 'remove', moderator_path(@user, forum.moderatorship_id), :method => :delete %>
	17	<%= link_to forum.name, moderator_path(@user, forum.moderatorship_id), :method => :delete, :confirm => "Remove user as moderator for #{forum.name}?" %>
	18	</li>
	19	<% end -%>
	20	</ul>
	21	<% end -%>
	22
	23	<p>
	24	<label>Add as moderator</label><br />
	25	<select name="moderator">
	26	<option value="-"></option>
	27	<%= options_from_collection_for_select(Forum.find(:all, :order => 'position') - @user.forums, "id", "name") %>
	28	</select></p>
	29
	30	<p><label><%= f.check_box :admin %> User is an administrator</label></p>
	31
	32	<p><%= submit_tag :Save %></p>
	33	<% end -%>
	34	<% end -%>
	35	<% end %>
	36
		<p style="float:right;"><%= avatar_for @user, 80 %></p>

		<h1><%=h @user.display_name %> </h1>
...	...
		<p class="subtitle">
		<%= feed_icon_tag @user.display_name, formatted_user_posts_path(:user_id => @user, :format => :rss) %>
		<span>
	44	<%= pluralize @user.topics.count, 'topic' %>,
		<%= pluralize @user.posts_count, 'post' %>
		(view <%= link_to "all", user_posts_path(@user) %> \|
		<%= link_to 'monitored', monitored_posts_path(@user) %> posts)<br />
		</span>
		</p>

16		~~<%= format_text @user.bio %>~~
	51	<%= @user.bio_html %>

		<% unless @user.website.blank? -%>
		<p><strong>Website:</strong> <%= white_list link_to(@user.website.gsub("http://",""), "http://" + @user.website.gsub("http://","")) %>
		<% end -%>
		<p>User since <%= @user.created_at.to_date.to_s :long %></p>

23		~~<% form_for :user, :url => admin_user_path(@user), :html => {:class => "dialog"} do \|f\| -%>~~
24		~~<p>Moderated Forums</p>~~
25
26		~~<% if @user.forums.any? -%>~~
27		~~<ul>~~
28		~~<% @user.forums.find(:all, :select => 'forums.*, moderatorships.id as moderatorship_id').each do \|forum\| -%>~~
29		~~<li>~~
30		~~<%= link_to forum.name, forum_path(forum) %>~~
31		~~(<%= link_to 'x', moderator_path(@user, forum.moderatorship_id), :method => :delete %>)~~
32		~~</li>~~
33		~~<% end -%>~~
34		~~</ul>~~
35		~~<% end -%>~~
36
37		~~<p><select name="moderator">~~
38		~~<option value="-">Add as moderator to...</option>~~
39		~~<%= options_from_collection_for_select(Forum.find(:all) - @user.forums, "id", "name") %>~~
40		~~</select></p>~~
41
42		~~<p><label><%= f.check_box :admin %> is admin?</label></p>~~
43		~~<p><%= submit_tag :Save %></p>~~
44		~~<% end if admin? -%>~~

rool/rails/beast/trunk/config/environment.rb:

prev.	current

		# Bootstrap the Rails environment, frameworks, and default configuration
		require File.join(File.dirname(__FILE__), 'boot')

	13	PATH_PREFIX = ENV['RAILS_RELATIVE_URL_ROOT']
	14
		Rails::Initializer.run do \|config\|
	16	# We don't run in the document root, so images etc. must come from
	17	# a non-root location too. Hijack the 'asset host' facility to get
	18	# helper-based links pointing in the right place.
	19	config.action_controller.asset_host = PATH_PREFIX
	20
		# Settings in config/environments/* take precedence those specified here

		# Skip frameworks you're not going to use (only works if using vendor/rails)
...	...

		# Force all environments to use the same logger level
		# (by default production uses :info, the others :debug)
24		~~# config.log_level = :debug~~
	31	config.log_level = :warn

		# Use the database for sessions instead of the file system
		# (create the session table with 'rake db:sessions:create')
...	...
		# end

		# Include your application configuration below
54		~~PASSWORD_SALT = '48e45be7d489cbb0ab582d26e2168621' unless Object.const_defined?(:PASSWORD_SALT)~~
55		~~ActiveRecord::Base.class_eval do~~
56		~~def dom_id~~
57		~~[self.class.name.downcase.pluralize.dasherize, id] * '-'~~
	61
	62	ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:session_key] = 'beastapp_session_id'
	63
	64	PASSWORD_SALT = '59f34ac7f486c440ab342d26eff45531' unless Object.const_defined?(:PASSWORD_SALT)
	65
	66	Module.class_eval do
	67	def expiring_attr_reader(method_name, value)
	68	class_eval(<<-EOS, __FILE__, __LINE__)
	69	def #{method_name}
	70	class << self; attr_reader :#{method_name}; end
	71	@#{method_name} = eval(%(#{value}))
	72	end
	73	EOS
		end
59		~~end~~

	76	end
	77
	78	WhiteListHelper.tags.merge(%w(object param embed))
	79

rool/rails/beast/trunk/config/routes.rb:

prev.	current

	1	PATH_PREFIX \|\|= ''
	2
		ActionController::Routing::Routes.draw do \|map\|
2		~~map.home '', :controller => 'forums', :action => 'index'~~
	4	map.home PATH_PREFIX + '/', :controller => 'forums', :action => 'index'

4		~~map.resources :sessions~~
	6	map.resources :sessions, :path_prefix => PATH_PREFIX

6		~~map.resources :users, :member => { :admin => :post } do \|user\|~~
	8	map.resources :users, :path_prefix => PATH_PREFIX, :member => { :admin => :post } do \|user\|
		user.resources :moderators
		end

10		~~map.resources :forums do \|forum\|~~
	12	map.resources :forums, :path_prefix => PATH_PREFIX do \|forum\|
		forum.resources :topics do \|topic\|
		topic.resources :posts, :monitorships
		end
		end

16		~~map.resources :posts, :name_prefix => 'all_'~~
	18	map.resources :posts, :name_prefix => 'all_', :path_prefix => PATH_PREFIX, :collection => { :search => :get }

		%w(user forum).each do \|attr\|
19		~~map.resources :posts, :name_prefix => "#{attr}_", :path_prefix => "/#{attr.pluralize}/:#{attr}_id"~~
	21	map.resources :posts, :name_prefix => "#{attr}_", :path_prefix => PATH_PREFIX + "/#{attr.pluralize}/:#{attr}_id"
		end

22		~~map.signup '/signup', :controller => 'users', :action => 'new'~~
23		~~map.settings '/settings', :controller => 'users', :action => 'edit'~~
24		~~map.activate '/activate/:key', :controller => 'users', :action => 'activate'~~
25		~~map.login '/login', :controller => 'sessions', :action => 'new'~~
26		~~map.logout '/logout', :controller => 'sessions', :action => 'destroy'~~
	24	map.signup PATH_PREFIX + '/signup', :controller => 'users', :action => 'new'
	25	map.settings PATH_PREFIX + '/settings', :controller => 'users', :action => 'edit'
	26	map.activate PATH_PREFIX + '/activate/:key', :controller => 'users', :action => 'activate'
	27	map.login PATH_PREFIX + '/login', :controller => 'sessions', :action => 'new'
	28	map.logout PATH_PREFIX + '/logout', :controller => 'sessions', :action => 'destroy'
		map.with_options :controller => 'posts', :action => 'monitored' do \|map\|
28		~~map.formatted_monitored_posts '/users/:user_id/monitored.:format'~~
29		~~map.monitored_posts '/users/:user_id/monitored'~~
	30	map.formatted_monitored_posts PATH_PREFIX + '/users/:user_id/monitored.:format'
	31	map.monitored_posts PATH_PREFIX + '/users/:user_id/monitored'
		end

32		~~map.exceptions '/logged_exceptions/:action/:id', :controller => 'logged_exceptions', :action => 'index', :id => nil~~
	34	map.exceptions PATH_PREFIX + '/logged_exceptions/:action/:id', :controller => 'logged_exceptions', :action => 'index', :id => nil
		end

rool/rails/beast/trunk/db/migrate/033_add_password_hash.rb:

prev.	current

		# you need to edit your environment.rb and pick a non-default password salt
		# before you continue
		raise "ChangePasswordHash" if PASSWORD_SALT == '48e45be7d489cbb0ab582d26e2168621'
8		~~say_with_time "Hashing all your passwords in 30 seconds... this is a big deal (because it's not reversible), cancel if you aren't ready."~~
9		~~sleep 30~~
	8	say_with_time "Hashing all your passwords in 30 seconds... this is a big deal (because it's not reversible), cancel if you aren't ready." do
	9	sleep 30
	10	end
		rename_column :users, :password, :password_hash
		say_with_time "Hashing passwords..." do
		User.find(:all, :select => 'id, password_hash').each do \|u\|

rool/rails/beast/trunk/db/schema.rb:

prev.	current

		# migrations feature of ActiveRecord to incrementally modify your database, and
		# then regenerate this schema definition.

5		~~ActiveRecord::Schema.define(:version => 39) do~~
	5	ActiveRecord::Schema.define(:version => 47) do

		create_table "forums", :force => true do \|t\|
8		~~t.column "name", :string~~
9		~~t.column "description", :string~~
10		~~t.column "topics_count", :integer, :default => 0~~
11		~~t.column "posts_count", :integer, :default => 0~~
12		~~t.column "position", :integer~~
	8	t.column "name", :string
	9	t.column "description", :string
	10	t.column "topics_count", :integer, :default => 0
	11	t.column "posts_count", :integer, :default => 0
	12	t.column "position", :integer
	13	t.column "description_html", :text
		end

		create_table "logged_exceptions", :force => true do \|t\|
...	...
		t.column "user_id", :integer
		end

	32	add_index "moderatorships", ["forum_id"], :name => "index_moderatorships_on_forum_id"
	33
		create_table "monitorships", :force => true do \|t\|
		t.column "topic_id", :integer
		t.column "user_id", :integer
...	...
		t.column "created_at", :datetime
		t.column "updated_at", :datetime
		t.column "forum_id", :integer
	47	t.column "body_html", :text
		end

46		~~add_index "posts", ["user_id"], :name => "index_posts_on_user_id"~~
47		~~add_index "posts", ["topic_id"], :name => "index_posts_on_topic_id"~~
	50	add_index "posts", ["forum_id", "created_at"], :name => "index_posts_on_forum_id"
	51	add_index "posts", ["user_id", "created_at"], :name => "index_posts_on_user_id"

		create_table "sessions", :force => true do \|t\|
		t.column "session_id", :string
...	...
		end

		add_index "topics", ["forum_id"], :name => "index_topics_on_forum_id"
	78	add_index "topics", ["forum_id", "sticky", "replied_at"], :name => "index_topics_on_sticky_and_replied_at"

		create_table "users", :force => true do \|t\|
		t.column "login", :string
...	...
		t.column "login_key_expires_at", :datetime
		t.column "activated", :boolean, :default => false
		t.column "bio", :string
	96	t.column "bio_html", :text
		end

	99	add_index "users", ["last_seen_at"], :name => "index_users_on_last_seen_at"
	100
		end

rool/rails/beast/trunk/lib/authentication_system.rb:

prev.	current

		# this could be a filter for the entire app and keep with it's true meaning, but that
		# would just slow things down without any forseeable benefit since we already know
		# who is online from the user/session connection
	13	#
	14	# This is now also used to show which users are online... not at accurate as the
	15	# session based approach, but less code and less overhead.
		def update_last_seen_at
14		~~User.update_all ['last_seen_at = ?', Time.now.utc], ['id = ?', current_user.id] if logged_in?~~
	17	return unless logged_in?
	18	User.update_all ['last_seen_at = ?', Time.now.utc], ['id = ?', current_user.id]
	19	current_user.last_seen_at = Time.now.utc
		end

		def login_required
18		~~login_by_token unless logged_in?~~
19		~~redirect_to login_path unless logged_in? && authorized?~~
	23	login_by_token unless logged_in?
	24	login_by_basic_auth unless logged_in?
	25	respond_to do \|format\|
	26	format.html { redirect_to login_path }
	27	format.js { render(:update) { \|p\| p.redirect_to login_path } }
	28	format.xml do
	29	headers["WWW-Authenticate"] = %(Basic realm="Beast")
	30	render :text => "HTTP Basic: Access denied.\n", :status => :unauthorized
	31	end
	32	end unless logged_in? && authorized?
		end

		def login_by_token
		self.current_user = User.find_by_id_and_login_key(*cookies[:login_token].split(";")) if cookies[:login_token] and not logged_in?
		end

	39	@@http_auth_headers = %w(X-HTTP_AUTHORIZATION HTTP_AUTHORIZATION Authorization)
	40	def login_by_basic_auth
	41	auth_key = @@http_auth_headers.detect { \|h\| request.env.has_key?(h) }
	42	auth_data = request.env[auth_key].to_s.split unless auth_key.blank?
	43	self.current_user = User.authenticate *Base64.decode64(auth_data[1]).split(':')[0..1] if auth_data && auth_data[0] == 'Basic'
	44	end
	45
		def authorized?() true end

		def current_user=(value)
		if @current_user = value
		session[:user_id] = @current_user.id
31		~~# need to remove the unless RAILS_ENV when figure out how~~
32		~~# to make this work with tests~~
33		~~session.model.user_id = @current_user.id unless RAILS_ENV == "test"~~
		# this is used while we're logged in to know which threads are new, etc
		session[:last_active] = @current_user.last_seen_at
		session[:topics] = session[:forums] = {}
...	...
		@current_user \|\|= ((session[:user_id] && User.find_by_id(session[:user_id])) \|\| 0)
		end

45		~~def logged_in?() current_user != 0 end~~
	62	def logged_in?
	63	current_user != 0
	64	end

47		~~def admin?() logged_in? and current_user.admin? end~~
	66	def admin?
	67	logged_in? && current_user.admin?
	68	end
		end

rool/rails/beast/trunk/public/dispatch.cgi:

prev.	current

1		~~#!/opt/local/bin/ruby~~
	1	#!/bin/ruby

		require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)

rool/rails/beast/trunk/public/dispatch.fcgi:

prev.	current

1		~~#!/opt/local/bin/ruby~~
	1	#!/bin/env ruby
		#
		# You may specify the path to the FastCGI crash log (a log of unhandled
		# exceptions which forced the FastCGI instance to exit, great for debugging)

rool/rails/beast/trunk/public/dispatch.rb:

prev.	current

1		~~#!/opt/local/bin/ruby~~
	1	#!/bin/ruby

		require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)

rool/rails/beast/trunk/public/javascripts/application.js:

prev.	current

		// for Safari which is sometime weird
		// setTimeout('$(\"post_body\").focus();',50);
		}
66		}

	67	}
	68
	69	Event.addBehavior({
	70	'#search,#monitor_submit': function() { this.hide(); }
	71	})

rool/rails/beast/trunk/public/stylesheets/display.css:

prev.	current

		{
		font-size:0.75em;
		}
46		~~#right p a.hidden { color:black; text-decoration:none; border-bottom:1px solid #999; }~~
47		~~#right p a.hidden:hover { color:blue; text-decoration:none; border-bottom:1px solid blue; }~~
	46	#right a.hidden { color:black; text-decoration:none; border-bottom:1px solid #999; }
	47	#right a.hidden:hover { color:blue; text-decoration:none; border-bottom:1px solid #963; }

		#right p.help
		{
...	...

		h3
		{
184		~~color:#393;~~
185		~~font-size:0.8em;~~
186		~~background:#e0e7e0;~~
187		~~padding:3px 10px;~~
	184	padding:2px 10px 3px;
	185	background:#333;
	186	color:white;
	187	font-size:0.70em;
	188	border-bottom:1px solid #999;
	189	font-family: 'Lucida Grande', Tahoma, Arial, Helvetica, sans-serif;
		}

		h6 { margin-bottom:0; }
...	...

		#right hr { border-color:#bbb; }

	212	#monitor_topic {
	213	font-size: 12px;
	214	}
	215	#monitor_topic .icon {
	216	background-image:none;
	217	}

		/* footer */

...	...

		/* topics */

	569	#forum_description,
		#topic_body
		{
		width:99%;
...	...
		padding:15px;
		}

	657	form .entryhelp
	658	{
	659	font-size:0.7em;
	660	}
	661
		form .help
		{
		font-size:0.8em;
...	...

		table.posts
		{
686		~~xborder-collapse:collapse;~~
		border-bottom:2px solid #eee;
		}

...	...
		font-size:0.9em;
		min-height:32px;
		width:10em;
	733	min-width:8em;
		vertical-align:top;
		}

...	...

		.posts .post .body pre
		{
772		~~font-size:0.9em;~~
	786	font-size:0.8em;
		background:#eee;
		padding:5px 10px;
		border:1px solid #ccc;
		border-left:3px solid #ddd;
		border-right:0;
	792	overflow:auto;
	793	font-family: "Monaco", "Bitstream Vera Sans Mono", "Courier New", serif;
		}

		.posts .post .body a:hover { color:brown; }
...	...
		width:100%;
		padding:6px 0 7px;
		z-index:50;
843		~~padding-left:4em;~~
844		~~xopacity:0.9;~~
845		~~xfilter:alpha(opacity=90);~~
		}
	860
	861	div.editbox .container
	862	{
	863	width:92%;
	864	margin:0 auto;
	865	min-width:760px;
	866	}
	867
		div.editbox p { margin:0.5em 0;}
		div.editbox textarea
		{
...	...
		{
		color:#ccc;
		}
860		~~div.editbox table td { border:0;}~~
	881	div.editbox table td { border:0; }
	882	div.editbox a.utility
	883	{
	884	color: #f99;
	885	font-size: 0.65em;
	886	padding: 2px 5px 4px;
	887	display: block;
	888	font-family: 'Lucida Grande', Tahoma, Arial, Helvetica, sans-serif;
	889	float: right;
	890	text-align: right;
	891	margin-top: 0.2em;
	892	}

		div.editbox h5
		{
...	...
		div.editbox ul.help {
		list-style-type:none; }

	918	#monitor_topic a
	919	{
	920	color: #666;
	921	}

rool/rails/beast/trunk/test/functional/forums_controller_test.rb:

prev.	current

		end

		def test_remember_me_logs_in_when_login_required
23		~~users(:aaron).login_key="8305f94ab2b92f99137abbc235ee28e5"~~
24		~~users(:aaron).login_key_expires_at=Time.now.utc+1.week~~
	23	users(:aaron).login_key = "8305f94ab2b92f99137abbc235ee28e5"
	24	users(:aaron).login_key_expires_at = Time.now.utc+1.week
		users(:aaron).save!
		@request.cookies['login_token'] = CGI::Cookie.new('login_token', [users(:aaron).id.to_s, users(:aaron).login_key].join(';'))
		get :edit, :id => users(:aaron).id
...	...
		get :index
		assert_response :success
		assert assigns(:forums)
	36	assert_select 'html>head'
		end

	39	def test_should_get_index_with_xml
	40	content_type 'application/xml'
	41	get :index, :format => 'xml'
	42	assert_response :success
	43	assert_select 'forums>forum'
	44	end
	45
		def test_should_get_new
		login_as :aaron
		get :new
...	...

		assert_redirected_to forums_path
		end
	66
	67	def test_should_create_forum_with_xml
	68	content_type 'application/xml'
	69	authorize_as :aaron

	71	assert_difference Forum, :count do
	72	post :create, :forum => { :name => 'yeah' }, :format => 'xml'
	73	end
	74
	75	assert_response :created
	76	assert_equal formatted_forum_url(:id => assigns(:forum), :format => :xml), @response.headers["Location"]
	77	end
	78
		def test_should_show_forum
		get :show, :id => 1
		assert_response :success
		assert assigns(:topics)
		# sticky should be first
		assert_equal(topics(:sticky), assigns(:topics).first)
	85	assert_select 'html>head'
		end
	87
	88	def test_should_show_forum_with_xml
	89	content_type 'application/xml'
	90	get :show, :id => 1, :format => 'xml'
	91	assert_response :success
	92	assert_select 'forum'
	93	end

		def test_should_get_edit
		login_as :aaron
...	...
		put :update, :id => 1, :forum => { }
		assert_redirected_to forums_path
		end
78
	106
	107	def test_should_update_forum_with_xml
	108	authorize_as :aaron
	109	content_type 'application/xml'
	110	put :update, :id => 1, :forum => { }, :format => 'xml'
	111	assert_response :success
	112	end
	113
		def test_should_destroy_forum
		login_as :aaron
		old_count = Forum.count
...	...

		assert_redirected_to forums_path
		end
	122
	123	def test_should_destroy_forum_with_xml
	124	authorize_as :aaron
	125	content_type 'application/xml'
	126	old_count = Forum.count
	127	delete :destroy, :id => 1, :format => 'xml'
	128	assert_equal old_count-1, Forum.count
	129	assert_response :success
	130	end
		end

rool/rails/beast/trunk/test/functional/monitorships_controller_test.rb:

prev.	current

		end

		def test_should_require_login
16		~~post :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:aaron).id~~
17		~~assert_redirected_to login_path~~
	16	xhr :post, :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:aaron).id
	17	assert_response :success
		end

		def test_should_add_monitorship
		login_as :joe
		assert_difference Monitorship, :count do
23		~~post :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:joe).id~~
	23	xhr :post, :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:joe).id
	24	assert_response :success
		end

		assert topics(:pdi).monitors(true).include?(users(:joe))
...	...
		def test_should_activate_monitorship
		login_as :sam
		assert_difference Monitorship, :count, 0 do
32		~~post :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:sam).id~~
	33	xhr :post, :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:sam).id
	34	assert_response :success
		end
		end

		def test_should_not_duplicate_monitorship
		login_as :aaron
		assert_difference Monitorship, :count, 0 do
39		~~post :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:aaron).id~~
	41	xhr :post, :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:aaron).id
	42	assert_response :success
		end
		end

		def test_should_deactivate_monitorship
		login_as :aaron
		assert_difference Monitorship, :count, 0 do
	49	xhr :delete, :destroy, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:aaron).id
	50	assert_response :success
	51	end
	52
	53	assert !topics(:pdi).monitors(true).include?(users(:aaron))
	54	end
	55
	56	def test_should_require_login_with_html
	57	post :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:aaron).id
	58	assert_redirected_to login_path
	59	end
	60
	61	def test_should_add_monitorship_with_html
	62	login_as :joe
	63	assert_difference Monitorship, :count do
	64	post :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:joe).id
	65	assert_redirected_to topic_path(forums(:rails), topics(:pdi))
	66	end
	67
	68	assert topics(:pdi).monitors(true).include?(users(:joe))
	69	end
	70
	71	def test_should_deactivate_monitorship_with_html
	72	login_as :aaron
	73	assert_difference Monitorship, :count, 0 do
		delete :destroy, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:aaron).id
	75	assert_redirected_to topic_path(forums(:rails), topics(:pdi))
		end

		assert !topics(:pdi).monitors(true).include?(users(:aaron))

rool/rails/beast/trunk/test/functional/posts_controller_test.rb:

prev.	current

		assert_equal old_equal, equal.call
		end

	31	def test_should_create_reply_with_xml
	32	content_type 'application/xml'
	33	authorize_as :aaron
	34	post :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :post => { :body => 'blah' }, :format => 'xml'
	35	assert_response :created
	36	assert_equal formatted_post_url(:forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => assigns(:post), :format => :xml), @response.headers["Location"]
	37	end
	38
		def test_should_update_topic_replied_at_upon_replying
		old=topics(:pdi).replied_at
		login_as :aaron
...	...

		login_as :aaron
		delete :destroy, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => posts(:pdi_reply).id
	63	assert_redirected_to topic_path(:forum_id => forums(:rails), :id => topics(:pdi))
		[forums(:rails), users(:sam), topics(:pdi)].each &:reload

		assert_equal old_counts.collect { \|n\| n - 1}, counts.call
		assert_equal old_equal, equal.call
		end

	70	def test_should_delete_reply_with_xml
	71	content_type 'application/xml'
	72	authorize_as :aaron
	73	delete :destroy, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => posts(:pdi_reply).id, :format => 'xml'
	74	assert_response :success
	75	end
	76
		def test_should_delete_reply_as_moderator
		assert_difference Post, :count, -1 do
		login_as :sam
...	...
		assert_redirected_to topic_path(:forum_id => forums(:comics), :id => topics(:galactus), :anchor => posts(:silver_surfer).dom_id, :page => '1')
		end

	101	def test_can_edit_own_post_with_xml
	102	content_type 'application/xml'
	103	authorize_as :sam
	104	put :update, :forum_id => forums(:comics).id, :topic_id => topics(:galactus).id, :id => posts(:silver_surfer).id, :post => {}, :format => 'xml'
	105	assert_response :success
	106	end
	107
	108
		def test_can_edit_other_post_as_moderator
		login_as :sam
		put :update, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => posts(:pdi_rebuttal).id, :post => {}
...	...
		assert_redirected_to login_path
		end

	121	def test_cannot_edit_other_post_with_xml
	122	content_type 'application/xml'
	123	authorize_as :sam
	124	put :update, :forum_id => forums(:comics).id, :topic_id => topics(:galactus).id, :id => posts(:galactus).id, :post => {}, :format => 'xml'
	125	assert_response 401
	126	end
	127
		def test_cannot_edit_own_post_user_id
		login_as :sam
		put :update, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => posts(:pdi_reply).id, :post => { :user_id => 32 }
...	...
		assert_redirected_to topic_path(:forum_id => forums(:rails), :id => posts(:pdi), :anchor => posts(:pdi_rebuttal).dom_id, :page => '1')
		end

	141	def test_should_view_post_as_xml
	142	get :show, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => posts(:pdi_rebuttal).id, :format => 'xml'
	143	assert_response :success
	144	assert_select 'post'
	145	end
	146
		def test_should_view_recent_posts
		get :index
		assert_response :success
		assert_models_equal [posts(:il8n), posts(:shield_reply), posts(:shield), posts(:silver_surfer), posts(:galactus), posts(:ponies), posts(:pdi_rebuttal), posts(:pdi_reply), posts(:pdi), posts(:sticky)], assigns(:posts)
	151	assert_select 'html>head'
		end

		def test_should_view_posts_by_forum
		get :index, :forum_id => forums(:comics).id
		assert_response :success
		assert_models_equal [posts(:shield_reply), posts(:shield), posts(:silver_surfer), posts(:galactus)], assigns(:posts)
	158	assert_select 'html>head'
		end

		def test_should_view_posts_by_user
		get :index, :user_id => users(:sam).id
		assert_response :success
		assert_models_equal [posts(:shield), posts(:silver_surfer), posts(:ponies), posts(:pdi_reply), posts(:sticky)], assigns(:posts)
	165	assert_select 'html>head'
		end

	168	def test_should_view_recent_posts_with_xml
	169	content_type 'application/xml'
	170	get :index, :format => 'xml'
	171	assert_response :success
	172	assert_models_equal [posts(:il8n), posts(:shield_reply), posts(:shield), posts(:silver_surfer), posts(:galactus), posts(:ponies), posts(:pdi_rebuttal), posts(:pdi_reply), posts(:pdi), posts(:sticky)], assigns(:posts)
	173	assert_select 'posts>post'
	174	end
	175
	176	def test_should_view_posts_by_forum_with_xml
	177	content_type 'application/xml'
	178	get :index, :forum_id => forums(:comics).id, :format => 'xml'
	179	assert_response :success
	180	assert_models_equal [posts(:shield_reply), posts(:shield), posts(:silver_surfer), posts(:galactus)], assigns(:posts)
	181	assert_select 'posts>post'
	182	end
	183
	184	def test_should_view_posts_by_user_with_xml
	185	content_type 'application/xml'
	186	get :index, :user_id => users(:sam).id, :format => 'xml'
	187	assert_response :success
	188	assert_models_equal [posts(:shield), posts(:silver_surfer), posts(:ponies), posts(:pdi_reply), posts(:sticky)], assigns(:posts)
	189	assert_select 'posts>post'
	190	end
	191
		def test_should_view_monitored_posts
		get :monitored, :user_id => users(:aaron).id
		assert_models_equal [posts(:pdi_reply)], assigns(:posts)
		end

		def test_should_search_recent_posts
134		~~get :index, :q => 'pdi'~~
	198	get :search, :q => 'pdi'
		assert_response :success
		assert_models_equal [posts(:pdi_rebuttal), posts(:pdi_reply), posts(:pdi)], assigns(:posts)
		end

		def test_should_search_posts_by_forum
140		~~get :index, :forum_id => forums(:comics).id, :q => 'galactus'~~
	204	get :search, :forum_id => forums(:comics).id, :q => 'galactus'
		assert_response :success
		assert_models_equal [posts(:silver_surfer), posts(:galactus)], assigns(:posts)
		end
144
145		~~def test_should_search_posts_by_user~~
146		~~get :index, :user_id => users(:sam).id, :q => 'pdi'~~
147		~~assert_response :success~~
148		~~assert_models_equal [posts(:pdi_reply)], assigns(:posts)~~
149		~~end~~

		def test_should_view_recent_posts_as_rss
		get :index, :format => 'rss'

rool/rails/beast/trunk/test/functional/sessions_controller_test.rb:

prev.	current

		assert_redirected_to home_path
		assert_equal users(:aaron).id, session[:user_id]
		assert old != users(:aaron).reload.last_seen_at
21		~~assert_equal old, @controller.send(:last_login)~~
	21	assert_equal old, @controller.send(:last_active)
		end

		def test_remember_me

rool/rails/beast/trunk/test/functional/topics_controller_test.rb:

prev.	current

		assert_redirected_to forum_path(1)
		end

	21	def test_should_get_index_as_xml
	22	content_type 'application/xml'
	23	get :index, :forum_id => 1, :format => 'xml'
	24	assert_response :success
	25	assert_select 'topics>topic'
	26	end
	27
		def test_should_show_topic_as_rss
		get :show, :forum_id => forums(:rails).id, :id => topics(:pdi).id, :format => 'rss'
		assert_response :success
	31	assert_select 'channel'
		end
	33
	34	def test_should_show_topic_as_xml
	35	content_type 'application/xml'
	36	get :show, :forum_id => forums(:rails).id, :id => topics(:pdi).id, :format => 'xml'
	37	assert_response :success
	38	assert_select 'topic'
	39	end

		def test_should_get_new
		login_as :aaron
...	...
		post :create, :forum_id => forums(:rails).id, :topic => { :title => 'blah', :body => 'foo' }
		assert assigns(:topic)
		assert assigns(:post)
	82	assert_redirected_to topic_path(forums(:rails), assigns(:topic))
		[forums(:rails), users(:aaron)].each &:reload

		assert_equal old.collect { \|n\| n + 1}, counts.call
		end
71
	87
	88	def test_should_create_topic_with_xml
	89	content_type 'application/xml'
	90	authorize_as :aaron
	91	post :create, :forum_id => forums(:rails).id, :topic => { :title => 'blah', :body => 'foo' }, :format => 'xml'
	92	assert_response :created
	93	assert_equal formatted_topic_url(:forum_id => forums(:rails), :id => assigns(:topic), :format => :xml), @response.headers["Location"]
	94	end
	95
		def test_should_delete_topic
		counts = lambda { [Post.count, forums(:rails).topics_count, forums(:rails).posts_count] }
		old = counts.call

		login_as :aaron
		delete :destroy, :forum_id => forums(:rails).id, :id => topics(:ponies).id
	102	assert_redirected_to forum_path(forums(:rails))
		[forums(:rails), users(:aaron)].each &:reload

		assert_equal old.collect { \|n\| n - 1}, counts.call
		end

	108	def test_should_delete_topic_with_xml
	109	content_type 'application/xml'
	110	authorize_as :aaron
	111	delete :destroy, :forum_id => forums(:rails).id, :id => topics(:ponies).id, :format => 'xml'
	112	assert_response :success
	113	end
	114
		def test_should_allow_moderator_to_delete_topic
		assert_difference Topic, :count, -1 do
		login_as :sam
...	...
		assert_redirected_to topic_path(forums(:rails), assigns(:topic))
		end

	179	def test_should_update_with_xml
	180	content_type 'application/xml'
	181	authorize_as :sam
	182	put :update, :forum_id => forums(:rails).id, :id => topics(:ponies).id, :topic => { }, :format => 'xml'
	183	assert_response :success
	184	end
	185
		def test_should_not_update_user_id_of_own_post
		login_as :sam
		put :update, :forum_id => forums(:rails).id, :id => topics(:ponies).id, :topic => { :user_id => 32 }
...	...
		assert_redirected_to login_path
		end

	199	def test_should_not_update_other_post_with_xml
	200	content_type 'application/xml'
	201	authorize_as :sam
	202	put :update, :forum_id => forums(:comics).id, :id => topics(:galactus).id, :topic => { }, :format => 'xml'
	203	assert_response :unauthorized
	204	end
	205
		def test_should_update_other_post_as_moderator
		login_as :sam
		put :update, :forum_id => forums(:rails).id, :id => topics(:pdi).id, :topic => { }

rool/rails/beast/trunk/test/functional/users_controller_test.rb:

prev.	current

		require 'users_controller'

		# Re-raise errors caught by the controller.
5		~~class UsersController; def rescue_action(e) raise e end; end~~
	5	class UsersController
	6	def rescue_action(exception)
	7	exception.is_a?(ActiveRecord::RecordInvalid) ? render_invalid_record(exception.record) : super
	8	end
	9	end

		class UsersControllerTest < Test::Unit::TestCase
		all_fixtures
...	...
		get :index
		assert_response :success
		assert assigns(:users)
	24	assert_select 'html>head'
		end
	26
	27	def test_should_get_index_as_xml
	28	get :index, :format => 'xml'
	29	assert_response :success
	30	assert_select 'users>user'
	31	end

		def test_should_get_new
		get :new
		assert_response :success
		end

	38	def test_should_not_allow_user_creation_with_xml
	39	post :create, :user => { :login => 'nico', :email => 'nico@email.com', :password => 'fooey', :password_confirmation => 'fooey' }, :format => 'xml'
	40	assert_response 406
	41	end
	42
		def test_should_create_user
		assert_difference User, :count do
		post :create, :user => { :login => 'nico', :email => 'nico@email.com', :password => 'fooey', :password_confirmation => 'fooey' }
...	...
		assert_redirected_to login_path
		assert old_key != users(:sam).reload.login_key
		end
48
	64
	65	def test_should_require_password
	66	assert_difference User, :count, 0 do
	67	post :create, :user => { :password => '', :password_confirmation => '', :login => '', :email => '' }
	68	assert_template 'new'
	69	end
	70	end
	71
		def test_should_not_bomb_when_resetting_invalid_email
		assert_difference User, :count, 0 do
		post :create, :email => 'whatever'
...	...
		def test_should_show_user
		get :show, :id => 1
		assert_response :success
	82	assert_select 'html>head'
		end
	84
	85	def test_should_show_user_with_xml
	86	get :show, :id => 1, :format => 'xml'
	87	assert_response :success
	88	assert_select 'user'
	89	end

		def test_should_require_valid_user
		login_as :sam
...	...
		def test_should_update_user
		login_as :aaron
		put :update, :id => 1, :user => { }
82		~~assert_redirected_to user_path(assigns(:user))~~
	112	assert_redirected_to edit_user_path(assigns(:user))
		end
	114
	115	def test_should_update_user_with_xml
	116	authorize_as :aaron
	117	put :update, :id => 1, :user => { }, :format => 'xml'
	118	assert_response :success
	119	end

		def test_should_only_update_safe_fields
		# non-admin should not be able to change all this stuff
		login_as :sam
		put :update, :id => users(:sam).id, :user => { :login => "ruby", :created_at => "2005-10-24", :updated_at => "2004-10-24", :last_login_at => "2005-10-24", :last_seen_at => "2005-10-24", :posts_count => "1000", :admin => "1" }
89		~~assert_redirected_to user_path(assigns(:user))~~
	125	assert_redirected_to edit_user_path(assigns(:user))
		assert_equal users(:sam), assigns(:user)
		[:created_at, :last_login_at, :posts_count, :admin].each do \|attr\|
		assert_equal users(:sam).send(attr), assigns(:user).send(attr), "#{attr}"
...	...
		assert_redirected_to login_path
		end

	155	def test_admin_can_destroy_user_with_xml
	156	authorize_as :aaron
	157	old_count = User.count
	158	delete :destroy, :id => 2, :format => 'xml'
	159	assert_equal old_count-1, User.count
	160
	161	assert_response :success
	162	end
	163
	164	def test_normal_user_cannot_destroy_others_with_xml
	165	authorize_as :sam
	166	old_count = User.count
	167	delete :destroy, :id => 1, :format => 'xml'
	168	assert_equal old_count, User.count
	169
	170	assert_response 401
	171	end
	172
	173	def test_should_not_allow_setting_admin_with_xml
	174	authorize_as :aaron
	175	post :admin, :id => users(:sam).id, :user => { :admin => '1' }, :format => 'xml'
	176	assert_response 406
	177	end
	178
		def test_should_set_admin
		assert !users(:sam).admin?

...	...
		assert_redirected_to login_path
		end

	214	def test_should_not_activate_user_with_xml
	215	get :activate, :key => users(:kyle).login_key, :format => 'xml'
	216	assert_response 406
	217	end
	218
		def test_should_activate_user
		assert !users(:kyle).activated?
		get :activate, :key => users(:kyle).login_key

rool/rails/beast/trunk/test/integration/new_user_first_post_test.rb:

prev.	current

		def click_edit_post(post)
		get edit_post_path(post.topic.forum, post.topic, post)
		assert_response :success
95		~~assert_template "posts/edit.rhtml"~~
	95	assert_template "posts/edit"
		end

		def login(user, password)

rool/rails/beast/trunk/test/test_helper.rb:

prev.	current

		def login_as(user)
		@request.session[:user_id] = user ? users(user).id : nil
		@request.session[:topics] = {}
23		~~# @controller.send :current_user=, (user ? users(user) : nil)~~
		end
25
	24
	25	def authorize_as(user, mime_type = 'application/xml')
	26	@request.env["HTTP_AUTHORIZATION"] = user ? "Basic #{Base64.encode64("#{users(user).login}:testy")}" : nil
	27	end
	28
		def logout
		@request.session[:user_id] = nil
		@controller.instance_variable_set("@current_user",nil)
		end

	34	def content_type(type)
	35	@request.env['Content-Type'] = type
	36	end
	37
	38	def accept(accept)
	39	@request.env["HTTP_ACCEPT"] = accept
	40	end
	41
		def assert_models_equal(expected_models, actual_models, message = nil)
		to_test_param = lambda { \|r\| "<#{r.class}:#{r.to_param}>" }
		full_message = build_message(message, "<?> expected but was\n<?>.\n",

rool/rails/beast/trunk/test/unit/forum_test.rb:

prev.	current

		def test_should_find_last_post
		assert_equal posts(:il8n), forums(:rails).posts.last
		end
	17
	18	def test_should_format_body_html
	19	forum = Forum.new(:description => 'foo')
	20	forum.send :format_content
	21	assert_not_nil forum.description_html
	22
	23	forum.description = ''
	24	forum.send :format_content
	25	assert forum.description_html.blank?
	26	end
		end

rool/rails/beast/trunk/test/unit/moderatorship_test.rb:

prev.	current

		def test_should_not_add_duplicate_moderator
		assert_models_equal [users(:sam)], forums(:rails).moderators
		assert_difference Moderatorship, :count, 0 do
25		~~forums(:rails).moderators << users(:sam)~~
	25	assert_raise ActiveRecord::RecordNotSaved do
	26	forums(:rails).moderators << users(:sam)
	27	end
		end
		end
		end

rool/rails/beast/trunk/test/unit/post_test.rb:

prev.	current

		assert_equal p.created_at.to_i, topics(:pdi).replied_at.to_i
		end

	44	def test_should_delete_last_post_and_fix_topic_cached_data
	45	posts(:pdi_rebuttal).destroy
	46	assert_equal posts(:pdi_reply).id, topics(:pdi).last_post_id
	47	assert_equal posts(:pdi_reply).user_id, topics(:pdi).replied_by
	48	assert_equal posts(:pdi_reply).created_at.to_i, topics(:pdi).replied_at.to_i
	49	end
	50
		def test_should_create_reply_and_set_forum_from_topic
		p = create_post topics(:pdi), :body => 'blah'
		assert_equal topics(:pdi).forum_id, p.forum_id

rool/rails/beast/trunk/test/unit/topic_test.rb:

prev.	current

		class TopicTest < Test::Unit::TestCase
		all_fixtures

	6	def test_save_should_update_post_id_for_posts_belonging_to_topic
	7	# checking current forum_id's are in sync
	8	topic = topics(:pdi)
	9	post_forums = lambda do
	10	topic.posts.each { \|p\| assert_equal p.forum_id, topic.forum_id }
	11	end
	12	post_forums.call
	13	assert_equal forums(:rails).id, topic.forum_id
	14
	15	# updating forum_id
	16	topic.update_attribute :forum_id, forums(:comics).id
	17	assert_equal forums(:comics).id, topic.reload.forum_id
	18	post_forums.call
	19	end
	20
		def test_knows_last_post
		assert_equal posts(:pdi_rebuttal), topics(:pdi).posts.last
		end
...	...
		def test_should_require_title_user_and_forum
		t=Topic.new
		t.valid?
13		~~assert t.errors.on( :title)~~
14		~~assert t.errors.on( :user)~~
15		~~assert t.errors.on( :forum)~~
	28	assert t.errors.on(:title)
	29	assert t.errors.on(:user)
	30	assert t.errors.on(:forum)
		assert ! t.save
17		~~t.user=users(:aaron)~~
	32	t.user = users(:aaron)
		t.title = "happy life"
		t.forum = forums(:rails)
		assert t.save
21		~~assert_nil t.errors.on( :title)~~
22		~~assert_nil t.errors.on( :user)~~
23		~~assert_nil t.errors.on( :forum)~~
	36	assert_nil t.errors.on(:title)
	37	assert_nil t.errors.on(:user)
	38	assert_nil t.errors.on(:forum)
		end

		def test_should_add_to_user_counter_cache
...	...
		t.user = users(:aaron)
		assert_valid t
		t.save
	58	assert_equal 0, t.sticky
		[forums(:rails), users(:aaron)].each &:reload
		assert_equal old.collect { \|n\| n + 1}, counts.call
		end

rool/rails/beast/trunk/test/unit/user_test.rb:

prev.	current

		end
		end

	30	def test_minimum_password_length
	31	u = users(:sam)
	32	u.password = "bluegill"
	33	assert_valid u
	34	u.password = "fishing"
	35	assert_valid u
	36	u.password = "trout"
	37	assert_valid u
	38	# fewer than 5 chars are not valid passwords
	39	u.password = "bass"
	40	assert ! u.valid?
	41	u.password = "chi"
	42	assert ! u.valid?
	43	end
	44
		def test_no_valid_display_names
		u=users(:sam)
		u.display_name="1234556789"
...	...
		u.login="bobby"
		assert u.save
		assert u.admin?
	67	assert u.activated?
		u=User.create(:email => "woody@aol.com", :password => "zoegirl", :password_confirmation => "zoegirl")
		u.login="woody"
		assert ! u.admin?
	71	assert ! u.activated?
		end

		def test_login_token

rool/rails/beast/trunk/vendor/plugins/exception_logger/lib/logged_exception.rb:

prev.	current

		def find_exception_controllers_and_actions
		find(:all, :select => "DISTINCT controller_name, action_name", :order => "controller_name, action_name").collect(&:controller_action)
		end
	20
	21	def host_name
	22	`hostname -s`.chomp
	23	end
		end

		def backtrace=(backtrace)
...	...
		env = request.env.keys.sort.inject [] do \|env, key\|
		env << '* ' + ("%*-s: %s" % [max.length, key, request.env[key].to_s.strip])
		end
39		~~write_attribute(:environment, (env << "* Process: #{$$}" << "* Server : #{`hostname -s`.chomp}") * "\n")~~
	43	write_attribute(:environment, (env << "* Process: #{$$}" << "* Server : #{self.class.host_name}") * "\n")

		write_attribute(:request, [
		"* URL: #{request.protocol}#{request.env["HTTP_HOST"]}#{request.request_uri}",

rool/rails/beast/trunk/vendor/plugins/exception_logger/views/logged_exceptions/_exceptions.rhtml:

prev.	current

		<div id="exceptions">
2		~~<%= session[:user_id] ; controller.reset_session %>~~
		<div class="pages">
		<%= link_to_remote 'Delete Visible', :url => { :action => 'destroy_all' }, :with => "ExceptionLogger.deleteAll()" %>
		<% if @exception_pages.page_count > 1 %>

rool/rails/beast/trunk/vendor/plugins/white_list/README:

prev.	current


		You can add or remove tags/attributes if you want to customize it a bit.

13		~~add table tags~~
	13	Add table tags

15		~~WhiteListHelper.tags += %w(table td th)~~
	15	WhiteListHelper.tags.merge %w(table td th)

17		~~remove tags~~
	17	Remove tags

19		~~WhiteListHelper.tags -= %w(div span)~~
	19	WhiteListHelper.tags.delete 'div'

21		~~clear any attributes that are allowed for <a> tags~~
	21	Change allowed attributes

23		~~WhiteListHelper.attributes['a'] = []~~
	23	WhiteListHelper.attributes.merge %w(id class style)

25		~~allow a new attribute for the <img> tag~~
	25	white_list accepts a block for custom tag escaping. Shown below is the default block that white_list uses if none is given.
	26	The block is called for all bad tags, and every text node. node is an instance of HTML::Node (either HTML::Tag or HTML::Text).
	27	bad is nil for text nodes inside good tags, or is the tag name of the bad tag.

27		~~WhiteListHelper.attributes['img'] += %w(style)~~
28
29		~~add new tag with attributes~~
30
31		~~WhiteListHelper.attributes['table'] = %w(cellpadding cellspacing)~~
32
33		~~change allowed attributes for all tags~~
34
35		~~WhiteListHelper.attributes[nil] = %w(id class style)~~

	30	<%= white_list(@article.body) { \|node, bad\| white_listed_bad_tags.include?(bad) ? nil : node.to_s.gsub(/</, '<') } %>

rool/rails/beast/trunk/vendor/plugins/white_list/lib/white_list_helper.rb:

prev.	current

		module WhiteListHelper
2		~~PROTOCOL_ATTRIBUTES = %w(src href)~~
	2	PROTOCOL_ATTRIBUTES = Set.new %w(src href)
		PROTOCOL_SEPARATOR = /:\|(&#0*58)\|(&#x70)\|(%\|%)3A/
4		~~mattr_reader :tags, :attributes, :protocols~~
5		~~@@tags = %w(strong em b i p code pre tt output samp kbd var sub sup dfn cite big small address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dt dd)~~
6		~~@@attributes = {~~
7		~~'a' => %w(href),~~
8		~~'img' => %w(src width height alt),~~
9		~~'blockquote' => %w(cite),~~
10		~~'del' => %w(cite datetime),~~
11		~~'ins' => %w(cite datetime),~~
12		~~nil => %w(id class) }~~
13		~~@@protocols = %w(ed2k ftp http https irc mailto news gopher nntp telnet webcal xmpp callto feed)~~

15		~~def white_listed_tags~~
16		~~::WhiteListHelper.tags~~
	5	[:bad_tags, :tags, :attributes, :protocols].each do \|attr\|
	6	klass = class << self; self; end
	7	klass.send(:define_method, "#{attr}=") { \|value\| class_variable_set("@@#{attr}", Set.new(value)) }
	8	define_method("white_listed_#{attr}") { ::WhiteListHelper.send(attr) }
	9	mattr_reader attr
		end
18
19		~~def white_listed_attributes~~
20		~~::WhiteListHelper.attributes~~
21		~~end~~

23		~~def white_listed_protocols~~
24		~~::WhiteListHelper.protocols~~
25		~~end~~
26
27		~~def white_list(html)~~
	12	# This White Listing helper will html encode all tags and strip all attributes that aren't specifically allowed.
	13	# It also strips href/src tags with invalid protocols, like javascript: especially. It does its best to counter any
	14	# tricks that hackers may use, like throwing in unicode/ascii/hex values to get past the javascript: filters. Check out
	15	# the extensive test suite.
	16	#
	17	# <%= white_list @article.body %>
	18	#
	19	# You can add or remove tags/attributes if you want to customize it a bit.
	20	#
	21	# Add table tags
	22	#
	23	# WhiteListHelper.tags.merge %w(table td th)
	24	#
	25	# Remove tags
	26	#
	27	# WhiteListHelper.tags.delete 'div'
	28	#
	29	# Change allowed attributes
	30	#
	31	# WhiteListHelper.attributes.merge %w(id class style)
	32	#
	33	# white_list accepts a block for custom tag escaping. Shown below is the default block that white_list uses if none is given.
	34	# The block is called for all bad tags, and every text node. node is an instance of HTML::Node (either HTML::Tag or HTML::Text).
	35	# bad is nil for text nodes inside good tags, or is the tag name of the bad tag.
	36	#
	37	# <%= white_list(@article.body) { \|node, bad\| white_listed_bad_tags.include?(bad) ? nil : node.to_s.gsub(/</, '<') } %>
	38	#
	39	def white_list(html, options = {}, &block)
		return html if html.blank? \|\| !html.include?('<')
	41	attrs = Set.new(options[:attributes]).merge(white_listed_attributes)
	42	tags = Set.new(options[:tags] ).merge(white_listed_tags)
	43	block \|\|= lambda { \|node, bad\| white_listed_bad_tags.include?(bad) ? nil : node.to_s.gsub(/</, '<') }
		returning [] do \|new_text\|
		tokenizer = HTML::Tokenizer.new(html)
31
	46	bad = nil
		while token = tokenizer.next
		node = HTML::Node.parse(nil, 0, 0, token, false)
		new_text << case node
		when HTML::Tag
36		~~unless (white_listed_tags + white_listed_attributes.keys).include?(node.name)~~
37		~~node.to_s.gsub(/</, "<")~~
	51	unless tags.include?(node.name)
	52	bad = node.name
	53	block.call node, bad
		else
	55	bad = nil
		if node.closing != :close
40		~~attributes = (white_listed_attributes[nil] \|\| []) + (white_listed_attributes[node.name] \|\| [])~~
		node.attributes.delete_if do \|attr_name, value\|
42		~~!attributes.include?(attr_name) \|\| (PROTOCOL_ATTRIBUTES.include?(attr_name) && contains_bad_protocols?(value))~~
	58	!attrs.include?(attr_name) \|\| (PROTOCOL_ATTRIBUTES.include?(attr_name) && contains_bad_protocols?(value))
		end if attributes.any?
		end
45		~~node.to_s~~
	61	node
		end
		else
48		~~node.to_s.gsub(/</, "<")~~
	64	block.call node, bad
		end
		end
		end.join
		end

54		~~private~~
	70	protected
		def contains_bad_protocols?(value)
		value =~ PROTOCOL_SEPARATOR && !white_listed_protocols.include?(value.split(PROTOCOL_SEPARATOR).first)
		end
58		~~end~~

	75	end
	76
	77	WhiteListHelper.bad_tags = %w(script)
	78	WhiteListHelper.tags = %w(strong em b i p code pre tt output samp kbd var sub sup dfn cite big small address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dt dd abbr acronym a img blockquote del ins fieldset legend)
	79	WhiteListHelper.attributes = %w(href src width height alt cite datetime title class)
	80	WhiteListHelper.protocols = %w(ed2k ftp http https irc mailto news gopher nntp telnet webcal xmpp callto feed)

rool/rails/beast/trunk/vendor/plugins/white_list/test/white_list_test.rb:

prev.	current

		include WhiteListHelper
		public :contains_bad_protocols?

8		~~(WhiteListHelper.tags + WhiteListHelper.attributes.keys).compact.each do \|tag_name\|~~
	8	WhiteListHelper.tags.each do \|tag_name\|
		define_method "test_should_allow_#{tag_name}_tag" do
10		~~assert_white_listed "start <#{tag_name} id=\"1\" name=\"foo\">foo <bad>bar</bad> baz</#{tag_name}> end", "start <#{tag_name} id='1'>foo <bad>bar</bad> baz</#{tag_name}> end"~~
	10	assert_white_listed "start <#{tag_name} title=\"1\" name=\"foo\">foo <bad>bar</bad> baz</#{tag_name}> end", "start <#{tag_name} title='1'>foo <bad>bar</bad> baz</#{tag_name}> end"
		end
		end

		def test_should_allow_anchors
15		~~assert_white_listed %(<a href="foo" onclick="bar"><script>baz</script></a>), "<a href='foo'><script>baz</script></a>"~~
	15	assert_white_listed %(<a href="foo" onclick="bar"><script>baz</script></a>), "<a href='foo'></a>"
		end

18		~~WhiteListHelper.attributes['img'].each do \|img_attr\|~~
	18	%w(src width height alt).each do \|img_attr\|
		define_method "test_should_allow_image_#{img_attr}_attribute" do
		assert_white_listed %(<img #{img_attr}="foo" onclick="bar" />), "<img #{img_attr}='foo' />"
		end
...	...
		assert_white_listed ''
		end

	33	def test_should_allow_custom_tags
	34	text = "<u>foo</u>"
	35	assert_equal(text, white_list(text, :tags => %w(u)))
	36	end
	37
	38	def test_should_allow_custom_tags_with_attributes
	39	text = "<fieldset foo='bar'>foo</fieldset>"
	40	assert_equal(text, white_list(text, :attributes => ['foo']))
	41	end
	42
		[%w(img src), %w(a href)].each do \|(tag, attr)\|
		define_method "test_should_strip_#{attr}_attribute_in_#{tag}_with_bad_protocols" do
35		~~assert_white_listed %(<#{tag} #{attr}="javascript:bang" id="1">boo</#{tag}>), %(<#{tag} id='1'>boo</#{tag}>)~~
	45	assert_white_listed %(<#{tag} #{attr}="javascript:bang" title="1">boo</#{tag}>), %(<#{tag} title='1'>boo</#{tag}>)
		end
		end

...	...
		end

		def test_should_block_script_tag
57		~~assert_white_listed %(<SCRIPT\nSRC=http://ha.ckers.org/xss.js></SCRIPT>), "<script src='http:' /></script>"~~
	67	assert_white_listed %(<SCRIPT\nSRC=http://ha.ckers.org/xss.js></SCRIPT>), ""
		end

		[%(<IMG SRC="javascript:alert('XSS');">),
...	...
		end

		def test_should_sanitize_invalid_script_tag
85		~~assert_white_listed %(<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>), "<script /></script>"~~
	95	assert_white_listed %(<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>), ""
		end

		def test_should_sanitize_script_tag_with_multiple_open_brackets
89		~~assert_white_listed %(<<SCRIPT>alert("XSS");//<</SCRIPT>), "<<script>alert(\"XSS\");//<</script>"~~
	99	assert_white_listed %(<<SCRIPT>alert("XSS");//<</SCRIPT>), "<"
		assert_white_listed %(<iframe src=http://ha.ckers.org/scriptlet.html\n<), "<iframe src='http:' /><"
		end

		def test_should_sanitize_unclosed_script
94		~~assert_white_listed %(<SCRIPT SRC=http://ha.ckers.org/xss.js?<B>), "<script src='http:' /><b>"~~
	104	assert_white_listed %(<SCRIPT SRC=http://ha.ckers.org/xss.js?<B>), "<b>"
		end

		def test_should_sanitize_half_open_scripts
...	...
		img_hack = %(<IMG\nSRC\n=\n"\nj\na\nv\na\ns\nc\nr\ni\np\nt\n:\na\nl\ne\nr\nt\n(\n'\nX\nS\nS\n'\n)\n"\n>)
		assert_white_listed img_hack, "<img>"
		end
105
	115
	116	def test_should_allow_custom_block
	117	html = %(<SCRIPT type="javascript">foo</SCRIPT><img>blah</img><blink>blah</blink>)
	118	safe = white_list html do \|node, bad\|
	119	bad == 'script' ? nil : node
	120	end
	121	assert_equal "<img>blah</img><blink>blah</blink>", safe
	122	end
	123
		protected
		def assert_white_listed(text, expected = nil)
		assert_equal((expected \|\| text), white_list(text))