community_engine 3.0.0 → 3.2.0

data/app/controllers/authorizations_controller.rb

@@ -1,5 +1,5 @@
 class AuthorizationsController < BaseController
-  before_filter :login_required, :only => [:destroy]
+  before_action :login_required, :only => [:destroy]
 
   def create
     omniauth = request.env['omniauth.auth'] #this is where you get all the data from your provider through omniauth

data/app/controllers/base_controller.rb

@@ -3,19 +3,21 @@ require 'open-uri'
 require 'pp'
 
 class BaseController < ApplicationController
-
   include AuthenticatedSystem
+  include Pundit
   include LocalizedApplication
   include BaseHelper
 
-  around_filter :set_locale
-  skip_before_filter :verify_authenticity_token, :only => :footer_content
-  before_filter :initialize_header_tabs
-  before_filter :initialize_admin_tabs
-  before_filter :store_location, :except => :footer_content
+  around_action :set_locale
+  skip_before_action :verify_authenticity_token, :only => :footer_content
+  before_action :initialize_header_tabs
+
+  before_action :store_location, :except => :footer_content
 
   caches_action :site_index, :footer_content, :if => Proc.new{|c| c.cache_action? }
 
+  rescue_from Pundit::NotAuthorizedError, with: :access_denied
+
   def cache_action?
     !logged_in? && controller_name.eql?('base') && params[:format].blank?
   end
@@ -60,28 +62,8 @@ class BaseController < ApplicationController
   def advertise
   end
 
-  protected
-  def self.uses_tiny_mce(options = {}, &block)
-    if block_given?
-      options = block.call
-    end
-
-    new_configuration = TinyMCE::Rails.configuration.merge(options.delete(:options)).options
-    new_configuration.stringify_keys!
-
-    # Set instance vars in the current class
-    p = Proc.new do |c|
-      configuration = c.instance_variable_get(:@tiny_mce_configuration) || {}
-
-      c.instance_variable_set(:@tiny_mce_configuration, configuration.merge(new_configuration))
-      c.instance_variable_set(:@uses_tiny_mce, true)
-    end
-
-    before_filter p, options
-  end
-
-
   private
+
     def admin_required
       current_user && current_user.admin? ? true : access_denied
     end
@@ -147,10 +129,5 @@ class BaseController < ApplicationController
       # Usage: @header_tabs << {:name => "My tab", :url => my_tab_path, :section => 'my_tab_section' }
       @header_tabs = []
     end
-    def initialize_admin_tabs
-      # This hook allows plugins or host apps to easily add tabs to the admin nav by adding to the @admin_nav_links array
-      # Usage: @admin_nav_links << {:name => "My link", :url => my_link_path,  }
-      @admin_nav_links = []
-    end
 
 end

data/app/controllers/categories_controller.rb

@@ -1,19 +1,6 @@
 class CategoriesController < BaseController
-  before_filter :login_required, :except => [:show, :most_viewed, :rss]
-  before_filter :admin_required, :only => [:new, :edit, :update, :create, :destroy, :index]
+  before_action :login_required, :except => [:show, :most_viewed, :rss]
 
-  cache_sweeper :category_sweeper, :only => [:create, :update, :destroy]
-
-  # GET /categories
-  # GET /categories.xml
-  def index
-    @categories = Category.all
-
-    respond_to do |format|
-      format.html # index.rhtml
-      format.xml  { render :xml => @categories.to_xml }
-    end
-  end
 
   # GET /categories/1
   # GET /categories/1.xml
@@ -44,64 +31,6 @@ class CategoriesController < BaseController
     end
   end
 
-  # GET /categories/new
-  def new
-    @category = Category.new
-  end
-
-  # GET /categories/1;edit
-  def edit
-    @category = Category.find(params[:id])
-  end
-
-  # POST /categories
-  # POST /categories.xml
-  def create
-    @category = Category.new(category_params)
-
-    respond_to do |format|
-      if @category.save
-        flash[:notice] = :category_was_successfully_created.l
-
-        format.html { redirect_to category_url(@category) }
-        format.xml do
-          headers["Location"] = category_url(@category)
-          render :nothing => true, :status => "201 Created"
-        end
-      else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @category.errors.to_xml }
-      end
-    end
-  end
-
-  # patch /categories/1
-  # patch /categories/1.xml
-  def update
-    @category = Category.find(params[:id])
-
-    respond_to do |format|
-      if @category.update_attributes(category_params)
-        format.html { redirect_to category_url(@category) }
-        format.xml  { render :nothing => true }
-      else
-        format.html { render :action => "edit" }
-        format.xml  { render :xml => @category.errors.to_xml }
-      end
-    end
-  end
-
-  # DELETE /categories/1
-  # DELETE /categories/1.xml
-  def destroy
-    @category = Category.find(params[:id])
-    @category.destroy
-
-    respond_to do |format|
-      format.html { redirect_to categories_url   }
-      format.xml  { render :nothing => true }
-    end
-  end
 
   def show_tips
     @category = Category.find(params[:id] )
@@ -111,10 +40,4 @@ class CategoriesController < BaseController
   end
 
 
-  private
-
-  def category_params
-    params[:category].permit(:name, :tips, :new_post_text, :nav_text)
-  end
-
 end

data/app/controllers/clippings_controller.rb

@@ -1,11 +1,7 @@
 class ClippingsController < BaseController
-  before_filter :login_required, :only => [:new, :edit, :update, :create, :destroy, :new_clipping]
-  before_filter :find_user, :only => [:new, :edit, :index, :show]
-  before_filter :require_current_user, :only => [:new, :edit, :update, :destroy]
-
-  uses_tiny_mce do
-    {:only => [:show,:new_clipping], :options => configatron.default_mce_options}
-  end
+  before_action :login_required, :only => [:new, :edit, :update, :create, :destroy, :new_clipping]
+  before_action :find_user, :only => [:new, :edit, :index, :show]
+  before_action :require_current_user, :only => [:new, :edit, :update, :destroy]
 
   cache_sweeper :taggable_sweeper, :only => [:create, :update, :destroy]
 

data/app/controllers/comments_controller.rb

@@ -1,14 +1,10 @@
 class CommentsController < BaseController
-  before_filter :login_required, :except => [:index, :unsubscribe]
-  before_filter :admin_or_moderator_required, :only => [:delete_selected, :edit, :update, :approve, :disapprove]
+  before_action :login_required, :except => [:index, :unsubscribe]
+  before_action :admin_or_moderator_required, :only => [:delete_selected, :edit, :update, :approve, :disapprove]
 
   if configatron.allow_anonymous_commenting
-    skip_before_filter :verify_authenticity_token, :only => [:create]   #because the auth token might be cached anyway
-    skip_before_filter :login_required, :only => [:create]
-  end
-
-  uses_tiny_mce do
-    {:only => [:index, :edit, :update], :options => configatron.simple_mce_options}
+    skip_before_action :verify_authenticity_token, :only => [:create]   #because the auth token might be cached anyway
+    skip_before_action :login_required, :only => [:create]
   end
 
   cache_sweeper :comment_sweeper, :only => [:create, :destroy]
@@ -141,22 +137,6 @@ class CommentsController < BaseController
     end
   end
 
-  def delete_selected
-    if request.delete?
-      if params[:delete]
-        params[:delete].each { |id|
-          comment = Comment.find(id)
-          comment.spam! if params[:spam] && configatron.has_key?(:akismet_key)
-          comment.destroy if comment.can_be_deleted_by(current_user)
-        }
-      end
-      flash[:notice] = :comments_deleted.l
-    else
-      flash[:error] = :comments_not_deleted.l
-    end
-    redirect_to admin_comments_path
-  end
-
 
   def unsubscribe
     @comment = Comment.find(params[:id])

data/app/controllers/events_controller.rb

@@ -4,16 +4,7 @@ class EventsController < BaseController
   caches_page :ical
   cache_sweeper :event_sweeper, :only => [:create, :update, :destroy]
 
-
-  uses_tiny_mce do
-    {:only => [:new, :edit, :create, :update, :clone ], :options => configatron.default_mce_options}
-  end
-
-  uses_tiny_mce do
-    {:only => [:show], :options => configatron.simple_mce_options}
-  end
-
-  before_filter :admin_required, :except => [:index, :show, :ical]
+  before_action :admin_required, :except => [:index, :show, :ical]
 
   def ical
     @calendar = RiCal.Calendar
@@ -25,7 +16,7 @@ class EventsController < BaseController
         event.dtend = ce_event.end_time
         event.summary = ce_event.name + (ce_event.metro_area.blank? ? '' : " (#{ce_event.metro_area})")
         coder = HTMLEntities.new
-        event.description = (ce_event.description.blank? ? '' : coder.decode(help.strip_tags(ce_event.description).to_s) + "\n\n") + event_url(ce_event)
+        event.description = (ce_event.description.blank? ? '' : coder.decode(view_context.strip_tags(ce_event.description).to_s) + "\n\n") + event_url(ce_event)
         event.location = ce_event.location unless ce_event.location.blank?
       end
       @calendar.add_subcomponent rical_event
@@ -146,7 +137,7 @@ class EventsController < BaseController
       elsif object.is_a? User
         states = object.country.states if object.country
         if object.state
-          metro_areas = object.state.metro_areas..order("name")
+          metro_areas = object.state.metro_areas.order("name")
         else
           metro_areas = object.country.metro_areas.order("name")
         end

data/app/controllers/favorites_controller.rb

@@ -1,6 +1,6 @@
 class FavoritesController < BaseController
-  before_filter :login_required, :only => [:destroy]
-  before_filter :find_user, :only => [:show, :index]
+  before_action :login_required, :only => [:destroy]
+  before_action :find_user, :only => [:show, :index]
 
   cache_sweeper :favorite_sweeper, :only => [:create, :destroy]
 

data/app/controllers/forums_controller.rb

@@ -1,10 +1,6 @@
 class ForumsController < BaseController
   before_action :admin_required, :except => [:index, :show]
 
-  uses_tiny_mce do    
-    {:options => configatron.default_mce_options}
-  end
-  
   def index
     @forums = Forum.order("position")
     respond_to do |format|
@@ -22,7 +18,7 @@ class ForumsController < BaseController
 
         @topics = @forum.topics.includes(:replied_by_user).order('sticky DESC, replied_at DESC').page(params[:page]).per(20)
       end
-      
+
       format.xml do
         render :xml => @forum
       end
@@ -32,7 +28,7 @@ class ForumsController < BaseController
   def new
     @forum = Forum.new
   end
-  
+
   def create
     @forum = Forum.new(forum_params)
     @forum.tag_list = params[:tag_list] || ''
@@ -56,7 +52,7 @@ class ForumsController < BaseController
       format.xml  { head 200 }
     end
   end
-  
+
   def destroy
     @forum = Forum.find(params[:id])
     @forum.destroy
@@ -65,11 +61,11 @@ class ForumsController < BaseController
       format.xml  { head 200 }
     end
   end
-  
+
   private
 
   def forum_params
     params[:forum].permit(:name, :position, :description)
   end
-    
+
 end

data/app/controllers/invitations_controller.rb

@@ -1,5 +1,5 @@
 class InvitationsController < BaseController
-  before_filter :login_required
+  before_action :login_required
 
   def index
     @user = current_user

data/app/controllers/messages_controller.rb

@@ -1,13 +1,9 @@
 class MessagesController < BaseController
-  before_filter :find_user
-  before_filter :login_required
-  before_filter :require_ownership_or_moderator, :except => [:auto_complete_for_username]
+  before_action :find_user
+  before_action :login_required
+  before_action :require_ownership_or_moderator, :except => [:auto_complete_for_username]
 
-  skip_before_filter :verify_authenticity_token, :only => [:auto_complete_for_username]
-
-  uses_tiny_mce do
-    {:options => configatron.default_mce_options}
-  end
+  skip_before_action :verify_authenticity_token, :only => [:auto_complete_for_username]
 
   def auto_complete_for_username
     @usernames = User.active.where.not(login: @user.login).pluck(:login)

data/app/controllers/moderators_controller.rb

@@ -1,5 +1,5 @@
 class ModeratorsController < BaseController
-  before_filter :admin_required
+  before_action :admin_required
 
   def create
     @forum = Forum.find(params[:forum_id])

data/app/controllers/monitorships_controller.rb

@@ -1,5 +1,5 @@
 class MonitorshipsController < BaseController
-  before_filter :login_required
+  before_action :login_required
 
   def create
     @monitorship = Monitorship.find_or_initialize_by(:user_id => current_user.id, :topic_id => params[:topic_id])

data/app/controllers/pages_controller.rb

@@ -1,27 +1,11 @@
 class PagesController < BaseController
-  uses_tiny_mce do
-    {:only => [:new, :edit, :update, :create ], :options => configatron.default_mce_options}
-  end
 
-  cache_sweeper :page_sweeper, :only => [:create, :update, :destroy]
   caches_action :show, :if => Proc.new{|c| c.cache_action? }
 
   def cache_action?
     !logged_in? && controller_name.eql?('pages')
   end
 
-  before_filter :login_required, :only => [:index, :new, :edit, :update, :destroy, :create, :preview]
-  before_filter :require_moderator, :only => [:index, :new, :edit, :update, :destroy, :create, :preview]
-
-  def index
-    @pages = Page.unscoped.order('created_at DESC').page(params[:page])
-  end
-
-  def preview
-    @page = Page.unscoped.find(params[:id])
-    render :action => :show
-  end
-
   def show
     @page = Page.live.find(params[:id])
     unless logged_in? || @page.page_public
@@ -32,51 +16,5 @@ class PagesController < BaseController
     flash[:error] = :page_not_found.l
     redirect_to home_path
   end
-  
-  def new
-    @page = Page.new
-  end 
-  
-  def edit
-    @page = Page.unscoped.find(params[:id])
-  end
-
-  def create
-    @page = Page.new(page_params)
-    if @page.save
-      flash[:notice] = :page_was_successfully_created.l
-      redirect_to admin_pages_path
-    else
-      render :action => :new
-    end
-  end
-
-  def update
-    if @page.update_attributes(page_params)
-      flash[:notice] = :page_was_successfully_updated.l
-      redirect_to admin_pages_path
-    else
-      render :action => :edit
-    end
-  end
-
-  def destroy
-    @page.destroy
-    flash[:notice] = :page_was_successfully_deleted.l
-    redirect_to admin_pages_path
-  end
-
-  private
-
-  def require_moderator
-    @page ||= Page.unscoped.find(params[:id]) if params[:id]
-    unless admin? || moderator?
-      redirect_to :controller => 'sessions', :action => 'new' and return false
-    end
-  end
-
-  def page_params
-    params.require(:page).permit(:title, :body, :published_as, :page_public)
-  end
 
 end