tb_core 1.3.10 → 1.4.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f0cffee46e753563727811398cd307e5263df61
-  data.tar.gz: a47903d588cfae9ddea08cbe0a844685b7a9578f
+  metadata.gz: 7972e913d7dfa93775c49dff5e6bd3fe6bd4781c
+  data.tar.gz: 38b2840a7b5e0770508445c53199de91230c97a9
 SHA512:
-  metadata.gz: c5e33f9dc1dea1dc14efae2017bce65b7168cab6a1b9a6c5d082898fce58a2eb134ee88a811414ce360a3e5c5ad676be29ef942d22b2d7110c204ab0f3b5b229
-  data.tar.gz: 3ccb89456ef9606374f775aaeadffb943ea144e0167d02b6243ce1eb2b17bb2f87363dac20d34272c03ce4b31ca8ef558f3c18f38b810156facf562aa8b08a33
+  metadata.gz: badde50660d068861e27367ec9033f125e63f53973c5cfa3d496114fabc7675e7ca7b354dd7e6076af254b64517fef074b6a18f5b8e8753379ac0cf70a1d1056
+  data.tar.gz: 82f6a259e226267a08cdf81ee59a8cc57bca8e8a14e7f1f150c57d0e016ac8ad36d567e214bf604fae2b0136e7b59b8edfad98d91486ef277e8ab767be75706a

data/Rakefile

@@ -1,16 +1,10 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+
+require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -20,18 +14,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
-Bundler::GemHelper.install_tasks
-
-require 'rake'
+load 'rails/tasks/statistics.rake'
 
-begin
-  require 'jasmine'
-  load 'jasmine/tasks/jasmine.rake'
-rescue LoadError
-  task :jasmine do
-    abort "Jasmine is not available. In order to run jasmine, you must: (sudo) gem install jasmine"
-  end
-end
+Bundler::GemHelper.install_tasks

data/app/controllers/admin/application_controller.rb

@@ -1,7 +1,7 @@
 class Admin::ApplicationController < Spud::ApplicationController
 
   before_action :require_admin_user
-  add_breadcrumb "Dashboard", :admin_root_path
+  add_breadcrumb 'Dashboard', :admin_root_path
   layout 'admin/detail'
   respond_to :html, :json
 
@@ -12,7 +12,7 @@ private
   end
 
   def login_path_for_require_user
-    admin_login_path(:return_to => request.path)
+    admin_login_path(return_to: request.path)
   end
 
 end

data/app/controllers/admin/dashboard_controller.rb

@@ -4,7 +4,7 @@ class Admin::DashboardController < Admin::ApplicationController
   layout 'admin/application'
 
   def index
-    @setting = SpudUserSetting.find_by(:spud_user_id => current_user.id, :key => "dash_icon_order")
+    @setting = SpudUserSetting.find_by(spud_user_id: current_user.id, key: 'dash_icon_order')
     apps = Spud::Core.admin_applications
     if @setting.nil? == false
       apps = arrange_apps(apps)
@@ -16,7 +16,7 @@ class Admin::DashboardController < Admin::ApplicationController
 
   def change_sort
     @order = params[:order]
-    @setting = SpudUserSetting.find_or_initialize_by(:spud_user_id => current_user.id, :key => "dash_icon_order")
+    @setting = SpudUserSetting.find_or_initialize_by(spud_user_id: current_user.id, key: 'dash_icon_order')
     @setting.value = @order
     if @setting.save
       respond_to do |format|
@@ -30,11 +30,11 @@ class Admin::DashboardController < Admin::ApplicationController
     @admin_applications = Spud::Core.admin_applications.select do |admin_application|
       if current_user.can_view_app?(admin_application)
         if admin_application[:badge]
-          data << {:key => admin_application[:key], :badge_count => admin_application[:badge].call(current_user)}
+          data << {key: admin_application[:key], badge_count: admin_application[:badge].call(current_user)}
         end
       end
     end
-    render :json => {:data => data}
+    render json: {data: data}
   end
 
   private

data/app/controllers/admin/password_resets_controller.rb

@@ -1,7 +1,7 @@
 class Admin::PasswordResetsController < Admin::ApplicationController
 
-  before_action :load_user_using_perishable_token, :only => [:show, :update]
-  skip_before_action :require_user, :require_admin_user
+  before_action :load_user_using_perishable_token, only: [:show, :update]
+  skip_before_action :require_user, :require_admin_user, raise: false
   layout 'admin/login'
 
   def index
@@ -13,11 +13,11 @@ class Admin::PasswordResetsController < Admin::ApplicationController
     if @user
       @user.reset_perishable_token!
       TbCoreMailer.forgot_password_notification(@user, admin_password_reset_url(@user.perishable_token)).deliver_later
-      flash[:notice] = "Instructions to reset your password have been emailed to you. " +
-      "Please check your email."
+      flash[:notice] = 'Instructions to reset your password have been emailed to you. ' +
+      'Please check your email.'
       redirect_to admin_login_path
     else
-      flash.now[:error] = "No user was found with that email address"
+      flash.now[:error] = 'No user was found with that email address'
       render 'index'
     end
   end
@@ -31,7 +31,7 @@ class Admin::PasswordResetsController < Admin::ApplicationController
     @user.password_confirmation = params[:spud_user][:password_confirmation]
     if @user.save
       SpudUserSession.create(@user)
-      flash[:notice] = "Password successfully updated"
+      flash[:notice] = 'Password successfully updated'
       redirect_to admin_login_path
     else
       render 'show'
@@ -44,9 +44,9 @@ private
     @user = SpudUser.find_using_perishable_token(params[:id])
     unless @user
       flash[:notice] = "We're sorry, but we could not locate your account. " +
-      "If you are having issues try copying and pasting the URL " +
-      "from your email into your browser or restarting the " +
-      "reset password process."
+      'If you are having issues try copying and pasting the URL ' +
+      'from your email into your browser or restarting the ' +
+      'reset password process.'
       redirect_to admin_login_path
     end
   end

data/app/controllers/admin/roles_controller.rb

@@ -1,10 +1,10 @@
 class Admin::RolesController < Admin::ApplicationController
 
-  before_action :get_record, :only => [:show, :edit, :update, :destroy]
+  before_action :get_record, only: [:show, :edit, :update, :destroy]
   respond_to :html, :json, :xml
   belongs_to_app :users
-  add_breadcrumb "Users", :admin_users_path
-  add_breadcrumb "Roles", :admin_roles_path
+  add_breadcrumb 'Users', :admin_users_path
+  add_breadcrumb 'Roles', :admin_roles_path
 
   def index
     @roles = SpudRole.includes(:spud_role_permissions)
@@ -25,7 +25,7 @@ class Admin::RolesController < Admin::ApplicationController
     logger.debug role_params
     @role = SpudRole.new(role_params)
     flash[:notice] = 'SpudRole created successfully' if @role.save
-    respond_with @role, :location => admin_roles_path
+    respond_with @role, location: admin_roles_path
   end
   
   def edit
@@ -37,12 +37,12 @@ class Admin::RolesController < Admin::ApplicationController
     if @role.update_attributes(role_params)
       flash[:notice] = 'SpudRole updated successfully'
     end
-    respond_with @role, :location => admin_roles_path
+    respond_with @role, location: admin_roles_path
   end
   
   def destroy
     flash[:notice] = 'SpudRole deleted successfully' if @role.destroy
-    respond_with @role, :location => admin_roles_path
+    respond_with @role, location: admin_roles_path
   end
 
   private
@@ -51,14 +51,14 @@ class Admin::RolesController < Admin::ApplicationController
     begin
       @role = SpudRole.find(params[:id])
     rescue ActiveRecord::RecordNotFound => e
-      flash[:error] = "Could not find the requested SpudRole"
+      flash[:error] = 'Could not find the requested SpudRole'
       redirect_to admin_roles_path
       return false
     end
   end
 
   def role_params
-    params.require(:spud_role).permit(:name, :permission_tags => [])
+    params.require(:spud_role).permit(:name, permission_tags: [])
   end
 
 end

data/app/controllers/admin/settings_controller.rb

@@ -5,38 +5,40 @@ class Admin::SettingsController < Admin::ApplicationController
 
   before_action do |c|
     if current_user && current_user.has_admin_rights?
-      add_breadcrumb "Settings", :admin_settings_path
+      add_breadcrumb 'Settings', :admin_settings_path
     end
   end
 
   def edit
-    
   end
 
   def update
     if check_password && @current_user.update_attributes(user_params)
       if user_params.include?(:password)
-          SpudUserSession.create(@current_user)
+        SpudUserSession.create(@current_user)
       end
-      flash[:notice] = "User settings saved successfully."
-      respond_with @current_user, :location => admin_settings_path
+      flash[:notice] = 'User settings saved successfully.'
+      respond_with @current_user, location: admin_settings_path
     else
-      render 'edit', :status => 401
+      render 'edit', status: 401
     end
   end
 
 private
 
   def user_params
-    params.require(:spud_user).permit(:login, :first_name, :last_name, :email, :password, :password_confirmation, :time_zone)
+    params.require(:spud_user).permit(
+      :login, :first_name, :last_name, :email,
+      :password, :password_confirmation, :time_zone
+    )
   end
 
   def check_password
-    if params[:spud_user][:password].nil? || params[:spud_user][:password].empty?
+    if user_params[:password].nil? || user_params[:password].empty?
       return true
     else
       if !current_user.valid_password?(params[:current_password])
-        current_user.errors.add(:current_password, "is not correct. Please enter correct password.")
+        current_user.errors.add(:current_password, 'is not correct. Please enter correct password.')
         return false
       end
       return true

data/app/controllers/admin/setup_controller.rb

@@ -1,13 +1,13 @@
 class Admin::SetupController < Admin::ApplicationController
 
-  skip_before_action :require_user, :require_admin_user
+  skip_before_action :require_admin_user
 
   def new
-    if SpudUser.count != 0
-      flash[:error] = "Access Denied! This wizard may only be executed when the database is empty."
+    if SpudUser.count.nonzero?
+      flash[:error] = 'Access Denied! This wizard may only be executed when the database is empty.'
       redirect_to admin_login_path and return
     else
-      @spud_user = SpudUser.new  
+      @spud_user = SpudUser.new
     end
   end
 
@@ -18,7 +18,7 @@ class Admin::SetupController < Admin::ApplicationController
       SpudUserSession.create(@spud_user)
       redirect_to admin_root_path
     else
-      render 'new', :status => 422
+      render 'new', status: 422
     end
   end
 

data/app/controllers/admin/user_sessions_controller.rb

@@ -6,8 +6,8 @@ class Admin::UserSessionsController < Admin::ApplicationController
   def new
     if current_user
       redirect_to admin_root_path
-    elsif SpudUser.all.count == 0
-      logger.debug "NO USERS!"
+    elsif SpudUser.all.count.zero?
+      logger.debug 'NO USERS!'
       redirect_to admin_setup_path and return
     end
     @user_session = SpudUserSession.new

data/app/controllers/admin/users_controller.rb

@@ -2,13 +2,13 @@ class Admin::UsersController < Admin::ApplicationController
   require 'csv'
 
   belongs_to_app :users
-  add_breadcrumb "Users", :admin_users_path
-  before_action :load_user, :only => [:edit, :update, :show, :destroy]
-  after_action :send_credentials_email, :only => [:create, :update]
+  add_breadcrumb 'Users', :admin_users_path
+  before_action :load_user, only: [:edit, :update, :show, :destroy]
+  after_action :send_credentials_email, only: [:create, :update]
   respond_to :html, :csv
 
   def index
-    @spud_users = SpudUser.ordered.paginate(:page => params[:page], :per_page => 15)
+    @spud_users = SpudUser.ordered.paginate(page: params[:page], per_page: 15)
     if params[:search]
       @spud_users = @spud_users.where_name_like(params[:search])
     end
@@ -23,7 +23,9 @@ class Admin::UsersController < Admin::ApplicationController
     users = SpudUser.all
     export_columns = %w(created_at first_name last_name email last_login_at)
     file_name = Spud::Core.site_name + ' Users Export.csv'
-    send_data users.as_csv(export_columns), :type => 'text/csv; charset=iso-8859-1; header=present', :disposition => "attachment; filename=#{file_name}"
+    send_data users.as_csv(export_columns),
+      type: 'text/csv; charset=iso-8859-1; header=present',
+      disposition: "attachment; filename=#{file_name}"
   end
 
   def new
@@ -31,7 +33,7 @@ class Admin::UsersController < Admin::ApplicationController
     respond_with @user do |format|
       format.html{
         if request.xhr?
-          render 'new', :layout => false
+          render 'new', layout: false
         else
           render 'new'
         end
@@ -41,14 +43,14 @@ class Admin::UsersController < Admin::ApplicationController
 
   def create
     @user = SpudUser.create(user_params)
-    respond_with @user, :location => admin_users_path
+    respond_with @user, location: admin_users_path
   end
 
   def edit
     respond_with @user do |format|
       format.html{
         if request.xhr?
-          render 'edit', :layout => false
+          render 'edit', layout: false
         else
           render 'edit'
         end
@@ -62,14 +64,14 @@ class Admin::UsersController < Admin::ApplicationController
         SpudUserSession.create(@user)
       end
     end
-    respond_with @user, :location => admin_user_path(@user), :status => 200
+    respond_with @user, location: admin_user_path(@user), status: 200
   end
 
   def destroy
     @user.destroy
-    respond_with @user, :location => admin_users_path do |format|
+    respond_with @user, location: admin_users_path do |format|
       format.js{
-        render :nothing => true, :status => 200
+        render nothing: true, status: 200
       }
     end
   end
@@ -83,8 +85,6 @@ private
     end
   end
 
-  # attr_accessible :login,:email,:first_name,:last_name,:password,:password_confirmation,:password_salt,:last_login_at,:last_request_at,:last_login_ip,:failed_login_count,:current_login_at,:login_count,:persistence_token,:perishable_token,:single_access_token,:crypted_password, :current_login_ip, :created_at, :updated_at,:time_zone, :as => [:default, :admin]
-  # attr_accessible :super_admin, :spud_role_id, :id, :as => :admin
   def user_params
     params.require(:spud_user).permit!
   end

data/app/controllers/password_resets_controller.rb

@@ -1,7 +1,7 @@
 class PasswordResetsController < ApplicationController
 
-  before_action :load_user_using_perishable_token, :only => [:show, :update]
-  skip_before_action :require_user
+  before_action :load_user_using_perishable_token, only: [:show, :update]
+  skip_before_action :require_user, raise: false
   respond_to :html
   layout 'user_sessions'
 
@@ -14,16 +14,16 @@ class PasswordResetsController < ApplicationController
     if @user
       @user.reset_perishable_token!
       TbCoreMailer.forgot_password_notification(@user, password_reset_url(@user.perishable_token)).deliver_later
-      flash[:notice] = "Password reset instructions have been sent to your email"
+      flash[:notice] = 'Password reset instructions have been sent to your email'
       redirect_to login_path
     else
-      flash.now[:error] = "No user was found with that email address"
+      flash.now[:error] = 'No user was found with that email address'
       render 'index'
     end
   end
 
   def show
-    
+
   end
 
   def update
@@ -34,7 +34,7 @@ class PasswordResetsController < ApplicationController
       @user.password_confirmation = params[:spud_user][:password_confirmation]
       if @user.save()
         SpudUserSession.create(@user)
-        flash[:notice] = "Password successfully updated"
+        flash[:notice] = 'Password successfully updated'
         redirect_back_or_default(root_path)
         return
       end
@@ -47,7 +47,7 @@ private
   def load_user_using_perishable_token
     @user = SpudUser.find_using_perishable_token(params[:id])
     unless @user
-      flash[:error] = "Password reset token was invalid or expired"
+      flash[:error] = 'Password reset token was invalid or expired'
       redirect_to login_path
     end
   end

data/app/controllers/spud/admin/application_controller.rb

@@ -1,7 +1,11 @@
 class Spud::Admin::ApplicationController < Admin::ApplicationController
 
   def initialize
-    ActiveSupport::Deprecation.warn "Spud::Admin::ApplicationController is deprecated and may be removed from future releases, use Admin::ApplicationController instead.", caller
+    ActiveSupport::Deprecation.warn(
+      "Spud::Admin::ApplicationController is deprecated and may be removed from future releases,
+      use Admin::ApplicationController instead.",
+      caller
+    )
     super
   end
 

data/app/controllers/spud/application_controller.rb

@@ -10,9 +10,9 @@ class Spud::ApplicationController < ActionController::Base
 
   self.responder = TbCore::Responder
 
-  rescue_from Spud::RequestError, :with => :handle_request_error
-  rescue_from ActiveRecord::RecordNotFound, :with => :handle_record_not_found
-  rescue_from ActionController::UnknownFormat, :with => :handle_unknown_format_error
+  rescue_from Spud::RequestError, with: :handle_request_error
+  rescue_from ActiveRecord::RecordNotFound, with: :handle_record_not_found
+  rescue_from ActionController::UnknownFormat, with: :handle_unknown_format_error
 
   def not_found
     raise Spud::NotFoundError
@@ -21,7 +21,7 @@ class Spud::ApplicationController < ActionController::Base
 private
 
   def set_mailer_default_url
-    ActionMailer::Base.default_url_options = {:host => request.host_with_port}
+    ActionMailer::Base.default_url_options = {host: request.host_with_port}
   end
 
   def current_user_session
@@ -52,7 +52,7 @@ private
   # Override this in a controller to redifine where the login form is
   #
   def login_path_for_require_user
-    login_path(:return_to => request.path)
+    login_path(return_to: request.path)
   end
 
   def require_admin_user
@@ -78,7 +78,7 @@ private
 
   def check_requires_password_change
     if current_user.present? && current_user.requires_password_change?
-      redirect_to(login_change_password_path(:return_to => request.path))
+      redirect_to(login_change_password_path(return_to: request.path))
       return false
     end
   end
@@ -97,19 +97,23 @@ private
 
     if error.is_a?(Spud::UnauthorizedError)
       if should_present_basic_auth?
-        headers["WWW-Authenticate"] = "Basic realm=\"#{Spud::Core.config.site_name}\""
+        headers['WWW-Authenticate'] = "Basic realm=\"#{Spud::Core.config.site_name}\""
       elsif request.format.html?
         redirect_to(login_path_for_require_user)
         return false
       end
     end
 
+    do_error_response(error)
+  end
+
+  def do_error_response(error)
     respond_to do |format|
-      format.json{ render :json => {:errors => error.message}, :status => error.code }
-      format.xml{ render :xml => {:errors => error.message}, :status => error.code }
-      format.all{
+      format.json { render json: { errors: error.message }, status: error.code }
+      format.xml { render xml: { errors: error.message }, status: error.code }
+      format.all {
         @error = error
-        render :template => error.template, :layout => nil, :formats => [:html], :status => error.code, :content_type => 'text/html'
+        render template: error.template, layout: nil, formats: [:html], status: error.code, content_type: 'text/html'
       }
     end
   end

data/app/controllers/user_sessions_controller.rb

@@ -1,7 +1,9 @@
 class UserSessionsController < ApplicationController
 
-  skip_before_action :require_user, :only => [:new, :create, :destroy]
-  skip_before_action :check_requires_password_change, :only => [:destroy, :change_password, :set_change_password]
+  skip_before_action :require_user, only: [:new, :create, :destroy], raise: false
+  skip_before_action :check_requires_password_change,
+    only: [:destroy, :change_password, :set_change_password],
+    raise: false
 
   respond_to :html, :json, :js
   layout 'user_sessions'
@@ -12,11 +14,11 @@ class UserSessionsController < ApplicationController
   end
 
   def create
-    @user_session = SpudUserSession.new(params[:spud_user_session])
+    @user_session = SpudUserSession.new(user_session_params)
     if @user_session.save()
       respond_with @user_session do |format|
         format.html{
-          flash[:notice] = "Login successful!"
+          flash[:notice] = 'Login successful!'
           redirect_back_or_default('/')
         }
         format.json{
@@ -36,7 +38,7 @@ class UserSessionsController < ApplicationController
     current_user_session.destroy unless current_user_session.blank?
     respond_with({}) do |format|
       format.html{
-        flash[:notice] = "Logout successful!"
+        flash[:notice] = 'Logout successful!'
         redirect_back_or_default(login_path)
       }
     end
@@ -62,6 +64,10 @@ class UserSessionsController < ApplicationController
 
 private
 
+  def user_session_params
+    params.require(:spud_user_session).permit(:login, :password)
+  end
+
   def change_password_params
     params.require(:spud_user).permit(:password, :password_confirmation)
   end

data/app/helpers/admin/application_helper.rb

@@ -1,14 +1,18 @@
 module Admin::ApplicationHelper
 
   def timestamp(timedate=nil)
-    return "Never" if timedate.blank?
+    return 'Never' if timedate.blank?
 
     if Time.now() > timedate # in the past
-      return Time.now() - timedate > 604800 ? timedate.strftime("%B %d, %Y") + ' at ' + timedate.strftime("%I:%M %p") : time_ago_in_words(timedate) + ' ago'
+      if Time.now() - timedate > 604800
+        return timedate.strftime('%B %d, %Y') + ' at ' + timedate.strftime('%I:%M %p')
+      else
+        return time_ago_in_words(timedate) + ' ago'
+      end
     elsif Time.now() < timedate # in the future
-      return timedate.strftime("%B %d, %Y") + ' at ' + timedate.strftime("%I:%M %p")
+      return timedate.strftime('%B %d, %Y') + ' at ' + timedate.strftime('%I:%M %p')
     else
-      return "Right now"
+      return 'Right now'
     end
   end
 
@@ -16,25 +20,28 @@ module Admin::ApplicationHelper
     if Rails.configuration.relative_url_root.blank?
       return url
     else
-      return [Rails.configuration.relative_url_root, url].join('/').gsub(/(\/+)/, '/') 
+      return [Rails.configuration.relative_url_root, url].join('/').gsub(/(\/+)/, '/')
     end
   end
 
   # Build an icon with left padding to indicate nesting below the previous table row
   #
   def table_nesting_indicator(depth)
-    if depth > 0
+    if depth.positive?
       depth.times do
-        concat content_tag(:span, '', :class => 'nesting-spacer')
+        concat content_tag(:span, '', class: 'nesting-spacer')
       end
-      content_tag(:span, "", :class => 'glyphicon glyphicon-chevron-right')
+      content_tag(:span, '', class: 'glyphicon glyphicon-chevron-right')
     end
   end
 
+  WHITE_LIST_PARAMS = [:tab, :page, :sort, :direction, :search, :id].freeze
+
   # Build a Bootstrap nav-tabs element
   #
   # * url_helper: A symbol representing the url helper method. ie: admin_widgets_path
   # * tabs: An array of tab hashes with :title and :value keys
+  # * white_list: An array of param keys that should be allowed in the tabs. Optional.
   #
   # Example:
   #
@@ -42,7 +49,7 @@ module Admin::ApplicationHelper
   #    {:title => 'All'},
   #    {:title => 'New', :value => 'new'},
   #    {:title => 'Used', :value => 'used'}
-  #  ]) %>
+  #  ], white_list: [:category_id]) %>
   #
   # This would generate:
   #
@@ -52,18 +59,17 @@ module Admin::ApplicationHelper
   #   <li class=""><a href="/admin/vehicles?tab=used">Used</a></li>
   # </ul>
   #
-  def tb_core_tabbed_navigation(url_helper, tabs)
+  def tb_core_tabbed_navigation(url_helper, tabs, white_list: [])
     key = :tab
-    content_tag :ul, :class => 'nav nav-tabs' do
+    content_tag :ul, class: 'nav nav-tabs' do
       tabs.each do |tab|
         cls = params[key] == tab[:value] ? 'active' : ''
         url = tab.delete(:url)
         if url.blank?
-          id_params = params.select{ |k,v| k == :id || k.to_s =~ /_id$/ }
-          link_args = id_params.merge(key => tab[:value])
+          link_args = params.permit(white_list.concat(WHITE_LIST_PARAMS)).merge(key => tab[:value])
           url = self.send(url_helper, link_args)
         end
-        concat(content_tag(:li, :class => cls){ link_to tab[:title], url })
+        concat(content_tag(:li, class: cls){ link_to tab[:title], url })
       end
     end
   end