typo 5.1.2 → 5.1.3

data/CHANGES-5.1.3

@@ -0,0 +1,21 @@
+Typo 5.1.3 is the fourth release of the "Cartier-Bresson" series and released on sunday August the 31th. It is mostly a bugfix and behaviour fix version, so don't expect many changes.
+
+Bug #1244: error with postgresql database on admin/content
+Bug #1251: Documentation on dashboard is 404
+Bug #1252: migrations alter updated_at timestamps of articles and comments, affects RSS feeds
+Bug #1253: Twice redirect in admin/user#list if no admin
+Bug #1254: Fix little error when you use bad id in AdminUser#edit
+Bug #1255: Doesn't autosave if no define title
+Bug #1256: /article/ 301 redirect hits the default buffer which is not the expected behaviour
+Bug #1257: Articles redirect doesn't work with non-nil relative_url_root
+
+
+Rev #1784: Fixed requirements and added our official Typo mascot
+Rev #1786: Fixes a stupid behaviour that forces tags display name to be the same as the name in the url. IE : "web 2.0" would display on a page as web2-0 after transformation, which is stupid. Adds a migration that changes '.' into '-' in tag already in the database. Otherwise, it makes typo crash when accessing that tag. Allows edition of tag display name in the admin.
+Rev #1787:Removes database dependencies from installer. Now we assume you already have MySQL, PgSQL or SQLLite adater installed. Deletes 2 themes from FCKEditor, about 300k lighter now. Suppress caching from development environment
+Rev #1789: Fixes a stupid bug that allows a non administrative user to change his profile
+Rev #1792: Removing tmcode textfilter. It now has its own life at http://svn.typosphere.org/plugins/typo_textfilter_tmcode/. Removing amazon textfilter. It now has its own life at http://svn.typosphere.org/plugins/typo_textfilter_amazon/. Removing sparkline textfilter. It now has its own life at http://svn.typosphere.org/plugins/typo_textfilter_sparkline/
+Rev #1795: Fixes 2 nasty bugs with autosave. The first one broke autosave when no title was set. We now set a default title. The second one was overriding permalink with a void string when post was autosaved because the permalink field was empty after autosave. For autosave: If no title is given, Typo gives it a title like "Article Draft + post_id". When publishing, every article-draft-something permalink is just replaced with the article title crafted permalink.
+Rev #1796: Enables in admin database migration back, gets rid of the old pre 4.1 general controller, sets the CHANGELOG for 5.1.3.
+
+Many thanks to Cyril Mougel, Matijs van Zuijlen and Frédéric Logier for submitting patches.

data/MAINTAINERS

@@ -19,4 +19,9 @@ irc: neuro`
 
 Davide D'Agostino <d.dagostino@lipsiasoft.com>
 blog: http://www.lipsiasoft.com
-irc: DAddYE
+irc: DAddYE
+
+Mascot
+
+Sprewell
+irc: sprewell

data/README

@@ -12,7 +12,7 @@ Requirements
 
 Currently you need all of those things to get typo to run:
 
- * Ruby 1.8.6 or higher
+ * Ruby 1.8.6 or Ruby Enterprise Edition. 
  * Rails 2.0.2. Typo DOES NOT support Rails 2.1 yet.
  * A database.  Typo supports MySQL, PostgreSQL, and SQLite.
  * Ruby drivers for your database.

data/app/controllers/admin/base_controller.rb

@@ -11,7 +11,7 @@ class Admin::BaseController < ApplicationController
   private
   def look_for_needed_db_updates
     if Migrator.offer_migration_when_available
-      redirect_to :controller => '/admin/general', :action => 'update_database' if Migrator.current_schema_version != Migrator.max_schema_version
+      redirect_to :controller => '/admin/settings', :action => 'update_database' if Migrator.current_schema_version != Migrator.max_schema_version
     end
   end
 end

data/app/controllers/admin/content_controller.rb

@@ -102,24 +102,25 @@ class Admin::ContentController < Admin::BaseController
   end
 
   def autosave
-    if params[:id]
-      @article = Article.find(params[:id])
-    else
-      @article = Article.new
-    end
-
+    get_or_build_article
     unless @article.published
       params[:article] ||= {}
       @article.attributes = params[:article]
-
+      @article.published = false
       setup_categories
       @selected = @article.categories.collect { |c| c.id }
       set_article_author
       save_attachments
+
+      set_article_title_for_autosave
+
       @article.state = "draft" unless @article.state == "withdrawn"
       if @article.save
-        set_article_categories
-        render :text => _("Article was successfully saved at ") + Time.now.to_s + "<input type='hidden' name='id' value='#{@article.id}' />"
+        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('permalink', text_field('article', 'permalink'))
+        end
+
         return true
       end
     end
@@ -143,12 +144,14 @@ class Admin::ContentController < Admin::BaseController
 
   def new_or_edit
     get_or_build_article
+    @article.published = true
+    
     params[:article] ||= {}
     params[:bookmarklet_link] && post_from_bookmarklet
 
     @resources = Resource.find(:all, :order => 'created_at DESC')
     @article.attributes = params[:article]
-
+    
     setup_categories
     @selected = @article.categories.collect { |c| c.id }
     @drafts = Article.find(:all, :conditions => "state='draft'")
@@ -189,6 +192,11 @@ class Admin::ContentController < Admin::BaseController
     @article.user   = current_user
   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
+  end
+  
   def save_attachments
     return if params[:attachments].nil?
     params[:attachments].each do |k,v|
@@ -213,7 +221,6 @@ 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.published      = true
                end
             else
               Article.find(params[:id])

data/app/controllers/admin/settings_controller.rb

@@ -62,4 +62,20 @@ class Admin::SettingsController < Admin::BaseController
     end
   end
   
+  def update_database
+    @current_version = Migrator.current_schema_version
+    @needed_version = Migrator.max_schema_version
+    @support = Migrator.db_supports_migrations?
+    @needed_migrations = Migrator.available_migrations[@current_version..@needed_version].collect do |mig|
+      mig.scan(/\d+\_([\w_]+)\.rb$/).flatten.first.humanize
+    end
+  end
+
+  def migrate
+    if request.post?
+      Migrator.migrate
+      redirect_to :action => 'update_database'
+    end
+  end
+  
 end

data/app/controllers/admin/users_controller.rb

@@ -2,7 +2,7 @@ class Admin::UsersController < Admin::BaseController
 
   def list
     index
-    render :action => 'index'
+    render :action => 'index' if current_user.profile.label == 'admin'
   end
 
   def index
@@ -26,9 +26,8 @@ class Admin::UsersController < Admin::BaseController
     if current_user.profile.label == 'admin'
       @user = User.find_by_id(params[:id])
     else
-      if params[:id] and params[:id] != current_user[:id]
+      if params[:id] and params[:id].to_i != current_user[:id]
         flash[:error] = _("Error, you are not allowed to perform this action")
-        redirect_to :action => 'index'
       end
       @user = User.find_by_id(current_user.id)
     end

data/app/controllers/redirect_controller.rb

@@ -2,13 +2,15 @@ class RedirectController < ContentController
   session :off
 
   def redirect
-    # Ugly way to manage redirects, anything better ?
-    if (request.request_uri =~ /^\/articles/)
-      redirect_to request.request_uri.gsub('/articles', ''), :status => 301
+    if (params[:from].first == 'articles')
+      path = request.path.sub('/articles', '')
+      url_root = request.relative_url_root
+      path = url_root + path unless url_root.nil?
+      redirect_to path, :status => 301
       return
     end
 
-    r = Redirect.find_by_from_path(params[:from])
+    r = Redirect.find_by_from_path(params[:from].join("/"))
 
     if(r)
       path = r.to_path

data/app/models/article.rb

@@ -446,7 +446,11 @@ class Article < Content
   end
 
   def set_defaults
-    if self.attributes.include?("permalink") and self.permalink.blank?
+    if self.attributes.include?("permalink") and 
+          (self.permalink.blank? or 
+          self.permalink.to_s =~ /article-draft/ or 
+          self.state == "draft"
+    )
       self.permalink = self.stripped_title
     end
     if blog && self.allow_comments.nil?

data/app/models/content.rb

@@ -102,7 +102,7 @@ class Content < ActiveRecord::Base
     end
     
     def find_by_published_at(column_name = :published_at)
-      from_where = "FROM #{self.table_name} WHERE #{column_name} > 0 AND type='#{self.name}'"
+      from_where = "FROM #{self.table_name} WHERE #{column_name} is not NULL AND type='#{self.name}'"
 
       # Implement adapter-specific groupings below, or allow us to fall through to the generic ruby-side grouping
       

data/app/models/tag.rb

@@ -22,7 +22,7 @@ class Tag < ActiveRecord::Base
   end
 
   def ensure_naming_conventions
-    if self.display_name.blank? or self.display_name != self.name
+    if self.display_name.blank?
       self.display_name = self.name
     end
     self.name = self.name.gsub('.', '-')

data/app/views/admin/content/_form.html.erb

@@ -61,7 +61,7 @@
       </li>
       <li>
         <label for="article_permalink" class="float"><%= _("Permalink") %></label>
-        <%= text_field 'article', 'permalink' %>
+        <span id="permalink"><%= text_field 'article', 'permalink' %></span>
       </li>     
       <li class="checkbox">
         <label for="article_allow_comments" class="float"><%= _("Allow comments") %>: </label>
@@ -86,8 +86,8 @@
 
 <% if this_blog.editor == 0 %>
   <%= hidden_field_tag 'id', @article.id unless @article.id.nil? %>
+<%   #      :update => 'autosave', %>
   <%= observe_form "article_form",
-      :frequency => 30,
-      :update => 'autosave',
+      :frequency => 60,
       :url => { :action => "autosave" }  %>
 <% end %>

data/app/views/admin/{general → settings}/update_database.html.erb

@@ -1,5 +1,5 @@
  <% @page_heading = _('Database migration') %>
-
+ <% subtabs_for(:settings) %>
 
 <div id="settings">
  <div id="gensettings" class="set" style="margin-top:10px;">

data/app/views/admin/tags/_form.html.erb

@@ -1,4 +1,6 @@
 <p>
   <label for="tag_name"><%= _("Name")%>:</label> 
   <%= text_field 'tag', 'name'  %>
+  <label for="tag_display_name"><%= _("Display name")%>:</label>
+  <%= text_field 'tag', 'display_name' %>
 </p>

data/app/views/admin/users/_form.html.erb

@@ -6,10 +6,12 @@
   <label class="float" for="user_login"><%= _("Login")%>:</label>
   <%= text_field 'user', 'login'  %>
 </li>
+<% if current_user.profile.label == 'admin' %>
 <li>
 	<label class="float" for="user_profile"><%= _("Profile")%>:</label>
 	<%=  select("user", "profile_id", @profiles.collect {|p| [ p.nicename, p.id ] }, { :include_blank => true }) %>
 </li>
+<% end %>
 <li>
   <label class="float" for="user_login"><%= _("Display Name")%>:</label>
   <%= text_field 'user', 'name'  %>

data/config/environments/development.rb

@@ -8,7 +8,7 @@ config.whiny_nils        = true
 
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = true
+config.action_controller.perform_caching             = false
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false

data/config/routes.rb

@@ -154,11 +154,13 @@ ActionController::Routing::Routes.draw do |map|
   end
 
   %w{advanced blacklist cache categories comments content feedback general pages
-     resources sidebar textfilters themes trackbacks users}.each do |i|
+     resources sidebar textfilters themes trackbacks users settings tags }.each do |i|
     map.connect "/admin/#{i}", :controller => "admin/#{i}", :action => 'index'
     map.connect "/admin/#{i}/:action/:id", :controller => "admin/#{i}", :action => nil, :id => nil
   end
 
+  map.connect '*from', :controller => 'redirect', :action => 'redirect'
+
   returning(map.connect(':controller/:action/:id')) do |default_route|
     # Ick!
     default_route.write_generation
@@ -180,5 +182,4 @@ ActionController::Routing::Routes.draw do |map|
       alias_method_chain :generate, :deprecation
     end
   end
-  map.connect '*from', :controller => 'redirect', :action => 'redirect'
 end

data/db/migrate/063_rejig_state_field.rb

@@ -9,6 +9,7 @@ class RejigStateField < ActiveRecord::Migration
   end
   
   def self.up
+    ActiveRecord::Base.record_timestamps = false
     BareContent.transaction do
       BareFeedback.transaction do
         [BareContent, BareFeedback].each do |klass|
@@ -21,6 +22,7 @@ class RejigStateField < ActiveRecord::Migration
     end    
     change_column :contents, :state, :string
     change_column :feedback, :state, :string
+    ActiveRecord::Base.record_timestamps = true
   end
 
   def self.down

data/db/migrate/071_fix_tags_naming.rb

@@ -0,0 +1,18 @@
+class FixTagsNaming < ActiveRecord::Migration
+  def self.up
+    tags = Tag.find(:all)
+    tags.each do |tag|
+      tag.name = tag.name.gsub('.', '-')
+      tag.save!
+    end
+  end
+
+  def self.down
+    tags = Tag.find(:all)
+    tags.each do |tag|
+      tag.name = tag.display_name.gsub('-', '.')
+      tag.name = tag.name.gsub(' ', '').downcase
+      tag.save!
+    end
+  end
+end

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 70) do
+ActiveRecord::Schema.define(:version => 71) do
 
   create_table "articles_tags", :id => false, :force => true do |t|
     t.integer "article_id"
@@ -17,12 +17,10 @@ ActiveRecord::Schema.define(:version => 70) do
   end
 
   create_table "blacklist_patterns", :force => true do |t|
-    t.string "type"
+    t.string "type",    :limit => 15
     t.string "pattern"
   end
 
-  add_index "blacklist_patterns", ["pattern"], :name => "index_blacklist_patterns_on_pattern"
-
   create_table "blogs", :force => true do |t|
     t.text   "settings"
     t.string "base_url"
@@ -30,11 +28,11 @@ ActiveRecord::Schema.define(:version => 70) do
 
   create_table "categories", :force => true do |t|
     t.string  "name"
-    t.integer "position"
+    t.integer "position",  :default => 0, :null => false
     t.string  "permalink"
   end
 
-  add_index "categories", ["permalink"], :name => "index_categories_on_permalink"
+  add_index "categories", ["permalink"], :name => "categories_permalink_index"
 
   create_table "categorizations", :force => true do |t|
     t.integer "article_id"
@@ -65,8 +63,8 @@ ActiveRecord::Schema.define(:version => 70) do
     t.string   "state"
   end
 
-  add_index "contents", ["published"], :name => "index_contents_on_published"
-  add_index "contents", ["text_filter_id"], :name => "index_contents_on_text_filter_id"
+  add_index "contents", ["published"], :name => "contents_published_index"
+  add_index "contents", ["text_filter_id"], :name => "contents_text_filter_id_index"
 
   create_table "feedback", :force => true do |t|
     t.string   "type"
@@ -91,8 +89,8 @@ ActiveRecord::Schema.define(:version => 70) do
     t.boolean  "status_confirmed"
   end
 
-  add_index "feedback", ["article_id"], :name => "index_feedback_on_article_id"
-  add_index "feedback", ["text_filter_id"], :name => "index_feedback_on_text_filter_id"
+  add_index "feedback", ["article_id"], :name => "feedback_article_id_index"
+  add_index "feedback", ["text_filter_id"], :name => "feedback_text_filter_id_index"
 
   create_table "notifications", :force => true do |t|
     t.integer  "content_id"
@@ -102,10 +100,10 @@ ActiveRecord::Schema.define(:version => 70) do
   end
 
   create_table "page_caches", :force => true do |t|
-    t.string "name"
+    t.string "name", :null => false
   end
 
-  add_index "page_caches", ["name"], :name => "index_page_caches_on_name"
+  add_index "page_caches", ["name"], :name => "name"
 
   create_table "pings", :force => true do |t|
     t.integer  "article_id"
@@ -113,7 +111,7 @@ ActiveRecord::Schema.define(:version => 70) do
     t.datetime "created_at"
   end
 
-  add_index "pings", ["article_id"], :name => "index_pings_on_article_id"
+  add_index "pings", ["article_id"], :name => "article_id"
 
   create_table "profiles", :force => true do |t|
     t.string "label"
@@ -154,19 +152,20 @@ ActiveRecord::Schema.define(:version => 70) do
   end
 
   create_table "sessions", :force => true do |t|
-    t.string   "sessid"
+    t.string   "sessid",     :limit => 32
     t.text     "data"
-    t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "sessions", ["sessid"], :name => "index_sessions_on_sessid"
+  add_index "sessions", ["sessid"], :name => "sessid", :unique => true
+  add_index "sessions", ["sessid"], :name => "sessions_sessid_index"
 
   create_table "sidebars", :force => true do |t|
-    t.integer "active_position"
-    t.text    "config"
-    t.integer "staged_position"
-    t.string  "type"
+    t.integer  "active_position"
+    t.text     "config"
+    t.integer  "staged_position"
+    t.datetime "updated_at"
+    t.string   "type"
   end
 
   create_table "sitealizer", :force => true do |t|
@@ -194,6 +193,11 @@ ActiveRecord::Schema.define(:version => 70) do
     t.text   "params"
   end
 
+  create_table "text_link_ads_rss", :force => true do |t|
+    t.string  "html",    :limit => 1024
+    t.integer "post_id"
+  end
+
   create_table "triggers", :force => true do |t|
     t.integer  "pending_item_id"
     t.string   "pending_item_type"
@@ -202,10 +206,10 @@ ActiveRecord::Schema.define(:version => 70) do
   end
 
   create_table "users", :force => true do |t|
-    t.string  "login"
-    t.string  "password"
-    t.text    "email"
-    t.text    "name"
+    t.string  "login",                    :limit => 80
+    t.string  "password",                 :limit => 40
+    t.string  "name",                     :limit => 80
+    t.string  "email",                    :limit => 80
     t.boolean "notify_via_email"
     t.boolean "notify_on_new_articles"
     t.boolean "notify_on_comments"
@@ -215,4 +219,6 @@ ActiveRecord::Schema.define(:version => 70) do
     t.integer "profile_id"
   end
 
+  add_index "users", ["login"], :name => "login", :unique => true
+
 end