diff --git a/app/controllers/admin/articles_controller.rb b/app/controllers/admin/articles_controller.rb index 15b30592..f2368632 100644 --- a/app/controllers/admin/articles_controller.rb +++ b/app/controllers/admin/articles_controller.rb @@ -116,7 +116,7 @@ def autosave @article.text_filter_name ||= default_text_filter if @article.title.blank? - lastid = Article.order("id desc").first.id + lastid = Article.order(id: :desc).first.id @article.title = "Draft article #{lastid}" end diff --git a/app/controllers/admin/redirects_controller.rb b/app/controllers/admin/redirects_controller.rb index 5fb87ce2..51588aa4 100644 --- a/app/controllers/admin/redirects_controller.rb +++ b/app/controllers/admin/redirects_controller.rb @@ -4,13 +4,13 @@ class Admin::RedirectsController < Admin::BaseController before_action :set_redirect, only: [:edit, :update, :destroy] def index - @redirects = Redirect.where(content_id: nil).order("id desc").page(params[:page]) + @redirects = Redirect.where(content_id: nil).order(id: :desc).page(params[:page]) .per(this_blog.admin_display_elements) @redirect = Redirect.new end def edit - @redirects = Redirect.where(content_id: nil).order("id desc").page(params[:page]) + @redirects = Redirect.where(content_id: nil).order(id: :desc).page(params[:page]) .per(this_blog.admin_display_elements) end diff --git a/app/controllers/admin/resources_controller.rb b/app/controllers/admin/resources_controller.rb index d120c588..39ffd148 100644 --- a/app/controllers/admin/resources_controller.rb +++ b/app/controllers/admin/resources_controller.rb @@ -18,7 +18,7 @@ def upload def index @r = Resource.new - @resources = Resource.order("created_at DESC").page(params[:page]) + @resources = Resource.order(created_at: :desc).page(params[:page]) .per(this_blog.admin_display_elements) end diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb index adf8f0d7..b74cd80d 100644 --- a/app/controllers/admin/tags_controller.rb +++ b/app/controllers/admin/tags_controller.rb @@ -51,7 +51,7 @@ def tag_params end def fetch_tags - @tags = Tag.order("display_name").page(params[:page]) + @tags = Tag.order(:display_name).page(params[:page]) .per(this_blog.admin_display_elements) end end diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index e2ca5dbe..6d53a068 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -4,7 +4,7 @@ class Admin::UsersController < Admin::BaseController before_action :set_user, only: [:edit, :update, :destroy] def index - @users = User.order("login asc").page(params[:page]) + @users = User.order(:login).page(params[:page]) .per(this_blog.admin_display_elements) end diff --git a/app/models/article.rb b/app/models/article.rb index 1bac7a38..e4d0a3b0 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -36,7 +36,7 @@ class Article < Content "contents.state" => "published") .group("contents.id") .select("contents.*, count(feedback.id) as comment_count") - .order("comment_count DESC") + .order(comment_count: :desc) .limit(5) } @@ -106,7 +106,7 @@ def self.search_with(params) scoped = scoped.send(params[:state]) end - scoped.order("created_at DESC") + scoped.order(created_at: :desc) end # FIXME: Use keyword params to clean up call sites. @@ -140,12 +140,12 @@ def feed_url(format) end def next - Article.where("published_at > ?", published_at).order("published_at asc") + Article.where("published_at > ?", published_at).order(:published_at) .limit(1).first end def previous - Article.where(published_at: ...published_at).order("published_at desc") + Article.where(published_at: ...published_at).order(published_at: :desc) .limit(1).first end diff --git a/app/models/blog.rb b/app/models/blog.rb index e6fca52a..cf3c91cf 100644 --- a/app/models/blog.rb +++ b/app/models/blog.rb @@ -24,11 +24,11 @@ class Blog < ApplicationRecord has_many :notes has_many :redirects - has_many :sidebars, ->() { order("active_position ASC") } + has_many :sidebars, ->() { order(:active_position) } attr_accessor :custom_permalink - default_scope -> { order("id") } + default_scope -> { order(:id) } validates :blog_name, presence: true diff --git a/app/models/comment.rb b/app/models/comment.rb index d5512a96..e479598f 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -16,7 +16,7 @@ class Comment < Feedback scope :ham, -> { where(state: "ham") } scope :unconfirmed, -> { where(state: %w(presumed_spam presumed_ham)) } - scope :last_published, -> { published.limit(5).order("created_at DESC") } + scope :last_published, -> { published.limit(5).order(created_at: :desc) } def notify_user_via_email(user) EmailNotify.send_comment(self, user) if user.notify_via_email? diff --git a/app/models/content.rb b/app/models/content.rb index e1389fa5..15e0557b 100644 --- a/app/models/content.rb +++ b/app/models/content.rb @@ -21,8 +21,8 @@ class Content < ApplicationRecord published.where(published_at: PublifyTime.delta(*time_params)) } scope :not_published, -> { where.not(state: "published") } - scope :drafts, -> { where(state: "draft").order("created_at DESC") } - scope :no_draft, -> { where.not(state: "draft").order("published_at DESC") } + scope :drafts, -> { where(state: "draft").order(created_at: :desc) } + scope :no_draft, -> { where.not(state: "draft").order(published_at: :desc) } scope :searchstring, lambda { |search_string| result = where(state: "published") @@ -119,6 +119,6 @@ def rss_description end def short_url - redirect.from_url if redirect.present? + redirect&.from_url end end diff --git a/app/models/feedback.rb b/app/models/feedback.rb index 4bbef23f..d918f6cb 100644 --- a/app/models/feedback.rb +++ b/app/models/feedback.rb @@ -252,7 +252,7 @@ def akismet_client end def blog_id - article.blog_id if article.present? + article.blog_id end def plural_model_name diff --git a/app/models/note.rb b/app/models/note.rb index d83dcdef..b640ce62 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -23,7 +23,7 @@ class Note < Content scope :published, lambda { where(state: "published").where(published_at: ..Time.zone.now).order(default_order) } - default_scope { order("published_at DESC") } + default_scope { order(published_at: :desc) } TWITTER_FTP_URL_LENGTH = 19 TWITTER_HTTP_URL_LENGTH = 20 diff --git a/app/models/tag.rb b/app/models/tag.rb index cd513970..25233393 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -43,11 +43,11 @@ def self.find_all_with_content_counters .where(contents: { state: "published" }) .select(*Tag.column_names, "COUNT(contents_tags.content_id) as content_counter") .group(*Tag.column_names) - .order("content_counter DESC").limit(1000) + .order(content_counter: :desc).limit(1000) end def self.find_with_char(char) - where("name LIKE ? ", "%#{char}%").order("name ASC") + where("name LIKE ? ", "%#{char}%").order(:name) end def self.collection_to_string(tags) diff --git a/publify_core.gemspec b/publify_core.gemspec index ce4a4389..9aedf4b9 100644 --- a/publify_core.gemspec +++ b/publify_core.gemspec @@ -63,7 +63,7 @@ Gem::Specification.new do |s| s.add_development_dependency "rubocop-capybara", "~> 2.22.1" s.add_development_dependency "rubocop-factory_bot", "~> 2.27.1" s.add_development_dependency "rubocop-performance", "~> 1.26.1" - s.add_development_dependency "rubocop-rails", "~> 2.32.0" + s.add_development_dependency "rubocop-rails", "~> 2.34.3" s.add_development_dependency "rubocop-rspec", "~> 3.7.0" s.add_development_dependency "rubocop-rspec_rails", "~> 2.32.0" s.add_development_dependency "shoulda-matchers", "~> 6.0"