publify_core 10.0.0 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 315c96f6777f5d761c19b1b78a37aa38fdddb337522c56059813be2340f835cd
-  data.tar.gz: cd54077be1d63bfd63e385e2dd61e2f23e2928ba3e19ef9aa04f69ab94e00263
+  metadata.gz: f07659f73a5dbeb0204128c9d42e6fcec4092ed7d4e920dceac39f1d104531f3
+  data.tar.gz: cef962bcdc17d957b1824f6e529534c48fdadb473280c910a33198cbcb49d2e7
 SHA512:
-  metadata.gz: af4a6c89bc46ba69993175cbc0245c8cda50e5818a0d809322c5ff9a3431848c8c3b1e5b38db15e8a1ec2e226f3127978b25d312c4e91039af436eba950d2889
-  data.tar.gz: 114fd493221442b2d93dd40cf8c2766cd7b18e1d07a843fe14b605a44e1745a38b4481ccf4f83bf24afd378bb7d525ebd812e4b2bb8dfef3bcff6b7b18db13ba
+  metadata.gz: 5f1262b50e741c94cf9bfcf2cc9d30dade5ae00fccbb5a33206789e7a900af47d280246b204b4f6671f2baaf18547fa1c98aad558d890500347ce58cf97d14f6
+  data.tar.gz: 58e3228983425a5a802714855453184d726f351b81475c0f36f63acf19486c61c0be3f54b26a5cb205f0db48924158840a978fb83888c33cbbcaeaddc9d65b98

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 10.0.1 / 2023-10-28
+
+* Update CarrierWave dependency to version 3.0 ([#102] by [mvz])
+* Move String monkey-patches into a module under PublifyCore ([#115] by [mvz])
+* Remove text filter plugin naming requirements ([#109], [#110], [#117] by [mvz])
+* Fix name and description of Twitterfilter ([#118] by [mvz])
+* Fix link to pull request in CHANGELOG ([#116] by [mvz])
+* Provide proper validation feedback during setup ([#119] by [mvz])
+
+[#102]: https://github.com/publify/publify_core/pull/102
+[#109]: https://github.com/publify/publify_core/pull/109
+[#110]: https://github.com/publify/publify_core/pull/110
+[#115]: https://github.com/publify/publify_core/pull/115
+[#116]: https://github.com/publify/publify_core/pull/116
+[#117]: https://github.com/publify/publify_core/pull/117
+[#118]: https://github.com/publify/publify_core/pull/118
+[#119]: https://github.com/publify/publify_core/pull/119
+[mvz]: https://github.com/mvz
+[dependabot]: https://github.com/apps/dependabot
+
 ## 10.0.0 / 2023-06-25
 
 ### Updated dependencies
@@ -37,7 +57,7 @@
 * Remove `sitealizer` table [publify#1089](https://github.com/publify/publify/pull/1089) by [SupriyaMedankar](https://github.com/SupriyaMedankar)
 * Remove itunes fields from resources [publify#1092](https://github.com/publify/publify/pull/1092) by [SupriyaMedankar](https://github.com/SupriyaMedankar)
 * Remove `page_caches` table [publify#1090](https://github.com/publify/publify/pull/1090) by [SupriyaMedankar](https://github.com/SupriyaMedankar)
-* Remove obsolete Sidebar code [publify#58](https://github.com/publify/publify/pull/58)
+* Remove obsolete Sidebar code [publify_core#58](https://github.com/publify/publify_core/pull/58)
 
 ## 9.2.10 / 2023-01-08
 

data/app/controllers/admin/articles_controller.rb

@@ -93,7 +93,7 @@ class Admin::ArticlesController < Admin::BaseController
   end
 
   def auto_complete_for_article_keywords
-    @items = Tag.select(:display_name).order(:display_name).map(&:display_name)
+    @items = Tag.order(:display_name).pluck(:display_name)
     render json: @items
   end
 

data/app/controllers/admin/post_types_controller.rb

@@ -38,7 +38,7 @@ class Admin::PostTypesController < Admin::BaseController
     # Reset all Articles from the PostType we're destroying to the default PostType
     # Wrap it in a transaction for safety
     @post_type.transaction do
-      Article.where(post_type: @post_type.permalink).each do |article|
+      Article.where(post_type: @post_type.permalink).find_each do |article|
         article.post_type = "read"
         article.save
       end

data/app/controllers/articles_controller.rb

@@ -2,8 +2,8 @@
 
 class ArticlesController < ContentController
   before_action :login_required, only: [:preview, :preview_page]
-  before_action :auto_discovery_feed, only: [:show, :index]
   before_action :verify_config
+  before_action :auto_discovery_feed, only: [:show, :index]
 
   layout :theme_layout, except: [:trackback]
 
@@ -201,7 +201,7 @@ class ArticlesController < ContentController
     case from
     when /^.*\.rss$/
       request.format = "rss"
-      from = from.gsub(/\.rss/, "")
+      from = from.gsub(/\.rss$/, "")
     when /^.*\.atom$/
       request.format = "atom"
       from = from.gsub(/\.atom$/, "")

data/app/controllers/setup_controller.rb

@@ -4,23 +4,24 @@ class SetupController < BaseController
   before_action :check_config
   layout "accounts"
 
-  def index; end
+  def index
+    this_blog.blog_name = ""
+    @user = User.new
+  end
 
   def create
-    this_blog.blog_name = params[:setting][:blog_name]
+    this_blog.blog_name = blog_params[:blog_name]
     this_blog.base_url = blog_base_url
 
-    @user = User.new(login: "admin",
-                     email: params[:setting][:email],
-                     password: params[:setting][:password],
-                     text_filter_name: this_blog.text_filter,
-                     nickname: "Publify Admin")
+    @user = User.new(user_params.merge(login: "admin",
+                                       text_filter_name: this_blog.text_filter,
+                                       nickname: "Publify Admin"))
     @user.name = @user.login
 
-    unless this_blog.save && @user.save
-      redirect_to setup_url
-      return
-    end
+    return render :index unless this_blog.valid? && @user.valid?
+
+    this_blog.save!
+    @user.save!
 
     sign_in @user
 
@@ -36,6 +37,14 @@ class SetupController < BaseController
 
   private
 
+  def blog_params
+    params.require(:blog).permit(:blog_name)
+  end
+
+  def user_params
+    params.require(:user).permit(:email, :password)
+  end
+
   def create_first_post(user)
     this_blog.articles.build(title: I18n.t("setup.article.title"),
                              author: user.login,

data/app/helpers/base_helper.rb

@@ -138,7 +138,7 @@ module BaseHelper
         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/, "  ")
+        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

data/app/models/article.rb

@@ -174,8 +174,7 @@ class Article < Content
 
     if params[:title]
       req_params[:permalink] = CGI.escape(params[:title])
-      article = published.find_by(req_params)
-      return article if article
+      published.find_by(req_params)
     end
   end
 

data/app/models/note.rb

@@ -44,7 +44,7 @@ class Note < Content
   end
 
   def html_postprocess(field, html)
-    super(field, PublifyApp::Textfilter::Twitterfilter.filtertext(html))
+    super(field, PublifyCore::TextFilter::Twitterfilter.filtertext(html))
   end
 
   def truncate(message, length)

data/app/uploaders/resource_uploader.rb

@@ -57,11 +57,9 @@ class ResourceUploader < CarrierWave::Uploader::Base
   end
 
   def check_content_type!(new_file)
-    detected_type = if image? new_file
-                      file_content_content_type(new_file)
-                    else
-                      file_content_type(new_file)
-                    end
+    return unless image? new_file
+
+    detected_type = file_content_content_type(new_file)
     if detected_type != new_file.content_type
       raise CarrierWave::IntegrityError, "has MIME type mismatch"
     end
@@ -72,8 +70,4 @@ class ResourceUploader < CarrierWave::Uploader::Base
   def file_content_content_type(new_file)
     Marcel::MimeType.for Pathname.new(new_file.path)
   end
-
-  def file_content_type(new_file)
-    Marcel::MimeType.for Pathname.new(new_file.path), name: new_file.filename
-  end
 end

data/app/views/notes/show_in_reply.html.erb

@@ -5,7 +5,7 @@
         <%= image_tag(@reply['user']['profile_image_url'], class: 'alignleft', alt: @reply['user']['name']) %>
       <% end %>
       <strong><%= get_reply_context_url(@reply) %></strong>
-      <p><%= nofollowify_links(PublifyApp::Textfilter::Twitterfilter.filtertext(@reply['text'])) %></p>
+      <p><%= nofollowify_links(PublifyCore::TextFilter::Twitterfilter.filtertext(@reply['text'])) %></p>
       <p>
       <small>
         <%= get_reply_context_twitter_link(@reply) %>

data/app/views/setup/index.html.erb

@@ -1,17 +1,48 @@
+<div class="row">
+  <div class="col-md-8 col-md-offset-2" id="error-message-page">
+    <% if this_blog.errors.any? %>
+      <div id="error_explanation">
+        <h2><%= t("errors.template.header", model: 'blog', count: this_blog.errors.count) %></h2>
+        <p><%= t("errors.template.body") %></p>
+        <ul>
+          <% this_blog.errors.full_messages.each do |message| %>
+            <li><%= message %></li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
+    <% if @user.errors.any? %>
+      <div id="error_explanation">
+        <h2><%= t("errors.template.header", model: 'blog', count: @user.errors.count) %></h2>
+        <p><%= t("errors.template.body") %></p>
+        <ul>
+          <% @user.errors.full_messages.each do |message| %>
+            <li><%= message %></li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
+  </div>
+</div>
+
 <%= form_tag action: 'index' do %>
   <div class='alert alert-info'>
     <small><%= t('.welcome_to_your_blog_setup', publify: link_to('Publify', 'https://publify.github.io/')) %></small>
   </div>
-  <div class='form-group'>
-    <%= text_field(:setting, :blog_name, class: 'form-control', placeholder: t('.blog_name')) %>
-  </div>
-  <div class='form-group'>
-    <%= text_field(:setting, :email, class: 'form-control', placeholder: t('.your_mail')) %>
-  </div>
-  <div class='form-group'>
-    <%= label_tag :setting_password, t('.password') %><br />
-    <%= password_field(:setting, :password, class: 'form-control') %>
-  </div>
+  <%= fields model: this_blog do |form| %>
+    <div class='form-group'>
+      <%= form.text_field(:blog_name, class: 'form-control', placeholder: t('.blog_name')) %>
+    </div>
+  <% end %>
+  <%= fields model: @user do |form| %>
+    <div class='form-group'>
+      <%= form.text_field(:email, class: 'form-control', placeholder: t('.your_mail')) %>
+    </div>
+    <div class='form-group'>
+      <%= form.label :password, t('.password') %><br>
+      <%= form.password_field(:password, class: 'form-control') %>
+    </div>
+  <% end %>
 
-  <input type="submit" id="submit" class='btn btn-lg btn-success btn-block' value="<%= t('generic.save') %>" />
+  <input type="submit" id="submit" class='btn btn-lg btn-success btn-block' value="<%= t('generic.save') %>">
 <% end %>

data/db/seeds.rb

@@ -13,9 +13,9 @@
 blog = Blog.first || Blog.create!
 
 unless blog.sidebars.any?
-  PageSidebar.create!(active_position: 0, staged_position: 0, blog_id: blog.id)
-  TagSidebar.create!(active_position: 1, blog_id: blog.id)
-  ArchivesSidebar.create!(active_position: 2, blog_id: blog.id)
-  StaticSidebar.create!(active_position: 3, blog_id: blog.id)
-  MetaSidebar.create!(active_position: 4, blog_id: blog.id)
+  PageSidebar.create!(active_position: 0, staged_position: 0, blog: blog)
+  TagSidebar.create!(active_position: 1, blog: blog)
+  ArchivesSidebar.create!(active_position: 2, blog: blog)
+  StaticSidebar.create!(active_position: 3, blog: blog)
+  MetaSidebar.create!(active_position: 4, blog: blog)
 end

data/lib/publify_core/string_ext.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+# FIXME: Replace with helpers and/or methods provided by Rails
+module PublifyCore
+  module StringExt
+    ACCENTS = { %w(á à â ä ã Ã Ä Â À) => "a",
+                %w(é è ê ë Ë É È Ê) => "e",
+                %w(í ì î ï I Î Ì) => "i",
+                %w(ó ò ô ö õ Õ Ö Ô Ò) => "o",
+                ["œ"] => "oe",
+                ["ß"] => "ss",
+                %w(ú ù û ü U Û Ù) => "u",
+                %w(ç Ç) => "c" }.freeze
+
+    def to_permalink
+      string = self
+      ACCENTS.each do |key, value|
+        string = string.tr(key.join, value)
+      end
+      string = string.tr("'", "-")
+      string.gsub(/<[^>]*>/, "").to_url
+    end
+
+    # Returns a-string-with-dashes when passed 'a string with dashes'.
+    # All special chars are stripped in the process
+    def to_url
+      return if nil?
+
+      s = downcase.tr("\"'", "")
+      s = s.gsub(/\P{Word}/, " ")
+      s.strip.tr_s(" ", "-").tr(" ", "-").sub(/^$/, "-")
+    end
+
+    def to_title(item, settings, params)
+      TitleBuilder.new(self).build(item, settings, params)
+    end
+
+    # Strips any html markup from a string
+    TYPO_TAG_KEY = TYPO_ATTRIBUTE_KEY = /[\w:_-]+/.freeze
+    TYPO_ATTRIBUTE_VALUE = /(?:[A-Za-z0-9]+|(?:'[^']*?'|"[^"]*?"))/.freeze
+    TYPO_ATTRIBUTE = /(?:#{TYPO_ATTRIBUTE_KEY}(?:\s*=\s*#{TYPO_ATTRIBUTE_VALUE})?)/.freeze
+    TYPO_ATTRIBUTES = /(?:#{TYPO_ATTRIBUTE}(?:\s+#{TYPO_ATTRIBUTE})*)/.freeze
+    TAG =
+      %r{<[!/?\[]?(?:#{TYPO_TAG_KEY}|--)(?:\s+#{TYPO_ATTRIBUTES})?\s*(?:[!/?\]]+|--)?>}
+        .freeze
+    def strip_html
+      gsub(TAG, "").gsub(/\s+/, " ").strip
+    end
+  end
+end
+
+String.include PublifyCore::StringExt

data/lib/publify_core/text_filter/markdown.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "text_filter_plugin"
+require "commonmarker"
+
+module PublifyCore::TextFilter
+  class Markdown < TextFilterPlugin::Markup
+    plugin_display_name "Markdown"
+    plugin_description "Markdown markup language from" \
+                       ' <a href="http://daringfireball.com/">Daring Fireball</a>'
+
+    def self.help_text
+      <<~TXT
+        [Markdown](http://daringfireball.net/projects/markdown/) is a simple
+        text-to-HTML converter that turns common text idioms into HTML.  The
+        [full syntax](http://daringfireball.net/projects/markdown/syntax) is
+        available from the author's site, but here's a short summary:
+
+        * **Paragraphs**: Start a new paragraph by skipping a line.
+        * **Italics**: Put text in *italics* by enclosing it in either * or
+          _: `*italics*` turns into *italics*.
+        * **Bold**: Put text in **bold** by enclosing it in two *s:
+          `**bold**` turns into **bold**.
+        * **Pre-formatted text**: Enclosing a short block of text in
+          backquotes (&#96;) displays it in a monospaced font and converts HTML
+          metacharacters so they display correctly.  Example:
+          &#96;`<img src="foo"/>`&#96; displays as `<img src="foo"/>`. Also,
+          any paragraph indented 4 or more spaces is treated as pre-formatted
+          text.
+        * **Block quotes**: Any paragraph (or line) that starts with a `>` is
+          treated as a blockquote.
+        * **Hyperlinks**: You can create links like this:
+          `[amazon's web site](http://www.amazon.com)`. That produces
+          "[amazon's web site](http://www.amazon.com)".
+        * **Lists**: You can create numbered or bulleted lists by ending a
+          paragraph with a colon (:), skipping a line, and then using asterisks
+          (*, for bullets) or numbers (for numbered lists).  See the
+          [Markdown syntax page](http://daringfireball.net/projects/markdown/syntax)
+          for examples.
+        * **Raw HTML**: Markdown will pass raw HTML through unchanged, so you
+          can use HTML's syntax whenever Markdown doesn't provide a reasonable
+          alternative.
+      TXT
+    end
+
+    def self.filtertext(text)
+      # FIXME: Workaround for <publify:foo> not being interpreted as an HTML tag.
+      escaped_macros = text.gsub(%r{(</?publify):}, '\1X')
+      html = CommonMarker.render_html(escaped_macros, :UNSAFE)
+      html.gsub(%r{(</?publify)X}, '\1:').strip
+    end
+  end
+end

data/lib/{publify_textfilter_markdown_smartquotes.rb → publify_core/text_filter/markdown_smartquotes.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require "text_filter_plugin"
-require "publify_textfilter_markdown"
+require "publify_core/text_filter/markdown"
 
-module PublifyTextfilter
-  class MarkdownSmartquotes < PublifyApp::Textfilter::Markdown
+module PublifyCore::TextFilter
+  class MarkdownSmartquotes < PublifyCore::TextFilter::Markdown
     plugin_display_name "Markdown with smart quotes"
     plugin_description "Markdown markup language from" \
                        ' <a href="http://daringfireball.com/">Daring Fireball</a>' \

data/lib/publify_core/text_filter/none.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "text_filter_plugin"
+
+module PublifyCore::TextFilter
+  class None < TextFilterPlugin::Markup
+    plugin_display_name "None"
+    plugin_description "Raw HTML only"
+
+    def self.filtertext(text)
+      text
+    end
+  end
+end

data/lib/publify_core/text_filter/smartypants.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "rubypants"
+
+module PublifyCore::TextFilter
+  class Smartypants < TextFilterPlugin::PostProcess
+    plugin_display_name "Smartypants"
+    plugin_description "Converts HTML to use typographically correct quotes and dashes"
+
+    def self.filtertext(text)
+      RubyPants.new(text).to_html
+    end
+  end
+end

data/lib/publify_core/text_filter/twitterfilter.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "text_filter_plugin"
+require "html/pipeline"
+require "html/pipeline/hashtag/hashtag_filter"
+
+module PublifyCore::TextFilter
+  class Twitterfilter < TextFilterPlugin::PostProcess
+    plugin_display_name "Twitter Filter"
+    plugin_description "Convert hashtags and mentions to links"
+
+    class TwitterHashtagFilter < HTML::Pipeline::HashtagFilter
+      def initialize(text)
+        super(text,
+              tag_url: "https://twitter.com/search?q=%%23%<tag>s&src=tren&mode=realtime",
+              tag_link_attr: "")
+      end
+    end
+
+    class TwitterMentionFilter < HTML::Pipeline::MentionFilter
+      def initialize(text)
+        super(text, base_url: "https://twitter.com")
+      end
+
+      # Override base mentions finder, treating @mention just like any other @foo.
+      def self.mentioned_logins_in(text, username_pattern = UsernamePattern)
+        text.gsub MentionPatterns[username_pattern] do |match|
+          login = Regexp.last_match(1)
+          yield match, login, false
+        end
+      end
+
+      # Override base link creator, removing the class
+      def link_to_mentioned_user(login)
+        result[:mentioned_usernames] |= [login]
+
+        url = base_url.dup
+        url << "/" unless %r{[/~]\z}.match?(url)
+
+        "<a href='#{url << login}'>" \
+          "@#{login}" \
+          "</a>"
+      end
+    end
+
+    def self.filtertext(text)
+      # First, autolink
+      helper = PublifyCore::ContentTextHelpers.new
+      text = helper.auto_link(text)
+
+      text = TwitterHashtagFilter.new(text).call
+      TwitterMentionFilter.new(text).call.to_s
+    end
+  end
+end

data/lib/publify_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PublifyCore
-  VERSION = "10.0.0"
+  VERSION = "10.0.1"
 end

data/lib/publify_core.rb

@@ -8,6 +8,12 @@ require "publify_core/version"
 require "publify_core/engine"
 require "publify_core/lang"
 require "publify_core/content_text_helpers"
+require "publify_core/text_filter/none"
+require "publify_core/text_filter/markdown"
+require "publify_core/text_filter/markdown_smartquotes"
+require "publify_core/text_filter/smartypants"
+require "publify_core/text_filter/twitterfilter"
+require "publify_core/string_ext"
 
 require "carrierwave"
 require "jquery-rails"
@@ -20,17 +26,11 @@ require "sassc-rails"
 
 require "email_notify"
 require "publify_guid"
-require "publify_textfilter_none"
-require "publify_textfilter_markdown"
-require "publify_textfilter_markdown_smartquotes"
-require "publify_textfilter_smartypants"
-require "publify_textfilter_twitterfilter"
 require "publify_time"
 require "sidebar_registry"
 require "spam_protection"
 require "text_filter_plugin"
 require "theme"
-require "transforms"
 
 module PublifyCore
   Theme.register_themes File.join(Engine.root, "themes")

data/lib/text_filter_plugin.rb

@@ -13,10 +13,8 @@ class TextFilterPlugin
   def self.inherited(sub)
     super
 
-    if sub.to_s.start_with?("Plugin", "PublifyTextfilter", "PublifyApp::Textfilter")
-      name = sub.short_name
-      @@filter_map[name] = sub
-    end
+    name = sub.short_name
+    @@filter_map[name] = sub
   end
 
   def self.filter_map
@@ -116,34 +114,40 @@ class TextFilterPlugin
   def self.logger
     @logger ||= ::Rails.logger || Logger.new($stdout)
   end
+
+  def self.abstract_filter!
+    @@filter_map.delete short_name
+  end
 end
 
 class TextFilterPlugin::PostProcess < TextFilterPlugin
+  abstract_filter!
+
   def self.filter_type
     "postprocess"
   end
 end
 
-class TextFilterPlugin::Macro < TextFilterPlugin
+module TextFilterPlugin::MacroMethods
   # Utility function -- hand it a XML string like <a href="foo" title="bar">
   # and it'll give you back { "href" => "foo", "title" => "bar" }
-  def self.attributes_parse(string)
+  def attributes_parse(string)
     attributes = {}
 
     string.gsub(/([^ =]+="[^"]*")/) do |match|
-      key, value = match.split(/=/, 2)
+      key, value = match.split("=", 2)
       attributes[key] = value.delete('"')
     end
 
     string.gsub(/([^ =]+='[^']*')/) do |match|
-      key, value = match.split(/=/, 2)
+      key, value = match.split("=", 2)
       attributes[key] = value.delete("'")
     end
 
     attributes
   end
 
-  def self.filtertext(text)
+  def filtertext(text)
     regex1 = %r{<publify:#{short_name}(?:[ \t][^>]*)?/>}
     regex2 = %r{<publify:#{short_name}([ \t][^>]*)?>(.*?)</publify:#{short_name}>}m
 
@@ -157,19 +161,27 @@ class TextFilterPlugin::Macro < TextFilterPlugin
   end
 end
 
-class TextFilterPlugin::MacroPre < TextFilterPlugin::Macro
+class TextFilterPlugin::MacroPre < TextFilterPlugin
+  abstract_filter!
+  extend TextFilterPlugin::MacroMethods
+
   def self.filter_type
     "macropre"
   end
 end
 
-class TextFilterPlugin::MacroPost < TextFilterPlugin::Macro
+class TextFilterPlugin::MacroPost < TextFilterPlugin
+  abstract_filter!
+  extend TextFilterPlugin::MacroMethods
+
   def self.filter_type
     "macropost"
   end
 end
 
 class TextFilterPlugin::Markup < TextFilterPlugin
+  abstract_filter!
+
   def self.filter_type
     "markup"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publify_core
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.0.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-25 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: commonmarker
   requirement: !ruby/object:Gem::Requirement
@@ -191,16 +191,22 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -539,70 +545,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.52.0
+        version: 1.57.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.57.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.52.0
+        version: 2.19.0
 - !ruby/object:Gem::Dependency
   name: rubocop-factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.23.1
+        version: 2.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.23.1
+        version: 2.24.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.20.2
+        version: 2.21.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.20.2
+        version: 2.21.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.22.0
+        version: 2.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.22.0
+        version: 2.24.1
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -1103,6 +1123,7 @@ files:
 - lib/publify_core/content_text_helpers.rb
 - lib/publify_core/engine.rb
 - lib/publify_core/lang.rb
+- lib/publify_core/string_ext.rb
 - lib/publify_core/testing_support/dns_mock.rb
 - lib/publify_core/testing_support/factories/articles.rb
 - lib/publify_core/testing_support/factories/blogs.rb
@@ -1127,14 +1148,14 @@ files:
 - lib/publify_core/testing_support/fixtures/testfile.png
 - lib/publify_core/testing_support/fixtures/testfile.txt
 - lib/publify_core/testing_support/upload_fixtures.rb
+- lib/publify_core/text_filter/markdown.rb
+- lib/publify_core/text_filter/markdown_smartquotes.rb
+- lib/publify_core/text_filter/none.rb
+- lib/publify_core/text_filter/smartypants.rb
+- lib/publify_core/text_filter/twitterfilter.rb
 - lib/publify_core/version.rb
 - lib/publify_guid.rb
 - lib/publify_plugins.rb
-- lib/publify_textfilter_markdown.rb
-- lib/publify_textfilter_markdown_smartquotes.rb
-- lib/publify_textfilter_none.rb
-- lib/publify_textfilter_smartypants.rb
-- lib/publify_textfilter_twitterfilter.rb
 - lib/publify_time.rb
 - lib/sidebar_field.rb
 - lib/sidebar_registry.rb
@@ -1143,7 +1164,6 @@ files:
 - lib/tasks/publify_core_tasks.rake
 - lib/text_filter_plugin.rb
 - lib/theme.rb
-- lib/transforms.rb
 - themes/plain/about.markdown
 - themes/plain/javascripts/theme.js
 - themes/plain/preview.png
@@ -1168,7 +1188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Core engine for the Publify blogging system.

data/lib/publify_textfilter_markdown.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require "text_filter_plugin"
-require "commonmarker"
-
-# TODO: Move to a different namespace
-class PublifyApp
-  class Textfilter
-    class Markdown < TextFilterPlugin::Markup
-      plugin_display_name "Markdown"
-      plugin_description "Markdown markup language from" \
-                         ' <a href="http://daringfireball.com/">Daring Fireball</a>'
-
-      def self.help_text
-        <<~TXT
-          [Markdown](http://daringfireball.net/projects/markdown/) is a simple
-          text-to-HTML converter that turns common text idioms into HTML.  The
-          [full syntax](http://daringfireball.net/projects/markdown/syntax) is
-          available from the author's site, but here's a short summary:
-
-          * **Paragraphs**: Start a new paragraph by skipping a line.
-          * **Italics**: Put text in *italics* by enclosing it in either * or
-            _: `*italics*` turns into *italics*.
-          * **Bold**: Put text in **bold** by enclosing it in two *s:
-            `**bold**` turns into **bold**.
-          * **Pre-formatted text**: Enclosing a short block of text in
-            backquotes (&#96;) displays it in a monospaced font and converts HTML
-            metacharacters so they display correctly.  Example:
-            &#96;`<img src="foo"/>`&#96; displays as `<img src="foo"/>`. Also,
-            any paragraph indented 4 or more spaces is treated as pre-formatted
-            text.
-          * **Block quotes**: Any paragraph (or line) that starts with a `>` is
-            treated as a blockquote.
-          * **Hyperlinks**: You can create links like this:
-            `[amazon's web site](http://www.amazon.com)`. That produces
-            "[amazon's web site](http://www.amazon.com)".
-          * **Lists**: You can create numbered or bulleted lists by ending a
-            paragraph with a colon (:), skipping a line, and then using asterisks
-            (*, for bullets) or numbers (for numbered lists).  See the
-            [Markdown syntax page](http://daringfireball.net/projects/markdown/syntax)
-            for examples.
-          * **Raw HTML**: Markdown will pass raw HTML through unchanged, so you
-            can use HTML's syntax whenever Markdown doesn't provide a reasonable
-            alternative.
-        TXT
-      end
-
-      def self.filtertext(text)
-        # FIXME: Workaround for <publify:foo> not being interpreted as an HTML tag.
-        escaped_macros = text.gsub(%r{(</?publify):}, '\1X')
-        html = CommonMarker.render_html(escaped_macros, :UNSAFE)
-        html.gsub(%r{(</?publify)X}, '\1:').strip
-      end
-    end
-  end
-end

data/lib/publify_textfilter_none.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require "text_filter_plugin"
-
-class PublifyApp
-  class Textfilter
-    class None < TextFilterPlugin::Markup
-      plugin_display_name "None"
-      plugin_description "Raw HTML only"
-
-      def self.filtertext(text)
-        text
-      end
-    end
-  end
-end

data/lib/publify_textfilter_smartypants.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require "rubypants"
-
-class PublifyApp
-  class Textfilter
-    class Smartypants < TextFilterPlugin::PostProcess
-      plugin_display_name "Smartypants"
-      plugin_description "Converts HTML to use typographically correct quotes and dashes"
-
-      def self.filtertext(text)
-        RubyPants.new(text).to_html
-      end
-    end
-  end
-end

data/lib/publify_textfilter_twitterfilter.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require "text_filter_plugin"
-require "html/pipeline"
-require "html/pipeline/hashtag/hashtag_filter"
-
-class PublifyApp
-  class Textfilter
-    class Twitterfilter < TextFilterPlugin::PostProcess
-      plugin_display_name "HTML Filter"
-      plugin_description "Strip HTML tags"
-
-      class TwitterHashtagFilter < HTML::Pipeline::HashtagFilter
-        def initialize(text)
-          super(text,
-                tag_url: "https://twitter.com/search?q=%%23%<tag>s&src=tren&mode=realtime",
-                tag_link_attr: "")
-        end
-      end
-
-      class TwitterMentionFilter < HTML::Pipeline::MentionFilter
-        def initialize(text)
-          super(text, base_url: "https://twitter.com")
-        end
-
-        # Override base mentions finder, treating @mention just like any other @foo.
-        def self.mentioned_logins_in(text, username_pattern = UsernamePattern)
-          text.gsub MentionPatterns[username_pattern] do |match|
-            login = Regexp.last_match(1)
-            yield match, login, false
-          end
-        end
-
-        # Override base link creator, removing the class
-        def link_to_mentioned_user(login)
-          result[:mentioned_usernames] |= [login]
-
-          url = base_url.dup
-          url << "/" unless %r{[/~]\z}.match?(url)
-
-          "<a href='#{url << login}'>" \
-            "@#{login}" \
-            "</a>"
-        end
-      end
-
-      def self.filtertext(text)
-        # First, autolink
-        helper = PublifyCore::ContentTextHelpers.new
-        text = helper.auto_link(text)
-
-        text = TwitterHashtagFilter.new(text).call
-        TwitterMentionFilter.new(text).call.to_s
-      end
-    end
-  end
-end

data/lib/transforms.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-# FIXME: Replace with helpers and/or methods provided by Rails
-class String
-  ACCENTS = { %w(á à â ä ã Ã Ä Â À) => "a",
-              %w(é è ê ë Ë É È Ê) => "e",
-              %w(í ì î ï I Î Ì) => "i",
-              %w(ó ò ô ö õ Õ Ö Ô Ò) => "o",
-              ["œ"] => "oe",
-              ["ß"] => "ss",
-              %w(ú ù û ü U Û Ù) => "u",
-              %w(ç Ç) => "c" }.freeze
-
-  def to_permalink
-    string = self
-    ACCENTS.each do |key, value|
-      string = string.tr(key.join, value)
-    end
-    string = string.tr("'", "-")
-    string.gsub(/<[^>]*>/, "").to_url
-  end
-
-  # Returns a-string-with-dashes when passed 'a string with dashes'.
-  # All special chars are stripped in the process
-  def to_url
-    return if nil?
-
-    s = downcase.tr("\"'", "")
-    s = s.gsub(/\P{Word}/, " ")
-    s.strip.tr_s(" ", "-").tr(" ", "-").sub(/^$/, "-")
-  end
-
-  def to_title(item, settings, params)
-    TitleBuilder.new(self).build(item, settings, params)
-  end
-
-  # Strips any html markup from a string
-  TYPO_TAG_KEY = TYPO_ATTRIBUTE_KEY = /[\w:_-]+/.freeze
-  TYPO_ATTRIBUTE_VALUE = /(?:[A-Za-z0-9]+|(?:'[^']*?'|"[^"]*?"))/.freeze
-  TYPO_ATTRIBUTE = /(?:#{TYPO_ATTRIBUTE_KEY}(?:\s*=\s*#{TYPO_ATTRIBUTE_VALUE})?)/.freeze
-  TYPO_ATTRIBUTES = /(?:#{TYPO_ATTRIBUTE}(?:\s+#{TYPO_ATTRIBUTE})*)/.freeze
-  TAG =
-    %r{<[!/?\[]?(?:#{TYPO_TAG_KEY}|--)(?:\s+#{TYPO_ATTRIBUTES})?\s*(?:[!/?\]]+|--)?>}.freeze
-  def strip_html
-    gsub(TAG, "").gsub(/\s+/, " ").strip
-  end
-end