app/controllers/application_controller.rb app/controllers/monitorships_controller.rb app/models/monitorships_sweeper.rb app/models/posts_sweeper.rb app/views/monitorships/create.rjs app/views/monitorships/destroy.rjs config/initializers/application.rb db/migrate/20090317123901_add_open_id_authentication_tables.rb spec/controllers/monitorships_controller_spec.rb vendor/plugins/open_id_authentication/CHANGELOG vendor/plugins/open_id_authentication/README vendor/plugins/open_id_authentication/Rakefile vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/open_id_authentication_tables_generator.rb vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/templates/migration.rb vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/templates/migration.rb vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/upgrade_open_id_authentication_tables_generator.rb vendor/plugins/open_id_authentication/init.rb vendor/plugins/open_id_authentication/lib/open_id_authentication.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/association.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/db_store.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/request.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/timeout_fixes.rb vendor/plugins/open_id_authentication/tasks/open_id_authentication_tasks.rake vendor/plugins/open_id_authentication/test/normalize_test.rb vendor/plugins/open_id_authentication/test/open_id_authentication_test.rb vendor/plugins/open_id_authentication/test/status_test.rb vendor/plugins/open_id_authentication/test/test_helper.rb @@ -26,15 +26,6 @@ class PostsController < ApplicationController end end - def new - @post = Post.new - - respond_to do |format| - format.html # new.html.erb - format.xml { render :xml => @post } - end - end - def edit respond_to do |format| format.html # edit.html.erb @@ -47,7 +38,7 @@ class PostsController < ApplicationController respond_to do |format| if @post.new_record? - format.html { render :action => "new" } + format.html { redirect_to forum_topic_path(@forum, @topic) } format.xml { render :xml => @post.errors, :status => :unprocessable_entity } else flash[:notice] = 'Post was successfully created.' @@ -82,14 +73,19 @@ class PostsController < ApplicationController protected def find_parents if params[:user_id] - @parent = @user = User.find_by_permalink(params[:user_id]) + @parent = @user = User.find(params[:user_id]) elsif params[:forum_id] @parent = @forum = Forum.find_by_permalink(params[:forum_id]) @parent = @topic = @forum.topics.find_by_permalink(params[:topic_id]) if params[:topic_id] end end - + def find_post - @post = @topic.posts.find(params[:id]) + post = @topic.posts.find(params[:id]) + if post.user == current_user || current_user.admin? + @post = post + else + raise ActiveRecord::RecordNotFound + end end -end +end \ No newline at end of file app/controllers/posts_controller.rb @@ -7,19 +7,14 @@ class SessionsController < ApplicationController end def create - params[:login] = params[:login].downcase - self.current_user = current_site.users.authenticate(params[:login], params[:password]) - - if logged_in? - if params[:remember_me] == "1" - current_user.remember_me - cookies[:auth_token] = { :value => current_user.remember_token , :expires => current_user.remember_token_expires_at } - end - redirect_back_or_default('/') - flash[:notice] = "Logged in successfully" + reset_session + if using_open_id? + cookies[:use_open_id] = {:value => '1', :expires => 1.year.from_now.utc} + open_id_authentication(params[:openid_url]) else + cookies[:use_open_id] = {:value => '0', :expires => 1.year.ago.utc} + password_authentication params[:login], params[:password] flash[:error] = "Invalid login" - render :action => 'new' end end @@ -30,4 +25,55 @@ class SessionsController < ApplicationController flash[:notice] = "You have been logged out." redirect_back_or_default('/') end + + protected + + def password_authentication(name, password) + if @current_user = current_site.users.authenticate(name, password) + successful_login + else + failed_login "Sorry, that username/password doesn't work" + end + end + + def open_id_authentication(openid_url) + authenticate_with_open_id(openid_url, :required => [:nickname, :email]) do |result, openid_url, registration| + if result.successful? + @user = User.find_or_initialize_by_openid_url(openid_url) + @current_user = @user + if @current_user + if @user.new_record? + @user.login = openid_url + @user.email = registration['email'] + @user.password = 123456 + @user.site = Site.find(:first) + @user.display_name = registration['nickname'] + @user.save(false) + end + successful_login + else + failed_login "Sorry, no user by the identity URL {openid_url} exists"[:openid_no_user_message, openid_url.inspect] + end + else + failed_login result.message + end + end + end + + + private + def successful_login + flash[:notice] = 'You are now logged in! Welcome.' + new_cookie_flag = (params[:remember_me] == "1") + handle_remember_cookie! new_cookie_flag + session[:user_id] = @current_user.id + redirect_back_or_default('/') + end + + def failed_login(message) + @remember_me = params[:remember_me] + flash[:error] = message + render :action => "new" + end + end app/controllers/sessions_controller.rb @@ -1,5 +1,5 @@ class SitesController < ApplicationController - before_filter :admin_required, :only => [ :destroy, :update, :edit ] + before_filter :admin_required def index @sites = Site.paginate(:all, :page => current_page, :order => 'host ASC') app/controllers/sites_controller.rb @@ -20,8 +20,8 @@ class UsersController < ApplicationController cookies.delete :auth_token @user = current_site.users.build(params[:user]) @user.save if @user.valid? + @user.register! if @user.valid? unless @user.new_record? - @user.register! redirect_back_or_default('/login') flash[:notice] = "Thanks for signing up! Please click the link in your email to activate your account" else @@ -95,13 +95,15 @@ class UsersController < ApplicationController protected def find_user @user = if admin? - current_site.all_users.find_by_permalink(params[:id]) + current_site.all_users.find params[:id] + elsif params[:id] == current_user.id + current_user else - current_site.users.find_by_permalink(params[:id]) + current_site.users.find params[:id] end or raise ActiveRecord::RecordNotFound end def authorized? - admin? || params[:id].blank? || params[:id] == current_user.permalink + admin? || params[:id].blank? || params[:id] == current_user.id.to_s end -end +end \ No newline at end of file app/controllers/users_controller.rb @@ -58,7 +58,7 @@ module ApplicationHelper else :search end - atom ? send("formatted_#{prefix}_posts_path", options.update(:format => :atom)) : send("#{prefix}_posts_path", options) + atom ? send("#{prefix}_posts_path", options.update(:format => :atom)) : send("#{prefix}_posts_path", options) end @@default_jstime_format = "%d %b, %Y %I:%M %p" app/helpers/application_helper.rb @@ -65,7 +65,7 @@ class Topic < ActiveRecord::Base self.class.update_all(['last_updated_at = ?, last_user_id = ?, last_post_id = ?, posts_count = ?', remaining_post.created_at, remaining_post.user_id, remaining_post.id, posts.count], ['id = ?', id]) else - self.destroy + destroy end end app/models/topic.rb @@ -65,6 +65,21 @@ class User < ActiveRecord::Base end def to_param - permalink + id.to_s # permalink || login end + + def openid_url=(value) + write_attribute :openid_url, value.blank? ? nil : OpenIdAuthentication.normalize_identifier(value) + end + + def using_openid + self.openid_url.blank? ? false : true + end + + def to_xml(options = {}) + options[:except] ||= [] + options[:except] << :email << :login_key << :login_key_expires_at << :password_hash << :openid_url << :activated << :admin + super + end + end app/models/user.rb @@ -5,7 +5,7 @@ class User after_create :set_first_user_as_activated def set_first_user_as_activated - register! && activate! if site.nil? or site.users.size <= 1 + register! && activate! if site.nil? or site.users.count <= 1 end # Returns true if the user has just been activated. app/models/user/activation.rb @@ -38,7 +38,7 @@ class User self.deleted_at = nil self.activation_code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join ) - UserMailer.deliver_signup_notification(self) + UserMailer.deliver_signup_notification(self) unless using_openid end protected @@ -52,7 +52,7 @@ protected self.deleted_at = nil self.activation_code = "" - UserMailer.deliver_activation(self) + UserMailer.deliver_activation(self) unless using_openid end def remove_moderatorships app/models/user/states.rb @@ -14,6 +14,8 @@ class User before_save :downcase_email_and_login before_save :encrypt_password before_create :set_first_user_as_admin + # validates_email_format_of :email, :message=>"is invalid" + validates_uniqueness_of :openid_url, :case_sensitive => false, :allow_nil => true # prevents a user from submitting a crafted form that bypasses activation # anything else you want your user to change should be added here. @@ -42,7 +44,12 @@ protected self.crypted_password = encrypt(password) end - def password_required? + def using_openid + self.openid_url.blank? ? false : true + end + + def password_required? + return false if using_openid crypted_password.blank? || !password.blank? end app/models/user/validation.rb @@ -15,7 +15,7 @@ <h1 style="margin-top:0;"><%= 'Forums'[:forums_title] %></h1> <p class="subtitle"> -<%= feed_icon_tag "Recent Posts"[:recent_posts], formatted_posts_path(:format => 'atom') %> +<%= feed_icon_tag "Recent Posts"[:recent_posts], posts_path(:format => 'atom') %> <%= topic_count %>, <%= post_count %> <%# OPTIMIZE ME voice_count %> </p> @@ -25,7 +25,7 @@ <th class="la" width="30%" colspan="1"><%= 'Last Post'[:last_post] %></th> </tr> <% for forum in @forums do %> - <tr> + <tr class="forum" id="forum_<%= forum.id %>_row"> <td class="vat c1"> <% if recent_forum_activity(forum) %> app/views/forums/index.html.erb @@ -30,7 +30,7 @@ </h1> <p class="subtitle"> - <%= feed_icon_tag @forum.name, formatted_forum_posts_path(@forum, :atom) %> + <%= feed_icon_tag @forum.name, forum_posts_path(@forum, :format => :atom) %> <%= '{count} topic(s)'[(count=@forum.topics.size)==1 ? :topic_count : :topics_count, number_with_delimiter(count)] %>, <%= '{count} post(s)'[(count=@forum.posts.size)==1 ? :post_count : :posts_count, number_with_delimiter(count)] %> </p> app/views/forums/show.html.erb @@ -1,11 +1,10 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <title><%= "#{h @page_title} - " if @page_title %> <%=h @current_site && current_site.name %></title> <%= stylesheet_link_tag 'display' %> - <%= javascript_include_tag "prototype", "effects", "lowpro", "time", "application", :cache => 'beast' %> + <%= javascript_include_tag "prototype", "effects", "lowpro", "time", "application", :cache => "beast" %> <% unless @feed_icons.blank? -%> <% @feed_icons.each do |feed| -%> <%= auto_discovery_link_tag :atom, feed[:url], :title => "Subscribe to '#{feed[:title]}'" %> @@ -27,7 +26,7 @@ <li><%= link_to_function 'Search'[:search_title], "#", :href => root_path, :id => 'search-link' %></li> <% if @current_site and logged_in? -%> - <li class="login"><%= link_to current_user.login, user_path(current_user) %></li> + <li class="login"><%= link_to current_user.display_name, user_path(current_user) %></li> <li class="logout"><%= link_to 'Settings'[:settings_title], settings_path %></li> <li class="logout"><%= link_to 'Logout'[:logout_title], logout_path(:to => CGI.escape(request.request_uri)) %></li> <% else -%> app/views/layouts/_head.html.erb @@ -1,16 +1,42 @@ <h1>Log In</h1> -<% form_tag session_path do -%> +<% form_tag(session_path) do -%> +<div id="openid_fields" style="display:none"> +<p> + <label for="openid_url">Login with OpenID</label> + <br /> + <%= text_field_tag 'openid_url', params[:openid_url], :class => "openid_url" %> +</p> +<p>or login with <a href="#" onclick="LoginForm.setToPassword()">username/password</a></p> +</div> + +<div id="password_fields"> <p><%= label_tag 'login' %><br /> <%= text_field_tag 'login', @login %></p> <p><%= label_tag 'password' %><br/> <%= password_field_tag 'password', nil %></p> -<!-- Uncomment this if you want this functionality <p><%= label_tag 'remember_me', 'Remember me' %> <%= check_box_tag 'remember_me', '1', @remember_me %></p> ---> -<p><%= submit_tag 'Log in' %></p> +<p>or login with <a href="#" onclick="LoginForm.setToOpenID()">OpenID</a></p> +</div> + +<p><%= submit_tag 'Log in' %> or <%= link_to_function('reset password'[], "$('reset-password').toggle();") %></p> + <% end -%> + +<% form_tag users_path, :id => 'reset-password', :style => 'display:none' do -%> + + <hr /> + <h5><%= 'Reset Password'[] %></h5> + + <p><%= 'Enter your email, and a brand new login key will be sent to you. Click the link in the email to log in, and then change your password.'[:email_directions] %></p> + <p><%= text_field_tag :email, "", :size => 30 %></p> + <p><%= submit_tag 'E-mail me the link'[:email_submit] %> + or <%= link_to_function('cancel'[], "$('reset-password').hide()") %></p> + +<% end -%> + +<%= javascript_tag "$('openid_input').focus();"%> app/views/sessions/new.html.erb @@ -13,7 +13,7 @@ <% end # right content -%> -<% if false#logged_in? %> +<% if logged_in? %> <% form_tag monitorship_path(@forum, @topic), :style => 'margin-top:0em; float:right;' do -%> <div> @@ -58,7 +58,7 @@ </h1> <p class="subtitle"> - <%= feed_icon_tag @topic.title, formatted_forum_topic_posts_path(@forum, @topic, 'atom') %> + <%= feed_icon_tag @topic.title, forum_topic_posts_path(@forum, @topic, :format => 'atom') %> <%= '{count} post(s)'[(count=@topic.posts.size)==1 ? :post_count : :posts_count, number_with_delimiter(count)] %>, <%= '{count} voice(s)'[(count=@topic.voices.size)==1 ? :voice_count : :voices_count, number_with_delimiter(count)] %> </p> app/views/topics/show.html.erb @@ -12,5 +12,9 @@ <p><label for="password_confirmation">Confirm Password</label><br/> <%= f.password_field :password_confirmation %></p> +<p><label for="user_openid_url">OpenID URL</label><br /> +<%= f.text_field :openid_url %> +</p> + <p><%= submit_tag 'Sign up' %></p> <% end -%> app/views/users/new.rhtml @@ -45,7 +45,7 @@ <h1><%=h @user.display_name %> </h1> <p class="subtitle"> - <%= feed_icon_tag @user.display_name, formatted_user_posts_path(:user_id => @user, :format => :rss) %> + <%= feed_icon_tag @user.display_name, user_posts_path(:user_id => @user, :format => :rss) %> <span> <%= '{count} topics'[(count=@user.topics.size)==1 ? :topic_count : :topics_count, number_with_delimiter(count)] %>, <%= '{count} posts'[(count=@user.posts.size)==1 ? :post_count : :posts_count, number_with_delimiter(count)] %> app/views/users/show.html.erb @@ -5,7 +5,7 @@ # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.3' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') @@ -18,6 +18,8 @@ Rails::Initializer.run do |config| config.gem 'mislav-will_paginate', :lib => "will_paginate", :source => "http://gems.github.com" + + config.gem "bluecloth" # Skip frameworks you're not going to use (only works if using vendor/rails). # To use Rails without a database, you must remove the Active Record framework config/environment.rb @@ -1,7 +1,10 @@ ActionController::Routing::Routes.draw do |map| - map.resource :session + map.open_id_complete '/session', + :controller => "sessions", :action => "create", + :requirements => { :method => :get } - map.resources :sites, :moderatorships + map.resources :sites, :moderatorships, :monitorship + map.resources :forums, :has_many => :posts do |forum| forum.resources :topics do |topic| @@ -11,8 +14,8 @@ ActionController::Routing::Routes.draw do |map| forum.resources :posts end + map.user '/users/:id', :controller => "users", :action => "show" map.resources :posts, :collection => {:search => :get} - map.resources :users, :member => { :suspend => :put, :settings => :get, :make_admin => :put, @@ -26,5 +29,11 @@ ActionController::Routing::Routes.draw do |map| map.logout '/logout', :controller => 'sessions', :action => 'destroy' map.settings '/settings', :controller => 'users', :action => 'settings' map.resource :session + + map.with_options :controller => 'posts', :action => 'monitored' do |map| + map.formatted_monitored_posts 'users/:user_id/monitored.:format' + map.monitored_posts 'users/:user_id/monitored' + end + map.root :controller => 'forums', :action => 'index' end config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20081213180202) do +ActiveRecord::Schema.define(:version => 20090317123901) do create_table "forums", :force => true do |t| t.integer "site_id" @@ -41,6 +41,25 @@ ActiveRecord::Schema.define(:version => 20081213180202) do t.boolean "active", :default => true end + create_table "open_id_authentication_associations", :force => true do |t| + t.binary "server_url" + t.string "handle" + t.binary "secret" + t.integer "issued" + t.integer "lifetime" + t.string "assoc_type" + end + + create_table "open_id_authentication_nonces", :force => true do |t| + t.string "nonce" + t.integer "created" + end + + create_table "open_id_authentication_settings", :force => true do |t| + t.string "setting" + t.binary "value" + end + create_table "posts", :force => true do |t| t.integer "user_id" t.integer "topic_id" db/schema.rb @@ -201,7 +201,7 @@ module AuthenticatedSystem end def send_remember_cookie! - cookies[:auth_token] = { + cookies['auth_token'] = { :value => @current_user.remember_token, :expires => @current_user.remember_token_expires_at } end lib/authenticated_system.rb @@ -1,3 +1,4 @@ +require 'redcloth' module HtmlFormatting protected @@ -5,7 +6,7 @@ module HtmlFormatting self.class.formatted_attributes.each do |attr| raw = read_attribute attr linked = auto_link(raw) { |text| truncate(text, :length => 50) } - textilized = RedCloth.new(linked, [:hard_breaks]) + textilized = ::RedCloth.new(linked, [:hard_breaks]) textilized.hard_breaks = true if textilized.respond_to?("hard_breaks=") write_attribute "#{attr}_html", white_list_sanitizer.sanitize(textilized.to_html) end lib/html_formatting.rb @@ -80,6 +80,19 @@ var PostForm = { } } +var RowManager = { + addMouseBehavior : function(ele){ + ele.onmouseover = function(e){ + ele.addClassName('topic_over'); + } + + ele.onmouseout = function(e){ + ele.removeClassName('topic_over'); + } + } +}; + + Event.addBehavior({ 'span.time': toTimeAgoInWords, '#search, #reply': function() { this.hide() }, @@ -88,11 +101,20 @@ Event.addBehavior({ $('search_box').focus(); return false }, - + + 'tr.forum' : function() { + RowManager.addMouseBehavior(this); + }, + + 'tr.topic' : function(){ + RowManager.addMouseBehavior(this); + }, + 'tr.post': function() { var postId = this.id.match(/^post_(\d+)-/)[1] - var anchor = this.down(".edit a") - if(anchor) { PostForm.edit.attach(anchor, postId) }; + var anchor = this.down(".edit a") + if(anchor) { PostForm.edit.attach(anchor, postId) }; + RowManager.addMouseBehavior(this); }, '#reply-link': function() { public/javascripts/application.js @@ -132,31 +132,6 @@ describe PostsController, "GET #show" do end end -describe PostsController, "GET #new" do - include PostsControllerParentObjects - define_models - act! { get :new, :forum_id => @forum.to_param, :topic_id => @topic.to_param } - before do - @post = Post.new - end - - it_assigns :forum, :topic, :parent => lambda { @topic } - - it "assigns @post" do - act! - assigns[:post].should be_new_record - end - - it_renders :template, :new, :pending => true - - describe PostsController, "(xml)" do - define_models - act! { get :new, :forum_id => @forum.to_param, :topic_id => @topic.to_param, :format => 'xml' } - it_assigns :forum, :topic, :parent => lambda { @topic } - it_renders :xml, :post - end -end - describe PostsController, "GET #edit" do include PostsControllerParentObjects act! { get :edit, :forum_id => @forum.to_param, :topic_id => @topic.to_param, :id => @post.to_param } @@ -185,7 +160,7 @@ describe PostsController, "POST #create" do act! { post :create, :forum_id => @forum.to_param, :topic_id => @topic.to_param, :post => {:body => ''} } it_assigns :post, :forum, :topic, :parent => lambda { @topic } - it_renders :template, :new, :pending => true + it_redirects_to { forum_topic_url(@forum, @topic) } end describe PostsController, "(successful creation, xml)" do spec/controllers/posts_controller_spec.rb @@ -57,7 +57,7 @@ describe SessionsController, "DELETE /destroy" do it_redirects_to { '/' } it 'deletes token on logout' do - acting.cookies["auth_token"].should == [] + acting.cookies["auth_token"].should be_nil end end spec/controllers/sessions_controller_spec.rb @@ -51,6 +51,7 @@ describe SitesController, "GET #new" do act! { get :new } before do + @controller.stub!(:admin_required).and_return(true) login_as :default end @@ -95,6 +96,7 @@ describe SitesController, "POST #create" do before do login_as :default @attributes = {:name => 'yow'} + @controller.stub!(:admin_required).and_return(true) end describe SitesController, "(successful creation)" do spec/controllers/sites_controller_spec.rb @@ -71,7 +71,8 @@ describe UsersController do end it "sends an email to the user on create" do - pending "Email functionality has not been written" + create_user :login => "admin", :email => "admin@example.com" + response.should be_redirect lambda{ create_user }.should change(ActionMailer::Base.deliveries, :size).by(1) end @@ -133,7 +134,7 @@ describe UsersController, "PUT #make_admin" do it "sets admin" do user = users(:default) user.admin.should be_false - put :make_admin, :id => users(:default).to_param, :user => { :admin => "1" } + put :make_admin, :id => users(:default).id, :user => { :admin => "1" } user.reload.admin.should be_true end @@ -141,13 +142,14 @@ describe UsersController, "PUT #make_admin" do user = users(:default) user.update_attribute :admin, true user.admin.should be_true - put :make_admin, :id => users(:default).to_param, :user => { } + put :make_admin, :id => users(:default).id, :user => { } user.reload.admin.should be_false end end end describe UsersController, "PUT #update" do + define_models :users before do login_as :default current_site :default @@ -156,7 +158,7 @@ describe UsersController, "PUT #update" do describe UsersController, "(successful save)" do define_models - act! { put :update, :id => @user.to_param, :user => @attributes } + act! { put :update,{ :id => @user.id, :user => @attributes }} before do @user.stub!(:save).and_return(true) @@ -167,18 +169,22 @@ describe UsersController, "PUT #update" do describe "updating from edit form" do define_models :stubbed - %w(display_name openid_url website bio).each do |field| - it "should update #{field}" do - put :update, :id => @user.to_param, :user => { field, "test" } - assigns(:user).attributes[field].should == "test" + %w(display_name website bio).each do |field| + it "should update #{field}" do + put :update, :id => @user.id, :user => { field => "test" } + assigns(:user).attributes[field].should == "test" + end end + it "should update openid_url" do + put :update, :id => @user.id, :user => { 'openid_url' => 'test' } + assigns(:user).attributes['openid_url'].should == 'http://test/' end end end describe UsersController, "(successful save, xml)" do define_models - act! { put :update, :id => @user.to_param, :user => @attributes, :format => 'xml' } + act! { put :update, :id => @user.id, :user => @attributes, :format => 'xml' } before do @user.stub!(:save).and_return(true) @@ -190,7 +196,7 @@ describe UsersController, "PUT #update" do describe UsersController, "(unsuccessful save)" do define_models - act! { put :update, :id => @user.to_param, :user => {:email => ''} } + act! { put :update, :id => @user.id, :user => {:email => ''} } it_assigns :user it_renders :template, :edit @@ -198,7 +204,7 @@ describe UsersController, "PUT #update" do describe UsersController, "(unsuccessful save, xml)" do define_models - act! { put :update, :id => @user.to_param, :user => {:email => ''}, :format => 'xml' } + act! { put :update, :id => @user.id, :user => {:email => ''}, :format => 'xml' } it_assigns :user it_renders :xml, :status => :unprocessable_entity do spec/controllers/users_controller_spec.rb @@ -13,6 +13,12 @@ describe User do end end + it 'logs in with openid' do + u = sites(:default).users.new(:openid_url => 'http://foo', :email => 'zoe@girl.com') + u.login = 'zoegirl' + assert u.valid?, u.errors.inspect + end + it 'increments User.count' do @creating_user.should change(User, :count).by(1) end spec/models/user_spec.rb 7a8990e61f1c8b0f9f2f8eeccbe11475b9779851 726bb9c56a1add65e6f5afcadbaaf9c399bd19a3 c3 courtenay@entp.com http://github.com/courtenay/altered_beast/commit/4c237a2ed5deec7725ccbb87d49cf9af4ece3387 4c237a2ed5deec7725ccbb87d49cf9af4ece3387 2009-08-05T17:06:09-07:00 2009-08-05T17:06:09-07:00 Merge branch 'master' into i18n Conflicts: app/controllers/sessions_controller.rb app/controllers/users_controller.rb app/views/forums/index.html.erb app/views/forums/show.html.erb app/views/layouts/_head.html.erb app/views/sessions/new.html.erb app/views/topics/show.html.erb app/views/users/new.rhtml public/javascripts/application.js 96cf81f32f7494a72494571793698f1a30f6365e c3 courtenay@entp.com