typo 5.4 → 5.4.1

data/db/schema.sqlite3.sql

@@ -0,0 +1,3 @@
+-- Leaving this file empty forces the whole migration
+-- and fixes a bug when using Typo installer.
+-- Please, leave them as is.

data/lang/fr_FR.rb

@@ -1,5 +1,6 @@
 Localization.define("fr_FR") do |l|
 
+
   # app/views/accounts/confirm.html.erb
   l.store "You have successfully signed up", "Vous vous %etes inscrit avec succès"
   l.store "Login %s", "Identifiant %s"
@@ -127,7 +128,7 @@ Localization.define("fr_FR") do |l|
   l.store "You have no internet connection", "Vous n'avez pas de connection à internet"
 
   # app/views/admin/dashboard/_overview.html.erb
-  l.store "This place gives you a quick overview of what happens on your Typo blog and what you can do. Maybe will you want to %s, %s or %s.", ""
+  l.store "This place gives you a quick overview of what happens on your Typo blog and what you can do. Maybe will you want to %s, %s or %s.", "Voici un rapide aperçu de ce que peux faire votre blog Typo. Peux-être voulez vous %s, %s ou %s"
   l.store "update your profile or change your password", "mettre votre profil à jour ou changer votre mot de passe"
   l.store "You can also do a bit of design, %s or %s.", "Vous pouvez également faire un peu de personnalisation, %s, %s"
   l.store "change your blog presentation", "changer l'apparence de votre blog"
@@ -176,18 +177,19 @@ Localization.define("fr_FR") do |l|
   l.store "Are you sure?", "Êtes-vous certain ?"
   l.store "add a comment", "Ajouter un commentaire"
   l.store "All comments", "Tous les commentaires"
-  l.store "Limit to ham", "Uniquement les commentaires valides"
+  l.store "Limit to ham", "Uniquement les commentaires validés"
   l.store "Limit to spam", "Afficher le spam"
 
   # app/views/admin/feedback/edit.html.erb
   l.store "Comments for", "Commentaires pour"
 
   # app/views/admin/feedback/index.html.erb
-  l.store "Feedback for", "Feedback sur"
+  l.store "Feedback for", "Feedbacks sur"
   l.store "Search Comments and Trackbacks that contain", "Chercher les commentaires et les trackbacks contenant"
   l.store "Article", "Article"
   l.store "Comment Excerpt", "Extrait du commentaire"
   l.store "IP", "Adresse IP"
+  l.store "Unapproved comments", "Commentaires non validés"
 
   # app/views/admin/pages/_form.html.erb
   l.store "Options", "Options"
@@ -282,7 +284,7 @@ Localization.define("fr_FR") do |l|
   l.store "Blog subtitle", "Sous-titre du blog"
   l.store "Blog URL", "Adresse du blog"
   l.store "Language", "Langue"
-  l.store "You can allow users to register to your blog. By default, they will register as contributors, an unpriviledged account level which grant them no rights but own a profile on the site. If you don't want users to register, you can thus add them by yourself in the users part of this admin.", ""
+  l.store "You can allow users to register to your blog. By default, they will register as contributors, an unpriviledged account level which grant them no rights but own a profile on the site. If you don't want users to register, you can thus add them by yourself in the users part of this admin.", "Vous pouvez permettre aux utilisateur de s'enregistrer sur votre blog. Par défaut, ils seront enregistrés come contributeurs. Cet utilisateur a un niveau faible sans droit mais qui possède sont propre profile sur le site. Si vous ne voulez pas que les utilisateurs s'enregistrent, vous pouvez les ajouter vous même dans la partie d'administration des utilisateurs."
   l.store "Allow users to register", "Autoriser les utilisateurs à s'enregistrer"
   l.store "No", "Non"
   l.store "Yes", "Oui"
@@ -306,23 +308,23 @@ Localization.define("fr_FR") do |l|
   l.store "At the beginning of page title", "Au début du titre de la page"
   l.store "At the end of page title", "À la fin du titre de la page"
   l.store "Don't show blog name in page title", "Ne pas afficher le nom du blog dans le titre de la page"
-  l.store "Format of permalink", ""
-  l.store "Google Analytics", ""
-  l.store "Meta description", ""
-  l.store "Meta keywords", ""
-  l.store "Use RSS description", ""
-  l.store "Index categories", ""
-  l.store "Unchecking this box will add <code>noindex, follow</code> meta tags in every category page, removing them from search engines and preventing duplicate content issues", ""
-  l.store "Index tags", ""
-  l.store "Unchecking this box will add <code>noindex, follow</code> meta tags in every tags page, removing them from search engines and preventing duplicate content issues", ""
-  l.store "Robots.txt", ""
-  l.store "You robots.txt file is not writeable. Typo won't be able to write it", ""
-  l.store "Search Engine Optimization", ""
+  l.store "Format of permalink", "Format des liens permanents"
+  l.store "Google Analytics", "Google Analytics"
+  l.store "Meta description", "Meta description"
+  l.store "Meta keywords", "Meta keywords"
+  l.store "Use RSS description", "Utilisation de la description RSS"
+  l.store "Index categories", "Index de catégories"
+  l.store "Unchecking this box will add <code>noindex, follow</code> meta tags in every category page, removing them from search engines and preventing duplicate content issues", "Détiquer cette options ajoutera le meta tags <code>noindex, follow</code> dans toutes les pages de chaque categorie. Cela les enlevera des moteurs de recherches et préviendra ainsi des problèmes de contenu dupliqué."
+  l.store "Index tags", "Index des tags"
+  l.store "Unchecking this box will add <code>noindex, follow</code> meta tags in every tags page, removing them from search engines and preventing duplicate content issues", "Détiquer cette options ajoutera le meta tags <code>noindex, follow</code> dans toutes les pages de chaque tag. Cela les enlevera des moteurs de recherches et préviendra ainsi des problèmes de contenu dupliqué."
+  l.store "Robots.txt", "Robots.txt"
+  l.store "You robots.txt file is not writeable. Typo won't be able to write it", "Votre fichier Robots.txt n'est pas écrivable. Typo ne peux donc pas l'écrire."
+  l.store "Search Engine Optimization", "Optimisation pour les moteurs de recherches"
   l.store "This will display", "Cela affichera"
-  l.store "Original article writen by", "Article original écrit par" 
+  l.store "Original article writen by", "Article original écrit par"
   l.store "and published on", "et publié sur"
-  l.store "direct link to this article", "lien direct vers cet article" 
-  l.store "If you are reading this article elsewhere than", "Si vous lisez cet article ailleurs que sur" 
+  l.store "direct link to this article", "lien direct vers cet article"
+  l.store "If you are reading this article elsewhere than", "Si vous lisez cet article ailleurs que sur"
   l.store "it has been illegally reproduced and without proper authorization", "c'est qu'il a été reproduit illégalement et sans autorisation"
   l.store "at the bottom of each of your post in the RSS feed", "en bas de chacun de vos articles sur le flux RSS"
 
@@ -402,7 +404,7 @@ Localization.define("fr_FR") do |l|
   l.store "Get more themes", "Téléchargez d'autres thèmes"
   l.store "You can download third party themes from officially supported %s ", "Vous pouvez télécharger des thèmes officiellement supportés sur %s "
   l.store "Typogarden", "Typogarden"
-  l.store "To install a theme you  just need to upload the theme folder into your themes directory. Once a theme is uploaded, you should see it on this page.", ""
+  l.store "To install a theme you  just need to upload the theme folder into your themes directory. Once a theme is uploaded, you should see it on this page.", "Pour installer votre thèmes, il suffit de l'uploader dans le dossier themes de votre projet."
   l.store "Choose a theme", "Sélectionnez un thème"
 
   # app/views/admin/users/_form.html.erb
@@ -421,7 +423,7 @@ Localization.define("fr_FR") do |l|
   l.store "Use visual rich editor", "Utiliser l'éditeur visuel"
   l.store "Use simple editor", "Utiliser l'éditeur simplifié"
   l.store "Send notification messages via email", "Envoi de notification des messages par email"
-  l.store "Send notification messages when new articles are posted", "Envoi de notification de messages quand de nouveaux articles sont postés" 
+  l.store "Send notification messages when new articles are posted", "Envoi de notification de messages quand de nouveaux articles sont postés"
   l.store "Send notification messages when comments are posted", "Envoi de notification de messages quand des commentaires sont postés"
   l.store "Contact options", "Options de contact"
   l.store "Your site", "Votre site"
@@ -462,14 +464,14 @@ Localization.define("fr_FR") do |l|
 
   # app/views/articles/_comment_box.html.erb
   l.store "Your name", "Votre nom "
-  l.store "(leave url/email &#187;)", ""
+  l.store "(leave url/email &#187;)", "(laissez votre url/email &#187;)"
   l.store "Your email", "Votre courriel"
   l.store "Your message", "Votre commentaire"
   l.store "Comment Markup Help", "Aide sur le balisage des commentaires"
   l.store "Preview comment", "Prévisualiser le commentaire"
 
   # app/views/articles/_comment_failed.html.erb
-  l.store "Oops, something wrong happened, the comment could not be saved", ""
+  l.store "Oops, something wrong happened, the comment could not be saved", "Oops, quelque chose s'est mal déroulé. Votre commentaire n'a donc pu être enregistré."
 
   # app/views/articles/_trackback.html.erb
   l.store "From", "De"
@@ -489,7 +491,7 @@ Localization.define("fr_FR") do |l|
 
   # app/views/articles/read.html.erb
   l.store "Leave a response", "Réagir à ce billet"
-  l.store "Trackbacks", ""
+  l.store "Trackbacks", "Trackbacks"
   l.store "Use the following link to trackback from your own site", "Utilisez le lien ci-dessous pour envoyer un trackback depuis votre site"
   l.store "RSS feed for this post", "Flux RSS de ce billet"
   l.store "trackback uri", "URL de rétrolien"
@@ -676,22 +678,22 @@ Localization.define("fr_FR") do |l|
   l.store "Destroy this draft", "Supprimer ce brouillon"
 
   # app/helpers/application_helper.rb
-  # Dates 
+  # Dates
   l.store "Mon", "Lun"
   l.store "Tue", "Mar"
   l.store "Wed", "Mer"
-  l.store "Thu", "Jeu"  
-  l.store "Fri", "Ven"  
-  l.store "Sat", "Sam"  
+  l.store "Thu", "Jeu"
+  l.store "Fri", "Ven"
+  l.store "Sat", "Sam"
   l.store "Sun", "Dim"
   l.store "Monday", "Lundi"
   l.store "Tuesday", "Mardi"
   l.store "Wednesday", "Mercredi"
-  l.store "Thursday", "Jeudi"  
-  l.store "Friday", "Vendredi"  
-  l.store "Saturday", "Samedi"  
+  l.store "Thursday", "Jeudi"
+  l.store "Friday", "Vendredi"
+  l.store "Saturday", "Samedi"
   l.store "Sunday", "Dimanche"
-  l.store "Jan", "Jan"    
+  l.store "Jan", "Jan"
   l.store "Feb", "Fév"
   l.store "Mar", "Mars"
   l.store "Apr", "Avr"
@@ -703,7 +705,7 @@ Localization.define("fr_FR") do |l|
   l.store "Oct", "Oct"
   l.store "Nov", "Nov"
   l.store "Dec", "Déc"
-  l.store "January", "janvier"    
+  l.store "January", "janvier"
   l.store "February", "février"
   l.store "March", "mars"
   l.store "April", "avril"
@@ -721,14 +723,14 @@ Localization.define("fr_FR") do |l|
   l.store "%%a, %%d %%b %%Y %%H:%%M", Proc.new {|date|
      sprintf( date.strftime("%%s %d %%s %Y %H:%M"), _(date.strftime("%a")), _(date.strftime("%b")).downcase )
   }
-  
+
   l.store "%%d. %%b", Proc.new {|date|
      sprintf( date.strftime("%d. %%s"), _(date.strftime("%b")).downcase )
   }
-  l.store "Original article writen by", "Article original écrit par" 
+  l.store "Original article writen by", "Article original écrit par"
   l.store "and published on", "et publié sur"
-  l.store "direct link to this article", "lien direct vers cet article" 
-  l.store "If you are reading this article elsewhere than", "Si vous lisez cet article ailleurs que sur" 
+  l.store "direct link to this article", "lien direct vers cet article"
+  l.store "If you are reading this article elsewhere than", "Si vous lisez cet article ailleurs que sur"
   l.store "it has been illegally reproduced and without proper authorization", "c'est qu'il a été reproduit illégalement et sans autorisation"
   l.store "This will display", "Cela affichera"
   l.store "at the bottom of each of your post in the RSS feed", "en bas de chacun de vos articles sur le flux RSS"
@@ -750,11 +752,11 @@ Localization.define("fr_FR") do |l|
   l.store "You need a permalink format with an identifier : %%month%%, %%year%%, %%day%%, %%title%%", "Vous devez spécifier un identifiant : %%month%%, %%year%%, %%day%%, %%title%%"
 
   # app/models/feedback/states.rb
-  l.store "Unclassified", ""
-  l.store "Just Presumed Ham", ""
-  l.store "Ham?", ""
-  l.store "Just Marked As Ham", ""
-  l.store "Ham", ""
-  l.store "Spam?", ""
-  l.store "Just Marked As Spam", ""
+  l.store "Unclassified", "Non vérifié"
+  l.store "Just Presumed Ham", "Marqué commme supposé désirable"
+  l.store "Ham?", "Désirable?"
+  l.store "Just Marked As Ham", "Marqué comme désirable"
+  l.store "Ham", "Désirable"
+  l.store "Spam?", "Spam?"
+  l.store "Just Marked As Spam", "Marqué comme spam"
 end

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "5.4"
+PKG_VERSION = "5.4.1"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'

data/lib/typo_version.rb

@@ -1 +1 @@
-TYPO_VERSION = '5.4'
+TYPO_VERSION = '5.4.1'

data/public/stylesheets/administration.css

@@ -53,10 +53,6 @@ p {
 	padding-top: 20px;
 }
 
-textarea {
-	border: none;
-}
-
 .clear {
   clear: both;
 }
@@ -245,7 +241,11 @@ p.input_text_title {
 	margin-top: 10px;
 }
 
-input.small, #article_published_at, textarea.small {
+textarea {
+	border: none;
+}
+
+input.small, #article_published_at, textarea.small, #theme_body {
 	padding: 2px 0 4px 5px;
 	margin: 0;
 	border: 0;
@@ -257,6 +257,10 @@ input.small, #article_published_at, textarea.small {
 	behavior: url("../../stylesheets/border-radius.htc");
 }
 
+#theme_body {
+  font-family: courier, sans-serif;
+}
+
 .ed_button {
 	border-color: #023;
 	border-width: 3px;
@@ -641,12 +645,28 @@ td.paginate {
   color: #6a0;
 }
 
-.unpublished {
+.unpublished,
+.mandatory {
   color: #c00;
 }
 
+#article_keywords_auto_complete {
+  margin-top: 2px;
+}
+
+#article_keywords_auto_complete ul {
+  margin: 0;
+  padding: 0;
+}
+
 #article_keywords_auto_complete ul li {
   list-style: none;
   background: #DCF6FE;
-  border-bottom: #00131E 1px solid;
-}
+  border-bottom: #a7eafe 1px solid;
+  padding: 3px 5px;
+}
+
+#article_keywords_auto_complete ul li.selected {
+  background: #a7eafe;
+}
+

data/spec/controllers/admin/content_controller_spec.rb

@@ -36,13 +36,78 @@ describe Admin::ContentController do
 
   end
 
+  describe 'autosave action', :shared => true do
+    it 'should save new article with draft status and link to other article if first autosave' do
+      lambda do
+      lambda do
+        post :autosave, :article => {:allow_comments => '1',
+          :body_and_extended => 'my draft in autosave',
+          :keywords => 'mientag',
+          :permalink => 'big-post',
+          :title => 'big post',
+          :text_filter => 'none',
+          :published => '1',
+          :published_at => 'December 23, 2009 03:20 PM'}
+      end.should change(Article, :count)
+      end.should change(Tag, :count)
+      result = Article.last
+      result.body.should == 'my draft in autosave'
+      result.title.should == 'big post'
+      result.permalink.should == 'big-post'
+      result.parent_id.should be_nil
+    end
+
+    describe "for a published article" do
+      before :each do
+        @article = contents(:article1)
+        @data = {:allow_comments => @article.allow_comments,
+          :body_and_extended => 'my draft in autosave',
+          :keywords => '',
+          :permalink => @article.permalink,
+          :title => @article.title,
+          :text_filter => @article.text_filter,
+          :published => '1',
+          :published_at => 'December 23, 2009 03:20 PM'}
+      end
+
+      it 'should create a draft article with proper attributes and existing article as a parent' do
+        lambda do
+          post :autosave, :id => @article.id, :article => @data
+        end.should change(Article, :count)
+        result = Article.last
+        result.body.should == 'my draft in autosave'
+        result.title.should == @article.title
+        result.permalink.should == @article.permalink
+        result.parent_id.should == @article.id
+      end
+
+      it 'should not create another draft article with parent_id if article has already a draft associated' do
+        draft = Article.create!(@article.attributes.merge(:guid => nil, :state => 'draft', :parent_id => @article.id))
+        lambda do
+          post :autosave, :id => @article.id, :article => @data
+        end.should_not change(Article, :count)
+        Article.last.parent_id.should == @article.id
+      end
+
+      it 'should create a draft with the same permalink even if the title has changed' do
+        @data[:title] = @article.title + " more stuff"
+        lambda do
+          post :autosave, :id => @article.id, :article => @data
+        end.should change(Article, :count)
+        result = Article.last
+        result.parent_id.should == @article.id
+        result.permalink.should == @article.permalink
+      end
+    end
+  end
+
   describe 'insert_editor action' do
-    
+
     before do
       @user = users(:tobi)
       request.session = { :user => @user.id }
     end
-    
+
     it 'should render _simple_editor' do
       get(:insert_editor, :editor => 'simple')
       response.should render_template('_simple_editor')
@@ -68,7 +133,7 @@ describe Admin::ContentController do
       { :title => "posted via tests!",
         :body => "A good body",
         :keywords => "tagged",
-        :allow_comments => '1', 
+        :allow_comments => '1',
         :allow_pings => '1' }.merge(options)
     end
 
@@ -97,8 +162,8 @@ describe Admin::ContentController do
 
         assert_difference 'Article.count_published_articles' do
           tags = ['foo', 'bar', 'baz bliz', 'gorp gack gar']
-          post :new, 
-            'article' => base_article(:keywords => tags) , 
+          post :new,
+            'article' => base_article(:keywords => tags) ,
             'categories' => [category.id]
           assert_response :redirect, :action => 'show'
         end
@@ -180,12 +245,12 @@ describe Admin::ContentController do
     it_should_behave_like 'index action'
     it_should_behave_like 'new action'
     it_should_behave_like 'destroy action'
+    it_should_behave_like 'autosave action'
 
     describe 'edit action' do
 
       it 'should edit article' do
         get :edit, 'id' => contents(:article1).id
-        assigns(:selected).should == contents(:article1).categories.collect {|c| c.id}
         response.should render_template('new')
         assert_template_has 'article'
         assigns(:article).should be_valid
@@ -225,6 +290,26 @@ describe Admin::ContentController do
         article.body.should == 'foo'
         article.extended.should == 'bar<!--more-->baz'
       end
+
+      it 'should delete draft about this article if update' do
+        article = contents(:article1)
+        draft = Article.create!(article.attributes.merge(:state => 'draft', :parent_id => article.id, :guid => nil))
+        lambda do
+          post :edit, 'id' => article.id, 'article' => { 'title' => 'new'}
+        end.should change(Article, :count).by(-1)
+        Article.should_not be_exists({:id => draft.id})
+      end
+
+      it 'should delete all draft about this article if update not happen but why not' do
+        article = contents(:article1)
+        draft = Article.create!(article.attributes.merge(:state => 'draft', :parent_id => article.id, :guid => nil))
+        draft_2 = Article.create!(article.attributes.merge(:state => 'draft', :parent_id => article.id, :guid => nil))
+        lambda do
+          post :edit, 'id' => article.id, 'article' => { 'title' => 'new'}
+        end.should change(Article, :count).by(-2)
+        Article.should_not be_exists({:id => draft.id})
+        Article.should_not be_exists({:id => draft_2.id})
+      end
     end
 
     describe 'resource_add action' do
@@ -303,7 +388,6 @@ describe Admin::ContentController do
 
       it 'should edit article' do
         get :edit, 'id' => contents(:publisher_article).id
-        assigns(:selected).should == contents(:publisher_article).categories.collect {|c| c.id}
         response.should render_template('new')
         assert_template_has 'article'
         assigns(:article).should be_valid

data/spec/controllers/articles_controller_spec.rb

@@ -202,3 +202,212 @@ describe ArticlesController, "the index" do
     response.should_not render_template("_atom_feed")
   end
 end
+
+describe ArticlesController, "previewing" do
+  integrate_views
+
+  describe 'with non logged user' do
+    before :each do
+      @request.session = {}
+      get :preview, :id => Factory(:article).id
+    end
+
+    it 'should be redirect to login' do
+      response.should redirect_to(:controller => "accounts/login", :action => :index)
+    end
+  end
+  describe 'with logged user' do
+    before :each do
+      @request.session = {:user => users(:tobi).id}
+      @article = Factory(:article)
+    end
+
+    with_each_theme do |theme, view_path|
+      it "should render template #{view_path}/articles/read" do
+        this_blog.theme = theme if theme
+        get :preview, :id => @article.id
+        response.should render_template('articles/read.html.erb')
+      end
+    end
+
+    it 'should assigns article define with id' do
+      get :preview, :id => @article.id
+      assigns[:article].should == @article
+    end
+
+    it 'should assigns last article with id like parent_id' do
+      draft = Factory(:article, :parent_id => @article.id)
+      get :preview, :id => @article.id
+      assigns[:article].should == draft
+    end
+
+  end
+end
+
+describe ArticlesController, "redirecting" do
+  before do
+    ActionController::Base.relative_url_root = nil # avoid failures if environment.rb defines a relative URL root
+  end
+
+  it 'should split routing path' do
+    assert_routing "foo/bar/baz", {
+      :from => ["foo", "bar", "baz"],
+      :controller => 'articles', :action => 'redirect'}
+  end
+
+  it 'should redirect from articles_routing' do
+    assert_routing "articles", {
+      :from => ["articles"],
+      :controller => 'articles', :action => 'redirect'}
+    assert_routing "articles/foo", {
+      :from => ["articles", "foo"],
+      :controller => 'articles', :action => 'redirect'}
+    assert_routing "articles/foo/bar", {
+      :from => ["articles", "foo", "bar"],
+      :controller => 'articles', :action => 'redirect'}
+    assert_routing "articles/foo/bar/baz", {
+      :from => ["articles", "foo", "bar", "baz"],
+      :controller => 'articles', :action => 'redirect'}
+  end
+
+
+  it 'should redirect' do
+    get :redirect, :from => ["foo", "bar"]
+    assert_response 301
+    assert_redirected_to "http://test.host/someplace/else"
+  end
+
+  it 'should redirect with url_root' do
+    ActionController::Base.relative_url_root = "/blog"
+    get :redirect, :from => ["foo", "bar"]
+    assert_response 301
+    assert_redirected_to "http://test.host/blog/someplace/else"
+
+    get :redirect, :from => ["bar", "foo"]
+    assert_response 301
+    assert_redirected_to "http://test.host/blog/someplace/else"
+  end
+
+  it 'should no redirect' do
+    get :redirect, :from => ["something/that/isnt/there"]
+    assert_response 404
+  end
+
+  it 'should redirect to article' do
+    get :redirect, :from => ["articles", "2004", "04", "01", "second-blog-article"]
+    assert_response 301
+    assert_redirected_to "http://myblog.net/2004/04/01/second-blog-article"
+  end
+
+  it 'should redirect to article with url_root' do
+    b = blogs(:default)
+    b.base_url = "http://test.host/blog"
+    b.save
+    get :redirect, :from => ["articles", "2004", "04", "01", "second-blog-article"]
+    assert_response 301
+    assert_redirected_to "http://test.host/blog/2004/04/01/second-blog-article"
+  end
+
+  it 'should redirect to article when url_root is articles' do
+    b = blogs(:default)
+    b.base_url = "http://test.host/articles"
+    b.save
+    get :redirect, :from => ["articles", "2004", "04", "01", "second-blog-article"]
+    assert_response 301
+    assert_redirected_to "http://test.host/articles/2004/04/01/second-blog-article"
+  end
+
+  it 'should redirect to article with articles in url_root' do
+    b = blogs(:default)
+    b.base_url = "http://test.host/aaa/articles/bbb"
+    b.save
+
+    get :redirect, :from => ["articles", "2004", "04", "01", "second-blog-article"]
+    assert_response 301
+    assert_redirected_to "http://test.host/aaa/articles/bbb/2004/04/01/second-blog-article"
+  end
+
+  describe 'with permalink_format like %title%.html' do
+
+    integrate_views
+
+    before(:each) do
+      b = blogs(:default)
+      b.permalink_format = '/%title%.html'
+      b.save
+    end
+    describe 'render article' do
+
+      integrate_views
+
+      before(:each) do
+        get :redirect, :from => ["#{contents(:article1).permalink}.html"]
+      end
+
+      it 'should render template read to article' do
+        response.should render_template('articles/read.html.erb')
+      end
+
+      it 'should assign article1 to @article' do
+	assigns(:article).should == contents(:article1)
+      end
+
+      it 'should have good rss feed link' do
+        response.should have_tag('head>link[href=?]', "http://myblog.net/#{contents(:article1).permalink}.html.rss")
+      end
+
+      it 'should have good atom feed link' do
+        response.should have_tag('head>link[href=?]', "http://myblog.net/#{contents(:article1).permalink}.html.atom")
+      end
+
+    end
+
+    it 'should get good article with utf8 slug' do
+      get :redirect, :from => ['2004', '06', '02', 'ルビー']
+      assigns(:article).should == contents(:utf8_article)
+    end
+
+    describe 'rendering as atom feed' do
+      before(:each) do
+        get :redirect, :from => ["#{contents(:article1).permalink}.html.atom"]
+      end
+
+      it 'should render atom partial' do
+        response.should render_template('articles/_atom_feed.atom.builder')
+      end
+
+      it 'should render a valid feed' do
+        assert_feedvalidator response.body
+      end
+    end
+
+    describe 'rendering as rss feed' do
+      before(:each) do
+        get :redirect, :from => ["#{contents(:article1).permalink}.html.rss"]
+      end
+
+      it 'should render rss20 partial' do
+        response.should render_template('articles/_rss20_feed.rss.builder')
+      end
+
+      it 'should render a valid feed' do
+        assert_feedvalidator response.body
+      end
+    end
+
+    describe 'rendering comment feed with problematic characters' do
+      before(:each) do
+        @comment = contents(:article1).comments.first
+        @comment.body = "&eacute;coute! 4 < 2, non?"
+        @comment.save!
+        get :redirect, :from => ["#{contents(:article1).permalink}.html.atom"]
+      end
+
+      it 'should result in a valid atom feed' do
+        assigns(:article).should == contents(:article1)
+        assert_feedvalidator response.body
+      end
+    end
+
+  end
+end