Migration from Rails 2.3.5 to Rails 8.1 successful.

Merging dev branch.

13 files changed, 215 insertions, 144 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 1d1a1ca..9e8564e 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -2,31 +2,46 @@ class AdminController < ApplicationController
   
   # Private
   
-  before_filter :login_required
+  before_action :login_required
 
   def index
-    @drafts = Node.all(
-      :limit => 20,
-      :order => "updated_at desc",
-      :conditions => ["draft_id IS NOT NULL"]
-    )
-    @recent_changes = Node.all(
-      :limit => 20,
-      :order => "updated_at desc",
-      :conditions => [ 
-        "updated_at < ? AND updated_at > ? AND parent_id IS NOT NULL", Time.now, Time.now-14.days
-      ]
-    )
+    @drafts = Node.where("draft_id IS NOT NULL")
+      .limit(50).order("updated_at desc")
+
+    @drafts_count = Node.where("draft_id IS NOT NULL").count
+
+    @recent_changes = Node.where(
+      "updated_at < ? AND updated_at > ? AND parent_id IS NOT NULL",
+      Time.now, Time.now - 14.days
+    ).limit(50).order("updated_at desc")
+
+    all_nodes = Node.root.self_and_descendants
+    @sitemap_depth = {}
+    Node.each_with_level(all_nodes) do |node, level|
+      @sitemap_depth[node.id] = level
+    end
+    @sitemap = all_nodes.to_a.sort! { |node1,node2| node1.lft <=> node2.lft }.delete_if { |node| node.update? }
+
+    @mypages = Page.where("user_id = ? or editor_id = ?", @current_user, @current_user)
+
+    @mynodes = Node.joins(:pages)
+              .where("pages.user_id = ? or pages.editor_id = ?", @current_user, @current_user)
+              .order("updated_at desc")
+              .uniq.first(50)
   end
   
   def search
-    @results = Node.search params[:search_term]
+    @results = Node.search params[:search_term], :per_page => 1000
     
     respond_to do |format|
-      format.html
+      format.html do
+        render :template => 'admin/search_results.html'
+      end
       format.js do 
         render( :json => @results.map do |node| 
-          {:id => node.id, :title => node.title, :edit_path => node_path(node)} 
+            if node
+              {:id => node.id, :title => node.title, :edit_path => node_path(node)}
+            end
           end
         )
         
@@ -46,7 +61,6 @@ class AdminController < ApplicationController
         render :partial => 'admin/menu_search_results'
       end
       
-      
       format.js do 
         render( :json => @results.map do |node| 
           {:node_id => node.id, :title => node.title, :unique_name => node.unique_name} 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bce0c71..75f92c3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,26 +1,21 @@
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
 class ApplicationController < ActionController::Base
-  
-  include ExceptionNotifiable
   include AuthenticatedSystem
-    
-  helper :all # include all helpers, all the time
-  protect_from_forgery # See ActionController::RequestForgeryProtection for details
 
-  # Scrub sensitive parameters from your log
-  filter_parameter_logging :password, :password_confirmation
-  
-  before_filter :set_locale
-  
+  protect_from_forgery
+
+  before_action :set_locale
+
   protected
-  
-    def set_locale
-      if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
-        I18n.locale = params[:locale].to_sym
-      else
-        params.delete(:locale)
-      end
+
+  def set_locale
+    if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
+      I18n.locale = params[:locale].to_sym
+    else
+      I18n.locale = I18n.default_locale
     end
+  end
+
+  def default_url_options
+    { locale: I18n.locale == I18n.default_locale ? nil : I18n.locale }
+  end
 end
diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index cfaf176..d150e06 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -2,15 +2,14 @@ class AssetsController < ApplicationController
   
   # Private
   
-  before_filter :login_required
+  before_action :login_required
   
   layout 'admin'
   
   def index
-    @assets = Asset.all.paginate(
-      :page => params[:page], 
-      :per_page => 20,
-      :order => 'id DESC'
+    @assets = Asset.order('id DESC').paginate(
+      :page     => params[:page],
+      :per_page => 20
     )
   end
 
@@ -44,7 +43,7 @@ class AssetsController < ApplicationController
   # POST /assets
   # POST /assets.xml
   def create
-    @asset = Asset.new(params[:asset])
+    @asset = Asset.new(asset_params)
 
     respond_to do |format|
       if @asset.save
@@ -64,7 +63,7 @@ class AssetsController < ApplicationController
     @asset = Asset.find(params[:id])
 
     respond_to do |format|
-      if @asset.update_attributes(params[:asset])
+      if @asset.update(asset_params)
         flash[:notice] = 'Asset was successfully updated.'
         format.html { redirect_to(@asset) }
         format.xml  { head :ok }
@@ -86,4 +85,10 @@ class AssetsController < ApplicationController
       format.xml  { head :ok }
     end
   end
+
+  private
+
+    def asset_params
+      params.require(:asset).permit(:name, :upload)
+    end
 end
diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb
index 1b13456..8d33105 100644
--- a/app/controllers/content_controller.rb
+++ b/app/controllers/content_controller.rb
@@ -1,30 +1,31 @@
 class ContentController < ApplicationController
-  
+
   # Public
-  
-  before_filter :find_page
-  
+
+  before_action :find_page
+
   # This is the method that renders most of the the public content. It recieves
-  # a :locale and a :page_path parameter through the params hash. It looks up 
+  # a :locale and a :page_path parameter through the params hash. It looks up
   # the node with the corresponding unique_name attribute. The method doesn't
-  # return a node though, the node is really a proxy object for pages. It 
+  # return a node though, the node is really a proxy object for pages. It
   # returns the most recent page associated to this node instead.
   def render_page
-    
+
     expires_in 20.minutes, :public => true
-    
+
     if @page and @page.public?
       render(
-        :file => @page.valid_template,
+        :template => @page.valid_template,
         :layout => true
       )
     else
-      render( 
-        :file => File.join(RAILS_ROOT, 'public', '404.html'),
-        :status => 404
+      render(
+        :file => Rails.root.join('public', '404.html').to_s,
+        :status => 404,
+        :layout => false
       )
     end
-    
+
   end
 
   def render_gallery
@@ -32,13 +33,17 @@ class ContentController < ApplicationController
       @images = @page.assets.images
       render :file => "content/gallery"
     else
-      render :nothing => true, :status => 404
+      head :not_found
     end
   end
-  
+
   private
     def find_page
-      path = params[:page_path].join('/')
-      @page = Node.find_page(path)
+      path = params[:page_path].is_a?(Array) ? params[:page_path].join('/') : params[:page_path]
+      if path =~ /^[a-zA-Z\:\/\/\.\-\d_]+$/
+        @page = Node.find_page(path)
+      else
+        @page = nil
+      end
     end
 end
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 805e941..7695e9b 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -2,7 +2,7 @@ class EventsController < ApplicationController
   
   # Private
   
-  before_filter :login_required
+  before_action :login_required
   
   layout 'admin'
   
@@ -47,7 +47,7 @@ class EventsController < ApplicationController
   # POST /events
   # POST /events.xml
   def create
-    @event = Event.new(params[:event])
+    @event = Event.new(event_params)
 
     respond_to do |format|
       if @event.save
@@ -67,7 +67,7 @@ class EventsController < ApplicationController
     @event = Event.find(params[:id])
 
     respond_to do |format|
-      if @event.update_attributes(params[:event])
+      if @event.update(event_params)
         flash[:notice] = 'Event was successfully updated.'
         format.html { redirect_to(edit_node_path(@event.node)) }
         format.xml  { head :ok }
@@ -89,4 +89,10 @@ class EventsController < ApplicationController
       format.xml  { head :ok }
     end
   end
+
+  private
+
+    def event_params
+      params.require(:event).permit(:start_time, :end_time, :rrule, :custom_rrule, :allday, :url, :latitude, :longitude, :node_id, :location)
+    end
 end
diff --git a/app/controllers/menu_items_controller.rb b/app/controllers/menu_items_controller.rb
index 808da15..1b1eb59 100644
--- a/app/controllers/menu_items_controller.rb
+++ b/app/controllers/menu_items_controller.rb
@@ -2,23 +2,23 @@ class MenuItemsController < ApplicationController
 
   # Private
 
-  before_filter :login_required
+  before_action :login_required
   
   layout 'admin'
   
   def index
-    @menu_items = MenuItem.all(:order => "position ASC")
+    @menu_items = MenuItem.order("position ASC").all
   end
 
   def show
   end
 
   def new
-    @menu_item = MenuItem.new params[:menu_item]
+    @menu_item = MenuItem.new menu_item_params
   end
 
   def create
-    if MenuItem.create( params[:menu_item] )
+    if MenuItem.create( menu_item_params )
       redirect_to menu_items_path
     else
       render :new
@@ -32,7 +32,7 @@ class MenuItemsController < ApplicationController
   def update
     @menu_item = MenuItem.find( params[:id] )
     
-    if @menu_item.update_attributes( params[:menu_item] )
+    if @menu_item.update( menu_item_params )
       redirect_to menu_items_path
     else
       render :edit
@@ -48,10 +48,15 @@ class MenuItemsController < ApplicationController
   def sort
     params[:menu_items].each_with_index do |item_id, index|
       menu_item = MenuItem.find(item_id)
-      menu_item.update_attributes(:position => index + 1)
+      menu_item.update(:position => index + 1)
     end
     
-    render :nothing => true
+    head :ok
   end
 
+  private
+
+    def menu_item_params
+      params.require(:menu_item).permit(:node_id, :path, :position, :type, :type_id)
+    end
 end
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 4f72744..494887d 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -4,8 +4,8 @@ class NodesController < ApplicationController
   
   layout 'admin'
   
-  before_filter :login_required
-  before_filter :find_node, :only => [
+  before_action :login_required
+  before_action :find_node, :only => [
                               :show, 
                               :edit, 
                               :update, 
@@ -15,16 +15,17 @@ class NodesController < ApplicationController
                             ]
 
   def index
-    @nodes = Node.root.descendants.paginate( 
-      :include => [:head, :draft],
-      :page => params[:page], 
-      :per_page => 25,
-      :order => 'id DESC'
-    )
+    @nodes = Node.root.descendants.includes(:head, :draft)
+      .order('id DESC')
+      .paginate(:page => params[:page], :per_page => 25)
   end
 
   def new
-    @node = Node.new params[:node]
+    @node = Node.new node_params
+    if params.has_key?(:parent_id)
+      @parent_id = params[:parent_id]
+      @parent_name = Node.find(@parent_id).title
+    end
   end
   
   def create
@@ -33,9 +34,16 @@ class NodesController < ApplicationController
     @node = Node.new
     @node.parent_id = find_parent
     @node.slug = params[:title].parameterize.to_s
-    
+   
     if @node.save
-      @node.draft.update_attributes(:title => params[:title])
+      @node.draft.update(:title => params[:title])
+      case params[:kind]
+        when "update"
+          @node.draft.tag_list.add("update")
+        when "press_release"
+          @node.draft.tag_list.add("update", "pressemitteilung")
+      end
+      @node.draft.save!
       redirect_to(edit_node_path(@node))
     else
       render :new
@@ -44,6 +52,7 @@ class NodesController < ApplicationController
   
   def show
     node = Node.find(params[:id])
+    node.wipe_draft!
     @page = node.draft || node.head
   end
 
@@ -53,7 +62,7 @@ class NodesController < ApplicationController
     rescue LockedByAnotherUser => e
       flash[:error] = e.message
       if request.referer
-        redirect_to :back
+        redirect_to request.referer || node_path(@node)
       else
         redirect_to node_path(@node)
       end
@@ -61,10 +70,10 @@ class NodesController < ApplicationController
   end
 
   def update
-    @node.update_attributes(params[:node])
+    @node.update(node_params)
     @draft = @node.find_or_create_draft current_user
     @draft.tag_list = params[:tag_list]
-    if @draft.update_attributes( params[:page] )
+    if @draft.update( page_params )
       flash[:notice] = "Draft has been saved: #{Time.now}"
       respond_to do |format|
         format.html { redirect_to edit_node_path(@node) }
@@ -82,7 +91,7 @@ class NodesController < ApplicationController
   def publish
     @node.publish_draft!
     flash[:notice] = "Draft has been published"
-    redirect_to node_path
+    redirect_to node_path(@node)
   end
   
   def unlock
@@ -96,6 +105,14 @@ class NodesController < ApplicationController
   end
   
   private
+
+    def node_params
+      params.fetch(:node, {}).permit(:slug, :parent_id, :staged_slug, :staged_parent_id)
+    end
+
+    def page_params
+      params.fetch(:page, {}).permit(:title, :abstract, :body, :template_name, :published_at, :user_id)
+    end
   
     def find_node
       @node = Node.find(params[:id])
@@ -107,6 +124,8 @@ class NodesController < ApplicationController
         Node.root.id
       when "update"
         Update.find_or_create_parent.id
+      when "press_release"
+        Update.find_or_create_parent.id
       when "generic"
         if params[:parent_id] && Node.find(params[:parent_id])
           params[:parent_id]
diff --git a/app/controllers/occurrences_controller.rb b/app/controllers/occurrences_controller.rb
index 751be40..0f30ce3 100644
--- a/app/controllers/occurrences_controller.rb
+++ b/app/controllers/occurrences_controller.rb
@@ -2,7 +2,7 @@ class OccurrencesController < ApplicationController
   
   # Private
   
-  before_filter :login_required
+  before_action :login_required
   
   # GET /occurrences
   # GET /occurrences.xml
@@ -45,7 +45,7 @@ class OccurrencesController < ApplicationController
   # POST /occurrences
   # POST /occurrences.xml
   def create
-    @occurrence = Occurrence.new(params[:occurrence])
+    @occurrence = Occurrence.new(occurrence_params)
 
     respond_to do |format|
       if @occurrence.save
@@ -65,7 +65,7 @@ class OccurrencesController < ApplicationController
     @occurrence = Occurrence.find(params[:id])
 
     respond_to do |format|
-      if @occurrence.update_attributes(params[:occurrence])
+      if @occurrence.update(occurrence_params)
         flash[:notice] = 'Occurrence was successfully updated.'
         format.html { redirect_to(@occurrence) }
         format.xml  { head :ok }
@@ -87,4 +87,11 @@ class OccurrencesController < ApplicationController
       format.xml  { head :ok }
     end
   end
+
+  private
+
+    def occurrence_params
+      params.require(:occurrence).permit(:start_time, :end_time, :node_id, :event_id)
+    end
+
 end
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index a684327..2d08dea 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -2,26 +2,24 @@ class PagesController < ApplicationController
   
   # Private
   
-  before_filter :login_required
-  
+  before_action :login_required
+
   def preview
     @page = Page.find(params[:id])
-    
+
     if @page
       template = @page.valid_template
       render(
-        :file => template,
-        :layout => "application"
+        template: template,
+        layout: "application"
       )
     end
-    
   end
-  
-  
+
   def sort_images
     page = Page.find(params[:id])
     page.update_assets(params[:images])
     
-    render :nothing => true, :status => 200
+    head :ok
   end
 end
diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb
index 05e8acc..42d667e 100644
--- a/app/controllers/revisions_controller.rb
+++ b/app/controllers/revisions_controller.rb
@@ -2,12 +2,13 @@ class RevisionsController < ApplicationController
   
   # Private
   
-  before_filter :login_required
+  before_action :login_required
   
   layout 'admin'
   
   def index
     @node = Node.find(params[:node_id])
+    @pages = @node.pages.all
   end
 
   def diff
diff --git a/app/controllers/rss_controller.rb b/app/controllers/rss_controller.rb
index acffc0e..4b47218 100644
--- a/app/controllers/rss_controller.rb
+++ b/app/controllers/rss_controller.rb
@@ -1,19 +1,21 @@
 class RssController < ApplicationController
   
-  before_filter :authenticate, :only => :recent_changes
-  before_filter :get_host
+  before_action :authenticate, :only => :recent_changes
+  before_action :get_host
   
   def updates
     expires_in 31.minutes, :public => true
     
     I18n.locale = :de
-    
-    @items = Page.heads.find_tagged_with(
-      "update",
-      :order => "published_at DESC",
-      :limit => 20
-    )
-    
+  
+    @items = Page.heads
+      .joins("JOIN taggings ON taggings.taggable_id = pages.id
+            AND taggings.taggable_type = 'Page'
+            AND taggings.context = 'tags'")
+      .joins("JOIN tags ON tags.id = taggings.tag_id")
+      .where("LOWER(tags.name) = ?", "update")
+      .order("published_at DESC").limit(20)
+
     respond_to do |format|
       format.xml {}
       format.rdf {}
@@ -21,13 +23,9 @@ class RssController < ApplicationController
   end
 
   def recent_changes
-    @items = Page.all(
-      :limit => 20,
-      :order => "updated_at desc",
-      :conditions => [ 
-        "updated_at < ? AND updated_at > ?", Time.now, Time.now-14.days
-      ]
-    )
+    @items = Page.where(
+      "updated_at < ? AND updated_at > ?", Time.now, Time.now - 14.days
+    ).limit(20).order("updated_at desc")
   end
   
   protected
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 565cdd4..bf6a029 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -1,33 +1,44 @@
 class TagsController < ApplicationController
-  
+
   # Public
-  
+
   def index
     @page = Page.new :title => "Tags"
-    
-    @tags = Tag.all(:limit => 500)
+
+    @tags = Tag.limit(500).all
   end
 
   def show
-    @tag    = Tag.find_by_name(params[:id])
-    
-    @tag = @tag ? @tag.name : params[:id]
-    
-    @page   = Page.new
+    tag_name = params[:id]
+
+    if tag_name.match(/^[a-zA-Z0-9_\w\s\-\.\']+$/)
+      @tag = ActsAsTaggableOn::Tag.find_by_name(tag_name)
+      @tag  = @tag ? @tag.name : tag_name
+      @page = Page.new
 
-    params[:page] = ( params[:page].is_a?(Fixnum) ? params[:page] : 1 )
-    
-    @pages  = Page.heads.paginate(
-      Page.find_options_for_find_tagged_with(@tag).merge(
-        :order => 'published_at DESC',
-        :page=>params[:page],
-        :per_page => 23
-      )
-    )
-    
-    respond_to do |format|
-      format.html {}
+      params[:page] = (params[:page].is_a?(Integer) ? params[:page] : 1)
+
+      @pages = Page.heads
+        .joins("JOIN taggings ON taggings.taggable_id = pages.id
+            AND taggings.taggable_type = 'Page'
+            AND taggings.context = 'tags'")
+        .joins("JOIN tags ON tags.id = taggings.tag_id")
+        .where("LOWER(tags.name) = ?", @tag.downcase)
+        .order('published_at DESC')
+        .paginate(
+          :page     => params[:page],
+          :per_page => 23
+        )
+
+      respond_to do |format|
+        format.html {}
+      end
+    else
+      respond_to do |format|
+        format.html { head :bad_request }
+      end
     end
+
   end
 
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 87df678..98fd534 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2,24 +2,24 @@ class UsersController < ApplicationController
 
   # Private
 
-  before_filter :login_required
-  before_filter :find_user,     :only => [:show, :edit, :update, :destroy]
-  before_filter :verify_status, :except => [:index, :show]
+  before_action :login_required
+  before_action :find_user,     :only => [:show, :edit, :update, :destroy]
+  before_action :verify_status, :except => [:index, :show]
 
   layout 'admin'
 
   def index
-    @users = User.all(:order => "login ASC").group_by do |user|
+    @users = User.order("login ASC").all.group_by do |user|
       user.admin? ? :admin : :user
     end
   end
 
   def new
-    @user = User.new( params[:user] )
+    @user = User.new
   end
 
   def create
-    @user = User.new params[:user]
+    @user = User.new user_params
 
     if @user.save
       flash[:notice] = "User created #{@user.login}"
@@ -33,8 +33,10 @@ class UsersController < ApplicationController
   end
 
   def update
-    params[:user].delete(:admin) unless current_user.is_admin?
-    if @user.update_attributes(params[:user])
+    permitted = user_params
+    permitted.delete(:admin) unless current_user.is_admin?
+            
+    if @user.update(permitted)
       flash[:notice] = "Updated user #{@user.login}"
       redirect_to user_path(@user)
     else
@@ -51,6 +53,11 @@ class UsersController < ApplicationController
   end
 
   private
+
+    def user_params
+      params.fetch(:user, {}).permit(:login, :email, :password, :password_confirmation, :admin)
+    end
+
     def find_user
       @user = User.find(params[:id])
     end