merge 19364:19600 of rails_port into the openID branch

renamed migration 049_add_open_id_authentication_tables.rb to
050_add_open_id_authentication_tables.rb

app/models/notifier.rb

@@ -84,7 +84,7 @@ class Notifier < ActionMailer::Base
          :replyurl => url_for(:host => SERVER_URL,
                               :controller => "message",
                               :action => "new",
-                              :user_id => comment.user.id,
+                              :display_name => comment.user.display_name,
                               :title => "Re: #{comment.diary_entry.title}")
   end
 

app/models/trace_sweeper.rb

@@ -0,0 +1,28 @@
+class TraceSweeper < ActionController::Caching::Sweeper
+  observe Trace
+
+  def after_create(record)
+    expire_cache_for(record)
+  end
+
+  def after_update(record)
+    expire_cache_for(record)
+  end
+
+  def after_destroy(record)
+    expire_cache_for(record)
+  end
+
+private
+
+  def expire_cache_for(record)
+    expire_action(:controller => 'trace', :action => 'view', :id => record.id)
+    expire_action(:controller => 'trace', :action => 'view', :display_name => record.user.display_name, :id => record.id)
+
+    expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil)
+    expire_action(:controller => 'trace', :action => 'list', :display_name => record.user.display_name, :tag => nil)
+
+    expire_action(:controller => 'trace', :action => 'georss', :display_name => nil, :tag => nil)
+    expire_action(:controller => 'trace', :action => 'georss', :display_name => record.user.display_name, :tag => nil)
+  end
+end

app/models/tracetag_sweeper.rb

@@ -0,0 +1,25 @@
+class TracetagSweeper < ActionController::Caching::Sweeper
+  observe Tracetag
+
+  def after_create(record)
+    expire_cache_for(record)
+  end
+
+  def after_update(record)
+    expire_cache_for(record)
+  end
+
+  def after_destroy(record)
+    expire_cache_for(record)
+  end
+
+private
+
+  def expire_cache_for(record)
+    expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => record.tag)
+    expire_action(:controller => 'trace', :action => 'list', :display_name => record.trace.user.display_name, :tag => record.tag)
+
+    expire_action(:controller => 'trace', :action => 'georss', :display_name => nil, :tag => record.tag)
+    expire_action(:controller => 'trace', :action => 'georss', :display_name => record.trace.user.display_name, :tag => record.tag)
+  end
+end

app/models/user_sweeper.rb

@@ -0,0 +1,51 @@
+class UserSweeper < ActionController::Caching::Sweeper
+  observe User
+
+  def before_update(record)
+    expire_cache_for(User.find(record.id), record)
+  end
+
+  def before_destroy(record)
+    expire_cache_for(record, nil)
+  end
+
+private
+
+  def expire_cache_for(old_record, new_record)
+    if old_record and
+        (new_record.nil? or
+         old_record.visible != new_record.visible or
+         old_record.display_name != new_record.display_name)
+      old_record.diary_entries.each do |entry|
+        expire_action(:controller => 'diary_entry', :action => 'view', :id => entry.id)
+        expire_action(:controller => 'diary_entry', :action => 'list', :language => entry.language_code, :display_name => nil)
+        expire_action(:controller => 'diary_entry', :action => 'rss', :language => entry.language_code, :display_name => nil)
+      end
+
+      expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => nil)
+      expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => old_record.display_name)
+
+      expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => nil)
+      expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => old_record.display_name)
+
+      old_record.traces.each do |trace|
+        expire_action(:controller => 'trace', :action => 'view', :id => trace.id)
+        expire_action(:controller => 'trace', :action => 'view', :display_name => old_record.display_name, :id => trace.id)
+
+        trace.tags.each do |tag|
+          expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => tag.tag)
+          expire_action(:controller => 'trace', :action => 'list', :display_name => old_record.display_name, :tag => tag.tag)
+
+          expire_action(:controller => 'trace', :action => 'georss', :display_name => nil, :tag => tag.tag)
+          expire_action(:controller => 'trace', :action => 'georss', :display_name => old_record.display_name, :tag => tag.tag)
+        end
+      end
+
+      expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil)
+      expire_action(:controller => 'trace', :action => 'list', :display_name => old_record.display_name, :tag => nil)
+
+      expire_action(:controller => 'trace', :action => 'georss', :display_name => nil, :tag => nil)
+      expire_action(:controller => 'trace', :action => 'georss', :display_name => old_record.display_name, :tag => nil)
+    end
+  end
+end