jekyll 0.11.2 → 0.12.0

data/History.txt

@@ -1,3 +1,22 @@
+== 0.12.0 / 2012-12-22
+  * Minor Enhancements
+    * Add ability to explicitly specify included files (#261)
+    * Add --default-mimetype option (#279)
+    * Allow setting of RedCloth options (#284)
+    * Add post_url Liquid tag for internal post linking (#369)
+    * Allow multiple plugin dirs to be specified (#438)
+    * Inline TOC token support for RDiscount (#333)
+    * Add the option to specify the paginated url format (#342)
+    * Support Redcarpet 2 and fenced code blocks (#619)
+    * Better reporting of Liquid errors (#624)
+  * Bug Fixes
+    * Allow some special characters in highlight names
+    * URL escape category names in URL generation (#360)
+    * Fix error with limit_posts (#442)
+    * Properly select dotfile during directory scan (#363, #431, #377)
+    * Allow setting of Kramdown smart_quotes (#482)
+    * Ensure front-matter is at start of file (#562)
+
 == 0.11.2 / 2011-12-27
   * Bug Fixes
     * Fix gemspec

data/Rakefile

@@ -50,10 +50,6 @@ task :default => [:test, :features]
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  if `which pygmentize` == ''
-    puts "You must have Pygments installed to run the tests."
-    exit 1
-  end
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
@@ -163,4 +159,4 @@ task :gemspec do
   spec = [head, manifest, tail].join("  # = MANIFEST =\n")
   File.open(gemspec_file, 'w') { |io| io.write(spec) }
   puts "Updated #{gemspec_file}"
-end
+end

data/bin/jekyll

@@ -71,6 +71,10 @@ opts = OptionParser.new do |opts|
       options['baseurl'] = baseurl
   end
 
+  opts.on("--default-mimetype [MT]", "Mimetype to use when no file extension (if --server)") do |mt|
+      options['default-mimetype'] = mt
+  end
+
   opts.on("--[no-]lsi", "Use LSI for better related posts") do |lsi|
     options['lsi'] = lsi
   end
@@ -102,7 +106,7 @@ opts = OptionParser.new do |opts|
   opts.on("--permalink [TYPE]", "Use 'date' (default) for YYYY/MM/DD") do |style|
     options['permalink'] = style unless style.nil?
   end
-  
+
   opts.on("--paginate [POSTS_PER_PAGE]", "Paginate a blog's posts") do |per_page|
     begin
       options['paginate'] = per_page.to_i
@@ -113,6 +117,16 @@ opts = OptionParser.new do |opts|
     end
   end
 
+  opts.on("--paginate_path [PAGINATED_URL_FORMAT]", "Leave blank for /page<num>") do |paginate_path|
+    begin
+      options['paginate_path'] = paginate_path
+      raise ArgumentError if options['paginate_path'].nil?
+    rescue
+      puts 'You must specify a pagination url format'
+      exit 0
+    end
+  end
+
   opts.on("--limit_posts [MAX_POSTS]", "Limit the number of posts to publish") do |limit_posts|
     begin
       options['limit_posts'] = limit_posts.to_i
@@ -148,12 +162,12 @@ if ARGV.size > 0
     else
       migrator = migrator.downcase
     end
-    
+
     cmd_options = []
     ['file', 'dbname', 'user', 'pass', 'host', 'site'].each do |p|
       cmd_options << "\"#{options[p]}\"" unless options[p].nil?
     end
-    
+
     # It's import time
     puts "Importing..."
     
@@ -162,7 +176,7 @@ if ARGV.size > 0
     migrators = {
       :posterous => 'Posterous',
       :wordpressdotcom => 'WordpressDotCom',
-      :wordpress => 'Wordpress',
+      :wordpress => 'WordPress',
       :csv => 'CSV',
       :drupal => 'Drupal',
       :enki => 'Enki',
@@ -191,7 +205,7 @@ end
 
 
 
-# Get source and destintation from command line
+# Get source and destination from command line
 case ARGV.size
   when 0
   when 1
@@ -267,6 +281,9 @@ if options['server']
 
   mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
   mime_types.store 'js', 'application/javascript'
+  if options['default-mimetype']
+    mime_types.store(nil, options['default-mimetype'])
+  end
 
   s = HTTPServer.new(
     :Port            => options['server_port'],

data/features/create_sites.feature

@@ -92,3 +92,21 @@ Feature: Create sites
     When I debug jekyll
     Then the _site directory should exist
     And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
+
+  Scenario: Basic site with internal post linking
+    Given I have an "index.html" page that contains "URL: {% post_url 2020-01-31-entry2 %}"
+    And I have a configuration file with "permalink" set to "pretty"
+    And I have a _posts directory
+    And I have the following posts:
+      | title     | date       | layout  | content                                |
+      | entry1    | 12/31/2007 | post    | content for entry1.                    |
+      | entry2    | 01/31/2020 | post    | content for entry2.                    |
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "URL: /2020/01/31/entry2/" in "_site/index.html"
+
+  Scenario: Basic site with whitelisted dotfile
+    Given I have an ".htaccess" file that contains "SomeDirective"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "SomeDirective" in "_site/.htaccess"

data/features/pagination.feature

@@ -19,9 +19,36 @@ Feature: Site pagination
     And the "_site/page<exist>/index.html" file should exist
     And I should see "<posts>" in "_site/page<exist>/index.html"
     And the "_site/page<not_exist>/index.html" file should not exist
-    
+
     Examples:
       | num | exist | posts | not_exist |
       | 1   | 4     | 1     | 5         |
       | 2   | 2     | 2     | 3         |
       | 3   | 2     | 1     | 3         |
+
+  Scenario Outline: Setting a custom pagination path
+    Given I have a configuration file with:
+      | key           | value                          |
+      | paginate      | 1                              |
+      | paginate_path | /blog/page-:num                |
+      | permalink     | /blog/:year/:month/:day/:title |
+      And I have a _layouts directory
+      And I have an "index.html" page that contains "{{ paginator.posts.size }}"
+    And I have a _posts directory
+    And I have the following post:
+      | title     | date      | layout  | content                                |
+      | Wargames  | 3/27/2009 | default | The only winning move is not to play.  |
+      | Wargames2 | 4/27/2009 | default | The only winning move is not to play2. |
+      | Wargames3 | 5/27/2009 | default | The only winning move is not to play3. |
+      | Wargames4 | 6/27/2009 | default | The only winning move is not to play4. |
+    When I run jekyll
+    Then the _site/blog/page-<exist> directory should exist
+    And the "_site/blog/page-<exist>/index.html" file should exist
+    And I should see "<posts>" in "_site/blog/page-<exist>/index.html"
+    And the "_site/blog/page-<not_exist>/index.html" file should not exist
+
+    Examples:
+      | exist | posts | not_exist |
+      | 2     | 1     | 5         |
+      | 3     | 1     | 6         |
+      | 4     | 1     | 7         |

data/features/site_configuration.feature

@@ -131,3 +131,36 @@ Feature: Site configuration
     And the "_site/2009/04/05/bananas.html" file should exist
     And the "_site/2009/04/01/oranges.html" file should exist
     And the "_site/2009/03/27/apples.html" file should not exist
+
+  Scenario: Copy over normally excluded files when they are explicitly included
+    Given I have a ".gitignore" file that contains ".DS_Store"
+    And I have an ".htaccess" file that contains "SomeDirective"
+    And I have a configuration file with "include" set to:
+      | value      |
+      | .gitignore |
+      | .foo       |
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see ".DS_Store" in "_site/.gitignore"
+    And the "_site/.htaccess" file should not exist
+
+  Scenario: Using a different layouts directory
+    Given I have a _theme directory
+    And I have a page theme that contains "Page Layout: {{ site.posts.size }} on {{ site.time | date: "%Y-%m-%d" }}"
+    And I have a post theme that contains "Post Layout: {{ content }}"
+    And I have an "index.html" page with layout "page" that contains "site index page"
+    And I have a configuration file with:
+      | key         | value        |
+      | time        | 2010-01-01   |
+      | future      | true         |
+      | layouts     | _theme       |
+    And I have a _posts directory
+    And I have the following posts:
+      | title     | date       | layout  | content                                |
+      | entry1    | 12/31/2007 | post    | content for entry1.                    |
+      | entry2    | 01/31/2020 | post    | content for entry2.                    |
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Page Layout: 2 on 2010-01-01" in "_site/index.html"
+    And I should see "Post Layout: <p>content for entry1.</p>" in "_site/2007/12/31/entry1.html"
+    And I should see "Post Layout: <p>content for entry2.</p>" in "_site/2020/01/31/entry2.html"

data/features/step_definitions/jekyll_steps.rb

@@ -39,6 +39,13 @@ Given /^I have a (.*) layout that contains "(.*)"$/ do |layout, text|
   end
 end
 
+Given /^I have a (.*) theme that contains "(.*)"$/ do |layout, text|
+  File.open(File.join('_theme', layout + '.html'), 'w') do |f|
+    f.write(text)
+    f.close
+  end
+end
+
 Given /^I have an? (.*) directory$/ do |dir|
   FileUtils.mkdir_p(dir)
 end
@@ -121,7 +128,7 @@ When /^I change "(.*)" to contain "(.*)"$/ do |file, text|
 end
 
 Then /^the (.*) directory should exist$/ do |dir|
-  assert File.directory?(dir)
+  assert File.directory?(dir), "The directory \"#{dir}\" does not exist"
 end
 
 Then /^I should see "(.*)" in "(.*)"$/ do |text, file|

data/jekyll.gemspec

@@ -4,8 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '0.11.2'
-  s.date              = '2011-12-27'
+  s.version           = '0.12.0'
+  s.license           = 'MIT'
+  s.date              = '2012-12-22'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -26,8 +27,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('classifier', "~> 1.3")
   s.add_runtime_dependency('directory_watcher', "~> 1.1")
   s.add_runtime_dependency('maruku', "~> 0.5")
-  s.add_runtime_dependency('kramdown', "~> 0.13")
-  s.add_runtime_dependency('albino', "~> 1.3")
+  s.add_runtime_dependency('kramdown', "~> 0.13.4")
+  s.add_runtime_dependency('pygments.rb', "~> 0.3.2")
 
   s.add_development_dependency('rake', "~> 0.9")
   s.add_development_dependency('rdoc', "~> 3.11")
@@ -37,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('cucumber', "1.1")
   s.add_development_dependency('RedCloth', "~> 4.2")
   s.add_development_dependency('rdiscount', "~> 1.6")
-  s.add_development_dependency('redcarpet', "~> 1.9")
+  s.add_development_dependency('redcarpet', "~> 2.1.1")
   
   # = MANIFEST =
   s.files = %w[
@@ -74,10 +75,12 @@ Gem::Specification.new do |s|
     lib/jekyll/migrators/csv.rb
     lib/jekyll/migrators/drupal.rb
     lib/jekyll/migrators/enki.rb
+    lib/jekyll/migrators/joomla.rb
     lib/jekyll/migrators/marley.rb
     lib/jekyll/migrators/mephisto.rb
     lib/jekyll/migrators/mt.rb
     lib/jekyll/migrators/posterous.rb
+    lib/jekyll/migrators/rss.rb
     lib/jekyll/migrators/textpattern.rb
     lib/jekyll/migrators/tumblr.rb
     lib/jekyll/migrators/typo.rb
@@ -90,6 +93,9 @@ Gem::Specification.new do |s|
     lib/jekyll/static_file.rb
     lib/jekyll/tags/highlight.rb
     lib/jekyll/tags/include.rb
+    lib/jekyll/tags/post_url.rb
+    test/fixtures/broken_front_matter1.erb
+    test/fixtures/front_matter.erb
     test/helper.rb
     test/source/.htaccess
     test/source/_includes/sig.markdown
@@ -132,6 +138,7 @@ Gem::Specification.new do |s|
     test/source/z_category/_posts/2008-9-23-categories.textile
     test/suite.rb
     test/test_configuration.rb
+    test/test_convertible.rb
     test/test_core_ext.rb
     test/test_filters.rb
     test/test_generated_site.rb
@@ -141,6 +148,7 @@ Gem::Specification.new do |s|
     test/test_post.rb
     test/test_rdiscount.rb
     test/test_redcarpet.rb
+    test/test_redcloth.rb
     test/test_site.rb
     test/test_tags.rb
   ]

data/lib/jekyll.rb

@@ -24,7 +24,7 @@ require 'English'
 # 3rd party
 require 'liquid'
 require 'maruku'
-require 'albino'
+require 'pygments'
 
 # internal requires
 require 'jekyll/core_ext'
@@ -46,47 +46,54 @@ require_all 'jekyll/generators'
 require_all 'jekyll/tags'
 
 module Jekyll
-  VERSION = '0.11.2'
+  VERSION = '0.12.0'
 
   # Default options. Overriden by values in _config.yml or command-line opts.
-  # (Strings rather symbols used for compatability with YAML).
+  # Strings rather than symbols are used for compatability with YAML.
   DEFAULTS = {
-    'safe'         => false,
-    'auto'         => false,
-    'server'       => false,
-    'server_port'  => 4000,
-
-    'source'       => Dir.pwd,
-    'destination'  => File.join(Dir.pwd, '_site'),
-    'plugins'      => File.join(Dir.pwd, '_plugins'),
-
-    'future'       => true,
-    'lsi'          => false,
-    'pygments'     => false,
-    'markdown'     => 'maruku',
-    'permalink'    => 'date',
-    
-    'markdown_ext' => 'markdown,mkd,mkdn,md',
-    'textile_ext'  => 'textile',
-
-    'maruku'       => {
+    'safe'          => false,
+    'auto'          => false,
+    'server'        => false,
+    'server_port'   => 4000,
+
+    'source'        => Dir.pwd,
+    'destination'   => File.join(Dir.pwd, '_site'),
+    'plugins'       => File.join(Dir.pwd, '_plugins'),
+    'layouts'       => '_layouts',
+
+    'future'        => true,
+    'lsi'           => false,
+    'pygments'      => false,
+    'markdown'      => 'maruku',
+    'permalink'     => 'date',
+    'include'       => ['.htaccess'],
+    'paginate_path' => 'page:num',
+
+    'markdown_ext'  => 'markdown,mkd,mkdn,md',
+    'textile_ext'   => 'textile',
+
+    'maruku' => {
       'use_tex'    => false,
       'use_divs'   => false,
       'png_engine' => 'blahtex',
       'png_dir'    => 'images/latex',
       'png_url'    => '/images/latex'
     },
-    'rdiscount'    => {
+
+    'rdiscount' => {
       'extensions' => []
     },
-    'redcarpet'    => {
+
+    'redcarpet' => {
       'extensions' => []
     },
-    'kramdown'        => {
+
+    'kramdown' => {
       'auto_ids'      => true,
       'footnote_nr'   => 1,
       'entity_output' => 'as_char',
       'toc_levels'    => '1..6',
+      'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo',
       'use_coderay'   => false,
 
       'coderay' => {
@@ -97,6 +104,10 @@ module Jekyll
         'coderay_bold_every'        => 10,
         'coderay_css'               => 'style'
       }
+    },
+
+    'redcloth' => {
+      'hard_breaks' => true
     }
   }
 

data/lib/jekyll/converters/markdown.rb

@@ -8,12 +8,28 @@ module Jekyll
 
     def setup
       return if @setup
-      # Set the Markdown interpreter (and Maruku self.config, if necessary)
       case @config['markdown']
         when 'redcarpet'
           begin
             require 'redcarpet'
-            @redcarpet_extensions = @config['redcarpet']['extensions'].map { |e| e.to_sym }
+
+            @renderer ||= Class.new(Redcarpet::Render::HTML) do
+              def block_code(code, lang)
+                lang = lang && lang.split.first || "text"
+                output = add_code_tags(
+                  Pygments.highlight(code, :lexer => lang, :options => { :encoding => 'utf-8' }),
+                  lang
+                )
+              end
+
+              def add_code_tags(code, lang)
+                code = code.sub(/<pre>/,'<pre><code class="' + lang + '">')
+                code = code.sub(/<\/pre>/,"</code></pre>")
+              end
+            end
+
+            @redcarpet_extensions = {}
+            @config['redcarpet']['extensions'].each { |e| @redcarpet_extensions[e.to_sym] = true }
           rescue LoadError
             STDERR.puts 'You are missing a library required for Markdown. Please run:'
             STDERR.puts '  $ [sudo] gem install redcarpet'
@@ -30,8 +46,6 @@ module Jekyll
         when 'rdiscount'
           begin
             require 'rdiscount'
-
-            # Load rdiscount extensions
             @rdiscount_extensions = @config['rdiscount']['extensions'].map { |e| e.to_sym }
           rescue LoadError
             STDERR.puts 'You are missing a library required for Markdown. Please run:'
@@ -88,7 +102,10 @@ module Jekyll
       setup
       case @config['markdown']
         when 'redcarpet'
-          Redcarpet.new(content, *@redcarpet_extensions).to_html
+          @redcarpet_extensions[:fenced_code_blocks] = !@redcarpet_extensions[:no_fenced_code_blocks]
+          @renderer.send :include, Redcarpet::Render::SmartyPants if @redcarpet_extensions[:smart]
+          markdown = Redcarpet::Markdown.new(@renderer.new(@redcarpet_extensions), @redcarpet_extensions)
+          markdown.render(content)
         when 'kramdown'
           # Check for use of coderay
           if @config['kramdown']['use_coderay']
@@ -97,6 +114,7 @@ module Jekyll
               :footnote_nr   => @config['kramdown']['footnote_nr'],
               :entity_output => @config['kramdown']['entity_output'],
               :toc_levels    => @config['kramdown']['toc_levels'],
+              :smart_quotes  => @config['kramdown']['smart_quotes'],
 
               :coderay_wrap               => @config['kramdown']['coderay']['coderay_wrap'],
               :coderay_line_numbers       => @config['kramdown']['coderay']['coderay_line_numbers'],
@@ -111,11 +129,17 @@ module Jekyll
               :auto_ids      => @config['kramdown']['auto_ids'],
               :footnote_nr   => @config['kramdown']['footnote_nr'],
               :entity_output => @config['kramdown']['entity_output'],
-              :toc_levels    => @config['kramdown']['toc_levels']
+              :toc_levels    => @config['kramdown']['toc_levels'],
+              :smart_quotes  => @config['kramdown']['smart_quotes']
             }).to_html
           end
         when 'rdiscount'
-          RDiscount.new(content, *@rdiscount_extensions).to_html
+          rd = RDiscount.new(content, *@rdiscount_extensions)
+          html = rd.to_html
+          if rd.generate_toc and html.include?(@config['rdiscount']['toc_token'])
+            html.gsub!(@config['rdiscount']['toc_token'], rd.toc_content)
+          end
+          html
         when 'maruku'
           Maruku.new(content).to_html
       end