publify_core 9.0.0 → 9.2.2

data/app/helpers/base_helper.rb

@@ -1,7 +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
@@ -9,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)
@@ -19,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)
@@ -31,14 +32,20 @@ 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
+    options[:rel] = "nofollow" if nofollow
     url = item.permalink_url(anchor, only_path)
     if url
       link_to title, url, options
@@ -51,9 +58,10 @@ module BaseHelper
     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
 
@@ -63,18 +71,21 @@ module BaseHelper
 
   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
@@ -91,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 = 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
@@ -175,40 +175,43 @@ module BaseHelper
 
   def display_date_and_time(timestamp)
     return if timestamp.blank?
-    if this_blog.date_format == 'setting_date_format_distance_of_time_in_words'
+
+    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 if @keywords.present?
+
+    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)
@@ -223,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
@@ -247,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

data/app/helpers/blog_helper.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module BlogHelper
   # The base URL for this request, calculated by looking up the URL for the main
   # blog index page.
   def blog_base_url
-    url_for(controller: '/articles', action: 'index').gsub(%r{/$}, '')
+    url_for(controller: "/articles", action: "index").gsub(%r{/$}, "")
   end
 
   # Find the blog whose base_url matches the current location.
   def this_blog
-    @blog ||= Blog.find_blog(blog_base_url)
+    @this_blog ||= Blog.find_blog(blog_base_url)
   end
 end

data/app/helpers/xml_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module XmlHelper
   def collection_lastmod(collection)
     article_updated = collection.contents.order(updated_at: :desc).first
@@ -8,7 +10,7 @@ module XmlHelper
     times.push article_published.updated_at if article_published
 
     if times.empty?
-      Time.at(0).xmlschema
+      Time.zone.at(0).xmlschema
     else
       times.max.xmlschema
     end

data/app/jobs/application_job.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class ApplicationJob < ActiveJob::Base
 end

data/app/mailers/notification_mailer.rb

@@ -1,4 +1,6 @@
-class NotificationMailer < ActionMailer::Base
+# frozen_string_literal: true
+
+class NotificationMailer < ApplicationMailer
   helper :base
   layout nil
 
@@ -20,7 +22,7 @@ class NotificationMailer < ActionMailer::Base
     @user = user
     # TODO: Make user blog-dependent
     @blog = Blog.first
-    build_mail @blog, @user, 'Welcome to Publify'
+    build_mail @blog, @user, "Welcome to Publify"
   end
 
   private
@@ -30,7 +32,7 @@ class NotificationMailer < ActionMailer::Base
   end
 
   def build_mail(blog, user, subject)
-    headers['X-Mailer'] = "Publify #{PublifyCore::VERSION}"
+    headers["X-Mailer"] = "Publify #{PublifyCore::VERSION}"
     mail(from: blog.email_from,
          to: user.email,
          subject: make_subject(blog, subject))

data/app/models/ability.rb

@@ -1,4 +1,6 @@
-require 'cancancan'
+# frozen_string_literal: true
+
+require "cancancan"
 
 class Ability
   include CanCan::Ability
@@ -7,14 +9,14 @@ class Ability
     return unless user
 
     case user.profile
-    when 'admin'
+    when "admin"
       add_admin_abilities
       add_publisher_abilities
       add_contributor_abilities
-    when 'publisher'
+    when "publisher"
       add_publisher_abilities
       add_contributor_abilities
-    when 'contributor'
+    when "contributor"
       add_contributor_abilities
     end
   end
@@ -22,30 +24,30 @@ class Ability
   private
 
   def add_admin_abilities
-    can :manage, 'admin/migrations'
-    can :manage, 'admin/seo'
-    can :manage, 'admin/settings'
-    can :manage, 'admin/sidebar'
-    can :manage, 'admin/textfilters'
-    can :manage, 'admin/themes'
-    can :manage, 'admin/users'
+    can :manage, "admin/migrations"
+    can :manage, "admin/seo"
+    can :manage, "admin/settings"
+    can :manage, "admin/sidebar"
+    can :manage, "admin/textfilters"
+    can :manage, "admin/themes"
+    can :manage, "admin/users"
   end
 
   def add_publisher_abilities
-    can :manage, 'admin/content'
-    can :manage, 'admin/feedback'
-    can :manage, 'admin/notes'
-    can :manage, 'admin/pages'
-    can :manage, 'admin/post_types'
-    can :manage, 'admin/redirects'
-    can :manage, 'admin/resources'
-    can :manage, 'admin/tags'
-
-    can :manage, 'articles'
+    can :manage, "admin/content"
+    can :manage, "admin/feedback"
+    can :manage, "admin/notes"
+    can :manage, "admin/pages"
+    can :manage, "admin/post_types"
+    can :manage, "admin/redirects"
+    can :manage, "admin/resources"
+    can :manage, "admin/tags"
+
+    can :manage, "articles"
   end
 
   def add_contributor_abilities
-    can :manage, 'admin/dashboard'
-    can :manage, 'admin/profiles'
+    can :manage, "admin/dashboard"
+    can :manage, "admin/profiles"
   end
 end

data/app/models/archives_sidebar.rb

@@ -1,17 +1,20 @@
+# frozen_string_literal: true
+
 class ArchivesSidebar < Sidebar
-  description 'Displays links to monthly archives'
-  setting :title, 'Archives'
-  setting :show_count, true, label: 'Show article counts', input_type: :checkbox
-  setting :count, 10, label: 'Number of Months'
+  description "Displays links to monthly archives"
+  setting :title, "Archives"
+  setting :show_count, true, label: "Show article counts", input_type: :checkbox
+  setting :count, 10, label: "Number of Months"
 
   attr_accessor :archives
 
   def self.date_funcs
-    @date_func ||=
-      if Content.connection.class.name =~ /SQLite3Adapter/
+    @date_funcs ||=
+      if /SQLite3Adapter/.match?(Content.connection.class.name)
         ["strftime('%Y', published_at) as year", "strftime('%m', published_at) as month"]
       else
-        ['extract(year from published_at) as year', 'extract(month from published_at) as month']
+        ["extract(year from published_at) as year",
+         "extract(month from published_at) as month"]
       end
   end
 
@@ -23,17 +26,17 @@ class ArchivesSidebar < Sidebar
     # DB-specific code.
     date_funcs = self.class.date_funcs
 
-    article_counts = Article.published.select('count(*) as count', *date_funcs).
-      group(:year, :month).reorder('year desc', 'month desc').limit(count.to_i)
+    article_counts = Article.published.select("count(*) as count", *date_funcs).
+      group(:year, :month).reorder("year desc", "month desc").limit(count.to_i)
 
     @archives = article_counts.map do |entry|
       month = entry.month.to_i
       year = entry.year.to_i
       {
-        name: I18n.l(Date.new(year, month), format: '%B %Y'),
+        name: I18n.l(Date.new(year, month), format: "%B %Y"),
         month: month,
         year: year,
-        article_count: entry.count
+        article_count: entry.count,
       }
     end
   end

data/app/models/article.rb

@@ -1,8 +1,8 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-require 'aasm'
-require 'uri'
-require 'net/http'
+require "aasm"
+require "uri"
+require "net/http"
 
 class Article < Content
   include PublifyGuid
@@ -21,28 +21,26 @@ class Article < Content
   has_many :triggers, as: :pending_item
   has_many :comments, dependent: :destroy
 
-  before_create :create_guid
   before_save :set_permalink
+  before_create :create_guid
   after_save :keywords_to_tags, :shorten_url
 
   scope :child_of, ->(article_id) { where(parent_id: article_id) }
-  scope :published_since, ->(time) {
-    published.where('published_at > ?', time).order(default_order)
-  }
-  scope :withdrawn, -> { where(state: 'withdrawn').order(default_order) }
-  scope :pending, -> { where(state: 'publication_pending'). order(default_order) }
+  scope :published_since, ->(time) { published.where("published_at > ?", time) }
+  scope :withdrawn, -> { where(state: "withdrawn").order(default_order) }
+  scope :pending, -> { where(state: "publication_pending").order(default_order) }
 
   scope :bestof, lambda {
     joins(:feedback).
-      where('feedback.type' => 'Comment',
-            'contents.state' => 'published').
-      group('contents.id').
-      order('count(feedback.id) DESC').
-      select('contents.*, count(feedback.id) as comment_count').
+      where("feedback.type" => "Comment",
+            "contents.state" => "published").
+      group("contents.id").
+      select("contents.*, count(feedback.id) as comment_count").
+      order("comment_count DESC").
       limit(5)
   }
 
-  setting :password, :string, ''
+  setting :password, :string, ""
 
   attr_accessor :draft, :keywords
 
@@ -81,6 +79,7 @@ class Article < Content
 
   def set_permalink
     return if draft? || permalink.present?
+
     self.permalink = title.to_permalink
   end
 
@@ -90,7 +89,7 @@ class Article < Content
 
   def post_type
     post_type = self[:post_type]
-    post_type = 'read' if post_type.blank?
+    post_type = "read" if post_type.blank?
     post_type
   end
 
@@ -107,19 +106,21 @@ class Article < Content
       scoped = scoped.send(params[:state])
     end
 
-    scoped.order('created_at DESC')
+    scoped.order("created_at DESC")
   end
 
   # FIXME: Use keyword params to clean up call sites.
   def permalink_url(anchor = nil, only_path = false)
     return unless published?
+
     @cached_permalink_url ||= {}
-    @cached_permalink_url["#{anchor}#{only_path}"] ||= blog.url_for(permalink_url_options, anchor: anchor, only_path: only_path)
+    @cached_permalink_url["#{anchor}#{only_path}"] ||=
+      blog.url_for(permalink_url_options, anchor: anchor, only_path: only_path)
   end
 
   def save_attachments!(files)
     files ||= {}
-    files.values.each { |f| save_attachment!(f) }
+    files.each_value { |f| save_attachment!(f) }
   end
 
   def save_attachment!(file)
@@ -135,28 +136,30 @@ class Article < Content
   end
 
   def feed_url(format)
-    "#{permalink_url}.#{format.gsub(/\d/, '')}"
+    "#{permalink_url}.#{format.gsub(/\d/, "")}"
   end
 
   def next
-    Article.where('published_at > ?', published_at).order('published_at asc').limit(1).first
+    Article.where("published_at > ?", published_at).order("published_at asc").
+      limit(1).first
   end
 
   def previous
-    Article.where('published_at < ?', published_at).order('published_at desc').limit(1).first
+    Article.where("published_at < ?", published_at).order("published_at desc").
+      limit(1).first
   end
 
   def publication_month
-    published_at.strftime('%Y-%m')
+    published_at.strftime("%Y-%m")
   end
 
   def self.publication_months
-    result = select('published_at').where('published_at is not NULL').where(type: 'Article')
+    result = select("published_at").where("published_at is not NULL").where(type: "Article")
     result.map { |it| [it.publication_month] }.uniq
   end
 
-  # Finds one article which was posted on a certain date and matches the supplied dashed-title
-  # params is a Hash
+  # Finds one article which was posted on a certain date and matches the
+  # supplied dashed-title params is a Hash
   def self.requested_article(params)
     date_range = PublifyTime.delta(params[:year], params[:month], params[:day])
 
@@ -165,6 +168,7 @@ class Article < Content
     req_params[:published_at] = date_range if date_range
 
     return if req_params.empty? # no search if no params send
+
     article = published.find_by(req_params)
     return article if article
 
@@ -206,9 +210,7 @@ class Article < Content
   def html_urls
     urls = []
     html.gsub(/<a\s+[^>]*>/) do |tag|
-      if tag =~ /\bhref=(["']?)([^ >"]+)\1/
-        urls.push(Regexp.last_match[2].strip)
-      end
+      urls.push(Regexp.last_match[2].strip) if tag =~ /\bhref=(["']?)([^ >"]+)\1/
     end
     urls.uniq
   end
@@ -223,10 +225,6 @@ class Article < Content
       published_at.to_i > blog.sp_article_auto_close.days.ago.to_i
   end
 
-  def content_fields
-    [:body, :extended]
-  end
-
   # The web interface no longer distinguishes between separate "body" and
   # "extended" fields, and instead edits everything in a single edit field,
   # separating the extended content using "\<!--more-->".
@@ -234,7 +232,7 @@ class Article < Content
     if extended.blank?
       body
     else
-      body + "\n<!--more-->\n" + extended
+      "#{body}\n<!--more-->\n#{extended}"
     end
   end
 
@@ -243,7 +241,7 @@ class Article < Content
   def body_and_extended=(value)
     parts = value.split(/\n?<!--more-->\n?/, 2)
     self.body = parts[0]
-    self.extended = parts[1] || ''
+    self.extended = parts[1] || ""
   end
 
   def password_protected?
@@ -260,11 +258,13 @@ class Article < Content
 
   def allow_comments?
     return allow_comments unless allow_comments.nil?
+
     blog.default_allow_comments
   end
 
   def allow_pings?
     return allow_pings unless allow_pings.nil?
+
     blog.default_allow_pings
   end
 
@@ -284,11 +284,11 @@ class Article < Content
 
   def permalink_url_options
     format_url = blog.permalink_format.dup
-    format_url.gsub!('%year%', published_at.year.to_s)
-    format_url.gsub!('%month%', sprintf('%.2d', published_at.month))
-    format_url.gsub!('%day%', sprintf('%.2d', published_at.day))
-    format_url.gsub!('%title%', URI.encode(permalink.to_s))
-    if format_url[0, 1] == '/'
+    format_url.gsub!("%year%", published_at.year.to_s)
+    format_url.gsub!("%month%", sprintf("%<month>.2d", month: published_at.month))
+    format_url.gsub!("%day%", sprintf("%<day>.2d", day: published_at.day))
+    format_url.gsub!("%title%", URI::DEFAULT_PARSER.escape(permalink.to_s))
+    if format_url[0, 1] == "/"
       format_url[1..-1]
     else
       format_url
@@ -297,6 +297,6 @@ class Article < Content
 
   def trigger_publication
     # TODO: Skip if already published, update when published_at changes
-    Trigger.post_action(published_at, self, 'publish!')
+    Trigger.post_action(published_at, self, "publish!")
   end
 end