RubyGems - jekyll - Versions diffs - 0.12.1 → 1.0.0.beta1 - Mend

jekyll 0.12.1 → 1.0.0.beta1

Potentially problematic release.

This version of jekyll might be problematic. Click here for more details.

Files changed (124) hide show

data/CONTRIBUTING.md +67 -0
data/Gemfile +1 -1
data/History.txt +50 -6
data/README.textile +10 -6
data/Rakefile +74 -36
data/bin/jekyll +78 -276
data/cucumber.yml +3 -1
data/features/create_sites.feature +1 -1
data/features/drafts.feature +25 -0
data/features/site_configuration.feature +1 -1
data/features/step_definitions/jekyll_steps.rb +13 -3
data/features/support/env.rb +3 -1
data/jekyll.gemspec +73 -17
data/lib/jekyll.rb +31 -21
data/lib/jekyll/command.rb +12 -0
data/lib/jekyll/commands/build.rb +81 -0
data/lib/jekyll/commands/serve.rb +28 -0
data/lib/jekyll/converter.rb +1 -3
data/lib/jekyll/converters/identity.rb +13 -14
data/lib/jekyll/converters/markdown.rb +128 -128
data/lib/jekyll/converters/textile.rb +37 -37
data/lib/jekyll/convertible.rb +6 -4
data/lib/jekyll/core_ext.rb +9 -1
data/lib/jekyll/draft.rb +35 -0
data/lib/jekyll/errors.rb +1 -3
data/lib/jekyll/filters.rb +13 -4
data/lib/jekyll/generator.rb +1 -4
data/lib/jekyll/generators/pagination.rb +46 -46
data/lib/jekyll/layout.rb +0 -2
data/lib/jekyll/mime.types +1588 -0
data/lib/jekyll/page.rb +24 -8
data/lib/jekyll/plugin.rb +0 -2
data/lib/jekyll/post.rb +66 -40
data/lib/jekyll/site.rb +96 -20
data/lib/jekyll/static_file.rb +0 -2
data/lib/jekyll/tags/gist.rb +19 -0
data/lib/jekyll/tags/highlight.rb +63 -62
data/lib/jekyll/tags/include.rb +25 -25
data/lib/jekyll/tags/post_url.rb +30 -25
data/script/bootstrap +2 -0
data/site/.gitignore +4 -0
data/site/CNAME +1 -0
data/site/README +1 -0
data/site/_config.yml +5 -0
data/site/_includes/analytics.html +32 -0
data/site/_includes/docs_contents.html +82 -0
data/site/_includes/footer.html +15 -0
data/site/_includes/header.html +26 -0
data/site/_includes/section_nav.html +22 -0
data/site/_includes/top.html +14 -0
data/site/_layouts/default.html +12 -0
data/site/_layouts/docs.html +21 -0
data/site/_posts/2012-07-01-configuration.md +277 -0
data/site/_posts/2012-07-01-contributing.md +66 -0
data/site/_posts/2012-07-01-deployment-methods.md +108 -0
data/site/_posts/2012-07-01-extras.md +103 -0
data/site/_posts/2012-07-01-frontmatter.md +120 -0
data/site/_posts/2012-07-01-github-pages.md +34 -0
data/site/_posts/2012-07-01-heroku.md +8 -0
data/site/_posts/2012-07-01-home.md +47 -0
data/site/_posts/2012-07-01-installation.md +43 -0
data/site/_posts/2012-07-01-migrations.md +180 -0
data/site/_posts/2012-07-01-pages.md +62 -0
data/site/_posts/2012-07-01-pagination.md +116 -0
data/site/_posts/2012-07-01-permalinks.md +163 -0
data/site/_posts/2012-07-01-plugins.md +384 -0
data/site/_posts/2012-07-01-posts.md +106 -0
data/site/_posts/2012-07-01-resources.md +49 -0
data/site/_posts/2012-07-01-sites.md +28 -0
data/site/_posts/2012-07-01-structure.md +95 -0
data/site/_posts/2012-07-01-templates.md +217 -0
data/site/_posts/2012-07-01-troubleshooting.md +108 -0
data/site/_posts/2012-07-01-usage.md +38 -0
data/site/_posts/2012-07-01-variables.md +166 -0
data/site/css/grid.css +62 -0
data/site/css/normalize.css +504 -0
data/site/css/pygments.css +70 -0
data/site/css/style.css +697 -0
data/site/docs/index.html +11 -0
data/site/favicon.png +0 -0
data/site/img/article-footer.png +0 -0
data/site/img/footer-arrow.png +0 -0
data/site/img/footer-logo.png +0 -0
data/site/img/logo-2x.png +0 -0
data/site/img/octojekyll.png +0 -0
data/site/img/tube.png +0 -0
data/site/img/tube1x.png +0 -0
data/site/index.html +77 -0
data/site/js/modernizr-2.5.3.min.js +4 -0
data/test/fixtures/broken_front_matter2.erb +4 -0
data/test/fixtures/broken_front_matter3.erb +7 -0
data/test/fixtures/exploit_front_matter.erb +4 -0
data/test/helper.rb +16 -0
data/test/source/_posts/2013-01-12-nil-layout.textile +6 -0
data/test/source/_posts/2013-01-12-no-layout.textile +5 -0
data/test/source/contacts/bar.html +5 -0
data/test/source/contacts/index.html +5 -0
data/test/test_configuration.rb +7 -8
data/test/test_convertible.rb +29 -0
data/test/test_core_ext.rb +22 -0
data/test/test_generated_site.rb +1 -1
data/test/test_kramdown.rb +3 -3
data/test/test_page.rb +88 -2
data/test/test_post.rb +42 -6
data/test/test_rdiscount.rb +1 -1
data/test/test_redcarpet.rb +1 -1
data/test/test_redcloth.rb +6 -6
data/test/test_site.rb +73 -8
data/test/test_tags.rb +36 -13
metadata +150 -19
data/lib/jekyll/migrators/csv.rb +0 -26
data/lib/jekyll/migrators/drupal.rb +0 -103
data/lib/jekyll/migrators/enki.rb +0 -49
data/lib/jekyll/migrators/joomla.rb +0 -53
data/lib/jekyll/migrators/marley.rb +0 -52
data/lib/jekyll/migrators/mephisto.rb +0 -84
data/lib/jekyll/migrators/mt.rb +0 -86
data/lib/jekyll/migrators/posterous.rb +0 -67
data/lib/jekyll/migrators/rss.rb +0 -47
data/lib/jekyll/migrators/textpattern.rb +0 -58
data/lib/jekyll/migrators/tumblr.rb +0 -195
data/lib/jekyll/migrators/typo.rb +0 -51
data/lib/jekyll/migrators/wordpress.rb +0 -294
data/lib/jekyll/migrators/wordpressdotcom.rb +0 -70

data/lib/jekyll/migrators/csv.rb DELETED

@@ -1,26 +0,0 @@
-module Jekyll
-  module CSV
-    # Reads a csv with title, permalink, body, published_at, and filter.
-    # It creates a post file for each row in the csv
-    def self.process(file = "posts.csv")
-      FileUtils.mkdir_p "_posts"
-      posts = 0
-      FasterCSV.foreach(file) do |row|
-        next if row[0] == "title"
-        posts += 1
-        name = row[3].split(" ")[0]+"-"+row[1]+(row[4] =~ /markdown/ ? ".markdown" : ".textile")
-        File.open("_posts/#{name}", "w") do |f|
-          f.puts <<-HEADER
----
-layout: post
-title: #{row[0]}
----
-          HEADER
-          f.puts row[2]
-        end
-      end
-      "Created #{posts} posts!"
-    end
-  end
-end

data/lib/jekyll/migrators/drupal.rb DELETED

@@ -1,103 +0,0 @@
-require 'rubygems'
-require 'sequel'
-require 'fileutils'
-require 'yaml'
-# NOTE: This converter requires Sequel and the MySQL gems.
-# The MySQL gem can be difficult to install on OS X. Once you have MySQL
-# installed, running the following commands should work:
-# $ sudo gem install sequel
-# $ sudo gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
-module Jekyll
-  module Drupal
-    # Reads a MySQL database via Sequel and creates a post file for each post
-    # in wp_posts that has post_status = 'publish'. This restriction is made
-    # because 'draft' posts are not guaranteed to have valid dates.
-    QUERY = "SELECT n.nid, \
-                    n.title, \
-                    nr.body, \
-                    n.created, \
-                    n.status \
-             FROM node AS n, \
-                  node_revisions AS nr \
-             WHERE (n.type = 'blog' OR n.type = 'story') \
-             AND n.vid = nr.vid"
-    def self.process(dbname, user, pass, host = 'localhost', prefix = '')
-      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
-      if prefix != ''
-        QUERY[" node "] = " " + prefix + "node "
-        QUERY[" node_revisions "] = " " + prefix + "node_revisions "
-      end
-      FileUtils.mkdir_p "_posts"
-      FileUtils.mkdir_p "_drafts"
-      # Create the refresh layout
-      # Change the refresh url if you customized your permalink config
-      File.open("_layouts/refresh.html", "w") do |f|
-        f.puts <<EOF
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta http-equiv="refresh" content="0;url={{ page.refresh_to_post_id }}.html" />
-</head>
-</html>
-EOF
-      end
-      db[QUERY].each do |post|
-        # Get required fields and construct Jekyll compatible name
-        node_id = post[:nid]
-        title = post[:title]
-        content = post[:body]
-        created = post[:created]
-        time = Time.at(created)
-        is_published = post[:status] == 1
-        dir = is_published ? "_posts" : "_drafts"
-        slug = title.strip.downcase.gsub(/(&|&amp;)/, ' and ').gsub(/[\s\.\/\\]/, '-').gsub(/[^\w-]/, '').gsub(/[-_]{2,}/, '-').gsub(/^[-_]/, '').gsub(/[-_]$/, '')
-        name = time.strftime("%Y-%m-%d-") + slug + '.md'
-        # Get the relevant fields as a hash, delete empty fields and convert
-        # to YAML for the header
-        data = {
-           'layout' => 'post',
-           'title' => title.to_s,
-           'created' => created,
-         }.delete_if { |k,v| v.nil? || v == ''}.to_yaml
-        # Write out the data and content to file
-        File.open("#{dir}/#{name}", "w") do |f|
-          f.puts data
-          f.puts "---"
-          f.puts content
-        end
-        # Make a file to redirect from the old Drupal URL
-        if is_published
-          aliases = db["SELECT dst FROM #{prefix}url_alias WHERE src = ?", "node/#{node_id}"].all
-          aliases.push(:dst => "node/#{node_id}")
-          aliases.each do |url_alias|
-            FileUtils.mkdir_p url_alias[:dst]
-            File.open("#{url_alias[:dst]}/index.md", "w") do |f|
-              f.puts "---"
-              f.puts "layout: refresh"
-              f.puts "refresh_to_post_id: /#{time.strftime("%Y/%m/%d/") + slug}"
-              f.puts "---"
-            end
-          end
-        end
-      end
-      # TODO: Make dirs & files for nodes of type 'page'
-        # Make refresh pages for these as well
-      # TODO: Make refresh dirs & files according to entries in url_alias table
-    end
-  end
-end

data/lib/jekyll/migrators/enki.rb DELETED

@@ -1,49 +0,0 @@
-# Adapted by Rodrigo Pinto <rodrigopqn@gmail.com>
-# Based on typo.rb by Toby DiPasquale
-require 'fileutils'
-require 'rubygems'
-require 'sequel'
-module Jekyll
-  module Enki
-    SQL = <<-EOS
-      SELECT p.id,
-             p.title,
-             p.slug,
-             p.body,
-             p.published_at as date,
-             p.cached_tag_list as tags
-      FROM posts p
-    EOS
-    # Just working with postgres, but can be easily adapted
-    # to work with both mysql and postgres.
-    def self.process(dbname, user, pass, host = 'localhost')
-      FileUtils.mkdir_p('_posts')
-      db = Sequel.postgres(:database => dbname,
-                           :user => user,
-                           :password => pass,
-                           :host => host,
-                           :encoding => 'utf8')
-      db[SQL].each do |post|
-        name = [ sprintf("%.04d", post[:date].year),
-                 sprintf("%.02d", post[:date].month),
-                 sprintf("%.02d", post[:date].day),
-                 post[:slug].strip ].join('-')
-        name += '.textile'
-        File.open("_posts/#{name}", 'w') do |f|
-          f.puts({ 'layout'   => 'post',
-                   'title'    => post[:title].to_s,
-                   'enki_id'  => post[:id],
-                   'categories'  => post[:tags]
-                 }.delete_if { |k, v| v.nil? || v == '' }.to_yaml)
-          f.puts '---'
-          f.puts post[:body].delete("\r")
-        end
-      end
-    end
-  end
-end

data/lib/jekyll/migrators/joomla.rb DELETED

@@ -1,53 +0,0 @@
-require 'rubygems'
-require 'sequel'
-require 'fileutils'
-require 'yaml'
-# NOTE: This migrator is made for Joomla 1.5 databases.
-# NOTE: This converter requires Sequel and the MySQL gems.
-# The MySQL gem can be difficult to install on OS X. Once you have MySQL
-# installed, running the following commands should work:
-# $ sudo gem install sequel
-# $ sudo gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
-module Jekyll
-  module Joomla
-    def self.process(dbname, user, pass, host = 'localhost', table_prefix = 'jos_', section = '1')
-      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
-      FileUtils.mkdir_p("_posts")
-      # Reads a MySQL database via Sequel and creates a post file for each
-      # post in wp_posts that has post_status = 'publish'. This restriction is
-      # made because 'draft' posts are not guaranteed to have valid dates.
-      query = "SELECT `title`, `alias`, CONCAT(`introtext`,`fulltext`) as content, `created`, `id` FROM #{table_prefix}content WHERE state = '0' OR state = '1' AND sectionid = '#{section}'"
-      db[query].each do |post|
-        # Get required fields and construct Jekyll compatible name.
-        title = post[:title]
-        slug = post[:alias]
-        date = post[:created]
-        content = post[:content]
-        name = "%02d-%02d-%02d-%s.markdown" % [date.year, date.month, date.day,
-                                               slug]
-        # Get the relevant fields as a hash, delete empty fields and convert
-        # to YAML for the header.
-        data = {
-           'layout' => 'post',
-           'title' => title.to_s,
-           'joomla_id' => post[:id],
-           'joomla_url' => post[:alias],
-           'date' => date
-         }.delete_if { |k,v| v.nil? || v == '' }.to_yaml
-        # Write out the data and content to file
-        File.open("_posts/#{name}", "w") do |f|
-          f.puts data
-          f.puts "---"
-          f.puts content
-        end
-      end
-    end
-  end
-end

data/lib/jekyll/migrators/marley.rb DELETED

@@ -1,52 +0,0 @@
-require 'yaml'
-require 'fileutils'
-module Jekyll
-  module Marley
-    def self.regexp
-      { :id    => /^\d{0,4}-{0,1}(.*)$/,
-        :title => /^#\s*(.*)\s+$/,
-        :title_with_date => /^#\s*(.*)\s+\(([0-9\/]+)\)$/,
-        :published_on => /.*\s+\(([0-9\/]+)\)$/,
-        :perex => /^([^\#\n]+\n)$/,
-        :meta  => /^\{\{\n(.*)\}\}\n$/mi # Multiline Regexp
-      }
-    end
-    def self.process(marley_data_dir)
-      raise ArgumentError, "marley dir #{marley_data_dir} not found" unless File.directory?(marley_data_dir)
-      FileUtils.mkdir_p "_posts"
-      posts = 0
-      Dir["#{marley_data_dir}/**/*.txt"].each do |f|
-        next unless File.exists?(f)
-        #copied over from marley's app/lib/post.rb
-        file_content  = File.read(f)
-        meta_content  = file_content.slice!( self.regexp[:meta] )
-        body          = file_content.sub( self.regexp[:title], '').sub( self.regexp[:perex], '').strip
-        title = file_content.scan( self.regexp[:title] ).first.to_s.strip
-        prerex = file_content.scan( self.regexp[:perex] ).first.to_s.strip
-        published_on = DateTime.parse( post[:published_on] ) rescue File.mtime( File.dirname(f) )
-        meta          = ( meta_content ) ? YAML::load( meta_content.scan( self.regexp[:meta]).to_s ) : {}
-        meta['title'] = title
-        meta['layout'] = 'post'
-        formatted_date = published_on.strftime('%Y-%m-%d')
-        post_name =  File.dirname(f).split(%r{/}).last.gsub(/\A\d+-/, '')
-        name = "#{formatted_date}-#{post_name}"
-        File.open("_posts/#{name}.markdown", "w") do |f|
-          f.puts meta.to_yaml
-          f.puts "---\n"
-          f.puts "\n#{prerex}\n\n" if prerex
-          f.puts body
-        end
-        posts += 1
-      end
-      "Created #{posts} posts!"
-    end
-  end
-end

data/lib/jekyll/migrators/mephisto.rb DELETED

@@ -1,84 +0,0 @@
-# Quickly hacked together my Michael Ivey
-# Based on mt.rb by Nick Gerakines, open source and publically
-# available under the MIT license. Use this module at your own risk.
-require 'rubygems'
-require 'sequel'
-require 'fastercsv'
-require 'fileutils'
-require File.join(File.dirname(__FILE__),"csv.rb")
-# NOTE: This converter requires Sequel and the MySQL gems.
-# The MySQL gem can be difficult to install on OS X. Once you have MySQL
-# installed, running the following commands should work:
-# $ sudo gem install sequel
-# $ sudo gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
-module Jekyll
-  module Mephisto
-    #Accepts a hash with database config variables, exports mephisto posts into a csv
-    #export PGPASSWORD if you must
-    def self.postgres(c)
-      sql = <<-SQL
-      BEGIN;
-      CREATE TEMP TABLE jekyll AS
-        SELECT title, permalink, body, published_at, filter FROM contents
-        WHERE user_id = 1 AND type = 'Article' ORDER BY published_at;
-      COPY jekyll TO STDOUT WITH CSV HEADER;
-      ROLLBACK;
-      SQL
-      command = %Q(psql -h #{c[:host] || "localhost"} -c "#{sql.strip}" #{c[:database]} #{c[:username]} -o #{c[:filename] || "posts.csv"})
-      puts command
-      `#{command}`
-      CSV.process
-    end
-    # This query will pull blog posts from all entries across all blogs. If
-    # you've got unpublished, deleted or otherwise hidden posts please sift
-    # through the created posts to make sure nothing is accidently published.
-    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')
-      db = Sequel.mysql(dbname, :user => user,
-                                :password => pass,
-                                :host => host,
-                                :encoding => 'utf8')
-      FileUtils.mkdir_p "_posts"
-      db[QUERY].each do |post|
-        title = post[:title]
-        slug = post[:permalink]
-        date = post[:published_at]
-        content = post[:body]
-        # Ideally, this script would determine the post format (markdown,
-        # html, etc) and create files with proper extensions. At this point
-        # it just assumes that markdown will be acceptable.
-        name = [date.year, date.month, date.day, slug].join('-') + ".markdown"
-        data = {
-           'layout' => 'post',
-           'title' => title.to_s,
-           'mt_id' => post[:entry_id],
-         }.delete_if { |k,v| v.nil? || v == ''}.to_yaml
-        File.open("_posts/#{name}", "w") do |f|
-          f.puts data
-          f.puts "---"
-          f.puts content
-        end
-      end
-    end
-  end
-end

data/lib/jekyll/migrators/mt.rb DELETED

@@ -1,86 +0,0 @@
-# Created by Nick Gerakines, open source and publically available under the
-# MIT license. Use this module at your own risk.
-# I'm an Erlang/Perl/C++ guy so please forgive my dirty ruby.
-require 'rubygems'
-require 'sequel'
-require 'fileutils'
-require 'yaml'
-# NOTE: This converter requires Sequel and the MySQL gems.
-# The MySQL gem can be difficult to install on OS X. Once you have MySQL
-# installed, running the following commands should work:
-# $ sudo gem install sequel
-# $ sudo gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
-module Jekyll
-  module MT
-    # This query will pull blog posts from all entries across all blogs. If
-    # you've got unpublished, deleted or otherwise hidden posts please sift
-    # through the created posts to make sure nothing is accidently published.
-    QUERY = "SELECT entry_id, \
-                    entry_basename, \
-                    entry_text, \
-                    entry_text_more, \
-                    entry_authored_on, \
-                    entry_title, \
-                    entry_convert_breaks \
-             FROM mt_entry"
-    def self.process(dbname, user, pass, host = 'localhost')
-      db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')
-      FileUtils.mkdir_p "_posts"
-      db[QUERY].each do |post|
-        title = post[:entry_title]
-        slug = post[:entry_basename].gsub(/_/, '-')
-        date = post[:entry_authored_on]
-        content = post[:entry_text]
-        more_content = post[:entry_text_more]
-        entry_convert_breaks = post[:entry_convert_breaks]
-        # Be sure to include the body and extended body.
-        if more_content != nil
-          content = content + " \n" + more_content
-        end
-        # Ideally, this script would determine the post format (markdown,
-        # html, etc) and create files with proper extensions. At this point
-        # it just assumes that markdown will be acceptable.
-        name = [date.year, date.month, date.day, slug].join('-') + '.' +
-               self.suffix(entry_convert_breaks)
-        data = {
-           'layout' => 'post',
-           'title' => title.to_s,
-           'mt_id' => post[:entry_id],
-           'date' => date
-         }.delete_if { |k,v| v.nil? || v == '' }.to_yaml
-        File.open("_posts/#{name}", "w") do |f|
-          f.puts data
-          f.puts "---"
-          f.puts content
-        end
-      end
-    end
-    def self.suffix(entry_type)
-      if entry_type.nil? || entry_type.include?("markdown")
-        # The markdown plugin I have saves this as
-        # "markdown_with_smarty_pants", so I just look for "markdown".
-        "markdown"
-      elsif entry_type.include?("textile")
-        # This is saved as "textile_2" on my installation of MT 5.1.
-        "textile"
-      elsif entry_type == "0" || entry_type.include?("richtext")
-        # Richtext looks to me like it's saved as HTML, so I include it here.
-        "html"
-      else
-        # Other values might need custom work.
-        entry_type
-      end
-    end
-  end
-end