typo 5.2 → 5.2.98

data/README

@@ -2,7 +2,7 @@ What is it?
 ===========
 
 Typo is a weblog system written in Ruby using Ruby on Rails. Weblogs are cool,
-weblogs are "in" and everyone who writes code has an different opinion on how
+weblogs are "in" and everyone who writes code has a different opinion on how
 a weblog should be written. Typo is our take on it. Typo is designed to be
 usable by programmers and non-programmers, while being easy for programmers to
 extend.
@@ -13,7 +13,7 @@ Requirements
 Currently you need all of those things to get typo to run:
 
  * Ruby 1.8.6 or Ruby Enterprise Edition. 
- * Rails 2.2, Typo 5.2 DOES NOT support Rails 2.1.
+ * Rails 2.2, Typo 5.3 DOES NOT support Rails 2.1.
  * A database.  Typo supports MySQL, PostgreSQL, and SQLite.
  * Ruby drivers for your database.
  * For best performance, you should have a web server running either
@@ -26,7 +26,7 @@ Currently you need all of those things to get typo to run:
 Installation
 ============
 
-See doc/Installer.text and doc/typo-5.2-release-notes.txt.
+See doc/Installer.txt and doc/typo-5.3-release-notes.txt.
 
 Usage
 ======

data/UPGRADE

@@ -0,0 +1,140 @@
+UPGRADING TO TYPO 5.3 HOWTO
+
+*** BEFORE UPGRADING ***
+
+Pre migration steps are divided into 2 categories : things you should do, and things you must do.
+
+You should make a backup of your current blog, either using a file transfer software or an archiver like zip or tar.
+
+You should make a backup of your database, using either mysqldump, pgdump or phpmyadmin, whichever you feel safe with.
+
+If you're using a pre 5.0 version, you should remove all the following sidebars before migrating:
+
+* AIM presence
+* Audioscrobbler
+* Backpack
+* Delicious
+* Flickr
+* 43 things
+* 43 places
+* Magnolia
+* Recent comments
+* Tada
+* Upcoming
+* Xbox
+
+These sidebars have been removed from Typo core at 5.0 and are now hosted on a separate repository. You can also migrate, then reinstall those plugins before trying to access your blog frontend or admin.
+
+If you're using a Typo version priori to 5.1, you must manually remove the lib directory inside your typo install.
+
+If you're using a third party theme, you'll have do some changes to your template as well. This is explained later.
+
+*** UPGRADING ***
+
+Upgrading should be a really easy process, depending on how you installed your typo first.
+
+** UPGRADING WITH TYPO INSTALLER FROM TYPO 2.0 to 5.0 **
+
+Automagically upgrading Typo 2.0 to 5.0 using Typo instaler is not possible, but you can catch on the train anyway, it will just be a little harder. By default Typo uses MySQL database. If you want to use something else, check our installation documentation.
+
+* UPGRADING FILES *
+
+First, move your production Typo directory somewhere else :
+
+$ mv typo_path old_typo
+
+If you have root access to your host, launch:
+
+$ sudo gem install typo
+$ typo install typo_path
+
+or 
+
+$ sudo gem update typo
+$ typo install typo_path
+
+If you don't have root access, things are just a bit more complicated
+
+$ export GEM_PATH=~/gems
+$ gem install -i ~/gems typo
+$ ~/gems/bin/typo install typo_path
+
+or
+
+$ export GEM_PATH=~/gems
+$ gem update -i ~/gems typo
+$ ~/gems/bin/typo install typo_path
+
+Then, move your theme (which is certainly not compatible anymore at all), your database confiuration and your uploaded files to your new blog:
+
+$ mv old_typo/public/files/* typo_path/public/files
+$ mv old_typo/themes/your_theme typo_path/themes/
+$ mv old_typo/config/database.yml typo_path/config
+
+Ensure all your typo files have the good perms, then restart your Typo instance.
+
+* UPGRADING DATABASE *
+
+Login in to your Typo admin using your favourite web browser. You'll access to the database migration page. Just click on the "migrate" button.
+
+If something goes wrong, go back to your terminal, and run
+
+$ cd typo_path
+$ rake RAILS_ENV=production db:migrate
+
+If things really goes wrong, then please ask for help on the Typo mailing list or on IRC #typo@irc.freenode.net
+
+** UPGRADING WITH TYPO INSTALLER FROM TYPO 5.0 and later **
+
+* UPGRADING FILES *
+
+First, install or update your Typo gem.
+
+If you have root access to your host, launch:
+
+$ sudo gem install typo
+$ typo install typo_path
+
+or 
+
+$ sudo gem update typo
+$ typo install typo_path
+
+If you don't have root access, things are just a bit more complicated
+
+$ export GEM_PATH=~/gems
+$ gem install -i ~/gems typo
+$ ~/gems/bin/typo install typo_path
+
+or
+
+$ export GEM_PATH=~/gems
+$ gem update -i ~/gems typo
+$ ~/gems/bin/typo install /some/path
+
+Ensure all your typo files have the good perms, then restart your Typo instance.
+
+* UPGRADING DATABASE *
+
+Login in to your Typo admin using your favourite web browser. You'll access to the database migration page. Just click on the "migrate" button.
+
+If something goes wrong, go back to your terminal, and run
+
+$ cd typo_path
+$ rake RAILS_ENV=production db:migrate
+
+If things really goes wrong, then please ask for help on the Typo mailing list or on IRC #typo@irc.freenode.net
+
+*** UPGRADING YOUR THEME ***
+
+** UPGRADING FROM TYPO 5.2 **
+
+* In articles/_comment_box.html.erb use @article.comment_url instead of comments_path(@article)
+
+* all link preview_new_comment_path(@article) are changed to @article.preview_comment_url
+
+* all link url_for formatted_article_path(@article, :rss) are changed to @article.feed_url(:rss)
+
+* all link formatted_article_url(@article, @format) are changed to   @article.permalink_by_format(@format)
+
+* The classical search has moved to sidebar. So if you want, you can delete the render of shared/search in your layout and use the search_sidebar instead of.

data/app/controllers/accounts_controller.rb

@@ -2,7 +2,12 @@ class AccountsController < ApplicationController
 
   before_filter :verify_users, :only => [:login]
 
-  def login
+  def login 
+    if session[:user_id] && session[:user_id] == self.current_user.id
+      redirect_back_or_default :controller => "admin/dashboard", :action => "index"
+      return
+    end
+      
     @page_title = "#{this_blog.blog_name} - #{_('login')}"
     case request.method
       when :post

data/app/controllers/admin/base_controller.rb

@@ -15,23 +15,6 @@ class Admin::BaseController < ApplicationController
   end
 
   def sweep_cache
-    if Blog.default
-      if Blog.default.cache_option == "caches_action_with_params"
-        sweep_cache_action
-      end
-      if Blog.default.cache_option == "caches_page"
-        sweep_cache_html
-      end
-    end
-  end
-
-  def sweep_cache_action
-    PageCache.sweep_all
-    expire_fragment(/.*/)
-  end
-
-  def sweep_cache_html
-    PageCache.sweep_all
-    expire_fragment(/^contents_html.*/)
+    PageCache.sweep_all  
   end
 end

data/app/controllers/admin/cache_controller.rb

@@ -1,13 +1,7 @@
 class Admin::CacheController < Admin::BaseController
 
-  def sweep
-    sweep_cache_action
-    flash[:notice] = _('Cache was cleared')
-    redirect_to :controller => '/admin/settings'
-  end
-
   def sweep_html
-    sweep_cache_html
+    sweep_cache
     flash[:notice] = _('HTML was cleared')
     redirect_to :controller => '/admin/settings'
   end

data/app/controllers/admin/content_controller.rb

@@ -1,4 +1,5 @@
 require 'base64'
+
 module Admin; end
 class Admin::ContentController < Admin::BaseController
   layout "administration", :except => [:show, :autosave]
@@ -23,10 +24,6 @@ class Admin::ContentController < Admin::BaseController
     end
   end
 
-  def show
-    @article = Article.find(params[:id])
-  end
-
   def new 
     new_or_edit
   end
@@ -59,6 +56,14 @@ class Admin::ContentController < Admin::BaseController
     end
   end
 
+  def insert_editor
+    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
+
   def category_add; do_add_or_remove_fu; end
   alias_method :resource_add,    :category_add
   alias_method :resource_remove, :category_add
@@ -99,7 +104,7 @@ class Admin::ContentController < Admin::BaseController
       @article.state = "draft" unless @article.state == "withdrawn"
       if @article.save
         render(:update) do |page|
-          page.replace_html('autosave', _("Article was successfully saved at ") + Time.now.to_s + "<input type='hidden' name='id' value='#{@article.id}' />")
+          page.replace_html('autosave', hidden_field_tag('id', @article.id))
           page.replace_html('permalink', text_field('article', 'permalink'))
         end
 
@@ -130,6 +135,7 @@ class Admin::ContentController < Admin::BaseController
     @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')
@@ -207,6 +213,7 @@ class Admin::ContentController < Admin::BaseController
                returning(Article.new) do |art|
                  art.allow_comments = this_blog.default_allow_comments
                  art.allow_pings    = this_blog.default_allow_pings
+                 art.text_filter    = current_user.text_filter
                end
             else
               Article.find(params[:id])

data/app/controllers/admin/feedback_controller.rb

@@ -60,7 +60,8 @@ class Admin::FeedbackController < Admin::BaseController
   def create
     @article = Article.find(params[:article_id])
     @comment = @article.comments.build(params[:comment])
-
+    @comment.user_id = current_user.id
+    
     if request.post? and @comment.save
       # We should probably wave a spam filter over this, but for now, just mark it as published.
       @comment.mark_as_ham!
@@ -157,7 +158,6 @@ class Admin::FeedbackController < Admin::BaseController
   def flush_cache
     @unexpired = false
     PageCache.sweep_all
-    expire_fragment(/.*/)
   end
 
   def only_own_feedback

data/app/controllers/admin/pages_controller.rb

@@ -35,7 +35,7 @@ class Admin::PagesController < Admin::BaseController
     @macros = TextFilter.available_filters.select { |filter| TextFilterPlugin::Macro > filter }
     @page = Page.new(params[:page])
     @page.user_id = current_user.id
-    @page.text_filter ||= this_blog.text_filter
+    @page.text_filter ||= current_user.text_filter
     if request.post? 
       if @page.name.blank?
         @page.name = @page.title.tr(FROM, TO).gsub(/<[^>]*>/, '').to_url 
@@ -65,4 +65,13 @@ class Admin::PagesController < Admin::BaseController
       redirect_to :action => 'index'
     end
   end
+  
+  def insert_editor
+    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
+  
 end

data/app/controllers/admin/settings_controller.rb

@@ -11,7 +11,16 @@ class Admin::SettingsController < Admin::BaseController
   def read; end
   def write; end
   def feedback; end
-  def seo; end
+  
+  def seo
+    if File.exists? "#{RAILS_ROOT}/public/robots.txt"
+      this_blog.robots = ""
+      file = File.readlines("#{RAILS_ROOT}/public/robots.txt")
+      file.each do |line|
+        this_blog.robots << line
+      end
+    end
+  end
   
   def redirect
     flash[:notice] = _("Please review and save the settings before continuing")
@@ -25,8 +34,13 @@ class Admin::SettingsController < Admin::BaseController
         this_blog.save
         flash[:notice] = _('config updated.')
       end
+      
+      save_robots unless params[:setting][:robots].blank?
+      
       redirect_to :action => params[:from]
     end
+  rescue ActiveRecord::RecordInvalid
+    render :action => params[:from]
   end
   
   def update_database
@@ -45,4 +59,12 @@ class Admin::SettingsController < Admin::BaseController
     end
   end
   
+  private
+  def save_robots
+    if File.writable? "#{RAILS_ROOT}/public/robots.txt"
+      robots = File.new("#{RAILS_ROOT}/public/robots.txt", "r+")
+      robots.write(params[:setting][:robots])
+      robots.close
+    end
+  end
 end

data/app/controllers/admin/users_controller.rb

@@ -12,6 +12,7 @@ class Admin::UsersController < Admin::BaseController
 
   def new
     @user = User.new(params[:user])
+    @user.text_filter = TextFilter.find_by_name(this_blog.text_filter)
     setup_profiles
     if request.post? and @user.save
       flash[:notice] = _('User was successfully created.')

data/app/controllers/application.rb

@@ -13,6 +13,16 @@ class ApplicationController < ActionController::Base
         ActionController::Base.view_paths.last
       end
     end
+
+    # Log all path in file path_cache in Rails.root
+    # When we sweep all cache. We just need delete this file
+    def cache_page_with_log_page(content, path)
+      return unless perform_caching
+      cache_page_without_log_page(content, path)
+      CacheInformation.create(:path => page_cache_file(path))
+    end
+    alias_method_chain :cache_page, :log_page
+
   end
 
   protected

data/app/controllers/articles_controller.rb

@@ -5,14 +5,7 @@ class ArticlesController < ContentController
   layout :theme_layout, :except => [:comment_preview, :trackback]
 
   cache_sweeper :blog_sweeper
-
-  cached_pages = [:index, :read, :show, :archives, :view_page]
-
-  if Blog.default && Blog.default.cache_option == "caches_action_with_params"
-    caches_action_with_params *cached_pages
-  else
-    caches_page *cached_pages
-  end
+  caches_page :index, :read, :archives, :view_page
 
   helper :'admin/base'
 
@@ -24,9 +17,11 @@ class ArticlesController < ContentController
     end
     
     unless params[:year].blank?
-      @articles = Article.paginate :page => params[:page], :conditions => { :published_at => time_delta(*params.values_at(:year, :month, :day)), :published => true }, :order => 'created_at DESC', :per_page => @limit
+      @noindex = 1
+      @articles = Article.paginate :page => params[:page], :conditions => { :published_at => time_delta(*params.values_at(:year, :month, :day)), :published => true }, :order => 'published_at DESC', :per_page => @limit
     else
-      @articles = Article.paginate :page => params[:page], :conditions => { :published => true }, :order => 'created_at DESC', :per_page => @limit      
+      @noindex = 1 unless params[:page].blank?
+      @articles = Article.paginate :page => params[:page], :conditions => { :published => true }, :order => 'published_at DESC', :per_page => @limit
     end
     
     @page_title = index_title
@@ -36,36 +31,29 @@ class ArticlesController < ContentController
     respond_to do |format|
       format.html { render_paginated_index }
       format.atom do
-        render :partial => 'articles/atom_feed', :object => @articles
+        send_feed('atom')
       end
       format.rss do
         auto_discovery_feed(:only_path => false)
-        render :partial => 'articles/rss20_feed', :object => @articles
+        send_feed('rss20')
       end
     end
   end
 
-  def show
-    @article      = this_blog.requested_article(params)
-    @comment      = Comment.new
-    @page_title   = @article.title
-    article_meta
-    
-    auto_discovery_feed
+  def search
+    @articles = this_blog.articles_matching(params[:q], :page => params[:page], :per_page => @limit)
+    return error(_("No posts found..."), :status => 200) if @articles.empty?
     respond_to do |format|
-      format.html { render :action => 'read' }
-      format.atom {  render :partial => 'articles/atom_feed', :object => @article.published_feedback }
-      format.rss  { render :partial => 'articles/rss20_feed', :object => @article.published_feedback }
-      format.xml  { redirect_to :format => 'atom' }
+      format.html { render :action => 'search' }
+      format.rss { render :partial => "articles/rss20_feed", :object => @articles }
+      format.atom { render :partial => "articles/atom_feed", :object => @articles }
     end
-    rescue ActiveRecord::RecordNotFound
-      error("Post not found...")
   end
 
-  def search
-    @articles = this_blog.articles_matching(params[:q], :page => params[:page], :per_page => @limit)
-    return error(on_empty, :status => 200) if @articles.empty?
-    render :action => 'search'
+  def live_search
+    @search = params[:q]
+    @articles = Article.search(@search)
+    render :layout => false, :action => :live_search
   end
 
   ### Deprecated Actions ###
@@ -88,10 +76,6 @@ class ArticlesController < ContentController
     @controller = self
   end
 
-  def author
-    redirect_to authors_path, :status => 301
-  end
-
   def category
     redirect_to categories_path, :status => 301
   end
@@ -124,28 +108,32 @@ class ArticlesController < ContentController
     end
   end
   
+  def send_feed(format)
+    if this_blog.feedburner_url.empty? or request.env["HTTP_USER_AGENT"][/Feedburner/] 
+      render :partial => "articles/#{format}_feed", :object => @articles
+    else
+      redirect_to "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
+    end
+  end
+  
   alias_method :rescue_action_in_public, :error
 
   def render_error(object = '', status = 500)
     render(:text => (object.errors.full_messages.join(", ") rescue object.to_s), :status => status)
   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 set_headers
     headers["Content-Type"] = "text/html; charset=utf-8"
   end
 
   def render_paginated_index(on_empty = _("No posts found..."))
     return error(on_empty, :status => 200) if @articles.empty?
+    if this_blog.feedburner_url.empty?
+      auto_discovery_feed(:only_path => false)
+    else
+      @auto_discovery_url_rss = "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
+      @auto_discovery_url_atom = "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
+    end
     render :action => 'index'
   end