typo 4.0.0 → 4.0.1

data/app/models/content.rb

@@ -18,15 +18,15 @@ class Content < ActiveRecord::Base
   has_many :triggers, :as => :pending_item, :dependent => :delete_all
 
   before_save :state_before_save
-  after_save :post_trigger
+  after_save :post_trigger, :state_after_save
 
   serialize :whiteboard
 
   @@content_fields = Hash.new
   @@html_map       = Hash.new
 
-  def initialize(*args)
-    super(*args)
+  def initialize(*args, &block)
+    super(*args, &block)
     set_default_blog
   end
 
@@ -112,7 +112,11 @@ class Content < ActiveRecord::Base
   end
 
   def state_before_save
-    self.state.before_save(self)
+    state.before_save(self)
+  end
+
+  def state_after_save
+    state.after_save(self)
   end
 
   def html_map(field=nil); self.class.html_map(field); end
@@ -175,14 +179,23 @@ class Content < ActiveRecord::Base
     self[:blog] ||= blog_id.to_i.zero? ? Blog.default : Blog.find(blog_id)
   end
 
+  def state=(newstate)
+    if state
+      state.exit_hook(self, newstate)
+    end
+    @state = newstate
+    self[:state] = newstate.memento
+    newstate.enter_hook(self)
+    @state
+  end
+
   def publish!
     self.published = true
     self.save!
   end
 
   def withdraw
-    self.published    = false
-    self.published_at = nil
+    state.withdraw(self)
   end
 
   def withdraw!
@@ -203,10 +216,18 @@ class Content < ActiveRecord::Base
     self[:published_at] || self[:created_at]
   end
 
+  def published?
+    state.published?(self)
+  end
+
   def just_published?
     state.just_published?
   end
 
+  def withdrawn?
+    state.withdrawn?
+  end
+
   def publication_pending?
     state.publication_pending?
   end
@@ -227,53 +248,10 @@ class Content < ActiveRecord::Base
   def send_notifications(controller = nil)
     state.send_notifications(self, controller || blog.controller)
   end
-  
-  # is_spam? checks to see if this is spam.  This really belongs in a 'feedback' class
-  # that is the parent of Comment and Trackback, but we aren't going to build one right
-  # now.
-  # 
-  # options are passed on to Akismet.  Recommended options (when available) are:
-  #
-  #  :permalink => the article's URL
-  #  :user_agent => the poster's UserAgent string
-  #  :referer => the poster's Referer string
-  #
-  def is_spam?(options={})
-    return false unless blog.sp_global
-
-    sp = SpamProtection.new(blog)
-    spam = false
-
-    # Check fields against the blacklist.
-    spam_fields.each do |field|
-      spam ||= sp.is_spam? self[field]
-    end
+end
 
-    # Attempt to use Akismet.  Timeout after 5 seconds if we can't contact them.
-    unless blog.sp_akismet_key.blank?
-      Timeout.timeout(5) do
-        akismet = Akismet.new(blog.sp_akismet_key,blog.canonical_server_url)
-        spam ||= akismet.commentCheck(akismet_options.merge(options))
-      end
-    end
-    
-    spam == true
-  end
-  
-  def set_spam(is_spam, options ={})
-    unless blog.sp_akismet_key.blank?
-      Timeout.timeout(5) do
-        akismet = Akismet.new(blog.sp_akismet_key,blog.canonical_server_url)
-        if is_spam
-          STDERR.puts "** submitting spam for #{id}"
-          akismet.submitSpam(akismet_options.merge(options))
-        else
-          STDERR.puts "** submitting ham for #{id}"
-          akismet.submitHam(akismet_options.merge(options))
-        end
-      end
-    end
+class Object
+  def to_text_filter
+    TextFilter.find_by_name(self.to_s) || TextFilter.find_by_name('none')
   end
 end
-
-class Object; def to_text_filter; TextFilter.find_by_name(self.to_s); end; end

data/app/models/content_state/base.rb

@@ -1,4 +1,10 @@
 module ContentState
+  class StateError < StandardError
+  end
+
+  class StateNotSerializable < StateError
+  end
+
   class Base
     include Reloadable
 
@@ -14,12 +20,34 @@ module ContentState
       self.class.to_s
     end
 
+    def exit_hook(content, target_state)
+      logger.debug("#{content} leaving state #{self.memento}")
+    end
+
+    def enter_hook(content)
+      logger.debug("#{content} entering state #{self.memento}")
+    end
+
     def before_save(content)
-      serialize_on(content)
       true
     end
 
-    def published?
+    def after_save(content)
+      true
+    end
+
+    def withdraw(content)
+    end
+
+    def mark_as_spam(content)
+      content.state = Factory.new(:just_marked_as_spam)
+    end
+
+    def mark_as_ham(content)
+      content.state = Factory.new(:just_marked_as_ham)
+    end
+
+    def published?(content)
       false
     end
 
@@ -35,6 +63,10 @@ module ContentState
       false
     end
 
+    def withdrawn?
+      false
+    end
+
     def after_save(content)
       true
     end
@@ -43,13 +75,24 @@ module ContentState
       true
     end
 
-    def send_notifications(content)
+    def send_notifications(content, controller)
       true
     end
 
     def send_pings(content)
       true
     end
+
+    def is_spam?(content)
+      false
+    end
+
+    def logger
+      @logger ||= RAILS_DEFAULT_LOGGER || Logger.new(STDERR)
+    end
+
+    def confirm_classification(content)
+    end
   end
 end
 

data/app/models/content_state/draft.rb

@@ -2,18 +2,11 @@ module ContentState
   class Draft < Base
     include Reloadable
     include Singleton
-    class << self
-      def derivable_from(content)
-        ! content.new_record? &&
-          ! content.published &&
-          content.published_at.nil?
-      end
-    end
 
-    def serialize_on(content)
+    def enter_hook(content)
+      super
       content[:published] = false
       content.published_at = nil
-      true
     end
 
     def change_published_state(content, boolean)

data/app/models/content_state/ham.rb

@@ -0,0 +1,31 @@
+module ContentState
+  class Ham < Base
+    include Reloadable
+    include Singleton
+
+    def enter_hook(content)
+      super
+      content[:published] = true
+    end
+
+    def published?(content)
+      true
+    end
+
+    def before_save(content)
+      content.report_as_ham
+      true
+    end
+
+    def withdraw(content)
+      content.mark_as_spam
+    end
+
+    def to_s
+      'Ham'
+    end
+
+    def mark_as_ham(content)
+    end
+  end
+end

data/app/models/content_state/just_marked_as_ham.rb

@@ -0,0 +1,10 @@
+module ContentState
+  class JustMarkedAsHam < JustPresumedHam
+    include Reloadable
+    include Singleton
+
+    def memento
+      'ContentState::Ham'
+    end
+  end
+end

data/app/models/content_state/just_marked_as_spam.rb

@@ -0,0 +1,23 @@
+module ContentState
+  class JustMarkedAsSpam < Spam
+    def enter_hook(content)
+      logger.debug("#{content} entering state Content::JustMarkedAsSpam")
+      content[:published] = false
+    end
+
+    def exit_hook(content, target_state)
+      logger.debug("#{content} leaving state Content::JustMarkedAsSpam")
+    end
+
+    def memento
+      'ContentState::Spam'
+    end
+
+    def after_save(content)
+      content.state = Spam.instance
+      super
+      content.report_as_spam
+      true
+    end
+  end
+end

data/app/models/content_state/just_presumed_ham.rb

@@ -0,0 +1,37 @@
+module ContentState
+  class JustPresumedHam < Base
+    include Reloadable
+    include Singleton
+    
+    def memento
+      'ContentState::PresumedHam'
+    end
+    
+    def enter_hook(content)
+      logger.debug("#{content} entering state Content::JustPresumedHam")
+      content[:published] = true
+    end
+    
+    def exit_hook(content, target_state)
+      logger.debug("#{content} leaving state Content::JustPresumedHam")
+    end
+    
+    def published?(content)
+      true
+    end
+    
+    def after_save(content)
+      content.state = PresumedHam.instance
+    end
+    
+    def send_notifications(content, controller)
+      content.interested_users.each do |user|
+        content.send_notification_to_user(controller, user)
+      end
+    end
+    
+    def send_pings(content)
+      content.really_send_pings
+    end
+  end
+end

data/app/models/content_state/just_published.rb

@@ -3,23 +3,25 @@ module ContentState
     include Reloadable
     include Singleton
 
-    class << self
-      def derivable_from(content)
-        content.new_record? &&
-          content.published &&
-          content[:published_at].nil?
-      end
+    # We need to save the state as 'Published', but we need after_save
+    # to be handled by JustPublished. So, JustPublished tells Rails that
+    # it's *actually* Published and all shall be well.
+    def memento
+      'ContentState::Published'
     end
 
     def just_published?
       true
     end
 
+    def published?(content)
+      true
+    end
 
-    def serialize_on(content)
+    def enter_hook(content)
+      super
       content[:published] = true
       content[:published_at] ||= Time.now
-      true
     end
 
     def set_published_at(content, new_time)
@@ -43,5 +45,10 @@ module ContentState
     def send_pings(content)
       content.really_send_pings
     end
+
+    def withdraw(content)
+      content[:published_at] = nil
+      content.state = Factory.new(:draft)
+    end
   end
 end

data/app/models/content_state/new.rb

@@ -2,18 +2,11 @@ module ContentState
   class New < Base
     include Reloadable
     include Singleton
-    class << self
-      def derivable_from(content)
-        content.new_record? &&
-          !content.published &&
-          content.published_at.nil?
-      end
-    end
 
-    def serialize_on(content)
+    def enter_hook(content)
+      super
       content[:published] = false
       content[:published_at] = nil
-      true
     end
 
     def before_save(content)
@@ -23,7 +16,7 @@ module ContentState
 
     def change_published_state(content, boolean)
       content[:published] = boolean
-      if content.published
+      if boolean
         content.state = JustPublished.instance
       end
     end

data/app/models/content_state/presumed_ham.rb

@@ -0,0 +1,27 @@
+module ContentState
+  class PresumedHam < Base
+    include Reloadable
+    include Singleton
+
+    def enter_hook(content)
+      super
+      content[:published] = true
+    end
+
+    def published?(content)
+      true
+    end
+
+    def withdraw(content)
+      content.mark_as_spam
+    end
+
+    def confirm_classification(content)
+      content.mark_as_ham
+    end
+
+    def to_s
+      'Ham?'
+    end
+  end
+end