publify_core 9.0.0.pre6 → 9.0.0

data/app/models/article.rb

@@ -1,4 +1,6 @@
 # coding: utf-8
+
+require 'aasm'
 require 'uri'
 require 'net/http'
 
@@ -16,29 +18,24 @@ class Article < Content
   has_many :pings, dependent: :destroy
   has_many :trackbacks, dependent: :destroy
   has_many :feedback
-  has_many :resources, inverse_of: :article, dependent: :nullify
   has_many :triggers, as: :pending_item
   has_many :comments, dependent: :destroy
 
-  has_and_belongs_to_many :tags, join_table: 'articles_tags'
-
   before_create :create_guid
-  before_save :set_published_at, :set_permalink
-  after_save :post_trigger, :keywords_to_tags, :shorten_url
-  after_save :send_pings
-  after_save :send_notifications
+  before_save :set_permalink
+  after_save :keywords_to_tags, :shorten_url
 
-  scope :drafts, -> { where(state: 'draft').order('created_at DESC') }
   scope :child_of, ->(article_id) { where(parent_id: article_id) }
-  scope :published_at, ->(time_params) { published.where(published_at: PublifyTime.delta(*time_params)).order('published_at DESC') }
-  scope :published_since, ->(time) { published.where('published_at > ?', time).order('published_at DESC') }
-  scope :withdrawn, -> { where(state: 'withdrawn').order('published_at DESC') }
-  scope :pending, -> { where('state = ? and published_at > ?', 'publication_pending', Time.now).order('published_at DESC') }
+  scope :published_since, ->(time) {
+    published.where('published_at > ?', time).order(default_order)
+  }
+  scope :withdrawn, -> { where(state: 'withdrawn').order(default_order) }
+  scope :pending, -> { where(state: 'publication_pending'). order(default_order) }
 
   scope :bestof, lambda {
     joins(:feedback).
-      where('feedback.published' => true, 'feedback.type' => 'Comment',
-            'contents.published' => true).
+      where('feedback.type' => 'Comment',
+            'contents.state' => 'published').
       group('contents.id').
       order('count(feedback.id) DESC').
       select('contents.*, count(feedback.id) as comment_count').
@@ -49,19 +46,41 @@ class Article < Content
 
   attr_accessor :draft, :keywords
 
-  include Article::States
+  include AASM
+
+  aasm column: :state do
+    state :draft, initial: true
+    # TODO: Disallow if published_at in past
+    state :publication_pending, after_enter: :trigger_publication
+    state :published, after_enter: :really_send_notifications
+    state :withdrawn
+
+    event :withdraw do
+      transitions from: :published, to: :withdrawn
+      transitions from: :publication_pending, to: :draft
+    end
+
+    event :publish do
+      before do
+        self.published_at ||= Time.zone.now
+      end
+
+      transitions from: [:new, :draft], to: :publication_pending do
+        guard do
+          published_at > Time.zone.now
+        end
+      end
 
-  has_state(:state, valid_states: [:new, :draft,
-                                   :publication_pending, :just_published, :published,
-                                   :just_withdrawn, :withdrawn],
-                    initial_state: :new,
-                    handles: [:withdraw,
-                              :post_trigger,
-                              :send_pings, :send_notifications,
-                              :published_at=, :published=, :just_published?])
+      transitions from: [:new, :draft, :publication_pending], to: :published do
+        guard do
+          published_at <= Time.zone.now
+        end
+      end
+    end
+  end
 
   def set_permalink
-    return if state == 'draft' || permalink.present?
+    return if draft? || permalink.present?
     self.permalink = title.to_permalink
   end
 
@@ -93,6 +112,7 @@ class Article < Content
 
   # FIXME: Use keyword params to clean up call sites.
   def permalink_url(anchor = nil, only_path = false)
+    return unless published?
     @cached_permalink_url ||= {}
     @cached_permalink_url["#{anchor}#{only_path}"] ||= blog.url_for(permalink_url_options, anchor: anchor, only_path: only_path)
   end
@@ -106,10 +126,6 @@ class Article < Content
     resources.create!(upload: file, blog: blog)
   end
 
-  def trackback_url
-    blog.url_for("trackbacks?article_id=#{id}", only_path: false)
-  end
-
   def comment_url
     blog.url_for("comments?article_id=#{id}", only_path: true)
   end
@@ -122,30 +138,6 @@ class Article < Content
     "#{permalink_url}.#{format.gsub(/\d/, '')}"
   end
 
-  def really_send_pings
-    return unless blog.send_outbound_pings
-
-    blog.urls_to_ping_for(self).each do |url_to_ping|
-      begin
-        url_to_ping.send_weblogupdatesping(blog.base_url, permalink_url)
-      rescue => e
-        logger.error(e)
-        # in case the remote server doesn't respond or gives an error,
-        # we should throw an xmlrpc error here.
-      end
-    end
-
-    html_urls_to_ping.each do |url_to_ping|
-      begin
-        url_to_ping.send_pingback_or_trackback(permalink_url)
-      rescue => e
-        logger.error(e)
-        # in case the remote server doesn't respond or gives an error,
-        # we should throw an xmlrpc error here.
-      end
-    end
-  end
-
   def next
     Article.where('published_at > ?', published_at).order('published_at asc').limit(1).first
   end
@@ -154,9 +146,13 @@ class Article < Content
     Article.where('published_at < ?', published_at).order('published_at desc').limit(1).first
   end
 
+  def publication_month
+    published_at.strftime('%Y-%m')
+  end
+
   def self.publication_months
     result = select('published_at').where('published_at is not NULL').where(type: 'Article')
-    result.map { |d| [d.published_at.strftime('%Y-%m')] }.uniq
+    result.map { |it| [it.publication_month] }.uniq
   end
 
   # Finds one article which was posted on a certain date and matches the supplied dashed-title
@@ -251,7 +247,7 @@ class Article < Content
   end
 
   def password_protected?
-    !password.blank?
+    password.present?
   end
 
   def add_comment(params)
@@ -262,10 +258,6 @@ class Article < Content
     user.admin? || user_id == user.id
   end
 
-  def already_ping?(url)
-    pings.map(&:url).include?(url)
-  end
-
   def allow_comments?
     return allow_comments unless allow_comments.nil?
     blog.default_allow_comments
@@ -288,14 +280,6 @@ class Article < Content
     feedback.published.oldest_first
   end
 
-  protected
-
-  def set_published_at
-    if published && self[:published_at].nil?
-      self[:published_at] = created_at || Time.now
-    end
-  end
-
   private
 
   def permalink_url_options
@@ -311,11 +295,8 @@ class Article < Content
     end
   end
 
-  def html_urls_to_ping
-    urls_to_ping = []
-    html_urls.delete_if { |url| already_ping?(url) }.uniq.each do |url_to_ping|
-      urls_to_ping << pings.build('url' => url_to_ping)
-    end
-    urls_to_ping
+  def trigger_publication
+    # TODO: Skip if already published, update when published_at changes
+    Trigger.post_action(published_at, self, 'publish!')
   end
 end

data/app/models/article/factory.rb

@@ -11,7 +11,7 @@ class Article::Factory
       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.state = 'draft'
     end
   end
 

data/app/models/blog.rb

@@ -13,9 +13,7 @@ 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
@@ -62,7 +60,6 @@ class Blog < ActiveRecord::Base
   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 :allow_signup, :integer, 0
@@ -76,25 +73,24 @@ class Blog < ActiveRecord::Base
   setting :meta_description, :string, ''
   setting :meta_keywords, :string, ''
   setting :google_analytics, :string, ''
-  setting :feedburner_url, :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>
+  setting :rss_description_text, :string, <<EOS.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>
 EOS
   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}
+  setting :humans, :string, <<EOS.strip_heredoc
+    /* 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 :unindex_categories, :boolean, false
@@ -145,16 +141,6 @@ 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
@@ -207,12 +193,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
 
@@ -252,14 +237,6 @@ 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?

data/app/models/comment.rb

@@ -1,4 +1,3 @@
-require_dependency 'spam_protection'
 require 'timeout'
 
 class Comment < Feedback
@@ -6,8 +5,6 @@ class Comment < Feedback
   content_fields :body
   validates :author, :body, presence: true
 
-  after_save :send_notifications
-
   attr_accessor :referrer, :permalink
 
   scope :spam, -> { where(state: 'spam') }
@@ -35,6 +32,10 @@ class Comment < Feedback
     "Comment on #{article.title} by #{author}"
   end
 
+  def send_notifications
+    really_send_notifications
+  end
+
   protected
 
   def article_allows_feedback?

data/app/models/content.rb

@@ -2,12 +2,10 @@ require 'set'
 require 'uri'
 
 class Content < ActiveRecord::Base
-  include Stateful
-
   include ContentBase
 
   belongs_to :text_filter, optional: true
-  belongs_to :user, optional: true
+  belongs_to :user, optional: true, touch: true
   belongs_to :blog
 
   validates :blog, presence: true
@@ -15,19 +13,24 @@ class Content < ActiveRecord::Base
   has_one :redirect, dependent: :destroy, inverse_of: :contents
 
   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(published: true, published_at: Time.at(0)..Time.now).order('published_at DESC') }
-  scope :published_at, ->(time_params) { published.where(published_at: PublifyTime.delta(*time_params)).order('published_at DESC') }
-  scope :not_published, -> { where('published = ?', false) }
-  scope :draft, -> { where('state = ?', 'draft') }
-  scope :no_draft, -> { where('state <> ?', 'draft').order('published_at DESC') }
+  scope :published, -> { where(state: 'published'). order(default_order) }
+  scope :published_at, ->(time_params) {
+    published.
+    where(published_at: PublifyTime.delta(*time_params)).
+    order('published_at DESC')
+  }
+  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)
   }
-  scope :already_published, -> { where('published = ? AND published_at < ?', true, Time.now).order(default_order) }
 
   scope :published_at_like, ->(date_at) { where(published_at: PublifyTime.delta_like(date_at)) }
 
@@ -60,7 +63,7 @@ class Content < ActiveRecord::Base
   end
 
   def shorten_url
-    return unless published
+    return unless published?
 
     if redirect.present?
       return if redirect.to_path == permalink_url
@@ -74,8 +77,9 @@ class Content < ActiveRecord::Base
     end
   end
 
-  def self.find_already_published(_limit)
-    where('published_at < ?', Time.now).limit(1000).order('created_at DESC')
+  # TODO: Inline this method
+  def self.find_already_published(limit)
+    published.limit(limit)
   end
 
   def self.search_with(params)
@@ -105,13 +109,8 @@ class Content < ActiveRecord::Base
     self[:whiteboard] ||= {}
   end
 
-  def withdraw!
-    withdraw
-    save!
-  end
-
   def link_to_author?
-    !user.email.blank? && blog.link_to_author
+    user.email.present? && blog.link_to_author
   end
 
   def get_rss_description
@@ -127,8 +126,6 @@ class Content < ActiveRecord::Base
   end
 
   def short_url
-    # Double check because of crappy data in my own old database
-    return unless published && redirect.present?
-    redirect.from_url
+    redirect.from_url if redirect.present?
   end
 end

data/app/models/content_base.rb

@@ -64,11 +64,6 @@ module ContentBase
       (text.length > length ? '...' : '')
   end
 
-  def publish!
-    self.published = true
-    save!
-  end
-
   # The default text filter.  Generally, this is the filter specified by blog.text_filter,
   # but comments may use a different default.
   def default_text_filter