publify_core 9.1.0 → 9.2.0

data/app/controllers/admin/users_controller.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 class Admin::UsersController < Admin::BaseController
   before_action :set_user, only: [:edit, :update, :destroy]
 
   def index
-    @users = User.order('login asc').page(params[:page]).per(this_blog.admin_display_elements)
+    @users = User.order("login asc").page(params[:page]).
+      per(this_blog.admin_display_elements)
   end
 
   def new
     @user = User.new
-    @user.text_filter = TextFilter.find_by(name: this_blog.text_filter)
+    @user.text_filter_name = this_blog.text_filter
   end
 
   def edit
@@ -18,7 +21,7 @@ class Admin::UsersController < Admin::BaseController
     @user = User.new(user_params)
     @user.name = @user.login
     if @user.save
-      redirect_to admin_users_url, notice: I18n.t('admin.users.new.success')
+      redirect_to admin_users_url, notice: I18n.t("admin.users.new.success")
     else
       render :new
     end
@@ -26,14 +29,14 @@ class Admin::UsersController < Admin::BaseController
 
   def update
     if @user.update(update_params)
-      redirect_to admin_users_url, notice: 'User was successfully updated.'
+      redirect_to admin_users_url, notice: "User was successfully updated."
     else
       render :edit
     end
   end
 
   def destroy
-    @user.destroy if User.where('profile = ? and id != ?', User::ADMIN, @user.id).count > 1
+    @user.destroy if User.where("profile = ? and id != ?", User::ADMIN, @user.id).count > 1
     redirect_to admin_users_url
   end
 
@@ -48,7 +51,7 @@ class Admin::UsersController < Admin::BaseController
                                  :email, :firstname, :lastname, :nickname,
                                  :name, :notify_via_email,
                                  :notify_on_new_articles, :notify_on_comments,
-                                 :profile, :text_filter_id, :state,
+                                 :profile, :text_filter_name, :state,
                                  :twitter_account, :twitter_oauth_token,
                                  :twitter_oauth_token_secret, :description,
                                  :url, :msn, :yahoo, :jabber, :aim, :twitter)

data/app/controllers/articles_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ArticlesController < ContentController
   before_action :login_required, only: [:preview, :preview_page]
   before_action :auto_discovery_feed, only: [:show, :index]
@@ -8,7 +10,7 @@ class ArticlesController < ContentController
   helper :'admin/base'
 
   def index
-    wanted_types = this_blog.statuses_in_timeline ? ['Article', 'Note'] : ['Article']
+    wanted_types = this_blog.statuses_in_timeline ? ["Article", "Note"] : ["Article"]
 
     limit = this_blog.per_page(params[:format])
     articles_base = if params[:year].blank?
@@ -16,7 +18,7 @@ class ArticlesController < ContentController
                     else
                       this_blog.contents.published_at(params.values_at(:year, :month, :day))
                     end
-    @articles = articles_base.includes(:user, :resources, :tags, :text_filter).
+    @articles = articles_base.includes(:user, :resources, :tags).
       where(type: wanted_types).page(params[:page]).per(limit)
 
     respond_to do |format|
@@ -27,24 +29,27 @@ class ArticlesController < ContentController
         render_paginated_index
       end
       format.atom do
-        render_articles_feed('atom')
+        render_articles_feed("atom")
       end
       format.rss do
         auto_discovery_feed(only_path: false)
-        render_articles_feed('rss')
+        render_articles_feed("rss")
       end
     end
   end
 
   def search
-    @articles = this_blog.articles_matching(params[:q], page: params[:page], per_page: this_blog.per_page(params[:format]))
+    @articles = this_blog.articles_matching(params[:q],
+                                            page: params[:page],
+                                            per_page: this_blog.per_page(params[:format]))
     return error! if @articles.empty?
+
     @page_title = this_blog.search_title_template.to_title(@articles, this_blog, params)
     @description = this_blog.search_desc_template.to_title(@articles, this_blog, params)
     respond_to do |format|
-      format.html { render 'search' }
-      format.rss { render_articles_feed 'rss' }
-      format.atom { render_articles_feed 'atom' }
+      format.html { render "search" }
+      format.rss { render_articles_feed "rss" }
+      format.atom { render_articles_feed "atom" }
     end
   end
 
@@ -57,16 +62,17 @@ class ArticlesController < ContentController
   def preview
     @article = Article.last_draft(params[:id])
     @page_title = this_blog.article_title_template.to_title(@article, this_blog, params)
-    render 'read'
+    render "read"
   end
 
   def check_password
     return unless request.xhr?
+
     @article = Article.find(params[:article][:id])
     if @article.password == params[:article][:password]
-      render partial: 'articles/full_article_content', locals: { article: @article }
+      render partial: "articles/full_article_content", locals: { article: @article }
     else
-      render partial: 'articles/password_form', locals: { article: @article }
+      render partial: "articles/password_form", locals: { article: @article }
     end
   end
 
@@ -79,15 +85,18 @@ class ArticlesController < ContentController
 
     # Redirect old version with /:year/:month/:day/:title to new format,
     # because it's changed
-    ['%year%/%month%/%day%/%title%', 'articles/%year%/%month%/%day%/%title%'].each do |part|
+    ["%year%/%month%/%day%/%title%", "articles/%year%/%month%/%day%/%title%"].each do |part|
       @article = factory.match_permalink_format(from, part)
-      return redirect_to URI.parse(@article.permalink_url).path, status: 301 if @article
+      if @article
+        return redirect_to URI.parse(@article.permalink_url).path,
+                           status: :moved_permanently
+      end
     end
 
     r = Redirect.find_by!(from_path: from)
     # TODO: If linked to article, directly redirect to the article.
     # Let redirection made outside of the blog on purpose (deal with it, Brakeman!)
-    redirect_to r.full_to_path, status: 301 if r
+    redirect_to r.full_to_path, status: :moved_permanently if r
   end
 
   def archives
@@ -99,24 +108,29 @@ class ArticlesController < ContentController
   end
 
   def tag
-    redirect_to tags_path, status: 301
+    redirect_to tags_path, status: :moved_permanently
   end
 
   def preview_page
     @page = Page.find(params[:id])
-    render 'view_page'
+    render "view_page"
   end
 
   def view_page
-    @page = Page.published.find_by!(name: Array(params[:name]).join('/'))
+    @page = Page.published.find_by!(name: Array(params[:name]).join("/"))
     @page_title = @page.title
     @description = this_blog.meta_description
     @keywords = this_blog.meta_keywords
   end
 
-  # TODO: Move to TextfilterController?
+  # TODO: Move to TextfilterController
   def markup_help
-    render html: TextFilter.find(params[:id]).commenthelp
+    filter = TextFilter.make_filter(params[:id])
+    if filter
+      render html: filter.commenthelp
+    else
+      render plain: "Unknown filter"
+    end
   end
 
   private
@@ -137,7 +151,7 @@ class ArticlesController < ContentController
 
   def verify_config
     if !this_blog.configured?
-      redirect_to controller: 'setup', action: 'index'
+      redirect_to controller: "setup", action: "index"
     elsif User.count == 0
       redirect_to new_user_registration_path
     else
@@ -154,12 +168,12 @@ class ArticlesController < ContentController
         @page_title = this_blog.article_title_template.to_title(@article, this_blog, params)
         @description = this_blog.article_desc_template.to_title(@article, this_blog, params)
 
-        @keywords = @article.tags.map(&:name).join(', ')
+        @keywords = @article.tags.map(&:name).join(", ")
         render "articles/#{@article.post_type}"
       end
-      format.atom { render_feedback_feed('atom') }
-      format.rss { render_feedback_feed('rss') }
-      format.xml { render_feedback_feed('atom') }
+      format.atom { render_feedback_feed("atom") }
+      format.rss { render_feedback_feed("rss") }
+      format.xml { render_feedback_feed("atom") }
     end
   rescue ActiveRecord::RecordNotFound
     error!
@@ -175,23 +189,25 @@ class ArticlesController < ContentController
 
   def render_paginated_index
     return error! if @articles.empty?
+
     auto_discovery_feed(only_path: false)
-    render 'index'
+    render "index"
   end
 
   def extract_feed_format(from)
-    if from =~ /^.*\.rss$/
-      request.format = 'rss'
-      from = from.gsub(/\.rss/, '')
-    elsif from =~ /^.*\.atom$/
-      request.format = 'atom'
-      from = from.gsub(/\.atom$/, '')
+    case from
+    when /^.*\.rss$/
+      request.format = "rss"
+      from = from.gsub(/\.rss/, "")
+    when /^.*\.atom$/
+      request.format = "atom"
+      from = from.gsub(/\.atom$/, "")
     end
     from
   end
 
   def error!
-    @message = I18n.t('errors.no_posts_found')
-    render 'articles/error', status: 200
+    @message = I18n.t("errors.no_posts_found")
+    render "articles/error", status: :ok
   end
 end

data/app/controllers/authors_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AuthorsController < ContentController
   layout :theme_layout
 
@@ -5,7 +7,8 @@ class AuthorsController < ContentController
     @author = User.find_by(login: params[:id])
     raise ActiveRecord::RecordNotFound unless @author
 
-    @articles = @author.articles.published.page(params[:page]).per(this_blog.per_page(params[:format]))
+    @articles = @author.articles.published.page(params[:page]).
+      per(this_blog.per_page(params[:format]))
     @page_title = this_blog.author_title_template.to_title(@author, this_blog, params)
     @keywords = this_blog.meta_keywords
     @description = this_blog.author_desc_template.to_title(@author, this_blog, params)
@@ -13,8 +16,8 @@ class AuthorsController < ContentController
     auto_discovery_feed(only_path: false)
 
     respond_to do |format|
-      format.rss { render_feed 'rss' }
-      format.atom { render_feed 'atom' }
+      format.rss { render_feed "rss" }
+      format.atom { render_feed "atom" }
       format.html
     end
   end

data/app/controllers/base_controller.rb

@@ -1,4 +1,6 @@
-require 'cancancan'
+# frozen_string_literal: true
+
+require "cancancan"
 
 class BaseController < ApplicationController
   before_action :fire_triggers, :load_lang, :set_paths
@@ -11,7 +13,7 @@ class BaseController < ApplicationController
 
   def set_paths
     prepend_view_path this_blog.current_theme.view_path
-    Dir.glob(File.join(::Rails.root.to_s, 'lib', '*_sidebar/app/views')).select do |file|
+    Dir.glob(File.join(::Rails.root.to_s, "lib", "*_sidebar/app/views")).select do |file|
       append_view_path file
     end
   end
@@ -26,13 +28,15 @@ class BaseController < ApplicationController
     elsif I18n.available_locales.include?(this_blog.lang[0..1].to_sym)
       I18n.locale = this_blog.lang[0..1]
     # for the same language used in different areas, e.g. zh_CN, zh_TW
-    elsif I18n.available_locales.include?(this_blog.lang.sub('_', '-').to_sym)
-      I18n.locale = this_blog.lang.sub('_', '-')
+    elsif I18n.available_locales.include?(this_blog.lang.sub("_", "-").to_sym)
+      I18n.locale = this_blog.lang.sub("_", "-")
     end
   end
 
   def add_to_cookies(name, value, path = nil, _expires = nil)
-    cookies[name] = { value: value, path: path || "/#{controller_name}", expires: 6.weeks.from_now }
+    cookies[name] = { value: value,
+                      path: path || "/#{controller_name}",
+                      expires: 6.weeks.from_now }
   end
 
   include BlogHelper

data/app/controllers/comments_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CommentsController < BaseController
   before_action :set_article, only: [:create, :preview]
 
@@ -12,8 +14,8 @@ class CommentsController < BaseController
 
     remember_author_info_for @comment
 
-    partial = '/articles/comment_failed'
-    partial = '/articles/comment' if recaptcha_ok_for?(@comment) && @comment.save
+    partial = "/articles/comment_failed"
+    partial = "/articles/comment" if recaptcha_ok_for?(@comment) && @comment.save
     respond_to do |format|
       format.js { render partial }
       format.html { redirect_to URI.parse(@article.permalink_url).path }
@@ -21,14 +23,14 @@ class CommentsController < BaseController
   end
 
   def preview
-    return render plain: 'Comments are closed' if @article.comments_closed?
+    return render plain: "Comments are closed" if @article.comments_closed?
 
     if comment_params[:body].blank?
       head :ok
       return
     end
 
-    @comment = Comment.new(comment_params)
+    @comment = @article.comments.build(comment_params)
   end
 
   protected
@@ -40,17 +42,19 @@ class CommentsController < BaseController
 
   def new_comment_defaults
     { ip: request.remote_ip,
-      author: 'Anonymous',
+      author: "Anonymous",
       user: @current_user,
-      user_agent: request.env['HTTP_USER_AGENT'],
-      referrer: request.env['HTTP_REFERER'],
+      user_agent: request.env["HTTP_USER_AGENT"],
+      referrer: request.env["HTTP_REFERER"],
       permalink: @article.permalink_url }.stringify_keys
   end
 
   def remember_author_info_for(comment)
     add_to_cookies(:author, comment.author)
     add_to_cookies(:url, comment.url)
-    add_to_cookies(:gravatar_id, Digest::MD5.hexdigest(comment.email.strip)) if comment.email.present?
+    if comment.email.present?
+      add_to_cookies(:gravatar_id, Digest::MD5.hexdigest(comment.email.strip))
+    end
   end
 
   def set_article

data/app/controllers/content_controller.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 class ContentController < BaseController
   private
 
   # TODO: Make this work for all content.
   def auto_discovery_feed(options = {})
     with_options(options.reverse_merge(only_path: true)) do |opts|
-      @auto_discovery_url_rss = opts.url_for(format: 'rss', only_path: false)
-      @auto_discovery_url_atom = opts.url_for(format: 'atom', only_path: false)
+      @auto_discovery_url_rss = opts.url_for(format: "rss", only_path: false)
+      @auto_discovery_url_atom = opts.url_for(format: "atom", only_path: false)
     end
   end
 

data/app/controllers/feedback_controller.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 class FeedbackController < BaseController
   def index
     @feedback = Feedback.ham.
       newest_first.
       limit(this_blog.per_page(params[:format]))
     respond_to do |format|
-      format.atom { render 'index', format: 'atom' }
-      format.rss { render 'index', format: 'rss' }
+      format.atom { render "index", format: "atom" }
+      format.rss { render "index", format: "rss" }
     end
   end
 end

data/app/controllers/notes_controller.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class NotesController < ContentController
-  require 'json'
+  require "json"
 
   layout :theme_layout
 
@@ -9,8 +11,8 @@ class NotesController < ContentController
     @notes = Note.published.page(params[:page]).per(this_blog.limit_article_display)
 
     if @notes.empty?
-      @message = I18n.t('errors.no_notes_found')
-      render 'notes/error', status: 200
+      @message = I18n.t("errors.no_notes_found")
+      render "notes/error", status: :ok
     end
   end
 

data/app/controllers/setup_controller.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class SetupController < BaseController
   before_action :check_config
-  layout 'accounts'
+  layout "accounts"
 
   def index; end
 
@@ -8,10 +10,11 @@ class SetupController < BaseController
     this_blog.blog_name = params[:setting][:blog_name]
     this_blog.base_url = blog_base_url
 
-    @user = User.new(login: 'admin',
+    @user = User.new(login: "admin",
                      email: params[:setting][:email],
                      password: params[:setting][:password],
-                     nickname: 'Publify Admin')
+                     text_filter_name: this_blog.text_filter,
+                     nickname: "Publify Admin")
     @user.name = @user.login
 
     unless this_blog.save && @user.save
@@ -34,24 +37,25 @@ class SetupController < BaseController
   private
 
   def create_first_post(user)
-    this_blog.articles.build(title: I18n.t('setup.article.title'),
+    this_blog.articles.build(title: I18n.t("setup.article.title"),
                              author: user.login,
-                             body: I18n.t('setup.article.body'),
+                             body: I18n.t("setup.article.body"),
                              allow_comments: 1,
                              allow_pings: 1,
                              user: user).publish!
   end
 
   def create_first_page(user)
-    this_blog.pages.create(name: 'about',
-                           state: 'published',
-                           title: I18n.t('setup.page.about'),
+    this_blog.pages.create(name: "about",
+                           state: "published",
+                           title: I18n.t("setup.page.about"),
                            user: user,
-                           body: I18n.t('setup.page.body'))
+                           body: I18n.t("setup.page.body"))
   end
 
   def check_config
     return unless this_blog.configured?
-    redirect_to controller: 'articles', action: 'index'
+
+    redirect_to controller: "articles", action: "index"
   end
 end