publify_core 9.0.0.pre6 → 9.2.1

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 unless item.present?
+    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
 
@@ -16,24 +19,12 @@ module AuthorsHelper
   end
 
   def author_description(user)
-    return unless user.description.present?
+    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

data/app/helpers/base_helper.rb

@@ -1,6 +1,7 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 # Methods added to this helper will be available to all templates in the application.
-require 'digest/sha1'
+require "digest/sha1"
 
 module BaseHelper
   include BlogHelper
@@ -8,8 +9,8 @@ module BaseHelper
   # Need to rewrite this one, quick hack to test my changes.
   attr_reader :page_title
 
-  def render_sidebars(*sidebars)
-    rendered_sidebars = (sidebars.blank? ? Sidebar.order(:active_position) : sidebars).map do |sb|
+  def render_sidebars
+    rendered_sidebars = Sidebar.order(:active_position).map do |sb|
       @sidebar = sb
       sb.parse_request(content_array, params)
       render_sidebar(sb)
@@ -18,11 +19,12 @@ module BaseHelper
   rescue => e
     logger.error e
     logger.error e.backtrace.join("\n")
-    I18n.t('errors.render_sidebar')
+    I18n.t("errors.render_sidebar")
   end
 
   def render_sidebar(sidebar)
-    render_to_string(partial: sidebar.content_partial, locals: sidebar.to_locals_hash, layout: false)
+    render_to_string(partial: sidebar.content_partial, locals: sidebar.to_locals_hash,
+                     layout: false)
   end
 
   def themeable_stylesheet_link_tag(name)
@@ -30,45 +32,60 @@ module BaseHelper
     stylesheet_link_tag "/stylesheets/theme/#{name}.css" if File.exist? src
   end
 
+  def themeable_javascript_include_tag(name)
+    src = this_blog.current_theme.path + "/javascripts/#{name}.js"
+    javascript_include_tag "/javascripts/theme/#{name}.js" if File.exist? src
+  end
+
   def render_to_string(*args, &block)
     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
-    link_to title, item.permalink_url(anchor, only_path), options
+    options[:rel] = "nofollow" if nofollow
+    url = item.permalink_url(anchor, only_path)
+    if url
+      link_to title, url, options
+    else
+      title
+    end
   end
 
   def avatar_tag(options = {})
     begin
       avatar_class = this_blog.plugin_avatar.constantize
     rescue NameError
-      return ''
+      return ""
     end
-    return '' unless avatar_class.respond_to?(:get_avatar)
+    return "" unless avatar_class.respond_to?(:get_avatar)
+
     avatar_class.get_avatar(options)
   end
 
   def meta_tag(name, value)
-    tag :meta, name: name, content: value unless value.blank?
+    tag :meta, name: name, content: value if value.present?
   end
 
   def markup_help_popup(markup, text)
     if markup && markup.commenthelp.size > 1
-      link_to text, url_for(controller: 'articles', action: 'markup_help', id: markup.id), onclick: "return popup(this, 'Publify Markup Help')"
+      link_to(text,
+              url_for(controller: "articles", action: "markup_help", id: markup.name),
+              onclick: "return popup(this, 'Publify Markup Help')")
     else
-      ''
+      ""
     end
   end
 
   def onhover_show_admin_tools(type, id = nil)
-    admin_id = "#admin_#{[type, id].compact.join('_')}"
+    admin_id = "#admin_#{[type, id].compact.join("_")}"
     tag = []
-    tag << %{ onmouseover="if (getCookie('publify_user_profile') == 'admin') { $('#{admin_id}').show(); }" }
+    tag << %{ onmouseover="if (getCookie('publify_user_profile') == 'admin')\
+             { $('#{admin_id}').show(); }" }
     tag << %{ onmouseout="$('#{admin_id}').hide();" }
-    safe_join(tag, ' ')
+    safe_join(tag, " ")
   end
 
   def feed_title
@@ -85,66 +102,55 @@ module BaseHelper
     content.html(what)
   end
 
-  def display_user_avatar(user, size = 'avatar', klass = 'alignleft')
+  def display_user_avatar(user, size = "avatar", klass = "alignleft")
     if user.resource.present?
       avatar_path = case size
-                    when 'thumb'
+                    when "thumb"
                       user.resource.upload.thumb.url
-                    when 'medium'
+                    when "medium"
                       user.resource.upload.medium.url
-                    when 'large'
+                    when "large"
                       user.resource.upload.large.url
                     else
                       user.resource.upload.avatar.url
                     end
       return if avatar_path.nil?
-      avatar_url = File.join(this_blog.base_url, avatar_path)
+
+      avatar_url = this_blog.file_url(avatar_path)
     elsif user.twitter_profile_image.present?
       avatar_url = user.twitter_profile_image
     end
     return unless avatar_url
+
     image_tag(avatar_url, alt: user.nickname, class: klass)
   end
 
   def author_picture(status)
     return if status.user.twitter_profile_image.blank?
 
-    image_tag(status.user.twitter_profile_image, class: 'alignleft', alt: status.user.nickname)
-  end
-
-  def google_analytics
-    unless this_blog.google_analytics.empty?
-      <<-HTML
-      <script type="text/javascript">
-      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-      var pageTracker = _gat._getTracker("#{this_blog.google_analytics}");
-      pageTracker._trackPageview();
-      </script>
-      HTML
-    end
+    image_tag(status.user.twitter_profile_image, class: "alignleft",
+                                                 alt: status.user.nickname)
   end
 
   def page_header_includes
     content_array.map(&:whiteboard).map do |w|
-      w.select { |k, _v| k =~ /^page_header_/ }.map do |_, v|
+      w.select { |k, _v| k.start_with?("page_header_") }.map do |_, v|
         v = v.chomp
         # trim the same number of spaces from the beginning of each line
         # this way plugins can indent nicely without making ugly source output
-        spaces = /\A[ \t]*/.match(v)[0].gsub(/\t/, '  ')
-        v.gsub!(/^#{spaces}/, '  ') # add 2 spaces to line up with the assumed position of the surrounding tags
+        spaces = /\A[ \t]*/.match(v)[0].gsub(/\t/, "  ")
+        # add 2 spaces to line up with the assumed position of the surrounding tags
+        v.gsub!(/^#{spaces}/, "  ")
       end
     end.flatten.uniq.join("\n")
   end
 
   def feed_atom
-    feed_for('atom')
+    feed_for("atom")
   end
 
   def feed_rss
-    feed_for('rss')
+    feed_for("rss")
   end
 
   def content_array
@@ -168,40 +174,44 @@ module BaseHelper
   end
 
   def display_date_and_time(timestamp)
-    if this_blog.date_format == 'setting_date_format_distance_of_time_in_words'
+    return if timestamp.blank?
+
+    if this_blog.date_format == "setting_date_format_distance_of_time_in_words"
       timeago_tag timestamp, date_only: false
     else
-      "#{display_date(timestamp)} #{t('helper.at')} #{display_time(timestamp)}"
+      "#{display_date(timestamp)} #{t("helper.at")} #{display_time(timestamp)}"
     end
   end
 
   def show_meta_keyword
     return unless this_blog.use_meta_keyword
-    meta_tag 'keywords', @keywords unless @keywords.blank?
+
+    meta_tag "keywords", @keywords if @keywords.present?
   end
 
   def stop_index_robots?(blog)
     stop = (params[:year].present? || params[:page].present?)
-    stop = blog.unindex_tags if controller_name == 'tags'
-    stop = blog.unindex_categories if controller_name == 'categories'
+    stop = blog.unindex_tags if controller_name == "tags"
+    stop = blog.unindex_categories if controller_name == "categories"
     stop
   end
 
   def get_reply_context_url(reply)
-    link_to(reply['user']['name'], reply['user']['entities']['url']['urls'][0]['expanded_url'])
+    link_to(reply["user"]["name"],
+            reply["user"]["entities"]["url"]["urls"][0]["expanded_url"])
   rescue
-    link_to(reply['user']['name'], "https://twitter.com/#{reply['user']['name']}")
+    link_to(reply["user"]["name"], "https://twitter.com/#{reply["user"]["name"]}")
   end
 
   def get_reply_context_twitter_link(reply)
-    link_to(display_date_and_time(reply['created_at'].to_time.in_time_zone),
-            "https://twitter.com/#{reply['user']['screen_name']}/status/#{reply['id_str']}")
+    link_to(display_date_and_time(reply["created_at"].to_time.in_time_zone),
+            "https://twitter.com/#{reply["user"]["screen_name"]}/status/#{reply["id_str"]}")
   end
 
   private
 
   def feed_for(type)
-    if params[:action] == 'search'
+    if params[:action] == "search"
       url_for(only_path: false, format: type, q: params[:q])
     elsif !@article.nil?
       @article.feed_url(type)
@@ -216,7 +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
@@ -240,7 +251,7 @@ module BaseHelper
     if this_blog.dofollowify
       link_to(text, url)
     else
-      link_to(text, url, rel: 'nofollow')
+      link_to(text, url, rel: "nofollow")
     end
   end
 end