typo 4.0.3 → 4.1

data/CHANGES-4.1

@@ -0,0 +1,83 @@
+This is a list of changes in Typo 4.1. This is aimed at developers and theme
+creators, not end-users.
+
+URL Generation
+--------------
+
+URLs are now generated based on the blog base_url, not the current
+controller's base URL. This has a number of impacts:
+
+  * If the base_url setting is wrong, most links will be broken.
+  * We can now generate permalink URLs directly from models without needing a
+    controller object.
+  * We can (and have) removed all of the controllers parameters passed around 
+    to text filters and notifiers.
+
+We've added a number of methods for generating URLs directly from models. In
+specific, all models that make sense have a 'permalink_url' method, and we're
+adding methods like 'trackback_url' and 'feed_url' where they make sense.
+There are *way* too many definitions of common URLs within Typo, and we're
+moving all of them into the models.
+
+
+Text Filters
+------------
+
+The text filter API has been overhauled. Since we no longer need a controller
+object everywhere, we've been able to simplify the API substantially. We've
+also moved text filters from the Rails components/ directory into Rails
+plugins, in vendor/plugins/typo-textfilter-*. It should now be possible to
+manage text filters using the usual plugin management mechanisms.
+
+
+Helper Cleanup
+--------------
+
+A bunch of redundant helpers have been deprecated. Look at
+app/helpers/application_helper.rb for a list. All calls to deprecated helpers
+have been removed from the Typo tree, but some out-of-tree plugins and themes
+may still call them. Watch Typo's log for deprecation warnings.
+
+Here's a partial list of what's been removed:
+
+  * ApplicationHelper.config_value(:foo): replace with this_blog.foo
+  * ApplicationHelper.config[:foo]: replace with this_blog.foo
+  * ApplicationHelper.server_url_for: just use url_for.
+  * ApplicationHelper.url_of(item): use item.permalink_url
+  * ApplicationHelper.*_url(item): use item.permalink_url
+  * XmlHelper.*_link(item): use item.permalink_url
+
+
+Removal of body_html and friends
+--------------------------------
+
+The content table's body_html and extended_html fields are gone. They've
+always been a bit odd, because they're a cache of text_filter(body) and
+text_filter(extended). They've moved out of the database and into the fragment
+cache. As a practical measure users shouldn't see a difference, however the
+body_html and extended_html methods have been deprecated; use html(:body) or
+html(:extended).
+
+
+Admin revamping
+---------------
+
+The admin has been rebuilt to become more functionnal. The previous 
+organization was based on the MVC model, this one on ergonomics. 
+There is still a lot of work to be done, like having a lovely Aqua 2.0 like 
+CSS to look cleaner.
+
+
+Internationalization and localization
+-------------------------------------
+
+Typo now supports foreign languages. The Localization plugin has been used, 
+and the application now supports French.
+More translators are needed to support as much languages as possible.
+
+
+Comments auto moderation
+------------------------
+
+Comments and trackbacks can now be directly sent to moderation before being 
+published. An option is avaliable in the settings.

data/MAINTAINERS

@@ -21,10 +21,6 @@ Kevin Ballard <kevin@sb.org>
 blog: http://kevin.sb.org
 irc:  Eridius
 
-Patrick Lenz <patrick@lenz.sh>
-blog: http://poocs.net/
-irc:  scoop
-
-Seth Hall <seth@remor.com>
-blog: http://blog.remor.com/
-irc:  sethh
+Frédéric de Villamil <frederic@de-villamil.com>
+blog: http://fredericdevillamil.com
+irc: neuro`

data/README

@@ -13,7 +13,7 @@ Requirements
 Currently you need all of those things to get typo to run:
 
  * Ruby 1.8.4 or higher
- * Rails 1.1.x
+ * Rails 1.2.x
  * A database.  Typo supports MySQL, PostgreSQL, and SQLite.
  * Ruby drivers for your database.
  * For best performance, you should have a web server running either

data/{components/sidebars/README → README.SIDEBARS}

@@ -1,3 +1,6 @@
+***THIS DOCUMENT IS OUT OF DATE***
+==================================
+
 How to add a new sidebar plugin
 ===============================
 

data/Rakefile

@@ -7,4 +7,4 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-require 'tasks/rails'
+require 'tasks/rails'

data/TODO-4.1

@@ -0,0 +1,16 @@
+Short-term To-Do for 4.1
+------------------------
+
+- Add migration+code to add blog_id to category and tags
+- fix sparklines controller
+- Revert cache filter order
+- Push some filter tests into plugins
+- url command attack fix
+- audit admin, only POST can change state
+- verify front page query count (should be 4 queries)
+
+X Add migration to ditch trailing slash from canonical_server_url
+X Add migration to ditch *_html
+X goals 4.1
+X finish edit/delete_url
+X delete links helpers, replace with model methods

data/app/apis/blogger_service.rb

@@ -55,14 +55,14 @@ class BloggerService < TypoWebService
       :lastname => "",
       :nickname => username,
       :email => "",
-      :url => controller.url_for(:controller => "articles")
+      :url => this_blog.base_url
     )
   end
 
   def getUsersBlogs(appkey, username, password)
     [BloggerStructs::Blog.new(
-      :url      => controller.url_for(:controller => "articles"),
-      :blogid   => 1,
+      :url      => this_blog.base_url,
+      :blogid   => this_blog.id,
       :blogName => this_blog.blog_name
     )]
   end

data/app/apis/meta_weblog_service.rb

@@ -149,7 +149,7 @@ class MetaWeblogService < TypoWebService
     resource = Resource.create(:filename => data['name'], :mime => data['type'], :created_at => Time.now)
     resource.write_to_disk(data['bits'])
 
-    MetaWeblogStructs::Url.new("url" => controller.url_for(:controller => "files", :action => "#{resource.filename}"))
+    MetaWeblogStructs::Url.new("url" => this_blog.file_url(resource.filename))
   end
 
   def article_dto_from(article)
@@ -157,9 +157,9 @@ class MetaWeblogService < TypoWebService
       :description       => article.body,
       :title             => article.title,
       :postid            => article.id.to_s,
-      :url               => article_url(article).to_s,
-      :link              => article_url(article).to_s,
-      :permaLink         => article_url(article).to_s,
+      :url               => article.permalink_url(only_path=false),
+      :link              => article.permalink_url(only_path=false),
+      :permaLink         => article.permalink_url(only_path=false),
       :categories        => article.categories.collect { |c| c.name },
       :mt_text_more      => article.extended.to_s,
       :mt_excerpt        => article.excerpt.to_s,
@@ -174,23 +174,6 @@ class MetaWeblogService < TypoWebService
 
   protected
 
-  def article_url(article)
-    begin
-      controller.url_for :controller=>"articles", :action =>"permalink",
-        :year => article.published_at.year, :month => sprintf("%.2d", article.published_at.month),
-        :day => sprintf("%.2d", article.published_at.day), :title => article.stripped_title
-    rescue
-      created = article.published_at
-      sprintf("/articles/%.4d/%.2d/%.2d/#{article.stripped_title}", created.year, created.month, created.day)
-      # FIXME: rescue is needed for functional tests as the test framework currently doesn't supply fully
-      # fledged controller instances (yet?)
-    end
-  end
-
-  def server_url
-    controller.url_for(:only_path => false, :controller => "articles")
-  end
-
   def pub_date(time)
     time.strftime "%a, %e %b %Y %H:%M:%S %Z"
   end

data/app/apis/movable_type_service.rb

@@ -84,7 +84,7 @@ class MovableTypeService < TypoWebService
   end
 
   def getCategoryList(blogid, username, password)
-    Category.find_all.collect do |c|
+    Category.find(:all).collect do |c|
       MovableTypeStructs::CategoryList.new(
           :categoryId   => c.id,
           :categoryName => c.name
@@ -93,10 +93,10 @@ class MovableTypeService < TypoWebService
   end
 
   def getPostCategories(postid, username, password)
-    this_blog.articles.find(postid).categories.collect do |c|
+    this_blog.articles.find(postid).categorizations.collect do |c|
       MovableTypeStructs::CategoryPerPost.new(
-          :categoryName => c.name,
-          :categoryId   => c.id.to_i,
+          :categoryName => c.category.name,
+          :categoryId   => c.category_id.to_i,
           :isPrimary    => c.is_primary.to_i
         )
     end
@@ -108,7 +108,7 @@ class MovableTypeService < TypoWebService
 
     for c in categories
       category = Category.find(c['categoryId'])
-      article.categories.push_with_attributes(category, :is_primary => c['isPrimary'])
+      article.categories.push_with_attributes(category, :is_primary => c['isPrimary'] || 0)
     end
     article.save
   end

data/app/controllers/accounts_controller.rb

@@ -19,7 +19,10 @@ class AccountsController < ApplicationController
   end
 
   def signup
-    redirect_to :action => "login" and return unless User.count.zero?
+    unless User.count.zero?
+      redirect_to :action => 'login'
+      return
+    end
 
     @user = User.new(params[:user])
 
@@ -38,9 +41,9 @@ class AccountsController < ApplicationController
 
   def welcome
   end
-  
+
   private
-  
+
   def verify_users
     if User.count == 0
       redirect_to :controller => "accounts", :action => "signup"

data/app/controllers/admin/blacklist_controller.rb

@@ -5,7 +5,7 @@ class Admin::BlacklistController < Admin::BaseController
   end
 
   def list
-    @blacklist_patterns = BlacklistPattern.find_all
+    @blacklist_patterns = BlacklistPattern.find :all
   end
 
   def show

data/app/controllers/admin/cache_controller.rb

@@ -14,18 +14,14 @@ class Admin::CacheController < Admin::BaseController
     expire_fragment(/.*/)
 
     flash[:notice] = 'Cache was cleared'
-    redirect_to :controller => 'general'
+    redirect_to :controller => '/admin/general'
   end
 
   def sweep_html
-    Article.transaction do
-      Article.update_all 'body_html = null'
-      Comment.update_all 'body_html = null'
-      Page.update_all 'body_html = null'
-    end
+    expire_fragment(/^contents_html.*/)
 
     flash[:notice] = 'HTML was cleared'
-    redirect_to :controller => 'general'
+    redirect_to :controller => '/admin/general'
   end
 
 end

data/app/controllers/admin/content_controller.rb

@@ -1,3 +1,5 @@
+require 'base64'
+
 class Admin::ContentController < Admin::BaseController
   def index
     list
@@ -5,16 +7,17 @@ class Admin::ContentController < Admin::BaseController
   end
 
   def list
-    @articles_pages, @articles = with_blog_scoped_classes do
-      paginate(:article, :per_page => 15, :order_by => "created_at DESC",
-               :parameter => 'id')
-    end
+    now = Time.now
+    count = this_blog.articles.count
+    @articles_pages = Paginator.new(self, count, 15, params[:id])
+    @articles = this_blog.articles.find(:all, :limit => 15, :order => 'id DESC',
+                                        :offset => @articles_pages.current.offset)
     setup_categories
     @article = this_blog.articles.build(params[:article])
   end
 
   def show
-    @article = Article.find(params[:id])
+    @article = this_blog.articles.find(params[:id])
     setup_categories
     @resources = Resource.find(:all, :order => 'created_at DESC')
   end
@@ -23,7 +26,7 @@ class Admin::ContentController < Admin::BaseController
   def edit; new_or_edit; end
 
   def destroy
-    @article = Article.find(params[:id])
+    @article = this_blog.articles.find(params[:id])
     if request.post?
       @article.destroy
       redirect_to :action => 'list'
@@ -31,22 +34,37 @@ class Admin::ContentController < Admin::BaseController
   end
 
   def category_add; do_add_or_remove_fu; end
-  alias_method :category_remove, :category_add
   alias_method :resource_add,    :category_add
   alias_method :resource_remove, :category_add
 
-  def preview
-    @headers["Content-Type"] = "text/html; charset=utf-8"
-    @article = Article.new(params[:article])
-    render :layout => false
+  def category_remove
+    @article  = this_blog.articles.find(params[:id])
+    @category = @article.categories.find(params['category_id'])
+    setup_categories
+    @article.categorizations.delete(@article.categorizations.find_by_category_id(params['category_id']))
+    @article.save
+    render :partial => 'show_categories'
   end
 
-  def attachment_box_add
-    render :partial => 'admin/content/attachment', :locals => { :attachment_num => params[:id] }
+  def preview
+    headers["Content-Type"] = "text/html; charset=utf-8"
+    @article = this_blog.articles.build 
+    @article.attributes = params[:article]
+    set_article_author
+    data = render_to_string(:layout => "minimal")
+    data = Base64.encode64(data).gsub("\n", '')
+    data = "data:text/html;charset=utf-8;base64,#{data}"
+    render :text => data
   end
 
-  def attachment_box_remove
-    render :inline => "<%= javascript_tag 'document.getElementById(\"attachments\").removeChild(document.getElementById(\"attachment_#{params[:id]}\")); return false;' -%>"
+  def attachment_box_add
+    render :update do |page|
+      page["attachment_add_#{params[:id]}"].remove
+      page.insert_html :bottom, 'attachments',
+          :partial => 'admin/content/attachment',
+          :locals => { :attachment_num => params[:id], :hidden => true }
+      page.visual_effect(:toggle_appear, "attachment_#{params[:id]}")
+    end
   end
 
   def attachment_save(attachment)
@@ -65,7 +83,7 @@ class Admin::ContentController < Admin::BaseController
 
   def do_add_or_remove_fu
     attrib, action = params[:action].split('_')
-    @article = Article.find(params[:id])
+    @article = this_blog.articles.find(params[:id])
     self.send("#{attrib}=", self.class.const_get(attrib.classify).find(params["#{attrib}_id"]))
     send("setup_#{attrib.pluralize}")
     @article.send(attrib.pluralize).send(real_action_for(action), send(attrib))
@@ -79,7 +97,7 @@ class Admin::ContentController < Admin::BaseController
     get_or_build_article
     params[:article] ||= {}
 
-    @article.attributes = (params[:article])
+    @article.attributes = params[:article]
     setup_categories
     @selected = @article.categories.collect { |c| c.id }
     if request.post?
@@ -119,19 +137,23 @@ class Admin::ContentController < Admin::BaseController
   end
 
   def set_article_categories
-    @article.categories.clear
-    @article.categories = Category.find(params[:categories]) if params[:categories]
+    @article.categorizations.clear
+    if params[:categories]
+      Category.find(params[:categories]).each do |cat|
+        @article.categories << cat
+      end
+    end
     @selected = params[:categories] || []
   end
 
   def get_or_build_article
     @article = case params[:action]
                when 'new'
-                 art = this_blog.articles.build
-                 art.allow_comments = this_blog.default_allow_comments
-                 art.allow_pings    = this_blog.default_allow_pings
-                 art.published      = true
-                 art
+                 returning(this_blog.articles.build) do |art|
+                   art.allow_comments = this_blog.default_allow_comments
+                   art.allow_pings    = this_blog.default_allow_pings
+                   art.published      = true
+                 end
                when 'edit'
                  this_blog.articles.find(params[:id])
                else

data/app/controllers/admin/feedback_controller.rb

@@ -1,7 +1,7 @@
-
+require 'comment'
+require 'trackback'
 
 class Admin::FeedbackController < Admin::BaseController
-  model :comment, :trackback
 
   def index
     conditions = ['blog_id = :blog_id', {:blog_id => Blog.default.id}]
@@ -22,7 +22,7 @@ class Admin::FeedbackController < Admin::BaseController
     end
 
     @pages, @feedback = paginate(:feedback,
-      :order => 'contents.created_at desc',
+      :order => 'feedback.created_at desc',
       :conditions => conditions,
       :per_page => 40)
 

data/app/controllers/admin/general_controller.rb

@@ -1,7 +1,7 @@
 class Admin::GeneralController < Admin::BaseController
   def index
-    if this_blog.canonical_server_url.blank?
-      this_blog.canonical_server_url = server_url
+    if this_blog.base_url.blank?
+      this_blog.base_url = blog_base_url
     end
     @page_cache_size = PageCache.count
   end
@@ -30,7 +30,7 @@ class Admin::GeneralController < Admin::BaseController
   def update
     if request.post?
       Blog.transaction do
-        params[:setting].each { |k,v| this_blog[k] = v}
+        params[:setting].each { |k,v| this_blog.send("#{k.to_s}=", v) }
         this_blog.save
         flash[:notice] = 'config updated.'
       end