publify_core 9.0.0 → 9.2.2

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,18 +1,20 @@
+# frozen_string_literal: true
+
 class SetupController < BaseController
   before_action :check_config
-  layout 'accounts'
+  layout "accounts"
 
-  def index
-  end
+  def index; end
 
   def create
     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
@@ -35,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

data/app/controllers/tags_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TagsController < ContentController
   before_action :auto_discovery_feed, only: [:show, :index]
   layout :theme_layout
@@ -5,7 +7,7 @@ class TagsController < ContentController
   def index
     @tags = Tag.page(params[:page]).per(100)
     @page_title = controller_name.capitalize
-    @keywords = ''
+    @keywords = ""
     @description = "Tags for #{this_blog.blog_name}"
   end
 
@@ -13,7 +15,7 @@ class TagsController < ContentController
     @tag = Tag.find_by!(name: params[:id])
 
     @articles = @tag.
-      contents.includes(:blog, :user, :tags, :resources, :text_filter).
+      contents.includes(:blog, :user, :tags, :resources).
       published.page(params[:page]).per(10)
 
     respond_to do |format|
@@ -30,12 +32,12 @@ class TagsController < ContentController
 
       format.atom do
         @articles = @articles[0, this_blog.limit_rss_display]
-        render_cached_xml 'articles/index_atom_feed', @articles
+        render_cached_xml "articles/index_atom_feed", @articles
       end
 
       format.rss do
         @articles = @articles[0, this_blog.limit_rss_display]
-        render_cached_xml 'articles/index_rss_feed', @articles
+        render_cached_xml "articles/index_rss_feed", @articles
       end
     end
   end

data/app/controllers/text_controller.rb

@@ -1,8 +1,6 @@
-class TextController < BaseController
-  def humans
-    render plain: this_blog.humans
-  end
+# frozen_string_literal: true
 
+class TextController < BaseController
   def robots
     render plain: this_blog.robots
   end

data/app/controllers/textfilter_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # TODO: Remove
 class TextfilterController < BaseController
 end

data/app/controllers/theme_controller.rb

@@ -1,10 +1,15 @@
+# frozen_string_literal: true
+
 class ThemeController < ContentController
+  # Allow javascripts via Get request
+  skip_before_action :verify_authenticity_token, only: :javascripts
+
   def stylesheets
-    render_theme_item(:stylesheets, params[:filename], 'text/css; charset=utf-8')
+    render_theme_item(:stylesheets, params[:filename], "text/css; charset=utf-8")
   end
 
-  def javascript
-    render_theme_item(:javascript, params[:filename], 'text/javascript; charset=utf-8')
+  def javascripts
+    render_theme_item(:javascripts, params[:filename], "text/javascript; charset=utf-8")
   end
 
   def images
@@ -24,35 +29,35 @@ class ThemeController < ContentController
   private
 
   def render_theme_item(type, file, mime = nil)
-    return render_not_found if file.split(%r{[\\/]}).include?('..')
+    return render_not_found if file.split(%r{[\\/]}).include?("..")
 
     src = this_blog.current_theme.path + "/#{type}/#{file}"
     return render_not_found unless File.exist? src
 
     mime ||= mime_for(file)
-    send_file(src, type: mime, disposition: 'inline', stream: true)
+    send_file(src, type: mime, disposition: "inline", stream: true)
   end
 
   def render_not_found
-    render plain: 'Not Found', status: 404
+    render plain: "Not Found", status: :not_found
   end
 
   def mime_for(filename)
     case filename.downcase
     when /\.js$/
-      'text/javascript'
+      "text/javascript"
     when /\.css$/
-      'text/css'
+      "text/css"
     when /\.gif$/
-      'image/gif'
+      "image/gif"
     when /(\.jpg|\.jpeg)$/
-      'image/jpeg'
+      "image/jpeg"
     when /\.png$/
-      'image/png'
+      "image/png"
     when /\.swf$/
-      'application/x-shockwave-flash'
+      "application/x-shockwave-flash"
     else
-      'application/binary'
+      "application/binary"
     end
   end
 end

data/app/controllers/xml_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class XmlController < BaseController
   def sitemap
     @items = []

data/app/helpers/admin/base_helper.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 module Admin::BaseHelper
   include ActionView::Helpers::DateHelper
 
-  def toggle_element(element, label = t('generic.change'))
+  def toggle_element(element, label = t("generic.change"))
     link_to label, "##{element}", data: { toggle: :collapse }
   end
 
   def class_for_admin_state(sidebar, this_position)
     case sidebar.admin_state
     when :active
-      'active alert-info'
+      "active alert-info"
     when :will_change_position
       if this_position == sidebar.active_position
-        'will_change ghost'
+        "will_change ghost"
       else
-        'will_change alert-warning'
+        "will_change alert-warning"
       end
     else
       raise sidebar.admin_state.inspect
@@ -22,13 +24,7 @@ module Admin::BaseHelper
 
   def text_filter_options
     TextFilter.all.map do |filter|
-      [filter.description, filter]
-    end
-  end
-
-  def text_filter_options_with_id
-    TextFilter.all.map do |filter|
-      [filter.description, filter.id]
+      [filter.description, filter.name]
     end
   end
 
@@ -39,38 +35,41 @@ module Admin::BaseHelper
   end
 
   def show_actions(item)
-    content_tag(:div, class: 'action', style: '') do
+    tag.div(class: "action", style: "") do
       safe_join [button_to_edit(item),
                  button_to_delete(item),
-                 button_to_short_url(item)], ' '
+                 button_to_short_url(item)], " "
     end
   end
 
-  def display_pagination(collection, cols, _first = '', _last = '')
+  def display_pagination(collection, cols, _first = "", _last = "")
     return if collection.count == 0
-    content_tag(:tr) do
-      content_tag(:td, paginate(collection), class: 'paginate', colspan: cols)
+
+    tag.tr do
+      tag.td(paginate(collection), class: "paginate", colspan: cols)
     end
   end
 
   def button_to_edit(item)
-    link_to(content_tag(:span, '', class: 'glyphicon glyphicon-pencil'), { action: 'edit', id: item.id }, { class: 'btn btn-primary btn-xs btn-action' })
+    link_to(t("generic.edit"),
+            { action: "edit", id: item.id },
+            { class: "btn btn-primary btn-xs btn-action" })
   end
 
   def button_to_delete(item)
-    confirm_text = t('admin.shared.destroy.are_you_sure',
-                     element: item.class.name.downcase)
-    link_to(
-      content_tag(:span, '', class: 'glyphicon glyphicon-trash'),
-      { action: 'destroy', id: item.id },
-      { class: 'btn btn-danger btn-xs btn-action', method: :delete,
-        data: { confirm: confirm_text } }
-    )
+    confirm_text = t("admin.shared.destroy.are_you_sure",
+                     element: item.class.model_name.human.downcase)
+    link_to(t("generic.delete"),
+            { action: "destroy", id: item.id },
+            { class: "btn btn-danger btn-xs btn-action", method: :delete,
+              data: { confirm: confirm_text } })
   end
 
   def button_to_short_url(item)
-    return '' if item.short_url.nil?
-    link_to(content_tag(:span, '', class: 'glyphicon glyphicon-link'), item.short_url, class: 'btn btn-success btn-xs btn-action')
+    return "" if item.short_url.nil?
+
+    link_to(t("generic.short_url"), item.short_url,
+            class: "btn btn-success btn-xs btn-action")
   end
 
   def twitter_available?(blog, user)
@@ -79,9 +78,9 @@ module Admin::BaseHelper
 
   def menu_item(name, url)
     if current_page? url
-      content_tag(:li, link_to(name, '#'), class: 'active')
+      tag.li(link_to(name, "#"), class: "active")
     else
-      content_tag(:li, link_to(name, url))
+      tag.li(link_to(name, url))
     end
   end
 end

data/app/helpers/admin/feedback_helper.rb

@@ -1,42 +1,52 @@
+# frozen_string_literal: true
+
 module Admin::FeedbackHelper
   def comment_class(state)
-    return 'label-info' if state.to_s.casecmp('presumed_ham').zero?
-    return 'label-warning' if state.to_s.casecmp('presumed_spam').zero?
-    return 'label-success' if state.to_s.casecmp('ham').zero?
-    'label-danger'
+    return "label-info" if state.to_s.casecmp("presumed_ham").zero?
+    return "label-warning" if state.to_s.casecmp("presumed_spam").zero?
+    return "label-success" if state.to_s.casecmp("ham").zero?
+
+    "label-danger"
   end
 
-  def show_feedback_actions(item, context = 'listing')
-    return unless can? :manage, 'admin/feedback'
-    content_tag(:div, class: 'action', style: '') do
-      safe_join [
-        content_tag(:small, change_status(item, context)),
-        button_to_edit_comment(item),
-        button_to_delete_comment(item),
-        button_to_conversation(item)
-      ], ' '
-    end
+  def show_feedback_actions(item, context = "listing")
+    return unless can? :manage, "admin/feedback"
+
+    safe_join [
+      change_status(item, context),
+      button_to_edit_comment(item),
+      button_to_delete_comment(item),
+      button_to_conversation(item),
+    ], " "
   end
 
   def button_to_edit_comment(item)
-    link_to(content_tag(:span, '', class: 'glyphicon glyphicon-pencil'), { controller: 'admin/feedback', action: 'edit', id: item.id }, { class: 'btn btn-primary btn-xs btn-action' })
+    link_to(t("generic.edit"),
+            { controller: "admin/feedback", action: "edit", id: item.id },
+            { class: "btn btn-primary btn-xs btn-action" })
   end
 
   def button_to_delete_comment(item)
-    link_to(content_tag(:span, '', class: 'glyphicon glyphicon-trash'), { controller: 'admin/feedback', action: 'destroy', id: item.id }, { class: 'btn btn-danger btn-xs btn-action' })
+    link_to(t("generic.delete"),
+            { controller: "admin/feedback", action: "destroy", id: item.id },
+            { class: "btn btn-danger btn-xs btn-action" })
   end
 
   def button_to_conversation(item)
-    link_to(content_tag(:span, '', class: 'glyphicon glyphicon-share-alt'), { controller: 'admin/feedback', action: 'article', id: item.article_id }, { class: 'btn btn-default btn-xs btn-action' })
+    link_to(t("generic.conversation"),
+            { controller: "admin/feedback", action: "article", id: item.article_id },
+            { class: "btn btn-default btn-xs btn-action" })
   end
 
-  def change_status(item, context = 'listing')
-    spammy = item.state.to_s.downcase =~ /spam/
-    direction = spammy ? 'up' : 'down'
-    button_type = spammy ? 'success' : 'warning'
+  def change_status(item, context = "listing")
+    spammy = item.state.to_s.downcase.include? "spam"
+    link_text = spammy ? t("generic.mark_as_ham") : t("generic.mark_as_spam")
+    button_type = spammy ? "success" : "warning"
 
-    link_to(content_tag(:span, '', class: "glyphicon glyphicon-thumbs-#{direction}"),
-            { controller: 'admin/feedback', action: 'change_state', id: item.id, context: context },
-            { class: "btn btn-#{button_type} btn-xs btn-action", remote: true })
+    link_to(link_text,
+            { controller: "admin/feedback", action: "change_state",
+              id: item.id, context: context },
+            { class: "btn btn-#{button_type} btn-xs btn-action",
+              method: :post, remote: true })
   end
 end

data/app/helpers/articles_helper.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module ArticlesHelper
   def tag_links(article)
     tag_arr = article.tags.map do |tag|
-      link_to tag.display_name, tag.permalink_url(nil, true), rel: 'tag'
+      link_to tag.display_name, tag.permalink_url(nil, true), rel: "tag"
     end
-    safe_join(tag_arr.sort, ', ')
+    safe_join(tag_arr.sort, ", ")
   end
 end

data/app/helpers/authors_helper.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 module AuthorsHelper
   include BlogHelper
 
   def display_profile_item(item, item_desc)
     return if item.blank?
+
     item = link_to(item, item) if is_url?(item)
-    content_tag :li do
-      safe_join([item_desc, item], ' ')
+    tag.li do
+      safe_join([item_desc, item], " ")
     end
   end
 
@@ -18,22 +21,10 @@ module AuthorsHelper
   def author_description(user)
     return if user.description.blank?
 
-    content_tag(:div, user.description, id: 'author-description')
+    tag.div(user.description, id: "author-description")
   end
 
   def author_link(article)
-    return h(article.author) if just_author?(article.user)
-    return h(article.user.name) if just_name?(article.user)
-    content_tag(:a, href: "mailto:#{h article.user.email}") { h(article.user.name) }
-  end
-
-  private
-
-  def just_author?(author)
-    author.nil? || author.name.blank?
-  end
-
-  def just_name?(author)
-    author.present? && !this_blog.link_to_author
+    h(article.author_name)
   end
 end