typo 5.4 → 5.4.1

data/CHANGELOG

@@ -1,44 +1,37 @@
-After 9 months of hard work, we're proud to announce the official release of Typo 5.4 Willy Ronis, the most advanced and user friendly blogging platform on Rails. Despite having a minor version number, Typo 5.4 is a major release, coming with a lot of new features and some bugfixes as Willy Ronis was a great photographer who died this year at the age of 99. Since Typo 5.4 fixes some major security issues, you should really think about upgrading.
+Only 1 week after releasing Typo 5.4, we're back with another cool Typo release. Since it was fixing a major security breach, Typo 5.4 was released a bit too quickly, and we left some bugs here and there we promptly fixed. So don't expect any new feature here, it's only about bug fixing and refactoring. Apparently, Matijs and Cyril had great fun doing this. I started to work on the first Typo user's guide as in our documentation effort. The 0.1 version is provided in Typo 5.4.1. We've also upgraded every theme at Typogarden to make them 5.4.1 compliant.
 
-Typo 5.4 is also a major release because we had many contributors from all over the world sending new features and fixes along this year. After contributing for a while, Matijs van Zuijlen (http://www.matijs.net/) finally joined the core team in late February and did a great job on this release. We would also like to thank, in alphabetical order: Diego Elio 'Flameeyes' Pettenò, Edward Middleton, Erik Ostrom, Hans de Graaff, Jakob Skov-Pedersen, Kurt Werle, Michael Reinsch, Mike Mondragon, Wei Jen Lu, Yuka Ouka, jzellman, and mpagalan.
+Since we're still working on what we want to see in the next Typo, don't mind opening a ticket to ask for something you want.
 
-So, what's new in Typo 5.4? A lot of things
+[#68] Atom feed has duplicated content
+There was a duplicate content in atom feed because of the use of atom:summary with extended content. Since summary is not mandatory, and it should not duplicate content, we've decided to remove it one from the feed. 
 
-= A brand new theme
-As we announced on our blog, Typo has now a default new theme. True Blue 3 is a port of the theme used at http://t37.net. Typographic is a great theme, but we needed something that would fit everyone's blog. Typographic is still proposed as a standard theme in Typo, but it's not the default theme anymore.
+[#75] <typo:code> textfilter need change all < by &lt; in atom feed
 
-= A brand new admin
-Once again, we've deeply changed the admin. It now comes in the same blue flavor we've been using on True Blue 3. Some things have moved, some others have disappeared. 
+[#86] Migrations out of necessary sequence
 
-= Performances improvement
-Performances improvement has been a huge part of the work on Typo 5.4. We followed 3 axes to give Typo better performances:
-  * Switching to Rails 2.3.4 divided the memory footprint by 2 since a major bug was fixed in this release.
-  * Removing lots of dead, legacy code made Typo slightly faster. It may break your theme though, but the changed are easy.
-  * Switching from Ruby Bluecloth to C Bluecloth 2 has surprising effects on page generation speed. Generating a page with 4500 comments switched from more than 2 minutes to about 2 seconds on our testing machines.
+[#124] &gt; and &lt; entities are decoded in the atom feed
 
-= Autosave for all
-Previsouly reserved to new posts only with the simple editor, autosave is now avaliable when you create and edit posts, on both simple and visual editor.
+[#126] Previews give an application error 
 
-= New visual editor
-Speaking of the visual editor, we've upgraded to the new CKEditor, aka FCKEditor 3. Lighter, producing better code, CKEditor is the new generation of visual web editors. CKEditor is now plugged to Typo resources engine, providing better backward compatibility with older blogs. Switch between simple and visual editor without losing content has also been fixed.
+[#127] Changing post's title changes the permalink slug
 
-= Articles preview
-A long awaited feature was the article preview during edition. It is now avaliable, so you can be sure of what you're going to publish.
+[#128] Fix typogarden themes
+Seems obvious isn't it?
 
-= User creation simplified
-Users creation from the front end has been simplified. You now just need to provide a login and an email, and you're done! 
+[#130] Theme editor textbox is too small
+There was actually wet paint in our new admin. We fixed that quickly.
 
-= Users public profiles
-Users public pages are back, coming with an improved profile, allowing you to display your msn, aim, or twitter id. You can also chose the name you'll display on screen, chosing from your login, real name, or anything else. Authors also have their RSS and Atom feed back. An author sidebar is now also avaliable.
+[#131] New Tags are created two times
+The way autosave on new / saved articles worked was quite complicated and ended with strange behavior.
 
-= Chinese support
-Simple Chinese joins the number of languages supported by Typo. Cool.
+[#132] Categories are brocken
+A typo in the category views.
+
+[#133] Installer parameter database=sqlite3 doesn't work
+Awated parameter was database=sqlite, but since this could be confusing, we've made sqlite3 avaliable as well.
+
+[#134] "Continue reading ..." link appears for posts that do not have additional content. 
+This one was actually the tree hiding the forest of all our themes being brocken because it constant renaming of the read controller and action name.
 
-= Better Wordpress converter
-Wordpress converter has been greatly improved, fixing lots of points that made the import incomplete: pages imported as article, spam comments considered as ham, blog name and subtitle not imported... Switching to Typo has never been easier.
 
-= Secondary layout for pages
-Lost of users have been asking for the possibility to define a secondary layout for pages. It's now done. Just add a pages.html.erb in your theme layout directory, mix some HTML and Ruby and you're done!
 
-= Cache unification
-Since we've fixed the static cache, we've decided to drop the cached model support along with the memcache support for cache model. It results in a lighter, simpler code, and less errors possible.

data/app/controllers/admin/content_controller.rb

@@ -10,13 +10,11 @@ class Admin::ContentController < Admin::BaseController
     @items = Tag.find_with_char params[:article][:keywords].strip
     render :inline => "<%= auto_complete_result @items, 'name' %>"
   end
-  
+
   def index
-    @drafts = Article.draft.all
-    setup_categories
     @search = params[:search] ? params[:search] : {}
     @articles = Article.search_no_draft_paginate(@search, :page => params[:page], :per_page => this_blog.admin_display_elements)
-    
+
     if request.xhr?
       render :partial => 'article_list', :object => @articles
     else
@@ -24,31 +22,30 @@ class Admin::ContentController < Admin::BaseController
     end
   end
 
-  def new 
+  def new
     new_or_edit
   end
-  
+
   def edit
-    @drafts = Article.draft.all
     @article = Article.find(params[:id])
-    
-    unless @article.access_by? current_user 
+
+    unless @article.access_by? current_user
       redirect_to :action => 'index'
       flash[:error] = _("Error, you are not allowed to perform this action")
       return
     end
-    new_or_edit 
+    new_or_edit
   end
 
   def destroy
     @article = Article.find(params[:id])
-    
+
     unless @article.access_by?(current_user)
       redirect_to :action => 'index'
       flash[:error] = _("Error, you are not allowed to perform this action")
       return
     end
-    
+
     if request.post?
       @article.destroy
       redirect_to :action => 'index'
@@ -60,7 +57,7 @@ class Admin::ContentController < Admin::BaseController
     return unless params[:editor].to_s =~ /simple|visual/
     current_user.editor = params[:editor].to_s
     current_user.save!
-    
+
     render :partial => "#{params[:editor].to_s}_editor"
   end
 
@@ -91,23 +88,21 @@ class Admin::ContentController < Admin::BaseController
   def autosave
     get_or_build_article
 
-    # This is ugly, but I have to check whether or not the article is 
+    # This is ugly, but I have to check whether or not the article is
     # published to create the dummy draft I'll replace later so that the
     # published article doesn't get overriden on the front
     if @article.published
       parent_id = @article.id
-      @article = Article.new
+      @article = Article.drafts.child_of(parent_id).first || Article.new
       @article.allow_comments = this_blog.default_allow_comments
       @article.allow_pings    = this_blog.default_allow_pings
       @article.text_filter    = (current_user.editor == 'simple') ? current_user.text_filter : 1
       @article.parent_id      = parent_id
     end
-  
+
     params[:article] ||= {}
     @article.attributes = params[:article]
     @article.published = false
-    setup_categories
-    @selected = @article.categories.collect { |c| c.id }
     set_article_author
     save_attachments
 
@@ -144,24 +139,22 @@ class Admin::ContentController < Admin::BaseController
 
   def new_or_edit
     get_or_build_article
-    
+
     @macros = TextFilter.available_filters.select { |filter| TextFilterPlugin::Macro > filter }
     @article.published = true
-    
+
     # TODO Test if we can delete the next line. It's delete on nice_permalinks branch
     params[:article] ||= {}
 
     @resources = Resource.find(:all, :order => 'filename')
     @article.attributes = params[:article]
-    
-    setup_categories
-    @selected = @article.categories.collect { |c| c.id }
-    @drafts = Article.drafts
+
+
     if request.post?
       set_article_author
       save_attachments
       @article.state = "draft" if @article.draft
-      
+
       if @article.save
         destroy_the_draft unless @article.draft
         set_article_categories
@@ -185,8 +178,7 @@ class Admin::ContentController < Admin::BaseController
   end
 
   def destroy_the_draft
-    draft = Article.find(:first, :conditions => { :parent_id => @article.id })
-    draft.destroy if draft
+    Article.all(:conditions => { :parent_id => @article.id }).map(&:destroy)
   end
 
   def set_article_author
@@ -196,10 +188,15 @@ class Admin::ContentController < Admin::BaseController
   end
 
   def set_article_title_for_autosave
-    lastid = Article.find(:first, :order => 'id DESC').id
-    @article.title = @article.title.blank? ? "Draft article " + lastid.to_s : @article.permalink = @article.stripped_title
+    if @article.title.blank?
+      lastid = Article.find(:first, :order => 'id DESC').id
+      @article.title = "Draft article " + lastid.to_s
+    end
+    unless @article.parent_id and Article.find(@article.parent_id).published
+      @article.permalink = @article.stripped_title
+    end
   end
-  
+
   def save_attachments
     return if params[:attachments].nil?
     params[:attachments].each do |k,v|
@@ -215,7 +212,6 @@ class Admin::ContentController < Admin::BaseController
         @article.categories << cat
       end
     end
-    @selected = params[:categories] || []
   end
 
   def def_build_body
@@ -224,7 +220,7 @@ class Admin::ContentController < Admin::BaseController
       @article.body = body[0]
       @article.extended = body[1]
     end
-    
+
   end
 
   def get_or_build_article
@@ -240,10 +236,6 @@ class Admin::ContentController < Admin::BaseController
             end
   end
 
-  def setup_categories
-    @categories = Category.find(:all, :order => 'UPPER(name)')
-  end
-
   def setup_resources
     @resources = Resource.find(:all, :order => 'created_at DESC')
   end

data/app/controllers/admin/tags_controller.rb

@@ -1,5 +1,5 @@
 class Admin::TagsController < Admin::BaseController
-  
+
   cache_sweeper :blog_sweeper
 
   def index
@@ -15,7 +15,7 @@ class Admin::TagsController < Admin::BaseController
 
     @tags = Tag.paginate(:page => params[:page], :order => :display_name, :per_page => this_blog.admin_display_elements)
   end
-  
+
   def edit
     @tag = Tag.find(params[:id])
     @tag.attributes = params[:tag]
@@ -25,7 +25,7 @@ class Admin::TagsController < Admin::BaseController
       redirect_to :action => 'index'
     end
   end
-    
+
   def destroy
     @tag = Tag.find(params[:id])
     if request.post?
@@ -33,5 +33,5 @@ class Admin::TagsController < Admin::BaseController
       redirect_to :action => 'index'
     end
   end
-  
+
 end

data/app/controllers/articles_controller.rb

@@ -1,11 +1,12 @@
 class ArticlesController < ContentController
   before_filter :verify_config
+  before_filter :login_required, :only => [:preview]
   before_filter :auto_discovery_feed, :only => [:show, :index]
 
   layout :theme_layout, :except => [:comment_preview, :trackback]
 
   cache_sweeper :blog_sweeper
-  caches_page :index, :read, :archives, :view_page, :if => Proc.new {|c|
+  caches_page :index, :read, :archives, :view_page, :redirect, :if => Proc.new {|c|
     c.request.query_string == ''
   }
 
@@ -58,6 +59,91 @@ class ArticlesController < ContentController
     render :layout => false, :action => :live_search
   end
 
+  def preview
+    @article = Article.last_draft(params[:id])
+    render :action => 'read'
+  end
+
+  def redirect
+    part = this_blog.permalink_format.split('/')
+    part.delete('') # delete all par of / where no data. Avoid all // or / started
+    params[:from].delete('')
+    if params[:from].last =~ /\.atom$/
+      params[:format] = 'atom'
+      params[:from].last.gsub!(/\.atom$/, '')
+    elsif params[:from].last =~ /\.rss$/
+      params[:format] = 'rss'
+      params[:from].last.gsub!(/\.rss$/, '')
+    end
+    zip_part = part.zip(params[:from])
+    article_params = {}
+    zip_part.each do |asso|
+      ['%year%', '%month%', '%day%', '%title%'].each do |format_string|
+        if asso[0] =~ /(.*)#{format_string}(.*)/
+          before_format = $1
+          after_format = $2
+          next if asso[1].nil?
+          result =  asso[1].gsub(before_format, '')
+          result.gsub!(after_format, '')
+          article_params[format_string.gsub('%', '').to_sym] = result
+        end
+      end
+    end
+    begin
+      @article = this_blog.requested_article(article_params)
+    rescue
+      #Not really good. 
+      # TODO :Check in request_article type of DATA made in next step
+    end
+    return show_article if @article
+
+    # Redirect old version with /:year/:month/:day/:title to new format.
+    # because it's change
+    ["%year%/%month%/%day%/%title%".split('/'), "articles/%year%/%month%/%day%/%title%".split('/')].each do |part|
+      part.delete('') # delete all par of / where no data. Avoid all // or / started
+      params[:from].delete('')
+      zip_part = part.zip(params[:from])
+      article_params = {}
+      zip_part.each do |asso|
+        ['%year%', '%month%', '%day%', '%title%'].each do |format_string|
+          if asso[0] =~ /(.*)#{format_string}(.*)/
+            before_format = $1
+            after_format = $2
+            next if asso[1].nil?
+            result =  asso[1].gsub(before_format, '')
+            result.gsub!(after_format, '')
+            article_params[format_string.gsub('%', '').to_sym] = result
+          end
+        end
+      end
+      begin
+        @article = this_blog.requested_article(article_params)
+      rescue
+        #Not really good. 
+        # TODO :Check in request_article type of DATA made in next step
+      end
+      if @article
+        redirect_to @article.permalink_url, :status => 301
+        return
+      end
+    end
+
+
+    # see how manage all by this redirect to redirect in different possible
+    # way maybe define in a controller in admin part in insert in this table
+    r = Redirect.find_by_from_path(params[:from].join("/"))
+
+    if(r)
+      path = r.to_path
+      url_root = self.class.relative_url_root
+      path = url_root + path unless url_root.nil? or path[0,url_root.length] == url_root
+      redirect_to path, :status => 301
+    else
+      render :text => "Page not found", :status => 404
+    end
+  end
+
+
   ### Deprecated Actions ###
 
   def archives
@@ -110,6 +196,33 @@ class ArticlesController < ContentController
     end
   end
   
+  # See an article We need define @article before
+  def show_article
+    @comment      = Comment.new
+    @page_title   = @article.title
+    article_meta
+    
+    auto_discovery_feed
+    respond_to do |format|
+      format.html { render :template => '/articles/read' }
+      format.atom { render_feed('atom') }
+      format.rss  { render_feed('rss20') }
+      format.xml  { render_feed('atom') }
+    end
+  rescue ActiveRecord::RecordNotFound
+    error("Post not found...")
+  end
+
+  def article_meta
+    @keywords = ""
+    @keywords << @article.categories.map { |c| c.name }.join(", ") << ", " unless @article.categories.empty?
+    @keywords << @article.tags.map { |t| t.name }.join(", ") unless @article.tags.empty?  
+    @description = "#{@article.title}, " 
+    @description << @article.categories.map { |c| c.name }.join(", ") << ", " unless @article.categories.empty?
+    @description << @article.tags.map { |t| t.name }.join(", ") unless @article.tags.empty?
+    @description << " #{this_blog.blog_name}"
+  end
+
   def send_feed(format)
     if this_blog.feedburner_url.empty? or request.env["HTTP_USER_AGENT"] =~ /FeedBurner/i
       render :partial => "articles/#{format}_feed", :object => @articles
@@ -118,6 +231,11 @@ class ArticlesController < ContentController
     end
   end
   
+  # TODO: Merge with send_feed?
+  def render_feed(type)
+    render :partial => "/articles/#{type}_feed", :object => @article.published_feedback 
+  end
+
   def set_headers
     headers["Content-Type"] = "text/html; charset=utf-8"
   end

data/app/controllers/comments_controller.rb

@@ -1,5 +1,4 @@
 class CommentsController < FeedbackController
-  before_filter :check_request_type, :only => [:create]
   before_filter :get_article, :only => [:create, :preview]
 
   def create
@@ -76,12 +75,6 @@ class CommentsController < FeedbackController
     headers["Content-Type"] = "text/html; charset=utf-8"
   end
 
-  def check_request_type
-    return true if this_blog.sp_allow_non_ajax_comments || request.xhr?
-    render :nothing => true, :status => :bad_request
-    return false
-  end
-
   def set_comment_cookies
     add_to_cookies(:author, @comment.author)
     if ! @comment.email.blank?

data/app/controllers/content_controller.rb

@@ -24,6 +24,7 @@ class ContentController < ApplicationController
 
   protected
 
+  # TODO: Make this work for all content.
   def auto_discovery_feed(options = { })
     with_options(options.reverse_merge(:only_path => true)) do |opts|
       @auto_discovery_url_rss = opts.url_for(:format => 'rss')