typo 5.1.3 → 5.1.98

data/CHANGELOG

@@ -0,0 +1 @@
+Typo 5.2 is the latest Typo major version, comming along with Rails 2.2.2

data/MAINTAINERS

@@ -21,7 +21,11 @@ Davide D'Agostino <d.dagostino@lipsiasoft.com>
 blog: http://www.lipsiasoft.com
 irc: DAddYE
 
+Cyril Mougel <cyril.mougel@gmail.com>
+blog: http://blog.shingara.fr
+irc: shingara
+
 Mascot
 
 Sprewell
-irc: sprewell
+irc: sprewell

data/README

@@ -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.0.2. Typo DOES NOT support Rails 2.1 yet.
+ * Rails 2.2, Typo 5.2 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.0.3-release-notes.txt.
+See doc/Installer.text and doc/typo-5.2-release-notes.txt.
 
 Usage
 ======
@@ -36,7 +36,7 @@ http://your.domain.com/admin. You can use this to post articles and
 change Typo's configuration settings. For posting new content, you can
 either use this administrative web interface or a desktop blog editor
 like MarsEdit or Ecto. For a short list of clients which are confirmed
-to work please visit http://trac.typosphere.org/wiki/DesktopClients.
+to work please visit http://typosphere.org/wiki/DesktopClients.
 
 Client setup
 ============
@@ -44,13 +44,6 @@ Client setup
 Set your desktop client to Movable Type API and enter
 http://your.domain.com/backend/xmlrpc as endpoint address.
 
-Tell me about your blog
-=======================
-
-Add yourself to the list of typo blogs at http://trac.typosphere.org/wiki/TypoPowered
-and subscribe to the typo mailing list.
-
-
 Enjoy,
 Your typo team
 

data/app/apis/meta_weblog_service.rb

@@ -167,7 +167,7 @@ class MetaWeblogService < TypoWebService
       :mt_allow_pings    => article.allow_pings? ? 1 : 0,
       :mt_convert_breaks => (article.text_filter.name.to_s rescue ''),
       :mt_tb_ping_urls   => article.pings.collect { |p| p.url },
-      :dateCreated       => (article.published_at.getutc.to_formatted_s(:db) rescue "")
+      :dateCreated       => (article.published_at.utc rescue '')
       )
   end
 end

data/app/controllers/accounts_controller.rb

@@ -3,6 +3,7 @@ class AccountsController < ApplicationController
   before_filter :verify_users, :only => [:login]
 
   def login
+    @page_title = "#{this_blog.blog_name} - #{_('login')}"
     case request.method
       when :post
       self.current_user = User.authenticate(params[:user_login], params[:user_password])
@@ -10,16 +11,27 @@ class AccountsController < ApplicationController
       if logged_in?
         session[:user_id] = self.current_user.id
 
+        if params[:remember_me] == "1"
+          self.current_user.remember_me unless self.current_user.remember_token?
+          cookies[:auth_token] = {
+            :value => self.current_user.remember_token,
+            :expires => self.current_user.remember_token_expires_at,
+            :http_only => true # Help prevent auth_token theft.
+          }
+        end
+        add_to_cookies(:typo_user_profile, self.current_user.profile.label, '/')
+
         flash[:notice]  = _("Login successful")
         redirect_back_or_default :controller => "admin/dashboard", :action => "index"
       else
-        flash.now[:notice]  = _("Login unsuccessful")
+        flash.now[:error]  = _("Login unsuccessful")
         @login = params[:user_login]
       end
     end
   end
   
   def signup
+    @page_title = "#{this_blog.blog_name} - #{_('signup')}"
     unless User.count.zero? or this_blog.allow_signup == 1
       redirect_to :action => 'login'
       return
@@ -37,21 +49,20 @@ class AccountsController < ApplicationController
   end
 
   def logout
+    flash[:notice]  = _("Successfully logged out")
+    self.current_user.forget_me
     self.current_user = nil
     session[:user_id] = nil
-  end
-
-  def welcome
+    cookies.delete :auth_token
+    cookies.delete :typo_user_profile
+    redirect_to :action => 'login'
   end
 
   private
 
   def verify_users
-    if User.count == 0
-      redirect_to :controller => "accounts", :action => "signup"
-    else
-      true
-    end
+    redirect_to(:controller => "accounts", :action => "signup") if User.count == 0
+    true
   end
 
 end

data/app/controllers/admin/base_controller.rb

@@ -6,7 +6,6 @@ class Admin::BaseController < ApplicationController
   layout 'administration'
   before_filter :login_required, :except => [ :login, :signup ]
   before_filter :look_for_needed_db_updates, :except => [:login, :signup, :update_database, :migrate]
-  cache_sweeper :blog_sweeper
 
   private
   def look_for_needed_db_updates
@@ -14,4 +13,25 @@ class Admin::BaseController < ApplicationController
       redirect_to :controller => '/admin/settings', :action => 'update_database' if Migrator.current_schema_version != Migrator.max_schema_version
     end
   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.*/)
+  end
 end

data/app/controllers/admin/blacklist_controller.rb

@@ -1,15 +1,6 @@
 class Admin::BlacklistController < Admin::BaseController
-  def list
-    index
-    render :action => 'index'
-  end
-
   def index
-    @blacklist_patterns = BlacklistPattern.find :all
-  end
-
-  def show
-    @blacklist_pattern = BlacklistPattern.find(params[:id])
+    @blacklist_patterns = BlacklistPattern.paginate :page => params[:page], :order => 'pattern ASC', :per_page => 10
   end
 
   def new
@@ -25,8 +16,8 @@ class Admin::BlacklistController < Admin::BaseController
     @blacklist_pattern.attributes = params[:blacklist_pattern]
 
     if request.post? and @blacklist_pattern.save
-      flash[:notice] = 'BlacklistPattern was successfully created.'
-      redirect_to :action => 'list'
+      flash[:notice] = _('Blacklist Pattern was successfully created.')
+      redirect_to :action => 'index'
     end
   end
 
@@ -34,8 +25,8 @@ class Admin::BlacklistController < Admin::BaseController
     @blacklist_pattern = BlacklistPattern.find(params[:id])
     @blacklist_pattern.attributes = params[:blacklist_pattern]
     if request.post? and @blacklist_pattern.save
-      flash[:notice] = 'BlacklistPattern was successfully updated.'
-      redirect_to :action => 'list'
+      flash[:notice] = _('BlacklistPattern was successfully updated.')
+      redirect_to :action => 'index'
     end
   end
 
@@ -43,7 +34,7 @@ class Admin::BlacklistController < Admin::BaseController
     @blacklist_pattern = BlacklistPattern.find(params[:id])
     if request.post?
       @blacklist_pattern.destroy
-      redirect_to :action => 'list'
+      redirect_to :action => 'index'
     end
   end
 

data/app/controllers/admin/cache_controller.rb

@@ -1,17 +1,13 @@
 class Admin::CacheController < Admin::BaseController
 
   def sweep
-    PageCache.sweep_all
-    expire_fragment(/.*/)
-
+    sweep_cache_action
     flash[:notice] = _('Cache was cleared')
     redirect_to :controller => '/admin/settings'
   end
 
   def sweep_html
-    PageCache.sweep_all
-    expire_fragment(/^contents_html.*/)
-
+    sweep_cache_html
     flash[:notice] = _('HTML was cleared')
     redirect_to :controller => '/admin/settings'
   end

data/app/controllers/admin/categories_controller.rb

@@ -1,40 +1,19 @@
 class Admin::CategoriesController < Admin::BaseController
 
-  def list
-    index
-    render :action => 'index'
-  end
+  cache_sweeper :blog_sweeper
 
   def index
-    @categories = Category.find(:all, :order => :position)
-  end
-
-  def new
-    @category = Category.new(params[:category])
-
-    if request.post? and @category.save
-      flash[:notice] = _('Category was successfully created.')
-    else
-      flash[:error] = _('Category could not be created.')
-    end
-
-    redirect_to :action => 'list'
+    @categories = Category.find(:all, :order => :position, :conditions => { :parent_id => nil })
   end
 
-  def edit
-    @category = Category.find(params[:id])
-    @category.attributes = params[:category]
-    if request.post? and @category.save
-      flash[:notice] = _('Category was successfully updated.')
-      redirect_to :action => 'list'
-    end
-  end
+  def new; new_or_edit ; end
+  def edit; new_or_edit;  end
 
   def destroy
     @category = Category.find(params[:id])
     if request.post?
       @category.destroy
-      redirect_to :action => 'list'
+      redirect_to :action => 'index'
     end
   end
 
@@ -57,4 +36,31 @@ class Admin::CategoriesController < Admin::BaseController
     @categories = Category.find(:all, :order => :position)
     render :layout => false
   end
+  
+  private
+  
+  def new_or_edit
+    @category = case params[:id]
+    when nil
+      Category.new
+    else
+      Category.find(params[:id])
+    end
+    @category.attributes = params[:category]
+    if request.post?
+      save_category
+      return
+    end    
+    render :action => 'new'
+  end
+  
+  def save_category
+    if @category.save!
+      flash[:notice] = _('Category was successfully saved.') 
+    else
+      flash[:error] = _('Category could not be saved.')
+    end
+      redirect_to :action => 'index'
+  end
+  
 end

data/app/controllers/admin/content_controller.rb

@@ -3,62 +3,42 @@ module Admin; end
 class Admin::ContentController < Admin::BaseController
   layout "administration", :except => [:show, :autosave]
 
+  cache_sweeper :blog_sweeper
+
   def auto_complete_for_article_keywords
     @items = Tag.find_with_char params[:article][:keywords].strip
     render :inline => "<%= auto_complete_result @items, 'name' %>"
   end
   
-  def list
-    index
-    render :action => 'index'
-  end
-
   def index
-    # Filtering articles
-    @drafts = Article.find(:all, :conditions => "state='draft'")
-    conditions = "state in('published', 'withdrawn')"
-    if params[:search]
-      @search = params[:search]
-
-      if @search[:published_at] and %r{(\d\d\d\d)-(\d\d)} =~ @search[:published_at]
-        conditions += " AND published_at LIKE '%#{@search[:published_at]}%'"
-      end
-
-      if @search[:user_id] and @search[:user_id].to_i > 0
-        conditions += " AND user_id = #{@search[:user_id].to_i}"
-      end
-      
-      if @search[:published] and @search[:published].to_s =~ /0|1/
-        conditions += " AND published = #{@search[:published].to_i}"
-      end
-      
-      if @search[:category] and @search[:category].to_i > 0
-        conditions += " AND categorizations.category_id = #{@search[:category].to_i}"
-      end
-      
+    @drafts = Article.draft.all
+    setup_categories
+    @search = params[:search] ? params[:search] : {}
+    @articles = Article.search_no_draft_paginate(@search, :page => params[:page], :per_page => 10)
+    
+    if request.xhr?
+      render :partial => 'article_list', :object => @articles
     else
-      @search = { :category => nil, :user_id => nil, :published_at => nil, :published => nil }
+      @article = Article.new(params[:article])
     end
-
-    now = Time.now
-    count = Article.count(:all, :include => :categorizations, :conditions => conditions)
-    @articles_pages = Paginator.new(self, count, 20, params[:id])
-    @articles = Article.find(:all, :limit => 20, :order => "contents.id DESC", :include => :categorizations, :conditions => conditions, :offset => @articles_pages.current.offset)
-    setup_categories
-    @article = Article.new(params[:article])
   end
 
   def show
     @article = Article.find(params[:id])
   end
 
-  def new; new_or_edit; end
+  def new 
+    new_or_edit
+  end
+  
   def edit
     @drafts = Article.find(:all, :conditions => "state='draft'")
-    article = Article.find(params[:id])
-    if current_user.profile.label != 'admin' and article.user_id != current_user.id 
-      redirect_to :action => 'list'
+    @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
     new_or_edit 
   end
@@ -66,14 +46,16 @@ class Admin::ContentController < Admin::BaseController
   def destroy
     @article = Article.find(params[:id])
     
-    if current_user.profile.label != 'admin' and @article.user_id != current_user.id 
-      redirect_to :action => 'list'
+    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 => 'list'
+      redirect_to :action => 'index'
+      return
     end
   end
 
@@ -126,6 +108,7 @@ class Admin::ContentController < Admin::BaseController
     end
     render :text => nil
   end
+
   protected
 
   attr_accessor :resources, :categories, :resource, :category
@@ -144,10 +127,10 @@ 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
     
     params[:article] ||= {}
-    params[:bookmarklet_link] && post_from_bookmarklet
 
     @resources = Resource.find(:all, :order => 'created_at DESC')
     @article.attributes = params[:article]
@@ -162,25 +145,19 @@ class Admin::ContentController < Admin::BaseController
       if @article.save
         set_article_categories
         set_the_flash
-        redirect_to :action => 'list'
+        redirect_to :action => 'index'
+        return
       end
     end
-  end
-
-  def post_from_bookmarklet
-    params[:article][:title] = params[:bookmarklet_title]
-    params[:article][:body] = '<a href="' + params[:bookmarklet_link] + \
-      ' title="' + params[:bookmarklet_title] + '">' + \
-      params[:bookmarklet_title] + '</a>'
-    params[:article][:body] += ("\n\n" + params[:bookmarklet_text]) if params[:bookmarklet_text]
+    render :action => 'new'
   end
 
   def set_the_flash
     case params[:action]
     when 'new'
-      flash[:notice] = 'Article was successfully created'
+      flash[:notice] = _('Article was successfully created')
     when 'edit'
-      flash[:notice] = 'Article was successfully updated.'
+      flash[:notice] = _('Article was successfully updated.')
     else
       raise "I don't know how to tidy up action: #{params[:action]}"
     end
@@ -215,6 +192,15 @@ class Admin::ContentController < Admin::BaseController
     @selected = params[:categories] || []
   end
 
+  def def_build_body
+    if @article.body =~ /<!--more-->/
+      body = @article.body.split('<!--more-->')
+      @article.body = body[0]
+      @article.extended = body[1]
+    end
+    
+  end
+
   def get_or_build_article
     @article = case params[:id]
              when nil

data/app/controllers/admin/dashboard_controller.rb

@@ -1,9 +1,15 @@
 class Admin::DashboardController < Admin::BaseController
+  require 'open-uri'
+  require 'time'
+  require 'rexml/document'
+  
   def index
     comments
     lastposts
     popular
     statistics
+    inbound_links
+    typo_dev
   end
   
   private
@@ -18,7 +24,7 @@ class Admin::DashboardController < Admin::BaseController
   def comments
     @comments ||=
       Comment.find(:all,
-                   :limit => 10,
+                   :limit => 5,
                    :conditions => ['published = ?', true],
                    :order => 'created_at DESC')
   end
@@ -27,15 +33,62 @@ class Admin::DashboardController < Admin::BaseController
     @recent_posts = Article.find(:all, 
                                  :conditions => ["published = ?", true], 
                                  :order => 'published_at DESC', 
-                                 :limit => 10)
+                                 :limit => 5)
   end
   
   def popular
     @bestof = Article.find(:all,
                            :select => 'contents.*, comment_counts.count AS comment_count',
-                           :from => "contents, (SELECT feedback.article_id AS article_id, COUNT(feedback.id) as count FROM feedback GROUP BY feedback.article_id ORDER BY count DESC LIMIT 9) AS comment_counts",
+                           :from => "contents, (SELECT feedback.article_id AS article_id, COUNT(feedback.id) as count FROM feedback WHERE feedback.state IN ('presumed_ham', 'ham') GROUP BY feedback.article_id ORDER BY count DESC LIMIT 9) AS comment_counts",
                            :conditions => ['comment_counts.article_id = contents.id AND published = ?', true],
                            :order => 'comment_counts.count DESC',
-                           :limit => 9) 
+                           :limit => 5) 
+  end
+  
+  def inbound_links
+    url = "http://blogsearch.google.com/blogsearch_feeds?q=link:#{this_blog.base_url}&num=5&output=rss"
+    open(url) do |http|
+      @inbound_links = parse_rss(http.read)
+    end
+  rescue
+    @inbound_links = nil
+  end
+  
+  def typo_dev
+    url = "http://blog.typosphere.org/articles.rss"
+    open(url) do |http|
+      @typo_links = parse_rss(http.read)[0..1]
+    end
+  rescue
+    @typo_links = nil
+  end
+  
+  private
+  
+  class RssItem < Struct.new(:link, :title, :description, :description_link, :date, :author)
+    def to_s; title end
+  end
+  
+  def parse_rss(body)
+    xml = REXML::Document.new(body)
+ 
+    items        = []
+    link         = REXML::XPath.match(xml, "//channel/link/text()").first.value rescue ""
+    title        = REXML::XPath.match(xml, "//channel/title/text()").first.value rescue ""
+ 
+    REXML::XPath.each(xml, "//item/") do |elem|
+      item = RssItem.new
+      item.title       = REXML::XPath.match(elem, "title/text()").first.value rescue ""
+      item.link        = REXML::XPath.match(elem, "link/text()").first.value rescue ""
+      item.description = REXML::XPath.match(elem, "description/text()").first.value rescue ""
+      item.author = REXML::XPath.match(elem, "dc:publisher/text()").first.value rescue ""
+      item.date        = Time.mktime(*ParseDate.parsedate(XPath.match(elem, "dc:date/text()").first.value)) rescue Time.now
+ 
+      item.description_link = item.description
+      item.description.gsub!(/<\/?a\b.*?>/, "") # remove all <a> tags
+      items << item
+    end
+ 
+    items.sort_by { |item| item.date }
   end
-end
+end