typo 4.0.0 → 4.0.1

data/app/controllers/admin/comments_controller.rb

@@ -20,7 +20,7 @@ class Admin::CommentsController < Admin::BaseController
 
     if request.post? and @comment.save
       # We should probably wave a spam filter over this, but for now, just mark it as published.
-      @comment.published = true
+      @comment.mark_as_ham!
       flash[:notice] = 'Comment was successfully created.'
       redirect_to :action => 'show', :id => @comment.id
     end

data/app/controllers/admin/content_controller.rb

@@ -78,9 +78,7 @@ class Admin::ContentController < Admin::BaseController
   def new_or_edit
     get_or_build_article
     params[:article] ||= {}
-#    params[:article].reverse_merge!('allow_comments' => this_blog.default_allow_comments,
-#                                    'allow_pings'    => this_blog.default_allow_pings,
-#                                    'published'      => true)
+
     @article.attributes = (params[:article])
     setup_categories
     @selected = @article.categories.collect { |c| c.id }

data/app/controllers/admin/feedback_controller.rb

@@ -1,67 +1,72 @@
+
+
 class Admin::FeedbackController < Admin::BaseController
+  model :comment, :trackback
+
   def index
-    conditions = ["(contents.type = 'Comment' or contents.type = 'Trackback')"]
+    conditions = ['1=1', {}]
 
     if params[:search]
-      search_sql = "%#{params[:search]}%"
-      conditions.first << ' and (url like ? or author like ? or title like ? or ip like ? or email like ?)'
-      5.times { conditions.push search_sql }
+      conditions.first << ' and (url like :pattern or author like :pattern or title like :pattern or ip like :pattern or email like :pattern)'
+      conditions.last.merge!(:pattern => "%#{params[:search]}%")
     end
 
     if params[:published] == 'f'
-      conditions.first << ' and (published = ?)'
-      conditions.push false
+      conditions.first << ' and (published = :published)'
+      conditions.last.merge!(:published => false)
     end
 
-    @pages, @feedback = paginate(:contents, 
-      :order => 'contents.created_at desc', 
+    @pages, @feedback = paginate(:feedback,
+      :order => 'contents.created_at desc',
       :conditions => conditions,
       :per_page => 40)
-    
+
     render_action 'list'
   end
-  
+
   def delete
     if request.post?
-      feedback = Content.find(params[:id])
-      if feedback.kind_of? Comment or feedback.kind_of? Trackback
-        feedback.destroy
+      begin
+        Feedback.destroy(params[:id])
         flash[:notice] = "Deleted"
-      else
+      rescue ActiveRecord::RecordNotFound
         flash[:notice] = "Not found"
       end
     end
     redirect_to :action => 'index', :page => params[:page], :search => params[:search]
   end
-  
+
   def bulkops
-    STDERR.puts "Bulkops: #{params.inspect}"
-    
     ids = (params[:feedback_check]||{}).keys.map(&:to_i)
-    
+
     case params[:commit]
     when 'Delete Checked Items'
       count = 0
       ids.each do |id|
-        count += Content.delete(id)
+        count += Feedback.delete(id) ## XXX Should this be #destroy?
       end
       flash[:notice] = "Deleted #{count} item(s)"
-    when 'Publish Checked Items'
+
+      # Sweep cache
+      PageCache.sweep_all
+      expire_fragment(/.*/)
+    when 'Mark Checked Items as Ham'
+      ids.each do |id|
+        feedback = Feedback.find(id)
+        feedback.mark_as_ham!
+      end
+      flash[:notice]= "Marked #{ids.size} item(s) as Ham"
+    when 'Mark Checked Items as Spam'
       ids.each do |id|
-        feedback = Content.find(id)
-        feedback.attributes[:published] = true
-        feedback.set_spam(false)
-        feedback.save
+        feedback = Feedback.find(id)
+        feedback.mark_as_spam!
       end
-      flash[:notice]= "Published #{ids.size} item(s)"
-    when 'Unpublish Checked Items'
+      flash[:notice]= "Marked #{ids.size} item(s) as Spam"
+    when 'Confirm Classification of Checked Items'
       ids.each do |id|
-        feedback = Content.find(id)
-        feedback.withdraw!
-        feedback.set_spam(true)
-        feedback.save
+        Feedback.find(id).confirm_classification!
       end
-      flash[:notice]= "Unpublished #{ids.size} item(s)"
+      flash[:notice] = "Confirmed classification of #{ids.size} item(s)"
     else
       flash[:notice] = "Not implemented"
     end

data/app/controllers/admin/sidebar_controller.rb

@@ -53,8 +53,19 @@ class Admin::SidebarController < Admin::BaseController
       params[:configure] ||= []
       Sidebar.update_all('active_position = null')
       flash[:sidebars].each do |id|
-        Sidebar.find(id).update_attributes(:config => params[:configure][id.to_s],
-                                           :active_position => position)
+        sidebar = Sidebar.find(id)
+
+        # If it's a checkbox and unchecked, convert the 0 to false
+        # This is ugly.  Anyone have an improvement?
+        params[:configure][id.to_s].each do |k,v|
+          field = sidebar.sidebar_controller.fields.detect { |f| f.key == k }
+          if v == "0" && field.is_a?(Sidebars::Field::CheckBoxField)
+            params[:configure][id.to_s][k] = false
+          end
+        end
+          
+        sidebar.update_attributes(:config => params[:configure][id.to_s],
+                                  :active_position => position)
         position += 1
       end
       Sidebar.delete_all('active_position is null')

data/app/controllers/admin/users_controller.rb

@@ -10,7 +10,8 @@ class Admin::UsersController < Admin::BaseController
   end
 
   def show
-    @user = User.find(params[:id])
+    @user = User.find(params[:id], :include => [ :articles ])
+    @articles = @user.articles
   end
 
   def new

data/app/controllers/articles_controller.rb

@@ -27,12 +27,12 @@ class ArticlesController < ContentController
     @articles = Article.find( :all,
       :offset => @pages.current.offset,
       :limit => @pages.items_per_page,
-      :order => "contents.published_at DESC", 
+      :order => "contents.published_at DESC",
       :include => [:categories, :tags, :user, :blog],
       :conditions =>
          ['published = ? AND contents.published_at < ? AND blog_id = ?',
           true, Time.now, this_blog.id]
-    )  
+    )
   end
 
   def search
@@ -94,23 +94,14 @@ class ArticlesController < ContentController
 
     if request.post?
       begin
-        params[:comment].merge!({:ip => request.remote_ip,
-                                :published => true })
         @article = this_blog.published_articles.find(params[:id])
-        @comment = @article.comments.build(params[:comment])
-        @comment.user = session[:user]
-        
-        spam_options = {
-          :user_agent => request.env['HTTP_USER_AGENT'], 
-          :referrer => request.env['HTTP_REFERER'], 
-          :permalink => this_blog.article_url(@article, false)}
-          
-        if @comment.is_spam? spam_options
-          STDERR.puts "Moderating comment as spam!"
-          @comment.withdraw
-        end
-        
-        @comment.save!
+        params[:comment].merge!({:ip => request.remote_ip,
+                                :published => true,
+                                :user => session[:user],
+                                :user_agent => request.env['HTTP_USER_AGENT'],
+                                :referrer => request.env['HTTP_REFERER'],
+                                :permalink => this_blog.article_url(@article, false)})
+        @comment = @article.comments.create!(params[:comment])
         add_to_cookies(:author, @comment.author)
         add_to_cookies(:url, @comment.url)
 
@@ -165,7 +156,7 @@ class ArticlesController < ContentController
       render :nothing => true, :status => 404
     end
   end
-  
+
   def markup_help
     render :text => TextFilter.find(params[:id]).commenthelp
   end

data/app/controllers/xml_controller.rb

@@ -65,7 +65,7 @@ class XmlController < ContentController
 
   protected
 
-  def fetch_items(association, order='created_at DESC', limit=nil)
+  def fetch_items(association, order='published_at DESC', limit=nil)
     if association.instance_of?(Symbol)
       association = this_blog.send(association)
     end
@@ -89,7 +89,7 @@ class XmlController < ContentController
 
   def prep_article
     article = this_blog.articles.find(params[:id])
-    fetch_items(article.comments, 'created_at DESC', 25)
+    fetch_items(article.comments, 'published_at DESC', 25)
     @items.unshift(article)
     @feed_title << ": #{article.title}"
     @link = article_url(article, false)

data/app/helpers/admin/base_helper.rb

@@ -1,5 +1,9 @@
 module Admin::BaseHelper
 
+  def state_class(item)
+    item.state.memento.underscore.sub(/.*\//, '')
+  end
+
   def render_flash
     output = []
 
@@ -14,10 +18,10 @@ module Admin::BaseHelper
      output = []
 
       for key,value in @tasks
-   	  output << "<a href=\"#{value}\">#{key}</a>"
-   	end if @tasks
+      output << "<a href=\"#{value}\">#{key}</a>"
+    end if @tasks
 
-   	output.join("<br/>\n")
+    output.join("<br/>\n")
   end
 
   def current_user_notice

data/app/helpers/application_helper.rb

@@ -40,12 +40,12 @@ module ApplicationHelper
   end
 
   def comments_link(article)
-    article_link(pluralize(article.comments.size, "comment"),
+    article_link(pluralize(article.published_comments.size, "comment"),
                  article, 'comments')
   end
 
   def trackbacks_link(article)
-    article_link(pluralize(article.trackbacks.size, "trackback"),
+    article_link(pluralize(article.published_trackbacks.size, "trackback"),
                  article, 'trackbacks')
   end
 

data/app/helpers/articles_helper.rb

@@ -42,7 +42,8 @@ module ArticlesHelper
 
   def page_title
     if @page_title
-      @page_title
+      # this is where the page title prefix (string) should go
+      (this_blog.title_prefix ? "#{this_blog.blog_name || "Typo"} : " : '') + @page_title
     else
       this_blog.blog_name || "Typo"
     end
@@ -151,10 +152,10 @@ module ArticlesHelper
   end
 
   def ul_tag_for(grouping_class)
-    case grouping_class
-    when Tag
+    case
+    when grouping_class == Tag
       %{<ul id="taglist" class="tags">}
-    when Category
+    when grouping_class == Category
       %{<ul class="categorylist">}
     else
       '<ul>'

data/app/models/article.rb

@@ -37,9 +37,13 @@ class Article < Content
     urls
   end
 
-  def really_send_pings(serverurl = blog.server_url, articleurl = location(nil, false))
+  def really_send_pings(serverurl = blog.server_url, articleurl = nil)
     return unless blog.send_outbound_pings
 
+    # Moved the default value for articleurl out of the method declaration to
+    # avoid unnecessary evaluations of the #location() method.
+    articleurl ||= location(nil, false)
+
     weblogupdatesping_urls = blog.ping_urls.gsub(/ +/,'').split(/[\n\r]+/)
     pingback_or_trackback_urls = self.html_urls
 
@@ -52,7 +56,7 @@ class Article < Content
 
           if weblogupdatesping_urls.include?(url)
             ping.send_weblogupdatesping(serverurl, articleurl)
-          else pingback_or_trackback_urls.include?(url)
+          elsif pingback_or_trackback_urls.include?(url)
             ping.send_pingback_or_trackback(articleurl)
           end
         end
@@ -142,7 +146,7 @@ class Article < Content
     if user.notify_via_jabber?
       JabberNotify.send_message(user, "New post",
                                 "A new message was posted to #{blog.blog_name}",
-                                content.body_html)
+                                body_html)
     end
   end
 
@@ -158,17 +162,20 @@ class Article < Content
     end
   end
 
+  def published_comments
+    comments.select {|c| c.published?}
+  end
+
+  def published_trackbacks
+    trackbacks.select {|c| c.published?}
+  end
+
   protected
 
   before_create :set_defaults, :create_guid, :add_notifications
   before_save :set_published_at
   after_save :keywords_to_tags
 
-  def correct_counts
-    self.comments_count = self.comments_count
-    self.trackbacks_count = self.trackbacks_count
-  end
-  
   def set_published_at
     if self.published and self[:published_at].nil?
       self[:published_at] = self.created_at || Time.now
@@ -179,7 +186,6 @@ class Article < Content
     if self.attributes.include?("permalink") and self.permalink.blank?
       self.permalink = self.stripped_title
     end
-    correct_counts
     if blog && self.allow_comments.nil?
       self.allow_comments = blog.default_allow_comments
     end
@@ -187,7 +193,7 @@ class Article < Content
     if blog && self.allow_pings.nil?
       self.allow_pings = blog.default_allow_pings
     end
-    
+
     true
   end
 

data/app/models/blog.rb

@@ -2,9 +2,9 @@
 # This isn't enabled yet, but it will be soon...
 class BlogRequest
   include Reloadable
-  
+
   attr_accessor :protocol, :host_with_port, :path, :symbolized_path_parameters, :relative_url_root
-  
+
   def initialize(root)
     @protocol = @host_with_port = @path = ''
     @symbolized_path_parameters = {}
@@ -37,6 +37,7 @@ class Blog < ActiveRecord::Base
   # Description
   setting :blog_name,                  :string, 'My Shiny Weblog!'
   setting :blog_subtitle,              :string, ''
+  setting :title_prefix,               :boolean, false
   setting :geourl_location,            :string, ''
   setting :canonical_server_url,       :string, ''
 
@@ -86,13 +87,6 @@ class Blog < ActiveRecord::Base
     article_id = settings[:id]
     settings.delete(:id)
     trackback = published_articles.find(article_id).trackbacks.create!(settings)
-
-    if trackback.is_spam?
-      STDERR.puts "Moderating trackback as spam!"
-      trackback.withdraw!
-    end
-    
-    trackback
   end
 
 
@@ -161,7 +155,7 @@ class Blog < ActiveRecord::Base
   end
 
   def article_url(article, only_path = true, anchor = nil)
-		url_for(:year => article.published_at.year,
+    url_for(:year => article.published_at.year,
             :month => sprintf("%.2d", article.published_at.month),
             :day => sprintf("%.2d", article.published_at.day),
             :title => article.permalink, :anchor => anchor,

data/app/models/comment.rb

@@ -2,22 +2,18 @@ require_dependency 'spam_protection'
 require 'sanitize'
 require 'timeout'
 
-class Comment < Content
-  include TypoGuid
+class Comment < Feedback
+  belongs_to :article
 
   content_fields :body
 
-  belongs_to :article, :counter_cache => true
   belongs_to :user
 
   validates_presence_of :author, :body
-  validates_age_of :article_id
-  validate_on_create :check_article_is_open_to_comments
 
-
-  def self.default_order
-    'created_at ASC'
-  end
+  attr_accessor :user_agent
+  attr_accessor :referrer
+  attr_accessor :permalink
 
   def notify_user_via_email(controller, user)
     if user.notify_via_email?
@@ -37,17 +33,12 @@ class Comment < Content
     users
   end
 
-  def location(anchor=:ignored, only_path=true)
-    blog.url_for(article, "comment-#{id}", only_path)
-  end
-
   protected
 
-  def check_article_is_open_to_comments
-    return unless article
-    unless article.allow_comments?
-      errors.add(:article, "Article is not open to comments")
-    end
+  def article_allows_feedback?
+    return true if article.allow_comments?
+    errors.add(:article, "Article is not open to comments")
+    false
   end
 
   def body_html_postprocess(value, controller)
@@ -58,28 +49,18 @@ class Comment < Content
     'comment_text_filter'
   end
 
-  before_create :create_guid
-  before_save :correct_url, :make_nofollow
-
-  def correct_url
-    unless url.to_s.empty?
-      unless url =~ /^http\:\/\//
-        self.url = "http://#{url}"
-      end
-    end
-  end
-
   def make_nofollow
     self.author    = author.nofollowify
     self.body_html = body_html.to_s.nofollowify
   end
-  
-  def akismet_options
-    {:user_ip => ip, :comment_type => 'comment', :comment_author => author, :comment_author_email => email,
-      :comment_author_url => url, :comment_content => body}
+
+  def originator
+    author
   end
-  
-  def spam_fields
-    [:body, :url, :ip]
+
+  def additional_akismet_options
+    { :user_agent => user_agent,
+      :referrer   => referrer,
+      :permalink  => permalink }
   end
 end