publify_core 9.0.0.pre6 → 9.2.1

data/app/controllers/admin/tags_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Admin::TagsController < Admin::BaseController
   before_action :fetch_tags, only: [:index, :edit]
   before_action :set_tag, only: [:edit, :update, :destroy]
@@ -12,7 +14,7 @@ class Admin::TagsController < Admin::BaseController
     @tag = this_blog.tags.new(tag_params)
 
     if @tag.save
-      redirect_to admin_tags_url, notice: 'Tag was successfully created.'
+      redirect_to admin_tags_url, notice: "Tag was successfully created."
     else
       fetch_tags
       render :index
@@ -22,8 +24,9 @@ class Admin::TagsController < Admin::BaseController
   def update
     old_name = @tag.name
     if @tag.update(tag_params)
+      # TODO: Check whether these redirects are useful or ignored.
       Redirect.create(from_path: "/tag/#{old_name}", to_path: @tag.permalink_url(nil, true))
-      redirect_to admin_tags_url, notice: I18n.t('admin.tags.edit.success')
+      redirect_to admin_tags_url, notice: I18n.t("admin.tags.edit.success")
     else
       render :edit
     end
@@ -46,6 +49,7 @@ class Admin::TagsController < Admin::BaseController
   end
 
   def fetch_tags
-    @tags = Tag.order('display_name').page(params[:page]).per(this_blog.admin_display_elements)
+    @tags = Tag.order("display_name").page(params[:page]).
+      per(this_blog.admin_display_elements)
   end
 end

data/app/controllers/admin/themes_controller.rb

@@ -1,28 +1,31 @@
-require 'open-uri'
-require 'time'
-require 'rexml/document'
+# frozen_string_literal: true
+
+require "open-uri"
+require "time"
+require "rexml/document"
 
 class Admin::ThemesController < Admin::BaseController
   def index
     @themes = Theme.find_all
     @themes.each do |theme|
       # TODO: Move to Theme
-      theme.description_html = TextFilter.filter_text(theme.description, [:markdown, :smartypants])
+      theme.description_html = TextFilter.filter_text(theme.description,
+                                                      [:markdown, :smartypants])
     end
     @active = this_blog.current_theme
   end
 
   def preview
     theme = Theme.find(params[:theme])
-    send_file File.join(theme.path, 'preview.png'),
-              type: 'image/png', disposition: 'inline', stream: false
+    send_file File.join(theme.path, "preview.png"),
+              type: "image/png", disposition: "inline", stream: false
   end
 
   def switchto
     this_blog.theme = params[:theme]
     this_blog.save
     this_blog.current_theme(:reload)
-    flash[:success] = I18n.t('admin.themes.switchto.success')
+    flash[:success] = I18n.t("admin.themes.switchto.success")
     redirect_to admin_themes_url
   end
 end

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
 
@@ -46,9 +49,9 @@ class Admin::UsersController < Admin::BaseController
   def user_params
     params.require(:user).permit(:login, :password, :password_confirmation,
                                  :email, :firstname, :lastname, :nickname,
-                                 :display_name, :notify_via_email,
+                                 :name, :notify_via_email,
                                  :notify_on_new_articles, :notify_on_comments,
-                                 :profile, :text_filter, :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,50 +10,46 @@ class ArticlesController < ContentController
   helper :'admin/base'
 
   def index
-    conditions = this_blog.statuses_in_timeline ? ['type in (?, ?)', 'Article', 'Note'] : ['type = ?', 'Article']
+    wanted_types = this_blog.statuses_in_timeline ? ["Article", "Note"] : ["Article"]
 
     limit = this_blog.per_page(params[:format])
-    @articles = if params[:year].blank?
-                  this_blog.contents.published.where(conditions).page(params[:page]).per(limit)
-                else
-                  this_blog.contents.published_at(params.values_at(:year, :month, :day)).where(conditions).page(params[:page]).per(limit)
-                end
-
-    @page_title = this_blog.home_title_template
-    @description = this_blog.home_desc_template
-    if params[:year]
-      @page_title = this_blog.archives_title_template
-      @description = this_blog.archives_desc_template
-    elsif params[:page]
-      @page_title = this_blog.paginated_title_template
-      @description = this_blog.paginated_desc_template
-    end
-    @page_title = @page_title.to_title(@articles, this_blog, params)
-    @description = @description.to_title(@articles, this_blog, params)
-
-    @keywords = this_blog.meta_keywords
+    articles_base = if params[:year].blank?
+                      this_blog.contents.published
+                    else
+                      this_blog.contents.published_at(params.values_at(:year, :month, :day))
+                    end
+    @articles = articles_base.includes(:user, :resources, :tags).
+      where(type: wanted_types).page(params[:page]).per(limit)
 
     respond_to do |format|
-      format.html { render_paginated_index }
+      format.html do
+        set_index_title_and_description(this_blog, params)
+        @keywords = this_blog.meta_keywords
+
+        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 'index_rss_feed', layout: false }
-      format.atom { render 'index_atom_feed', layout: false }
+      format.html { render "search" }
+      format.rss { render_articles_feed "rss" }
+      format.atom { render_articles_feed "atom" }
     end
   end
 
@@ -64,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
 
@@ -86,54 +85,73 @@ 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)
-    return redirect_to r.full_to_path, status: 301 if r # Let redirection made outside of the blog on purpose (deal with it, Brakeman!)
-
-    render 'errors/404', status: 404
+    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: :moved_permanently if r
   end
 
   def archives
     limit = this_blog.limit_archives_display
-    @articles = this_blog.published_articles.page(params[:page]).per(limit)
+    @articles = this_blog.published_articles.includes(:tags).page(params[:page]).per(limit)
     @page_title = this_blog.archives_title_template.to_title(@articles, this_blog, params)
     @keywords = this_blog.meta_keywords
     @description = this_blog.archives_desc_template.to_title(@articles, this_blog, params)
   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
-    if (@page = Page.find_by(name: Array(params[:name]).join('/'))) && @page.published?
-      @page_title = @page.title
-      @description = this_blog.meta_description
-      @keywords = this_blog.meta_keywords
-    else
-      render 'errors/404', status: 404
-    end
+    @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
 
+  def set_index_title_and_description(blog, parameters)
+    @page_title = blog.home_title_template
+    @description = blog.home_desc_template
+    if parameters[:year]
+      @page_title = blog.archives_title_template
+      @description = blog.archives_desc_template
+    elsif parameters[:page]
+      @page_title = blog.paginated_title_template
+      @description = blog.paginated_desc_template
+    end
+    @page_title = @page_title.to_title(@articles, blog, parameters)
+    @description = @description.to_title(@articles, blog, parameters)
+  end
+
   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
@@ -143,60 +161,53 @@ class ArticlesController < ContentController
 
   # See an article We need define @article before
   def show_article
-    @comment = Comment.new
-    @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)
-    groupings = @article.tags
-    @keywords = groupings.map(&:name).join(', ')
-
     auto_discovery_feed
     respond_to do |format|
-      format.html { render "articles/#{@article.post_type}" }
-      format.atom { render_feedback_feed('atom') }
-      format.rss { render_feedback_feed('rss') }
-      format.xml { render_feedback_feed('atom') }
+      format.html do
+        @comment = Comment.new
+        @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(", ")
+        render "articles/#{@article.post_type}"
+      end
+      format.atom { render_feedback_feed("atom") }
+      format.rss { render_feedback_feed("rss") }
+      format.xml { render_feedback_feed("atom") }
     end
   rescue ActiveRecord::RecordNotFound
     error!
   end
 
   def render_articles_feed(format)
-    if this_blog.feedburner_url.empty? || request.env['HTTP_USER_AGENT'] =~ /FeedBurner/i
-      render "index_#{format}_feed", layout: false
-    else
-      redirect_to "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
-    end
+    render_cached_xml("index_#{format}_feed", @articles)
   end
 
   def render_feedback_feed(format)
-    @feedback = @article.published_feedback
-    render "feedback_#{format}_feed", layout: false
+    render_cached_xml("feedback_#{format}_feed", @article)
   end
 
   def render_paginated_index
     return error! if @articles.empty?
-    if this_blog.feedburner_url.empty?
-      auto_discovery_feed(only_path: false)
-    else
-      @auto_discovery_url_rss = "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
-      @auto_discovery_url_atom = "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
-    end
-    render 'index'
+
+    auto_discovery_feed(only_path: false)
+    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,23 +1,19 @@
-require 'cancancan'
+# frozen_string_literal: true
+
+require "cancancan"
 
 class BaseController < ApplicationController
   before_action :fire_triggers, :load_lang, :set_paths
-  before_action :configure_permitted_parameters, if: :devise_controller?
 
   private
 
-  def configure_permitted_parameters
-    # TODO: Check if this is still needed
-    devise_parameter_sanitizer.permit(:sign_up, keys: [:email])
-  end
-
   def login_required
     authenticate_user! && authorize!(params[:action], params[:controller])
   end
 
   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
@@ -32,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