publify_core 9.0.0 → 9.2.2

data/app/models/content_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ContentBase
   def self.included(base)
     base.extend ClassMethods
@@ -24,7 +26,7 @@ module ContentBase
     elsif html_map(field)
       generate_html(field)
     else
-      raise "Unknown field: #{field.inspect} in content.html"
+      raise ArgumentError, "Field #{field.inspect} is not valid for #{self.class}"
     end
   end
 
@@ -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 < ActiveRecord::Base
-  self.table_name = 'feedback'
+class Feedback < ApplicationRecord
+  self.table_name = "feedback"
 
-  belongs_to :text_filter, optional: true
   belongs_to :article, touch: true
 
   include PublifyGuid
@@ -21,17 +20,17 @@ class Feedback < ActiveRecord::Base
   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) }
@@ -68,6 +67,7 @@ class Feedback < ActiveRecord::Base
     end
   end
 
+  # FIXME: Inline this method
   def self.paginated(page, per_page)
     page(page).per(per_page)
   end
@@ -96,7 +96,8 @@ class Feedback < ActiveRecord::Base
 
   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
@@ -156,13 +157,13 @@ class Feedback < ActiveRecord::Base
   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
@@ -182,6 +183,7 @@ class Feedback < ActiveRecord::Base
 
   def report_as_spam
     return if akismet.nil?
+
     begin
       Timeout.timeout(5) do
         akismet.submit_spam(ip, user_agent, akismet_options)
@@ -193,6 +195,7 @@ class Feedback < ActiveRecord::Base
 
   def report_as_ham
     return if akismet.nil?
+
     begin
       Timeout.timeout(5) do
         akismet.ham(ip, user_agent, akismet_options)
@@ -203,7 +206,7 @@ class Feedback < ActiveRecord::Base
   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
@@ -232,9 +235,10 @@ class Feedback < ActiveRecord::Base
 
   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,9 +1,10 @@
-# coding: utf-8
+# 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,12 +111,11 @@ 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
-    )
+      only_path: only_path)
   end
 
   def short_link
@@ -123,11 +124,11 @@ class Note < Content
   end
 
   def prefix
-    blog.shortener_url.sub(/^https?\:\/\//, '')
+    blog.shortener_url.sub(%r{^https?://}, "")
   end
 
   def published?
-    state == 'published'
+    state == "published"
   end
 
   private
@@ -136,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,25 +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
-    )
+      only_path: only_path)
   end
 
   def publish!
-    self.state = 'published'
+    self.state = "published"
     save!
   end
 
   def published?
-    state == 'published'
+    state == "published"
   end
 end

data/app/models/page_sidebar.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class PageSidebar < Sidebar
-  display_name 'Page'
-  description 'Show pages for this blog'
+  display_name "Page"
+  description "Show pages for this blog"
 
   setting :maximum_pages, 10
 

data/app/models/ping.rb

@@ -1,3 +1,5 @@
-class Ping < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Ping < ApplicationRecord
   belongs_to :article
 end

data/app/models/post_type.rb

@@ -1,13 +1,13 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-class PostType < ActiveRecord::Base
+class PostType < ApplicationRecord
   validates :name, uniqueness: true
   validates :name, presence: true
   validate :name_is_not_read
   before_save :sanitize_title
 
   def name_is_not_read
-    errors.add(:name, I18n.t('errors.article_type_already_exist')) if name == 'read'
+    errors.add(:name, I18n.t("errors.article_type_already_exist")) if name == "read"
   end
 
   def sanitize_title

data/app/models/redirect.rb

@@ -1,5 +1,7 @@
-class Redirect < ActiveRecord::Base
-  belongs_to :contents, optional: true, touch: true
+# frozen_string_literal: true
+
+class Redirect < ApplicationRecord
+  belongs_to :content, optional: true, touch: true
   belongs_to :blog
 
   validates :from_path, uniqueness: true
@@ -8,9 +10,13 @@ class Redirect < ActiveRecord::Base
 
   def full_to_path
     path = to_path
-    return path if path =~ /^(https?):\/\/([^\/]*)(.*)/
+    # FIXME: Unify HTTP URI matchers
+    return path if %r{^(https?)://([^/]*)(.*)}.match?(path)
+
     url_root = blog.root_path
-    path = File.join(url_root, path) unless url_root.nil? || path[0, url_root.length] == url_root
+    unless url_root.nil? || path[0, url_root.length] == url_root
+      path = File.join(url_root, path)
+    end
     path
   end
 
@@ -23,7 +29,7 @@ class Redirect < ActiveRecord::Base
   end
 
   def to_url
-    raise 'Use #from_url'
+    raise "Use #from_url"
   end
 
   def from_url
@@ -33,8 +39,8 @@ class Redirect < ActiveRecord::Base
   private
 
   def random_token
-    characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890'
-    temp_token = ''
+    characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890"
+    temp_token = ""
     srand
     6.times do
       pos = rand(characters.length)

data/app/models/redirection.rb

@@ -1,4 +1,6 @@
-class Redirection < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Redirection < ApplicationRecord
   belongs_to :content
   belongs_to :redirect
 end

data/app/models/resource.rb

@@ -1,7 +1,9 @@
-require 'carrierwave'
-require 'carrierwave/orm/activerecord'
+# frozen_string_literal: true
 
-class Resource < ActiveRecord::Base
+require "carrierwave"
+require "carrierwave/orm/activerecord"
+
+class Resource < ApplicationRecord
   belongs_to :blog
   belongs_to :content, optional: true
 

data/app/models/search_sidebar.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class SearchSidebar < Sidebar
-  description 'Adds basic search sidebar in your Publify blog'
+  description "Adds basic search sidebar in your Publify blog"
 
-  setting :title, 'Search'
+  setting :title, "Search"
 end
 
 SidebarRegistry.register_sidebar SearchSidebar