typo 5.3 → 5.4

data/vendor/plugins/easy-ckeditor/public/javascripts/ckeditor/skins/v2/skin.js

@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.skins.add('v2',(function(){var a=[];if(CKEDITOR.env.ie&&CKEDITOR.env.version<7)a.push('icons.png','images/sprites_ie6.png','images/dialog_sides.gif');return{preload:a,editor:{css:['editor.css']},dialog:{css:['dialog.css']},templates:{css:['templates.css']},margins:[0,14,18,14]};})());if(CKEDITOR.dialog)CKEDITOR.dialog.on('resize',function(a){var b=a.data,c=b.width,d=b.height,e=b.dialog,f=!CKEDITOR.env.quirk;if(b.skin!='v2')return;e.parts.contents.setStyles({width:c+'px',height:d+'px'});if(!CKEDITOR.env.ie)return;setTimeout(function(){var g=e.parts.contents,h=g.getParent(),i=h.getParent(),j=i.getChild(2);j.setStyle('width',h.$.offsetWidth+'px');j=i.getChild(7);j.setStyle('width',h.$.offsetWidth-28+'px');j=i.getChild(4);j.setStyle('height',h.$.offsetHeight-31-14+'px');j=i.getChild(5);j.setStyle('height',h.$.offsetHeight-31-14+'px');},100);});

data/vendor/plugins/easy-ckeditor/public/javascripts/ckeditor/skins/v2/templates.css

@@ -0,0 +1,6 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+.cke_skin_v2 .cke_tpl_list{border:#dcdcdc 2px solid;background-color:#fff;overflow:auto;width:100%;height:220px;}.cke_skin_v2 .cke_tpl_item{margin:5px;padding:7px;border:#eee 1px solid;*width:88%;}.cke_skin_v2 .cke_tpl_preview{border-collapse:separate;text-indent:0;width:100%;}.cke_skin_v2 .cke_tpl_preview td{padding:2px;vertical-align:middle;}.cke_skin_v2 .cke_tpl_preview .cke_tpl_preview_img{width:100px;}.cke_skin_v2 .cke_tpl_preview span{white-space:normal;}.cke_skin_v2 .cke_tpl_title{font-weight:bold;}.cke_skin_v2 .cke_tpl_hover{border:#f93 1px solid!important;background-color:#fffacd!important;cursor:pointer;cursor:hand;}.cke_skin_v2 .cke_tpl_hover *{cursor:inherit;}.cke_skin_v2 .cke_tpl_empty,.cke_tpl_loading{text-align:center;padding:5px;}

data/vendor/plugins/easy-ckeditor/public/javascripts/ckeditor/themes/default/theme.js

@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.themes.add('default',(function(){return{build:function(a,b){var c=a.name,d=a.element,e=a.elementMode;if(!d||e==CKEDITOR.ELEMENT_MODE_NONE)return;if(e==CKEDITOR.ELEMENT_MODE_REPLACE)d.hide();var f=a.fire('themeSpace',{space:'top',html:''}).html,g=a.fire('themeSpace',{space:'contents',html:''}).html,h=a.fireOnce('themeSpace',{space:'bottom',html:''}).html,i=g&&a.config.height,j=a.config.tabIndex||a.element.getAttribute('tabindex')||0;if(!g)i='auto';else if(!isNaN(i))i+='px';var k='',l=a.config.width;if(l){if(!isNaN(l))l+='px';k+='width: '+l+';';}var m=CKEDITOR.dom.element.createFromHtml(['<span id="cke_',c,'" onmousedown="return false;" class="',a.skinClass,'" dir="',a.lang.dir,'" title="',CKEDITOR.env.gecko?' ':'','" lang="',a.langCode,'" tabindex="'+j+'"'+(k?' style="'+k+'"':'')+'>'+'<span class="',CKEDITOR.env.cssClass,'"><span class="cke_wrapper cke_',a.lang.dir,'"><table class="cke_editor" border="0" cellspacing="0" cellpadding="0"><tbody><tr',f?'':' style="display:none"','><td id="cke_top_',c,'" class="cke_top">',f,'</td></tr><tr',g?'':' style="display:none"','><td id="cke_contents_',c,'" class="cke_contents" style="height:',i,'">',g,'</td></tr><tr',h?'':' style="display:none"','><td id="cke_bottom_',c,'" class="cke_bottom">',h,'</td></tr></tbody></table><style>.',a.skinClass,'{visibility:hidden;}</style></span></span></span>'].join(''));m.getChild([0,0,0,0,0]).unselectable();m.getChild([0,0,0,0,2]).unselectable();if(e==CKEDITOR.ELEMENT_MODE_REPLACE)m.insertAfter(d);else d.append(m);a.container=m;a.fireOnce('themeLoaded');a.fireOnce('uiReady');},buildDialog:function(a){var b=CKEDITOR.tools.getNextNumber(),c=CKEDITOR.dom.element.createFromHtml(['<div id="cke_'+a.name.replace('.','\\.')+'_dialog" class="cke_skin_',a.skinName,'" dir="',a.lang.dir,'" lang="',a.langCode,'"><div class="cke_dialog',' '+CKEDITOR.env.cssClass,' cke_',a.lang.dir,'" style="position:absolute"><div class="%body"><div id="%title#" class="%title"></div><div id="%close_button#" class="%close_button"><span>X</span></div><div id="%tabs#" class="%tabs"></div><div id="%contents#" class="%contents"></div><div id="%footer#" class="%footer"></div></div><div id="%tl#" class="%tl"></div><div id="%tc#" class="%tc"></div><div id="%tr#" class="%tr"></div><div id="%ml#" class="%ml"></div><div id="%mr#" class="%mr"></div><div id="%bl#" class="%bl"></div><div id="%bc#" class="%bc"></div><div id="%br#" class="%br"></div></div>',CKEDITOR.env.ie?'':'<style>.cke_dialog{visibility:hidden;}</style>','</div>'].join('').replace(/#/g,'_'+b).replace(/%/g,'cke_dialog_')),d=c.getChild([0,0]);
+d.getChild(0).unselectable();d.getChild(1).unselectable();return{element:c,parts:{dialog:c.getChild(0),title:d.getChild(0),close:d.getChild(1),tabs:d.getChild(2),contents:d.getChild(3),footer:d.getChild(4)}};},destroy:function(a){var b=a.container;if(CKEDITOR.env.ie){b.setStyle('display','none');var c=document.body.createTextRange();c.moveToElementText(b.$);try{c.select();}catch(d){}}if(b)b.remove();if(a.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE){a.element.show();delete a.element;}}};})());CKEDITOR.editor.prototype.getThemeSpace=function(a){var b='cke_'+a,c=this._[b]||(this._[b]=CKEDITOR.document.getById(b+'_'+this.name));return c;};CKEDITOR.editor.prototype.resize=function(a,b,c,d){var e=/^\d+$/;if(e.test(a))a+='px';var f=CKEDITOR.document.getById('cke_contents_'+this.name),g=d?f.getAscendant('table').getParent():f.getAscendant('table').getParent().getParent().getParent();CKEDITOR.env.webkit&&g.setStyle('display','none');g.setStyle('width',a);if(CKEDITOR.env.webkit){g.$.offsetWidth;g.setStyle('display','');}var h=c?0:(g.$.offsetHeight||0)-(f.$.clientHeight||0);f.setStyle('height',Math.max(b-h,0)+'px');this.fire('resize');};CKEDITOR.editor.prototype.getResizable=function(){return this.container.getChild([0,0]);};

data/vendor/plugins/easy-ckeditor/tasks/ckeditor_tasks.rake

@@ -0,0 +1,108 @@
+# desc "Explaining what the task does"
+# task :ckeditor do
+#   # Task goes here
+# end
+
+namespace :ckeditor do
+  def setup
+    require "config/environment"
+    require 'fileutils'
+
+    directory = File.join(RAILS_ROOT, '/vendor/plugins/easy-ckeditor/')
+    require "#{directory}lib/ckeditor"
+    require "#{directory}lib/ckeditor_version"
+    require "#{directory}lib/ckeditor_file_utils"
+  end
+
+  desc 'Install the CKEditor components'
+  task :install do
+    setup
+    puts "** Installing CKEditor Plugin version #{CkeditorVersion.current}..."
+
+    CkeditorFileUtils.destroy_and_install
+
+    puts "** Successfully installed CKEditor Plugin version #{CkeditorVersion.current}"
+  end
+
+  desc 'Uninstall the CKEditor components'
+  task :uninstall do
+    setup
+    puts "** Uninstalling CKEditor Plugin version #{CkeditorVersion.current}..."
+    CkeditorFileUtils.destroy
+
+    puts "** Uninstalling Easy CKEditor Plugin Files..."
+    CkeditorFileUtils.rm_plugin
+    puts "** Successfully Uninstalled CKEditor Plugin version #{CkeditorVersion.current}"
+  end
+
+  def fetch(path)
+    response = Net::HTTP.get_response(URI.parse(path))
+    case response
+    when Net::HTTPSuccess     then
+      response
+    when Net::HTTPRedirection then
+      puts "** Redirected to #{response['location']}"
+      fetch(response['location'])
+    else
+      response.error!
+    end
+  end
+
+  desc "Update the CKEditor code to the latest nightly build"
+  task :download do
+    require 'net/http'
+    require 'zip/zipfilesystem'
+
+    setup
+    version = ENV['VERSION'] || "Nightly"
+    installed_version = "3.0"
+
+    puts "** Current CKEditor version: #{installed_version}..."
+    puts "** Downloading #{version} (please be patient)..."
+
+    rails_tmp_path = File.join(RAILS_ROOT, "/tmp/")
+    tmp_zip_path = File.join(rails_tmp_path, "ckeditor_#{version}.zip")
+
+    # Creating tmp dir if it doesn't exist
+    Dir.mkdir(rails_tmp_path) unless File.exists? rails_tmp_path
+
+    # Download nightly build (http://download.cksource.com/CKEditor/CKEditor/Nightly%20Build/ckeditor_nightly.zip)
+    # Releases (http://download.cksource.com/CKEditor/CKEditor/CKEditor%203.0/ckeditor_3.0.zip)
+    nightly = version=='Nightly' ? true : false
+    domain = "http://download.cksource.com"
+    path = nightly ? "/CKEditor/CKEditor/Nightly%20Build/ckeditor_nightly.zip" : "/CKEditor/CKEditor/CKEditor%203.0/ckeditor_#{version}.zip"
+
+    puts "** Download from #{domain}#{path}"
+    #Net::HTTP.start(domain) { |http|
+      response = fetch("#{domain}#{path}")
+
+      open(tmp_zip_path, "wb") { |file|
+        file.write(response.body)
+      }
+    #}
+    puts "** Download successful"
+
+    puts "** Extracting CKeditor"
+    Zip::ZipFile.open(tmp_zip_path) do |zipfile|
+      zipfile.each do |entry|
+        filename = File.join(rails_tmp_path, entry.name)
+        FileUtils.rm_f(filename)
+        FileUtils.mkdir_p(File.dirname(filename))
+        entry.extract(filename)
+      end
+    end
+
+    puts "** Backing up existing CKEditor install to /public/javascripts/ckeditor_bck"
+    CkeditorFileUtils.backup_existing
+
+    puts "** Shifting files to /public/javascripts/ckeditor"
+    FileUtils.cp_r File.join(RAILS_ROOT, "/tmp/ckeditor/"), File.join(RAILS_ROOT, "/public/javascripts/")
+
+    puts "** Clean up"
+    FileUtils.remove_file(tmp_zip_path, true)
+    FileUtils.remove_entry(File.join(rails_tmp_path, "ckeditor/"), true)
+
+    puts "** Successfully updated to CKEditor version: #{version}..."
+  end
+end
+

data/vendor/plugins/easy-ckeditor/uninstall.rb

@@ -0,0 +1,8 @@
+directory = File.join(RAILS_ROOT, '/vendor/plugins/easy-ckeditor/')
+require "#{directory}lib/ckeditor_file_utils"
+require "#{directory}lib/ckeditor_version"
+require "#{directory}lib/ckeditor"
+
+puts "** Uninstalling Easy CKEditor Plugin version #{CkeditorVersion.current}...."
+
+CkeditorFileUtils.destroy

data/vendor/plugins/livesearch_sidebar/views/content.rhtml

@@ -2,7 +2,7 @@
   <label for="q"><%= @sidebar.title %></label>
 </h3>
 <% form_tag({:controller => 'articles',  :action => 'search'}, {:method => 'get', :id => 'sform'}) do %>
-  <input type="text" id="live_search" name="q" value="" size="15" />
+  <%= text_field_tag :q, '', {:id => "live_search", :size => 15, :autocomplete => "off"} %>
   <%= image_tag "spinner-blue.gif", :id => 'search_spinner', :style => 'display:none;' %>
 <% end %>
 <%= observe_field "live_search", :frequency => 1,

data/vendor/plugins/page_sidebar/lib/page_sidebar.rb

@@ -5,6 +5,6 @@ class PageSidebar < Sidebar
   setting :maximum_pages, 10
 
   def pages
-    @pages ||= Page.find(:all).sort_by {|t| t.name}
+    @pages ||= Page.published.order(:title)
   end
 end

data/vendor/plugins/typo_converter/Rakefile

@@ -1,15 +1,14 @@
 require 'rake'
-require 'rake/testtask'
 require 'rake/rdoctask'
+require 'spec/rake/spectask'
 
-desc 'Default: run unit tests.'
-task :default => :test
+desc 'Default: run specs.'
+task :default => :spec
 
-desc 'Test the Typo_converters plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+desc 'Run the specs'
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_opts = ['--colour --format progress --loadby mtime --reverse']
+  t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
 desc 'Generate documentation for the Typo_converters plugin.'

data/vendor/plugins/typo_converter/db/wp25_schema.rb

@@ -0,0 +1,152 @@
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# please use the migrations feature of Active Record to incrementally modify your database, and
+# then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 0) do
+
+  create_table "wp_comments", :primary_key => "comment_ID", :force => true do |t|
+    t.integer  "comment_post_ID",                     :default => 0,   :null => false
+    t.text     "comment_author",       :limit => 255,                  :null => false
+    t.string   "comment_author_email", :limit => 100, :default => "",  :null => false
+    t.string   "comment_author_url",   :limit => 200, :default => "",  :null => false
+    t.string   "comment_author_IP",    :limit => 100, :default => "",  :null => false
+    t.datetime "comment_date",                                         :null => false
+    t.datetime "comment_date_gmt",                                     :null => false
+    t.text     "comment_content",                                      :null => false
+    t.integer  "comment_karma",                       :default => 0,   :null => false
+    t.string   "comment_approved",     :limit => 20,  :default => "1", :null => false
+    t.string   "comment_agent",                       :default => "",  :null => false
+    t.string   "comment_type",         :limit => 20,  :default => "",  :null => false
+    t.integer  "comment_parent",       :limit => 8,   :default => 0,   :null => false
+    t.integer  "user_id",              :limit => 8,   :default => 0,   :null => false
+  end
+
+  add_index "wp_comments", ["comment_approved", "comment_date_gmt"], :name => "comment_approved_date_gmt"
+  add_index "wp_comments", ["comment_approved"], :name => "comment_approved"
+  add_index "wp_comments", ["comment_date_gmt"], :name => "comment_date_gmt"
+  add_index "wp_comments", ["comment_post_ID"], :name => "comment_post_ID"
+
+  create_table "wp_links", :primary_key => "link_id", :force => true do |t|
+    t.string   "link_url",                             :default => "",  :null => false
+    t.string   "link_name",                            :default => "",  :null => false
+    t.string   "link_image",                           :default => "",  :null => false
+    t.string   "link_target",      :limit => 25,       :default => "",  :null => false
+    t.integer  "link_category",    :limit => 8,        :default => 0,   :null => false
+    t.string   "link_description",                     :default => "",  :null => false
+    t.string   "link_visible",     :limit => 20,       :default => "Y", :null => false
+    t.integer  "link_owner",                           :default => 1,   :null => false
+    t.integer  "link_rating",                          :default => 0,   :null => false
+    t.datetime "link_updated",                                          :null => false
+    t.string   "link_rel",                             :default => "",  :null => false
+    t.text     "link_notes",       :limit => 16777215,                  :null => false
+    t.string   "link_rss",                             :default => "",  :null => false
+  end
+
+  add_index "wp_links", ["link_category"], :name => "link_category"
+  add_index "wp_links", ["link_visible"], :name => "link_visible"
+
+  create_table "wp_options", :primary_key => "option_id", :force => true do |t|
+    t.integer "blog_id",                            :default => 0,     :null => false
+    t.string  "option_name",  :limit => 64,         :default => "",    :null => false
+    t.text    "option_value", :limit => 2147483647,                    :null => false
+    t.string  "autoload",     :limit => 20,         :default => "yes", :null => false
+  end
+
+  add_index "wp_options", ["option_name"], :name => "option_name"
+
+  create_table "wp_postmeta", :primary_key => "meta_id", :force => true do |t|
+    t.integer "post_id",    :limit => 8,          :default => 0, :null => false
+    t.string  "meta_key"
+    t.text    "meta_value", :limit => 2147483647
+  end
+
+  add_index "wp_postmeta", ["meta_key"], :name => "meta_key"
+  add_index "wp_postmeta", ["post_id"], :name => "post_id"
+
+  create_table "wp_posts", :primary_key => "ID", :force => true do |t|
+    t.integer  "post_author",           :limit => 8,          :default => 0,         :null => false
+    t.datetime "post_date",                                                          :null => false
+    t.datetime "post_date_gmt",                                                      :null => false
+    t.text     "post_content",          :limit => 2147483647,                        :null => false
+    t.text     "post_title",                                                         :null => false
+    t.integer  "post_category",                               :default => 0,         :null => false
+    t.text     "post_excerpt",                                                       :null => false
+    t.string   "post_status",           :limit => 20,         :default => "publish", :null => false
+    t.string   "comment_status",        :limit => 20,         :default => "open",    :null => false
+    t.string   "ping_status",           :limit => 20,         :default => "open",    :null => false
+    t.string   "post_password",         :limit => 20,         :default => "",        :null => false
+    t.string   "post_name",             :limit => 200,        :default => "",        :null => false
+    t.text     "to_ping",                                                            :null => false
+    t.text     "pinged",                                                             :null => false
+    t.datetime "post_modified",                                                      :null => false
+    t.datetime "post_modified_gmt",                                                  :null => false
+    t.text     "post_content_filtered",                                              :null => false
+    t.integer  "post_parent",           :limit => 8,          :default => 0,         :null => false
+    t.string   "guid",                                        :default => "",        :null => false
+    t.integer  "menu_order",                                  :default => 0,         :null => false
+    t.string   "post_type",             :limit => 20,         :default => "post",    :null => false
+    t.string   "post_mime_type",        :limit => 100,        :default => "",        :null => false
+    t.integer  "comment_count",         :limit => 8,          :default => 0,         :null => false
+  end
+
+  add_index "wp_posts", ["post_name"], :name => "post_name"
+  add_index "wp_posts", ["post_type", "post_status", "post_date", "ID"], :name => "type_status_date"
+
+  create_table "wp_term_relationships", :id => false, :force => true do |t|
+    t.integer "object_id",        :limit => 8, :default => 0, :null => false
+    t.integer "term_taxonomy_id", :limit => 8, :default => 0, :null => false
+    t.integer "term_order",                    :default => 0, :null => false
+  end
+
+  add_index "wp_term_relationships", ["term_taxonomy_id"], :name => "term_taxonomy_id"
+
+  create_table "wp_term_taxonomy", :primary_key => "term_taxonomy_id", :force => true do |t|
+    t.integer "term_id",     :limit => 8,          :default => 0,  :null => false
+    t.string  "taxonomy",    :limit => 32,         :default => "", :null => false
+    t.text    "description", :limit => 2147483647,                 :null => false
+    t.integer "parent",      :limit => 8,          :default => 0,  :null => false
+    t.integer "count",       :limit => 8,          :default => 0,  :null => false
+  end
+
+  add_index "wp_term_taxonomy", ["term_id", "taxonomy"], :name => "term_id_taxonomy", :unique => true
+
+  create_table "wp_terms", :primary_key => "term_id", :force => true do |t|
+    t.string  "name",       :limit => 55,  :default => "", :null => false
+    t.string  "slug",       :limit => 200, :default => "", :null => false
+    t.integer "term_group", :limit => 8,   :default => 0,  :null => false
+  end
+
+  add_index "wp_terms", ["slug"], :name => "slug", :unique => true
+
+  create_table "wp_usermeta", :primary_key => "umeta_id", :force => true do |t|
+    t.integer "user_id",    :limit => 8,          :default => 0, :null => false
+    t.string  "meta_key"
+    t.text    "meta_value", :limit => 2147483647
+  end
+
+  add_index "wp_usermeta", ["meta_key"], :name => "usermeta_meta_key"
+  add_index "wp_usermeta", ["user_id"], :name => "user_id"
+
+  create_table "wp_users", :primary_key => "ID", :force => true do |t|
+    t.string   "user_login",          :limit => 60,  :default => "", :null => false
+    t.string   "user_pass",           :limit => 64,  :default => "", :null => false
+    t.string   "user_nicename",       :limit => 50,  :default => "", :null => false
+    t.string   "user_email",          :limit => 100, :default => "", :null => false
+    t.string   "user_url",            :limit => 100, :default => "", :null => false
+    t.datetime "user_registered",                                    :null => false
+    t.string   "user_activation_key", :limit => 60,  :default => "", :null => false
+    t.integer  "user_status",                        :default => 0,  :null => false
+    t.string   "display_name",        :limit => 250, :default => "", :null => false
+  end
+
+  add_index "wp_users", ["user_login"], :name => "user_login_key"
+  add_index "wp_users", ["user_nicename"], :name => "user_nicename"
+
+end

data/vendor/plugins/typo_converter/lib/converters/base.rb

@@ -1,5 +1,5 @@
 class EmailNotifier < ActiveRecord::Observer
-  observe Article, Comment
+  observe Article, Page, Comment
   
   def after_save(content)
     true
@@ -18,7 +18,7 @@ class BaseConverter
   cattr_accessor :new_user_password
 
   def initialize(options = {})
-    @count   = {:users => 0, :articles => 0, :comments => 0}
+    @count   = {:users => 0, :articles => 0, :comments => 0, :pages => 0}
     @options = options
   end
 
@@ -30,6 +30,11 @@ class BaseConverter
   #     ::User.new ...
   #   end
   #   
+  #   convert.import_pages do |other_page|
+  #     # build Typo Page object from other page
+  #     ::Page.new ...
+  #   end
+  #   
   #   convert.import_articles do |other_article|
   #     # build Typo Article object from other article
   #     ::Article.new ...
@@ -50,6 +55,13 @@ class BaseConverter
     raise NotImplementedError
   end
 
+  # override this to provide array of all pages to migrate.
+  #
+  #   @old_pages ||= Page.find(:all)
+  def old_pages
+    [] # don't raise an error; some sources won't have pages
+  end
+
   # override this to find all users from the source database
   # save them to @old_users, indexed by :login
   # 
@@ -181,6 +193,24 @@ class BaseConverter
     raise
   end
 
+  def create_page(other_page, &block)
+    page = block.call(other_page)
+    if page
+      page.allow_comments = true
+      page.allow_pings    = false
+      page.published      = true
+      page.user           ||= default_user
+      page.text_filter    ||= filter
+      page.save!
+      print '.'
+      @count[:pages] += 1
+    end
+  rescue ActiveRecord::RecordInvalid
+    puts "Invalid Page: %s " % $!.record.errors.full_messages.join(' ')
+    puts $!.record.inspect
+    raise
+  end
+
   def create_comment(article, other_comment, &block)
     ActiveRecord::Base.logger.info "adding comment"
     returning block.call(other_comment) do |comment|
@@ -234,6 +264,15 @@ class BaseConverter
     puts "migrated #{@count[:articles]} article(s)..."
   end
   
+  def import_pages(&block)
+    puts "started pages migration..."
+    old_pages.each do |other_page|
+      create_page other_page, &block
+    end
+    print "\n"
+    puts "migrated #{@count[:pages]} page(s)..."
+  end
+  
   def import_comments(&block)
     puts "started comment migration..."
     old_articles.each do |other_article|

data/vendor/plugins/typo_converter/lib/converters/wp25.rb

@@ -1,3 +1,4 @@
+require 'converters/wp25/option'
 require 'converters/wp25/post'
 require 'converters/wp25/comment'
 require 'converters/wp25/term'
@@ -10,6 +11,7 @@ class Wp25Converter < BaseConverter
     converter = new(options)
     
     unless (options[:prefix].nil?)
+      WP25::Option.prefix = options[:prefix]
       WP25::Post.prefix = options[:prefix]
       WP25::Comment.prefix = options[:prefix]
       WP25::User.prefix = options[:prefix]
@@ -17,6 +19,12 @@ class Wp25Converter < BaseConverter
       WP25::TermRelationship.prefix = options[:prefix]
       WP25::TermTaxonomy.prefix = options[:prefix]
     end
+
+    Blog.default.update_attributes(
+      :blog_name => WP25::Option.find_by_option_name('blogname').option_value,
+      :blog_subtitle => WP25::Option.find_by_option_name('blogdescription').option_value
+    )
+
     converter.import_users do |wp_user|
       ::User.new \
         :name => wp_user.display_name,
@@ -28,7 +36,7 @@ class Wp25Converter < BaseConverter
 
     converter.import_articles do |wp_article|
       unless wp_article.post_content.blank? || wp_article.post_title.blank?
-        user = wp_article.post_author.nil? ? nil : converter.users[WP25::User.find(wp_article.post_author.to_i).ID]
+        user = wp_article.post_author.nil? ? nil : converter.users[WP25::User.find(wp_article.post_author.to_i).user_login]
         
         excerpt, body = !wp_article.post_excerpt.blank? ?
           [wp_article.post_excerpt, wp_article.post_content] :
@@ -37,25 +45,50 @@ class Wp25Converter < BaseConverter
         
         a = ::Article.new \
           :title        => CGI::unescapeHTML(wp_article.post_title),
-          :body         => body,
+          :body_and_extended => body,
           :created_at   => wp_article.post_date,
           :published_at => wp_article.post_date,
           :updated_at   => wp_article.post_modified,
-          :author       => user,
+          :user         => user,
+          :author       => user.login,
           :tags         => converter.find_or_create_tags(wp_article.tags)
         [a, converter.find_or_create_categories(wp_article)]
       end
     end
     
+    converter.import_pages do |wp_page|
+      unless wp_page.post_content.blank? || wp_page.post_title.blank?
+        user = wp_page.post_author.nil? ? nil : converter.users[WP25::User.find(wp_page.post_author.to_i).user_login]
+        
+        excerpt, body = !wp_page.post_excerpt.blank? ?
+          [wp_page.post_excerpt, wp_page.post_content] :
+          [nil, wp_page.post_content]
+        
+        ::Page.new \
+          :title        => CGI::unescapeHTML(wp_page.post_title),
+          :name         => wp_page.post_name,
+          :body         => body,
+          :created_at   => wp_page.post_date,
+          :published_at => wp_page.post_date,
+          :updated_at   => wp_page.post_modified,
+          :user         => user,
+          :author       => user.login
+      end
+    end
+
     converter.import_comments do |wp_comment|
+      user = wp_comment.user.nil? ? nil : converter.users[wp_comment.user.user_login]
+
       ::Comment.new \
         :body         => wp_comment.comment_content,
         :created_at   => wp_comment.comment_date,
         :updated_at   => wp_comment.comment_date,
         :published_at => wp_comment.comment_date,
+        :user         => user,
         :author       => wp_comment.comment_author,
         :url          => wp_comment.comment_author_url,
         :email        => wp_comment.comment_author_email,
+        :state        => converter.comment_state(wp_comment.comment_approved),
         :ip           => wp_comment.comment_author_IP
     end
   end
@@ -67,11 +100,25 @@ class Wp25Converter < BaseConverter
                                            :include => :categorie, 
                                            :conditions => ["post_pub = ? AND cat_libelle IN (?)", true, @options[:categories]])
     else
-      @old_article ||= WP25::Post.find_all_by_post_status 'publish'
+      @old_article ||= WP25::Post.find :all,
+        :conditions => { :post_status => 'publish', :post_type => 'post' }
     end
     @old_article
   end
 
+  def old_pages
+    if @options.has_key?(:categories)
+      #TODO: understand the categories configuration
+      @old_page ||= WP25::Post.find(:all, 
+                                           :include => :categorie, 
+                                           :conditions => ["post_pub = ? AND cat_libelle IN (?)", true, @options[:categories]])
+    else
+      @old_page ||= WP25::Post.find :all,
+        :conditions => { :post_status => 'publish', :post_type => 'page' }
+    end
+    @old_page
+  end
+
   def old_users
     @old_users ||= WP25::User.find(:all).index_by &:ID
   end
@@ -125,4 +172,12 @@ class Wp25Converter < BaseConverter
     }
     tags_post
   end
+  
+  def comment_state(wp_approved)
+    case wp_approved
+    when 'spam': :spam
+    when '1': :ham
+    else :unclassified
+    end
+  end
 end