publify_core 10.0.4 → 11.0.0

data/app/controllers/notes_controller.rb

@@ -3,8 +3,6 @@
 class NotesController < ContentController
   require "json"
 
-  layout :theme_layout
-
   after_action :set_blog_infos
 
   def index
@@ -19,10 +17,7 @@ class NotesController < ContentController
   def show
     @note = Note.published.find_by! permalink: CGI.escape(params[:permalink])
 
-    if @note.in_reply_to_message.present?
-      @reply = JSON.parse(@note.in_reply_to_message)
-      render :show_in_reply
-    end
+    @reply = JSON.parse(@note.in_reply_to_message) if @note.in_reply_to_message.present?
   end
 
   private

data/app/controllers/setup_controller.rb

@@ -25,7 +25,7 @@ class SetupController < BaseController
 
     sign_in @user
 
-    if User.count == 1
+    if User.one?
       create_first_post @user
       create_first_page @user
     end

data/app/controllers/tags_controller.rb

@@ -2,7 +2,6 @@
 
 class TagsController < ContentController
   before_action :auto_discovery_feed, only: [:show, :index]
-  layout :theme_layout
 
   def index
     @tags = Tag.page(params[:page]).per(100)

data/app/controllers/users/registrations_controller.rb

@@ -2,6 +2,7 @@
 
 class Users::RegistrationsController < Devise::RegistrationsController
   include BlogHelper
+
   before_action :require_signup_allowed
 
   private

data/app/helpers/admin/base_helper.rb

@@ -3,8 +3,8 @@
 module Admin::BaseHelper
   include ActionView::Helpers::DateHelper
 
-  def toggle_element(element, label = t("generic.change"))
-    link_to label, "##{element}", data: { toggle: :collapse }
+  def toggle_element(element, label = t("generic.change"), **)
+    link_to(label, "##{element}", data: { "bs-toggle": :collapse }, **)
   end
 
   def class_for_admin_state(sidebar, this_position)
@@ -35,15 +35,13 @@ module Admin::BaseHelper
   end
 
   def show_actions(item)
-    tag.div(class: "action", style: "") do
-      safe_join [button_to_edit(item),
-                 button_to_delete(item),
-                 button_to_short_url(item)], " "
-    end
+    safe_join [button_to_edit(item),
+               button_to_delete(item),
+               button_to_short_url(item)], " "
   end
 
   def display_pagination(collection, cols, _first = "", _last = "")
-    return if collection.count == 0
+    return if collection.none?
 
     tag.tr do
       tag.td(paginate(collection), class: "paginate", colspan: cols)
@@ -53,7 +51,7 @@ module Admin::BaseHelper
   def button_to_edit(item)
     link_to(t("generic.edit"),
             { action: "edit", id: item.id },
-            { class: "btn btn-primary btn-xs btn-action" })
+            { class: "btn btn-primary btn-sm" })
   end
 
   def button_to_delete(item)
@@ -61,7 +59,7 @@ module Admin::BaseHelper
                      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,
+            { class: "btn btn-danger btn-sm", method: :delete,
               data: { confirm: confirm_text } })
   end
 
@@ -69,18 +67,27 @@ module Admin::BaseHelper
     return "" if item.short_url.nil?
 
     link_to(t("generic.short_url"), item.short_url,
-            class: "btn btn-success btn-xs btn-action")
+            class: "btn btn-success btn-sm")
   end
 
   def twitter_available?(blog, user)
     blog.has_twitter_configured? && user.has_twitter_configured?
   end
 
+  def top_menu_item(name, url)
+    if current_page? url
+      tag.li(link_to(name, "#", class: "active nav-link", "aria-current": "page"),
+             class: "nav-item")
+    else
+      tag.li(link_to(name, url, class: "nav-link"), class: "nav-item")
+    end
+  end
+
   def menu_item(name, url)
     if current_page? url
-      tag.li(link_to(name, "#"), class: "active")
+      tag.li(link_to(name, "#", class: "active dropdown-item", "aria-current": "page"))
     else
-      tag.li(link_to(name, url))
+      tag.li(link_to(name, url, class: "dropdown-item"))
     end
   end
 end

data/app/helpers/admin/feedback_helper.rb

@@ -23,19 +23,19 @@ module Admin::FeedbackHelper
   def button_to_edit_comment(item)
     link_to(t("generic.edit"),
             { controller: "admin/feedback", action: "edit", id: item.id },
-            { class: "btn btn-primary btn-xs btn-action" })
+            { class: "btn btn-primary btn-sm" })
   end
 
   def button_to_delete_comment(item)
     link_to(t("generic.delete"),
             { controller: "admin/feedback", action: "destroy", id: item.id },
-            { class: "btn btn-danger btn-xs btn-action" })
+            { class: "btn btn-danger btn-sm" })
   end
 
   def button_to_conversation(item)
     link_to(t("generic.conversation"),
             { controller: "admin/feedback", action: "article", id: item.article_id },
-            { class: "btn btn-default btn-xs btn-action" })
+            { class: "btn btn-default btn-sm" })
   end
 
   def change_status(item, context = "listing")
@@ -46,7 +46,7 @@ module Admin::FeedbackHelper
     link_to(link_text,
             { controller: "admin/feedback", action: "change_state",
               id: item.id, context: context },
-            { class: "btn btn-#{button_type} btn-xs btn-action",
+            { class: "btn btn-#{button_type} btn-sm",
               method: :post, remote: true })
   end
 end

data/app/helpers/base_helper.rb

@@ -28,17 +28,21 @@ module BaseHelper
   end
 
   def themeable_stylesheet_link_tag(name)
-    src = this_blog.current_theme.path + "/stylesheets/#{name}.css"
-    stylesheet_link_tag "/stylesheets/theme/#{name}.css" if File.exist? src
+    theme = this_blog.current_theme
+    src = theme.path.join("stylesheets", theme.name, "#{name}.css")
+
+    stylesheet_link_tag "#{theme.name}/#{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
+    theme = this_blog.current_theme
+    src = theme.path.join("javascripts", theme.name, "#{name}.js")
+
+    javascript_include_tag "#{theme.name}/#{name}.js" if File.exist? src
   end
 
-  def render_to_string(*args, &block)
-    controller.send(:render_to_string, *args, &block)
+  def render_to_string(...)
+    controller.send(:render_to_string, ...)
   end
 
   def link_to_permalink(item, title,

data/app/helpers/xml_helper.rb

@@ -15,4 +15,8 @@ module XmlHelper
       times.max.xmlschema
     end
   end
+
+  def truncated_body(item)
+    truncate(strip_tags(item.html(:body)), length: 80, separator: " ", omissions: "...")
+  end
 end

data/app/models/article.rb

@@ -8,7 +8,7 @@ class Article < Content
   include PublifyGuid
   include ConfigManager
 
-  serialize :settings, Hash
+  serialize :settings, type: Hash, coder: YAML
 
   content_fields :body, :extended
 
@@ -36,7 +36,7 @@ class Article < Content
              "contents.state" => "published")
       .group("contents.id")
       .select("contents.*, count(feedback.id) as comment_count")
-      .order("comment_count DESC")
+      .order(comment_count: :desc)
       .limit(5)
   }
 
@@ -101,12 +101,12 @@ class Article < Content
 
   def self.search_with(params)
     params ||= {}
-    scoped = super(params)
+    scoped = super
     if %w(no_draft drafts published withdrawn pending).include?(params[:state])
       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.
@@ -140,12 +140,12 @@ class Article < Content
   end
 
   def next
-    Article.where("published_at > ?", published_at).order("published_at asc")
+    Article.where("published_at > ?", published_at).order(:published_at)
       .limit(1).first
   end
 
   def previous
-    Article.where("published_at < ?", published_at).order("published_at desc")
+    Article.where(published_at: ...published_at).order(published_at: :desc)
       .limit(1).first
   end
 
@@ -155,7 +155,7 @@ class Article < Content
 
   def self.publication_months
     result = select("published_at").where.not(published_at: nil).where(type: "Article")
-    result.map { |it| [it.publication_month] }.uniq
+    result.map { [_1.publication_month] }.uniq
   end
 
   # Finds one article which was posted on a certain date and matches the

data/app/models/blog.rb

@@ -24,15 +24,15 @@ class Blog < ApplicationRecord
   has_many :notes
 
   has_many :redirects
-  has_many :sidebars, ->() { order("active_position ASC") }
+  has_many :sidebars, ->() { order(:active_position) }
 
   attr_accessor :custom_permalink
 
-  default_scope -> { order("id") }
+  default_scope -> { order(:id) }
 
   validates :blog_name, presence: true
 
-  serialize :settings, Hash
+  serialize :settings, type: Hash, coder: YAML
 
   # Description
   setting :blog_name, :string, "My Shiny Weblog!"

data/app/models/comment.rb

@@ -16,7 +16,7 @@ class Comment < Feedback
   scope :ham, -> { where(state: "ham") }
   scope :unconfirmed, -> { where(state: %w(presumed_spam presumed_ham)) }
 
-  scope :last_published, -> { published.limit(5).order("created_at DESC") }
+  scope :last_published, -> { published.limit(5).order(created_at: :desc) }
 
   def notify_user_via_email(user)
     EmailNotify.send_comment(self, user) if user.notify_via_email?

data/app/models/config_manager.rb

@@ -69,9 +69,7 @@ module ConfigManager
     self.class.fields[key.to_s].canonicalize(value)
   end
 
-  def settings_keys
-    self.class.settings_keys
-  end
+  delegate :settings_keys, to: :class
 
   class Item
     VALID_TYPES = [:boolean, :integer, :string, :text].freeze

data/app/models/content.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require "uri"
 
 class Content < ApplicationRecord
@@ -22,8 +21,8 @@ class Content < ApplicationRecord
                          published.where(published_at: PublifyTime.delta(*time_params))
                        }
   scope :not_published, -> { where.not(state: "published") }
-  scope :drafts, -> { where(state: "draft").order("created_at DESC") }
-  scope :no_draft, -> { where.not(state: "draft").order("published_at DESC") }
+  scope :drafts, -> { where(state: "draft").order(created_at: :desc) }
+  scope :no_draft, -> { where.not(state: "draft").order(published_at: :desc) }
   scope :searchstring, lambda { |search_string|
     result = where(state: "published")
 
@@ -40,7 +39,7 @@ class Content < ApplicationRecord
                               where(published_at: PublifyTime.delta_like(date_at))
                             }
 
-  serialize :whiteboard
+  serialize :whiteboard, coder: YAML
 
   validates_default_string_length :title, :author, :permalink, :name,
                                   :post_type, :text_filter_name
@@ -120,6 +119,6 @@ class Content < ApplicationRecord
   end
 
   def short_url
-    redirect.from_url if redirect.present?
+    redirect&.from_url
   end
 end

data/app/models/content_base.rb

@@ -3,6 +3,7 @@
 module ContentBase
   def self.included(base)
     base.extend ClassMethods
+    base.include ActionView::Helpers::SanitizeHelper
   end
 
   attr_accessor :just_changed_published_status
@@ -33,7 +34,7 @@ module ContentBase
   # Generate HTML for a specific field using the text_filter in use for this
   # object.
   def generate_html(field, text = nil)
-    text ||= self[field].to_s
+    text ||= self[field] || ""
     html = (text_filter || default_text_filter).filter_text(text) || text
     html_postprocess(field, html).to_s
   end
@@ -49,13 +50,13 @@ module ContentBase
   end
 
   def excerpt_text(length = 160)
-    text = if respond_to?(:excerpt) && (excerpt || "") != ""
+    text = if respond_to?(:excerpt) && excerpt.present?
              generate_html(:excerpt, excerpt)
            else
              html(:all)
            end
 
-    text = text.strip_html
+    text = strip_tags(text)
 
     text.slice(0, length) +
       (text.length > length ? "..." : "")

data/app/models/feedback.rb

@@ -252,7 +252,7 @@ class Feedback < ApplicationRecord
   end
 
   def blog_id
-    article.blog_id if article.present?
+    article.blog_id
   end
 
   def plural_model_name

data/app/models/note.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
+require "twitter"
+require "json"
+require "uri"
+require "html_pipeline"
+require "html_pipeline/node_filter/mention_filter"
+
 class Note < Content
-  require "twitter"
-  require "json"
-  require "uri"
   include PublifyGuid
   include ConfigManager
 
-  serialize :settings, Hash
+  serialize :settings, type: Hash, coder: YAML
 
   setting :twitter_id, :string, ""
   setting :in_reply_to_status_id, :string, ""
@@ -21,15 +24,63 @@ class Note < Content
   after_create :set_permalink, :shorten_url
 
   scope :published, lambda {
-    where(state: "published").where("published_at <= ?", Time.zone.now).order(default_order)
+    where(state: "published").where(published_at: ..Time.zone.now).order(default_order)
   }
-  default_scope { order("published_at DESC") }
+  default_scope { order(published_at: :desc) }
 
   TWITTER_FTP_URL_LENGTH = 19
   TWITTER_HTTP_URL_LENGTH = 20
   TWITTER_HTTPS_URL_LENGTH = 21
   TWITTER_LINK_LENGTH = 22
 
+  class TwitterHashtagFilter < HTMLPipeline::NodeFilter
+    def after_initialize
+      context[:tag_url] ||= "https://twitter.com/search?q=%%23%<tag>s&src=tren&mode=realtime"
+    end
+
+    SELECTOR = Selma::Selector.new(match_text_within: "*",
+                                   ignore_text_within: ["a"])
+
+    def selector
+      SELECTOR
+    end
+
+    HASHTAG_PATTERN = /(?<=^|\W)#([-_A-Za-z0-9]+)(?=\W|$)/
+
+    def handle_text_chunk(chunk)
+      text = chunk.to_s
+
+      html = text.gsub(HASHTAG_PATTERN) do |match|
+        tag = Regexp.last_match(1)
+        url = format context[:tag_url], tag: tag
+        "<a href=\"#{url}\">#{match}</a>"
+      end
+
+      return chunk if html == text
+
+      chunk.replace(html, as: :html)
+    end
+  end
+
+  class TwitterMentionFilter < HTMLPipeline::NodeFilter::MentionFilter
+    def after_initialize
+      super
+      context[:base_url] ||= "https://twitter.com"
+      context[:info_url] ||= "https://foo.com"
+    end
+
+    # Override base link creator, removing the class
+    def link_to_mentioned_user(base_url, login)
+      result[:mentioned_usernames] |= [login]
+
+      url = base_url.dup
+      excluded_prefixes = %r{[/(?:~|@]\z}
+      url << "/" unless excluded_prefixes.match?(url)
+
+      "<a href=\"#{url << login}\">@#{login}</a>"
+    end
+  end
+
   def set_permalink
     self.permalink = "#{id}-#{body.to_permalink[0..79]}" if permalink.blank?
     save
@@ -43,8 +94,23 @@ class Note < Content
     []
   end
 
+  def generate_html(field, text = nil)
+    if field == :in_reply_to
+      helper = PublifyCore::ContentTextHelpers.new
+      html = helper.simple_format(text)
+      html_postprocess(field, html).to_s
+    else
+      super
+    end
+  end
+
   def html_postprocess(field, html)
-    super(field, PublifyCore::TextFilter::Twitterfilter.filtertext(html))
+    helper = PublifyCore::ContentTextHelpers.new
+    html = helper.auto_link(html)
+
+    html = TwitterHashtagFilter.call(html)
+    html = TwitterMentionFilter.call(html).to_s
+    super
   end
 
   def truncate(message, length)
@@ -56,7 +122,7 @@ class Note < Content
   end
 
   def twitter_message
-    base_message = body.strip_html
+    base_message = strip_tags(body)
     if too_long?("#{base_message} (#{short_link})")
       max_length = 140 - "... (#{redirect.from_url})".length - 1
       "#{truncate(base_message, max_length)}... (#{redirect.from_url})"

data/app/models/page.rb

@@ -6,7 +6,7 @@ class Page < Content
 
   include ConfigManager
 
-  serialize :settings, Hash
+  serialize :settings, type: Hash, coder: YAML
   setting :password, :string, ""
 
   before_save :set_permalink

data/app/models/redirect.rb

@@ -31,10 +31,6 @@ class Redirect < ApplicationRecord
     end
   end
 
-  def to_url
-    raise "Use #from_url"
-  end
-
   def from_url
     File.join(blog.shortener_url, from_path)
   end

data/app/models/resource.rb

@@ -5,6 +5,7 @@ require "carrierwave/orm/activerecord"
 
 class Resource < ApplicationRecord
   include StringLengthLimit
+
   belongs_to :blog
   belongs_to :content, optional: true
 

data/app/models/sidebar.rb

@@ -4,7 +4,7 @@ require "sidebar_field"
 
 # This class cannot be autoloaded since other sidebar classes depend on it.
 class Sidebar < ApplicationRecord
-  serialize :config, Hash
+  serialize :config, type: Hash, coder: YAML
 
   belongs_to :blog
 
@@ -32,7 +32,7 @@ class Sidebar < ApplicationRecord
   def self.setting(key, default = nil, options = {})
     key = key.to_s
 
-    return if instance_methods.include?(key)
+    return if method_defined?(key)
 
     fields << SidebarField.build(key, default, options)
 
@@ -97,9 +97,7 @@ class Sidebar < ApplicationRecord
 
   def parse_request(_contents, _params); end
 
-  def fields
-    self.class.fields
-  end
+  delegate :fields, to: :class
 
   def fieldmap(field = nil)
     if field
@@ -109,17 +107,11 @@ class Sidebar < ApplicationRecord
     end
   end
 
-  def description
-    self.class.description
-  end
+  delegate :description, to: :class
 
-  def short_name
-    self.class.short_name
-  end
+  delegate :short_name, to: :class
 
-  def display_name
-    self.class.display_name
-  end
+  delegate :display_name, to: :class
 
   def content_partial
     "/#{self.class.path_name}/content"

data/app/models/tag.rb

@@ -43,11 +43,11 @@ class Tag < ApplicationRecord
       .where(contents: { state: "published" })
       .select(*Tag.column_names, "COUNT(contents_tags.content_id) as content_counter")
       .group(*Tag.column_names)
-      .order("content_counter DESC").limit(1000)
+      .order(content_counter: :desc).limit(1000)
   end
 
   def self.find_with_char(char)
-    where("name LIKE ? ", "%#{char}%").order("name ASC")
+    where("name LIKE ? ", "%#{char}%").order(:name)
   end
 
   def self.collection_to_string(tags)

data/app/models/text_filter.rb

@@ -44,7 +44,7 @@ class TextFilter
       if f.help_text.blank?
         ""
       else
-        "<h3>#{f.display_name}</h3>\n#{CommonMarker.render_html(f.help_text, :DEFAULT)}"
+        "<h3>#{f.display_name}</h3>\n#{Commonmarker.to_html(f.help_text)}"
       end
     end
 
@@ -56,7 +56,7 @@ class TextFilter
       .expand_filter_list([markup, filters].flatten)
 
     help_filters.map do |f|
-      f.help_text.blank? ? "" : CommonMarker.render_html(f.help_text)
+      f.help_text.blank? ? "" : Commonmarker.to_html(f.help_text)
     end.join("\n")
   end
 

data/app/models/trigger.rb

@@ -11,7 +11,7 @@ class Trigger < ApplicationRecord
     end
 
     def fire
-      where("due_at <= ?", Time.zone.now).destroy_all
+      where(due_at: ..Time.zone.now).destroy_all
       true
     end