publify_core 9.1.0 → 9.2.0

data/app/models/comment.rb

@@ -1,4 +1,6 @@
-require 'timeout'
+# frozen_string_literal: true
+
+require "timeout"
 
 class Comment < Feedback
   belongs_to :user, optional: true
@@ -7,14 +9,14 @@ class Comment < Feedback
 
   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?
@@ -40,7 +42,8 @@ class Comment < Feedback
 
   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

data/app/models/content.rb

@@ -1,34 +1,40 @@
-require 'set'
-require 'uri'
+# frozen_string_literal: true
+
+require "set"
+require "uri"
 
 class Content < ApplicationRecord
   include ContentBase
 
-  belongs_to :text_filter, optional: true
   belongs_to :user, optional: true, touch: true
   belongs_to :blog
 
   validates :blog, presence: true
 
-  has_one :redirect, dependent: :destroy, inverse_of: :contents
+  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 :published, -> { where(state: 'published'). order(default_order) }
-  scope :published_at, ->(time_params) { 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 :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))
+                       }
+  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 :searchstring, lambda { |search_string|
-    tokens = search_string.split(' ').map { |c| "%#{c.downcase}%" }
-    where('state = ? AND ' + (['(LOWER(body) LIKE ? OR LOWER(extended) LIKE ? OR LOWER(title) LIKE ?)'] * tokens.size).join(' AND '),
-          'published', *tokens.map { |token| [token] * 3 }.flatten)
+    tokens = search_string.split(" ").map { |c| "%#{c.downcase}%" }
+    matcher = "(LOWER(body) LIKE ? OR LOWER(extended) LIKE ? OR LOWER(title) LIKE ?)"
+    template = "state = ? AND #{([matcher] * tokens.size).join(" AND ")}"
+    where(template, "published", *tokens.map { |token| [token] * 3 }.flatten)
   }
 
-  scope :published_at_like, ->(date_at) { where(published_at: PublifyTime.delta_like(date_at)) }
+  scope :published_at_like, lambda { |date_at|
+                              where(published_at: PublifyTime.delta_like(date_at))
+                            }
 
   serialize :whiteboard
 
@@ -49,28 +55,12 @@ class Content < ApplicationRecord
     end
   end
 
-  # Set the text filter for this object.
-  # NOTE: Due to how Rails injects association methods, this cannot be put in ContentBase
-  # TODO: Allowing assignment of a string here is not very clean.
-  def text_filter=(filter)
-    filter_object = case filter
-                    when TextFilter
-                      filter
-                    else
-                      TextFilter.find_or_default(filter)
-                    end
-    self.text_filter_id = if filter_object
-                            filter_object.id
-                          else
-                            filter.to_i
-                          end
-  end
-
   def shorten_url
     return unless published?
 
     if redirect.present?
       return if redirect.to_path == permalink_url
+
       redirect.to_path = permalink_url
       redirect.save
     else
@@ -91,13 +81,17 @@ class Content < ApplicationRecord
     scoped = unscoped
     scoped = scoped.searchstring(params[:searchstring]) if params[:searchstring].present?
 
-    scoped = scoped.published_at_like(params[:published_at]) if params[:published_at].present? && /(\d\d\d\d)-(\d\d)/ =~ params[:published_at]
+    if params[:published_at].present? && /(\d\d\d\d)-(\d\d)/ =~ params[:published_at]
+      scoped = scoped.published_at_like(params[:published_at])
+    end
 
-    scoped = scoped.user_id(params[:user_id]) if params[:user_id].present? && params[:user_id].to_i > 0
+    if params[:user_id].present? && params[:user_id].to_i > 0
+      scoped = scoped.user_id(params[:user_id])
+    end
 
     if params[:published].present?
-      scoped = scoped.published if params[:published].to_s == '1'
-      scoped = scoped.not_published if params[:published].to_s == '0'
+      scoped = scoped.published if params[:published].to_s == "1"
+      scoped = scoped.not_published if params[:published].to_s == "0"
     end
 
     scoped
@@ -108,13 +102,13 @@ class Content < ApplicationRecord
   end
 
   def rss_description
-    return '' unless blog.rss_description
+    return "" unless blog.rss_description
 
     rss_desc = blog.rss_description_text
-    rss_desc.gsub!('%author%', author_name)
-    rss_desc.gsub!('%blog_url%', blog.base_url)
-    rss_desc.gsub!('%blog_name%', blog.blog_name)
-    rss_desc.gsub!('%permalink_url%', permalink_url)
+    rss_desc.gsub!("%author%", author_name)
+    rss_desc.gsub!("%blog_url%", blog.base_url)
+    rss_desc.gsub!("%blog_name%", blog.blog_name)
+    rss_desc.gsub!("%permalink_url%", permalink_url)
     rss_desc
   end
 

data/app/models/content_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ContentBase
   def self.included(base)
     base.extend ClassMethods
@@ -52,7 +54,7 @@ module ContentBase
   end
 
   def excerpt_text(length = 160)
-    text = if respond_to?(:excerpt) && (excerpt || '') != ''
+    text = if respond_to?(:excerpt) && (excerpt || "") != ""
              generate_html(:excerpt, excerpt)
            else
              html(:all)
@@ -61,7 +63,11 @@ module ContentBase
     text = text.strip_html
 
     text.slice(0, length) +
-      (text.length > length ? '...' : '')
+      (text.length > length ? "..." : "")
+  end
+
+  def text_filter
+    TextFilter.make_filter(text_filter_name)
   end
 
   # The default text filter.  Generally, this is the filter specified by blog.text_filter,
@@ -76,7 +82,7 @@ module ContentBase
     end
 
     def default_order
-      'published_at DESC'
+      "published_at DESC"
     end
   end
 end

data/app/models/feedback.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require 'aasm'
-require 'akismet'
+require "aasm"
+require "akismet"
 
 class Feedback < ApplicationRecord
-  self.table_name = 'feedback'
+  self.table_name = "feedback"
 
-  belongs_to :text_filter, optional: true
   belongs_to :article, touch: true
 
   include PublifyGuid
@@ -21,17 +20,17 @@ class Feedback < ApplicationRecord
   validate :feedback_not_closed, on: :create
   validates :article, presence: true
 
-  before_create :create_guid, :article_allows_this_feedback
   before_save :correct_url, :classify_content
+  before_create :create_guid, :article_allows_this_feedback
 
   # TODO: Rename so it doesn't sound like only approved ham
   scope :ham, -> { where(state: %w(presumed_ham ham)) }
 
-  scope :spam, -> { where(state: 'spam') }
-  scope :created_since, ->(time) { ham.where('created_at > ?', time) }
-  scope :presumed_ham, -> { where(state: 'presumed_ham') }
-  scope :presumed_spam, -> { where(state: 'presumed_spam') }
-  scope :unapproved, -> { where(state: ['presumed_spam', 'presumed_ham']) }
+  scope :spam, -> { where(state: "spam") }
+  scope :created_since, ->(time) { ham.where("created_at > ?", time) }
+  scope :presumed_ham, -> { where(state: "presumed_ham") }
+  scope :presumed_spam, -> { where(state: "presumed_spam") }
+  scope :unapproved, -> { where(state: ["presumed_spam", "presumed_ham"]) }
 
   scope :published, -> { ham }
   scope :oldest_first, -> { order(:created_at) }
@@ -97,7 +96,8 @@ class Feedback < ApplicationRecord
 
   def correct_url
     return if url.blank?
-    self.url = 'http://' + url.to_s unless url =~ %r{^https?://}
+
+    self.url = "http://#{url}" unless %r{^https?://}.match?(url)
   end
 
   def article_allows_this_feedback
@@ -157,13 +157,13 @@ class Feedback < ApplicationRecord
   end
 
   def change_state!
-    result = ''
+    result = ""
     if spam? || presumed_spam?
       mark_as_ham!
-      result = 'ham'
+      result = "ham"
     else
       mark_as_spam!
-      result = 'spam'
+      result = "spam"
     end
     result
   end
@@ -183,6 +183,7 @@ class Feedback < ApplicationRecord
 
   def report_as_spam
     return if akismet.nil?
+
     begin
       Timeout.timeout(5) do
         akismet.submit_spam(ip, user_agent, akismet_options)
@@ -194,6 +195,7 @@ class Feedback < ApplicationRecord
 
   def report_as_ham
     return if akismet.nil?
+
     begin
       Timeout.timeout(5) do
         akismet.ham(ip, user_agent, akismet_options)
@@ -204,7 +206,7 @@ class Feedback < ApplicationRecord
   end
 
   def feedback_not_closed
-    errors.add(:article_id, 'Comment are closed') if article.comments_closed?
+    errors.add(:article_id, "Comment are closed") if article.comments_closed?
   end
 
   def send_notifications
@@ -233,9 +235,10 @@ class Feedback < ApplicationRecord
 
   def akismet_client
     return nil if blog.sp_akismet_key.blank?
+
     client = Akismet::Client.new(blog.sp_akismet_key, blog.base_url)
     begin
-      return client.verify_key ? client : nil
+      client.verify_key ? client : nil
     rescue SocketError
       nil
     end

data/app/models/meta_sidebar.rb

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

data/app/models/note.rb

@@ -1,27 +1,29 @@
+# frozen_string_literal: true
+
 class Note < Content
-  require 'twitter'
-  require 'json'
-  require 'uri'
+  require "twitter"
+  require "json"
+  require "uri"
   include PublifyGuid
   include ConfigManager
 
   serialize :settings, Hash
 
-  setting :twitter_id, :string, ''
-  setting :in_reply_to_status_id, :string, ''
+  setting :twitter_id, :string, ""
+  setting :in_reply_to_status_id, :string, ""
   setting :in_reply_to_protected, :boolean, false
-  setting :in_reply_to_message, :string, ''
+  setting :in_reply_to_message, :string, ""
 
   validates :body, presence: true
   validates :permalink, :guid, uniqueness: true
 
-  after_create :set_permalink, :shorten_url
   before_create :create_guid
+  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
@@ -46,10 +48,10 @@ class Note < Content
   end
 
   def truncate(message, length)
-    if message[length + 1] == ' '
+    if message[length + 1] == " "
       message[0..length]
     else
-      message[0..(message[0..length].rindex(' ') - 1)]
+      message[0..(message[0..length].rindex(" ") - 1)]
     end
   end
 
@@ -65,7 +67,7 @@ class Note < Content
 
   # FIXME: This breaks if the user changes or deletes their handle.
   def twitter_url
-    File.join('https://twitter.com', user.twitter, 'status', twitter_id)
+    File.join("https://twitter.com", user.twitter, "status", twitter_id)
   end
 
   def send_to_twitter
@@ -81,7 +83,7 @@ class Note < Content
 
     begin
       options = {}
-      if in_reply_to_status_id && in_reply_to_status_id != ''
+      if in_reply_to_status_id && in_reply_to_status_id != ""
         options = { in_reply_to_status_id: in_reply_to_status_id }
         self.in_reply_to_message = twitter.status(in_reply_to_status_id).to_json
       end
@@ -109,8 +111,8 @@ class Note < Content
 
   def permalink_url(anchor = nil, only_path = false)
     blog.url_for(
-      controller: '/notes',
-      action: 'show',
+      controller: "/notes",
+      action: "show",
       permalink: permalink,
       anchor: anchor,
       only_path: only_path)
@@ -122,11 +124,11 @@ class Note < Content
   end
 
   def prefix
-    blog.shortener_url.sub(%r{^https?://}, '')
+    blog.shortener_url.sub(%r{^https?://}, "")
   end
 
   def published?
-    state == 'published'
+    state == "published"
   end
 
   private
@@ -135,13 +137,13 @@ class Note < Content
     uris = URI.extract(message, %w(http https ftp))
     uris << prefix
     uris.each do |uri|
-      payload = case uri.split(':')[0]
-                when 'https'
-                  '-' * TWITTER_HTTPS_URL_LENGTH
-                when 'ftp'
-                  '-' * TWITTER_FTP_URL_LENGTH
+      payload = case uri.split(":")[0]
+                when "https"
+                  "-" * TWITTER_HTTPS_URL_LENGTH
+                when "ftp"
+                  "-" * TWITTER_FTP_URL_LENGTH
                 else
-                  '-' * TWITTER_HTTP_URL_LENGTH
+                  "-" * TWITTER_HTTP_URL_LENGTH
                 end
       message = message.gsub(uri, payload)
     end

data/app/models/page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Page < Content
   validates :title, :body, presence: true
   validates :name, uniqueness: true
@@ -5,7 +7,7 @@ class Page < Content
   include ConfigManager
 
   serialize :settings, Hash
-  setting :password, :string, ''
+  setting :password, :string, ""
 
   before_save :set_permalink
   after_save :shorten_url
@@ -17,24 +19,24 @@ class Page < Content
   content_fields :body
 
   def self.default_order
-    'title ASC'
+    "title ASC"
   end
 
   def permalink_url(anchor = nil, only_path = false)
     blog.url_for(
-      controller: '/articles',
-      action: 'view_page',
+      controller: "/articles",
+      action: "view_page",
       name: name,
       anchor: anchor,
       only_path: only_path)
   end
 
   def publish!
-    self.state = 'published'
+    self.state = "published"
     save!
   end
 
   def published?
-    state == 'published'
+    state == "published"
   end
 end