typo 3.99.2 → 3.99.3

data/app/controllers/articles_controller.rb

@@ -1,6 +1,5 @@
 class ArticlesController < ContentController
   before_filter :verify_config
-  before_filter :check_page_query_param_for_missing_routes
 
   layout :theme_layout, :except => [:comment_preview, :trackback]
 
@@ -17,13 +16,23 @@ class ArticlesController < ContentController
          :render => { :text => 'Forbidden', :status => 403 })
 
   def index
-    @pages, @articles =
-      paginate(:article, :per_page => this_blog.limit_article_display,
-               :conditions =>
-                 ['published = ? AND contents.created_at < ? AND blog_id = ?',
-                             true,            Time.now,     this_blog.id],
-               :order_by => "contents.published_at DESC",
-               :include => [:categories, :tags])
+    # On Postgresql, paginate's default count is *SLOW*, because it does a join against
+    # all of the eager-loaded tables.  I've seen it take up to 7 seconds on my test box.
+    #
+    # So, we're going to use the older Paginator class and manually provide a count.
+    # This is a 100x speedup on my box.
+    count = Article.count(:conditions => ['published = ? AND contents.published_at < ? AND blog_id = ?',
+      true, Time.now, this_blog.id])
+    @pages = Paginator.new self, count, this_blog.limit_article_display, @params[:page]
+    @articles = Article.find( :all,
+      :offset => @pages.current.offset,
+      :limit => @pages.items_per_page,
+      :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
@@ -145,6 +154,10 @@ class ArticlesController < ContentController
       render :nothing => true, :status => 404
     end
   end
+  
+  def markup_help
+    render :text => TextFilter.find(params[:id]).commenthelp
+  end
 
   private
 
@@ -153,12 +166,6 @@ class ArticlesController < ContentController
                        :expires => 6.weeks.from_now }
   end
 
-  def check_page_query_param_for_missing_routes
-    unless request.path =~ /\/page\//
-      raise "Page param problem" unless params[:page].nil?
-    end
-  end
-
   def verify_config
     if User.count == 0
       redirect_to :controller => "accounts", :action => "signup"

data/app/controllers/content_controller.rb

@@ -9,10 +9,10 @@ class ContentController < ApplicationController
     def after(controller)
        future_article =
          Article.find(:first,
-                      :conditions => ['published = ? AND created_at > ?', true, @request_time],
-                      :order =>  "created_at ASC" )
+                      :conditions => ['published = ? AND published_at > ?', true, @request_time],
+                      :order =>  "published_at ASC" )
        if future_article
-         delta = future_article.created_at - Time.now
+         delta = future_article.published_at - Time.now
          controller.response.lifetime = (delta <= 0) ? 0 : delta
        end
     end
@@ -20,9 +20,7 @@ class ContentController < ApplicationController
 
   include LoginSystem
   model :user
-
   helper :theme
-
   before_filter :auto_discovery_defaults
 
   def self.caches_action_with_params(*actions)

data/app/controllers/xml_controller.rb

@@ -3,10 +3,12 @@ class XmlController < ContentController
   session :off
 
   NORMALIZED_FORMAT_FOR = {'atom' => 'atom10', 'rss' => 'rss20',
-    'atom10' => 'atom10', 'rss20' => 'rss20'}
+    'atom10' => 'atom10', 'rss20' => 'rss20',
+    'googlesitemap' => 'googlesitemap' }
 
   CONTENT_TYPE_FOR = { 'rss20' => 'application/xml',
-    'atom10' => 'application/atom+xml' }
+    'atom10' => 'application/atom+xml',
+    'googlesitemap' => 'application/xml' }
 
 
   def feed
@@ -68,7 +70,7 @@ class XmlController < ContentController
       association = this_blog.send(association)
     end
     limit ||= this_blog.limit_rss_display
-    @items = association.find_already_published(:all, :limit => limit, :order => order)
+    @items += association.find_already_published(:all, :limit => limit, :order => order)
   end
 
   def prep_feed
@@ -108,4 +110,12 @@ class XmlController < ContentController
     @link = url_for({:controller => "articles_controller.rb", :action => 'tag', :tag => tag.name},
                     {:only_path => false})
   end
+
+  def prep_sitemap
+    fetch_items(:articles, 'created_at DESC', 1000)
+    fetch_items(:pages, 'created_at DESC', 1000)
+    @items += Category.find_all_with_article_counters(1000)
+    @items += Tag.find_all_with_article_counters(1000)
+  end
+
 end

data/app/helpers/application_helper.rb

@@ -88,5 +88,11 @@ module ApplicationHelper
     page.html(@controller,:body)
   end
 
-  def strip_html(text) text.strip_html end
+  def strip_html(text) 
+    text.strip_html
+  end
+    
+  def markup_help_popup(markup, text)
+    "<a href=\"#{url_for :controller => '/articles', :action => 'markup_help', :id => markup.id}\" onClick=\"return popup(this, 'Typo Markup Help')\">#{text}</a>"
+  end
 end

data/app/helpers/xml_helper.rb

@@ -18,4 +18,27 @@ module XmlHelper
   def blog_title
     this_blog.blog_name || "Unnamed blog"
   end
+  
+  def tag_link(tag)
+    url_for :controller => "articles", :action => 'tag', :id => tag.name, :only_path => false
+  end
+
+  def collection_lastmod(collection)
+    article_updated = collection.articles.find(:first, :order => 'updated_at DESC')
+    article_published = collection.articles.find(:first, :order => 'published_at DESC')
+
+    times = []
+    times.push article_updated.updated_at if article_updated
+    times.push article_published.updated_at if article_published
+
+    if times.empty?
+      Time.at(0).xmlschema
+    else
+      times.max.xmlschema
+    end
+  end
+
+  def category_link(category)
+    url_for :controller => "articles", :action => 'category', :id => category.permalink, :only_path => false
+  end
 end

data/app/models/article.rb

@@ -196,6 +196,11 @@ class Article < Content
     return [from, to]
   end
 
+  def find_published(what = :all, options = {})
+    options[:include] ||= []
+    options[:include] += [:user]
+    super(what, options)
+  end
 
   validates_uniqueness_of :guid
   validates_presence_of :title

data/app/models/content.rb

@@ -77,6 +77,8 @@ class Content < ActiveRecord::Base
       options.reverse_merge!(:order => default_order)
       options[:conditions] = merge_conditions(['published = ?', true],
                                               options[:conditions])
+      options[:include] ||= []
+      options[:include] += [:blog]
       find(what, options)
     end
 

data/app/models/ping.rb

@@ -87,43 +87,53 @@ class Ping < ActiveRecord::Base
   end
 
   def send_pingback_or_trackback(origin_url)
-    Pinger.new(origin_url, self).send_pingback_or_trackback
+    t = Thread.start do
+      Pinger.new(origin_url, self).send_pingback_or_trackback
+    end
+    t.join if defined? $TESTING
   end
 
   def send_trackback(trackback_url, origin_url)
-    trackback_uri = URI.parse(trackback_url)
-
-    post = "title=#{URI.escape(article.title)}"
-    post << "&excerpt=#{URI.escape(article.body_html.strip_html[0..254])}"
-    post << "&url=#{origin_url}"
-    post << "&blog_name=#{URI.escape(article.blog.blog_name)}"
-
-    Net::HTTP.start(trackback_uri.host, trackback_uri.port) do |http|
-      path = trackback_uri.path
-      path += "?#{trackback_uri.query}" if trackback_uri.query
-      http.post(path, post, 'Content-type' => 'application/x-www-form-urlencoded; charset=utf-8')
+    t = Thread.start do
+      trackback_uri = URI.parse(trackback_url)
+
+      post = "title=#{URI.escape(article.title)}"
+      post << "&excerpt=#{URI.escape(article.body_html.strip_html[0..254])}"
+      post << "&url=#{origin_url}"
+      post << "&blog_name=#{URI.escape(article.blog.blog_name)}"
+
+      Net::HTTP.start(trackback_uri.host, trackback_uri.port) do |http|
+        path = trackback_uri.path
+        path += "?#{trackback_uri.query}" if trackback_uri.query
+        http.post(path, post, 'Content-type' => 'application/x-www-form-urlencoded; charset=utf-8')
+      end
     end
+    t.join if defined? $TESTING
   end
 
-
-
   def send_weblogupdatesping(server_url, origin_url)
-    send_xml_rpc(self.url, "weblogUpdates.ping", article.blog.blog_name, server_url, origin_url)
+    t = Thread.start do
+      send_xml_rpc(self.url, "weblogUpdates.ping", article.blog.blog_name, server_url, origin_url)
+    end
+    t.join if defined? $TESTING
   end
 
   protected
 
   def send_xml_rpc(xml_rpc_url, name, *args)
-    begin
-      server = XMLRPC::Client.new2(URI.parse(xml_rpc_url).to_s)
-
+    t = Thread.start do
       begin
-        result = server.call(name, *args)
-      rescue XMLRPC::FaultException => e
+        server = XMLRPC::Client.new2(URI.parse(xml_rpc_url).to_s)
+
+        begin
+          result = server.call(name, *args)
+        rescue XMLRPC::FaultException => e
+          logger.error(e)
+        end
+      rescue Exception => e
         logger.error(e)
       end
-    rescue Exception => e
-      logger.error(e)
     end
+    t.join if defined? $TESTING
   end
 end

data/app/views/admin/content/_form.rhtml

@@ -12,6 +12,7 @@
 <p>
   <label for="article_body">Body:</label><br />
   <%= text_area 'article', 'body', :rows => 25, :style => 'width: 48%;'  %>
+  <br/><%= markup_help_popup @article.text_filter, "Markup Help" %>
 </p>
 <p>
   <label for="categories">Categories:</label><br />

data/app/views/admin/general/index.rhtml

@@ -176,7 +176,7 @@
         <p>
         <label for="itunes_summary">Summary:<small>(setting for channel)</small>
 </label> <br />
-          <textarea name="setting[itunes_summary]" cols="40" rows="3"><%= this_blog.itunes_summary %></textarea>
+          <textarea name="setting[itunes_summary]" cols="40" rows="3"><%=h this_blog.itunes_summary %></textarea>
         </p>
         <p>
           <label for="itunes_email">Email:</label>

data/app/views/admin/pages/_form.rhtml

@@ -11,6 +11,7 @@
 <p>
   <label for="page_body">Content:</label><br />
   <%= text_area 'page', 'body', :rows => 25, :style => 'width: 48%;'  %> 
+  <br/><%= markup_help_popup @page.text_filter, "Markup Help" %>
 </p>
 
 <label for="page_text_filter">Textfilter: </label><%= select 'page', 'text_filter', text_filter_options %><br/>

data/app/views/articles/_comment_box.rhtml

@@ -34,6 +34,7 @@
     <tr>
       <td colspan="2" id="frm-btns">
       <span id="comment_loading" style="display:none;"><%= image_tag "spinner.gif" %></span>&nbsp;&nbsp;
+      <%= markup_help_popup TextFilter.find_by_name(config[:comment_text_filter]), "Comment Markup Help" %>
       <a href="#" onclick="new Ajax.Updater('preview', '<%= url_for :action => 'comment_preview' %>',  {asynchronous:true, evalScripts:true, parameters:Form.serialize('commentform'), onComplete:function(request){Element.show('preview')}}); return false;">Preview comment</a>      
       <input type="submit" name="submit" id="form-submit-button" value="submit" class="button" />
       </td>

data/app/views/xml/_googlesitemap_item_article.rxml

@@ -0,0 +1,5 @@
+xm.item do
+  xm.link post_link(item)
+  xm.lastmod item.updated_at.xmlschema
+  xm.priority 0.8
+end

data/app/views/xml/_googlesitemap_item_category.rxml

@@ -0,0 +1,4 @@
+xm.item do
+  xm.link category_link(item)
+  xm.lastmod collection_lastmod(item)
+end

data/app/views/xml/_googlesitemap_item_page.rxml

@@ -0,0 +1,4 @@
+xm.item do
+  xm.link post_link(item)
+  xm.lastmod item.updated_at.xmlschema
+end

data/app/views/xml/_googlesitemap_item_tag.rxml

@@ -0,0 +1,4 @@
+xm.item do
+  xm.link tag_link(item)
+  xm.lastmod collection_lastmod(item)
+end

data/app/views/xml/googlesitemap_feed.rxml

@@ -0,0 +1,7 @@
+xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
+xml.urlset "xmlns"=>"http://www.google.com/schemas/sitemap/0.84" do
+  @items.each do |item|
+    render :partial => "googlesitemap_item_#{item.class.name.to_s.downcase}",
+      :locals => {:item => item, :xm => xml}
+  end
+end

data/app/views/xml/itunes_feed.rxml

@@ -20,10 +20,10 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
       xml.itunes :email,(this_blog.itunes_email)
     end
     xml.copyright(this_blog.itunes_copyright)
-  end
 
-  @items.each do |item|
-    render :partial => "itunes_item_resource",
-      :locals => {:item => item, :xm => xml}
+    @items.each do |item|
+      render :partial => "itunes_item_resource",
+        :locals => {:item => item, :xm => xml}
+    end
   end
 end

data/bin/typo

@@ -37,6 +37,16 @@ class TypoInstaller < RailsInstaller
   end
 end
 
+class SweepCache < RailsInstaller::Command
+  def self.command(installer, *args)
+    installer.sweep_cache
+  end
+  
+  def self.help(installer)
+    ['',"Sweep Typo's cache"]
+  end
+end
+
 # Installer program
 directory = ARGV[1]
 

data/components/plugins/sidebars/archives_controller.rb

@@ -5,20 +5,26 @@ class Plugins::Sidebars::ArchivesController < Sidebars::ComponentPlugin
 
 
   def content
-    @archives = this_blog.published_articles.inject([]) do |archives, a|
-      name = a.created_at.strftime('%B %Y')
-
-      if archives.last and archives.last[:name] == name
-        archives.last[:article_count] += 1
-        archives
-      else
-        break if archives.size == count.to_i # exit before we go over the limit
-
-        archives << { :name          => name,
-                      :year          => a.created_at.year,
-                      :month         => a.created_at.month,
-                      :article_count => 1 }
-      end
+    # The original query that was here instantiated every article and every
+    # tag, and then sorted through them just to do a 'group by date'. 
+    # Unfortunately, there's no universally-supported way to do this
+    # across all three of our supported DBs.  So, we resort to a bit of
+    # DB-specific code.
+    if Content.connection.kind_of? ActiveRecord::ConnectionAdapters::SQLiteAdapter
+      date_func = "strftime('%Y') as year, strftime('%m') as month"
+    else
+      date_func = "extract(year from published_at) as year,extract(month from published_at) as month"
+    end
+    
+    article_counts = Content.find_by_sql(["select count(*) as count, #{date_func} from contents where type='Article' and published = ? and published_at < ? group by year,month order by year desc,month desc limit ?",true,Time.now,count.to_i])
+    
+    @archives = article_counts.map do |entry|
+      {
+        :name => "#{Date::MONTHNAMES[entry.month.to_i]} #{entry.year}",
+        :month => entry.month.to_i,
+        :year => entry.year.to_i,
+        :article_count => entry.count
+      }
     end
   end
 end

data/components/plugins/sidebars/delicious/content.rhtml

@@ -1,16 +1,16 @@
 <% if @delicious -%>
   <div id="delicious">
-    <h3><a href="http://<%= @delicious.title %>"><%= @delicious.title %></a></h3>
+    <h3><a href="http://<%=h @delicious.title %>"><%=h @delicious.title %></a></h3>
     <% (@sb_config['groupdate'] ? @delicious.days : [{ :container => @delicious.items }]).each do |group| -%>
     <% if @sb_config['groupdate'] -%>
-    <span class="date"><%= group[:date].to_s.to_date.strftime("%b %d") %></span>
+    <span class="date"><%=h group[:date].to_s.to_date.strftime("%b %d") %></span>
     <% end -%>
     <ul>
       <% for item in group[:container] %>
       <li>
-        <a href="<%= item.link %>" title="<%=h item.description%>"><%=h item.title %></a>
+        <a href="<%=h item.link %>" title="<%=h item.description%>"><%=h item.title %></a>
         <% if @sb_config['description'] -%>
-          <br /><span class="desc"><%= @sb_config['desclink'] ? item.description_link : item.description %></span>
+          <br /><span class="desc"><%=h @sb_config['desclink'] ? item.description_link : item.description %></span>
         <% end -%>
       </li>
       <% end -%>

data/components/plugins/textfilters/amazon_controller.rb

@@ -34,6 +34,6 @@ while using your link.  Example:
 
 turns into
 
-    <a href="http://www.amazon.com/exec/obidos/ASIN/097669400X/scottstuff-20">}
+    <a href="http://www.amazon.com/.../097669400X/scottstuff-20">}
   end
 end

data/config/routes.rb

@@ -23,7 +23,8 @@ ActionController::Routing::Routes.draw do |map|
   map.xml 'xml/:format/:type/feed.xml', :controller => 'xml', :action => 'feed'
   map.xml 'xml/:format/:type/:id/feed.xml', :controller => 'xml', :action => 'feed'
   map.xml 'xml/rss', :controller => 'xml', :action => 'feed', :type => 'feed', :format => 'rss'
-
+  map.xml 'sitemap.xml', :controller => 'xml', :action => 'feed', :format => 'googlesitemap', :type => 'sitemap'
+ 
   # allow neat perma urls
   map.connect 'articles',
     :controller => 'articles', :action => 'index'