typo 4.0.0 → 4.0.1

data/app/models/content_state/presumed_spam.rb

@@ -0,0 +1,31 @@
+module ContentState
+  class PresumedSpam < Base
+    include Reloadable
+    include Singleton
+
+    def enter_hook(content)
+      super
+      content[:published] = false
+    end
+
+    def is_spam?(content)
+      true
+    end
+
+    def mark_as_ham(content)
+      content.state = Factory.new(:just_marked_as_ham)
+    end
+
+    def withdraw(content)
+      content.mark_as_spam
+    end
+
+    def confirm_classification(content)
+      content.mark_as_spam
+    end
+
+    def to_s
+      "Spam?"
+    end
+  end
+end

data/app/models/content_state/publication_pending.rb

@@ -2,17 +2,10 @@ module ContentState
   class PublicationPending < Base
     include Reloadable
     include Singleton
-    class << self
-      def derivable_from(content)
-        !content.published && content.published_at ||
-          content.new_record? && content.published_at &&
-          content.published_at > Time.now
-      end
-    end
 
-    def serialize_on(content)
+    def enter_hook(content)
+      super
       content[:published] = false if content.new_record?
-      true
     end
 
     def change_published_state(content, boolean)
@@ -39,5 +32,10 @@ module ContentState
     def post_trigger(content)
       Trigger.post_action(content.published_at, content, 'publish!')
     end
+
+    def withdraw(content)
+      content[:published_at] = nil
+      content.state = Draft.instance
+    end
   end
 end

data/app/models/content_state/published.rb

@@ -2,28 +2,29 @@ module ContentState
   class Published < Base
     include Reloadable
     include Singleton
-    class << self
-      def derivable_from(content)
-        !content.new_record? && content.published
-      end
-    end
 
-    def serialize_on(content)
+    def published?(content)
       true
     end
 
-    def published?
-      true
+    def enter_hook(content)
+      super
+      content[:published] = true
+      content[:published_at] ||= Time.now
     end
 
     def change_published_state(content, boolean)
       content[:published] = boolean
       if ! content.published
         content[:published_at] = nil
-        content.state = Draft.instance
+        content.state = Factory.new(:withdrawn)
       end
     end
 
+    def withdraw(content)
+      content.state = Factory.new(:withdrawn)
+    end
+
     def set_published_at(content, new_time)
       content[:published_at] = new_time
       return if content.published_at.nil?

data/app/models/content_state/spam.rb

@@ -0,0 +1,23 @@
+module ContentState
+  class Spam < Base
+    include Reloadable
+    include Singleton
+
+    def enter_hook(content)
+      super
+      content[:published] = false
+    end
+
+    def is_spam?(content)
+      true
+    end
+
+    def to_s
+      'Spam'
+    end
+
+    def mark_as_spam(content)
+
+    end
+  end
+end

data/app/models/content_state/unclassified.rb

@@ -0,0 +1,29 @@
+module ContentState
+  class Unclassified < Base
+    include Reloadable
+    include Singleton
+
+    def published?(content)
+      classify(content).published?(content)
+    end
+
+    def is_spam?(content)
+      classify(content).is_spam?(content)
+    end
+
+    def classify(content)
+      content.state = case content.classify
+                      when :ham
+                        Factory.new(:just_presumed_ham)
+                      when :spam
+                        Factory.new(:presumed_spam)
+                      else
+                        Factory.new(:presumed_spam)
+                      end
+    end
+
+    def before_save(content)
+      classify(content).before_save(content)
+    end
+  end
+end

data/app/models/content_state/withdrawn.rb

@@ -0,0 +1,28 @@
+module ContentState
+  class Withdrawn < Base
+    include Reloadable
+    include Singleton
+    
+    def enter_hook(content)
+      content[:published] = false
+    end
+    
+    def change_published_state(content, boolean)
+      return unless boolean
+      content[:published] = true
+      content.state = Published.instance
+    end
+    
+    def set_published_at(content, new_time)
+      content[:published_at] = new_time
+      Trigger.remove(content, :trigger_method => 'publish!')
+      return if new_time.nil? || new_time <= Time.now
+      content.state = PublicationPending.instance
+    end
+    
+    def withdrawn?
+      true
+    end
+  end
+end
+      

data/app/models/email_notifier.rb

@@ -2,7 +2,6 @@ class EmailNotifier < ActiveRecord::Observer
   observe Article, Comment
 
   def after_save(content)
-    return true unless content.just_published?
     content.send_notifications
     true
   end

data/app/models/feedback.rb

@@ -0,0 +1,151 @@
+class Feedback < Content
+  # Empty, for now, ready to hoist up methods from Comment & Trackback
+  include TypoGuid
+  validates_age_of :article_id
+
+  def self.default_order
+    'created_at ASC'
+  end
+
+  def initialize(*args, &block)
+    super(*args, &block)
+    self.state = ContentState::Unclassified.instance
+  end
+
+  def location(anchor=:ignored, only_path=true)
+    blog.url_for(article, "#{self.class.to_s.downcase}-#{id}", only_path)
+  end
+
+  before_create :create_guid, :make_nofollow, :article_allows_this_feedback
+  before_save :correct_url
+
+  def correct_url
+    if !url.blank? && url !~ /^http:\/\//
+      self.url = 'http://' + url
+    end
+  end
+
+  def article_allows_this_feedback
+    article && blog_allows_feedback? && article_allows_feedback?
+  end
+
+  def blog_allows_feedback?
+    true
+  end
+
+  def akismet_options
+    {:user_ip => ip,
+      :comment_type => self.class.to_s.downcase,
+      :comment_author => originator,
+      :comment_author_email => email,
+      :comment_author_url => url,
+      :comment_content => body}.merge(additional_akismet_options)
+  end
+
+  def additional_akismet_options
+    { }
+  end
+
+  def spam_fields
+    [:title, :body, :ip, :url]
+  end
+
+  def spam?
+    state.is_spam?(self)
+  end
+
+  # is_spam? checks to see if this is spam.
+  #
+  # 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_is_spam?(options) || akismet_is_spam?(options)
+  end
+
+  def classify
+    return :ham unless blog.sp_global
+    test_result = is_spam?
+
+    # Yeah, three state logic is evil...
+    case is_spam?
+    when nil; :spam
+    when true; :spam
+    when false; :ham
+    end
+  end
+
+  def sp_is_spam?(options={})
+    sp = SpamProtection.new(blog)
+    spam_fields.any? do |field|
+      sp.is_spam?(self.send(field))
+    end
+  end
+
+  def akismet
+    Akismet.new(blog.sp_akismet_key, blog.canonical_server_url)
+  end
+
+  def akismet_is_spam?(options={})
+    return false if blog.sp_akismet_key.blank?
+    begin
+      Timeout.timeout(5) do
+        akismet.commentCheck(akismet_options)
+      end
+    rescue Timeout::Error => e
+      nil
+    end
+  end
+
+  def mark_as_ham
+    state.mark_as_ham(self)
+  end
+
+  def mark_as_ham!
+    mark_as_ham
+    save!
+  end
+
+  def mark_as_spam
+    state.mark_as_spam(self)
+  end
+
+  def mark_as_spam!
+    mark_as_spam
+    save
+  end
+
+  def report_as_spam
+    return if blog.sp_akismet_key.blank?
+    Timeout.timeout(5) { akismet.submitSpam(akismet_options) }
+  end
+
+  def report_as_ham
+    return if blog.sp_akismet_key.blank?
+    Timeout.timeout(5) { akismet.submitHam(akismet_options) }
+  end
+
+  def set_spam(is_spam, options ={})
+    return if blog.sp_akismet_key.blank?
+    Timeout.timeout(5) { is_spam ? report_as_spam : report_as_ham }
+  end
+
+  def withdraw!
+    withdraw
+    self.save!
+  end
+
+  def confirm_classification
+    state.confirm_classification(self)
+  end
+
+  def confirm_classification!
+    state.confirm_classification(self)
+    self.save
+  end
+end

data/app/models/trackback.rb

@@ -1,18 +1,11 @@
 require_dependency 'spam_protection'
 
-class Trackback < Content
-  include TypoGuid
-  belongs_to :article, :counter_cache => true
+class Trackback < Feedback
+  belongs_to :article
 
   content_fields :excerpt
 
-  validates_age_of :article_id
   validates_presence_of :title, :excerpt, :url
-  validate_on_create :article_is_pingable
-
-  def self.default_order
-    'created_at ASC'
-  end
 
   def initialize(*args, &block)
     super(*args, &block)
@@ -20,12 +13,7 @@ class Trackback < Content
     self.blog_name ||= ""
   end
 
-  def location(anchor=:ignored, only_path=true)
-    blog.url_for(article, "trackback-#{id}", only_path)
-  end
-
-  protected
-  before_create :make_nofollow, :process_trackback, :create_guid
+  before_create :process_trackback
 
   def make_nofollow
     self.blog_name = blog_name.strip_html
@@ -40,23 +28,28 @@ class Trackback < Content
     end
   end
 
-  def article_is_pingable
-    return if article.nil?
-    if blog.global_pings_disable
-      errors.add(:article, "Pings are disabled")
-    end
-    unless article.allow_pings?
-      errors.add(:article, "Article is not pingable")
-    end
+  def article_allows_feedback?
+    return true if article.allow_pings?
+    errors.add(:article, 'Article is not pingable')
+    false
   end
 
-  def akismet_options
-    {:user_ip => ip, :comment_type => 'trackback', :comment_author => blog_name, :comment_author_email => nil,
-      :comment_author_url => url, :comment_content => excerpt}
+  def blog_allows_feedback?
+    return true unless blog.global_pings_disable
+    errors.add(:article, "Pings are disabled")
+    false
   end
-  
-  def spam_fields
-    [:title, :excerpt, :ip, :url]
+
+  def originator
+    blog_name
+  end
+
+  def body
+    excerpt
+  end
+
+  def body=(newval)
+    self.excerpt = newval
   end
 end
 

data/app/views/admin/feedback/_item.rhtml

@@ -1,15 +1,15 @@
-<tr class="feedbackbody">
+<tr class="<%= state_class(item) %>">
   <td class="field"><input class= "feedback_check" type="checkbox" name="feedback_check[<%= item.id %>]"/></td>
-  <td class="field"><%= item.published ? "Yes" : "<strong>No</strong>" %></td>
+  <td class="state"><%= item.state %></td>
   <td class="field"><%=h item.class %></td>
   <td class="field"><%= link_to_article_edit item.article %></td>
   <td class="field">
     <%=h (item.author || '(unknown)').slice(0,40) %><br/>
-	<a href=<%=h item.url%>><%=h truncate(item.url.to_s)%></a><br/>
-  	<%=h item.email.to_s.slice(0,40) %>
+        <a href=<%=h item.url%>><%=h truncate(item.url.to_s)%></a><br/>
+        <%=h item.email.to_s.slice(0,40) %>
   </td>
   <td class="field"><%=h truncate(item.body,80)%></td>
   <td class="field"><%=h item.ip %></td>
   <td class="field"><%=h distance_of_time_in_words_to_now(item.created_at) %> ago</td>
   <td class="field"><%= link_to image_tag('delete'), {:action => 'delete', :id => item.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :post => true %></td>
-</tr>  
+</tr>

data/app/views/admin/feedback/list.rhtml

@@ -2,7 +2,7 @@
 
 <% content_for('tasks') do %>
   <%= task_showmod 'Show only unpublished feedback' %>
-<% end %> 
+<% end %>
 
 <div clas="search">
   <form>
@@ -10,24 +10,25 @@
   </form>
 </div>
 
-<div class="list">	
+<div class="list">
   <%= form_tag({:action => 'bulkops'}, :method => :post) %>
   <br/>
   <%= submit_tag "Delete Checked Items" %> &nbsp;
-  <%= submit_tag "Publish Checked Items" %>
-  <%= submit_tag "Unpublish Checked Items" %>
+  <%= submit_tag "Mark Checked Items as Ham" %>
+  <%= submit_tag "Mark Checked Items as Spam" %>
+  <%= submit_tag "Confirm Classification of Checked Items" %>
 
   <%= hidden_field_tag "search", params[:search]%>
   <%= hidden_field_tag "page", params[:page]%>
 
   <table>
   <tr>
-	<th><input class="feedback_check" type="checkbox" name="checkall" id="checkall" onclick="check_all(this);"/></th>
-	<th>Pub</th>
-	<th>Type</th>
-	<th>Article</th>
+        <th><input class="feedback_check" type="checkbox" name="checkall" id="checkall" onclick="check_all(this);"/></th>
+        <th>State</th>
+        <th>Type</th>
+        <th>Article</th>
     <th>Author</th>
-	<th>Body</th>
+        <th>Body</th>
     <th>IP</th>
     <th>Posted date</th>
     <th>Delete</th>
@@ -35,8 +36,9 @@
   <%= render :partial => 'item', :collection => @feedback %>
   </table>
   <%= submit_tag "Delete Checked Items" %> &nbsp;
-  <%= submit_tag "Publish Checked Items" %>
-  <%= submit_tag "Unpublish Checked Items" %>
+  <%= submit_tag "Mark Checked Items as Ham" %>
+  <%= submit_tag "Mark Checked Items as Spam" %>
+  <%= submit_tag "Confirm Classification of Checked Items" %>
   </form>
 </div>