app/controllers/icebreakers_controller.rb app/helpers/icebreakers_helper.rb app/models/icebreaker.rb app/views/icebreakers/_form.html.erb app/views/icebreakers/edit.html.erb app/views/icebreakers/index.html.erb app/views/icebreakers/new.html.erb app/views/icebreakers/show.html.erb db/migrate/20091101231404_create_icebreakers.rb features/icebreakers.feature features/step_definitions/icebreaker_steps.rb spec/controllers/icebreakers_controller_spec.rb spec/fixtures/icebreakers.yml spec/models/icebreaker_spec.rb @@ -14,7 +14,8 @@ class IdeasController < ApplicationController :order => "@relevance DESC, adjusted_rating DESC, active_projects_count DESC, watchers_count DESC, created_at DESC" else - @ideas = Idea.get('active', 'id DESC', params[:page]) + # activation code ensures only only ideas from activated (activation after registeration) users are shown + @ideas = Idea.get('ideas.active and users.activation_code is Null', 'ideas.id DESC', params[:page]) end @ideas.compact! # removes any nil objects app/controllers/ideas_controller.rb @@ -2,14 +2,16 @@ 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 + @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. - @user = User.new(params[:user]) - + @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 @@ -41,22 +43,38 @@ class UsersController < ApplicationController return end end - - success = @user && @user.save - if success && @user.errors.empty? + + # add industry + @idea.industries << (Industry.find_by_name("Just for fun") || Industry.find(:first)) # prevents an error if name changes + # check if idea is valid + unless @idea.valid? + if @idea.errors[:title] + @user.errors.add_to_base("Idea title " + @idea.errors[:title]) + end + + if @idea.errors[:description] + @user.errors.add_to_base("Idea description " + @idea.errors[:description]) + 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." + + @user.ideas << @idea + @idea.save(false) # validations already done above redirect_to :login - else + else flash[:error] = "Your registration attempt failed. Try again." render :action => :new end else - flash[:error] = "ReCaptcha test failed." + flash[:error] = "You failed the ReCaptcha test." render :action => :new 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 }) not found on open the invitation list.") + @user.errors.add(:email, " #{ '(' + @user.email + ')' if @user.email.length > 0 } not found on the invitation list.") render :action => 'new' end else @@ -113,7 +131,7 @@ class UsersController < ApplicationController :conditions => "active" unless @user - flash[:error] = "Profile for #{ h(params[:id]) } is currently inactive or doesn't exist." + flash[:error] = "Profile for #{params[:id] } is currently inactive or doesn't exist." end end app/controllers/users_controller.rb @@ -482,25 +482,61 @@ module ApplicationHelper end end - - def show_recent_ideas_and_projects - items = Scorecard.recent(3) || [] + def show_recent + ideas = Idea.recent(3) || [] + projects = Project.recent(3) || [] + jobs = Job.recent(3) || [] + people = User.recent(3) || [] html =[] - if items.size > 0 - items.each do |thing| - html << "<h3>" + link_to(h(thing.title), thing) + "</h3>" - html << h(thing.description[0..150]) - html << "..." if thing.description.size > 150 + + if ideas.size > 0 + html << "<h2>New Ideas</h2><h3>" + ideas.each do |idea| + html << link_to(h(idea.title), idea_path(idea)) + html << " || " unless idea == ideas.last end - else + html << "</h3>" + end + + if projects.size > 0 + html << "<h2>New Projects</h2><h3>" + projects.each do |project| + html << link_to(h(project.title), project_path(project)) + html << " || " unless project == projects.last + end + html << "</h3>" + end + + if jobs.size > 0 + html << "<h2>New Jobs</h2><h3>" + jobs.each do |job| + html << link_to(h(job.title), job_path(job)) + html << " || " unless job == jobs.last + end + html << "</h3>" + end + + if people.size > 0 + html << "<h2>New People</h2><h3>" + people.each do |person| + html << link_to(h(person.login), user_path(person)) + html << " || " unless person == people.last + end + html << "</h3>" + end + + if html == [] html = "There is no recent activity" end html + end + + def display_dashboard unless current_user app/helpers/application_helper.rb @@ -1,6 +1,10 @@ class Idea < ActiveRecord::Base validates_presence_of :title + validates_size_of :title, :maximum => 100 + validates_presence_of :description + 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." @@ -87,7 +91,14 @@ class Idea < ActiveRecord::Base updated_at > timestamp # returns true if updated since date, false otherwise end - + def self.recent(how_many = 3) # default is 3 + # this is a class method + # usage => Idea.recent(5) + + find :all, :limit => how_many.to_i, :include => :user, + :conditions => 'ideas.active = true and users.activation_code is Null', + :order => "ideas.created_at DESC" + end private @@ -123,7 +134,7 @@ class Idea < ActiveRecord::Base if active # this was counted in user's idea counter # note: inactive projects are not counted - decrement_counter + decrement_counter if user end end app/models/idea.rb @@ -77,6 +77,17 @@ class Job < ActiveRecord::Base ind.chop.strip end + + def self.recent(how_many = 3) # default is 3 + # this is a class method + # usage => Idea.recent(5) + + find :all, :limit => how_many.to_i, :include => :user, + :conditions => 'jobs.active = true and jobs.open = true and users.activation_code is Null and users.active = true', + :order => "jobs.created_at DESC" + end + + private # THE BELOW COUNTERS ARE MEANT TO TRACK OPEN JOBS POSTED BY USER app/models/job.rb @@ -1,6 +1,10 @@ class Project < ActiveRecord::Base validates_presence_of :title + validates_size_of :title, :maximum => 100 + validates_presence_of :description + 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" @@ -104,6 +108,14 @@ class Project < ActiveRecord::Base + def self.recent(how_many = 3) # default is 3 + # this is a class method + # usage => Project.recent(5) + + find :all, :limit => how_many.to_i, :include => :user, + :conditions => 'projects.active = true and users.activation_code is Null', + :order => "projects.created_at DESC" + end protected app/models/project.rb @@ -1,11 +1,12 @@ class Scorecard < ActiveRecord::Base include Math - belongs_to :scorable, :polymorphic => true - has_many :ratings - + validates_presence_of :scorable_id validates_presence_of :scorable_type + belongs_to :scorable, :polymorphic => true + has_many :ratings + attr_accessible # nothing @@ -33,23 +34,25 @@ class Scorecard < ActiveRecord::Base end - def self.recent(how_many = 3) # default is 3 - # this is a class method - # usage => Scorecard.recent(5) - - # find 3 most recent ideas and or proects - # (also ensures how_many is an integer) - scores = find :all, :limit => how_many.to_i, :order => "created_at DESC", :conditions => { :scorable_type => ["Idea", "Project"] } - # return the objects, not scorecard - items =[] - if scores - scores.each do |s| - items << s.scorable unless s.scorable == nil - end - end - - return items - end +# def self.recent(how_many = 3) # default is 3 +# # this is a class method +# # usage => Scorecard.recent(5) +# +# # find 3 most recent ideas and or proects +# # (also ensures how_many is an integer) +# scores = find :all, :limit => how_many.to_i, :order => "created_at DESC", :conditions => { :scorable_type => ["Idea", "Project"] } +# # return the objects, not scorecard + +# items =[] +# if scores +# scores.each do |s| +# items << s.scorable unless s.scorable == nil +# end +# end + + +# return items +# end define_index do indexes scorable_type app/models/scorecard.rb @@ -145,8 +145,10 @@ class User < ActiveRecord::Base has_many :applications_for_jobs, :through => :job_openings, :source => :job_applications, :conditions => "job_applications.user_id != #{id}" + has_many :icebreakers + before_create :make_activation_code - after_create :create_some_objects + 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 @@ -173,7 +175,8 @@ class User < ActiveRecord::Base :password, :password_confirmation, :last_logon, - :previous_logon + :previous_logon, + :idea_attributes # virtual attribute def self.get(conditions, order, page) @@ -447,6 +450,17 @@ class User < ActiveRecord::Base return { :mystuff => mystuff, :watching => watching } end + + def self.recent(how_many = 3) # default is 3 + # this is a class method + # usage => User.recent(5) + + find :all, :limit => how_many.to_i, + :conditions => 'active = true and activation_code is Null', + :order => "created_at DESC" + end + + protected app/models/user.rb @@ -26,7 +26,7 @@ </h2> <%= render :partial => '/shared/stars', :locals => { :scorable => idea} %> <p><%= show_description(idea) %></p> - <p>posted <%= time_ago_in_words(idea.created_at) %> ago by <%= link_to(idea.user.login, user_path(idea.user)) %></p> + <p>posted <%= time_ago_in_words(idea.created_at) %> ago by <%= idea.user ? link_to(idea.user.login, user_path(idea.user)) : "Anonymous" %></p> <p><%= dashboard_for(idea) %></p> </div> app/views/ideas/_idea.html.erb @@ -1,6 +1,12 @@ <% content_for :title do %>Invitations<% end %> -<h1><%= pluralize @invitations.total_entries, "Invitation" %> | <%= link_to "Invite Another Person", new_invitation_path %></h1> +<h1><%= pluralize @invitations.total_entries, "Invitation" %> | <%= link_to "Invite Another Person", new_invitation_path %> + <% if current_user.admin? %> + | <%= link_to "Icebreakers", icebreakers_path %> + <% end %> +</h1> + + <% unless @invitations %> You have not invited anyone yet, <%= link_to "invite", new_invitation_path %> someone! <% end %> app/views/invitations/index.html.erb @@ -5,7 +5,12 @@ <tr> <td width="70%" valign="top"> - <h1>New Invitation | <%= link_to "View Past Invitations", invitations_path %></h1> + <h1>New Invitation | <%= link_to "View Past Invitations", invitations_path %> + <% if current_user.admin? %> + | <%= link_to "Icebreakers", icebreakers_path %> + <% end %> + </h1> + <p><i>Commune2 is a closed network. Without this invitation, the person will not be able to register.</i></p> <p><b>NOTE:</b> You can invite only one person at a time, and only 2 people per 24 hours.</p> <p><h2>You currently have <%= pluralize current_user.available_invitations, "available invitation" %>.</h2> app/views/invitations/new.html.erb @@ -15,7 +15,7 @@ </h2> <%=h job.description[0..250] %><% if job.description.length > 250 %>...<% end %> - <p>posted <%= time_ago_in_words(job.created_at) %> ago by <%= link_to(job.user.login, user_path(job.user)) %></p> + <p>posted <%= time_ago_in_words(job.created_at) %> ago by <%= job.user ? link_to(job.user.login, user_path(job.user)) : "Anonymous" %></p> <%= dashboard_for(job) %> app/views/jobs/_job.html.erb @@ -38,8 +38,8 @@ <%= section_icon %> </td> <td valign="top"> - <p class="banner"><%= link_to image_tag("menu_icons/home_menu_icon.png", :border => "0"), root_path %></p> - <p class="banner"><%= link_to image_tag("menu_icons/help_menu_icon.png", :border => "0"), help_path %></p> + <p class="banner"><%= link_to "home", root_path, :class=> "banner-no-block" %></p> + <p class="banner"><%= link_to "about", help_path, :class=> "banner-no-block" %></p> </td> </tr> </table> app/views/layouts/application.html.erb @@ -29,7 +29,7 @@ <%= render :partial => '/shared/stars', :locals => { :scorable => project} %> <p><%= show_description(project) %></p> - <p>posted <%= time_ago_in_words(project.created_at) %> ago by <%= link_to(project.user.login, user_path(project.user)) %></p> + <p>posted <%= time_ago_in_words(project.created_at) %> ago by <%= project.user ? link_to(project.user.login, user_path(project.user)) : "Anonymous" %></p> <p><%= dashboard_for(project) %></p> </div> app/views/projects/_project.html.erb @@ -1,7 +1,7 @@ <div id="login-splash"> <% form_tag session_path do -%> - <h1>If you have been invited to join, please <%= link_to "register", signup_path %>. What is this thing? Check out our <%= link_to "about", help_path %> page. + <h1 style=" text-transform: none;">If you have been invited to join, please <%= link_to "register", signup_path %>. What is this thing? Check out our <%= link_to "about", help_path %> page. If your registration has been activated, you can log in. </h1> app/views/sessions/_logon.html.erb @@ -1,4 +1,4 @@ - <%= label_tag 'Add new location (city)' %><br /><%= text_field_tag :new_location, @new_location, :style=>"width:300px;" %> + <%= label_tag 'Location' %> (city)<br /><%= text_field_tag :new_location, @new_location, :style=>"width:300px;" %> <% if @location && @location.count > 1 %> <p><%= label_tag 'Multiple locations found, select one below or refine location above if none are right:' %> app/views/shared/_add_location.html.erb @@ -1,84 +1,88 @@ <h1>COMMUNE2</h2> -<div id="section_header"><h2>&nbsp;ABOUT</h2></div> +<div id="general-main"> -<p>We believe that anyone with an idea should have the opportunity to let it grow, see where it can take them, and succeed. People with ideas should not be hindered by lack of contacts or resources. We all have something to contribute, to take, to give, to be a part of something; an idea... that grows and develops. We all have a skill to contribute, we all have something to contribute, and in the end, our contributions can produce real results and change the way business is done. Don't let your ideas or skills squander idly away.</p> + <div id="section_header"><h2>&nbsp;ABOUT</h2></div> -<p>Commune2 is for sharing thoughts and for social networking through collaboration. It is a platform for people to learn from each other, turn ideas into projects, and turn projects into tangible accomplishments. We measure our success by the number of good ideas, successful projects, and working relationships created by our members. We encourage you to open up, think positive, and contribute something to the community. Do not let ideas die. Instead, turn them into reality, or let others do it.</p> + <p>We believe that anyone with an idea should have the opportunity to let it grow, see where it can take them, and succeed. People with ideas should not be hindered by lack of contacts or resources. We all have something to contribute, to take, to give, to be a part of something; an idea... that grows and develops. We all have a skill to contribute, we all have something to contribute, and in the end, our contributions can produce real results and change the way business is done. Don't let your ideas or skills squander idly away.</p> -<ul> - <li>Think open, think often, and share thoughts.</li> - <li>Help and be helped.</li> - <li>Do not be paranoid (if it is your idea, you can do it better).</li> - <li>If you want to do something, do something.</li> -</ul> + <p>Commune2 is for sharing thoughts and for social networking through collaboration. It is a platform for people to learn from each other, turn ideas into projects, and turn projects into tangible accomplishments. We measure our success by the number of good ideas, successful projects, and working relationships created by our members. We encourage you to open up, think positive, and contribute something to the community. Do not let ideas die. Instead, turn them into reality, or let others do it.</p> + <ul> + <li>Think open, think often, and share thoughts.</li> + <li>Help and be helped.</li> + <li>Do not be paranoid (if it is your idea, you can do it better).</li> + <li>If you want to do something, do something.</li> + </ul> -<div id="section_header"><h2>&nbsp;FAQ</h1></div> -<div id="snippet_header"><h3>&nbsp;General</h3></div> + <div id="section_header"><h2>&nbsp;FAQ</h2></div> -<p><b>What about my intellectual property? Will people steal my ideas and get rich off of them?</b></p> -<p>Commune2 claims no right on your intellectual property or on any of your future profits. If you are concerned about these issues, we suggest you contract a lawyer and protect yourself legally. We are an open community, so everything you post here is considered public. Keep in mind one thing: how good is your idea if no one ever hears about it, or if you cannot execute it alone?</p> + <div id="snippet_header"><h3>&nbsp;General</h3></div> -<p><b>Okay, all this “here to help out fellow Commune2 members” is all feel good and everything, but does it really work?</b></p> + <p><b>What about my intellectual property? Will people steal my ideas and get rich off of them?</b></p> + <p>Commune2 claims no right on your intellectual property or on any of your future profits. If you are concerned about these issues, we suggest you contract a lawyer and protect yourself legally. We are an open community, so everything you post here is considered public. Keep in mind one thing: how good is your idea if no one ever hears about it, or if you cannot execute it alone?</p> -<p>Try it. Have you ever had an idea or something you thought would be really great, but didn’t have all the skills to bring it to fruition? Here, you can find help - or help others, and be a part of something great.</p> + <p><b>Okay, all this “here to help out fellow Commune2 members” is all feel good and everything, but does it really work?</b></p> + <p>Try it. Have you ever had an idea or something you thought would be really great, but didn’t have all the skills to bring it to fruition? Here, you can find help - or help others, and be a part of something great.</p> -<p><b>What is the difference between watching and showing interest?</b></p> -<p>If you show interest, other people will see you have shown interest (there will be a link to your profile from the idea / project). Watching is anonymous.</p> -<p><b>I posted something a few months ago and now want to delete it. Can I?</b></p> -<p>No. But, you can edit the post and change the status to inactive. Only you will be able to see the inactive post.</p> + <p><b>What is the difference between watching and showing interest?</b></p> + <p>If you show interest, other people will see you have shown interest (there will be a link to your profile from the idea / project). Watching is anonymous.</p> + <p><b>I posted something a few months ago and now want to delete it. Can I?</b></p> + <p>No. But, you can edit the post and change the status to inactive. Only you will be able to see the inactive post.</p> -<div id="snippet_header"><h3>&nbsp;Ideas and Projects</h3></div> -<p><b>What the heck is the difference between an "idea" and a "project?"</b></p> -<p>Think of an idea as an interesting thought that is relatively general. Think of a project as something somewhat specific that you or someone else is actively working on... to turn an idea into reality. EXAMPLE: "We need some alternative to mass-produced bland beer" (idea); "A microbrewery in Brooklyn" (project).</p> + <div id="snippet_header"><h3>&nbsp;Ideas and Projects</h3></div> -<p><b>I have a great project that I want to get started. Do you recommend I post it as an idea first and then launch the project from there?</b></p> + <p><b>What the heck is the difference between an "idea" and a "project?"</b></p> + <p>Think of an idea as an interesting thought that is relatively general. Think of a project as something somewhat specific that you or someone else is actively working on... to turn an idea into reality. EXAMPLE: "We need some alternative to mass-produced bland beer" (idea); "A microbrewery in Brooklyn" (project).</p> -<p>Yes! If you post it as an idea first, you will allow people to spawn other projects from it. This way you will get to see what other great projects come out of your idea.</p> + <p><b>I have a great project that I want to get started. Do you recommend I post it as an idea first and then launch the project from there?</b></p> -<p><b>I saw an idea/project that I really like, how do I contact the poster to let them know I want to get involved?</b></p> -<p>Go to the user’s profile and send them a message or click on “show interest” in the left column of the idea/project. And, of course, you can always simply leave a comment.</p> + <p>Yes! If you post it as an idea first, you will allow people to spawn other projects from it. This way you will get to see what other great projects come out of your idea.</p> -<p><b>I would like to get involved, but there isn’t a job or project that seems in need of my skills. Is there a way I can post my skills and say that I am available to help?</b></p> + <p><b>I saw an idea/project that I really like, how do I contact the poster to let them know I want to get involved?</b></p> + <p>Go to the user’s profile and send them a message or click on “show interest” in the left column of the idea/project. And, of course, you can always simply leave a comment.</p> -<p>You could update your profile so that it is very specific to what you are looking for and when someone does a related search, your profile will come up. Alternatively, you can post your own idea or project.</p> + <p><b>I would like to get involved, but there isn’t a job or project that seems in need of my skills. Is there a way I can post my skills and say that I am available to help?</b></p> + <p>You could update your profile so that it is very specific to what you are looking for and when someone does a related search, your profile will come up. Alternatively, you can post your own idea or project.</p> -<p><b>I saw someone else’s project and would like to post a different project from it. Can I post a new project based on someone else’s project?</b></p> -<p>You can only spawn a project from ideas (check if that project has an idea link).</p> + <p><b>I saw someone else’s project and would like to post a different project from it. Can I post a new project based on someone else’s project?</b></p> + <p>You can only spawn a project from ideas (check if that project has an idea link).</p> -<div id="snippet_header"><h3>&nbsp;Jobs</h3></div> -<p><b>I have a great idea/project and need help to get it started, but I can’t afford to pay someone. Can I still post jobs for my project?</b></p> -<p>Yes!</p> + <div id="snippet_header"><h3>&nbsp;Jobs</h3></div> -<p><b>I recently started learning a new skill, but am still in the “learning stage.” I would like to develop this skill and work on a project that allows me to “learn on the job.” Can I do this?</b></p> -<p>This is between you and the project manager. However, we highly encourage such activity!</p> + <p><b>I have a great idea/project and need help to get it started, but I can’t afford to pay someone. Can I still post jobs for my project?</b></p> + <p>Yes!</p> -<p><b>I am only interested in jobs that can pay me. Is there any way I can view only those jobs that are for pay or equity?</b></p> + <p><b>I recently started learning a new skill, but am still in the “learning stage.” I would like to develop this skill and work on a project that allows me to “learn on the job.” Can I do this?</b></p> + <p>This is between you and the project manager. However, we highly encourage such activity!</p> -<p>You will need to look at the job before knowing how or if it is paid - or even contact the project manager. We see this as a positive. Maybe, you will find a really great job that you will WANT to work on regardless of compensation.</p> + <p><b>I am only interested in jobs that can pay me. Is there any way I can view only those jobs that are for pay or equity?</b></p> -<p><b>I have several open positions that are exactly the same. Is there any way I can indicate from one job posting that this is for several openings or do I need to have separate posts for each job?</b></p> + <p>You will need to look at the job before knowing how or if it is paid - or even contact the project manager. We see this as a positive. Maybe, you will find a really great job that you will WANT to work on regardless of compensation.</p> -<p>You need to have separate posts for each job, sorry.</p> + <p><b>I have several open positions that are exactly the same. Is there any way I can indicate from one job posting that this is for several openings or do I need to have separate posts for each job?</b></p> + <p>You need to have separate posts for each job, sorry.</p> -<div id="snippet_header"><h3>&nbsp;Invitations</h3></div> -<p><b>I have a bunch of friends who want to join, but I can only send out two invitations a day. Why can’t I just invite all my friends that want to join at once?</b></p> - -<p>We are still a work in progress and don’t want to overload the internets. Rest assured, you will be able to invite all your friends eventually.</p> + <div id="snippet_header"><h3>&nbsp;Invitations</h3></div> -<p><b>I would like to know when people I invite join, is there any way to receive an update when this happens?</b></p> + <p><b>I have a bunch of friends who want to join, but I can only send out two invitations a day. Why can’t I just invite all my friends that want to join at once?</b></p> + + <p>We are still a work in progress and don’t want to overload the internets. Rest assured, you will be able to invite all your friends eventually.</p> -<p>Not yet. However, if you click on “invite,” you will see a link to view your past invitations and their status.</p> + <p><b>I would like to know when people I invite join, is there any way to receive an update when this happens?</b></p> + + <p>Not yet. However, if you click on “invite,” you will see a link to view your past invitations and their status.</p> + +</div> app/views/static/help.html.erb @@ -6,7 +6,7 @@ <table border="0" cellpadding="15" align="center"> <tr> - <td valign="top"> + <td valign="top" style="height:175px;"> <table border="0" cellspacing="0" cellpadding="0"> <tr> <td> @@ -39,10 +39,8 @@ <td rowspan="2" valign="top"> <div id="recent-activity" > -<h2>Recent Activity</h2> - <table border="0" cellpadding="5" cellspacing="5"><tr><td> - <%= show_recent_ideas_and_projects %> - </td></tr></table> + <h1>Recent Activity</h1> + <%= show_recent %> </div> </td> app/views/user/index.html.erb @@ -1,38 +1,76 @@ <% content_for :title do %>New Account<% end %> <% 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> + <div id="show-main-container"> - -<% form_for @user do |f| -%> -<%= f.error_messages %> +<div id="section_header"><h2>&nbsp;Basic account Information</h2></div> -<p><%= label_tag 'login (username)' %><br/> -<%= f.text_field :login, :style=>"width:300px;" %></p> + <p>You will be able to add a lot more to your profile once you activate your account.</p> -<p><%= label_tag 'email' %><br/> -<%= f.text_field :email, :style=>"width:300px;" %></p> + <% form_for @user do |f| -%> -<%= render :partial => '/shared/add_location' %> + <p><%= label_tag 'login (username)' %><br/> + <%= f.text_field :login, :style=>"width:300px;" %></p> -<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><%= label_tag 'email' %><br/> + <%= f.text_field :email, :style=>"width:300px;" %></p> + <%= render :partial => '/shared/add_location' %> -<%= render :partial => '/shared/reCAPTCHA' %> - -<p><%= submit_tag 'Register', :class=>"big_button" %></p> -<% end -%> - + <p><%= label_tag 'password' %> (CaSe SeNsitIvE)<br/> + <%= f.password_field :password, :style=>"width:300px;" %></p> -<p><b>NOTE:</b> If you are registered and just need to log in, please go <%= link_to "here", login_path %>.</p> + <p><%= label_tag 'password_confirmation', 'Confirm Password' %> (CaSe SeNsitIvE)<br/> + <%= f.password_field :password_confirmation, :style=>"width:300px;" %></p> + + <p>&nbsp;</p> + + +<div id="section_header"><h2>&nbsp;An idea!</h2></div> + + <p>Commune2 is all about sharing ideas. <b>We want you to be proactive, so start now!</b> If you don't have an idea yet, think of this as a brain teaser exercise. Or, if you have a specific idea in mind already, great, use it here.</p> + + <p><b>Still not sure?</b> Here are some teaser questions to get you thinking (<b>but your idea does NOT have to address these</b>):</p> + + <ul> + <% Icebreaker.random(3).each do | icebreaker | %> + <li><%=h icebreaker.question %></li> + <% end %> + </ul> + + + + <p><%= label_tag 'Title' %><br /> + <%= text_field_tag 'idea[title]', @idea.title, :style=>"width:600px;" %> + </p> + + <p><%= label_tag 'Description' %><br/> + <%= text_area_tag 'idea[description]', @idea.description, :rows => 10 ,:style=>"width:600px;" %> + </p> + + + + <p>&nbsp;</p> + + +<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' %> + <p>&nbsp;</p> + + <p><%= submit_tag 'Register', :class=>"big_button" %></p> + <% end -%> + +</div> app/views/users/new.html.erb @@ -1,7 +1,7 @@ <% content_for :title do %>Person <% end %> <% if @user.blank? %> - <p>Sorry, no idea to see here.</p> + <p>Sorry, no one to see here.</p> <% else %> app/views/users/show.html.erb @@ -1,4 +1,6 @@ ActionController::Routing::Routes.draw do |map| + map.resources :icebreakers + map.root :controller => 'user', :action => 'index' # should change this map.resources :episodes # should remove this config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090917011143) do +ActiveRecord::Schema.define(:version => 20091101231404) do create_table "comments", :force => true do |t| t.string "title", :limit => 50, :default => "" @@ -38,6 +38,14 @@ ActiveRecord::Schema.define(:version => 20090917011143) do t.datetime "updated_at" end + create_table "icebreakers", :force => true do |t| + t.integer "user_id" + t.string "question" + t.boolean "approved" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "ideas", :force => true do |t| t.boolean "active", :default => true, :null => false t.integer "user_id", :null => false @@ -155,10 +163,10 @@ ActiveRecord::Schema.define(:version => 20090917011143) do add_index "logons", ["user_id"], :name => "index_logons_on_user_id", :unique => true create_table "messages", :force => true do |t| - t.integer "from_id", :null => false - t.integer "to_id", :null => false + t.integer "from_id", :null => false + t.integer "to_id", :null => false t.string "subject", :limit => 50 - t.text "body", :limit => 255 + t.text "body" t.datetime "created_at" t.datetime "updated_at" end db/schema.rb @@ -49,6 +49,8 @@ Feature: Various mailer functionalities And I fill in "user_password" with "password" And I fill in "user_password_confirmation" with "password" And I fill in "new_location" with "New York" + And I fill in "idea_title" with "Idea" + And I fill in "idea_description" with "Description" And I press "Register" Then I should see "Thank you for registering." And I should receive an email with "Please activate your new account" in subject features/mailer.feature @@ -9,6 +9,14 @@ Given /^the following additional user records?$/ do |table| parse_table_and_add_users(table) end + +Then /^a user with "([^\"]*)" login should not exist$/ do |login| + User.find_by_login(login).should equal(nil) +end + + + + def parse_table_and_add_users(table) table.hashes.each do |attributes| features/step_definitions/user_steps.rb @@ -3,13 +3,13 @@ require 'sham' require 'faker' -Sham.first_name { Faker::Name.first_name } -Sham.last_name { Faker::Name.last_name } +Sham.first_name(:unique => false) { Faker::Name.first_name } +Sham.last_name(:unique => false) { Faker::Name.last_name } Sham.login { Sham.first_name + '_' + Sham.last_name } -Sham.company { Faker::Company.name } +Sham.company(:unique => false) { Faker::Company.name } Sham.email { Faker::Internet.email } -Sham.sentence { Faker::Lorem.sentence[0..49] } -Sham.body { Faker::Lorem.paragraph[0..249] } +Sham.sentence(:unique => false) { Faker::Lorem.sentence[0..49] } +Sham.body(:unique => false) { Faker::Lorem.paragraph[0..249] } Sham.city(:unique => false) { Faker::Address.city } Sham.state(:unique => false) { Faker::Address.us_state } @@ -123,6 +123,14 @@ PolymorphicGeneralSkill.blueprint do general_skill { skills[id] } end + +Icebreaker.blueprint do + # needs to be called with the create method below + question { Sham.sentence } + approved { true } +end + + def create_user_with_associations!(attributes = {}) user = User.make_unsaved(attributes[:user]) @@ -272,6 +280,23 @@ def create_rating!(attributes = {}) end + +def create_icebreaker_with_author!(attributes = {}) + # check if the user exists, find or create + # create uses blueprint + + if attributes[:author] && attributes[:author][:login] + user = User.find_by_login( attributes[:author][:login] ) || create_user_with_associations!( { :user=> attributes[:author] } ) + else + user = create_user_with_associations!(:user => {:admin => true}) + end + + icebreaker = user.icebreakers.make(attributes[:icebreaker]) + +end + + + def create_on_the_fly(class_name, attributes = {}) class_name.capitalize! @@ -289,3 +314,5 @@ def create_on_the_fly(class_name, attributes = {}) end end + + features/support/blueprints.rb @@ -53,6 +53,9 @@ module NavigationHelpers when /invitations page/ invitations_path + when /icebreakers page/ + icebreakers_path + when /new idea page/ new_idea_path features/support/paths.rb @@ -14,6 +14,8 @@ And I fill in "user_password" with "password" And I fill in "user_password_confirmation" with "password" And I fill in "new_location" with "New York" + And I fill in "idea_title" with "Idea" + And I fill in "idea_description" with "Description" And I press "Register" Then I should see "Thank you for registering." @@ -27,6 +29,8 @@ And I fill in "user_password" with "password" And I fill in "user_password_confirmation" with "password" And I fill in "new_location" with "New York" + And I fill in "idea_title" with "Idea" + And I fill in "idea_description" with "Description" And I press "Register" Then I should see "Thank you for registering." @@ -40,6 +44,8 @@ And I fill in "user_password" with "password" And I fill in "user_password_confirmation" with "password" And I fill in "new_location" with "New York" + And I fill in "idea_title" with "Idea" + And I fill in "idea_description" with "Description" And I press "Register" Then I should see "Could not register" @@ -108,6 +114,8 @@ And I fill in "user_password" with "password" And I fill in "user_password_confirmation" with "password" And I fill in "new_location" with "Springfield" + And I fill in "idea_title" with "Idea" + And I fill in "idea_description" with "Description" And I press "Register" Then I should not see "Thank you for registering." But I should see "Multiple locations found" @@ -163,3 +171,20 @@ Then I should see "Profile updated" And my login should be "monolith" + Scenario: Need to post an idea while registering + Given I am on the registration page + And there are one or more users + And there is an invitation for "invited_user@commune2.com" + When I fill in "user_login" with "invited_user" + And I fill in "user_email" with "invited_user@commune2.com" + And I fill in "user_password" with "password" + And I fill in "user_password_confirmation" with "password" + And I fill in "new_location" with "New York" + And I press "Register" + Then I should not see "Thank you for registering." + And I should see "Idea title can't be blank" + And I should see "Idea description can't be blank" + And a user with "invited_user" login should not exist + + + features/users.feature @@ -909,6 +909,7 @@ h2 { letter-spacing:0.5px; margin: 0px; line-height: 40px; + text-transform: capitalize; } h3 { @@ -920,9 +921,10 @@ h3 { } -b { +b, label { color: #4f391a; font-size: medium; + font-weight:bold; } hr { @@ -985,3 +987,17 @@ input.big_button { } + + + +#general-main{ + position: relative; + float: left; + width: 100%; + background-image:url('/images/snippet_bg.jpg'); + background-repeat: repeat-y; + background-position: top right; + padding: 10px; + padding-left: 0px; + +} public/stylesheets/style.css d53cf4d3223099c6a321c9cf1d55470073d8a4e2 Anatoly Sholomyansky anatoly@commune2.com http://github.com/jaggederest/commune2/commit/5dd04049b21c8744e49fcdd99fe7698915ed42f8 5dd04049b21c8744e49fcdd99fe7698915ed42f8 2009-11-07T07:27:21-08:00 2009-11-07T07:27:21-08:00 icebreakers d3ff2483a902efeb2fb2ecad95d5c385d5916bf7 Anatoly Sholomyansky anatoly@commune2.com