dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'tomash/master'

This commit is contained in:
Tom Preston-Werner 2010-11-18 16:04:32 -06:00
parent 38ed81e0ce 9396c9d04c
commit e2d26ff8ed
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
History.txt
View File

@ -6,6 +6,7 @@
* Add --base-url cli option (#235) * Add --base-url cli option (#235)
* Bug Fixes * Bug Fixes
* Fixed filename basename generation (#208) * Fixed filename basename generation (#208)
* Set mode to UTF8 on Sequel connections (#237)
== 0.7.0 / 2010-08-24 == 0.7.0 / 2010-08-24
* Minor Enhancements * Minor Enhancements

2
lib/jekyll/migrators/mephisto.rb
View File

@ -40,7 +40,7 @@ module Jekyll
QUERY = "SELECT id, permalink, body, published_at, title FROM contents WHERE user_id = 1 AND type = 'Article' AND published_at IS NOT NULL ORDER BY published_at" QUERY = "SELECT id, permalink, body, published_at, title FROM contents WHERE user_id = 1 AND type = 'Article' AND published_at IS NOT NULL ORDER BY published_at"
def self.process(dbname, user, pass, host = 'localhost') def self.process(dbname, user, pass, host = 'localhost')
db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host) db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
FileUtils.mkdir_p "_posts" FileUtils.mkdir_p "_posts"

2
lib/jekyll/migrators/mt.rb
View File

@ -20,7 +20,7 @@ module Jekyll
QUERY = "SELECT entry_id, entry_basename, entry_text, entry_text_more, entry_created_on, entry_title FROM mt_entry" QUERY = "SELECT entry_id, entry_basename, entry_text, entry_text_more, entry_created_on, entry_title FROM mt_entry"
def self.process(dbname, user, pass, host = 'localhost') def self.process(dbname, user, pass, host = 'localhost')
db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host) db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
FileUtils.mkdir_p "_posts" FileUtils.mkdir_p "_posts"

2
lib/jekyll/migrators/textpattern.rb
View File

@ -17,7 +17,7 @@ module Jekyll
QUERY = "select Title, url_title, Posted, Body, Keywords from textpattern where Status = '4' or Status = '5'" QUERY = "select Title, url_title, Posted, Body, Keywords from textpattern where Status = '4' or Status = '5'"
def self.process(dbname, user, pass, host = 'localhost') def self.process(dbname, user, pass, host = 'localhost')
db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host) db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
FileUtils.mkdir_p "_posts" FileUtils.mkdir_p "_posts"

2
lib/jekyll/migrators/typo.rb
View File

@ -22,7 +22,7 @@ module Jekyll
def self.process dbname, user, pass, host='localhost' def self.process dbname, user, pass, host='localhost'
FileUtils.mkdir_p '_posts' FileUtils.mkdir_p '_posts'
db = Sequel.mysql dbname, :user => user, :password => pass, :host => host db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
db[SQL].each do |post| db[SQL].each do |post|
next unless post[:state] =~ /Published/ next unless post[:state] =~ /Published/

2
lib/jekyll/migrators/wordpress.rb
View File

@ -19,7 +19,7 @@ module Jekyll
QUERY = "select post_title, post_name, post_date, post_content, post_excerpt, ID, guid from wp_posts where post_status = 'publish' and post_type = 'post'" QUERY = "select post_title, post_name, post_date, post_content, post_excerpt, ID, guid from wp_posts where post_status = 'publish' and post_type = 'post'"
def self.process(dbname, user, pass, host = 'localhost') def self.process(dbname, user, pass, host = 'localhost')
db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host) db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
FileUtils.mkdir_p "_posts" FileUtils.mkdir_p "_posts"