publify_core 9.0.0.pre6 → 9.2.1

data/app/models/article/factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Article::Factory
   attr_reader :blog, :user
 
@@ -10,13 +12,14 @@ class Article::Factory
     blog.articles.build.tap do |art|
       art.allow_comments = blog.default_allow_comments
       art.allow_pings = blog.default_allow_pings
-      art.text_filter = user.default_text_filter
-      art.published = true
+      art.text_filter_name = default_text_filter
+      art.state = "draft"
     end
   end
 
   def get_or_build_from(id)
     return blog.articles.find(id) if id.present?
+
     default
   end
 
@@ -31,10 +34,10 @@ class Article::Factory
   end
 
   def extract_params(path, format)
-    specs = format.split('/')
-    specs.delete('')
-    parts = path.split('/')
-    parts.delete('')
+    specs = format.split("/")
+    specs.delete("")
+    parts = path.split("/")
+    parts.delete("")
 
     return if parts.length != specs.length
 
@@ -45,6 +48,7 @@ class Article::Factory
         after_format = Regexp.last_match[3]
         item =~ /^#{before_format}(.*)#{after_format}$/
         break unless Regexp.last_match
+
         value = Regexp.last_match[1]
         result[format_string.to_sym] = value
       elsif spec != item
@@ -53,4 +57,8 @@ class Article::Factory
       result
     end
   end
+
+  def default_text_filter
+    user.text_filter_name || blog.text_filter
+  end
 end

data/app/models/blog.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The Blog class represents the one and only blog.  It stores most
 # configuration settings and is linked to most of the assorted content
 # classes via has_many.
@@ -5,7 +7,7 @@
 # Once upon a time, there were plans to make publify handle multiple blogs,
 # but it never happened and publify is now firmly single-blog.
 #
-class Blog < ActiveRecord::Base
+class Blog < ApplicationRecord
   include ConfigManager
   include Rails.application.routes.url_helpers
 
@@ -13,126 +15,126 @@ class Blog < ActiveRecord::Base
   has_many :articles
   has_many :feedback, through: :articles
 
-  has_many(:published_articles,
-           ->() { includes(:tags).where(published: true).order('contents.published_at DESC') },
-           class_name: 'Article')
+  has_many :published_articles, ->() { published }, class_name: "Article"
 
   has_many :pages
   has_many :tags
   has_many :notes
 
   has_many :redirects
-  has_many :sidebars, ->() { order('active_position ASC') }
+  has_many :sidebars, ->() { order("active_position ASC") }
 
   attr_accessor :custom_permalink
 
-  default_scope -> { order('id') }
+  default_scope -> { order("id") }
 
   validates :blog_name, presence: true
 
   serialize :settings, Hash
 
   # Description
-  setting :blog_name, :string, 'My Shiny Weblog!'
-  setting :blog_subtitle, :string, ''
-  setting :geourl_location, :string, ''
-  setting :canonical_server_url, :string, '' # Deprecated
-  setting :lang, :string, 'en_US'
-  setting :title_prefix, :integer, 0 # Deprecated but needed for a migration
+  setting :blog_name, :string, "My Shiny Weblog!"
+  setting :blog_subtitle, :string, ""
+  setting :geourl_location, :string, ""
+  setting :canonical_server_url, :string, "" # Deprecated
+  setting :lang, :string, "en_US"
 
   # Spam
   setting :sp_global, :boolean, false
   setting :sp_article_auto_close, :integer, 0
   setting :sp_url_limit, :integer, 0
-  setting :sp_akismet_key, :string, ''
+  setting :sp_akismet_key, :string, ""
   setting :use_recaptcha, :boolean, false
 
   # Mostly Behaviour
-  setting :text_filter, :string, 'markdown smartypants'
-  setting :comment_text_filter, :string, 'markdown smartypants'
+  setting :text_filter, :string, "markdown smartypants"
+  setting :comment_text_filter, :string, "markdown smartypants"
   setting :limit_article_display, :integer, 10
   setting :limit_archives_display, :integer, 20
   setting :limit_rss_display, :integer, 10
   setting :default_allow_pings, :boolean, false
   setting :default_allow_comments, :boolean, true
   setting :default_moderate_comments, :boolean, false
-  setting :link_to_author, :boolean, false
-  setting :show_extended_on_rss, :boolean, true # deprecated but still needed for backward compatibility
+  # deprecated but still needed for backward compatibility
+  setting :show_extended_on_rss, :boolean, true
   setting :hide_extended_on_rss, :boolean, false
-  setting :theme, :string, 'plain'
-  setting :plugin_avatar, :string, ''
+  setting :theme, :string, "plain"
+  setting :plugin_avatar, :string, ""
   setting :global_pings_disable, :boolean, false
-  setting :ping_urls, :string, "http://blogsearch.google.com/ping/RPC2\nhttp://rpc.technorati.com/rpc/ping\nhttp://ping.blo.gs/\nhttp://rpc.weblogs.com/RPC2"
   setting :send_outbound_pings, :boolean, true
-  setting :email_from, :string, 'publify@example.com'
+  setting :email_from, :string, "publify@example.com"
   setting :allow_signup, :integer, 0
-  setting :date_format, :string, '%d/%m/%Y'
-  setting :time_format, :string, '%Hh%M'
+  setting :date_format, :string, "%d/%m/%Y"
+  setting :time_format, :string, "%Hh%M"
   setting :image_avatar_size, :integer, 48
   setting :image_thumb_size, :integer, 125
   setting :image_medium_size, :integer, 600
 
   # SEO
-  setting :meta_description, :string, ''
-  setting :meta_keywords, :string, ''
-  setting :google_analytics, :string, ''
-  setting :feedburner_url, :string, ''
+  setting :meta_description, :string, ""
+  setting :meta_keywords, :string, ""
+  setting :google_analytics, :string, ""
   setting :rss_description, :boolean, false
-  setting :rss_description_text, :string, <<EOS
-<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>
-| If you are reading this article anywhere other than on <a href='%blog_url%'>%blog_name%</a>,
-  it has been illegally reproduced and without proper authorization.</small></p>
-EOS
-  setting :permalink_format, :string, '/%year%/%month%/%day%/%title%'
+  setting :rss_description_text, :string, <<-HTML.strip_heredoc
+    <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>
+    | If you are reading this article anywhere other than on <a href='%blog_url%'>%blog_name%</a>,
+      it has been illegally reproduced and without proper authorization.</small></p>
+  HTML
+  setting :permalink_format, :string, "/%year%/%month%/%day%/%title%"
   setting :robots, :string, 'User-agent: *\nAllow: /\nDisallow: /admin\n'
-  setting :humans, :string, <<EOS
-/* TEAM */
-Your title: Your name.
-Site: email, link to a contact form, etc.
-Twitter: your Twitter username.
-
-/* SITE */
-Software: Publify [http://publify.co] #{PublifyCore::VERSION}
-EOS
-  setting :index_categories, :boolean, true # deprecated but still needed for backward compatibility
+  setting :humans, :string, <<-TEXT.strip_heredoc
+    /* TEAM */
+    Your title: Your name.
+    Site: email, link to a contact form, etc.
+    Twitter: your Twitter username.
+
+    /* SITE */
+    Software: Publify [https://publify.github.io/] #{PublifyCore::VERSION}
+  TEXT
+  # deprecated but still needed for backward compatibility
+  setting :index_categories, :boolean, true
   setting :unindex_categories, :boolean, false
-  setting :index_tags, :boolean, true # deprecated but still needed for backward compatibility
+  # deprecated but still needed for backward compatibility
+  setting :index_tags, :boolean, true
   setting :unindex_tags, :boolean, false
   setting :admin_display_elements, :integer, 10
-  setting :google_verification, :string, ''
-  setting :nofollowify, :boolean, true # deprecated but still needed for backward compatibility
+  setting :google_verification, :string, ""
+  # deprecated but still needed for backward compatibility
+  setting :nofollowify, :boolean, true
   setting :dofollowify, :boolean, false
-  setting :use_canonical_url, :boolean, false
   setting :use_meta_keyword, :boolean, true
-  setting :home_title_template, :string, '%blog_name% | %blog_subtitle%' # spec OK
-  setting :home_desc_template, :string, '%blog_name% | %blog_subtitle% | %meta_keywords%' # OK
-  setting :article_title_template, :string, '%title% | %blog_name%'
-  setting :article_desc_template, :string, '%excerpt%'
-  setting :page_title_template, :string, '%title% | %blog_name%'
-  setting :page_desc_template, :string, '%excerpt%'
-  setting :paginated_title_template, :string, '%blog_name% | %blog_subtitle% %page%'
-  setting :paginated_desc_template, :string, '%blog_name% | %blog_subtitle% | %meta_keywords% %page%'
-  setting :tag_title_template, :string, 'Tag: %name% | %blog_name% %page%'
-  setting :tag_desc_template, :string, '%name% | %blog_name% | %blog_subtitle% %page%'
-  setting :author_title_template, :string, '%author% | %blog_name%'
-  setting :author_desc_template, :string, '%author% | %blog_name% | %blog_subtitle%'
-  setting :archives_title_template, :string, 'Archives for %blog_name% %date% %page%'
-  setting :archives_desc_template, :string, 'Archives for %blog_name% %date% %page% %blog_subtitle%'
-  setting :search_title_template, :string, 'Results for %search% | %blog_name% %page%'
-  setting :search_desc_template, :string, 'Results for %search% | %blog_name% | %blog_subtitle% %page%'
-  setting :statuses_title_template, :string, 'Notes | %blog_name% %page%'
-  setting :statuses_desc_template, :string, 'Notes | %blog_name% | %blog_subtitle% %page%'
-  setting :status_title_template, :string, '%body% | %blog_name%'
-  setting :status_desc_template, :string, '%excerpt%'
-
-  setting :custom_tracking_field, :string, ''
+  setting :home_title_template, :string, "%blog_name% | %blog_subtitle%"
+  setting :home_desc_template, :string, "%blog_name% | %blog_subtitle% | %meta_keywords%"
+  setting :article_title_template, :string, "%title% | %blog_name%"
+  setting :article_desc_template, :string, "%excerpt%"
+  setting :page_title_template, :string, "%title% | %blog_name%"
+  setting :page_desc_template, :string, "%excerpt%"
+  setting :paginated_title_template, :string, "%blog_name% | %blog_subtitle% %page%"
+  setting :paginated_desc_template, :string,
+          "%blog_name% | %blog_subtitle% | %meta_keywords% %page%"
+  setting :tag_title_template, :string, "Tag: %name% | %blog_name% %page%"
+  setting :tag_desc_template, :string, "%name% | %blog_name% | %blog_subtitle% %page%"
+  setting :author_title_template, :string, "%author% | %blog_name%"
+  setting :author_desc_template, :string, "%author% | %blog_name% | %blog_subtitle%"
+  setting :archives_title_template, :string, "Archives for %blog_name% %date% %page%"
+  setting :archives_desc_template, :string,
+          "Archives for %blog_name% %date% %page% %blog_subtitle%"
+  setting :search_title_template, :string, "Results for %search% | %blog_name% %page%"
+  setting :search_desc_template, :string,
+          "Results for %search% | %blog_name% | %blog_subtitle% %page%"
+  setting :statuses_title_template, :string, "Notes | %blog_name% %page%"
+  setting :statuses_desc_template, :string, "Notes | %blog_name% | %blog_subtitle% %page%"
+  setting :status_title_template, :string, "%body% | %blog_name%"
+  setting :status_desc_template, :string, "%excerpt%"
+
+  setting :custom_tracking_field, :string, ""
   # setting :meta_author_template,       :string, "%blog_name% | %nickname%"
 
-  setting :twitter_consumer_key, :string, ''
-  setting :twitter_consumer_secret, :string, ''
-  setting :custom_url_shortener, :string, ''
+  setting :twitter_consumer_key, :string, ""
+  setting :twitter_consumer_secret, :string, ""
+  setting :custom_url_shortener, :string, ""
   setting :statuses_in_timeline, :boolean, true
 
   validate :permalink_has_identifier
@@ -145,29 +147,19 @@ EOS
     Blog.find_by(base_url: base_url) || Blog.first || Blog.new
   end
 
-  # In settings with :article_id
-  def ping_article!(settings)
-    unless global_pings_enabled? && settings.key?(:url) && settings.key?(:article_id)
-      throw :error, 'Invalid trackback or trackbacks not enabled'
-    end
-    article = Article.find(settings[:article_id])
-    throw :error, 'Trackback not saved' unless article.allow_pings?
-    article.trackbacks.create!(settings)
-  end
-
   def global_pings_enabled?
     !global_pings_disable?
   end
 
   # Check that all required blog settings have a value.
   def configured?
-    settings.key?('blog_name')
+    settings.key?("blog_name")
   end
 
   # The +Theme+ object for the current theme.
   def current_theme(reload = nil)
     @current_theme = nil if reload
-    @current_theme ||= Theme.find(theme) || Theme.new('', '')
+    @current_theme ||= Theme.find(theme) || Theme.new("", "")
   end
 
   module BasedUrlFor
@@ -180,20 +172,22 @@ EOS
     def url_for(options = {}, extra_params = {})
       case options
       when String
+        options = options.sub(%r{^/}, "")
         url_generated = if extra_params[:only_path]
                           root_path
                         else
                           base_url
                         end
-        url_generated += "/#{options}" # They asked for 'url_for "/some/path"', so return it unedited.
+        # They asked for 'url_for "/some/path"', so return it unedited.
+        url_generated += "/#{options}"
         url_generated += "##{extra_params[:anchor]}" if extra_params[:anchor]
         url_generated
       when Hash
-        merged_opts = options.reverse_merge!(only_path: false, controller: '',
-                                             action: 'permalink',
+        merged_opts = options.reverse_merge!(only_path: false, controller: "",
+                                             action: "permalink",
                                              host: host_with_port,
                                              script_name: root_path)
-        cache_key = merged_opts.values.prepend('blog-urlfor-withbaseurl').join('-')
+        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
@@ -207,12 +201,11 @@ EOS
   prepend BasedUrlFor
 
   # The URL for a static file.
-  # FIXME: Let carrierwave handle this by itself
   def file_url(filename)
-    if CarrierWave.configure { |config| config.storage == CarrierWave::Storage::Fog }
+    if CarrierWave.configure { |config| config.storage.name == "CarrierWave::Storage::Fog" }
       filename
     else
-      url_for "files/#{filename}", only_path: false
+      url_for filename, only_path: false
     end
   end
 
@@ -221,7 +214,8 @@ EOS
   end
 
   def per_page(format)
-    return limit_article_display if format.nil? || format == 'html'
+    return limit_article_display if format.nil? || format == "html"
+
     limit_rss_display
   end
 
@@ -235,12 +229,12 @@ EOS
   end
 
   def permalink_has_identifier
-    unless permalink_format =~ /(%title%)/
-      errors.add(:base, I18n.t('errors.permalink_need_a_title'))
+    unless /(%title%)/.match?(permalink_format)
+      errors.add(:base, I18n.t("errors.permalink_need_a_title"))
     end
 
-    if permalink_format =~ /\.(atom|rss)$/
-      errors.add(:permalink_format, I18n.t('errors.cant_end_with_rss_or_atom'))
+    if /\.(atom|rss)$/.match?(permalink_format)
+      errors.add(:permalink_format, I18n.t("errors.cant_end_with_rss_or_atom"))
     end
   end
 
@@ -252,17 +246,10 @@ EOS
     TextFilter.find_or_default(text_filter)
   end
 
-  def urls_to_ping_for(article)
-    urls_to_ping = []
-    ping_urls.gsub(/ +/, '').split(/[\n\r]+/).map(&:strip).delete_if { |u| article.already_ping?(u) }.uniq.each do |url|
-      urls_to_ping << article.pings.build('url' => url)
-    end
-    urls_to_ping
-  end
-
   def has_twitter_configured?
     return false if twitter_consumer_key.nil? || twitter_consumer_secret.nil?
     return false if twitter_consumer_key.empty? || twitter_consumer_secret.empty?
+
     true
   end
 
@@ -282,10 +269,11 @@ EOS
 
   def split_base_url
     unless @split_base_url
-      unless base_url =~ /(https?):\/\/([^\/]*)(.*)/
-        raise "Invalid base_url: #{base_url}"
-      end
-      @split_base_url = { protocol: Regexp.last_match[1], host_with_port: Regexp.last_match[2], root_path: Regexp.last_match[3].gsub(%r{/$}, '') }
+      raise "Invalid base_url: #{base_url}" unless base_url =~ %r{(https?)://([^/]*)(.*)}
+
+      @split_base_url = { protocol: Regexp.last_match[1],
+                          host_with_port: Regexp.last_match[2],
+                          root_path: Regexp.last_match[3].gsub(%r{/$}, "") }
     end
     @split_base_url
   end

data/app/models/comment.rb

@@ -1,23 +1,22 @@
-require_dependency 'spam_protection'
-require 'timeout'
+# frozen_string_literal: true
+
+require "timeout"
 
 class Comment < Feedback
   belongs_to :user, optional: true
   content_fields :body
   validates :author, :body, presence: true
 
-  after_save :send_notifications
-
   attr_accessor :referrer, :permalink
 
-  scope :spam, -> { where(state: 'spam') }
+  scope :spam, -> { where(state: "spam") }
   scope :not_spam, -> { where("state != 'spam'") }
-  scope :presumed_spam, -> { where(state: 'presumed_spam') }
-  scope :presumed_ham, -> { where(state: 'presumed_ham') }
-  scope :ham, -> { where(state: 'ham') }
+  scope :presumed_spam, -> { where(state: "presumed_spam") }
+  scope :presumed_ham, -> { where(state: "presumed_ham") }
+  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?
@@ -35,11 +34,16 @@ class Comment < Feedback
     "Comment on #{article.title} by #{author}"
   end
 
+  def send_notifications
+    really_send_notifications
+  end
+
   protected
 
   def article_allows_feedback?
     return true if article.allow_comments?
-    errors.add(:article, 'Article is not open to comments')
+
+    errors.add(:article, "Article is not open to comments")
     false
   end
 

data/app/models/config_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ConfigManager
   def self.append_features(base)
     super
@@ -35,7 +37,7 @@ module ConfigManager
         raw_value.nil? ? item.default : raw_value
       end
       if item.ruby_type == :boolean
-        send(:define_method, item.name + '?') do
+        send(:define_method, "#{item.name}?") do
           raw_value = settings[item.name]
           raw_value.nil? ? item.default : raw_value
         end
@@ -62,7 +64,7 @@ module ConfigManager
       case ruby_type
       when :boolean
         case value
-        when '0', 0, '', false, 'false', 'f', nil
+        when "0", 0, "", false, "false", "f", nil
           false
         else
           true