publify_core 9.2.10 → 10.0.0

data/app/models/archives_sidebar.rb

@@ -10,7 +10,7 @@ class ArchivesSidebar < Sidebar
 
   def self.date_funcs
     @date_funcs ||=
-      if /SQLite3Adapter/.match?(Content.connection.class.name)
+      if Content.connection.class.name.include?("SQLite3Adapter")
         ["strftime('%Y', published_at) as year", "strftime('%m', published_at) as month"]
       else
         ["extract(year from published_at) as year",
@@ -26,8 +26,8 @@ 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

data/app/models/article.rb

@@ -31,13 +31,13 @@ class Article < Content
   scope :pending, -> { where(state: "publication_pending").order(default_order) }
 
   scope :bestof, lambda {
-    joins(:feedback).
-      where("feedback.type" => "Comment",
-            "contents.state" => "published").
-      group("contents.id").
-      select("contents.*, count(feedback.id) as comment_count").
-      order("comment_count DESC").
-      limit(5)
+    joins(:feedback)
+      .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, ""
@@ -140,13 +140,13 @@ class Article < Content
   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
@@ -154,7 +154,7 @@ class Article < Content
   end
 
   def self.publication_months
-    result = select("published_at").where("published_at is not NULL").where(type: "Article")
+    result = select("published_at").where.not(published_at: nil).where(type: "Article")
     result.map { |it| [it.publication_month] }.uniq
   end
 
@@ -289,7 +289,7 @@ class Article < Content
     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]
+      format_url[1..]
     else
       format_url
     end

data/app/models/blog.rb

@@ -77,7 +77,7 @@ class Blog < ApplicationRecord
   setting :meta_keywords, :string, ""
   setting :google_analytics, :string, ""
   setting :rss_description, :boolean, false
-  setting :rss_description_text, :text, <<-HTML.strip_heredoc
+  setting :rss_description_text, :text, <<~HTML
     <hr />
     <p><small>Original article written by %author% and published on <a href='%blog_url%'>%blog_name%</a>
     | <a href='%permalink_url%'>direct link to this article</a>
@@ -86,7 +86,7 @@ class Blog < ApplicationRecord
   HTML
   setting :permalink_format, :string, "/%year%/%month%/%day%/%title%"
   setting :robots, :text, 'User-agent: *\nAllow: /\nDisallow: /admin\n'
-  setting :humans, :text, <<-TEXT.strip_heredoc
+  setting :humans, :text, <<~TEXT
     /* TEAM */
     Your title: Your name.
     Site: email, link to a contact form, etc.
@@ -191,10 +191,7 @@ class Blog < ApplicationRecord
                                              host: host_with_port,
                                              script_name: root_path)
         cache_key = merged_opts.values.prepend("blog-urlfor-withbaseurl").join("-")
-        unless Rails.cache.exist?(cache_key)
-          Rails.cache.write(cache_key, super(merged_opts))
-        end
-        Rails.cache.read(cache_key)
+        Rails.cache.fetch(cache_key) { super(merged_opts) }
       else
         raise "Invalid URL in url_for: #{options.inspect}"
       end

data/app/models/content.rb

@@ -10,15 +10,13 @@ class Content < ApplicationRecord
   belongs_to :user, optional: true, touch: true
   belongs_to :blog
 
-  validates :blog, presence: true
-
   has_one :redirect, dependent: :destroy, inverse_of: :content
 
   has_many :triggers, as: :pending_item, dependent: :delete_all
   has_many :resources, inverse_of: :content, dependent: :nullify
   has_and_belongs_to_many :tags
 
-  scope :user_id, ->(user_id) { where("user_id = ?", user_id) }
+  scope :user_id, ->(user_id) { where(user_id: user_id) }
   scope :published, -> { where(state: "published").order(default_order) }
   scope :published_at, lambda { |time_params|
                          published.where(published_at: PublifyTime.delta(*time_params))

data/app/models/content_base.rb

@@ -5,12 +5,6 @@ module ContentBase
     base.extend ClassMethods
   end
 
-  class ContentTextHelpers
-    include ActionView::Helpers::UrlHelper
-    include ActionView::Helpers::TextHelper
-    include ActionView::Helpers::SanitizeHelper
-  end
-
   attr_accessor :just_changed_published_status
   alias just_changed_published_status? just_changed_published_status
 
@@ -40,21 +34,16 @@ module ContentBase
   # object.
   def generate_html(field, text = nil)
     text ||= self[field].to_s
-    prehtml = html_preprocess(field, text).to_s
-    html = (text_filter || default_text_filter).filter_text(prehtml) || prehtml
+    html = (text_filter || default_text_filter).filter_text(text) || text
     html_postprocess(field, html).to_s
   end
 
   # Post-process the HTML
   def html_postprocess(_field, html)
-    helper = ContentTextHelpers.new
+    helper = PublifyCore::ContentTextHelpers.new
     helper.sanitize html
   end
 
-  def html_preprocess(_field, html)
-    html
-  end
-
   def html_map(field)
     content_fields.include? field
   end

data/app/models/feedback.rb

@@ -13,7 +13,6 @@ class Feedback < ApplicationRecord
   include StringLengthLimit
 
   validate :feedback_allowed, on: :create
-  validates :article, presence: true
 
   validates_default_string_length :title, :author, :email, :url, :blog_name,
                                   :user_agent, :text_filter_name
@@ -94,7 +93,7 @@ class Feedback < ApplicationRecord
   end
 
   def html_postprocess(_field, html)
-    helper = ContentTextHelpers.new
+    helper = PublifyCore::ContentTextHelpers.new
     helper.sanitize(helper.auto_link(html), tags: self.class.allowed_tags)
   end
 

data/app/models/meta_sidebar.rb

@@ -2,7 +2,7 @@
 
 class MetaSidebar < Sidebar
   description "This widget just displays links to Publify main site," \
-    " this blog's admin and RSS."
+              " this blog's admin and RSS."
 
   setting :title, "Meta"
 end

data/app/models/note.rb

@@ -43,8 +43,8 @@ class Note < Content
     []
   end
 
-  def html_preprocess(_field, html)
-    PublifyApp::Textfilter::Twitterfilter.filtertext(html)
+  def html_postprocess(field, html)
+    super(field, PublifyApp::Textfilter::Twitterfilter.filtertext(html))
   end
 
   def truncate(message, length)

data/app/models/redirect.rb

@@ -8,7 +8,6 @@ class Redirect < ApplicationRecord
 
   validates :from_path, uniqueness: true
   validates :to_path, presence: true
-  validates :blog, presence: true
 
   validates_default_string_length :from_path, :to_path
 

data/app/models/sidebar.rb

@@ -62,7 +62,7 @@ class Sidebar < ApplicationRecord
   end
 
   def self.short_name
-    to_s.underscore.split(/_/).first
+    to_s.underscore.split("_").first
   end
 
   def self.path_name

data/app/models/static_sidebar.rb

@@ -13,7 +13,7 @@ class StaticSidebar < Sidebar
   TEXT
 
   description "Static content, like links to other sites, advertisements," \
-    " or blog meta-information"
+              " or blog meta-information"
 
   setting :title, "Links"
   setting :body, DEFAULT_TEXT, input_type: :text_area

data/app/models/tag.rb

@@ -7,7 +7,6 @@ class Tag < ApplicationRecord
   has_and_belongs_to_many :contents, order: "created_at DESC"
 
   validates :name, uniqueness: { scope: :blog_id }
-  validates :blog, presence: true
   validates :name, presence: true
   validates_default_string_length :display_name
 
@@ -40,11 +39,11 @@ class Tag < ApplicationRecord
   end
 
   def self.find_all_with_content_counters
-    Tag.joins(:contents).
-      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)
+    Tag.joins(:contents)
+      .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)
   end
 
   def self.find_with_char(char)
@@ -52,8 +51,8 @@ class Tag < ApplicationRecord
   end
 
   def self.collection_to_string(tags)
-    tags.map(&:display_name).sort.
-      map { |name| / /.match?(name) ? "\"#{name}\"" : name }.join ", "
+    tags.map(&:display_name).sort
+      .map { |name| name.include?(" ") ? "\"#{name}\"" : name }.join ", "
   end
 
   def published_contents

data/app/models/tag_sidebar.rb

@@ -7,8 +7,8 @@ class TagSidebar < Sidebar
   setting :maximum_tags, 20
 
   def tags
-    @tags ||= Tag.find_all_with_content_counters.
-      take(maximum_tags.to_i).sort_by(&:name)
+    @tags ||= Tag.find_all_with_content_counters
+      .take(maximum_tags.to_i).sort_by(&:name)
   end
 
   def sizes
@@ -18,7 +18,7 @@ class TagSidebar < Sidebar
     average = total.to_f / @tags.size
     @sizes = tags.reduce({}) do |h, tag|
       size = tag.content_counter.to_f / average
-      h.merge tag => [[2.0 / 3.0, size].max, 2].min * 100
+      h.merge tag => size.clamp(2.0 / 3.0, 2) * 100
     end
   end
 

data/app/models/text_filter.rb

@@ -17,48 +17,34 @@ class TextFilter
     @params = params
   end
 
-  def sanitize(*args, &blk)
-    self.class.sanitize(*args, &blk)
+  def sanitize(...)
+    self.class.sanitize(...)
   end
 
   def self.find_or_default(name)
     make_filter(name) || none
   end
 
-  def self.filter_text(text, filters)
-    map = TextFilterPlugin.filter_map
-
-    filters.each do |filter|
-      next if filter.nil?
-
-      filter_class = map[filter.to_s]
-      next unless filter_class
+  def filter_text(text)
+    all_filters = TextFilterPlugin
+      .expand_filter_list([:macropre, markup, :macropost, filters].flatten)
 
-      text = filter_class.filtertext(text)
+    all_filters.each do |filter|
+      text = filter.filtertext(text)
     end
 
     text
   end
 
-  def filter_text(text)
-    self.class.filter_text(text, [:macropre, markup, :macropost, filters].flatten)
-  end
-
   def help
-    filter_map = TextFilterPlugin.filter_map
-    filter_types = TextFilterPlugin.available_filter_types
+    help_filters = TextFilterPlugin
+      .expand_filter_list([markup, :macropre, :macropost, filters].flatten)
 
-    help = []
-    help.push(filter_map[markup])
-    filter_types["macropre"].sort_by(&:short_name).each { |f| help.push f }
-    filter_types["macropost"].sort_by(&:short_name).each { |f| help.push f }
-    filters.each { |f| help.push(filter_map[f.to_s]) }
-
-    help_text = help.map do |f|
+    help_text = help_filters.map do |f|
       if f.help_text.blank?
         ""
       else
-        "<h3>#{f.display_name}</h3>\n#{BlueCloth.new(f.help_text).to_html}\n"
+        "<h3>#{f.display_name}</h3>\n#{CommonMarker.render_html(f.help_text, :DEFAULT)}"
       end
     end
 
@@ -66,13 +52,11 @@ class TextFilter
   end
 
   def commenthelp
-    filter_map = TextFilterPlugin.filter_map
-
-    help = [filter_map[markup]]
-    filters.each { |f| help.push(filter_map[f.to_s]) }
+    help_filters = TextFilterPlugin
+      .expand_filter_list([markup, filters].flatten)
 
-    help.map do |f|
-      f.help_text.blank? ? "" : "#{BlueCloth.new(f.help_text).to_html}\n"
+    help_filters.map do |f|
+      f.help_text.blank? ? "" : CommonMarker.render_html(f.help_text)
     end.join("\n")
   end
 
@@ -81,7 +65,6 @@ class TextFilter
       markdown,
       smartypants,
       markdown_smartypants,
-      textile,
       none,
     ]
   end
@@ -94,8 +77,6 @@ class TextFilter
       smartypants
     when "markdown smartypants"
       markdown_smartypants
-    when "textile"
-      textile
     when "none"
       none
     end
@@ -116,15 +97,8 @@ class TextFilter
 
   def self.markdown_smartypants
     new(name: "markdown smartypants",
-        description: "Markdown with SmartyPants",
-        markup: "markdown",
-        filters: [:smartypants])
-  end
-
-  def self.textile
-    new(name: "textile",
-        description: "Textile",
-        markup: "textile")
+        description: "Markdown with smart quotes",
+        markup: "markdownsmartquotes")
   end
 
   def self.none

data/app/models/user.rb

@@ -69,8 +69,8 @@ class User < ApplicationRecord
   end
 
   def display_names
-    [:login, :nickname, :firstname, :lastname, :first_and_last_name].
-      map { |f| send(f) }.delete_if(&:empty?)
+    [:login, :nickname, :firstname, :lastname, :first_and_last_name]
+      .map { |f| send(f) }.delete_if(&:empty?)
   end
 
   # Authenticate users with old password hashes

data/app/services/title_builder.rb

@@ -60,9 +60,9 @@ class TitleBuilder
   end
 
   def substitute_parameters(str, parameters)
-    str = str.gsub("%date%", parse_date(str, parameters)) if /%date%/.match?(str)
+    str = str.gsub("%date%", parse_date(str, parameters)) if str.include?("%date%")
     str = str.gsub("%search%", parameters[:q]) if parameters[:q]
-    str = str.gsub("%page%", parse_page(str, parameters)) if /%page%/.match?(str)
+    str = str.gsub("%page%", parse_page(str, parameters)) if str.include?("%page%")
 
     str
   end
@@ -75,8 +75,8 @@ class TitleBuilder
     format << "%B " if params[:month]
     format << "%Y" if params[:year]
 
-    string.gsub("%date%", Time.zone.local(*params.values_at(:year, :month, :day)).
-      strftime(format))
+    string.gsub("%date%", Time.zone.local(*params.values_at(:year, :month, :day))
+      .strftime(format))
   end
 
   def parse_page(_string, params)

data/app/views/admin/{content → articles}/_article_list.html.erb

@@ -1,6 +1,6 @@
 <% if @articles.empty? %>
   <tr>
-    <td colspan="6">
+    <td colspan="7">
       <%= t('.no_articles') %>
     </td>
   </tr>
@@ -9,7 +9,7 @@
   <tr>
     <td>
       <% if article.published? %>
-        <%= link_to_permalink(article, article.title, nil, 'published') %>
+        <%= link_to_permalink(article, article.title, style: 'published') %>
       <% else %>
         <%= link_to(article.title, { controller: '/articles', action: 'preview', id: article.id }, { class: 'unpublished', target: '_new' }) %>
       <% end %>
@@ -38,4 +38,4 @@
     </td>
   </tr>
 <% end %>
-<%= display_pagination(@articles, 5, 'first', 'last') %>
+<%= display_pagination(@articles, 7, 'first', 'last') %>

data/app/views/admin/{content → articles}/_form.html.erb

@@ -21,7 +21,17 @@
 <div class="row">
   <div class="col-md-8 col-md-offset-2" id="error-message-article">
     <%= render 'shared/flash', flash: flash %>
-    <%= error_messages_for 'article' %>
+    <% if @article.errors.any? %>
+      <div id="error_explanation">
+        <h2><%= t("errors.template.header", model: 'article', count: @article.errors.count) %></h2>
+        <p><%= t("errors.template.body") %></p>
+        <ul>
+          <% @article.errors.full_messages.each do |message| %>
+            <li><%= message %></li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
   </div>
 </div>
 

data/app/views/admin/{content → articles}/index.html.erb

@@ -1,7 +1,7 @@
 <% content_for :page_heading do %>
   <h2>
     <%= t('.manage_articles') %>
-    <%= link_to(t('.new_article'), { controller: 'content', action: 'new' }, { id: 'dialog-link', class: 'btn btn-info pull-right' }) %>
+    <%= link_to(t('.new_article'), { controller: 'articles', action: 'new' }, { id: 'dialog-link', class: 'btn btn-info pull-right' }) %>
   </h2>
 <% end %>
 

data/app/views/admin/dashboard/_drafts.html.erb

@@ -6,13 +6,13 @@
     <ul class='list-unstyled'>
       <% if @drafts.empty? %>
         <li class='alert alert-info'>
-        <%= link_to t('.no_drafts_yet'), controller: 'content', action: 'new' %> ?
+        <%= link_to t('.no_drafts_yet'), controller: 'articles', action: 'new' %> ?
         </li>
       <% else %>
         <% for post in @drafts %>
           <li>
           <h5>
-            <%= link_to(post.title, controller: 'admin/content', action: 'edit', id: post.id) %>
+            <%= link_to(post.title, controller: 'admin/articles', action: 'edit', id: post.id) %>
             <%= display_date_and_time(post.created_at) %>
           </h5>
           <p><%= post.body&.strip_html&.slice(0, 300) %></p>

data/app/views/admin/dashboard/_overview.html.erb

@@ -4,7 +4,7 @@
     <span class="sr-only">Close</span>
   </button>
   <% links = []
-     links << link_to(t('.write_a_post'), controller: 'content', action: 'new') if can? :new, 'admin/content'
+     links << link_to(t('.write_a_post'), controller: 'articles', action: 'new') if can? :new, 'admin/articles'
      links << link_to(t('.write_a_page'), controller: 'pages', action: 'new') if can? :new, 'admin/pages'
      links << link_to(t('.update_your_profile_or_change_your_password'), controller: 'profiles', action: 'index') %>
   <p>

data/app/views/admin/dashboard/_welcome.html.erb

@@ -6,11 +6,11 @@
     <p><%= t('.articles_and_comments_count_since', articles_count: @newposts_count, comments_count: @newcomments_count) %></p>
     <p><%= t('.running_publify', version: PublifyCore::VERSION) %> <%= @version_message %></p>
     <div class='col-md-6'>
-      <% if can? :index, 'admin/content' %>
+      <% if can? :index, 'admin/articles' %>
         <h4 class='page-header'><%= t('.content') %></h4>
-        <p><%= link_to(t('.articles_count', count: @statposts), controller: 'admin/content') %></p>
-        <p><%= link_to(t('.your_articles_count', count: @statuserposts), controller: 'admin/content', 'search[user_id]' => current_user.id) %></p>
-        <p><%= link_to(t('.drafts_count', count: @statsdrafts), controller: 'admin/content', 'search[state]' => 'drafts') %></p>
+        <p><%= link_to(t('.articles_count', count: @statposts), controller: 'admin/articles') %></p>
+        <p><%= link_to(t('.your_articles_count', count: @statuserposts), controller: 'admin/articles', 'search[user_id]' => current_user.id) %></p>
+        <p><%= link_to(t('.drafts_count', count: @statsdrafts), controller: 'admin/articles', 'search[state]' => 'drafts') %></p>
         <p><%= link_to(t('.pages_count', count: @statspages), controller: 'admin/pages') %></p>
         <p><%= link_to(t('.notes_count', count: @statuses), controller: 'admin/notes') %></p>
       <% end %>

data/app/views/admin/dashboard/index.html.erb

@@ -3,13 +3,6 @@
 <% end %>
 
 <%= render 'overview' %>
-<% if Content.where(text_filter_name: "textile").any? || Feedback.where(text_filter_name: "textile").any? %>
-  <div class="alert alert-warning">
-    <p>
-    <%= t('.textile_deprecated_html') %>
-    </p>
-  </div>
-<% end %>
 
 <div class='row'>
   <div class='col-md-6'>

data/app/views/admin/feedback/article.html.erb

@@ -1,6 +1,6 @@
 <% content_for :page_heading do %>
   <h2 class="page-title">
-    <%= t('.comments_for_html', title: @article.title) %>
+    <%= t('.comments_for_html', title: link_to_permalink(@article, @article.title)) %>
   </h2>
 <% end %>
 
@@ -8,18 +8,24 @@
 
   <%= hidden_field_tag 'article_id', @article.id %>
 
-  <%= render 'button', position: 'top' %>
+  <% if @feedback.any? %>
+    <%= render 'button', position: 'top' %>
+  <% end %>
 
-  <br class='clear' />
   <table class='table hover'>
     <thead>
       <tr class='noborder'>
-        <th colspan='5'>
+        <th>
           <input type="checkbox" name="checkall" id="checkall" onclick="check_all(this);" />
-          <%= t('.select_all') %>
         </th>
+        <th><%= t(".author") %></th>
+        <th><%= t(".created_at") %></th>
+        <th><%= t(".status") %></th>
+        <th><%= t(".content") %></th>
+        <th><%= t(".actions") %></th>
       </tr>
     </thead>
+
     <% if @feedback.empty? %>
       <tr>
         <td colspan="5">
@@ -62,7 +68,7 @@
         <%= text_area 'comment', 'body', rows: '10', class: 'form-control' %>
       </div>
     </div>
-    <div class='form-group col-md-12'>
+    <div>
       <%= t('.action_or_other_html', first_action: link_to(t('.cancel'), action: 'index'), second_action: submit_tag(t('.save'), class: 'btn btn-primary')) %>
     </div>
   </fieldset>

data/app/views/admin/feedback/edit.html.erb

@@ -1,12 +1,24 @@
 <% content_for :page_heading do %>
   <h2 class="page-title">
-    <%= t('.comments_for_html', article_link: link_to(h(@comment.article.title), controller: '/admin/content', action: 'edit', id: @comment.article.id).html_safe) %>
+    <%= t('.comments_for_html', article_link: link_to(h(@comment.article.title), controller: '/admin/articles', action: 'edit', id: @comment.article.id).html_safe) %>
   </h2>
 <% end %>
 
 <%= form_tag action: 'update', id: @comment.id do %>
 
-  <%= error_messages_for 'comment' %>
+  <%= render 'shared/flash', flash: flash %>
+  <% if @comment.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= t("errors.template.header", model: 'comment', count: @comment.errors.count) %></h2>
+      <p><%= t("errors.template.body") %></p>
+      <ul>
+        <% @comment.errors.full_messages.each do |message| %>
+          <li><%= message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
   <%= hidden_field_tag 'article_id', @article.id %>
 
   <fieldset>