typo 5.0 → 5.0.1

data/CHANGES-5.0

@@ -0,0 +1,82 @@
+Typo 5.0 "Eugène Atget" finally finished after about 7 month of slacking making. This in an important release, stuffed with great new features, loads of fixes and an incredible amount of polish. This may sound like DHH introduction to Rails 2.0, and it does, because Typo 5.0 now runs with Ruby on Rails 2.0 and won't run with anything else. That's the reason of the major version change.
+
+Before jumping into the breakdown of features, I’d just like to extend my deep gratitude towards everyone who helped make this release possible. From Piers who made this possible to the (hundreds of) contributors who got a patch applied to everyone on #typo who kept the spirit alive. You can all be mighty proud of the role you played. Cheers!
+
+** Why Eugène Atget ? ** 
+
+I've wanted to give our releases a name for a while now, but we needed to find a path we should follow from along the versions. Piers and I are both photographers, and most of the visible work on Typo has been done in Paris, which is a town Atget spent his life to picture. That's the reason why his name came first when we had to choose one.
+
+** Sidebars removal ** 
+
+As we announced earlier, we've decided to move most of the sidebars plugins out of the trunk. There are many reasons why we think that, out of some basic functionnalities, sidebars should be third party softwares apart performances issues. We'll continue to maintain these plugins anyway.
+
+If you're using one of the following plugins, be sure to install it, or your blog may explode with lots of nasty error messages. 
+
+
+– AIM presence
+– Audioscrobbler
+– Backpack
+– Delicious
+– Flickr
+– 43 things
+– 43 places
+– Magnolia
+– Recent comments
+– Tada
+– Upcoming
+– Xbox
+
+
+Plugins are now in our plugins repository, and installs like any rails plugin. Expect basic archives soon. 
+
+/path/to/typo$ ./script/plugins install http://svn.typosphere.org/typo/plugins/some-plugin
+
+** Code refactoring ** 
+
+The immerged part of the iceberg, but not the least one, most of the existing code has been rewriten. Typo was started when Rails was young, very young, and lots of things were added to the framework after we had to write them. 
+
+The result is impressive in terms of performances, and bug fixing as well. 
+
+** Admin refactoring ** 
+
+Admin has been entirely revamped, twice, between 4.1 and 5.0, and we're quite proud of how it works now. 
+
+The existing admin was the result of a scaffold during Typo early days, and even though some improvements has been done, many things were not as user friendly as they should have been. New admin now aims at giving a clear view on the information, and eased access to the most daily used functionnalities in your blogging life.
+
+* Simple and avanced admin *
+
+We now deliver the admin in 2 flavors, simple and advanced, because everybody doesn't have the same need when it goes to blogging. We have also splitted the settings in 2 places, to separate basic and advanced settings.
+
+* More localisation *
+
+4.1 introduced Typo internationalization, but no one noticed it as it was hidden in the deep of environment.rb. You can now choose your prefered language from the settings. We hope the community to support the translation effort.
+
+* Comments moderation *
+
+Another hidden feature of 4.1 I think it's important to mention here is default comment moderation. This is a stone in the build of a better discussion management.
+
+* Theme editor *
+
+A theme editor was a missing piece in Typo admin, and it's now filled with a basic, but usable editor. For now it allows you to edit your layout and stylesheet. Views editing will come later.
+
+* Dashboard *
+
+We've also added a dashboard we plan to improve with time. It aims at giving you a view on the latests activity on your Typo blog.
+
+** Solving SEO issues ** 
+
+For long time now, Typo has been a pain to search engine optimisation, mostly because most pages, out of single posts, had the same meta title and description. That thing we never noticed before had nasty effects when melted with Google duplicate content algorythm, which even led some blogs to be banned from index. Expect some more improvement in a near future. 
+
+** New themes ** 
+
+Azure which has been Typo default theme for a while now has been removed from the core and won't be supported anymore. Standard issue is now our new default theme, and we have introduced Dirtylicious as well. Scribbish has been kept for backward compatibility as many blogs are using it, starting Piers.
+
+Both themes were built above Scribbish markup and are thus hatom compliant.
+
+** Typo themes garden ** 
+
+I know this should be a community matter, and it may not have its place on a release note, however I think it's important enough to mention it. Every theme listed on <a href="http://www.dev411.com/typo/themes/">dev 411 Typo theme viewer</a> has been updated to support Typo 5.0, and updated themes are already avaliable.
+
+We do think having a usable themes and plugins park is important, and too many themes were only Typo 2.6.0 compatible. That's the reason why we did the themes migration while finishing Typo 5.0, and we plan to port even more non Typo themes in a near futur.
+
+We hope you'll enjoy this release as much as we enjoyed making it.

data/app/controllers/articles_controller.rb

@@ -41,10 +41,10 @@ class ArticlesController < ContentController
     respond_to do |format|
       format.html { render_paginated_index }
       format.atom do
-        render :partial => 'atom_feed', :object => @articles[0,this_blog.limit_rss_display]
+        render :partial => 'articles/atom_feed', :object => @articles[0,this_blog.limit_rss_display]
       end
       format.rss do
-        render :partial => 'rss20_feed', :object => @articles[0,this_blog.limit_rss_display]
+        render :partial => 'articles/rss20_feed', :object => @articles[0,this_blog.limit_rss_display]
       end
     end
   end
@@ -56,8 +56,8 @@ class ArticlesController < ContentController
     auto_discovery_feed
     respond_to do |format|
       format.html { render :action => 'read' }
-      format.atom {  render :partial => 'atom_feed', :object => @article.published_feedback }
-      format.rss  { render :partial => 'rss20_feed', :object => @article.published_feedback }
+      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' }
     end
     rescue ActiveRecord::RecordNotFound

data/app/helpers/admin/base_helper.rb

@@ -57,16 +57,19 @@ module Admin::BaseHelper
    '<input type="submit" value="' + val + '" />'
   end
 
-  def link_to_show(record)
-    link_to image_tag('admin/show.png'), :action => 'show', :id => record.id
+  def link_to_show(record, controller = @controller.controller_name)
+    link_to image_tag('admin/show.png', :alt => "show", :title => "Show content"), 
+      :controller => controller, :action => 'show', :id => record.id
   end
 
-  def link_to_edit(record)
-    link_to image_tag('admin/edit.png', :alt => "edit", :title => "Edit content"), :action => 'edit', :id => record.id
+  def link_to_edit(record, controller = @controller.controller_name)
+    link_to image_tag('admin/edit.png', :alt => "edit", :title => "Edit content"),
+      :controller => controller, :action => 'edit', :id => record.id
   end
 
-  def link_to_destroy(record)
-    link_to image_tag('admin/delete.png', :alt => "delete", :title => "Delete content"), :action => 'destroy', :id => record.id
+  def link_to_destroy(record, controller = @controller.controller_name)
+    link_to image_tag('admin/delete.png', :alt => "delete", :title => "Delete content"),
+      :controller => controller, :action => 'destroy', :id => record.id
   end
 
   def text_filter_options

data/app/models/blog_sweeper.rb

@@ -46,6 +46,7 @@ class BlogSweeper < ActionController::Caching::Sweeper
       sweep_pages
     when Blog, User
       sweep_all
+      sweep_theme
     end
   end
 
@@ -54,6 +55,10 @@ class BlogSweeper < ActionController::Caching::Sweeper
     PageCache.sweep_all
   end
 
+  def sweep_theme
+    PageCache.sweep_theme_cache
+  end
+
   def sweep_articles
     expire_fragment(%r{.*/articles/.*})
     PageCache.zap_pages('index.*', 'articles')

data/app/models/page_cache.rb

@@ -1,18 +1,24 @@
 class PageCache < ActiveRecord::Base
-  cattr_accessor :public_path
-  @@public_path = ActionController::Base.page_cache_directory
+  def self.public_path
+    ActionController::Base.page_cache_directory
+  end
 
   def self.sweep_all
     self.zap_pages('index.*', 'articles', 'pages')
   end
 
+  def self.sweep_theme_cache
+    self.zap_pages('images/theme', 'stylesheets/theme', 'javascripts/theme')
+  end
+
   def self.zap_pages(*paths)
+    srcs = paths.inject([]) { |o,v|
+      o + Dir.glob(public_path + "/#{v}")
+    }
+    return true if srcs.empty?
     trash = Dir::tmpdir
     FileUtils.makedirs(trash)
-    srcs = paths.collect { |v|
-      Dir.glob(public_path + "/#{v}")
-    }
-    FileUtils.mv(srcs.flatten, trash, :force => true)
+    FileUtils.mv(srcs, trash, :force => true)
     FileUtils.rm_rf(trash)
   end
 end

data/app/models/user.rb

@@ -2,7 +2,7 @@ require 'digest/sha1'
 
 # this model expects a certain database layout and its based on the name/login pattern.
 class User < CachedModel
-  has_one :profile
+  belongs_to :profile
   has_many :notifications, :foreign_key => 'notify_user_id'
   has_many :notify_contents, :through => :notifications,
     :source => 'notify_content',
@@ -117,11 +117,16 @@ class User < CachedModel
     end
   end
 
+  before_validation :set_default_profile
+
+  def set_default_profile
+    self.profile ||= Profile.find_by_label('admin')
+  end
+
   validates_uniqueness_of :login, :on => :create
   validates_length_of :password, :within => 5..40, :on => :create
   validates_presence_of :login
 
   validates_confirmation_of :password, :if=> Proc.new { |u| u.password.size > 0}
   validates_length_of :login, :within => 3..40
-  belongs_to :profile
 end

data/app/views/admin/categories/show.html.erb

@@ -27,9 +27,9 @@
         <td><%= article.published_at.strftime("%d/%m/%Y at %H:%M") %></td>
         <td><%= author_link(article) %></td>
         <td class="operation"><%= (article.published?) ? image_tag('admin/checked.png', :alt => "online", :title => _("Online")) : image_tag('admin/cancel.png', :alt => "offline", :title => _("Offline")) %></td>
-	  <td class="operation"><%= link_to image_tag('admin/show.png', :alt => "View article", :title => "Preview article"), {:action => "show", :id => article.id} %></td>
-	  <td class="operation"><%= link_to_edit article %></td>
-	  <td class="operation last"><%= link_to_destroy article %></td>
+	  <td class="operation"><%= link_to_show article, 'content' %></td>
+	  <td class="operation"><%= link_to_edit article, 'content' %></td>
+	  <td class="operation last"><%= link_to_destroy article, 'content' %></td>
       </tr>
     <% end -%>
     </table>

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

@@ -18,7 +18,7 @@
   <td><%= article.published_at.strftime("%d/%m/%Y at %H:%M") %></td>
   <td><%= author_link(article)%></td>
   <td class="operation"><%= (article.published?) ? image_tag('admin/checked.png', :alt => "online", :title => _("Online")) : image_tag('admin/cancel.png', :alt => "offline", :title => _("Offline")) %></td>
-  <td class="operation"><%= link_to image_tag('admin/show.png', :alt => "View article", :title => "Preview article"), { :controller => 'admin/content', :action => "show", :id => article.id} %></td>
+  <td class="operation"><%= link_to_show article %></td>
   <td class="operation"><%= link_to_edit article %></td>
   <td class="operation last"><%= link_to_destroy article %></td>
 </tr>

data/app/views/admin/general/index.html.erb

@@ -3,8 +3,8 @@
   <% content_for('tasks') do -%>
 	<%= subtab _("Basic settings"), "current", {:controller => "general"} %>
 	<%= subtab _("Advanced settings"), "", {:controller => "advanced"} if (this_blog.display_advanced == 1)  %>
-	<%= subtab _("Empty Fragment Cache"), "", {:controller => '/admin/cache', :action => 'sweep'} if (this_blog.display_advanced == 1) %>
-	<%= subtab _("Rebuild cached HTML"), "", {:controller => '/admin/cache', :action => 'sweep_html'} if (this_blog.display_advanced == 1) %>
+	<%= subtab _("Empty Fragment Cache"), "", {:controller => '/admin/cache', :action => 'sweep'} if this_blog.cache_option == 'caches_action_with_params'  %>
+	<%= subtab _("Rebuild cached HTML"), "", {:controller => '/admin/cache', :action => 'sweep_html'} if this_blog.cache_option == 'caches_page' %>
   <% end -%> 
 
 	<% form_tag :action => 'update' do %>
@@ -45,10 +45,10 @@
 			<li>
 				<label class="float" for="caches_page">Choose caching methode:</label>
 				<input type="radio" name="setting[cache_option]" value="caches_page" id="cache_option_0" <%= 'checked="checked"' if this_blog.cache_option == 'caches_page' %>/>
-				<label for="cache_option_0"><%= _("Use static HTML page caching (default)")%></label>
+				<label for="cache_option_0"><%= _("Use static HTML page caching ")%></label>
 				<span class="float">
 					<input type="radio" name="setting[cache_option]" value="caches_action_with_params" id="cache_option_1" <%= 'checked="checked"' if this_blog.cache_option == 'caches_action_with_params' %>/>
-					<label for="cache_option_1"><%= _("Use semi static caching")%></label>
+					<label for="cache_option_1"><%= _("Use semi static caching (default)")%></label>
 				</span>
 			</li>
 		</ul>

data/app/views/admin/sidebar/index.html.erb

@@ -3,7 +3,7 @@
     <%= subtab _("Sidebar"), "current", {:controller=>"sidebar", :action=>"index"} %>
     <%= subtab _("Choose theme"), "", {:controller=>"themes", :action=>"index"} %>	
 		<%= subtab _("Theme editor"), "", {:controller=>"themes", :action=>"editor"} %>
-    <%= subtab (_("Text Filters"), "", {:controller=>"textfilters", :action=>"list"}) if this_blog.display_advanced == 1 %>
+    <%= subtab(_("Text Filters"), "", {:controller=>"textfilters", :action=>"list"}) if this_blog.display_advanced == 1 %>
 <% end %>
   <p class="paginate l">You can download and install sidebar plugins from our official <a href="http://svn.typosphere.org/typo/plugins/">plugin repository</a> running script/plugins install http://svn.typosphere.org/typo/plugins/myplugin, or upload them in the vendors/plugin directory.</p>
 

data/app/views/admin/themes/index.html.erb

@@ -3,7 +3,7 @@
     <%= subtab _("Sidebar"), "", {:controller=>"sidebar", :action=>"index"} %>
     <%= subtab _("Choose theme"), "current", {:controller=>"themes", :action=>"index"} %>
     <%= subtab _("Theme editor"), "", {:controller=>"themes", :action=>"editor"} %>
-    <%= subtab _("Text Filters"), "", {:controller=>"textfilters", :action=>"list"} if (this_blog.display_advanced == 1) %>
+    <%= subtab(_("Text Filters"), "", {:controller=>"textfilters", :action=>"list"}) if (this_blog.display_advanced == 1) %>
 <% end %>
 
 <p class="paginate l">

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             = false
+config.action_controller.perform_caching             = true
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false

data/db/migrate/066_fix_profiles.rb

@@ -0,0 +1,20 @@
+class FixProfiles < ActiveRecord::Migration
+  # We got this migration wrong before. Easiest fix is to undo it, then reapply
+  # correctly
+
+  class User < ActiveRecord::Base
+    include BareMigration
+  end
+
+  def self.up
+    remove_column :users, :profile_id
+    add_column :users, :profile_id, :integer
+    admin_id = Profile.find_by_label('admin').id
+    User.update_all("profile_id = #{admin_id}")
+  end
+
+  def self.down
+    remove_column :users, :profile_id
+    add_column :users, :profile_id, :integer, :default => 1
+  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 => 65) do
+ActiveRecord::Schema.define(:version => 66) do
 
   create_table "articles_tags", :id => false, :force => true do |t|
     t.integer "article_id"
@@ -215,7 +215,7 @@ ActiveRecord::Schema.define(:version => 65) do
     t.boolean "notify_watch_my_articles"
     t.boolean "notify_via_jabber"
     t.string  "jabber"
-    t.integer "profile_id",               :default => 1
+    t.integer "profile_id"
   end
 
 end

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "5.0"
+PKG_VERSION = "5.0.1"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'
@@ -15,13 +15,6 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = false
   
   s.files = Dir.glob('**/*', File::FNM_DOTMATCH).reject do |f| 
-#     [ /\.$/, /config\/database.yml$/, /config\/database.yml-/, 
-#     /database\.sqlite/,
-#     /\.log$/, /^pkg/, /\.svn/, 
-#     /^public\/(files|xml|articles|pages|index.html)/, 
-#     /^public\/(stylesheets|javascripts|images)\/theme/, /\~$/, 
-#     /\/\._/, /\/#/ ].any? {|regex| f =~ regex }
-
      [ /\.$/, /config\/database.yml$/, /config\/database.yml-/, 
      /database\.sqlite/,
      /\.log$/, /^pkg/, /\.svn/, /^vendor\/rails\/(?!actionwebservice)/, 

data/lib/typo_version.rb

@@ -1 +1 @@
-TYPO_VERSION = '4.1.1'
+TYPO_VERSION = '5.0.1'

data/spec/controllers/articles_controller_spec.rb

@@ -11,7 +11,7 @@ describe 'ArticlesController' do
   controller_name :articles
   Article.delete_all
   fixtures(:contents, :feedback, :categories, :blogs, :users, :categorizations,
-           :text_filters, :articles_tags, :tags, :blacklist_patterns, :resources,
+           :text_filters, :tags, :blacklist_patterns, :resources,
            :sidebars)
 
   before(:each) do

data/spec/fixtures/contents.yml

@@ -2,7 +2,6 @@
 
 article1:
   blog_id: 1
-  id: 1
   title: Article 1!
   body: body
   extended: extended content
@@ -18,11 +17,11 @@ article1:
   type: Article
   published: true
   state: published
+  tags: foo_tag, bar_tag
 
 article2:
   type: Article
   blog_id: 1
-  id: 2
   title: Article 2!
   body: body
   extended: extended content
@@ -37,12 +36,12 @@ article2:
   guid: bbbbb
   published: true
   state: published
+  tags: foo_tag
 
 
 article3:
   type: Article
   blog_id: 1
-  id: 3
   title: Article 3!
   body: body
   extended: extended content
@@ -61,7 +60,6 @@ article3:
 article4:
   type: Article
   blog_id: 1
-  id: 4
   title: Article 4!
   body: I\'m not "public":http://www.example.com/public!
   published: false
@@ -75,11 +73,11 @@ article4:
   user_id: 1
   author: Tobi
   guid: ddddd
+  tags: foo_tag, bar_tag, bazz_tag
 
 first_page:
   type: Page
   blog_id: 1
-  id: 9
   name: page_one
   title: Page One Title
   body: ho ho ho
@@ -93,8 +91,6 @@ first_page:
 another_page:
   type: Page
   blog_id: 1
-  id: 10
-  name: page/two
   title: Another Page Title
   body: another body for yet another page
   updated_at: 2005-05-05 01:00:00
@@ -107,7 +103,6 @@ another_page:
 markdown_page:
   type: Page
   blog_id: 1
-  id: 11
   name: markdown-page
   title: Markdown Page
   text_filter_id: 1
@@ -122,7 +117,6 @@ markdown_page:
 inactive_article:
   type: Article
   blog_id: 1
-  id: 14
   title: Inactive Article
   body: body
   extended: extended content
@@ -141,7 +135,6 @@ inactive_article:
 second_blog_article:
   type: Article
   blog_id: 2
-  id: 16
   title: Second Blog Article
   body: body
   extended: extended content
@@ -160,7 +153,6 @@ second_blog_article:
 search_target:
   type: Article
   blog_id: 1
-  id: 17
   title: Find me!
   body: search target
   extended: extended content
@@ -179,7 +171,6 @@ search_target:
 xmltest:
   type: Article
   blog_id: 1
-  id: 18
   title: Associations aren\'t :dependent => true anymore
   body: originally seen on <a href="http://blog.rubyonrails.org/">blog.rubyonrails.org</a>
   extended: extended content
@@ -198,7 +189,6 @@ xmltest:
 spammed_article:
   type: Article
   blog_id: 1
-  id: 19
   title: C\'mon Spam Me!
   body: A bunch of innocuous content
   allow_comments: true