publify_core 9.0.0.pre6 → 9.2.1

data/app/models/note.rb

@@ -1,24 +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
 
-  default_scope { order('published_at DESC') }
+  scope :published, lambda {
+    where(state: "published").where("published_at <= ?", Time.zone.now).order(default_order)
+  }
+  default_scope { order("published_at DESC") }
 
   TWITTER_FTP_URL_LENGTH = 19
   TWITTER_HTTP_URL_LENGTH = 20
@@ -43,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
 
@@ -62,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
@@ -78,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
@@ -106,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
@@ -120,7 +124,11 @@ class Note < Content
   end
 
   def prefix
-    blog.shortener_url.sub(/^https?\:\/\//, '')
+    blog.shortener_url.sub(%r{^https?://}, "")
+  end
+
+  def published?
+    state == "published"
   end
 
   private
@@ -129,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,20 +19,24 @@ class Page < Content
   content_fields :body
 
   def self.default_order
-    'name ASC'
-  end
-
-  def self.search_with(search_hash)
-    super(search_hash).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"
+    save!
+  end
+
+  def 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,116 +1,5 @@
-require 'rexml/document'
-require 'xmlrpc/client'
+# frozen_string_literal: true
 
-class Ping < ActiveRecord::Base
+class Ping < ApplicationRecord
   belongs_to :article
-
-  class Pinger
-    attr_accessor :article
-    attr_accessor :blog
-
-    def send_pingback_or_trackback
-      @response = Net::HTTP.get_response(URI.parse(ping.url))
-      send_pingback or send_trackback
-    rescue Timeout::Error
-      Rails.logger.info 'Sending pingback or trackback timed out'
-      return
-    rescue => err
-      Rails.logger.info "Sending pingback or trackback failed with error: #{err}"
-    end
-
-    def pingback_url
-      if response['X-Pingback']
-        response['X-Pingback']
-      elsif response.body =~ /<link rel="pingback" href="([^"]+)" ?\/?>/
-        Regexp.last_match[1]
-      end
-    end
-
-    attr_reader :origin_url
-
-    attr_reader :response
-
-    attr_reader :ping
-
-    def send_xml_rpc(*args)
-      ping.send(:send_xml_rpc, *args)
-    end
-
-    def trackback_url
-      rdfs = response.body.scan(/<rdf:RDF.*?<\/rdf:RDF>/m)
-      rdfs.each do |rdf|
-        xml = REXML::Document.new(rdf)
-        xml.elements.each('//rdf:Description') do |desc|
-          if rdfs.size == 1 || desc.attributes['dc:identifier'] == ping.url
-            return desc.attributes['trackback:ping']
-          end
-        end
-      end
-      # Didn't find a trackback url, so fall back to the url itself.
-      @ping.url
-    end
-
-    def send_pingback
-      if pingback_url
-        send_xml_rpc(pingback_url, 'pingback.ping', origin_url, ping.url)
-        true
-      else
-        false
-      end
-    end
-
-    def send_trackback
-      do_send_trackback(trackback_url, origin_url)
-    end
-
-    def do_send_trackback(trackback_url, origin_url)
-      trackback_uri = URI.parse(trackback_url)
-
-      post = "title=#{CGI.escape(article.title)}"
-      post << "&excerpt=#{CGI.escape(article.html(:body).strip_html[0..254])}"
-      post << "&url=#{origin_url}"
-      post << "&blog_name=#{CGI.escape(blog.blog_name)}"
-
-      path = trackback_uri.path
-      path += "?#{trackback_uri.query}" if trackback_uri.query
-
-      Net::HTTP.start(trackback_uri.host, trackback_uri.port) do |http|
-        http.post(path, post, 'Content-type' => 'application/x-www-form-urlencoded; charset=utf-8')
-      end
-    end
-
-    private
-
-    def initialize(origin_url, ping)
-      @origin_url = origin_url
-      @ping = ping
-      # Add this call to text filter cause of a strange thing around text_filter. Need to clean text_filter usage !
-      ping.article.default_text_filter
-      ping.article.text_filter
-      # Make sure these are fetched now for thread safety purposes.
-      self.article = ping.article
-      self.blog = article.blog
-    end
-  end
-
-  def send_pingback_or_trackback(origin_url)
-    t = Thread.start(Pinger.new(origin_url, self), &:send_pingback_or_trackback)
-    t
-  end
-
-  def send_weblogupdatesping(server_url, origin_url)
-    t = Thread.start(article.blog.blog_name) do |blog_name|
-      send_xml_rpc(url, 'weblogUpdates.ping', blog_name, server_url, origin_url)
-    end
-    t
-  end
-
-  protected
-
-  def send_xml_rpc(xml_rpc_url, name, *args)
-    server = XMLRPC::Client.new2(URI.parse(xml_rpc_url).to_s)
-    server.call(name, *args)
-  rescue => e
-    logger.error(e)
-  end
 end

data/app/models/post_type.rb

@@ -1,12 +1,13 @@
-# coding: utf-8
-class PostType < ActiveRecord::Base
+# frozen_string_literal: true
+
+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
+# 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,28 +1,12 @@
-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 :article, optional: true
+  belongs_to :content, optional: true
 
   mount_uploader :upload, ResourceUploader
-  validate :image_mime_type_consistent
   validates :upload, presence: true
-
-  scope :without_images, -> { where("mime NOT LIKE '%image%'") }
-  scope :images, -> { where("mime LIKE '%image%'") }
-  scope :by_filename, -> { order('upload') }
-  scope :by_created_at, -> { order('created_at DESC') }
-
-  scope :without_images_by_filename, -> { without_images.by_filename }
-  scope :images_by_created_at, -> { images.by_created_at }
-
-  private
-
-  def image_mime_type_consistent
-    if upload.content_type =~ %r{^image/}
-      expected_type = upload.file.send :mime_magic_content_type
-      errors.add(:upload, 'Has MIME type mismatch') unless upload.content_type == expected_type
-    end
-  end
 end

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

data/app/models/sidebar.rb

@@ -1,7 +1,9 @@
-require 'sidebar_field'
+# frozen_string_literal: true
+
+require "sidebar_field"
 
 # This class cannot be autoloaded since other sidebar classes depend on it.
-class Sidebar < ActiveRecord::Base
+class Sidebar < ApplicationRecord
   serialize :config, Hash
 
   belongs_to :blog
@@ -24,7 +26,7 @@ class Sidebar < ActiveRecord::Base
   end
 
   def self.purge
-    delete_all('active_position is null and staged_position is null')
+    delete_all("active_position is null and staged_position is null")
   end
 
   def self.setting(key, default = nil, options = {})
@@ -55,7 +57,7 @@ class Sidebar < ActiveRecord::Base
     if desc
       @description = desc
     else
-      @description || ''
+      @description || ""
     end
   end
 
@@ -90,7 +92,7 @@ class Sidebar < ActiveRecord::Base
   end
 
   def html_id
-    short_name + '-' + id.to_s
+    "#{short_name}-#{id}"
   end
 
   def parse_request(_contents, _params); end
@@ -125,13 +127,16 @@ class Sidebar < ActiveRecord::Base
 
   def to_locals_hash
     fields.reduce(sidebar: self) do |hash, field|
-      hash.merge(field.key => config[field.key])
+      hash.merge(field.key => field.current_value(self))
     end
   end
 
   def admin_state
-    return :active if active_position && (staged_position == active_position || staged_position.nil?)
+    if active_position && (staged_position == active_position || staged_position.nil?)
+      return :active
+    end
     return :will_change_position if active_position != staged_position
+
     raise "Unknown admin_state: active: #{active_position}, staged: #{staged_position}"
   end
 end