Update application.rb for newer rails and implement openid login

app/controllers/monitorships_controller.rb

@@ -0,0 +1,20 @@
+class MonitorshipsController < ApplicationController
+  before_filter :login_required
+
+  def create
+    @monitorship = Monitorship.find_or_initialize_by_user_id_and_topic_id(current_user.id, params[:topic_id])
+    @monitorship.update_attribute :active, true
+    respond_to do |format| 
+      format.html { redirect_to topic_path(params[:forum_id], params[:topic_id]) }
+      format.js
+    end
+  end
+
+  def destroy
+    Monitorship.update_all ['active = ?', false], ['user_id = ? and topic_id = ?', current_user.id, params[:topic_id]]
+    respond_to do |format| 
+      format.html { redirect_to topic_path(params[:forum_id], params[:topic_id]) }
+      format.js
+    end
+  end
+end

app/controllers/sessions_controller.rb

@@ -18,8 +18,24 @@ def create
       redirect_back_or_default('/')
       flash[:notice] = "Logged in successfully"
     else
+      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]
+      end
+    end
+  end
+
+  def create
+    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 +46,52 @@ def destroy
     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(params[:name], params[: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.'
+    session[:user_id] = @current_user.id
+    redirect_back_or_default('/')
+  end
+
+  def failed_login(message)
+    flash[:error] = message
+    redirect_to(new_session_url)
+  end
+
 end

app/controllers/users_controller.rb

@@ -95,9 +95,11 @@ def make_admin
 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
 

app/models/monitorships_sweeper.rb

@@ -0,0 +1,9 @@
+class MonitorshipsSweeper < ActionController::Caching::Sweeper
+  observe Monitorship
+
+  def after_save(monitorship)
+    FileUtils.rm_rf File.join(RAILS_ROOT, 'public', 'users', monitorship.user_id.to_s)
+  end
+
+  alias_method :after_destroy, :after_save
+end

app/models/posts_sweeper.rb

@@ -0,0 +1,12 @@
+class PostsSweeper < ActionController::Caching::Sweeper
+  observe Post
+
+  def after_save(post)
+    FileUtils.rm_rf File.join(RAILS_ROOT, 'public', 'forums', post.forum_id.to_s, 'posts.rss')
+    FileUtils.rm_rf File.join(RAILS_ROOT, 'public', 'forums', post.forum_id.to_s, 'topics', "#{post.topic_id}.rss")
+    FileUtils.rm_rf File.join(RAILS_ROOT, 'public', 'users')
+    FileUtils.rm_rf File.join(RAILS_ROOT, 'public', 'posts.rss')
+  end
+
+  alias_method :after_destroy, :after_save
+end

app/models/user.rb

@@ -65,6 +65,21 @@ def seen!
   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/states.rb

@@ -38,7 +38,7 @@ def do_activation
     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 @@ def do_activate
     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/validation.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 @@ def encrypt_password
     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/views/forums/index.html.erb

@@ -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/layouts/_head.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/monitorships/create.rjs

@@ -0,0 +1,4 @@
+#page["monitorship-icon-topics-#{params[:topic_id]}"].remove_class_name(:grey)
+#page["monitorship-icon-topics-#{params[:topic_id]}"].add_class_name(:green)
+
+page[:monitor_label].innerHTML = "Monitoring topic"[]

app/views/monitorships/destroy.rjs

@@ -0,0 +1,4 @@
+#page["monitorship-icon-topics-#{params[:topic_id]}"].remove_class_name(:green)
+#page["monitorship-icon-topics-#{params[:topic_id]}"].add_class_name(:darkgrey)
+
+page[:monitor_label].innerHTML = "Monitor topic"[]

app/views/sessions/new.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/topics/show.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>

app/views/users/new.rhtml

@@ -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 -%>

config/environment.rb

@@ -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.2' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -18,6 +18,8 @@
 
   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/initializers/application.rb

@@ -0,0 +1 @@
+OpenIdAuthentication.store = :file

config/routes.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 @@
     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 @@
   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

db/migrate/20090317123901_add_open_id_authentication_tables.rb

@@ -0,0 +1,28 @@
+class AddOpenIdAuthenticationTables < ActiveRecord::Migration
+  def self.up
+    create_table "open_id_authentication_associations", :force => true do |t|
+      t.column "server_url", :binary
+      t.column "handle", :string
+      t.column "secret", :binary
+      t.column "issued", :integer
+      t.column "lifetime", :integer
+      t.column "assoc_type", :string
+    end
+
+    create_table "open_id_authentication_nonces", :force => true do |t|
+      t.column "nonce", :string
+      t.column "created", :integer
+    end
+
+    create_table "open_id_authentication_settings", :force => true do |t|
+      t.column "setting", :string
+      t.column "value", :binary
+    end
+  end
+
+  def self.down
+    drop_table "open_id_authentication_associations"
+    drop_table "open_id_authentication_nonces"
+    drop_table "open_id_authentication_settings"
+  end
+end