typo 4.0.3 → 4.1

data/app/models/content_state/draft.rb

@@ -1,17 +1,16 @@
 module ContentState
   class Draft < Base
-    include Reloadable
     include Singleton
 
     def enter_hook(content)
       super
       content[:published] = false
-      content.published_at = nil
+      content[:published_at] = nil
     end
 
     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/factory.rb

@@ -1,7 +1,7 @@
 module ContentState
   class Factory
     def self.new(state_name)
-      return ContentState::New.instance unless state_name
+      return ContentState::New.instance if !state_name || state_name.blank?
       state_name = state_name.to_s.underscore
       unless state_name.rindex('/')
         state_name = 'content_state/' + state_name

data/app/models/content_state/ham.rb

@@ -1,6 +1,5 @@
 module ContentState
   class Ham < Base
-    include Reloadable
     include Singleton
 
     def enter_hook(content)

data/app/models/content_state/just_marked_as_ham.rb

@@ -1,6 +1,5 @@
 module ContentState
   class JustMarkedAsHam < JustPresumedHam
-    include Reloadable
     include Singleton
 
     def enter_hook(content)
@@ -11,5 +10,13 @@ module ContentState
     def memento
       'ContentState::Ham'
     end
+
+    def to_s
+      'Ham'
+    end
+
+    def just_changed_published_status?
+      true
+    end
   end
 end

data/app/models/content_state/just_marked_as_spam.rb

@@ -15,10 +15,13 @@ module ContentState
     end
 
     def after_save(content)
-      content.state = Spam.instance
       super
       content.report_as_spam
       true
     end
+
+    def just_changed_published_status?
+      true
+    end
   end
 end

data/app/models/content_state/just_presumed_ham.rb

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

data/app/models/content_state/just_published.rb

@@ -1,6 +1,5 @@
 module ContentState
   class JustPublished < Published
-    include Reloadable
     include Singleton
 
     # We need to save the state as 'Published', but we need after_save
@@ -14,31 +13,25 @@ module ContentState
       true
     end
 
-    def published?(content)
+    def just_changed_published_status?
       true
     end
 
-    def enter_hook(content)
-      super
-      content[:published] = true
-      content[:published_at] ||= Time.now
+    def published?(content)
+      true
     end
 
-    def set_published_at(content, new_time)
-      content[:published_at] = new_time
-      return if content[:published_at].nil?
-      if content.published_at > Time.now
-        content.state = PublicationPending.instance
-      end
-    end
+#    def enter_hook(content)
+#      super
+#    end
 
-    def after_save(content)
-      content.state = Published.instance
-    end
+#    def set_published_at(content, new_time)
+#      super
+#    end
 
-    def send_notifications(content, controller)
+    def send_notifications(content)
       content.interested_users.each do |user|
-        content.send_notification_to_user(controller, user)
+        content.send_notification_to_user(user)
       end
     end
 

data/app/models/content_state/just_withdrawn.rb

@@ -0,0 +1,11 @@
+module ContentState
+  class JustWithdrawn < Withdrawn
+    def memento
+      'ContentState::Withdrawn'
+    end
+
+    def just_changed_published_status?
+      true
+    end
+  end
+end

data/app/models/content_state/new.rb

@@ -1,6 +1,5 @@
 module ContentState
   class New < Base
-    include Reloadable
     include Singleton
 
     def enter_hook(content)

data/app/models/content_state/presumed_ham.rb

@@ -1,6 +1,5 @@
 module ContentState
   class PresumedHam < Base
-    include Reloadable
     include Singleton
 
     def enter_hook(content)
@@ -14,19 +13,26 @@ module ContentState
     end
 
     def withdraw(content)
-      content.mark_as_spam
+      mark_as_spam(content)
     end
 
     def confirm_classification(content)
-      content.mark_as_ham
+      mark_as_ham(content)
     end
 
     def mark_as_ham(content)
       content.state = Factory.new(:ham)
+      true
     end
 
     def to_s
       'Ham?'
     end
+    
+    def send_notifications(content, controller) 
+      content.interested_users.each do |user| 
+        content.send_notification_to_user(controller, user) 
+      end
+    end   
   end
 end

data/app/models/content_state/presumed_spam.rb

@@ -1,6 +1,5 @@
 module ContentState
   class PresumedSpam < Base
-    include Reloadable
     include Singleton
 
     def enter_hook(content)
@@ -17,6 +16,10 @@ module ContentState
       content.state = Factory.new(:just_marked_as_ham)
     end
 
+    def mark_as_spam(content)
+      content.state = Factory.new(:spam)
+    end
+
     def withdraw(content)
       content.mark_as_spam
     end

data/app/models/content_state/publication_pending.rb

@@ -1,6 +1,5 @@
 module ContentState
   class PublicationPending < Base
-    include Reloadable
     include Singleton
 
     def enter_hook(content)
@@ -8,9 +7,10 @@ module ContentState
       content[:published] = false if content.new_record?
     end
 
-    def change_published_state(content, boolean)
-      content[:published] = boolean
-      if content.published && content.published_at <= Time.now
+    def change_published_state(content, published)
+      content[:published] = published
+
+      if published && content.published_at <= Time.now
         content.state = JustPublished.instance
       end
     end

data/app/models/content_state/published.rb

@@ -1,6 +1,5 @@
 module ContentState
   class Published < Base
-    include Reloadable
     include Singleton
 
     def published?(content)
@@ -14,22 +13,22 @@ module ContentState
     end
 
     def change_published_state(content, boolean)
-      content[:published] = boolean
-      if ! content.published
+      if ! boolean
+        content[:published] = false
         content[:published_at] = nil
-        content.state = Factory.new(:withdrawn)
+        content.state = Factory.new(:just_withdrawn)
       end
     end
 
     def withdraw(content)
-      content.state = Factory.new(:withdrawn)
+      content.state = Factory.new(:just_withdrawn)
     end
 
     def set_published_at(content, new_time)
       content[:published_at] = new_time
-      return if content.published_at.nil?
-      if content.published_at > Time.now
-        content.state = JustPublished.instance
+      return if new_time.nil?
+      if new_time > Time.now
+        content.state = PublicationPending.instance
       end
     end
   end

data/app/models/content_state/spam.rb

@@ -1,6 +1,5 @@
 module ContentState
   class Spam < Base
-    include Reloadable
     include Singleton
 
     def enter_hook(content)

data/app/models/content_state/unclassified.rb

@@ -1,8 +1,13 @@
 module ContentState
   class Unclassified < Base
-    include Reloadable
     include Singleton
 
+    def enter_hook(content)
+      super
+      content[:published] = false
+      content[:status_confirmed] = false
+    end
+
     def published?(content)
       classify(content).published?(content)
     end
@@ -22,8 +27,12 @@ module ContentState
                       end
     end
 
-    def before_save(content)
-      classify(content).before_save(content)
+    def before_save(feedback)
+      classify(feedback)
+    end
+
+    def to_s
+      "Unclassified"
     end
   end
 end

data/app/models/content_state/withdrawn.rb

@@ -1,28 +1,27 @@
 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

@@ -1,6 +1,6 @@
 class EmailNotifier < ActiveRecord::Observer
   observe Article, Comment
-
+  
   def after_save(content)
     content.send_notifications
     true

data/app/models/feedback.rb

@@ -1,8 +1,13 @@
 class Feedback < Content
   # Empty, for now, ready to hoist up methods from Comment & Trackback
+  set_table_name "feedback"
+
   include TypoGuid
   validates_age_of :article_id
 
+  before_create :create_guid, :article_allows_this_feedback
+  before_save :correct_url
+
   def self.default_order
     'created_at ASC'
   end
@@ -12,12 +17,22 @@ class Feedback < Content
     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)
+  def permalink_url(anchor=:ignored, only_path=true)
+    article.permalink_url("#{self.class.to_s.downcase}-#{id}",only_path)
   end
 
-  before_create :create_guid, :make_nofollow, :article_allows_this_feedback
-  before_save :correct_url
+  def edit_url(anchor=:ignored, only_path=true)
+    blog.url_for(:controller => "/admin/#{self.class.to_s.downcase}s", :action =>"edit", :id => id)
+  end
+
+  def delete_url(anchor=:ignored, only_path=true)
+    blog.url_for(:controller => "/admin/#{self.class.to_s.downcase}s", :action =>"destroy", :id => id)
+  end
+
+  def html_postprocess(field, html)
+    helper = ContentTextHelpers.new
+    sanitize(helper.auto_link(html),'a href, b, br, i, p, em, strong, pre, code, ol, ul, li, blockquote').nofollowify
+  end
 
   def correct_url
     if !url.blank? && url !~ /^http:\/\//
@@ -73,6 +88,7 @@ class Feedback < Content
   end
 
   def classify
+    return :spam if blog.default_moderate_comments
     return :ham unless blog.sp_global
     test_result = is_spam?
 
@@ -86,19 +102,23 @@ class Feedback < Content
 
   def sp_is_spam?(options={})
     sp = SpamProtection.new(blog)
-    spam_fields.any? do |field|
-      sp.is_spam?(self.send(field))
+    Timeout.timeout(defined?($TESTING) ? 10 : 30) do
+      spam_fields.any? do |field|
+        sp.is_spam?(self.send(field))
+      end
     end
+  rescue Timeout::Error => e
+    nil
   end
 
   def akismet
-    Akismet.new(blog.sp_akismet_key, blog.canonical_server_url)
+    Akismet.new(blog.sp_akismet_key, blog.base_url)
   end
 
   def akismet_is_spam?(options={})
     return false if blog.sp_akismet_key.blank?
     begin
-      Timeout.timeout(5) do
+      Timeout.timeout(defined?($TESTING) ? 30 : 60) do
         akismet.commentCheck(akismet_options)
       end
     rescue Timeout::Error => e
@@ -126,17 +146,17 @@ class Feedback < Content
 
   def report_as_spam
     return if blog.sp_akismet_key.blank?
-    Timeout.timeout(5) { akismet.submitSpam(akismet_options) }
+    Timeout.timeout(defined?($TESTING) ? 5 : 3600) { akismet.submitSpam(akismet_options) }
   end
 
   def report_as_ham
     return if blog.sp_akismet_key.blank?
-    Timeout.timeout(5) { akismet.submitHam(akismet_options) }
+    Timeout.timeout(defined?($TESTING) ? 5 : 3600) { 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 }
+    Timeout.timeout(defined?($TESTING) ? 5 : 3600) { is_spam ? report_as_spam : report_as_ham }
   end
 
   def withdraw!