Merge pull request #336 from AyuntamientoMadrid/cleanup

Cleanup
2015-09-03 09:35:04 +02:00
parent 276df52c69 10127f546e
commit 27ed66ea71
26 changed files with 34 additions and 41 deletions
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -1,5 +1,4 @@
 class AccountController < ApplicationController
-
  before_action :authenticate_user!
  before_action :set_account
  load_and_authorize_resource class: "User"
--- a/app/controllers/admin/comments_controller.rb
+++ b/app/controllers/admin/comments_controller.rb
@@ -1,8 +1,7 @@
 class Admin::CommentsController < Admin::BaseController
-
  has_filters %w{all with_confirmed_hide}

-  before_filter :load_comment, only: [:confirm_hide, :restore]
+  before_action :load_comment, only: [:confirm_hide, :restore]

  def index
    @comments = Comment.only_hidden.send(@current_filter).page(params[:page])
--- a/app/controllers/admin/debates_controller.rb
+++ b/app/controllers/admin/debates_controller.rb
@@ -1,7 +1,7 @@
 class Admin::DebatesController < Admin::BaseController
  has_filters %w{all with_confirmed_hide}, only: :index

-  before_filter :load_debate, only: [:confirm_hide, :restore]
+  before_action :load_debate, only: [:confirm_hide, :restore]

  def index
    @debates = Debate.only_hidden.send(@current_filter).page(params[:page])
--- a/app/controllers/admin/moderators_controller.rb
+++ b/app/controllers/admin/moderators_controller.rb
@@ -1,5 +1,4 @@
 class Admin::ModeratorsController < Admin::BaseController
-
  load_and_authorize_resource

  def index
--- a/app/controllers/admin/organizations_controller.rb
+++ b/app/controllers/admin/organizations_controller.rb
@@ -1,5 +1,4 @@
 class Admin::OrganizationsController < Admin::BaseController
-
  has_filters %w{all pending verified rejected}, only: :index

  load_and_authorize_resource except: :search
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,8 +1,7 @@
 class Admin::UsersController < Admin::BaseController
-
  has_filters %w{all with_confirmed_hide}, only: :index

-  before_filter :load_user, only: [:confirm_hide, :restore]
+  before_action :load_user, only: [:confirm_hide, :restore]

  def index
    @users = User.only_hidden.send(@current_filter).page(params[:page])
--- a/app/controllers/api/stats_controller.rb
+++ b/app/controllers/api/stats_controller.rb
@@ -1,4 +1,5 @@
 class Api::StatsController < Api::ApiController
+
  def show
    unless params[:events].present? || params[:visits].present?
      return render json: {}, status: :bad_request
@@ -19,4 +20,5 @@ class Api::StatsController < Api::ApiController

    render json: ds.build
  end
+
 end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,31 +1,28 @@
 require "application_responder"

 class ApplicationController < ActionController::Base
+  include SimpleCaptcha::ControllerHelpers
  include HasFilters

-  before_filter :authenticate_http_basic
-
-  before_filter :authenticate_user!, unless: :devise_controller?, if: :beta_site?
-  before_filter :authenticate_beta_tester!, unless: :devise_controller?, if: :beta_site?
-
-  check_authorization unless: :devise_controller?
-  include SimpleCaptcha::ControllerHelpers
-  self.responder = ApplicationResponder
-  respond_to :html
-
-  before_action :set_locale
-  layout :set_layout
-
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
+  before_action :authenticate_http_basic
+  before_action :authenticate_user!, unless: :devise_controller?, if: :beta_site?
+  before_action :authenticate_beta_tester!, unless: :devise_controller?, if: :beta_site?

  before_action :ensure_signup_complete
+  before_action :set_locale
+
+  check_authorization unless: :devise_controller?
+  self.responder = ApplicationResponder
+
+  protect_from_forgery with: :exception

  rescue_from CanCan::AccessDenied do |exception|
    redirect_to main_app.root_url, alert: exception.message
  end

+  layout :set_layout
+  respond_to :html
+
  private

    def authenticate_http_basic
--- a/app/controllers/concerns/has_filters.rb
+++ b/app/controllers/concerns/has_filters.rb
@@ -3,7 +3,7 @@ module HasFilters

  class_methods do
    def has_filters(valid_filters, *args)
-      before_filter(*args) do
+      before_action(*args) do
        @valid_filters = valid_filters
        @current_filter = params[:filter]
        @current_filter = @valid_filters.first unless @valid_filters.include?(@current_filter)
--- a/app/controllers/moderation/base_controller.rb
+++ b/app/controllers/moderation/base_controller.rb
@@ -2,9 +2,9 @@ class Moderation::BaseController < ApplicationController
  layout 'admin'

  before_action :authenticate_user!
+  before_action :verify_moderator

  skip_authorization_check
-  before_action :verify_moderator

  private

--- a/app/controllers/moderation/comments_controller.rb
+++ b/app/controllers/moderation/comments_controller.rb
@@ -1,7 +1,7 @@
 class Moderation::CommentsController < Moderation::BaseController
-
  has_filters %w{all pending_flag_review with_ignored_flag}, only: :index
-  before_filter :load_comments, only: :index
+
+  before_action :load_comments, only: :index

  load_and_authorize_resource

--- a/app/controllers/moderation/debates_controller.rb
+++ b/app/controllers/moderation/debates_controller.rb
@@ -1,8 +1,7 @@
 class Moderation::DebatesController < Moderation::BaseController
-
  has_filters %w{all pending_flag_review with_ignored_flag}, only: :index

-  before_filter :load_debates, only: :index
+  before_action :load_debates, only: :index

  load_and_authorize_resource

--- a/app/controllers/organizations/registrations_controller.rb
+++ b/app/controllers/organizations/registrations_controller.rb
@@ -1,4 +1,5 @@
 class Organizations::RegistrationsController < Devise::RegistrationsController
+
  def new
    super do |user|
      user.build_organization
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -1,5 +1,4 @@
 class PagesController < ApplicationController
-
  skip_authorization_check

  def census_terms
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -1,6 +1,6 @@
 class StatsController < ApplicationController
-  skip_authorization_check
  before_action :verify_administrator
+  skip_authorization_check

  def show
    @event_types = Ahoy::Event.select(:name).uniq.pluck(:name)
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -1,4 +1,5 @@
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
+
  def self.provides_callback_for(provider)
    class_eval %Q{
      def #{provider}
@@ -26,4 +27,5 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
      finish_signup_path
    end
  end
+
 end
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -1,5 +1,5 @@
 class Users::RegistrationsController < Devise::RegistrationsController
-  prepend_before_filter :authenticate_scope!, only: [:edit, :update, :destroy, :finish_signup, :do_finish_signup]
+  prepend_before_action :authenticate_scope!, only: [:edit, :update, :destroy, :finish_signup, :do_finish_signup]

  def create
    build_resource(sign_up_params)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,4 +1,5 @@
 module ApplicationHelper
+
  def percentage(vote, debate)
    return "0%" if debate.total_votes == 0
    debate.send(vote).percent_of(debate.total_votes).to_s + "%"
--- a/app/helpers/cache_keys_helper.rb
+++ b/app/helpers/cache_keys_helper.rb
@@ -1,4 +1,5 @@
 module CacheKeysHelper
+
  def locale_and_user_status
    @cache_key_user ||= calculate_user_status
    "#{I18n.locale}/#{@cache_key_user}"
@@ -17,4 +18,5 @@ module CacheKeysHelper

    user_status
  end
+
 end
--- a/app/helpers/flags_helper.rb
+++ b/app/helpers/flags_helper.rb
@@ -1,4 +1,5 @@
 module FlagsHelper
+
  def show_flag_action?(flaggable)
    current_user && !own_flaggable?(flaggable) && !flagged?(flaggable)
  end
@@ -24,4 +25,5 @@ module FlagsHelper
      flaggable.author_id == current_user.id
    end
  end
+
 end
--- a/app/helpers/stats_helper.rb
+++ b/app/helpers/stats_helper.rb
@@ -1,4 +1,5 @@
 module StatsHelper
+
  def events_chart_tag(events, opt={})
    events = events.join(',') if events.is_a? Array
    opt[:data] ||= {}
--- a/app/models/flag.rb
+++ b/app/models/flag.rb
@@ -1,5 +1,4 @@
 class Flag < ActiveRecord::Base
-
  belongs_to :user
  belongs_to :flaggable, polymorphic: true, counter_cache: true

--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -1,5 +1,4 @@
 class Organization < ActiveRecord::Base
-
  belongs_to :user

  validates :name, presence: true
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -1,5 +1,4 @@
 class Setting < ActiveRecord::Base
-
  validates :key, presence: true, uniqueness: true

  default_scope { order(key: :desc) }
--- a/app/models/verified_user.rb
+++ b/app/models/verified_user.rb
@@ -1,4 +1,3 @@
-# make sure document_type is being stored and queried in the correct format (Is it DNI? a number, a string?)
 class VerifiedUser < ActiveRecord::Base
  scope :by_user,  -> (user)  { where(document_number: user.document_number,
                                      document_type:   user.document_type) }
--- a/lib/application_responder.rb
+++ b/lib/application_responder.rb
@@ -1,8 +1,4 @@
 class ApplicationResponder < ActionController::Responder
  include Responders::FlashResponder
  include Responders::HttpCacheResponder
-
-  # Redirects resources to the collection path (index action) instead
-  # of the resource path (show action) for POST/PUT/DELETE requests.
-  # include Responders::CollectionResponder
 end