publify_core 9.2.10 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5527fac8b20913bab53dd2561d1733883484d9b2334da9acfb46265468caa501
-  data.tar.gz: 683bd0f0cdc369a1da0b6c6fa86c11be5aa51b657336ae6e96dbd6dc9f386193
+  metadata.gz: 315c96f6777f5d761c19b1b78a37aa38fdddb337522c56059813be2340f835cd
+  data.tar.gz: cd54077be1d63bfd63e385e2dd61e2f23e2928ba3e19ef9aa04f69ab94e00263
 SHA512:
-  metadata.gz: f494f56b72b267db6ed6d6962014290ddd1a0d888c83c9ec101a7c41572a27234e663c64ba021190252a04cb19e38eb1a109c2ccf4e41a0c1006b04b92bebcf7
-  data.tar.gz: 6b2e942362cefab924e25bb069d8a7a26e55605cb83b343f1934a62e9e6cf149cd2ee30b8d7dcbc3db181d14f59cddcd2c8de2c86b9e6b9822583d0861f07ccb
+  metadata.gz: af4a6c89bc46ba69993175cbc0245c8cda50e5818a0d809322c5ff9a3431848c8c3b1e5b38db15e8a1ec2e226f3127978b25d312c4e91039af436eba950d2889
+  data.tar.gz: 114fd493221442b2d93dd40cf8c2766cd7b18e1d07a843fe14b605a44e1745a38b4481ccf4f83bf24afd378bb7d525ebd812e4b2bb8dfef3bcff6b7b18db13ba

data/CHANGELOG.md

@@ -1,33 +1,72 @@
 # Changelog
 
+## 10.0.0 / 2023-06-25
+
+### Updated dependencies
+
+* Upgrade to Rails 6.1 and Ruby 2.7 to 3.2
+  [publify#987](https://github.com/publify/publify/pull/987),
+  [publify#1014](https://github.com/publify/publify/pull/1014),
+  [publify_core#71](https://github.com/publify/publify_core/pull/71), and
+  [publify_core#78](https://github.com/publify/publify_core/pull/78)
+* Update various other dependencies (various pull requests)
+
+### Breaking changes
+
+* Remove support for Textile as a text format [publify#1001](https://github.com/publify/publify/pull/1001)
+
+### Other changes
+
+* Improve feedback listings [publify#1005](https://github.com/publify/publify/pull/1005)
+* Link to article from article feedback admin page [publify#1007](https://github.com/publify/publify/pull/1007)
+* Link to blog from admin menu [publify#1008](https://github.com/publify/publify/pull/1008)
+* Handle markdown links in notes correctly [publify#1009](https://github.com/publify/publify/pull/1009)
+* Make notes twitterfilter robust [publify#1010](https://github.com/publify/publify/pull/1010)
+* Miscellaneous admin fixes [publify#1012](https://github.com/publify/publify/pull/1012)
+* Add arabic language to the project [publify#1060](https://github.com/publify/publify/pull/1060) by [ahmedhamid13](https://github.com/ahmedhamid13)
+
+### Internal changes
+
+* Remove use of 'notextile' [publify#1002](https://github.com/publify/publify/pull/1002)
+* Remove `TextFilter.filter_text` in favor of `#filter_text` [publify#1003](https://github.com/publify/publify/pull/1003)
+* Replace BlueCloth with CommonMarker for Markdown processing [publify#810](https://github.com/publify/publify/pull/810)
+* Rename Admin::ContentController to Admin::ArticlesController [publify#1004](https://github.com/publify/publify/pull/1004)
+* Remove unneeded wrapping elements from admin layout [publify#1006](https://github.com/publify/publify/pull/1006)
+* Split the factories into individual files [publify#1031](https://github.com/publify/publify/pull/1031) by [VictorPS](https://github.com/VictorPS)
+* Ensure `auto_link` helper is loaded on time [publify#1040](https://github.com/publify/publify/pull/1040)
+* Remove `sitealizer` table [publify#1089](https://github.com/publify/publify/pull/1089) by [SupriyaMedankar](https://github.com/SupriyaMedankar)
+* Remove itunes fields from resources [publify#1092](https://github.com/publify/publify/pull/1092) by [SupriyaMedankar](https://github.com/SupriyaMedankar)
+* Remove `page_caches` table [publify#1090](https://github.com/publify/publify/pull/1090) by [SupriyaMedankar](https://github.com/SupriyaMedankar)
+* Remove obsolete Sidebar code [publify#58](https://github.com/publify/publify/pull/58)
+
 ## 9.2.10 / 2023-01-08
 
-* Bump Rails version to 5.2.8.1 [#1070](https://github.com/publify/publify/pull/1070)
-* Limit length of settings values [#1072](https://github.com/publify/publify/pull/1072)
-* Require login to stay unique when updating a User [#1073](https://github.com/publify/publify/pull/1073)
-* Validate lengths of string attributes [#1077](https://github.com/publify/publify/pull/1077)
-* Strip EXIF data from resource uploads [#1078](https://github.com/publify/publify/pull/1078)
-* Require user passwords to be strong [#1086](https://github.com/publify/publify/pull/1086)
+* Bump Rails version to 5.2.8.1 [publify#1070](https://github.com/publify/publify/pull/1070)
+* Limit length of settings values [publify#1072](https://github.com/publify/publify/pull/1072)
+* Require login to stay unique when updating a User [publify#1073](https://github.com/publify/publify/pull/1073)
+* Validate lengths of string attributes [publify#1077](https://github.com/publify/publify/pull/1077)
+* Strip EXIF data from resource uploads [publify#1078](https://github.com/publify/publify/pull/1078)
+* Require user passwords to be strong [publify#1086](https://github.com/publify/publify/pull/1086)
 
 ## 9.2.9 / 2022-05-22
 
-* Fix admin article access control [#1065](https://github.com/publify/publify/pull/1065)
-* Refuse html files as resources even if declared to be plain text [#1066](https://github.com/publify/publify/pull/1066)
+* Fix admin article access control [publify#1065](https://github.com/publify/publify/pull/1065)
+* Refuse html files as resources even if declared to be plain text [publify#1066](https://github.com/publify/publify/pull/1066)
 
 ## 9.2.8 / 2022-05-14
 
-* Fix password protected article reveal [#1049](https://github.com/publify/publify/pull/1049)
-* Disallow comments on draft articles [#1048](https://github.com/publify/publify/pull/1048)
-* Clean up Feedback validation [#1051](https://github.com/publify/publify/pull/1051)
-* Disallow images in comments [#1054](https://github.com/publify/publify/pull/1054)
-* Fix password reset process [#1055](https://github.com/publify/publify/pull/1055)
-* Hide bodies of password-protected articles in search results [#1057](https://github.com/publify/publify/pull/1057)
-* Provide correct `article_id` input in bulkops form [#1058](https://github.com/publify/publify/pull/1058)
-* Do not create article meta description for password-protected articles [#1061](https://github.com/publify/publify/pull/1061)
+* Fix password protected article reveal [publify#1049](https://github.com/publify/publify/pull/1049)
+* Disallow comments on draft articles [publify#1048](https://github.com/publify/publify/pull/1048)
+* Clean up Feedback validation [publify#1051](https://github.com/publify/publify/pull/1051)
+* Disallow images in comments [publify#1054](https://github.com/publify/publify/pull/1054)
+* Fix password reset process [publify#1055](https://github.com/publify/publify/pull/1055)
+* Hide bodies of password-protected articles in search results [publify#1057](https://github.com/publify/publify/pull/1057)
+* Provide correct `article_id` input in bulkops form [publify#1058](https://github.com/publify/publify/pull/1058)
+* Do not create article meta description for password-protected articles [publify#1061](https://github.com/publify/publify/pull/1061)
 
 ## 9.2.7 / 2022-02-07
 
-* Fix setting the article password from the Admin [#1044](https://github.com/publify/publify/pull/1044)
+* Fix setting the article password from the Admin [publify#1044](https://github.com/publify/publify/pull/1044)
 
 ## 9.2.6 / 2022-01-07
 
@@ -57,7 +96,7 @@ Additionally, it includes the following changes:
 ## 9.2.3 / 2021-05-22
 
 * Bump Rails dependency to 5.2.6
-* Replace mimemagic with marcel
+* Replace mimemagic with marcel [publify#996](https://github.com/publify/publify/pull/996)
 
 ## 9.2.2 / 2021-03-21
 

data/app/assets/javascripts/lang/ar_AR.js

@@ -0,0 +1,17 @@
+window._lang = "ar_AR" ;
+window._l10s = window._l10s || { } ;
+window._l10s["ar_AR"] = {
+
+  "#{0} from now": "#{0} من الآن",
+  "#{0} ago": "#{0} منذ",
+  "on #{0}": "خلال #{0}",
+  "less than a minute": "أقل من دفيقة",
+  "#{0} minute": "#{0} دقيقة",
+  "#{0} minutes": "#{0} دقائق",
+  "about one hour": "خلال ساعة",
+  "#{0} hours": "#{0} ساعات",
+  "one day": "يوم",
+  "about one day": "خلال يوم",
+  "#{0} days": "#{0} أيام"
+
+} ;

data/app/controllers/admin/{content_controller.rb → articles_controller.rb}

@@ -4,11 +4,11 @@ require "base64"
 
 module Admin; end
 
-class Admin::ContentController < Admin::BaseController
+class Admin::ArticlesController < Admin::BaseController
   def index
     @search = params[:search] || {}
-    @articles = this_blog.articles.search_with(@search).page(params[:page]).
-      per(this_blog.admin_display_elements)
+    @articles = this_blog.articles.search_with(@search).page(params[:page])
+      .per(this_blog.admin_display_elements)
 
     if request.xhr?
       respond_to do |format|
@@ -29,7 +29,7 @@ class Admin::ContentController < Admin::BaseController
     return unless access_granted?(params[:id])
 
     @article = Article.find(params[:id])
-    @article.text_filter ||= default_text_filter
+    @article.text_filter_name ||= default_text_filter
     @article.keywords = Tag.collection_to_string @article.tags
     load_resources
     render layout: "editor"
@@ -48,7 +48,7 @@ class Admin::ContentController < Admin::BaseController
     end
 
     if @article.save
-      flash[:success] = I18n.t("admin.content.create.success")
+      flash[:success] = I18n.t("admin.articles.create.success")
       redirect_to action: "index"
     else
       @article.keywords = Tag.collection_to_string @article.tags
@@ -79,7 +79,7 @@ class Admin::ContentController < Admin::BaseController
 
     if @article.save
       Article.where(parent_id: @article.id).map(&:destroy) unless @article.draft
-      flash[:success] = I18n.t("admin.content.update.success")
+      flash[:success] = I18n.t("admin.articles.update.success")
       redirect_to action: "index"
     else
       @article.keywords = Tag.collection_to_string @article.tags
@@ -113,7 +113,7 @@ class Admin::ContentController < Admin::BaseController
     @article.author = current_user
     @article.save_attachments!(params[:attachments])
     @article.state = "draft" unless @article.withdrawn?
-    @article.text_filter ||= current_user.default_text_filter
+    @article.text_filter_name ||= default_text_filter
 
     if @article.title.blank?
       lastid = Article.order("id desc").first.id
@@ -121,7 +121,7 @@ class Admin::ContentController < Admin::BaseController
     end
 
     if @article.save
-      flash[:success] = I18n.t("admin.content.autosave.success")
+      flash[:success] = I18n.t("admin.articles.autosave.success")
       @must_update_calendar =
         (params[:article][:published_at] and
          params[:article][:published_at].to_time.to_i < Time.zone.now.to_time.to_i and
@@ -157,7 +157,7 @@ class Admin::ContentController < Admin::BaseController
     if article.access_by? current_user
       true
     else
-      flash[:error] = I18n.t("admin.content.access_granted.error")
+      flash[:error] = I18n.t("admin.articles.access_granted.error")
       redirect_to action: "index"
       false
     end
@@ -171,23 +171,23 @@ class Admin::ContentController < Admin::BaseController
   end
 
   def update_params
-    params.
-      require(:article).
-      permit(:allow_comments,
-             :allow_pings,
-             :body,
-             :body_and_extended,
-             :draft,
-             :extended,
-             :password,
-             :permalink,
-             :published_at,
-             :text_filter_name,
-             :title,
-             :keywords)
+    params
+      .require(:article)
+      .permit(:allow_comments,
+              :allow_pings,
+              :body,
+              :body_and_extended,
+              :draft,
+              :extended,
+              :password,
+              :permalink,
+              :published_at,
+              :text_filter_name,
+              :title,
+              :keywords)
   end
 
   def default_text_filter
-    current_user.text_filter || this_blog.text_filter
+    current_user.text_filter_name || this_blog.text_filter
   end
 end

data/app/controllers/admin/dashboard_controller.rb

@@ -18,15 +18,15 @@ class Admin::DashboardController < Admin::BaseController
     @statsdrafts = Article.drafts.where("created_at > ?", today).count
     @statspages = Page.where("published_at > ?", today).count
     @statuses = Note.where("published_at > ?", today).count
-    @statuserposts = Article.published.where("published_at > ?", today).
-      where(user_id: current_user.id).count
+    @statuserposts = Article.published.where("published_at > ?", today)
+      .where(user_id: current_user.id).count
     @statcomments = Comment.where("created_at > ?", today).count
     @presumedspam = Comment.presumed_spam.where("created_at > ?", today).count
     @confirmed = Comment.ham.where("created_at > ?", today).count
     @unconfirmed = Comment.unconfirmed.where("created_at > ?", today).count
 
     @comments = Comment.last_published
-    @drafts = Article.drafts.where("user_id = ?", current_user.id).limit(5)
+    @drafts = Article.drafts.where(user_id: current_user.id).limit(5)
 
     @statspam = Comment.spam.count
   end

data/app/controllers/admin/feedback_controller.rb

@@ -16,20 +16,13 @@ class Admin::FeedbackController < Admin::BaseController
     @feedback = scoped_feedback.paginated(params[:page], this_blog.admin_display_elements)
   end
 
-  def destroy
-    @record = Feedback.find params[:id]
-
-    unless @record.article.user_id == current_user.id
-      return redirect_to admin_feedback_index_url unless current_user.admin?
-    end
-
-    begin
-      @record.destroy
-      flash[:success] = I18n.t("admin.feedback.destroy.success")
-    rescue ActiveRecord::RecordNotFound
-      flash[:error] = I18n.t("admin.feedback.destroy.error")
+  def edit
+    @comment = Comment.find(params[:id])
+    @article = @comment.article
+    unless @article.access_by? current_user
+      redirect_to admin_feedback_index_url
+      nil
     end
-    redirect_to action: "article", id: @record.article.id
   end
 
   def create
@@ -47,15 +40,6 @@ class Admin::FeedbackController < Admin::BaseController
     redirect_to action: "article", id: @article.id
   end
 
-  def edit
-    @comment = Comment.find(params[:id])
-    @article = @comment.article
-    unless @article.access_by? current_user
-      redirect_to admin_feedback_index_url
-      nil
-    end
-  end
-
   def update
     comment = Comment.find(params[:id])
     unless comment.article.access_by? current_user
@@ -71,6 +55,22 @@ class Admin::FeedbackController < Admin::BaseController
     end
   end
 
+  def destroy
+    @record = Feedback.find params[:id]
+
+    unless @record.article.user_id == current_user.id
+      return redirect_to admin_feedback_index_url unless current_user.admin?
+    end
+
+    begin
+      @record.destroy
+      flash[:success] = I18n.t("admin.feedback.destroy.success")
+    rescue ActiveRecord::RecordNotFound
+      flash[:error] = I18n.t("admin.feedback.destroy.error")
+    end
+    redirect_to action: "article", id: @record.article.id
+  end
+
   def article
     @article = this_blog.articles.find(params[:id])
     @feedback = @article.comments
@@ -125,7 +125,7 @@ class Admin::FeedbackController < Admin::BaseController
                                count: ids.size)
     when "Delete all spam"
       if request.post?
-        Feedback.where("state = ?", "spam").delete_all
+        Feedback.where(state: "spam").delete_all
         flash[:success] = I18n.t("admin.feedback.bulkops.success_deleted_spam")
       end
     else

data/app/controllers/admin/pages_controller.rb

@@ -8,8 +8,8 @@ class Admin::PagesController < Admin::BaseController
 
   def index
     @search = params[:search] || {}
-    @pages = Page.search_with(@search).page(params[:page]).
-      per(this_blog.admin_display_elements)
+    @pages = Page.search_with(@search).page(params[:page])
+      .per(this_blog.admin_display_elements)
   end
 
   def new

data/app/controllers/admin/post_types_controller.rb

@@ -16,7 +16,9 @@ class Admin::PostTypesController < Admin::BaseController
     @post_type = PostType.new(post_type_params)
 
     if @post_type.save
-      redirect_to admin_post_types_url, notice: "Post type was successfully created."
+      flash[:notice] = I18n.t("admin.base.successfully_created",
+                              name: PostType.model_name.human)
+      redirect_to admin_post_types_url
     else
       render :index
     end
@@ -24,7 +26,9 @@ class Admin::PostTypesController < Admin::BaseController
 
   def update
     if @post_type.update(post_type_params)
-      redirect_to admin_post_types_url, notice: "Post type was successfully updated."
+      flash[:notice] = I18n.t("admin.base.successfully_updated",
+                              name: PostType.model_name.human)
+      redirect_to admin_post_types_url
     else
       render :edit
     end
@@ -34,13 +38,15 @@ class Admin::PostTypesController < Admin::BaseController
     # Reset all Articles from the PostType we're destroying to the default PostType
     # Wrap it in a transaction for safety
     @post_type.transaction do
-      Article.where("post_type = ?", @post_type.permalink).each do |article|
+      Article.where(post_type: @post_type.permalink).each do |article|
         article.post_type = "read"
         article.save
       end
       @post_type.destroy
     end
-    redirect_to admin_post_types_url, notice: "Post was successfully destroyed."
+    flash[:notice] = I18n.t("admin.base.successfully_deleted",
+                            name: PostType.model_name.human)
+    redirect_to admin_post_types_url
   end
 
   private

data/app/controllers/admin/redirects_controller.rb

@@ -4,21 +4,23 @@ 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]).
-      per(this_blog.admin_display_elements)
+    @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]).
-      per(this_blog.admin_display_elements)
+    @redirects = Redirect.where(content_id: nil).order("id desc").page(params[:page])
+      .per(this_blog.admin_display_elements)
   end
 
   def create
     @redirect = this_blog.redirects.build(redirect_params)
 
     if @redirect.save
-      redirect_to admin_redirects_url, notice: "Redirect was successfully created."
+      flash[:notice] = I18n.t("admin.base.successfully_created",
+                              name: Redirect.model_name.human)
+      redirect_to admin_redirects_url
     else
       render :index
     end
@@ -26,7 +28,9 @@ class Admin::RedirectsController < Admin::BaseController
 
   def update
     if @redirect.update(redirect_params)
-      redirect_to admin_redirects_url, notice: "Redirect was successfully updated."
+      flash[:notice] = I18n.t("admin.base.successfully_updated",
+                              name: Redirect.model_name.human)
+      redirect_to admin_redirects_url
     else
       render :edit
     end

data/app/controllers/admin/resources_controller.rb

@@ -18,8 +18,8 @@ class Admin::ResourcesController < Admin::BaseController
 
   def index
     @r = Resource.new
-    @resources = Resource.order("created_at DESC").page(params[:page]).
-      per(this_blog.admin_display_elements)
+    @resources = Resource.order("created_at DESC").page(params[:page])
+      .per(this_blog.admin_display_elements)
   end
 
   def destroy

data/app/controllers/admin/sidebar_controller.rb

@@ -45,8 +45,8 @@ class Admin::SidebarController < Admin::BaseController
         # IT'S OVER NINE THOUSAND! considering we'll never reach 9K Sidebar
         # instances or Sidebar specializations
         sidebar = if sidebar_id >= 9000
-                    SidebarRegistry.available_sidebars[sidebar_id - 9000].
-                      new(blog: this_blog)
+                    SidebarRegistry.available_sidebars[sidebar_id - 9000]
+                      .new(blog: this_blog)
                   else
                     Sidebar.valid.find(sidebar_id)
                   end

data/app/controllers/admin/tags_controller.rb

@@ -14,7 +14,9 @@ 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."
+      flash[:notice] = I18n.t("admin.base.successfully_created",
+                              name: PostType.model_name.human)
+      redirect_to admin_tags_url
     else
       fetch_tags
       render :index
@@ -49,7 +51,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

@@ -9,8 +9,7 @@ class Admin::ThemesController < Admin::BaseController
     @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.none.filter_text(theme.description)
     end
     @active = this_blog.current_theme
   end

data/app/controllers/admin/users_controller.rb

@@ -4,8 +4,8 @@ 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
@@ -29,7 +29,9 @@ class Admin::UsersController < Admin::BaseController
 
   def update
     if @user.update(update_params)
-      redirect_to admin_users_url, notice: "User was successfully updated."
+      flash[:notice] = I18n.t("admin.base.successfully_updated",
+                              name: User.model_name.human)
+      redirect_to admin_users_url
     else
       render :edit
     end

data/app/controllers/articles_controller.rb

@@ -7,7 +7,7 @@ class ArticlesController < ContentController
 
   layout :theme_layout, except: [:trackback]
 
-  helper :'admin/base'
+  helper :"admin/base"
 
   def index
     wanted_types = this_blog.statuses_in_timeline ? ["Article", "Note"] : ["Article"]
@@ -18,8 +18,8 @@ class ArticlesController < ContentController
                     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)
+    @articles = articles_base.includes(:user, :resources, :tags)
+      .where(type: wanted_types).page(params[:page]).per(limit)
 
     respond_to do |format|
       format.html do
@@ -167,8 +167,8 @@ class ArticlesController < ContentController
         @comment = Comment.new
         @page_title = this_blog.article_title_template.to_title(@article, this_blog, params)
         if @article.password.blank?
-          @description = this_blog.article_desc_template.
-            to_title(@article, this_blog, params)
+          @description = this_blog.article_desc_template
+            .to_title(@article, this_blog, params)
         end
 
         @keywords = @article.tags.map(&:name).join(", ")

data/app/controllers/authors_controller.rb

@@ -7,8 +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)

data/app/controllers/base_controller.rb

@@ -13,9 +13,6 @@ 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|
-      append_view_path file
-    end
   end
 
   def fire_triggers

data/app/controllers/feedback_controller.rb

@@ -2,9 +2,9 @@
 
 class FeedbackController < BaseController
   def index
-    @feedback = Feedback.ham.
-      newest_first.
-      limit(this_blog.per_page(params[:format]))
+    @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" }

data/app/controllers/tags_controller.rb

@@ -14,9 +14,9 @@ class TagsController < ContentController
   def show
     @tag = Tag.find_by!(name: params[:id])
 
-    @articles = @tag.
-      contents.includes(:blog, :user, :tags, :resources).
-      published.page(params[:page]).per(10)
+    @articles = @tag
+      .contents.includes(:blog, :user, :tags, :resources)
+      .published.page(params[:page]).per(10)
 
     respond_to do |format|
       format.html do

data/app/helpers/authors_helper.rb

@@ -25,6 +25,6 @@ module AuthorsHelper
   end
 
   def author_link(article)
-    h(article.author_name)
+    ERB::Util.html_escape(article.author_name)
   end
 end

data/app/helpers/base_helper.rb

@@ -41,8 +41,8 @@ module BaseHelper
     controller.send(:render_to_string, *args, &block)
   end
 
-  def link_to_permalink(item, title, anchor = nil, style = nil, nofollow = nil,
-                        only_path = false)
+  def link_to_permalink(item, title,
+                        anchor: nil, style: nil, nofollow: nil, only_path: false)
     options = {}
     options[:class] = style if style
     options[:rel] = "nofollow" if nofollow
@@ -66,7 +66,7 @@ module BaseHelper
   end
 
   def meta_tag(name, value)
-    tag :meta, name: name, content: value if value.present?
+    tag.meta(name: name, content: value) if value.present?
   end
 
   def markup_help_popup(markup, text)
@@ -226,8 +226,8 @@ module BaseHelper
   #   show the excerpt, or else we show the body
   def fetch_html_content_for_feeds(item, this_blog)
     if item.password_protected?
-      "<p>This article is password protected. Please " \
-        "<a href='#{item.permalink_url}'>fill in your password</a> to read it</p>"
+      "<p>This article is password protected. Please" \
+        " <a href='#{item.permalink_url}'>fill in your password</a> to read it</p>"
     elsif this_blog.hide_extended_on_rss
       if item.excerpt? && !item.excerpt.empty?
         item.excerpt
@@ -248,7 +248,7 @@ module BaseHelper
       followify_scrubber = Loofah::Scrubber.new do |node|
         node.set_attribute "rel", "nofollow" if node.name == "a"
       end
-      sanitize h(string), scrubber: followify_scrubber
+      sanitize string, scrubber: followify_scrubber
     end
   end
 

data/app/models/ability.rb

@@ -34,7 +34,7 @@ class Ability
   end
 
   def add_publisher_abilities
-    can :manage, "admin/content"
+    can :manage, "admin/articles"
     can :manage, "admin/feedback"
     can :manage, "admin/notes"
     can :manage, "admin/pages"