typo 4.0.3 → 4.1

data/app/models/categorization.rb

@@ -0,0 +1,4 @@
+class Categorization < ActiveRecord::Base
+  belongs_to :article
+  belongs_to :category
+end

data/app/models/category.rb

@@ -1,13 +1,14 @@
 class Category < ActiveRecord::Base
   acts_as_list
-  has_and_belongs_to_many(:articles,
-                          :order => "published_at DESC, created_at DESC")
+  has_many :categorizations
+  has_many :articles, :through => :categorizations,
+    :order => "published_at DESC, created_at DESC"
 
   def self.find_all_with_article_counters(maxcount=nil)
     self.find_by_sql([%{
       SELECT categories.id, categories.name, categories.permalink, categories.position, COUNT(articles.id) AS article_counter
       FROM #{Category.table_name} categories
-        LEFT OUTER JOIN #{Category.table_name_prefix}articles_categories#{Category.table_name_suffix} articles_categories
+        LEFT OUTER JOIN #{Category.table_name_prefix}categorizations#{Category.table_name_suffix} articles_categories
           ON articles_categories.category_id = categories.id
         LEFT OUTER JOIN #{Article.table_name} articles
           ON (articles_categories.article_id = articles.id AND articles.published = ?)
@@ -16,6 +17,12 @@ class Category < ActiveRecord::Base
       }, true]).each {|item| item.article_counter = item.article_counter.to_i }
   end
 
+  def self.find(*args)
+    with_scope :find => {:order => 'position ASC'} do
+      super
+    end
+  end
+
   def self.find_by_permalink(*args)
     super || new
   end
@@ -31,7 +38,7 @@ class Category < ActiveRecord::Base
   def self.reorder(serialized_list)
     self.transaction do
       serialized_list.each_with_index do |cid,index|
-        find(cid).update_attribute "position", index rescue nil
+        find(cid).update_attribute "position", index
       end
     end
   end
@@ -48,6 +55,16 @@ class Category < ActiveRecord::Base
     name
   end
 
+  def permalink_url(anchor=nil, only_path=true)
+    blog = Blog.find(1) # remove me...
+
+    blog.url_for(
+      :controller => '/articles',
+      :action => 'category',
+      :id => permalink
+    )
+  end
+
   protected
 
   before_save :set_defaults

data/app/models/comment.rb

@@ -4,26 +4,24 @@ require 'timeout'
 
 class Comment < Feedback
   belongs_to :article
-
-  content_fields :body
-
   belongs_to :user
-
+  content_fields :body
   validates_presence_of :author, :body
 
   attr_accessor :user_agent
   attr_accessor :referrer
   attr_accessor :permalink
 
-  def notify_user_via_email(controller, user)
+  def notify_user_via_email(user)
     if user.notify_via_email?
-      EmailNotify.send_comment(controller, self, user)
+      EmailNotify.send_comment(self, user)
     end
   end
 
-  def notify_user_via_jabber(controller, user)
+  def notify_user_via_jabber(user)
     if user.notify_via_jabber?
-      JabberNotify.send_message(user, "New comment", "A new comment was posted to '#{article.title}' on #{blog.blog_name} by #{author}: #{body}", self.body_html)
+      JabberNotify.send_message(user, "New comment", "A new comment was posted to '#{article.title}' on #{blog.blog_name} by #{author}: 
+        #{body} (#{controller.url_for :anchor => 'comments', :action => 'read', :id => article.id})", self.body_html) 
     end
   end
 
@@ -33,6 +31,10 @@ class Comment < Feedback
     users
   end
 
+  def default_text_filter
+    blog.comment_text_filter.to_text_filter
+  end
+
   protected
 
   def article_allows_feedback?
@@ -41,19 +43,6 @@ class Comment < Feedback
     false
   end
 
-  def body_html_postprocess(value, controller)
-    sanitize(controller.send(:auto_link, value),'a href, b, br, i, p, em, strong, pre, code, ol, ul, li, blockquote')
-  end
-
-  def default_text_filter_config_key
-    'comment_text_filter'
-  end
-
-  def make_nofollow
-    self.author    = author.nofollowify
-    self.body_html = body_html.to_s.nofollowify
-  end
-
   def originator
     author
   end
@@ -63,4 +52,17 @@ class Comment < Feedback
       :referrer   => referrer,
       :permalink  => permalink }
   end
+
+  def self.html_map(field=nil)
+    html_map = { :body => true }
+    if field
+      html_map[field.to_sym]
+    else
+      html_map
+    end
+  end
+
+  def content_fields
+    [:body]
+  end
 end

data/app/models/content.rb

@@ -11,9 +11,21 @@ class Content < ActiveRecord::Base
   composed_of :state, :class_name => 'ContentState::Factory',
     :mapping => %w{ state memento }
 
-  has_and_belongs_to_many :notify_users, :class_name => 'User',
-    :join_table => 'notifications', :foreign_key => 'notify_content_id',
-    :association_foreign_key => 'notify_user_id', :uniq => true
+  has_many :notifications, :foreign_key => 'content_id'
+  has_many :notify_users, :through => :notifications,
+    :source => 'notify_user',
+    :uniq => true
+
+  def notify_users=(collection)
+    return notify_users.clear if collection.empty?
+    self.class.transaction do
+      self.notifications.clear
+      collection.uniq.each do |u|
+        self.notifications.build(:notify_user => u)
+      end
+      notify_users.target = collection
+    end
+  end
 
   has_many :triggers, :as => :pending_item, :dependent => :delete_all
 
@@ -30,6 +42,14 @@ class Content < ActiveRecord::Base
     set_default_blog
   end
 
+  def invalidates_cache?(on_destruction = false)
+    if on_destruction
+      just_changed_published_status? || published?
+    else
+      changed? && published? || just_changed_published_status?
+    end
+  end
+
   def set_default_blog
     if self.blog_id == nil or self.blog_id == 0
       self.blog = Blog.default
@@ -37,6 +57,7 @@ class Content < ActiveRecord::Base
   end
 
   class << self
+    # Quite a bit of this isn't needed anymore.
     def content_fields(*attribs)
       @@content_fields[self] = ((@@content_fields[self]||[]) + attribs).uniq
       @@html_map[self] = nil
@@ -45,20 +66,13 @@ class Content < ActiveRecord::Base
           if self[field] != newval
             changed
             self[field] = newval
-            if html_map(field)
-              self[html_map(field)] = nil
-            end
-            notify_observers(self, field.to_sym)
           end
           self[field]
         end
         unless self.method_defined?("#{field}_html")
           define_method("#{field}_html") do
-            if blog.controller
-              html(blog.controller, field.to_sym)
-            else
-              self["#{field}_html"]
-            end
+            typo_deprecated "Use html(:#{field})"
+            html(field.to_sym)
           end
         end
       end
@@ -69,7 +83,7 @@ class Content < ActiveRecord::Base
         @@html_map[self] = Hash.new
         instance = self.new
         @@content_fields[self].each do |attrib|
-          @@html_map[self][attrib] = "#{attrib}_html"
+          @@html_map[self][attrib] = true
         end
       end
       if field
@@ -80,12 +94,9 @@ class Content < ActiveRecord::Base
     end
 
     def find_published(what = :all, options = {})
-      options.reverse_merge!(:order => default_order)
-      options[:conditions] = merge_conditions(['published = ?', true],
-                                              options[:conditions])
-      options[:include] ||= []
-      options[:include] += [:blog]
-      find(what, options)
+      with_scope(:find => {:order => default_order, :conditions => {:published => true}}) do
+        find what, options
+      end
     end
 
     def default_order
@@ -103,12 +114,10 @@ class Content < ActiveRecord::Base
         find_published(what, options)
       end
     end
+  end
 
-    def merge_conditions(*conditions)
-      conditions.compact.collect do |cond|
-        '(' + sanitize_sql(cond) + ')'
-      end.join(' AND ')
-    end
+  def content_fields
+    @@content_fields[self.class]
   end
 
   def state_before_save
@@ -119,62 +128,78 @@ class Content < ActiveRecord::Base
     state.after_save(self)
   end
 
-  def html_map(field=nil); self.class.html_map(field); end
-
-  def full_html
-    unless blog.controller
-      raise "full_html only works with an active controller"
-    end
-    html(blog.controller, :all)
+  def html_map(field=nil)
+    self.class.html_map(field)
   end
 
-  def populate_html_fields(controller)
-    html_map.each do |field, html_field|
-      if !self[field].blank? && self[html_field].blank?
-        html = text_filter.filter_text_for_controller( self[field].to_s, controller, self, false )
-        self[html_field] = self.send("#{html_field}_postprocess",
-                                     html, controller)
-      end
-    end
+  def cache_key(field)
+    id ? "contents_html/#{id}/#{field}" : nil
   end
 
-  def html(controller,what = :all)
-    populate_html_fields(controller)
-
-    if what == :all
-      self[:body_html].to_s + (self[:extended_html].to_s rescue '')
-    elsif self.class.html_map(what)
-      self[html_map(what)]
+  # Return HTML for some part of this object.  It will be fetched from the
+  # cache if possible, or regenerated if needed.
+  def html(field = :all)
+    if field == :all
+      generate_html(:all, content_fields.map{|f| self[f].to_s}.join("\n\n"))
+    elsif self.class.html_map(field)
+      generate_html(field)
     else
-      raise "Unknown 'what' in article.html"
+      raise "Unknown field: #{field.inspect} in article.html"
     end
   end
 
-  def method_missing(method, *args, &block)
-    if method.to_s =~ /_postprocess$/
-      args[0]
-    else
-      super(method, *args, &block)
-    end
+  # Generate HTML for a specific field using the text_filter in use for this
+  # object.  The HTML is cached in the fragment cache, using the +ContentCache+
+  # object in @@cache.
+  def generate_html(field, text = nil)
+    text ||= self[field].to_s
+    html = text_filter.filter_text_for_content(blog, text, self)
+    html ||= text # just in case the filter puked
+    html_postprocess(field,html).to_s
+  end
+
+  # Post-process the HTML.  This is a noop by default, but Comment overrides it
+  # to enforce HTML sanity.
+  def html_postprocess(field,html)
+    html
   end
 
   def whiteboard
     self[:whiteboard] ||= Hash.new
   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
+    blog.text_filter.to_text_filter
+  end
 
+  # Grab the text filter for this object.  It's either the filter specified by
+  # self.text_filter_id, or the default specified in the blog object.
   def text_filter
-    self[:text_filter] ||= if self[:text_filter_id]
-                             TextFilter.find(self[:text_filter_id])
-                           else
-                             blog[default_text_filter_config_key].to_text_filter
-                           end
+    if self[:text_filter_id] && !self[:text_filter_id].zero?
+      TextFilter.find(self[:text_filter_id])
+    else
+      default_text_filter
+    end
   end
 
+  # Set the text filter for this object.
   def text_filter=(filter)
-    self[:text_filter_id] = filter.to_text_filter.id
+    returning(filter.to_text_filter) { |tf| self.text_filter_id = tf.id }
+  end
+
+  # Changing the title flags the object as changed
+  def title=(new_title)
+    if new_title == self[:title]
+      self[:title]
+    else
+      self.changed
+      self[:title] = new_title
+    end
   end
 
+  # FIXME -- this feels wrong.
   def blog
     self[:blog] ||= blog_id.to_i.zero? ? Blog.default : Blog.find(blog_id)
   end
@@ -224,6 +249,10 @@ class Content < ActiveRecord::Base
     state.just_published?
   end
 
+  def just_changed_published_status?
+    state.just_changed_published_status?
+  end
+
   def withdrawn?
     state.withdrawn?
   end
@@ -240,14 +269,21 @@ class Content < ActiveRecord::Base
     state.after_save(self)
   end
 
-  def send_notification_to_user(controller, user)
-    notify_user_via_email(controller, user)
-    notify_user_via_jabber(controller, user)
+  def send_notification_to_user(user)
+    notify_user_via_email(user)
+    notify_user_via_jabber(user)
   end
 
-  def send_notifications(controller = nil)
-    state.send_notifications(self, controller || blog.controller)
+  def send_notifications()
+    state.send_notifications(self)
+  end
+
+  # deprecated
+  def full_html
+    typo_deprecated "use .html instead"
+    html
   end
+
 end
 
 class Object
@@ -255,3 +291,9 @@ class Object
     TextFilter.find_by_name(self.to_s) || TextFilter.find_by_name('none')
   end
 end
+
+class ContentTextHelpers
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::TextHelper
+end
+

data/app/models/content_state/base.rb

@@ -5,9 +5,10 @@ module ContentState
   class StateNotSerializable < StateError
   end
 
-  class Base
-    include Reloadable
+  class InvalidMethodForState < StandardError
+  end
 
+  class Base
     class << self
       def instance
         nil
@@ -55,6 +56,10 @@ module ContentState
       false
     end
 
+    def just_changed_published_status?
+      false
+    end
+
     def draft?
       false
     end
@@ -75,7 +80,7 @@ module ContentState
       true
     end
 
-    def send_notifications(content, controller)
+    def send_notifications(controller)
       true
     end
 
@@ -97,6 +102,10 @@ module ContentState
 
     def confirm_classification(content)
     end
+
+    def ==(other_state)
+      self.class == other_state.class
+    end
   end
 end