Rakefile app/controllers/application_controller.rb @@ -139,7 +139,7 @@ class IdeasController < ApplicationController flash[:notice] = "Comment added" end - redirect_to :back + redirect_to :back end app/controllers/ideas_controller.rb app/controllers/invitations_controller.rb app/controllers/jobs_controller.rb @@ -17,7 +17,7 @@ class MessagesController < ApplicationController @message = current_user.sent_messages.new(params[:message]) @user = @message.to - if verify_recaptcha(params) + if verify_recaptcha(params) if @message && @message.save flash[:notice] = "Message sent." @@ -27,8 +27,8 @@ class MessagesController < ApplicationController render :action => :new end else - flash[:error] = "You failed the ReCAPTCHA test, try again" - render :action => :new + flash[:error] = "You failed the ReCAPTCHA test, try again" + render :action => :new end end app/controllers/messages_controller.rb app/controllers/projects_controller.rb @@ -1,50 +1,50 @@ -# This controller handles the login/logout function of the site. -class SessionsController < ApplicationController - - # render new.rhtml - def new - end - - def create - logout_keeping_session! - user = User.authenticate(params[:login], params[:password]) - - if user - # Protects against session fixation attacks, causes request forgery - # protection if user resubmits an earlier form using back - # button. Uncomment if you understand the tradeoffs. - # reset_session - - if verify_recaptcha(params) - - self.current_user = user - new_cookie_flag = (params[:remember_me] == "1") - handle_remember_cookie! new_cookie_flag - redirect_back_or_default('/') - - else - @login = params[:login] - @remember_me = params[:remember_me] - flash[:error] = "You failed the ReCAPTCHA test, try again" - redirect_to :back - - end - else - note_failed_signin - @login = params[:login] - @remember_me = params[:remember_me] - render :action => :new - end - end - - def destroy - logout_killing_session! - flash[:notice] = "You have been logged out." - redirect_back_or_default('/') - end - -protected - # Track failed login attempts +# This controller handles the login/logout function of the site. +class SessionsController < ApplicationController + + # render new.rhtml + def new + end + + def create + logout_keeping_session! + user = User.authenticate(params[:login], params[:password]) + + if user + # Protects against session fixation attacks, causes request forgery + # protection if user resubmits an earlier form using back + # button. Uncomment if you understand the tradeoffs. + # reset_session + + if verify_recaptcha(params) + + self.current_user = user + new_cookie_flag = (params[:remember_me] == "1") + handle_remember_cookie! new_cookie_flag + redirect_back_or_default('/') + + else + @login = params[:login] + @remember_me = params[:remember_me] + flash[:error] = "You failed the ReCAPTCHA test, try again" + redirect_to :back + + end + else + note_failed_signin + @login = params[:login] + @remember_me = params[:remember_me] + render :action => :new + end + end + + def destroy + logout_killing_session! + flash[:notice] = "You have been logged out." + redirect_back_or_default('/') + end + +protected + # Track failed login attempts def note_failed_signin user = User.find_by_login params[:login] message = "" @@ -52,11 +52,11 @@ protected @show_resend_activation_button = true message = "- user not activated" end - flash[:error] = "Log in failed, please try again." + flash[:error] = "Log in failed, please try again." message = ["Failed login for ? from ? at ? ?", params[:login], request.remote_ip, Time.now.utc, message] - logger.warn + logger.warn - end -end + end +end app/controllers/sessions_controller.rb app/controllers/user_controller.rb @@ -1,31 +1,31 @@ -class UsersController < ApplicationController - before_filter :login_required, :update_login_time, :except => [ :new, :create, :activate, :forgot_password, :reset_password, :resend_activation_link ] - # render new.rhtml - def new +class UsersController < ApplicationController + before_filter :login_required, :update_login_time, :except => [ :new, :create, :activate, :forgot_password, :reset_password, :resend_activation_link ] + # render new.rhtml + def new @user = User.new @idea = Idea.new - end - - def create - logout_keeping_session! - # check passcode to confirm this person was invited. This is basic hard coded thing, will need to be replaced. + end + + def create + logout_keeping_session! + # check passcode to confirm this person was invited. This is basic hard coded thing, will need to be replaced. @user = User.new(params[:user]) @idea = Idea.new(params[:idea]) # will need to add javascript support to make the lookups via user browser possible, to reduce number of requests from single IP @new_location = params[:location_select] || params[:new_location].strip - if @user - @invitation = Invitation.find_by_email(@user.email) + if @user + @invitation = Invitation.find_by_email(@user.email) if @invitation || User.count == 0 if @invitation - @user.invited_by_id = @invitation.user_id + @user.invited_by_id = @invitation.user_id else @user.invited_by_id = 0 end - if verify_recaptcha(params) + if verify_recaptcha(params) if params[:location_select] || @new_location && @new_location.length > 0 @location = Locate.new params[:location_select] || @new_location @@ -57,52 +57,52 @@ class UsersController < ApplicationController end end - - if @user.errors.empty? and @user.save - flash[:notice] = "Thank you for registering. An activation email will be sent to " + @user.email + " shortly. You will be able to log in only after you activate your account." + + if @user.errors.empty? and @user.save + flash[:notice] = "Thank you for registering. An activation email will be sent to " + @user.email + " shortly. You will be able to log in only after you activate your account." @user.ideas << @idea @idea.save(false) # validations already done above redirect_to :login - else - flash[:error] = "Your registration attempt failed. Try again." - render :action => :new - end - else - flash[:error] = "You failed the ReCaptcha test." + else + flash[:error] = "Your registration attempt failed. Try again." + render :action => :new + end + else + flash[:error] = "You failed the ReCaptcha test." render :action => :new - end + end else flash[:error] = "Could not register. You must be invited to join this network before you can register." - @user.errors.add(:email, " #{ '(' + @user.email + ')' if @user.email.length > 0 } not found on the invitation list.") - render :action => 'new' - end - else - flash[:error] = "Your registration attempt failed." - render :action => 'new' - end - end - - def activate - logout_keeping_session! - user = User.find_by_activation_code(params[:activation_code]) unless params[:activation_code].blank? - case - when (!params[:activation_code].blank?) && user && !user.active? - user.activate! + @user.errors.add(:email, " #{ '(' + @user.email + ')' if @user.email.length > 0 } not found on the invitation list.") + render :action => 'new' + end + else + flash[:error] = "Your registration attempt failed." + render :action => 'new' + end + end + + def activate + logout_keeping_session! + user = User.find_by_activation_code(params[:activation_code]) unless params[:activation_code].blank? + case + when (!params[:activation_code].blank?) && user && !user.active? + user.activate! flash[:notice] = "Your account has been activated. You can now log in." redirect_to :login - when params[:activation_code].blank? - flash[:error] = "The activation code is missing. Please follow the URL from your email." - redirect_to :login - - else - flash[:error] = "We couldn't find a user with that activation code -- check your email? Or maybe you've already activated -- try signing in." - redirect_to :login - end - end - - def index + when params[:activation_code].blank? + flash[:error] = "The activation code is missing. Please follow the URL from your email." + redirect_to :login + + else + flash[:error] = "We couldn't find a user with that activation code -- check your email? Or maybe you've already activated -- try signing in." + redirect_to :login + end + end + + def index if params[:search] @profiles = User.search params[:search].gsub("@", "\\@"), # need to get @ to work in extended mode :include => [ :scorecard ], @@ -121,9 +121,9 @@ class UsersController < ApplicationController else @profiles = User.get('active', 'login asc', params[:page]) end - end - - def show + end + + def show @user = User.find_by_login params[:id], :include => [:active_ideas, :active_projects, :active_positions, :open_job_postings, @@ -150,8 +150,8 @@ class UsersController < ApplicationController @industry_ids = @user.industry_ids @skill_ids = @user.general_skill_ids - end - + end + def update params[:password] ||= {} @@ -206,7 +206,7 @@ class UsersController < ApplicationController end - def remove_location + def remove_location if current_user.locations.count < 2 flash[:error] = "Cannot remove location, you must have at least one" else @@ -219,98 +219,98 @@ class UsersController < ApplicationController end redirect_to :back - end - - - - # action to perform when the user wants to change their password - def change_password - return unless request.post? - - if verify_recaptcha(params) - - if User.authenticate(current_user.login, params[:old_password]) - if (params[:password] == params[:password_confirmation]) - current_user.password_confirmation = params[:password_confirmation].to_s - current_user.password = params[:password].to_s - - current_user.reset_password - - if current_user.save - flash[:notice] = "Password updated successfully" - redirect_to edit_profile_url - else - flash[:error] = "Could not change password." - end - else - flash[:error] = "New password mismatch" - @old_password = params[:old_password] - end - else - flash[:error] = "Old password incorrect" - end - - else - flash[:error] = "You failed the ReCAPTCHA test, try again" - - end - - end - - # action to perform when the users clicks forgot_password - def forgot_password - return unless request.post? - - if verify_recaptcha(params) - - if @user = User.find_by_email(params[:email]) - @user.forgot_password - @user.save - flash[:notice] = "A password reset link has been sent to your email address: #{params[:email]}" - redirect_to :root - else - flash[:error] = "Could not find a user with that email address: #{params[:email]}" - end - else - @email = params[:email] - flash[:error] = "You failed the ReCAPTCHA test, try again" - - end - end - - # action to perform when the user resets the password - def reset_password - @user = User.find_by_password_reset_code(params[:code]) - if @user == nil - flash[:error] = "This reset link is no longer active. You may request a new one if you need it." - render :action => 'forgot_password' - end - return if @user unless params[:user] - - if verify_recaptcha(params) - if ((params[:user][:password] && params[:user][:password_confirmation])) - self.current_user = @user # for the next two lines to work - current_user.password_confirmation = params[:user][:password_confirmation] - current_user.password = params[:user][:password] - - @user.reset_password - current_user.password_reset_code = nil - if current_user.save - flash[:notice] = "Password changed." - redirect_back_or_default('/') - else - flash[:error] = "Could not change password." - @user = current_user - end - - else - flash[:alert] = "Password mismatch" - end - else - flash[:error] = "You failed the ReCAPTCHA test, try again" - end - - end + end + + + + # action to perform when the user wants to change their password + def change_password + return unless request.post? + + if verify_recaptcha(params) + + if User.authenticate(current_user.login, params[:old_password]) + if (params[:password] == params[:password_confirmation]) + current_user.password_confirmation = params[:password_confirmation].to_s + current_user.password = params[:password].to_s + + current_user.reset_password + + if current_user.save + flash[:notice] = "Password updated successfully" + redirect_to edit_profile_url + else + flash[:error] = "Could not change password." + end + else + flash[:error] = "New password mismatch" + @old_password = params[:old_password] + end + else + flash[:error] = "Old password incorrect" + end + + else + flash[:error] = "You failed the ReCAPTCHA test, try again" + + end + + end + + # action to perform when the users clicks forgot_password + def forgot_password + return unless request.post? + + if verify_recaptcha(params) + + if @user = User.find_by_email(params[:email]) + @user.forgot_password + @user.save + flash[:notice] = "A password reset link has been sent to your email address: #{params[:email]}" + redirect_to :root + else + flash[:error] = "Could not find a user with that email address: #{params[:email]}" + end + else + @email = params[:email] + flash[:error] = "You failed the ReCAPTCHA test, try again" + + end + end + + # action to perform when the user resets the password + def reset_password + @user = User.find_by_password_reset_code(params[:code]) + if @user == nil + flash[:error] = "This reset link is no longer active. You may request a new one if you need it." + render :action => 'forgot_password' + end + return if @user unless params[:user] + + if verify_recaptcha(params) + if ((params[:user][:password] && params[:user][:password_confirmation])) + self.current_user = @user # for the next two lines to work + current_user.password_confirmation = params[:user][:password_confirmation] + current_user.password = params[:user][:password] + + @user.reset_password + current_user.password_reset_code = nil + if current_user.save + flash[:notice] = "Password changed." + redirect_back_or_default('/') + else + flash[:error] = "Could not change password." + @user = current_user + end + + else + flash[:alert] = "Password mismatch" + end + else + flash[:error] = "You failed the ReCAPTCHA test, try again" + end + + end def resend_activation_link @@ -321,7 +321,7 @@ class UsersController < ApplicationController flash[:notice] = "Activation email resent, please check you mail (for security reasons we are not displaying the email address here). " else flash[:error] = "This account is already active." - end + end else flash[:error] = "Unknown user." end @@ -345,5 +345,5 @@ class UsersController < ApplicationController end end - -end + +end app/controllers/users_controller.rb app/helpers/application_helper.rb app/helpers/ideas_helper.rb app/helpers/invitations_helper.rb app/helpers/jobs_helper.rb app/helpers/projects_helper.rb @@ -1,2 +1,2 @@ -module SessionsHelper +module SessionsHelper end \ No newline at end of file app/helpers/sessions_helper.rb app/helpers/user_helper.rb @@ -1,94 +1,94 @@ -module UsersHelper - - # - # Use this to wrap view elements that the user can't access. - # !! Note: this is an *interface*, not *security* feature !! - # You need to do all access control at the controller level. - # - # Example: - # <%= if_authorized?(:index, User) do link_to('List all users', users_path) end %> | - # <%= if_authorized?(:edit, @user) do link_to('Edit this user', edit_user_path) end %> | - # <%= if_authorized?(:destroy, @user) do link_to 'Destroy', @user, :confirm => 'Are you sure?', :method => :delete end %> - # - # - def if_authorized?(action, resource, &block) - if authorized?(action, resource) - yield action, resource - end - end - - # - # Link to user's page ('users/1') - # - # By default, their login is used as link text and link title (tooltip) - # - # Takes options - # * :content_text => 'Content text in place of user.login', escaped with - # the standard h() function. - # * :content_method => :user_instance_method_to_call_for_content_text - # * :title_method => :user_instance_method_to_call_for_title_attribute - # * as well as link_to()'s standard options - # - # Examples: - # link_to_user @user - # # => <a href="/users/3" title="barmy">barmy</a> - # - # # if you've added a .name attribute: - # content_tag :span, :class => :vcard do - # (link_to_user user, :class => 'fn n', :title_method => :login, :content_method => :name) + - # ': ' + (content_tag :span, user.email, :class => 'email') - # end - # # => <span class="vcard"><a href="/users/3" title="barmy" class="fn n">Cyril Fotheringay-Phipps</a>: <span class="email">barmy@blandings.com</span></span> - # - # link_to_user @user, :content_text => 'Your user page' - # # => <a href="/users/3" title="barmy" class="nickname">Your user page</a> - # - def link_to_user(user, options={}) - raise "Invalid user" unless user - options.reverse_merge! :content_method => :login, :title_method => :login, :class => :nickname - content_text = options.delete(:content_text) - content_text ||= user.send(options.delete(:content_method)) - options[:title] ||= user.send(options.delete(:title_method)) - link_to h(content_text), user_path(user), options - end - - # - # Link to login page using remote ip address as link content - # - # The :title (and thus, tooltip) is set to the IP address - # - # Examples: - # link_to_login_with_IP - # # => <a href="/login" title="169.69.69.69">169.69.69.69</a> - # - # link_to_login_with_IP :content_text => 'not signed in' - # # => <a href="/login" title="169.69.69.69">not signed in</a> - # - def link_to_login_with_IP content_text=nil, options={} - ip_addr = request.remote_ip - content_text ||= ip_addr - options.reverse_merge! :title => ip_addr - if tag = options.delete(:tag) - content_tag tag, h(content_text), options - else - link_to h(content_text), login_path, options - end - end - - # - # Link to the current user's page (using link_to_user) or to the login page - # (using link_to_login_with_IP). - # - def link_to_current_user(options={}) - if current_user - link_to_user current_user, options - else - content_text = options.delete(:content_text) || 'not signed in' - # kill ignored options from link_to_user - [:content_method, :title_method].each{|opt| options.delete(opt)} - link_to_login_with_IP content_text, options - end - end +module UsersHelper + + # + # Use this to wrap view elements that the user can't access. + # !! Note: this is an *interface*, not *security* feature !! + # You need to do all access control at the controller level. + # + # Example: + # <%= if_authorized?(:index, User) do link_to('List all users', users_path) end %> | + # <%= if_authorized?(:edit, @user) do link_to('Edit this user', edit_user_path) end %> | + # <%= if_authorized?(:destroy, @user) do link_to 'Destroy', @user, :confirm => 'Are you sure?', :method => :delete end %> + # + # + def if_authorized?(action, resource, &block) + if authorized?(action, resource) + yield action, resource + end + end - -end + # + # Link to user's page ('users/1') + # + # By default, their login is used as link text and link title (tooltip) + # + # Takes options + # * :content_text => 'Content text in place of user.login', escaped with + # the standard h() function. + # * :content_method => :user_instance_method_to_call_for_content_text + # * :title_method => :user_instance_method_to_call_for_title_attribute + # * as well as link_to()'s standard options + # + # Examples: + # link_to_user @user + # # => <a href="/users/3" title="barmy">barmy</a> + # + # # if you've added a .name attribute: + # content_tag :span, :class => :vcard do + # (link_to_user user, :class => 'fn n', :title_method => :login, :content_method => :name) + + # ': ' + (content_tag :span, user.email, :class => 'email') + # end + # # => <span class="vcard"><a href="/users/3" title="barmy" class="fn n">Cyril Fotheringay-Phipps</a>: <span class="email">barmy@blandings.com</span></span> + # + # link_to_user @user, :content_text => 'Your user page' + # # => <a href="/users/3" title="barmy" class="nickname">Your user page</a> + # + def link_to_user(user, options={}) + raise "Invalid user" unless user + options.reverse_merge! :content_method => :login, :title_method => :login, :class => :nickname + content_text = options.delete(:content_text) + content_text ||= user.send(options.delete(:content_method)) + options[:title] ||= user.send(options.delete(:title_method)) + link_to h(content_text), user_path(user), options + end + + # + # Link to login page using remote ip address as link content + # + # The :title (and thus, tooltip) is set to the IP address + # + # Examples: + # link_to_login_with_IP + # # => <a href="/login" title="169.69.69.69">169.69.69.69</a> + # + # link_to_login_with_IP :content_text => 'not signed in' + # # => <a href="/login" title="169.69.69.69">not signed in</a> + # + def link_to_login_with_IP content_text=nil, options={} + ip_addr = request.remote_ip + content_text ||= ip_addr + options.reverse_merge! :title => ip_addr + if tag = options.delete(:tag) + content_tag tag, h(content_text), options + else + link_to h(content_text), login_path, options + end + end + + # + # Link to the current user's page (using link_to_user) or to the login page + # (using link_to_login_with_IP). + # + def link_to_current_user(options={}) + if current_user + link_to_user current_user, options + else + content_text = options.delete(:content_text) || 'not signed in' + # kill ignored options from link_to_user + [:content_method, :title_method].each{|opt| options.delete(opt)} + link_to_login_with_IP content_text, options + end + end + + +end app/helpers/users_helper.rb @@ -1,6 +1,6 @@ class GeneralSkill < ActiveRecord::Base - validates_presence_of :name - validates_uniqueness_of :name + validates_presence_of :name + validates_uniqueness_of :name has_many :polymorphic_general_skills app/models/general_skill.rb @@ -6,7 +6,7 @@ class Idea < ActiveRecord::Base validates_size_of :description, :maximum => 1000 validates_presence_of :industries, :message => "should be selected" - validates_size_of :industries, :maximum => 5, :message => "should not be more than 5." + validates_size_of :industries, :maximum => 5, :message => "should not be more than 5." acts_as_commentable @@ -17,7 +17,7 @@ class Idea < ActiveRecord::Base has_one :scorecard, :as => :scorable, :dependent => :destroy has_many :wlists, :as => :watch, :class_name => "Watchlist", :dependent => :destroy - has_many :watchers, :through => :wlists, :source => :user + has_many :watchers, :through => :wlists, :source => :user has_many :interests, :as => :interest, :dependent => :destroy has_many :interested, :through => :interests, :source => :user app/models/idea.rb @@ -1,6 +1,6 @@ class Industry < ActiveRecord::Base - validates_presence_of :name - validates_uniqueness_of :name + validates_presence_of :name + validates_uniqueness_of :name has_many :relevant_industries, :dependent => :destroy app/models/industry.rb @@ -1,6 +1,6 @@ class Invitation < ActiveRecord::Base - + validates_presence_of :user validates_presence_of :email app/models/invitation.rb app/models/invitation_observer.rb @@ -1,12 +1,12 @@ class Job < ActiveRecord::Base - validates_presence_of :project, :message => "error: a job must be attached to a project. Please create project and post the job from it" - validates_presence_of :description - validates_presence_of :title - validates_presence_of :general_skills, :message => "error: you must select at least one general skill" + validates_presence_of :project, :message => "error: a job must be attached to a project. Please create project and post the job from it" + validates_presence_of :description + validates_presence_of :title + validates_presence_of :general_skills, :message => "error: you must select at least one general skill" validates_size_of :title, :maximum => 100 - validates_size_of :general_skills, :maximum => 5, :message => "error: you cannot select more than 5 general skills" + validates_size_of :general_skills, :maximum => 5, :message => "error: you cannot select more than 5 general skills" belongs_to :user belongs_to :project @@ -19,7 +19,7 @@ class Job < ActiveRecord::Base has_many :general_skills, :through => :polymorphic_general_skills has_many :wlists, :as => :watch, :dependent => :destroy, :class_name => "Watchlist" - has_many :watchers, :through => :wlists, :source => :user + has_many :watchers, :through => :wlists, :source => :user # the logic for these counters should be looked at in tandem with those in job_application after_create :custom_counter_cache_after_create app/models/job.rb @@ -7,7 +7,7 @@ class JobApplication < ActiveRecord::Base validates_presence_of :job validates_presence_of :message - validates_length_of :message, :maximum => 1000 + validates_length_of :message, :maximum => 1000 # the logic for these counters should be looked at in tandem with those in the job model before_create :custom_counter_cache_after_create app/models/job_application.rb @@ -1,6 +1,6 @@ class Locate < Array require 'open-uri' - require 'hpricot' + require 'hpricot' attr_reader :status, :message, :count app/models/locate.rb @@ -1,7 +1,7 @@ class Location < ActiveRecord::Base belongs_to :located, :polymorphic => true - validates_presence_of :location + validates_presence_of :location validates_uniqueness_of :location, :scope => [:located_id, :located_type], :message => "Location already exists" after_save :update_location_for_indexing app/models/location.rb @@ -3,7 +3,7 @@ class Message < ActiveRecord::Base belongs_to :to, :class_name => "User" validates_presence_of :subject, :body - validates_length_of :subject, :within => 0..50 + validates_length_of :subject, :within => 0..50 validates_length_of :body, :within => 0..500 validate :to_must_be_real_and_active_user, :from_must_be_real_user @@ -24,11 +24,11 @@ class Message < ActiveRecord::Base errors.add :recipient, " (to) not found or not active." end end - end + end def from_must_be_real_user errors.add :person, " (from) not found." if (from_id.nil? || !User.exists?(from_id)) - end + end private app/models/message.rb @@ -6,7 +6,7 @@ class Project < ActiveRecord::Base validates_size_of :description, :maximum => 1000 validates_presence_of :industries, :message => "error: you must select at least one relevant industry" - validates_size_of :industries, :maximum => 5, :message => "error: you cannot select more than 5 industries" + validates_size_of :industries, :maximum => 5, :message => "error: you cannot select more than 5 industries" acts_as_commentable @@ -24,7 +24,7 @@ class Project < ActiveRecord::Base has_one :scorecard, :as => :scorable, :dependent => :destroy has_many :wlists, :as => :watch, :class_name => "Watchlist", :dependent => :destroy - has_many :watchers, :through => :wlists, :source => :user + has_many :watchers, :through => :wlists, :source => :user has_many :interests, :as => :interest, :dependent => :destroy has_many :interested, :through => :interests, :source => :user app/models/project.rb app/models/rating.rb app/models/scorecard.rb @@ -1,59 +1,59 @@ -require 'digest/sha1' - -class User < ActiveRecord::Base - - include Authentication - include Authentication::ByPassword - include Authentication::ByCookieToken - - validates_presence_of :login - validates_length_of :login, :within => 3..40 - validates_uniqueness_of :login - validates_format_of :login, :with => Authentication.login_regex, :message => Authentication.bad_login_message +require 'digest/sha1' - validates_presence_of :email - validates_length_of :email, :within => 6..100 #r@a.wk - validates_uniqueness_of :email, :message => "has already been taken, perhaps you already registered." - validates_format_of :email, :with => Authentication.email_regex, :message => Authentication.bad_email_message +class User < ActiveRecord::Base - validates_format_of :first_name, :with => Authentication.name_regex, :message => Authentication.bad_name_message, :allow_nil => true - validates_length_of :first_name, :maximum => 30, :allow_nil => true + include Authentication + include Authentication::ByPassword + include Authentication::ByCookieToken + + validates_presence_of :login + validates_length_of :login, :within => 3..40 + validates_uniqueness_of :login + validates_format_of :login, :with => Authentication.login_regex, :message => Authentication.bad_login_message + + validates_presence_of :email + validates_length_of :email, :within => 6..100 #r@a.wk + validates_uniqueness_of :email, :message => "has already been taken, perhaps you already registered." + validates_format_of :email, :with => Authentication.email_regex, :message => Authentication.bad_email_message + + validates_format_of :first_name, :with => Authentication.name_regex, :message => Authentication.bad_name_message, :allow_nil => true + validates_length_of :first_name, :maximum => 30, :allow_nil => true - validates_format_of :last_name, :with => Authentication.name_regex, :message => Authentication.bad_name_message, :allow_nil => true - validates_length_of :last_name, :maximum => 30, :allow_nil => true + validates_format_of :last_name, :with => Authentication.name_regex, :message => Authentication.bad_name_message, :allow_nil => true + validates_length_of :last_name, :maximum => 30, :allow_nil => true - validates_format_of :company, :with => Authentication.name_regex, :message => Authentication.bad_name_message, :allow_nil => true - validates_length_of :company, :maximum => 50, :allow_nil => true + validates_format_of :company, :with => Authentication.name_regex, :message => Authentication.bad_name_message, :allow_nil => true + validates_length_of :company, :maximum => 50, :allow_nil => true - validates_format_of :headline, :with => Authentication.name_regex, :message => Authentication.bad_name_message, :allow_nil => true - validates_length_of :headline, :maximum => 50, :allow_nil => true + validates_format_of :headline, :with => Authentication.name_regex, :message => Authentication.bad_name_message, :allow_nil => true + validates_length_of :headline, :maximum => 50, :allow_nil => true - validates_length_of :secondary_email, :allow_blank => true, :within => 6..100 - validates_uniqueness_of :secondary_email, :allow_blank => true, :message => "has been used for another account." - validates_format_of :secondary_email, :with => Authentication.email_regex, :message => Authentication.bad_email_message, :allow_blank => true + validates_length_of :secondary_email, :allow_blank => true, :within => 6..100 + validates_uniqueness_of :secondary_email, :allow_blank => true, :message => "has been used for another account." + validates_format_of :secondary_email, :with => Authentication.email_regex, :message => Authentication.bad_email_message, :allow_blank => true - validates_length_of :skills, :within => 0..250, :allow_nil => true - validates_length_of :purpose, :within => 0..500, :allow_nil => true + validates_length_of :skills, :within => 0..250, :allow_nil => true + validates_length_of :purpose, :within => 0..500, :allow_nil => true - validates_length_of :experience, :within => 0..4000, :allow_nil => true - validates_length_of :education, :within => 0..1000, :allow_nil => true + validates_length_of :experience, :within => 0..4000, :allow_nil => true + validates_length_of :education, :within => 0..1000, :allow_nil => true - validates_associated :locations, :message => "must be unique (cannot have two of the same)." - validates_presence_of :locations, :message => "error: you must have at least one location." + validates_associated :locations, :message => "must be unique (cannot have two of the same)." + validates_presence_of :locations, :message => "error: you must have at least one location." # may also want to require general skills and industries, but need to add at sign up # only reason not to add now has been to reduce complexity of registration # however, the industry and general_skills models, through update, will require addition of these - validates_size_of :general_skills, :maximum => 5, :message => "error: you cannot select more than 5 general skills." - validates_size_of :relevant_industries, :maximum => 5, :message => "error: you cannot select more than 5 interests." - - has_many :invitations, :dependent => :destroy - has_many :ideas + validates_size_of :general_skills, :maximum => 5, :message => "error: you cannot select more than 5 general skills." + validates_size_of :relevant_industries, :maximum => 5, :message => "error: you cannot select more than 5 interests." + + has_many :invitations, :dependent => :destroy + has_many :ideas has_many :active_ideas, :class_name => "Idea", :conditions => "ideas.active" - has_many :projects - has_many :comments + has_many :projects + has_many :comments has_many :jobs, :dependent => :destroy has_many :job_applications, :dependent => :destroy @@ -101,7 +101,7 @@ class User < ActiveRecord::Base has_many :watchlists, :dependent => :destroy # figure out who is watching this user has_many :wlists, :as => :watch, :dependent => :destroy, :class_name => "Watchlist" - has_many :watchers, :through => :wlists, :source => :user + has_many :watchers, :through => :wlists, :source => :user # for dashboard - watched ideas has_many :watched_ideas, :through => :watchlists, :source => :watch, :source_type => "Idea", :conditions => "ideas.active" @@ -147,16 +147,16 @@ class User < ActiveRecord::Base has_many :icebreakers - before_create :make_activation_code + before_create :make_activation_code after_create :create_some_objects before_update :custom_counter_cache_before_update before_destroy :log # decreaseing active member count on projects not needed # because this will be handled through destroy of job application - - # HACK HACK HACK -- how to do attr_accessible from here? - # prevents a user from submitting a crafted form that bypasses activation - # anything else you want your user to change should be added here. + + # HACK HACK HACK -- how to do attr_accessible from here? + # prevents a user from submitting a crafted form that bypasses activation + # anything else you want your user to change should be added here. attr_accessible :login, :email, :secondary_email, @@ -176,89 +176,89 @@ class User < ActiveRecord::Base :password_confirmation, :last_logon, :previous_logon, - :idea_attributes # virtual attribute + :idea_attributes # virtual attribute - def self.get(conditions, order, page) + def self.get(conditions, order, page) paginate :include => [ :scorecard ], - :per_page => 10, :page => page, - :conditions => conditions, - :order => order - end - - # Activates the user in the database. - def activate! + :per_page => 10, :page => page, + :conditions => conditions, + :order => order + end + + # Activates the user in the database. + def activate! now = Time.now.utc - @activated = true - self.activated_at = now - self.activation_code = nil + @activated = true + self.activated_at = now + self.activation_code = nil self.active = true # needed because default when registering is false to prevent # the profile from coming up in search results, etc - save(false) + save(false) logon.previous = logon.last = now logon.save(false) - end - - # Returns true if the user has just been activated. - def recently_activated? - @activated - end - - def active? - # the existence of an activation code means they have not activated yet - activation_code.nil? - end - - # Authenticates a user by their login name and unencrypted password. Returns the user or nil. - # - # uff. this is really an authorization, not authentication routine. - # We really need a Dispatch Chain here or something. - # This will also let us return a human error message. - # - def self.authenticate(login, password) - return nil if login.blank? || password.blank? - u = find :first, :conditions => ['(login = ? or email = ?) and activated_at IS NOT NULL', login, login] # need to get the salt - u && u.authenticated?(password) ? u : nil - end - - def login=(value) - write_attribute :login, (value ? value.downcase : nil) - end - - def email=(value) - write_attribute :email, (value ? value.downcase : nil) - end - - - def forgot_password - @forgotten_password = true - self.make_password_reset_code - end - - def reset_password - # First update the password_reset_code before setting the - # reset_password flag to avoid duplicate mail notifications. - update_attributes(:password_reset_code => nil) - @reset_password = nil - end - - # Used in user_observer - def recently_forgot_password? - @forgotten_password - end - - # Used in user_observer - def recently_reset_password? - @reset_password - end - - # Used in user_observer - def recently_activated? - @activated - end + end + + # Returns true if the user has just been activated. + def recently_activated? + @activated + end + + def active? + # the existence of an activation code means they have not activated yet + activation_code.nil? + end + + # Authenticates a user by their login name and unencrypted password. Returns the user or nil. + # + # uff. this is really an authorization, not authentication routine. + # We really need a Dispatch Chain here or something. + # This will also let us return a human error message. + # + def self.authenticate(login, password) + return nil if login.blank? || password.blank? + u = find :first, :conditions => ['(login = ? or email = ?) and activated_at IS NOT NULL', login, login] # need to get the salt + u && u.authenticated?(password) ? u : nil + end + + def login=(value) + write_attribute :login, (value ? value.downcase : nil) + end + + def email=(value) + write_attribute :email, (value ? value.downcase : nil) + end + + + def forgot_password + @forgotten_password = true + self.make_password_reset_code + end + + def reset_password + # First update the password_reset_code before setting the + # reset_password flag to avoid duplicate mail notifications. + update_attributes(:password_reset_code => nil) + @reset_password = nil + end + + # Used in user_observer + def recently_forgot_password? + @forgotten_password + end + + # Used in user_observer + def recently_reset_password? + @reset_password + end + + # Used in user_observer + def recently_activated? + @activated + end def author?(author) # this for rating. name of method needs to be renamed for profiles, but initially done for ideas and projects @@ -462,22 +462,22 @@ class User < ActiveRecord::Base - protected + protected def create_some_objects self.create_scorecard self.create_logon end - - def make_activation_code - - self.activation_code = self.class.make_token - end - - def make_password_reset_code - self.password_reset_code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join ) - end - + + def make_activation_code + + self.activation_code = self.class.make_token + end + + def make_password_reset_code + self.password_reset_code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join ) + end + # need to use an association with source_type instead def extract_from_watchlist(list) @@ -556,4 +556,4 @@ class User < ActiveRecord::Base end -end +end app/models/user.rb @@ -1,53 +1,53 @@ -class UserMailer < ActionMailer::Base +class UserMailer < ActionMailer::Base - def signup_notification(user) - setup_email(user) - @subject += 'Please activate your new account' - @body[:url] = "http://#{domain}/activate/#{user.activation_code}" - end - - def activation(user) - setup_email(user) - @subject += 'Your account has been activated!' - @body[:url] = "http://www.commune2.com/" - end - - def forgot_password(user) - setup_email(user) - - @subject += 'Password reset help' - @body[:url] = "http://#{domain}/reset_password/#{user.password_reset_code}" - end - - def reset_password(user) - setup_email(user,'Your password has been reset.') - end - - def general(options = {}) - - @recipients = options[:recipients] + def signup_notification(user) + setup_email(user) + @subject += 'Please activate your new account' + @body[:url] = "http://#{domain}/activate/#{user.activation_code}" + end + + def activation(user) + setup_email(user) + @subject += 'Your account has been activated!' + @body[:url] = "http://www.commune2.com/" + end + + def forgot_password(user) + setup_email(user) + + @subject += 'Password reset help' + @body[:url] = "http://#{domain}/reset_password/#{user.password_reset_code}" + end + + def reset_password(user) + setup_email(user,'Your password has been reset.') + end + + def general(options = {}) + + @recipients = options[:recipients] @from = options[:from] || postman - @reply_to = options[:reply_to] if options[:reply_to] - - @subject = options[:subject] || "Commune2.com email" - @sent_on = Time.now - @bcc = postman - - @body[:who] = options[:who] || @reply_to - @body[:message] = options[:message] - @body[:url] = options[:url] || "http://www.commune2.com/" - - end - + @reply_to = options[:reply_to] if options[:reply_to] + + @subject = options[:subject] || "Commune2.com email" + @sent_on = Time.now + @bcc = postman + + @body[:who] = options[:who] || @reply_to + @body[:message] = options[:message] + @body[:url] = options[:url] || "http://www.commune2.com/" + + end + def message(msg) who = msg.from.name.blank? ? msg.from.login : msg.from.name @recipients = msg.to.email - @from = postman + @from = postman @reply_to = msg.from.email @subject = "[commune2 | " + who + "] " + msg.subject - @sent_on = Time.now + @sent_on = Time.now @bcc = @from @body[:message] = msg.body @@ -55,17 +55,17 @@ class UserMailer < ActionMailer::Base @body[:profile] = msg.from end - - protected - def setup_email(user) - @recipients = "#{user.email}" - @from = postman - @subject = "[commune2.com] " - @sent_on = Time.now - @bcc = @from - - @body[:user] = user - end + + protected + def setup_email(user) + @recipients = "#{user.email}" + @from = postman + @subject = "[commune2.com] " + @sent_on = Time.now + @bcc = @from + + @body[:user] = user + end private @@ -76,5 +76,5 @@ private def postman ENV['RAILS_ENV'] == "production" ? "Commune2 Postman <postman@mailer.commune2.com>" : "C2 DEV Postman <devpost@mailer.commune2.com>" end - -end + +end app/models/user_mailer.rb @@ -1,16 +1,16 @@ -class UserObserver < ActiveRecord::Observer - def after_create(user) - UserMailer.deliver_signup_notification(user) +class UserObserver < ActiveRecord::Observer + def after_create(user) + UserMailer.deliver_signup_notification(user) invite = Invitation.find_by_email(user.email) if invite invite.registered = user - invite.save(false) - end - end - - def after_save(user) - UserMailer.deliver_activation(user) if user.recently_activated? - UserMailer.deliver_forgot_password(user) if user.recently_forgot_password? - UserMailer.deliver_reset_password(user) if user.recently_reset_password? - end -end + invite.save(false) + end + end + + def after_save(user) + UserMailer.deliver_activation(user) if user.recently_activated? + UserMailer.deliver_forgot_password(user) if user.recently_forgot_password? + UserMailer.deliver_reset_password(user) if user.recently_reset_password? + end +end app/models/user_observer.rb @@ -1,4 +1,4 @@ - <div id="comment"> + <div id="comment"> <hr class="dashed"> <% if comment.user %> @@ -9,8 +9,8 @@ (<%= time_ago_in_words(comment.created_at) %> ago) - <p><%= simple_format(strip_tags(comment.comment)) %></p> + <p><%= simple_format(strip_tags(comment.comment)) %></p> <%= button_to_delete_if_allowed comment %> - </div> + </div> app/views/comments/_comment.html.erb app/views/ideas/_idea.html.erb @@ -1,33 +1,33 @@ <% content_for :title do %>Editing Idea<% end %> - - <h1>Edit Idea</h1> + + <h1>Edit Idea</h1> <p><%= link_to "Exit edit", idea_path(:id => @idea) %></p> - -<div id="post"> - - <%= error_messages_for :idea %> - - <% form_for @idea do |f| -%> - - <p>Is this idea active or inactive? - <%= f.radio_button :active, "true", :checked => true %>Active - <%= f.radio_button :active, "false" %>Inactive <br /> - <i>Only active ideas can be viewed by others.</i></p> - - - <p><%= label_tag 'Title' %><br/> - <%= f.text_field :title, :style=>"width:600px;" %></p> - - - <p><%= label_tag 'Description' %><br/> - <%= f.text_area :description, :rows => 10, :style=>"width:600px;" %></p> + +<div id="post"> + + <%= error_messages_for :idea %> + + <% form_for @idea do |f| -%> + + <p>Is this idea active or inactive? + <%= f.radio_button :active, "true", :checked => true %>Active + <%= f.radio_button :active, "false" %>Inactive <br /> + <i>Only active ideas can be viewed by others.</i></p> + + + <p><%= label_tag 'Title' %><br/> + <%= f.text_field :title, :style=>"width:600px;" %></p> + + + <p><%= label_tag 'Description' %><br/> + <%= f.text_area :description, :rows => 10, :style=>"width:600px;" %></p> <p>Select relevant industries (no more than 5 please)</p> <%= render :partial => '/shared/industries', :locals => { :industry_ids => @industry_ids} %> - - <p><%= submit_tag "Update" %></p> - <% end %> -</div> + + <p><%= submit_tag "Update" %></p> + <% end %> +</div> app/views/ideas/edit.html.erb app/views/ideas/index.html.erb @@ -16,18 +16,18 @@ </div> <% end %> - - -<% if @ideas.blank? %> + + +<% if @ideas.blank? %> <% unless flash[:new_project] %> <h1>Got ideas?</h1> - <p>You have not posted any ideas yet. Click <%= link_to 'here', new_idea_path %> if you would like to post your first.</p> + <p>You have not posted any ideas yet. Click <%= link_to 'here', new_idea_path %> if you would like to post your first.</p> <% end %> <% else %> - + <h1>My Ideas</h1> - <%= render :partial => @ideas %> -<% end %> - -<%= will_paginate @ideas %> - + <%= render :partial => @ideas %> +<% end %> + +<%= will_paginate @ideas %> + app/views/ideas/my_ideas.html.erb @@ -4,34 +4,34 @@ <tr> <td width="70%" valign="top"> - <h1>New Idea</h1> - - <div id="post"> - - <% form_for @idea do |f| -%> + <h1>New Idea</h1> + + <div id="post"> + + <% form_for @idea do |f| -%> <%= f.error_messages %> - - <p>Is this idea active or inactive? - <%= f.radio_button :active, "true", :checked => true %>Active - <%= f.radio_button :active, "false" %>Inactive <br /> - <i>Only active ideas can be viewed by others.</i></p> - - - <p><%= label_tag 'Title' %><br/> - <%= f.text_field :title, :style=>"width:600px;" %></p> - - - <p><%= label_tag 'Description' %><br/> - <%= f.text_area :description, :rows => 10, :style=>"width:600px;" %></p> + + <p>Is this idea active or inactive? + <%= f.radio_button :active, "true", :checked => true %>Active + <%= f.radio_button :active, "false" %>Inactive <br /> + <i>Only active ideas can be viewed by others.</i></p> + + + <p><%= label_tag 'Title' %><br/> + <%= f.text_field :title, :style=>"width:600px;" %></p> + + + <p><%= label_tag 'Description' %><br/> + <%= f.text_area :description, :rows => 10, :style=>"width:600px;" %></p> <p>Select relevant categories (no more than 5 please)<%= ", <i>" + pluralize(@industry_ids.size, "category") + " " + @message + "</i>" unless @message.blank? %></p> <%= render :partial => '/shared/industries', :locals => { :industry_ids => @industry_ids } %> - - <p><%= submit_tag "Post Idea" %></p> - <% end %> - </div> + + <p><%= submit_tag "Post Idea" %></p> + <% end %> + </div> </td> <td valign="top" align="center"> <table border="0" width="90%" cellspacing="0" cellpadding="0" align="center"> app/views/ideas/new.html.erb @@ -1,9 +1,9 @@ <% content_for :title do %>Idea <% end %> - -<% if @idea.blank? %> - <p>Sorry, no idea to see here.</p> -<% else %> +<% if @idea.blank? %> + <p>Sorry, no idea to see here.</p> + +<% else %> <div id="show-container"> @@ -13,9 +13,9 @@ <div id="show-action-menu"> - <% if @idea.user_id == current_user.id %> + <% if @idea.user_id == current_user.id %> <%= link_to "edit", edit_idea_path(@idea), :class => "action_menu_edit" %> - <% end %> + <% end %> <%= link_to "launch project", new_idea_project_path(@idea), :class => "action_menu_launch_project" %> @@ -25,26 +25,26 @@ </div> <div id="show-main-container"> - + <h1><%= image_tag("/images/other_icons/watched_item_icon_yellow.png", :border => 0, :title => "On Watchlist") if current_user.watched_ideas.include?(@idea) %> - <%=h @idea.title %></h1> + <%=h @idea.title %></h1> - <%= render :partial => '/shared/stars', :locals => { :scorable => @idea} %> + <%= render :partial => '/shared/stars', :locals => { :scorable => @idea} %> <p>Relevant industries: <%= @idea.industries_string %></p> - <%= @idea.user ? render(:partial => @idea.user) : "Anonymous" %> + <%= @idea.user ? render(:partial => @idea.user) : "Anonymous" %> <p> Posted: <%= time_ago_in_words(@idea.created_at) %> ago <% if @idea.created_at < @idea.updated_at %> | Updated: <%= time_ago_in_words(@idea.updated_at) %> ago <% end %> - </p> + </p> - <hr /> + <hr /> - <p><b>Details</b><br /><%= simple_format(strip_tags(@idea.description)) %></p> + <p><b>Details</b><br /><%= simple_format(strip_tags(@idea.description)) %></p> <table border="0" cellspacing="0" cellpadding="0"> <tr> @@ -52,31 +52,31 @@ <%= image_tag("other_icons/comment_icon_sm.png", :border =>"0") %> </td> <td valign="center"> - <%= pluralize @idea.scorecard.total_comments_count, "Comment" %> + <%= pluralize @idea.scorecard.total_comments_count, "Comment" %> </td> </tr> </table> - <%= render :partial => @idea.comments %> + <%= render :partial => @idea.comments %> <div id="postcomment"> - <h2>New Comment</h2> - - <% form_tag post_idea_comment_path do -%> - <%= text_area_tag 'newcomment', @comment, :rows => 10, :cols => 38 %> - <%= hidden_field_tag 'idea', @idea.id %> - <p><%= submit_tag 'Post Comment' %></p> - <% end %> - </div> + <h2>New Comment</h2> + + <% form_tag post_idea_comment_path do -%> + <%= text_area_tag 'newcomment', @comment, :rows => 10, :cols => 38 %> + <%= hidden_field_tag 'idea', @idea.id %> + <p><%= submit_tag 'Post Comment' %></p> + <% end %> + </div> - </div> + </div> - <div id="show-stat"> + <div id="show-stat"> <%= stats_for @idea, {:icons_side => "left", :breakout => true} %> </div> - - </div> - + </div> + + <% end %> app/views/ideas/show.html.erb @@ -1,6 +1,6 @@ <% status = invitation.status %> - + <table border="0" cellspacing="0" cellpadding="0" width="100%"> <tr> <td> app/views/invitations/_invitation.html.erb app/views/invitations/new.html.erb app/views/jobs/_job.html.erb @@ -1,31 +1,31 @@ <% content_for :title do %>Editing Job<% end %> - -<h1>Edit Job</h1> + +<h1>Edit Job</h1> <p><%= link_to "Exit edit", job_path(:id => @job) %></p> - -<div id="post"> - -<% form_for @job do |f| -%> + +<div id="post"> + +<% form_for @job do |f| -%> <%= f.error_messages %> - - <p>Is this job post active or inactive? - <%= f.radio_button :active, "true", :checked => true %>Active - <%= f.radio_button :active, "false" %>Inactive <br /> - <i>Only active job posts can be viewed by others.</i></p> - - <p><%= label_tag 'Job title' %><br/> - <%= f.text_field :title, :style=>"width:600px;" %></p> + + <p>Is this job post active or inactive? + <%= f.radio_button :active, "true", :checked => true %>Active + <%= f.radio_button :active, "false" %>Inactive <br /> + <i>Only active job posts can be viewed by others.</i></p> + + <p><%= label_tag 'Job title' %><br/> + <%= f.text_field :title, :style=>"width:600px;" %></p> <%= label_tag 'General skills' %><br /> <i>Please select no more than 5:</i> <%= render :partial => '/shared/general_skills', :locals => { :skill_ids => @skill_ids } %> - - <p><%= label_tag 'Description' %><br/> - <%= f.text_area :description, :rows => 10, :style=>"width:600px;" %></p> - - <p><%= submit_tag "Update" %></p> - <% end %> -</div> + + <p><%= label_tag 'Description' %><br/> + <%= f.text_area :description, :rows => 10, :style=>"width:600px;" %></p> + + <p><%= submit_tag "Update" %></p> + <% end %> +</div> app/views/jobs/edit.html.erb app/views/jobs/index.html.erb @@ -1,12 +1,12 @@ <% content_for :title do %>My Posted Jobs<% end %> - - -<h1><%= @title %></h1> - -<% if @jobs.blank? %> - You have not posted any jobs yet. -<% else %> - <%= render :partial => @jobs %> -<% end %> - + + +<h1><%= @title %></h1> + +<% if @jobs.blank? %> + You have not posted any jobs yet. +<% else %> + <%= render :partial => @jobs %> +<% end %> + <%= will_paginate @jobs %> app/views/jobs/my_posted_jobs.html.erb @@ -5,41 +5,41 @@ <tr> <td width="70%" valign="top"> - <h1>New Job</h1> + <h1>New Job</h1> - <div id="post"> - <% form_for @job do |f| -%> + <div id="post"> + <% form_for @job do |f| -%> <%= f.error_messages %> - - <% if @project %> - <p>This job is for the <%= link_to h(@project.title), project_path(:id => @project) %> project.</p> - <p>The job post will have a link to the project if the project is active.</p> - <%= f.hidden_field :project_id, :value => @project.id %> - <% end %> - - - <p>Is this job post active or inactive? - <%= f.radio_button :active, "true", :checked => true %>Active - <%= f.radio_button :active, "false" %>Inactive <br /> - <i>Only active job posts can be viewed by others.</i></p> - - <p><%= label_tag 'Job title' %><br/> - <%= f.text_field :title, :style=>"width:600px;" %></p> + + <% if @project %> + <p>This job is for the <%= link_to h(@project.title), project_path(:id => @project) %> project.</p> + <p>The job post will have a link to the project if the project is active.</p> + <%= f.hidden_field :project_id, :value => @project.id %> + <% end %> + + + <p>Is this job post active or inactive? + <%= f.radio_button :active, "true", :checked => true %>Active + <%= f.radio_button :active, "false" %>Inactive <br /> + <i>Only active job posts can be viewed by others.</i></p> + + <p><%= label_tag 'Job title' %><br/> + <%= f.text_field :title, :style=>"width:600px;" %></p> <%= label_tag 'General skills' %><br /> <i>Please select no more than 5:</i> <%= render :partial => '/shared/general_skills', :locals => { :skill_ids => @skill_ids } %> - <p><%= label_tag 'Description' %><br/> - <%= f.text_area :description, :rows => 10, :style=>"width:600px;" %></p> - - - <p><%= submit_tag "Create Job" %></p> - <% end %> - </div> + <p><%= label_tag 'Description' %><br/> + <%= f.text_area :description, :rows => 10, :style=>"width:600px;" %></p> + + + <p><%= submit_tag "Create Job" %></p> + <% end %> + </div> </td> <td valign="top" align="center"> app/views/jobs/new.html.erb @@ -1,9 +1,9 @@ <% content_for :title do %>Job <% end %> - -<% if @job.blank? %> - <p>Sorry, no job to see here.</p> -<% else %> +<% if @job.blank? %> + <p>Sorry, no job to see here.</p> + +<% else %> <div id="show-container"> @@ -22,15 +22,15 @@ </div> <div id="show-main-container"> - - <h1><%= image_tag("/images/other_icons/watched_item_icon_yellow.png", :border => 0, :title => "On Watchlist") if current_user.watched_jobs.include?(@job) %> <%=h @job.title %></h1> + + <h1><%= image_tag("/images/other_icons/watched_item_icon_yellow.png", :border => 0, :title => "On Watchlist") if current_user.watched_jobs.include?(@job) %> <%=h @job.title %></h1> <p> Posted: <%= time_ago_in_words(@job.created_at) %> ago <% if @job.created_at < @job.updated_at %> | Updated: <%= time_ago_in_words(@job.updated_at) %> ago <% end %> - </p> + </p> <% if @job.hired_user %> <p>Currently at this position:</p> @@ -42,20 +42,20 @@ <%=h @job.general_skills_string %></p> <p><b>Details</b><br /> - <%= simple_format(h(strip_tags(@job.description))) %></p> + <%= simple_format(h(strip_tags(@job.description))) %></p> <div id="white-divider">&nbsp;</div> - <% if @job.project and (@job.project.active? || @job.user == current_user) %> + <% if @job.project and (@job.project.active? || @job.user == current_user) %> <div id="section_header"><h2>&nbsp;Project</h2></div> <%= render :partial => @job.project %> - <% end %> + <% end %> <div id="section_header"><h2>&nbsp;Who's hiring?</h2></div> - <%= @job.user ? render(:partial => @job.user) : "Anonymous" %> + <%= @job.user ? render(:partial => @job.user) : "Anonymous" %> - <% if @job.project.user == current_user or (@job.project.members.include?(current_user) and not @job.job_applications.find_by_user_id(current_user.id)) %> + <% if @job.project.user == current_user or (@job.project.members.include?(current_user) and not @job.job_applications.find_by_user_id(current_user.id)) %> <div id="section_header"><h2>&nbsp;<%= pluralize @job.applicants.count, "Job Applicant" %></h2></div> <% @job.job_applications.each do |application| %> @@ -88,10 +88,10 @@ <% end %> - <% end %> + <% end %> - <% if @job.applicants.include?(current_user) %> + <% if @job.applicants.include?(current_user) %> <% if @job.hired_user == current_user %> <p>You are currently hired for this job.</p> @@ -111,43 +111,43 @@ <% else %> - <p><b>You applied for this job on <%= time_ago_in_words(@application.created_at) %> ago.</b></p> + <p><b>You applied for this job on <%= time_ago_in_words(@application.created_at) %> ago.</b></p> <% form_for @application do |f| -%> <%= f.text_area :message, :rows => 10, :cols => 60 %> - <p><%= submit_tag 'Update Job Application' %></p> + <p><%= submit_tag 'Update Job Application' %></p> <% end %> - + <%= button_to "Delete Application", job_application_path(@application), :confirm => "Are you sure you want to delete your application?", :method => :delete %> - <% end %> - <% else %> + <% end %> + <% else %> <% if current_user.active == true %> <h2>Want to apply?</h2> <p>Write a message and hit apply (1000 character limit) <% form_for @application do |f| -%> - <%= f.hidden_field :job_id %> + <%= f.hidden_field :job_id %> <%= f.text_area :message, :rows => 10, :cols => 60 %> - <p><%= submit_tag 'Apply' %></p> - <% end %> + <p><%= submit_tag 'Apply' %></p> + <% end %> <% end %> - <% end %> + <% end %> - </div> + </div> - <div id="show-stat"> + <div id="show-stat"> <%= stats_for @job, {:icons_side => "left", :breakout => true} %> - </div> + </div> </div> - + <% end %> app/views/jobs/show.html.erb @@ -1,7 +1,7 @@ <!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" /> +<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>Commune2 | <%= yield :title %></title> <%= stylesheet_link_tag 'style' %> @@ -10,8 +10,8 @@ <%= javascript_include_tag 'unitpngfix.js' %> <![endif]--> - </head> - <body> + </head> + <body> <div id="site-container"> @@ -49,7 +49,7 @@ - <% if logged_in? and request.path_parameters[:controller] != "user" %> + <% if logged_in? and request.path_parameters[:controller] != "user" %> <td valign="top" width="140"> @@ -134,17 +134,17 @@ <div id="content"> - <div id="system_message">Please note that this website is still under test. You can help us by playing with it!</div> + <div id="system_message">Please note that this website is still under test. You can help us by playing with it!</div> + + <% unless flash[:error].blank? %> + <div id="error"><%=h flash[:error] %> </div> + <% end %> + <% unless flash[:notice].blank? %> + <div id="notice"><%=h flash[:notice] %> </div> + <% end %> - <% unless flash[:error].blank? %> - <div id="error"><%=h flash[:error] %> </div> - <% end %> - <% unless flash[:notice].blank? %> - <div id="notice"><%=h flash[:notice] %> </div> - <% end %> - - <%= yield %> + <%= yield %> </div> @@ -157,7 +157,7 @@ <div id="disclaimer"> <p>&copy; 2009 Commune2.com. A social networking enterprise. Owned by <a href=http://www.bisonpeak.com>Bison Peak Corporation</a>. All rights reserved.</p> - </div> + </div> </td> @@ -179,7 +179,7 @@ } catch(err) {} </script> - </body> -</html> - + </body> +</html> + <% flash.discard %> app/views/layouts/application.html.erb @@ -18,7 +18,7 @@ <td valign="top"><h2>Message</h2></td> <td><p><%= f.text_area :body, :rows => 6, :style => "width: 100%" %></p> - <p><%= render :partial => '/shared/reCAPTCHA' %><p> + <p><%= render :partial => '/shared/reCAPTCHA' %><p> </td> </tr> app/views/messages/new.html.erb app/views/projects/_project.html.erb @@ -1,27 +1,27 @@ <% content_for :title do %>Editing Project<% end %> -<h1>Edit Project</h1> +<h1>Edit Project</h1> <p><%= link_to "Exit edit", project_path(:id => @project) %></p> -<%= error_messages_for :project %> - -<div id="post"> - - <% form_for @project do |f| -%> - - <p>Is this project active or inactive? - <%= f.radio_button :active, "true", :checked => true %>Active - <%= f.radio_button :active, "false" %>Inactive <br /> - <i>Details of inactive projects (project page) only visible to project members.</i></p> - - - <p><%= label_tag 'Project title' %><br/> - <%= f.text_field :title, :style=>"width:600px;" %></p> - - <p><%= label_tag 'Description' %><br/> - <%= f.text_area :description, :rows => 10, :style=>"width:600px;"%></p> - +<%= error_messages_for :project %> + +<div id="post"> + + <% form_for @project do |f| -%> + + <p>Is this project active or inactive? + <%= f.radio_button :active, "true", :checked => true %>Active + <%= f.radio_button :active, "false" %>Inactive <br /> + <i>Details of inactive projects (project page) only visible to project members.</i></p> + + + <p><%= label_tag 'Project title' %><br/> + <%= f.text_field :title, :style=>"width:600px;" %></p> + + <p><%= label_tag 'Description' %><br/> + <%= f.text_area :description, :rows => 10, :style=>"width:600px;"%></p> + <p>Select relevant industries (no more than 5 please)</p> <%= render :partial => '/shared/industries', :locals => { :industry_ids => @industry_ids } %> @@ -40,7 +40,7 @@ <a href="http://hobix.com/textile/quick.html" target="_blank">Click here for detailed wiki synthax reference guide</a>. - <p><%= f.text_area :wiki, :rows => 25, :style=>"width:600px;" %></p> - <p><%= submit_tag "Update" %></p> - <% end %> -</div> + <p><%= f.text_area :wiki, :rows => 25, :style=>"width:600px;" %></p> + <p><%= submit_tag "Update" %></p> + <% end %> +</div> app/views/projects/edit.html.erb app/views/projects/index.html.erb @@ -1,5 +1,5 @@ <% content_for :title do %>My Projects<% end %> - + <% if flash[:new_job] %> <div id="detailed_notice"> <h2>To post a job:</h2> @@ -12,20 +12,20 @@ </div> <% end %> - - -<% if @projects.blank? %> + + +<% if @projects.blank? %> <% unless flash[:new_job] %> <h1>Working on something?</h1> - <p> You have not posted any projects yet. Click <%= link_to 'here', new_project_path %> if you would like to post your first.</p> + <p> You have not posted any projects yet. Click <%= link_to 'here', new_project_path %> if you would like to post your first.</p> <% end %> -<% else %> +<% else %> <h1>My Projects</h1> - <%= render :partial => @projects %> -<% end %> - + <%= render :partial => @projects %> +<% end %> + <%= will_paginate @projects %> app/views/projects/my_projects.html.erb @@ -4,38 +4,38 @@ <tr> <td width="70%" valign="top"> - <h1>New Project</h1> - <%= error_messages_for :project %> - - <div id="post"> - - <% form_for :project, :url => projects_path do |f| -%> - - <% if @idea %> - This project is being spawned off of the "<%= link_to @idea.title, idea_path(:id => @idea) %>" idea. - <%= f.hidden_field :idea_id, :value => @idea.id %> - <% end %> - - <p>Is this project active or inactive? - <%= f.radio_button :active, "true", :checked => true %>Active - <%= f.radio_button :active, "false" %>Inactive <br /> - <i>Only active projects can be viewed by others, including from any jobs posts.</i></p> - - - <p><%= label_tag 'Project title' %><br/> - <%= f.text_field :title, :style=>"width:600px;" %></p> - - <p><%= label_tag 'Description' %><br/> - <%= f.text_area :description, :rows => 10, :style=>"width:600px;" %></p> - + <h1>New Project</h1> + <%= error_messages_for :project %> + + <div id="post"> + + <% form_for :project, :url => projects_path do |f| -%> + + <% if @idea %> + This project is being spawned off of the "<%= link_to @idea.title, idea_path(:id => @idea) %>" idea. + <%= f.hidden_field :idea_id, :value => @idea.id %> + <% end %> + + <p>Is this project active or inactive? + <%= f.radio_button :active, "true", :checked => true %>Active + <%= f.radio_button :active, "false" %>Inactive <br /> + <i>Only active projects can be viewed by others, including from any jobs posts.</i></p> + + + <p><%= label_tag 'Project title' %><br/> + <%= f.text_field :title, :style=>"width:600px;" %></p> + + <p><%= label_tag 'Description' %><br/> + <%= f.text_area :description, :rows => 10, :style=>"width:600px;" %></p> + <p>Select relevant industries (no more than 5 please)<%= ", <i>" + pluralize(@industry_ids.size, "industry") + " " + @message + "</i>" unless @message.blank? %></p> <%= render :partial => '/shared/industries', :locals => { :industry_ids => @industry_ids } %> - - <p><%= submit_tag "Create Project" %></p> - <% end %> - </div> + + <p><%= submit_tag "Create Project" %></p> + <% end %> + </div> </td> <td valign="top" align="center"> <table border="0" width="90%" cellspacing="0" cellpadding="0" align="center"> app/views/projects/new.html.erb @@ -1,9 +1,9 @@ <% content_for :title do %>Project <% end %> - -<% if @project.blank? %> - <p>Sorry, no project to see here.</p> -<% else %> +<% if @project.blank? %> + <p>Sorry, no project to see here.</p> + +<% else %> <div id="show-container"> @@ -22,21 +22,21 @@ <% end %> <%= render :partial => '/shared/watchlist_menu', :locals => { :object => @project} %> - + <%= button_to_delete_if_allowed @project %> </div> <div id="show-main-container"> - + <h1><%= image_tag("/images/other_icons/watched_item_icon_yellow.png", :border => 0, :title => "On Watchlist") if current_user.watched_projects.include?(@project) %> - <%=h @project.title %></h1> + <%=h @project.title %></h1> - <%= render :partial => '/shared/stars', :locals => { :scorable => @project} %> + <%= render :partial => '/shared/stars', :locals => { :scorable => @project} %> - <% if @project.idea %> - <p><b>This project was spawned from the "<%= link_to h(@project.idea.title), idea_path(:id => @project.idea) %>" idea.</b></p> - <% end %> + <% if @project.idea %> + <p><b>This project was spawned from the "<%= link_to h(@project.idea.title), idea_path(:id => @project.idea) %>" idea.</b></p> + <% end %> <p>Relevant industries: <%= @project.industries_string %></p> @@ -46,11 +46,11 @@ | Updated: <%= time_ago_in_words(@project.updated_at) %> ago <% end %> <br /> - </p> + </p> - <hr /> + <hr /> - <p><b>Details</b><br /><%= simple_format(strip_tags(@project.description)) %></p> + <p><b>Details</b><br /><%= simple_format(strip_tags(@project.description)) %></p> <% if @project.wiki and @project.wiki != "" %> <h2>Mini Wiki</h2> @@ -85,32 +85,32 @@ <%= image_tag("other_icons/comment_icon_sm.png", :border =>"0") %> </td> <td valign="center"> - <%= pluralize @project.scorecard.total_comments_count, "Comment" %> + <%= pluralize @project.scorecard.total_comments_count, "Comment" %> </td> </tr> </table> - <%= render :partial => @project.comments %> + <%= render :partial => @project.comments %> <div id="postcomment"> - <h2>New Comment</h2> - - <% form_tag post_project_comment_path do -%> - <%= text_area_tag 'newcomment', @comment, :rows => 10, :cols => 38 %> - <%= hidden_field_tag 'project', @project.id %> - <p><%= submit_tag 'Post Comment' %></p> - <% end %> - </div> + <h2>New Comment</h2> + + <% form_tag post_project_comment_path do -%> + <%= text_area_tag 'newcomment', @comment, :rows => 10, :cols => 38 %> + <%= hidden_field_tag 'project', @project.id %> + <p><%= submit_tag 'Post Comment' %></p> + <% end %> + </div> - </div> + </div> - <div id="show-stat"> + <div id="show-stat"> <%= stats_for @project, {:icons_side => "left", :breakout => true} %> </div> - - </div> - + </div> + + <% end %> app/views/projects/show.html.erb app/views/searches/index.html.erb app/views/sessions/new.html.erb @@ -1,4 +1,4 @@ - + <h2>Are you human?</h2> - <%= recaptcha_tags(:display => {:theme => 'red'}) %> + <%= recaptcha_tags(:display => {:theme => 'red'}) %> app/views/shared/_reCAPTCHA.html.erb app/views/user/index.html.erb @@ -1,5 +1,5 @@ -<%=h @user.login %>, your account has been activated. Welcome aboard! - - <%=h @url %> - +<%=h @user.login %>, your account has been activated. Welcome aboard! + + <%=h @url %> + (Do not reply to this email address) \ No newline at end of file app/views/user_mailer/activation.erb @@ -1,7 +1,7 @@ -You are getting this email because you told us you forgot your password. - -The link below will allow you to change your password. - -<%=h @url %> - +You are getting this email because you told us you forgot your password. + +The link below will allow you to change your password. + +<%=h @url %> + (Do not reply to this email address) \ No newline at end of file app/views/user_mailer/forgot_password.erb @@ -1,5 +1,5 @@ -<%=h @who %> has sent you a message. See below. - -<%=h @message %> - -<%=h @url %> +<%=h @who %> has sent you a message. See below. + +<%=h @message %> + +<%=h @url %> app/views/user_mailer/general.erb @@ -1,4 +1,4 @@ -<%=h @who %> has sent you a message through Commune2. You can view this person's profile here: <%= user_url(@profile) %> +<%=h @who %> has sent you a message through Commune2. You can view this person's profile here: <%= user_url(@profile) %> NOTE: Your email address was not revealed to <%=h @who %> by sending this email. However, if you reply you WILL reveal your email address. Do not reply unless you are comfortable revealing your email address. app/views/user_mailer/message.erb @@ -1,9 +1,9 @@ -The following is a copy of the non-disclosure agreement electronically signed by <%=h @nda.first_name %> <%=h @nda.last_name %>. - -This needs to be signed and mailed (or faxed). - -A copy is also available on <%=h @url %> - -= = = - -<%=h strip_tags(sanitize(@nda.agreement)) %> +The following is a copy of the non-disclosure agreement electronically signed by <%=h @nda.first_name %> <%=h @nda.last_name %>. + +This needs to be signed and mailed (or faxed). + +A copy is also available on <%=h @url %> + += = = + +<%=h strip_tags(sanitize(@nda.agreement)) %> app/views/user_mailer/nda.erb @@ -1,8 +1,8 @@ -Your account has been created. - - Username: <%=h @user.login %> - -Please visit this url to activate your account: -<%=h @url %> - +Your account has been created. + + Username: <%=h @user.login %> + +Please visit this url to activate your account: +<%=h @url %> + (Do not reply to this email address) app/views/user_mailer/signup_notification.erb app/views/users/_user.html.erb @@ -1,14 +1,14 @@ - - - <h1>Account</h1> - <p>Login name: <i><%= current_user.login %></i></p> - <p>Email: <i><%= current_user.email %></i></p> - - - <p>Want to change your password? Do it <%= link_to "here", change_password_path %>. - - - <% @nda = Nda.find_by_account_id(current_user.id) %> + + + <h1>Account</h1> + <p>Login name: <i><%= current_user.login %></i></p> + <p>Email: <i><%= current_user.email %></i></p> + + + <p>Want to change your password? Do it <%= link_to "here", change_password_path %>. + + + <% @nda = Nda.find_by_account_id(current_user.id) %> <% if @nda %> <div id="nda_show"><p>You have submitted an electornic non-disclosure agreement. It is currently binding, but you if have not done so already, you need to print and sign it. Click <%= link_to "here", nda_show_path %> to see this agreement.</p></div> <% end %> app/views/users/account.html.erb @@ -1,8 +1,8 @@ - - -<h1>Profiles</h1> + + +<h1>Profiles</h1> <% if params[:search] %><h2>Search Criteria: <%= params[:search] %></h2><% end %> - -<%= render :partial => 'profile_snippet' %> - + +<%= render :partial => 'profile_snippet' %> + <%= will_paginate @profiles %> app/views/users/browse.html.erb @@ -1,21 +1,21 @@ <% content_for :title do %>Change Password<% end %> - - <h1>Change your password</h1> - <%= error_messages_for :current_user %> -<% form_tag change_password_path do -%> - <p><%= label_tag 'New password' %><br /> - <%= password_field 'password', nil %></p> - - <p><%= label_tag 'Confirm new password' %><br /> - <%= password_field 'password_confirmation', nil %></p> - - <p><%= label_tag 'current password (the one you want to change)' %><br /> - <%= password_field 'old_password', nil %></p> - - <%= render :partial => '/shared/reCAPTCHA' %> - - <p><%= submit_tag 'Change!' %></p> - -<% end -%> - + + <h1>Change your password</h1> + <%= error_messages_for :current_user %> +<% form_tag change_password_path do -%> + <p><%= label_tag 'New password' %><br /> + <%= password_field 'password', nil %></p> + + <p><%= label_tag 'Confirm new password' %><br /> + <%= password_field 'password_confirmation', nil %></p> + + <p><%= label_tag 'current password (the one you want to change)' %><br /> + <%= password_field 'old_password', nil %></p> + + <%= render :partial => '/shared/reCAPTCHA' %> + + <p><%= submit_tag 'Change!' %></p> + +<% end -%> + app/views/users/change_password.html.erb @@ -1,21 +1,21 @@ <% content_for :title do %>Delete Account<% end %> - - <h1>Are you sure you want to delete your account?</h1> - <%= error_messages_for :current_user %> - <p>We are sorry to see you go. To delete your account, please enter your password.</p> -<% form_tag delete_account_path do -%> - - <p><%= label_tag 'Password' %><br /> + <h1>Are you sure you want to delete your account?</h1> - <%= password_field 'password', nil %></p> + <%= error_messages_for :current_user %> + <p>We are sorry to see you go. To delete your account, please enter your password.</p> +<% form_tag delete_account_path do -%> + + <p><%= label_tag 'Password' %><br /> -<br /><br /> - <%= render :partial => '/shared/reCAPTCHA' %> + <%= password_field 'password', nil %></p> <br /><br /> -<h2>You will not be able to undo this action...</h2> - <p><%= submit_tag 'DELETE MY ACCOUNT' %></p> - -<% end -%> + <%= render :partial => '/shared/reCAPTCHA' %> + +<br /><br /> +<h2>You will not be able to undo this action...</h2> + <p><%= submit_tag 'DELETE MY ACCOUNT' %></p> + +<% end -%> app/views/users/delete_account.html.erb @@ -5,10 +5,10 @@ <h1>My Profile and Account</h1> <p><%= link_to 'Click here', user_path(current_user) %> to see how other people see your profile.</p> - <p>Your rating: <%= render :partial => '/shared/stars', :locals => { :scorable => @user} %></p> + <p>Your rating: <%= render :partial => '/shared/stars', :locals => { :scorable => @user} %></p> - + <div id="section_header"><h2>&nbsp;Profile (public information)</h2></div> @@ -30,7 +30,7 @@ <%= render :partial => '/shared/add_location' %> - <br /><br /> + <br /><br /> </td> </tr> @@ -111,10 +111,10 @@ <%= submit_tag 'Save Changes & Update Profile' %></td></tr> - <tr><td colspan="2"><p>Want to change your password? Do it <%= link_to "here", change_password_path %> (any changes you made above would not be saved).</td></tr> + <tr><td colspan="2"><p>Want to change your password? Do it <%= link_to "here", change_password_path %> (any changes you made above would not be saved).</td></tr> </table> - <% end %> + <% end %> app/views/users/edit.html.erb @@ -1,24 +1,24 @@ <% content_for :title do %>Reset Password<% end %> - - - - <h1>Forgot your password?</h1> - + + + + <h1>Forgot your password?</h1> + <p>Enter your email address and we will help you reset your password.</p> - -<% form_tag forgot_password_path do -%> + +<% form_tag forgot_password_path do -%> <table border="0" cellspacing="0" cellpadding="0"> <tr> <td valign="top" width="250"> - <h2>Email</h2> - <%= text_field_tag 'email', @email%> + <h2>Email</h2> + <%= text_field_tag 'email', @email%> </td> <td valign="top"> <h2>Are you human?</h2> - <%= recaptcha_tags(:display => {:theme => 'red'}) %> + <%= recaptcha_tags(:display => {:theme => 'red'}) %> <br /> - <%= submit_tag 'Help!', :class => "big_button" %> + <%= submit_tag 'Help!', :class => "big_button" %> </td> </tr> @@ -26,5 +26,5 @@ <p> <%= link_to "Login", login_path %><br /> <%= link_to "Register", new_user_path %> - </p> -<% end -%> + </p> +<% end -%> app/views/users/forgot_password.html.erb @@ -1,6 +1,6 @@ <% content_for :title do %>People<% end %> - + <table border="0" width="100%" cellspacing="0" cellpadding="0"> <tr> <td width="70%" valign="top"> @@ -11,9 +11,9 @@ <% end %> <% if params[:search] %><h2>Search Criteria: <%=h params[:search] %></h2><% end %> - - <%= render :partial => @profiles %> - + + <%= render :partial => @profiles %> + <%= will_paginate @profiles %> </td> app/views/users/index.html.erb @@ -1,36 +1,36 @@ <% content_for :title do %>New Account<% end %> -<% flash[:notice] = "Registration by invitation only." %> +<% flash[:notice] = "Registration by invitation only." %> + - <%= error_messages_for :user, :header_message => "Could not create account" %> - -<h1>Registration</h1> -<p><b>NOTE:</b> If you are registered and just need to log in, please go <%= link_to "here", login_path %>.</p> + +<h1>Registration</h1> +<p><b>NOTE:</b> If you are registered and just need to log in, please go <%= link_to "here", login_path %>.</p> <div id="show-main-container"> <div id="section_header"><h2>&nbsp;Basic account Information</h2></div> <p>You will be able to add a lot more to your profile once you activate your account.</p> - - <% form_for @user do |f| -%> + <% form_for @user do |f| -%> + + + <p><%= label_tag 'login (username)' %><br/> + <%= f.text_field :login, :style=>"width:300px;" %></p> - <p><%= label_tag 'login (username)' %><br/> - <%= f.text_field :login, :style=>"width:300px;" %></p> - - <p><%= label_tag 'email' %><br/> - <%= f.text_field :email, :style=>"width:300px;" %></p> + <p><%= label_tag 'email' %><br/> + <%= f.text_field :email, :style=>"width:300px;" %></p> - <%= render :partial => '/shared/add_location' %> - - <p><%= label_tag 'password' %> (CaSe SeNsitIvE)<br/> - <%= f.password_field :password, :style=>"width:300px;" %></p> - - <p><%= label_tag 'password_confirmation', 'Confirm Password' %> (CaSe SeNsitIvE)<br/> - <%= f.password_field :password_confirmation, :style=>"width:300px;" %></p> + <%= render :partial => '/shared/add_location' %> + + <p><%= label_tag 'password' %> (CaSe SeNsitIvE)<br/> + <%= f.password_field :password, :style=>"width:300px;" %></p> + + <p><%= label_tag 'password_confirmation', 'Confirm Password' %> (CaSe SeNsitIvE)<br/> + <%= f.password_field :password_confirmation, :style=>"width:300px;" %></p> <p>&nbsp;</p> @@ -65,12 +65,12 @@ <div id="section_header"><h2>&nbsp;Almost there...</h2></div> <p>...just checking to make sure you're not a spambot.</p> - - <%= render :partial => '/shared/reCAPTCHA' %> + + <%= render :partial => '/shared/reCAPTCHA' %> <p>&nbsp;</p> - - <p><%= submit_tag 'Register', :class=>"big_button" %></p> - <% end -%> - + + <p><%= submit_tag 'Register', :class=>"big_button" %></p> + <% end -%> + </div> app/views/users/new.html.erb @@ -1,22 +1,22 @@ <% content_for :title do %>Reset Password<% end %> - - <h1>Reset Your Password</h1> - <% @user.password = @user.password_confirmation = nil %> - - <% form_for :user, :url => reset_password_path do |f| -%> - - <p><%= label_tag 'new_password', 'New Password' %> (CaSe SeNsAtIvE)<br/> - <%= f.password_field :password %></p> - - <p><%= label_tag 'password_confirmation', 'Confirm Password' %> (CaSe SeNsAtIvE)<br/> - <%= f.password_field :password_confirmation %></p> - - - <%= render :partial => '/shared/reCAPTCHA' %> - - <p><%= submit_tag 'Reset password' %></p> - <% end -%> - - </td> - <td valign="top"> - <%= error_messages_for :user %> + + <h1>Reset Your Password</h1> + <% @user.password = @user.password_confirmation = nil %> + + <% form_for :user, :url => reset_password_path do |f| -%> + + <p><%= label_tag 'new_password', 'New Password' %> (CaSe SeNsAtIvE)<br/> + <%= f.password_field :password %></p> + + <p><%= label_tag 'password_confirmation', 'Confirm Password' %> (CaSe SeNsAtIvE)<br/> + <%= f.password_field :password_confirmation %></p> + + + <%= render :partial => '/shared/reCAPTCHA' %> + + <p><%= submit_tag 'Reset password' %></p> + <% end -%> + + </td> + <td valign="top"> + <%= error_messages_for :user %> app/views/users/reset_password.html.erb @@ -1,9 +1,9 @@ <% content_for :title do %>Person <% end %> - -<% if @user.blank? %> - <p>Sorry, no one to see here.</p> -<% else %> +<% if @user.blank? %> + <p>Sorry, no one to see here.</p> + +<% else %> <div id="show-container"> @@ -26,7 +26,7 @@ </div> <div id="show-main-container"> - + <h1><%= image_tag("/images/other_icons/watched_item_icon_yellow.png", :border => 0, :title => "On Watchlist") if current_user.watched_people.include?(@user) %> <%=h @user.login %></h1> @@ -35,7 +35,7 @@ <br /><br /> <% end %> - <%= render :partial => '/shared/stars', :locals => { :scorable => @user} %> + <%= render :partial => '/shared/stars', :locals => { :scorable => @user} %> <table border="0" cellspacing="0" cellpading="0" width="100%"> <tr><td valign="top" width="50%"> @@ -84,21 +84,21 @@ <% if @user.experience and @user.experience != "" %><p><b>Experience:</b><br /><%= simple_format(strip_tags(@user.experience)) %></p><% end %> <% if @user.education and @user.education != "" %><p><b>Education:</b><br /><%= simple_format(strip_tags(@user.education)) %></p><% end %> - - <p>Joined <%= time_ago_in_words(@user.created_at) %> ago</p> + + <p>Joined <%= time_ago_in_words(@user.created_at) %> ago</p> <div id="white-divider">&nbsp;</div> <% ideas_count = @user.active_ideas.count %> - <% if ideas_count > 0 %> + <% if ideas_count > 0 %> <div id="section_header"><h2>&nbsp;<%= pluralize ideas_count, 'Active Idea' %></h2></div> - <%= render :partial => @user.active_ideas %> - <% end %> + <%= render :partial => @user.active_ideas %> + <% end %> <% positions_count = @user.active_positions.count %> - <% if positions_count > 0 %> + <% if positions_count > 0 %> <div id="section_header"><h2>&nbsp;<%= pluralize positions_count, 'Active Position' %></h2></div> <% @user.active_positions.each do |position| %> @@ -110,23 +110,23 @@ <% end %> - <% job_count = @user.open_job_postings.count %> - <% if job_count > 0 %> + <% job_count = @user.open_job_postings.count %> + <% if job_count > 0 %> <div id="section_header"><h2>&nbsp;<%= pluralize job_count, 'Open Job' %></h2></div> - <%= render :partial => @user.open_job_postings %> - <% end %> + <%= render :partial => @user.open_job_postings %> + <% end %> - </div> + </div> - <div id="show-stat"> + <div id="show-stat"> <%= stats_for @user, {:icons_side => "left", :breakout => true} %> </div> - - </div> - + </div> + + <% end %> app/views/users/show.html.erb config/boot.rb @@ -1,84 +1,84 @@ -# Be sure to restart your server when you modify this file - - -# Uncomment below to force Rails into production mode when -# you don't control web/app server and can't set it the proper way -# ENV['RAILS_ENV'] ||= 'production' - -# Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION - -# Bootstrap the Rails environment, frameworks, and default configuration +# Be sure to restart your server when you modify this file + + +# Uncomment below to force Rails into production mode when +# you don't control web/app server and can't set it the proper way +# ENV['RAILS_ENV'] ||= 'production' + +# Specifies gem version of Rails to use when vendor/rails is not present +RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION + +# Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') require File.join(File.dirname(__FILE__), 'secret') - - -Rails::Initializer.run do |config| - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - # See Rails::Configuration for more options. - - # Skip frameworks you're not going to use. To use Rails without a database - # you must remove the Active Record framework. - # config.frameworks -= [ :active_record, :active_resource, :action_mailer ] - - # Specify gems that this application depends on. - # They can then be installed with "rake gems:install" on new installations. - # You have to specify the :lib option for libraries, where the Gem name (sqlite3-ruby) differs from the file itself (sqlite3) + + +Rails::Initializer.run do |config| + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + # See Rails::Configuration for more options. + + # Skip frameworks you're not going to use. To use Rails without a database + # you must remove the Active Record framework. + # config.frameworks -= [ :active_record, :active_resource, :action_mailer ] + + # Specify gems that this application depends on. + # They can then be installed with "rake gems:install" on new installations. + # You have to specify the :lib option for libraries, where the Gem name (sqlite3-ruby) differs from the file itself (sqlite3) # config.gem "bj" - # config.gem "sqlite3-ruby", :lib => "sqlite3" + # config.gem "sqlite3-ruby", :lib => "sqlite3" # config.gem "aws-s3", :lib => "aws/s3" - # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" + # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" config.gem 'javan-whenever', :lib => false, :source => 'http://gems.github.com' - - - # Only load the plugins named here, in the order given. By default, all plugins - # in vendor/plugins are loaded in alphabetical order. - # :all can be used as a placeholder for all plugins not explicitly named - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Add additional load paths for your own custom dirs - # config.load_paths += %W( #{RAILS_ROOT}/extras ) - - # Force all environments to use the same logger level - # (by default production uses :info, the others :debug) - # config.log_level = :debug - - # Make Time.zone default to the specified zone, and make Active Record store time values - # in the database in UTC, and return them converted to the specified local zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Comment line to use default local time. - config.time_zone = 'UTC' - - # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths. - # All files from config/locales/*.rb,yml are added automatically. - # config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')] - # config.i18n.default_locale = :de - - # Your secret key for verifying cookie session data integrity. - # If you change this key, all old sessions will become invalid! - # Make sure the secret is at least 30 characters and all random, - # no regular words or you'll be exposed to dictionary attacks. - config.action_controller.session = { - :session_key => Session_key, - :secret => Session_secret - } - - # Use the database for sessions instead of the cookie-based default, - # which shouldn't be used to store highly confidential information - # (create the session table with "rake db:sessions:create") - # config.action_controller.session_store = :active_record_store - - # Use SQL instead of Active Record's schema dumper when creating the test database. - # This is necessary if your schema can't be completely dumped by the schema dumper, - # like if you have constraints or database-specific column types - # config.active_record.schema_format = :sql - - # Activate observers that should always be running - # Please note that observers generated using script/generate observer need to have an _observer suffix - # config.active_record.observers = :cacher, :garbage_collector, :forum_observer - - config.active_record.observers = :user_observer, :invitation_observer + + + # Only load the plugins named here, in the order given. By default, all plugins + # in vendor/plugins are loaded in alphabetical order. + # :all can be used as a placeholder for all plugins not explicitly named + # config.plugins = [ :exception_notification, :ssl_requirement, :all ] + + # Add additional load paths for your own custom dirs + # config.load_paths += %W( #{RAILS_ROOT}/extras ) + + # Force all environments to use the same logger level + # (by default production uses :info, the others :debug) + # config.log_level = :debug + + # Make Time.zone default to the specified zone, and make Active Record store time values + # in the database in UTC, and return them converted to the specified local zone. + # Run "rake -D time" for a list of tasks for finding time zone names. Comment line to use default local time. + config.time_zone = 'UTC' + + # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths. + # All files from config/locales/*.rb,yml are added automatically. + # config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')] + # config.i18n.default_locale = :de + + # Your secret key for verifying cookie session data integrity. + # If you change this key, all old sessions will become invalid! + # Make sure the secret is at least 30 characters and all random, + # no regular words or you'll be exposed to dictionary attacks. + config.action_controller.session = { + :session_key => Session_key, + :secret => Session_secret + } + + # Use the database for sessions instead of the cookie-based default, + # which shouldn't be used to store highly confidential information + # (create the session table with "rake db:sessions:create") + # config.action_controller.session_store = :active_record_store + + # Use SQL instead of Active Record's schema dumper when creating the test database. + # This is necessary if your schema can't be completely dumped by the schema dumper, + # like if you have constraints or database-specific column types + # config.active_record.schema_format = :sql + + # Activate observers that should always be running + # Please note that observers generated using script/generate observer need to have an _observer suffix + # config.active_record.observers = :cacher, :garbage_collector, :forum_observer + + config.active_record.observers = :user_observer, :invitation_observer end config/environment.rb config/environments/development.rb config/environments/production.rb config/environments/test.rb config/initializers/inflections.rb config/initializers/mime_types.rb config/initializers/new_rails_defaults.rb config/locales/en.yml @@ -4,32 +4,32 @@ ActionController::Routing::Routes.draw do |map| map.root :controller => 'user', :action => 'index' # should change this map.resources :episodes # should remove this - + - map.resource :session - map.logout '/logout/', :controller => 'sessions', :action => 'destroy' - map.login '/login/', :controller => 'sessions', :action => 'new' - map.register '/register/', :controller => 'users', :action => 'create' - map.signup '/signup/', :controller => 'users', :action => 'new' - map.resend_password '/resend_password/', :controller => 'sessions', :action => 'resend_password' - map.activate '/activate/:activation_code', :controller => 'users', :action => 'activate', :activation_code => nil - map.forgot_password '/forgot_password/', :controller => 'users', :action => 'forgot_password' - map.reset_password '/reset_password/:code', :controller => 'users', :action => 'reset_password' - map.change_password '/account/change_password', :controller => 'users', :action => 'change_password' - map.resend_activation_link '/resend_activation_link/', :controller => 'users', :action => 'resend_activation_link' - - map.help '/help/', :controller => 'static', :action => 'help' - - - + map.resource :session + map.logout '/logout/', :controller => 'sessions', :action => 'destroy' + map.login '/login/', :controller => 'sessions', :action => 'new' + map.register '/register/', :controller => 'users', :action => 'create' + map.signup '/signup/', :controller => 'users', :action => 'new' + map.resend_password '/resend_password/', :controller => 'sessions', :action => 'resend_password' + map.activate '/activate/:activation_code', :controller => 'users', :action => 'activate', :activation_code => nil + map.forgot_password '/forgot_password/', :controller => 'users', :action => 'forgot_password' + map.reset_password '/reset_password/:code', :controller => 'users', :action => 'reset_password' + map.change_password '/account/change_password', :controller => 'users', :action => 'change_password' + map.resend_activation_link '/resend_activation_link/', :controller => 'users', :action => 'resend_activation_link' + + map.help '/help/', :controller => 'static', :action => 'help' + + + # try adding as nested resource to user map.my_ideas '/my/ideas/', :controller => 'ideas', :action => 'my_ideas' - map.post_idea_comment '/post/idea/comment/', :controller => 'ideas', :action => 'add_comment' - - map.my_projects '/my/projects/', :controller => 'projects', :action => 'my_projects' - map.post_project_comment '/post/project/comment/', :controller => 'projects', :action => 'add_comment' + map.post_idea_comment '/post/idea/comment/', :controller => 'ideas', :action => 'add_comment' + + map.my_projects '/my/projects/', :controller => 'projects', :action => 'my_projects' + map.post_project_comment '/post/project/comment/', :controller => 'projects', :action => 'add_comment' - map.my_jobs '/my/jobs/', :controller => 'jobs', :action => 'my_jobs' + map.my_jobs '/my/jobs/', :controller => 'jobs', :action => 'my_jobs' map.open_job_postings '/jobs/open_job_postings/', :controller => 'jobs', :action => 'open_job_postings' map.job_posting_history '/jobs/job_posting_history/', :controller => 'jobs', :action => 'job_posting_history' map.open_applied_for_jobs '/jobs/open_applied_for_jobs/', :controller => 'jobs', :action => 'open_applied_for_jobs' @@ -38,24 +38,24 @@ ActionController::Routing::Routes.draw do |map| map.active_current_positions '/jobs/active_current_positions/', :controller => 'jobs', :action => 'active_current_positions' - # need to RESTify these - map.remove_location '/remove_location/', :controller => 'users', :action => 'remove_location' + # need to RESTify these + map.remove_location '/remove_location/', :controller => 'users', :action => 'remove_location' - map.rate '/rate/', :controller => 'rating', :action => 'rate' + map.rate '/rate/', :controller => 'rating', :action => 'rate' - map.resend_invitation '/resend_invitation', :controller => 'invitations', :action => 'resend' + map.resend_invitation '/resend_invitation', :controller => 'invitations', :action => 'resend' map.add_to_watchlist '/watchlists/add', :controller => 'watchlists', :action => 'add' map.watchlist_ideas '/watchlists/ideas', :controller => 'watchlists', :action => 'ideas' map.watchlist_projects '/watchlists/projects', :controller => 'watchlists', :action => 'projects' map.watchlist_jobs '/watchlists/jobs', :controller => 'watchlists', :action => 'jobs' - map.watchlist_people '/watchlists/people', :controller => 'watchlists', :action => 'people' - + map.watchlist_people '/watchlists/people', :controller => 'watchlists', :action => 'people' + map.add_to_interests '/interests/add', :controller => 'interests', :action => 'add' map.interest_ideas '/interests/ideas', :controller => 'interests', :action => 'ideas' map.interest_projects '/interests/projects', :controller => 'interests', :action => 'projects' - + map.resources :users, :as => :people map.resources :jobs, @@ -70,47 +70,47 @@ ActionController::Routing::Routes.draw do |map| map.resources :projects, :has_many => [:jobs, :comments] map.resources :searches - - # The priority is based upon order of creation: first created -> highest priority. - - # Sample of regular route: - # map.connect 'products/:id', :controller => 'catalog', :action => 'view' - # Keep in mind you can assign values other than :controller and :action - - # Sample of named route: - # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase' - # This route can be invoked with purchase_url(:id => product.id) - - # Sample resource route (maps HTTP verbs to controller actions automatically): - # map.resources :products - - # Sample resource route with options: - # map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get } - - # Sample resource route with sub-resources: - # map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller - - # Sample resource route with more complex sub-resources - # map.resources :products do |products| - # products.resources :comments - # products.resources :sales, :collection => { :recent => :get } - # end - - # Sample resource route within a namespace: - # map.namespace :admin do |admin| - # # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb) - # admin.resources :products - # end - - # You can have the root of your site routed with map.root -- just remember to delete public/index.html. - # map.root :controller => "welcome" - - # See how all your routes lay out with "rake routes" - - # Install the default routes as the lowest priority. - # Note: These default routes make all actions in every controller accessible via GET requests. You should - # consider removing the them or commenting them out if you're using named routes and resources. - - # map.connect ':controller/:action/:id' - # map.connect ':controller/:action/:id.:format' -end + + # The priority is based upon order of creation: first created -> highest priority. + + # Sample of regular route: + # map.connect 'products/:id', :controller => 'catalog', :action => 'view' + # Keep in mind you can assign values other than :controller and :action + + # Sample of named route: + # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase' + # This route can be invoked with purchase_url(:id => product.id) + + # Sample resource route (maps HTTP verbs to controller actions automatically): + # map.resources :products + + # Sample resource route with options: + # map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get } + + # Sample resource route with sub-resources: + # map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller + + # Sample resource route with more complex sub-resources + # map.resources :products do |products| + # products.resources :comments + # products.resources :sales, :collection => { :recent => :get } + # end + + # Sample resource route within a namespace: + # map.namespace :admin do |admin| + # # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb) + # admin.resources :products + # end + + # You can have the root of your site routed with map.root -- just remember to delete public/index.html. + # map.root :controller => "welcome" + + # See how all your routes lay out with "rake routes" + + # Install the default routes as the lowest priority. + # Note: These default routes make all actions in every controller accessible via GET requests. You should + # consider removing the them or commenting them out if you're using named routes and resources. + + # map.connect ':controller/:action/:id' + # map.connect ':controller/:action/:id.:format' +end config/routes.rb @@ -2,8 +2,8 @@ # recaptcha Recaptcha_public = "PUBLUC KEY" Recaptcha_private = "PRIVATE KEY" -ENV['RECAPTCHA_PUBLIC_KEY'] = Recaptcha_public -ENV['RECAPTCHA_PRIVATE_KEY'] = Recaptcha_private +ENV['RECAPTCHA_PUBLIC_KEY'] = Recaptcha_public +ENV['RECAPTCHA_PRIVATE_KEY'] = Recaptcha_private # google maps GoogleAPIKey = "GOOGLE API KEY" config/secret.sample @@ -1,24 +1,24 @@ -class CreateUsers < ActiveRecord::Migration - def self.up - create_table "users", :force => true do |t| - t.column :login, :string, :limit => 40 - t.column :name, :string, :limit => 100, :default => '', :null => true - t.column :email, :string, :limit => 100 - t.column :crypted_password, :string, :limit => 40 - t.column :salt, :string, :limit => 40 - t.column :created_at, :datetime - t.column :updated_at, :datetime - t.column :remember_token, :string, :limit => 40 - t.column :remember_token_expires_at, :datetime - - t.column :activation_code, :string, :limit => 40 - t.column :activated_at, :datetime - - end - add_index :users, :login, :unique => true - end - - def self.down - drop_table "users" - end -end +class CreateUsers < ActiveRecord::Migration + def self.up + create_table "users", :force => true do |t| + t.column :login, :string, :limit => 40 + t.column :name, :string, :limit => 100, :default => '', :null => true + t.column :email, :string, :limit => 100 + t.column :crypted_password, :string, :limit => 40 + t.column :salt, :string, :limit => 40 + t.column :created_at, :datetime + t.column :updated_at, :datetime + t.column :remember_token, :string, :limit => 40 + t.column :remember_token_expires_at, :datetime + + t.column :activation_code, :string, :limit => 40 + t.column :activated_at, :datetime + + end + add_index :users, :login, :unique => true + end + + def self.down + drop_table "users" + end +end db/migrate/20090129032201_create_users.rb db/migrate/20090202143114_add_email_as_index_for_users.rb db/migrate/20090204233719_create_invitations.rb db/migrate/20090204234330_add_invited_by_to_user.rb db/migrate/20090205041715_add_message_to_invite.rb db/migrate/20090329204338_create_ideas.rb db/migrate/20090331005744_add_reset_password_to_users.rb db/migrate/20090401014425_add_pass_word_reset_code_to_users.rb db/migrate/20090402033817_remove_resend_password_from_users.rb db/migrate/20090403015316_add_commentable.rb db/migrate/20090403235146_create_projects.rb db/migrate/20090405022207_create_jobs.rb db/migrate/20090409020349_create_job_applications.rb db/migrate/20090418030633_create_ratings.rb db/migrate/20090418125721_create_scorecards.rb @@ -1,14 +1,14 @@ class IndexTables < ActiveRecord::Migration def self.up - add_index :ideas, :user_id + add_index :ideas, :user_id add_index :ideas, :active - add_index :ideas, :created_at - add_index :ideas, :updated_at + add_index :ideas, :created_at + add_index :ideas, :updated_at - add_index :interests, :user_id - add_index :interests, :interest_type - add_index :interests, :interest_id - add_index :interests, :created_at + add_index :interests, :user_id + add_index :interests, :interest_type + add_index :interests, :interest_id + add_index :interests, :created_at add_index :invitations, :user_id add_index :invitations, :email, :unique => true @@ -21,64 +21,64 @@ class IndexTables < ActiveRecord::Migration add_index :jobs, :project_id add_index :jobs, :active add_index :jobs, :open - add_index :jobs, :created_at + add_index :jobs, :created_at add_index :locations, :located_type add_index :locations, :located_id add_index :locations, :latitude add_index :locations, :longitude - + add_index :logons, :user_id, :unique => true - add_index :messages, :from_id - add_index :messages, :to_id - add_index :messages, :created_at + add_index :messages, :from_id + add_index :messages, :to_id + add_index :messages, :created_at add_index :polymorphic_general_skills, :object_type - add_index :polymorphic_general_skills, :object_id - add_index :polymorphic_general_skills, :general_skill_id + add_index :polymorphic_general_skills, :object_id + add_index :polymorphic_general_skills, :general_skill_id - add_index :projects, :active - add_index :projects, :user_id - add_index :projects, :idea_id - add_index :projects, :created_at - add_index :projects, :updated_at + add_index :projects, :active + add_index :projects, :user_id + add_index :projects, :idea_id + add_index :projects, :created_at + add_index :projects, :updated_at - add_index :ratings, :scorecard_id - add_index :ratings, :user_id + add_index :ratings, :scorecard_id + add_index :ratings, :user_id - add_index :relevant_industries, :industrial_type - add_index :relevant_industries, :industrial_id - add_index :relevant_industries, :industry_id + add_index :relevant_industries, :industrial_type + add_index :relevant_industries, :industrial_id + add_index :relevant_industries, :industry_id - add_index :scorecards, :scorable_type - add_index :scorecards, :scorable_id + add_index :scorecards, :scorable_type + add_index :scorecards, :scorable_id - add_index :user_locations, :user_id - add_index :user_locations, :location_id + add_index :user_locations, :user_id + add_index :user_locations, :location_id - add_index :users, :active - add_index :users, :no_cash_ok - add_index :users, :currently_available - add_index :users, :updated_at - add_index :users, :created_at + add_index :users, :active + add_index :users, :no_cash_ok + add_index :users, :currently_available + add_index :users, :updated_at + add_index :users, :created_at - add_index :watchlists, :user_id - add_index :watchlists, :watch_type - add_index :watchlists, :watch_id + add_index :watchlists, :user_id + add_index :watchlists, :watch_type + add_index :watchlists, :watch_id add_index :watchlists, :created_at end def self.down - remove_index :ideas, :user_id + remove_index :ideas, :user_id remove_index :ideas, :active - remove_index :ideas, :created_at - remove_index :ideas, :updated_at + remove_index :ideas, :created_at + remove_index :ideas, :updated_at - remove_index :interests, :user_id - remove_index :interests, :interest_type - remove_index :interests, :interest_id - remove_index :interests, :created_at + remove_index :interests, :user_id + remove_index :interests, :interest_type + remove_index :interests, :interest_id + remove_index :interests, :created_at remove_index :invitations, :user_id remove_index :invitations, :email, :unique => true @@ -91,50 +91,50 @@ class IndexTables < ActiveRecord::Migration remove_index :jobs, :project_id remove_index :jobs, :active remove_index :jobs, :open - remove_index :jobs, :created_at - remove_index :jobs, :updated_at + remove_index :jobs, :created_at + remove_index :jobs, :updated_at remove_index :locations, :located_type remove_index :locations, :located_id remove_index :locations, :latitude remove_index :locations, :longitude - + remove_index :logons, :user_id, :unique => true - remove_index :messages, :from_id - remove_index :messages, :to_id - remove_index :messages, :created_at + remove_index :messages, :from_id + remove_index :messages, :to_id + remove_index :messages, :created_at remove_index :polymorphic_general_skills, :object_type - remove_index :polymorphic_general_skills, :object_id - remove_index :polymorphic_general_skills, :general_skill_id + remove_index :polymorphic_general_skills, :object_id + remove_index :polymorphic_general_skills, :general_skill_id - remove_index :projects, :active - remove_index :projects, :user_id - remove_index :projects, :idea_id - remove_index :projects, :created_at - remove_index :projects, :updated_at + remove_index :projects, :active + remove_index :projects, :user_id + remove_index :projects, :idea_id + remove_index :projects, :created_at + remove_index :projects, :updated_at - remove_index :ratings, :scorecard_id - remove_index :ratings, :user_id + remove_index :ratings, :scorecard_id + remove_index :ratings, :user_id - remove_index :relevant_industries, :industrial_type - remove_index :relevant_industries, :industrial_id - remove_index :relevant_industries, :industry_id + remove_index :relevant_industries, :industrial_type + remove_index :relevant_industries, :industrial_id + remove_index :relevant_industries, :industry_id - remove_index :scorecards, :scorable_type - remove_index :scorecards, :scorable_id + remove_index :scorecards, :scorable_type + remove_index :scorecards, :scorable_id - remove_index :user_locations, :user_id - remove_index :user_locations, :location_id + remove_index :user_locations, :user_id + remove_index :user_locations, :location_id - remove_index :users, :active - remove_index :users, :no_cash_ok - remove_index :users, :currently_available + remove_index :users, :active + remove_index :users, :no_cash_ok + remove_index :users, :currently_available - remove_index :watchlists, :user_id - remove_index :watchlists, :watch_type - remove_index :watchlists, :watch_id + remove_index :watchlists, :user_id + remove_index :watchlists, :watch_type + remove_index :watchlists, :watch_id remove_index :watchlists, :created_at end db/migrate/20090725140036_index_tables.rb db/schema.rb doc/README_FOR_APP @@ -1,6 +1,6 @@ @comments -Feature: Posting comments +Feature: Posting comments In order to give people feedback As a logged in user I want to post comments features/comments.feature @@ -1,6 +1,6 @@ @dashboard - Feature: Dashboard + Feature: Dashboard In order to know what's going on As a user I want to see stats about my stuff and things i am watching features/dashboard.feature @@ -1,7 +1,7 @@ # /features/icebreakers.feature @icebreakers - Feature: Icebreakers + Feature: Icebreakers In order to stimulate some ideas during registration As a user I want to see some icebreakers during registration features/icebreakers.feature @@ -1,6 +1,6 @@ @ideas - Feature: Basic idea management + Feature: Basic idea management In order to share and look for ideas As a user I want to be able to post, update, view, and comment on ideas features/ideas.feature @@ -1,6 +1,6 @@ @interests -Feature: Interest (showing interest in things) +Feature: Interest (showing interest in things) To let people know I am interested in some idea or project, I should be able to add them to my interested list, and at the same time Let others know that I am interested in this. features/interests.feature @@ -1,6 +1,6 @@ @invitations -Feature: Sending invitations to join commune2 +Feature: Sending invitations to join commune2 Members of the community, should be be able to invite others to join. However, to maintain exclusivity and site performance, number of invitations should be limited. Only admin users should have the ability to invite unlimitted members. features/invitations.feature @@ -1,6 +1,6 @@ @job_applications - Feature: Basic job application and hiring process + Feature: Basic job application and hiring process In order to join a project or find help for my project As a user I want to be able to apply for jobs, review job applications, make an offer, and accept a job features/job_applications.feature @@ -1,6 +1,6 @@ @jobs -Feature: Basic job management +Feature: Basic job management In order to find help for my projects, or help others As a user I want to be able to post, update, view, apply for jobs features/jobs.feature @@ -1,6 +1,6 @@ @login_required - Feature: Required logon for certain functionality + Feature: Required logon for certain functionality In order for the site to maintain quality content As a user I want to be logged in before I can perform basic tasks features/login_required.feature @@ -1,6 +1,6 @@ @projects -Feature: Basic project management (note: these are not project management tools) +Feature: Basic project management (note: these are not project management tools) In order to start a project and look for projects As a user I want to be able to post, update, view, and comment on projects features/projects.feature @@ -4,7 +4,7 @@ # Need to figure out how to actually test clicking on rating - may require Selenium # ##################################################################################### -Feature: Basic rating functionality +Feature: Basic rating functionality In order to provide feedback to the community As a logged in user I want to be able to rate users, ideas, and projects features/rating.feature @@ -1,6 +1,6 @@ @scorecard - Feature: Basic scorecard functionality + Feature: Basic scorecard functionality To get a better sense of what a person is looking at a scorecard will provide basic statistics, tracking the following information: - rating score features/scorecard.feature @@ -1,5 +1,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths")) -require 'hpricot' +require 'hpricot' # Commonly used webrat steps # http://github.com/brynary/webrat features/step_definitions/webrat_steps.rb @@ -1,5 +1,5 @@ @users - Feature: Basic user management + Feature: Basic user management As a user I want to be able to register, log in, log out, recover password, and invite So that I can use the website and invite others features/users.feature @@ -1,6 +1,6 @@ @watchlists -Feature: Watchlist +Feature: Watchlist In order to track things on the website As a logged in user I want to add things to my watchlist features/watchlists.feature @@ -1,189 +1,189 @@ -module AuthenticatedSystem - protected - # Returns true or false if the user is logged in. - # Preloads @current_user with the user model if they're logged in. - def logged_in? - !!current_user - end - - # Accesses the current user from the session. - # Future calls avoid the database because nil is not equal to false. - def current_user - @current_user ||= (login_from_session || login_from_basic_auth || login_from_cookie) unless @current_user == false - end - - # Store the given user id in the session. - def current_user=(new_user) - session[:user_id] = new_user ? new_user.id : nil - @current_user = new_user || false - end - - # Check if the user is authorized - # - # Override this method in your controllers if you want to restrict access - # to only a few actions or if you want to check if the user - # has the correct rights. - # - # Example: - # - # # only allow nonbobs - # def authorized? - # current_user.login != "bob" - # end - # - def authorized?(action = action_name, resource = nil) - logged_in? - end - - # Filter method to enforce a login requirement. - # - # To require logins for all actions, use this in your controllers: - # - # before_filter :login_required - # - # To require logins for specific actions, use this in your controllers: - # - # before_filter :login_required, :only => [ :edit, :update ] - # - # To skip this in a subclassed controller: - # - # skip_before_filter :login_required - # - def login_required - authorized? || access_denied - end - - # Redirect as appropriate when an access request fails. - # - # The default action is to redirect to the login screen. - # - # Override this method in your controllers if you want to have special - # behavior in case the user is not authorized - # to access the requested action. For example, a popup window might - # simply close itself. - def access_denied - respond_to do |format| - format.html do - store_location - redirect_to new_session_path - end - # format.any doesn't work in rails version < http://dev.rubyonrails.org/changeset/8987 - # Add any other API formats here. (Some browsers, notably IE6, send Accept: */* and trigger - # the 'format.any' block incorrectly. See http://bit.ly/ie6_borken or http://bit.ly/ie6_borken2 - # for a workaround.) - format.any(:json, :xml) do - request_http_basic_authentication 'Web Password' - end - end - end - - # Store the URI of the current request in the session. - # - # We can return to this location by calling #redirect_back_or_default. - def store_location - session[:return_to] = request.request_uri - end - - # Redirect to the URI stored by the most recent store_location call or - # to the passed default. Set an appropriately modified - # after_filter :store_location, :only => [:index, :new, :show, :edit] - # for any controller you want to be bounce-backable. - def redirect_back_or_default(default) - redirect_to(session[:return_to] || default) - session[:return_to] = nil - end - - # Inclusion hook to make #current_user and #logged_in? - # available as ActionView helper methods. - def self.included(base) - base.send :helper_method, :current_user, :logged_in?, :authorized? if base.respond_to? :helper_method - end - - # - # Login - # - - # Called from #current_user. First attempt to login by the user id stored in the session. - def login_from_session - self.current_user = User.find_by_id(session[:user_id]) if session[:user_id] - end - - # Called from #current_user. Now, attempt to login by basic authentication information. - def login_from_basic_auth - authenticate_with_http_basic do |login, password| - self.current_user = User.authenticate(login, password) - end - end - - # - # Logout - # - - # Called from #current_user. Finaly, attempt to login by an expiring token in the cookie. - # for the paranoid: we _should_ be storing user_token = hash(cookie_token, request IP) - def login_from_cookie - user = cookies[:auth_token] && User.find_by_remember_token(cookies[:auth_token]) - if user && user.remember_token? - self.current_user = user - handle_remember_cookie! false # freshen cookie token (keeping date) - self.current_user - end - end - - # This is ususally what you want; resetting the session willy-nilly wreaks - # havoc with forgery protection, and is only strictly necessary on login. - # However, **all session state variables should be unset here**. - def logout_keeping_session! - # Kill server-side auth cookie - @current_user.forget_me if @current_user.is_a? User - @current_user = false # not logged in, and don't do it for me - kill_remember_cookie! # Kill client-side auth cookie - session[:user_id] = nil # keeps the session but kill our variable - # explicitly kill any other session variables you set - end - - # The session should only be reset at the tail end of a form POST -- - # otherwise the request forgery protection fails. It's only really necessary - # when you cross quarantine (logged-out to logged-in). - def logout_killing_session! - logout_keeping_session! - reset_session - end - - # - # Remember_me Tokens - # - # Cookies shouldn't be allowed to persist past their freshness date, - # and they should be changed at each login - - # Cookies shouldn't be allowed to persist past their freshness date, - # and they should be changed at each login - - def valid_remember_cookie? - return nil unless @current_user - (@current_user.remember_token?) && - (cookies[:auth_token] == @current_user.remember_token) - end - - # Refresh the cookie auth token if it exists, create it otherwise - def handle_remember_cookie!(new_cookie_flag) - return unless @current_user - case - when valid_remember_cookie? then @current_user.refresh_token # keeping same expiry date - when new_cookie_flag then @current_user.remember_me - else @current_user.forget_me - end - send_remember_cookie! - end - - def kill_remember_cookie! - cookies.delete :auth_token - end - - def send_remember_cookie! - cookies[:auth_token] = { - :value => @current_user.remember_token, - :expires => @current_user.remember_token_expires_at } - end - -end +module AuthenticatedSystem + protected + # Returns true or false if the user is logged in. + # Preloads @current_user with the user model if they're logged in. + def logged_in? + !!current_user + end + + # Accesses the current user from the session. + # Future calls avoid the database because nil is not equal to false. + def current_user + @current_user ||= (login_from_session || login_from_basic_auth || login_from_cookie) unless @current_user == false + end + + # Store the given user id in the session. + def current_user=(new_user) + session[:user_id] = new_user ? new_user.id : nil + @current_user = new_user || false + end + + # Check if the user is authorized + # + # Override this method in your controllers if you want to restrict access + # to only a few actions or if you want to check if the user + # has the correct rights. + # + # Example: + # + # # only allow nonbobs + # def authorized? + # current_user.login != "bob" + # end + # + def authorized?(action = action_name, resource = nil) + logged_in? + end + + # Filter method to enforce a login requirement. + # + # To require logins for all actions, use this in your controllers: + # + # before_filter :login_required + # + # To require logins for specific actions, use this in your controllers: + # + # before_filter :login_required, :only => [ :edit, :update ] + # + # To skip this in a subclassed controller: + # + # skip_before_filter :login_required + # + def login_required + authorized? || access_denied + end + + # Redirect as appropriate when an access request fails. + # + # The default action is to redirect to the login screen. + # + # Override this method in your controllers if you want to have special + # behavior in case the user is not authorized + # to access the requested action. For example, a popup window might + # simply close itself. + def access_denied + respond_to do |format| + format.html do + store_location + redirect_to new_session_path + end + # format.any doesn't work in rails version < http://dev.rubyonrails.org/changeset/8987 + # Add any other API formats here. (Some browsers, notably IE6, send Accept: */* and trigger + # the 'format.any' block incorrectly. See http://bit.ly/ie6_borken or http://bit.ly/ie6_borken2 + # for a workaround.) + format.any(:json, :xml) do + request_http_basic_authentication 'Web Password' + end + end + end + + # Store the URI of the current request in the session. + # + # We can return to this location by calling #redirect_back_or_default. + def store_location + session[:return_to] = request.request_uri + end + + # Redirect to the URI stored by the most recent store_location call or + # to the passed default. Set an appropriately modified + # after_filter :store_location, :only => [:index, :new, :show, :edit] + # for any controller you want to be bounce-backable. + def redirect_back_or_default(default) + redirect_to(session[:return_to] || default) + session[:return_to] = nil + end + + # Inclusion hook to make #current_user and #logged_in? + # available as ActionView helper methods. + def self.included(base) + base.send :helper_method, :current_user, :logged_in?, :authorized? if base.respond_to? :helper_method + end + + # + # Login + # + + # Called from #current_user. First attempt to login by the user id stored in the session. + def login_from_session + self.current_user = User.find_by_id(session[:user_id]) if session[:user_id] + end + + # Called from #current_user. Now, attempt to login by basic authentication information. + def login_from_basic_auth + authenticate_with_http_basic do |login, password| + self.current_user = User.authenticate(login, password) + end + end + + # + # Logout + # + + # Called from #current_user. Finaly, attempt to login by an expiring token in the cookie. + # for the paranoid: we _should_ be storing user_token = hash(cookie_token, request IP) + def login_from_cookie + user = cookies[:auth_token] && User.find_by_remember_token(cookies[:auth_token]) + if user && user.remember_token? + self.current_user = user + handle_remember_cookie! false # freshen cookie token (keeping date) + self.current_user + end + end + + # This is ususally what you want; resetting the session willy-nilly wreaks + # havoc with forgery protection, and is only strictly necessary on login. + # However, **all session state variables should be unset here**. + def logout_keeping_session! + # Kill server-side auth cookie + @current_user.forget_me if @current_user.is_a? User + @current_user = false # not logged in, and don't do it for me + kill_remember_cookie! # Kill client-side auth cookie + session[:user_id] = nil # keeps the session but kill our variable + # explicitly kill any other session variables you set + end + + # The session should only be reset at the tail end of a form POST -- + # otherwise the request forgery protection fails. It's only really necessary + # when you cross quarantine (logged-out to logged-in). + def logout_killing_session! + logout_keeping_session! + reset_session + end + + # + # Remember_me Tokens + # + # Cookies shouldn't be allowed to persist past their freshness date, + # and they should be changed at each login + + # Cookies shouldn't be allowed to persist past their freshness date, + # and they should be changed at each login + + def valid_remember_cookie? + return nil unless @current_user + (@current_user.remember_token?) && + (cookies[:auth_token] == @current_user.remember_token) + end + + # Refresh the cookie auth token if it exists, create it otherwise + def handle_remember_cookie!(new_cookie_flag) + return unless @current_user + case + when valid_remember_cookie? then @current_user.refresh_token # keeping same expiry date + when new_cookie_flag then @current_user.remember_me + else @current_user.forget_me + end + send_remember_cookie! + end + + def kill_remember_cookie! + cookies.delete :auth_token + end + + def send_remember_cookie! + cookies[:auth_token] = { + :value => @current_user.remember_token, + :expires => @current_user.remember_token_expires_at } + end + +end lib/authenticated_system.rb @@ -1,12 +1,12 @@ -module AuthenticatedTestHelper - # Sets the current user in the session from the user fixtures. - def login_as(user) - @request.session[:user_id] = user ? users(user).id : nil - end - - def authorize_as(user) - @request.env["HTTP_AUTHORIZATION"] = user ? ActionController::HttpAuthentication::Basic.encode_credentials(users(user).login, 'monkey') : nil - end - - -end +module AuthenticatedTestHelper + # Sets the current user in the session from the user fixtures. + def login_as(user) + @request.session[:user_id] = user ? users(user).id : nil + end + + def authorize_as(user) + @request.env["HTTP_AUTHORIZATION"] = user ? ActionController::HttpAuthentication::Basic.encode_credentials(users(user).login, 'monkey') : nil + end + + +end lib/authenticated_test_helper.rb lib/smtp_tls.rb public/404.html public/422.html public/500.html public/dispatch.cgi public/dispatch.fcgi public/dispatch.rb 2c386fbaef7cc617d47ff46e3e390c82f09b4c72 Justin George justin.george@gmail.com http://github.com/jaggederest/commune2/commit/becde274229c008eb63f8f79019451bae32b38ed becde274229c008eb63f8f79019451bae32b38ed 2009-11-07T12:45:26-08:00 2009-11-07T12:45:26-08:00 dos2unix saves my ass agin 056a1f1158867b21e929479754086b50f54b887b Justin George justin.george@gmail.com