features/pagination.feature features/permalinks.feature lib/jekyll/pager.rb test/source/_posts/2009-03-12-hash-#1.markdown test/source/_posts/2009-05-18-tag.textile test/source/_posts/2009-05-18-tags.textile test/source/_posts/2009-06-22-empty-yaml.textile test/source/_posts/2009-06-22-no-yaml.textile test/source/about.html test/source/contacts.html test/source/win/_posts/2009-05-24-yaml-linebreak.markdown test/test_configuration.rb test/test_page.rb test/test_pager.rb @@ -1,3 +1,31 @@ +== 0.5.2 / 2009-06-24 + * Enhancements + * Added --paginate option to the executable along with a paginator object for the payload [github.com/calavera] + * Upgraded RedCloth to 4.2.1, which makes <notextile> tags work once again. + * Configuration options set in config.yml are now available through the site payload [github.com/vilcans] + * Posts can now have an empty YAML front matter or none at all [github.com/bahuvrihi] + * Bug Fixes + * Fixing Ruby 1.9 issue that requires to_s on the err object [github.com/Chrononaut] + * Fixes for pagination and ordering posts on the same day [github.com/ujh] + * Made pages respect permalinks style and permalinks in yml front matter [github.com/eugenebolshakov] + * Index.html file should always have index.html permalink [github.com/eugenebolshakov] + * Added trailing slash to pretty permalink style so Apache is happy [github.com/eugenebolshakov] + * Bad markdown processor in config fails sooner and with better message [github.com/gcnovus] + * Allow CRLFs in yaml frontmatter [github.com/juretta] + * Added Date#xmlschema for Ruby versions < 1.9 + +== 0.5.1 / 2009-05-06 + * Major Enhancements + * Next/previous posts in site payload [github.com/pantulis, github.com/tomo] + * Permalink templating system + * Moved most of the README out to the GitHub wiki + * Exclude option in configuration so specified files won't be brought over with generated site [github.com/duritong] + * Bug Fixes + * Making sure config.yaml references are all gone, using only config.yml + * Fixed syntax highlighting breaking for UTF-8 code [github.com/henrik] + * Worked around RDiscount bug that prevents Markdown from getting parsed after highlight [github.com/henrik] + * CGI escaped post titles [github.com/Chrononaut] + == 0.5.0 / 2009-04-07 * Minor Enhancements * Ability to set post categories via YAML [github.com/qrush] History.txt @@ -1,64 +1,28 @@ h1. Jekyll -Jekyll is a simple, blog aware, static site generator. It takes a template -directory (representing the raw form of a website), runs it through Textile or -Markdown and Liquid converters, and spits out a complete, static website -suitable for serving with Apache or your favorite web server. Visit -"http://tom.preston-werner.com":http://tom.preston-werner.com to see an -example of a Jekyll generated blog. - -To understand how this all works, open up my -"TPW":http://github.com/mojombo/tpw repo in a new browser window. I'll be -referencing the code there. - -Take a look at -"index.html":http://github.com/mojombo/tpw/tree/master/index.html. This file -represents the homepage of the site. At the top of the file is a chunk of YAML -that contains metadata about the file. This data tells Jekyll what layout to -give the file, what the page's title should be, etc. In this case, I specify -that the "default" template should be used. You can find the layout files in -the "_layouts":http://github.com/mojombo/tpw/tree/master/_layouts directory. -If you open -"default.html":http://github.com/mojombo/tpw/tree/master/_layouts/default.html -you can see that the homepage is constructed by wrapping index.html with this -layout. - -You'll also notice Liquid templating code in these files. -"Liquid":http://www.liquidmarkup.org/ is a simple, extensible templating -language that makes it easy to embed data in your templates. For my homepage I -wanted to have a list of all my blog posts. Jekyll hands me a Hash containing -various data about my site. A reverse chronological list of all my blog posts -can be found in <code>site.posts</code>. Each post, in turn, contains various -fields such as <code>title</code> and <code>date</code>. - -Jekyll gets the list of blog posts by parsing the files in any -"_posts":http://github.com/mojombo/tpw/tree/master/_posts directory found in -subdirectories below the root. -Each post's filename contains (by default) the publishing date and slug (what shows up in the -URL) that the final HTML file should have. Open up the file corresponding to a -blog post: -"2008-11-17-blogging-like-a-hacker.textile":http://github.com/mojombo/tpw/tree/master/_posts/2008-11-17-blogging-like-a-hacker.textile. -GitHub renders textile files by default, so to better understand the file, -click on the -"raw":http://github.com/mojombo/tpw/tree/master/_posts/2008-11-17-blogging-like-a-hacker.textile?raw=true -view to see the original file. Here I've specified the <code>post</code> -layout. If you look at that file you'll see an example of a nested layout. -Layouts can contain other layouts allowing you a great deal of flexibility in -how pages are assembled. In my case I use a nested layout in order to show -related posts for each blog entry. The YAML also specifies the post's title -which is then embedded in the post's body via Liquid. - -Posts are handled in a special way by Jekyll. The date you specify in the -filename is used to construct the URL in the generated site. The example post, -for instance, ends up at -<code>http://tom.preston-werner.com/2008/11/17/blogging-like-a-hacker.html</code>. - -Categories for posts are derived from the directory structure the posts were -found within. A post that appears in the directory foo/bar/_posts is placed in -the categories 'foo' and 'bar'. By selecting posts from particular categories -in your Liquid templates, you will be able to host multiple blogs within a -site. +By Tom Preston-Werner, Nick Quaranto, and many awesome contributors! +Jekyll is a simple, blog aware, static site generator. It takes a template directory (representing the raw form of a website), runs it through Textile or Markdown and Liquid converters, and spits out a complete, static website suitable for serving with Apache or your favorite web server. This is also the engine behind "GitHub Pages":http://pages.github.com, which you can use to host your project's page or blog right here from GitHub. + +h2. Getting Started + +* "Install":http://wiki.github.com/mojombo/jekyll/install the gem +* Read up about its "Usage":http://wiki.github.com/mojombo/jekyll/usage and "Configuration":http://wiki.github.com/mojombo/jekyll/configuration +* Take a gander at some existing "Sites":http://wiki.github.com/mojombo/jekyll/sites +* Fork and "Contribute":http://wiki.github.com/mojombo/jekyll/contribute your own modifications +* Have questions? Post them on the "Mailing List":http://groups.google.com/group/jekyll-rb + +h2. Diving In + +* "Migrate":http://wiki.github.com/mojombo/jekyll/blog-migrations from your previous system +* Learn how the "YAML Front Matter":http://wiki.github.com/mojombo/jekyll/yaml-front-matter works +* Put information on your site with "Template Data":http://wiki.github.com/mojombo/jekyll/template-data +* Customize the "Permalinks":http://wiki.github.com/mojombo/jekyll/permalinks your posts are generated with +* Use the built-in "Liquid Extensions":http://wiki.github.com/mojombo/jekyll/liquid-extensions to make your life easier + +h2. Dependencies + +<<<<<<< HEAD:README.textile Files that do not reside in directories prefixed with an underscore are mirrored into a corresponding directory structure in the generated site. If a file does not have a YAML preface, it is not run through the Liquid @@ -552,6 +516,14 @@ your changes merged back into core is as follows: # If necessary, rebase your commits into logical chunks, without errors # Push the branch up to GitHub # Send me (mojombo) a pull request for your branch +======= +* RedCloth: Textile support +* Liquid: Templating system +* Classifier: Generating related posts +* Maruku: Default markdown engine +* Directory Watcher: Auto-regeneration of sites +* Open4: Talking to pygments for syntax highlighting +>>>>>>> f1c8e388e406e2cc022354562d8bd683d1262072:README.textile h2. License @@ -559,21 +531,8 @@ h2. License Copyright (c) 2008 Tom Preston-Werner -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -'Software'), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. README.textile @@ -15,7 +15,7 @@ begin s.rubyforge_project = "jekyll" s.files.exclude 'test/dest' s.test_files.exclude 'test/dest' - s.add_dependency('RedCloth', '>= 4.0.4') + s.add_dependency('RedCloth', '>= 4.2.1') s.add_dependency('liquid', '>= 1.9.0') s.add_dependency('classifier', '>= 1.3.1') s.add_dependency('maruku', '>= 0.5.9') @@ -81,7 +81,7 @@ begin require 'cucumber/rake/task' Cucumber::Rake::Task.new(:features) do |t| - t.cucumber_opts = "--format pretty" + t.cucumber_opts = "--format progress" end rescue LoadError desc 'Cucumber rake task not available' Rakefile @@ -1,4 +1,4 @@ --- :major: 0 :minor: 5 -:patch: 0 +:patch: 2 VERSION.yml @@ -55,6 +55,16 @@ 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 + raise ArgumentError if options['paginate'] == 0 + rescue + puts 'you must specify a number of posts by page bigger than 0' + exit 0 + end + end opts.on("--version", "Display current version") do puts "Jekyll " + Jekyll.version bin/jekyll @@ -70,6 +70,17 @@ Feature: Post data Then the _site directory should exist And I should see "Post category: movies" in "_site/movies/2009/03/27/star-wars.html" + Scenario: Use post.tags variable + Given I have a _posts directory + And I have a _layouts directory + And I have the following post: + | title | date | layout | tag | content | + | Star Wars | 5/18/2009 | simple | twist | Luke, I am your father. | + And I have a simple layout that contains "Post tags: {{ site.posts.first.tags }}" + When I run jekyll + Then the _site directory should exist + And I should see "Post tags: twist" in "_site/2009/05/18/star-wars.html" + Scenario: Use post.categories variable when categories are in folders Given I have a movies directory And I have a movies/scifi directory @@ -105,19 +116,6 @@ Feature: Post data Then the _site directory should exist And I should see "Post categories: movies and scifi" in "_site/movies/scifi/2009/03/27/star-wars.html" - Scenario: Use post.topics variable - Given I have a _posts directory - And I have a _posts/movies directory - And I have a _posts/movies/scifi directory - And I have a _layouts directory - And I have the following post under "movies/scifi": - | title | date | layout | content | - | Star Wars | 3/27/2009 | simple | Luke, I am your father. | - And I have a simple layout that contains "Post topics: {{ site.posts.first.topics | array_to_sentence_string }}" - When I run jekyll - Then the _site directory should exist - And I should see "Post topics: movies and scifi" in "_site/2009/03/27/star-wars.html" - Scenario: Disable a post from being published Given I have a _posts directory And I have an "index.html" file that contains "Published!" features/post_data.feature @@ -18,6 +18,29 @@ Feature: Site configuration Then the _mysite directory should exist And I should see "Changing destination directory" in "_mysite/index.html" + Scenario: Exclude files inline + Given I have an "Rakefile" file that contains "I want to be excluded" + And I have an "README" file that contains "I want to be excluded" + And I have an "index.html" file that contains "I want to be included" + And I have a configuration file with "exclude" set to "Rakefile", "README" + When I run jekyll + Then I should see "I want to be included" in "_site/index.html" + And the "_site/Rakefile" file should not exist + And the "_site/README" file should not exist + + Scenario: Exclude files with YAML array + Given I have an "Rakefile" file that contains "I want to be excluded" + And I have an "README" file that contains "I want to be excluded" + And I have an "index.html" file that contains "I want to be included" + And I have a configuration file with "exclude" set to: + | Value | + | README | + | Rakefile | + When I run jekyll + Then I should see "I want to be included" in "_site/index.html" + And the "_site/Rakefile" file should not exist + And the "_site/README" file should not exist + Scenario: Use RDiscount for markup Given I have an "index.markdown" page that contains "[Google](http://google.com)" And I have a configuration file with "markdown" set to "rdiscount" @@ -32,26 +55,6 @@ Feature: Site configuration Then the _site directory should exist And I should see "<a href='http://google.com'>Google</a>" in "_site/index.html" - Scenario: Use none permalink schema - Given I have a _posts directory - And I have the following post: - | title | date | content | - | None Permalink Schema | 3/27/2009 | Totally nothing. | - And I have a configuration file with "permalink" set to "none" - When I run jekyll - Then the _site directory should exist - And I should see "Totally nothing." in "_site/none-permalink-schema.html" - - Scenario: Use pretty permalink schema - Given I have a _posts directory - And I have the following post: - | title | date | content | - | Pretty Permalink Schema | 3/27/2009 | Totally wordpress. | - And I have a configuration file with "permalink" set to "pretty" - When I run jekyll - Then the _site directory should exist - And I should see "Totally wordpress." in "_site/2009/03/27/pretty-permalink-schema/index.html" - Scenario: Highlight code with pygments Given I have an "index.html" file that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}" And I have a configuration file with "pygments" set to "true" features/site_configuration.feature @@ -10,7 +10,7 @@ Feature: Site data And I should see "Contact: email@me.com" in "_site/contact.html" Scenario: Use site.time variable - Given I have an "index.html" page that contains "Generated on: {{ site.time }}" + Given I have an "index.html" page that contains "{{ site.time }}" When I run jekyll Then the _site directory should exist And I should see today's time in "_site/index.html" @@ -49,3 +49,34 @@ Feature: Site data When I run jekyll Then the _site directory should exist And I should see "Awesome Hack" in "_site/index.html" + + Scenario: Use site.tags variable + Given I have a _posts directory + And I have an "index.html" page that contains "{% for post in site.tags.beer %} {{ post.content }} {% endfor %}" + And I have the following posts: + | title | date | tag | content | + | Delicious Beer | 3/26/2009 | beer | 1) Yuengling | + When I run jekyll + Then the _site directory should exist + And I should see "Yuengling" in "_site/index.html" + + Scenario: Order Posts by name when on the same date + Given I have a _posts directory + And I have an "index.html" page that contains "{% for post in site.posts %}{{ post.title }}:{{ post.previous.title}},{{ post.next.title}} {% endfor %}" + And I have the following posts: + | title | date | content | + | first | 2/26/2009 | first | + | A | 3/26/2009 | A | + | B | 3/26/2009 | B | + | C | 3/26/2009 | C | + | last | 4/26/2009 | last | + When I run jekyll + Then the _site directory should exist + And I should see "last:C, C:B,last B:A,C A:first,B first:,A" in "_site/index.html" + + Scenario: Use configuration date in site payload + Given I have an "index.html" page that contains "{{ site.url }}" + And I have a configuration file with "url" set to "http://mysite.com" + When I run jekyll + Then the _site directory should exist + And I should see "http://mysite.com" in "_site/index.html" features/site_data.feature @@ -57,7 +57,7 @@ Given /^I have the following posts?(?: (.*) "(.*)")?:$/ do |direction, folder, t path = File.join(before || '.', '_posts', after || '.', "#{date}-#{title}.#{post['type'] || 'textile'}") matter_hash = {} - %w(title layout tags category categories published author).each do |key| + %w(title layout tag tags category categories published author).each do |key| matter_hash[key] = post[key] if post[key] end matter = matter_hash.map { |k, v| "#{k}: #{v}\n" }.join.chomp @@ -86,10 +86,25 @@ Given /^I have a configuration file with "(.*)" set to "(.*)"$/ do |key, value| end end +Given /^I have a configuration file with "([^\"]*)" set to:$/ do |key, table| + File.open('_config.yml', 'w') do |f| + f.write("#{key}:\n") + table.hashes.each do |row| + f.write("- #{row["Value"]}\n") + end + f.close + end +end + + When /^I run jekyll$/ do run_jekyll end +When /^I debug jekyll$/ do + run_jekyll(:debug => true) +end + When /^I change "(.*)" to contain "(.*)"$/ do |file, text| File.open(file, 'a') do |f| f.write(text) @@ -100,6 +115,10 @@ Then /^the (.*) directory should exist$/ do |dir| assert File.directory?(dir) end +Then /^the (.*) file should exist$/ do |file| + assert File.file?(file) +end + Then /^I should see "(.*)" in "(.*)"$/ do |text, file| assert_match Regexp.new(text), File.open(file).readlines.join end @@ -109,10 +128,9 @@ Then /^the "(.*)" file should not exist$/ do |file| end Then /^I should see today's time in "(.*)"$/ do |file| - assert_match Regexp.new(Time.now.to_s), File.open(file).readlines.join + assert_match Regexp.new(Regexp.escape(Time.now.to_s)), File.open(file).readlines.join end Then /^I should see today's date in "(.*)"$/ do |file| assert_match Regexp.new(Date.today.to_s), File.open(file).readlines.join end - features/step_definitions/jekyll_steps.rb @@ -10,9 +10,7 @@ TEST_DIR = File.join('/', 'tmp', 'jekyll') JEKYLL_PATH = File.join(ENV['PWD'], 'bin', 'jekyll') def run_jekyll(opts = {}) - if opts[:bg] - bg = '&' - end - - system "#{JEKYLL_PATH} >> /dev/null" + command = JEKYLL_PATH + command << " >> /dev/null 2>&1" if opts[:debug].nil? + system command end features/support/env.rb @@ -2,11 +2,15 @@ Gem::Specification.new do |s| s.name = %q{jekyll} +<<<<<<< HEAD:jekyll.gemspec s.version = "0.5.1" +======= + s.version = "0.5.2" +>>>>>>> f1c8e388e406e2cc022354562d8bd683d1262072:jekyll.gemspec s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Tom Preston-Werner"] - s.date = %q{2009-04-07} + s.date = %q{2009-06-24} s.default_executable = %q{jekyll} s.description = %q{Jekyll is a simple, blog aware, static site generator.} s.email = %q{tom@mojombo.com} @@ -15,6 +19,7 @@ Gem::Specification.new do |s| "README.textile" ] s.files = [ +<<<<<<< HEAD:jekyll.gemspec "History.txt", "README.textile", "Rakefile", @@ -62,37 +67,110 @@ Gem::Specification.new do |s| "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb" +======= + ".gitignore", + "History.txt", + "README.textile", + "Rakefile", + "VERSION.yml", + "bin/jekyll", + "features/create_sites.feature", + "features/embed_filters.feature", + "features/pagination.feature", + "features/permalinks.feature", + "features/post_data.feature", + "features/site_configuration.feature", + "features/site_data.feature", + "features/step_definitions/jekyll_steps.rb", + "features/support/env.rb", + "jekyll.gemspec", + "lib/jekyll.rb", + "lib/jekyll/albino.rb", + "lib/jekyll/converters/csv.rb", + "lib/jekyll/converters/mephisto.rb", + "lib/jekyll/converters/mt.rb", + "lib/jekyll/converters/textpattern.rb", + "lib/jekyll/converters/typo.rb", + "lib/jekyll/converters/wordpress.rb", + "lib/jekyll/convertible.rb", + "lib/jekyll/core_ext.rb", + "lib/jekyll/filters.rb", + "lib/jekyll/layout.rb", + "lib/jekyll/page.rb", + "lib/jekyll/pager.rb", + "lib/jekyll/post.rb", + "lib/jekyll/site.rb", + "lib/jekyll/tags/highlight.rb", + "lib/jekyll/tags/include.rb", + "test/helper.rb", + "test/source/_includes/sig.markdown", + "test/source/_layouts/default.html", + "test/source/_layouts/simple.html", + "test/source/_posts/2008-02-02-not-published.textile", + "test/source/_posts/2008-02-02-published.textile", + "test/source/_posts/2008-10-18-foo-bar.textile", + "test/source/_posts/2008-11-21-complex.textile", + "test/source/_posts/2008-12-03-permalinked-post.textile", + "test/source/_posts/2008-12-13-include.markdown", + "test/source/_posts/2009-01-27-array-categories.textile", + "test/source/_posts/2009-01-27-categories.textile", + "test/source/_posts/2009-01-27-category.textile", + "test/source/_posts/2009-03-12-hash-#1.markdown", + "test/source/_posts/2009-05-18-tag.textile", + "test/source/_posts/2009-05-18-tags.textile", + "test/source/_posts/2009-06-22-empty-yaml.textile", + "test/source/_posts/2009-06-22-no-yaml.textile", + "test/source/about.html", + "test/source/category/_posts/2008-9-23-categories.textile", + "test/source/contacts.html", + "test/source/css/screen.css", + "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", + "test/source/index.html", + "test/source/win/_posts/2009-05-24-yaml-linebreak.markdown", + "test/source/z_category/_posts/2008-9-23-categories.textile", + "test/suite.rb", + "test/test_configuration.rb", + "test/test_filters.rb", + "test/test_generated_site.rb", + "test/test_page.rb", + "test/test_pager.rb", + "test/test_post.rb", + "test/test_site.rb", + "test/test_tags.rb" +>>>>>>> f1c8e388e406e2cc022354562d8bd683d1262072:jekyll.gemspec ] - s.has_rdoc = true s.homepage = %q{http://github.com/mojombo/jekyll} s.rdoc_options = ["--charset=UTF-8"] s.require_paths = ["lib"] s.rubyforge_project = %q{jekyll} - s.rubygems_version = %q{1.3.0} + s.rubygems_version = %q{1.3.4} s.summary = %q{Jekyll is a simple, blog aware, static site generator.} s.test_files = [ "test/helper.rb", - "test/suite.rb", - "test/test_filters.rb", - "test/test_generated_site.rb", - "test/test_post.rb", - "test/test_site.rb", - "test/test_tags.rb" + "test/suite.rb", + "test/test_configuration.rb", + "test/test_filters.rb", + "test/test_generated_site.rb", + "test/test_page.rb", + "test/test_pager.rb", + "test/test_post.rb", + "test/test_site.rb", + "test/test_tags.rb" ] if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 2 + s.specification_version = 3 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q<RedCloth>, [">= 4.0.4"]) + s.add_runtime_dependency(%q<RedCloth>, [">= 4.2.1"]) s.add_runtime_dependency(%q<liquid>, [">= 1.9.0"]) s.add_runtime_dependency(%q<classifier>, [">= 1.3.1"]) s.add_runtime_dependency(%q<maruku>, [">= 0.5.9"]) s.add_runtime_dependency(%q<directory_watcher>, [">= 1.1.1"]) s.add_runtime_dependency(%q<open4>, [">= 0.9.6"]) else - s.add_dependency(%q<RedCloth>, [">= 4.0.4"]) + s.add_dependency(%q<RedCloth>, [">= 4.2.1"]) s.add_dependency(%q<liquid>, [">= 1.9.0"]) s.add_dependency(%q<classifier>, [">= 1.3.1"]) s.add_dependency(%q<maruku>, [">= 0.5.9"]) @@ -100,7 +178,7 @@ Gem::Specification.new do |s| s.add_dependency(%q<open4>, [">= 0.9.6"]) end else - s.add_dependency(%q<RedCloth>, [">= 4.0.4"]) + s.add_dependency(%q<RedCloth>, [">= 4.2.1"]) s.add_dependency(%q<liquid>, [">= 1.9.0"]) s.add_dependency(%q<classifier>, [">= 1.3.1"]) s.add_dependency(%q<maruku>, [">= 0.5.9"]) jekyll.gemspec @@ -16,6 +16,7 @@ require 'redcloth' # internal requires require 'jekyll/core_ext' +require 'jekyll/pager' require 'jekyll/site' require 'jekyll/convertible' require 'jekyll/custom_filters' @@ -64,14 +65,15 @@ module Jekyll source = override['source'] || Jekyll::DEFAULTS['source'] # Get configuration from <source>/_config.yml - config = {} config_file = File.join(source, '_config.yml') begin config = YAML.load_file(config_file) - puts "Configuration from #{config_file}" + raise "Invalid configuration - #{config_file}" if !config.is_a?(Hash) + STDOUT.puts "Configuration from #{config_file}" rescue => err - puts "WARNING: Could not read configuration. Using defaults (and options)." - puts "\t" + err + STDERR.puts "WARNING: Could not read configuration. Using defaults (and options)." + STDERR.puts "\t" + err.to_s + config = {} end # Merge DEFAULTS < _config.yml < override lib/jekyll.rb @@ -56,7 +56,7 @@ class Albino def initialize(target, lexer = :text, format = :html) @target = File.exists?(target) ? File.read(target) : target rescue target - @options = { :l => lexer, :f => format } + @options = { :l => lexer, :f => format, :O => 'encoding=utf-8' } end def execute(command) @@ -71,7 +71,9 @@ class Albino end def colorize(options = {}) - execute @@bin + convert_options(options) + html = execute(@@bin + convert_options(options)) + # Work around an RDiscount bug: http://gist.github.com/97682 + html.to_s.sub(%r{</pre></div>\Z}, "</pre>\n</div>") end alias_method :to_s, :colorize lib/jekyll/albino.rb @@ -17,12 +17,14 @@ module Jekyll # Returns nothing def read_yaml(base, name) self.content = File.read(File.join(base, name)) - - if self.content =~ /^(---\s*\n.*?)\n---\s*\n/m - self.content = self.content[($1.size + 5)..-1] - + + if self.content =~ /^(---\s*\n.*?\n?)(---.*?\n)/m + self.content = self.content[($1.size + $2.size)..-1] + self.data = YAML.load($1) end + + self.data ||= {} end # Transform the contents based on the file extension. lib/jekyll/convertible.rb @@ -19,4 +19,12 @@ class Hash target end -end \ No newline at end of file +end + +# Thanks, ActiveSupport! +class Date + # Converts datetime to an appropriate format for use in XML + def xmlschema + strftime("%Y-%m-%dT%H:%M:%S%Z") + end if RUBY_VERSION < '1.9' +end lib/jekyll/core_ext.rb @@ -18,7 +18,11 @@ module Jekyll end def xml_escape(input) - input.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;") + CGI.escapeHTML(input) + end + + def cgi_escape(input) + CGI::escape(input) end def number_of_words(input) lib/jekyll/filters.rb @@ -4,7 +4,7 @@ module Jekyll include Convertible attr_accessor :site - attr_accessor :ext + attr_accessor :name, :ext, :basename attr_accessor :data, :content, :output # Initialize a new Page. @@ -17,14 +17,47 @@ module Jekyll def initialize(site, base, dir, name) @site = site @base = base - @dir = dir + @dir = dir @name = name - self.data = {} - self.process(name) self.read_yaml(File.join(base, dir), name) - #self.transform + end + + # The generated directory into which the page will be placed + # upon generation. This is derived from the permalink or, if + # permalink is absent, set to '/' + # + # Returns <String> + def dir + url[-1, 1] == '/' ? url : File.dirname(url) + end + + # The full path and filename of the post. + # Defined in the YAML of the post body + # (Optional) + # + # Returns <String> + def permalink + self.data && self.data['permalink'] + end + + def template + if self.site.permalink_style == :pretty && !index? + "/:name/" + else + "/:name.html" + end + end + + # The generated relative url of this page + # e.g. /about.html + # + # Returns <String> + def url + return permalink if permalink + + @url ||= template.gsub(':name', basename) end # Extract information from the page filename @@ -33,6 +66,7 @@ module Jekyll # Returns nothing def process(name) self.ext = File.extname(name) + self.basename = name.split('.')[0..-2].first end # Add any necessary layouts to this post @@ -46,22 +80,33 @@ module Jekyll end # Write the generated page file to the destination directory. - # +dest+ is the String path to the destination dir + # +dest_prefix+ is the String path to the destination dir + # +dest_suffix+ is a suffix path to the destination dir # # Returns nothing - def write(dest) - FileUtils.mkdir_p(File.join(dest, @dir)) + def write(dest_prefix, dest_suffix = nil) + dest = File.join(dest_prefix, @dir) + dest = File.join(dest, dest_suffix) if dest_suffix + FileUtils.mkdir_p(dest) - name = @name - if self.ext != "" - name = @name.split(".")[0..-2].join('.') + self.ext + # The url needs to be unescaped in order to preserve the correct filename + path = File.join(dest, CGI.unescape(self.url)) + if self.url[/\.html$/].nil? + FileUtils.mkdir_p(path) + path = File.join(path, "index.html") end - path = File.join(dest, @dir, name) File.open(path, 'w') do |f| f.write(self.output) end end + + private + + def index? + basename == 'index' + end + end -end \ No newline at end of file +end lib/jekyll/page.rb @@ -18,9 +18,12 @@ module Jekyll name =~ MATCHER end - attr_accessor :site - attr_accessor :date, :slug, :ext, :categories, :topics, :published - attr_accessor :data, :content, :output + attr_accessor :site, :date, :slug, :ext, :published, :data, :content, :output, :tags + attr_writer :categories + + def categories + @categories ||= [] + end # Initialize this Post instance. # +site+ is the Site @@ -35,10 +38,6 @@ module Jekyll @name = name self.categories = dir.split('/').reject { |x| x.empty? } - - parts = name.split('/') - self.topics = parts.size > 1 ? parts[0..-2] : [] - self.process(name) self.read_yaml(@base, name) @@ -48,6 +47,14 @@ module Jekyll self.published = true end + if self.data.has_key?("tag") + self.tags = [self.data["tag"]] + elsif self.data.has_key?("tags") + self.tags = self.data['tags'] + else + self.tags = [] + end + if self.categories.empty? if self.data.has_key?('category') self.categories << self.data['category'] @@ -63,11 +70,15 @@ module Jekyll end end - # Spaceship is based on Post#date + # Spaceship is based on Post#date, slug # # Returns -1, 0, 1 def <=>(other) - self.date <=> other.date + cmp = self.date <=> other.date + if 0 == cmp + cmp = self.slug <=> other.slug + end + return cmp end # Extract information from the post filename @@ -88,16 +99,7 @@ module Jekyll # # Returns <String> def dir - if permalink - permalink.to_s.split("/")[0..-2].join("/") + '/' - else - prefix = self.categories.empty? ? '' : '/' + self.categories.join('/') - if [:date, :pretty].include?(self.site.permalink_style) - prefix + date.strftime("/%Y/%m/%d/") - else - prefix + '/' - end - end + File.dirname(url) end # The full path and filename of the post. @@ -109,13 +111,35 @@ module Jekyll self.data && self.data['permalink'] end + def template + case self.site.permalink_style + when :pretty + "/:categories/:year/:month/:day/:title/" + when :none + "/:categories/:title.html" + when :date + "/:categories/:year/:month/:day/:title.html" + else + self.site.permalink_style.to_s + end + end + # The generated relative url of this post # e.g. /2008/11/05/my-awesome-post.html # # Returns <String> def url - ext = self.site.permalink_style == :pretty ? '' : '.html' - permalink || self.id + ext + return permalink if permalink + + @url ||= { + "year" => date.strftime("%Y"), + "month" => date.strftime("%m"), + "day" => date.strftime("%d"), + "title" => CGI.escape(slug), + "categories" => categories.sort.join('/') + }.inject(template) { |result, token| + result.gsub(/:#{token.first}/, token.last) + }.gsub(/\/\//, "/") end # The UID for this post (useful in feeds) @@ -123,7 +147,7 @@ module Jekyll # # Returns <String> def id - self.dir + self.slug + File.join(self.dir, self.slug) end # Calculate related posts. @@ -172,9 +196,10 @@ module Jekyll def write(dest) FileUtils.mkdir_p(File.join(dest, dir)) - path = File.join(dest, self.url) + # The url needs to be unescaped in order to preserve the correct filename + path = File.join(dest, CGI.unescape(self.url)) - if self.site.permalink_style == :pretty + if template[/\.html$/].nil? FileUtils.mkdir_p(path) path = File.join(path, "index.html") end @@ -188,15 +213,15 @@ module Jekyll # # Returns <Hash> def to_liquid - { "title" => self.data["title"] || self.slug.split('-').select {|w| w.capitalize! || w }.join(' '), - "url" => self.url, - "date" => self.date, - "id" => self.id, - "topics" => self.topics, + { "title" => self.data["title"] || self.slug.split('-').select {|w| w.capitalize! || w }.join(' '), + "url" => self.url, + "date" => self.date, + "id" => self.id, "categories" => self.categories, - "next" => self.next, - "previous" => self.previous, - "content" => self.content }.deep_merge(self.data) + "next" => self.next, + "previous" => self.previous, + "tags" => self.tags, + "content" => self.content }.deep_merge(self.data) end def inspect lib/jekyll/post.rb @@ -1,8 +1,8 @@ module Jekyll class Site - attr_accessor :config, :layouts, :posts, :categories - attr_accessor :source, :dest, :lsi, :pygments, :permalink_style + attr_accessor :config, :layouts, :posts, :categories, :exclude, + :source, :dest, :lsi, :pygments, :permalink_style, :tags # Initialize the site # +config+ is a Hash containing site configurations details @@ -16,6 +16,7 @@ module Jekyll self.lsi = config['lsi'] self.pygments = config['pygments'] self.permalink_style = config['permalink'].to_sym + self.exclude = config['exclude'] || [] self.reset self.setup @@ -24,7 +25,8 @@ module Jekyll def reset self.layouts = {} self.posts = [] - self.categories = Hash.new { |hash, key| hash[key] = Array.new } + self.categories = Hash.new { |hash, key| hash[key] = [] } + self.tags = Hash.new { |hash, key| hash[key] = [] } end def setup @@ -41,7 +43,6 @@ module Jekyll RDiscount.new(content).to_html end - puts 'Using rdiscount for Markdown' rescue LoadError puts 'You must have the rdiscount gem installed first' end @@ -76,6 +77,8 @@ module Jekyll rescue LoadError puts "The maruku gem is required for markdown support!" end + else + raise "Invalid Markdown processor: '#{self.config['markdown']}' -- did you mean 'maruku' or 'rdiscount'?" end if self.config['custom_filters'] @@ -140,6 +143,7 @@ module Jekyll if post.published self.posts << post post.categories.each { |c| self.categories[c] << post } + post.tags.each { |c| self.tags[c] << post } end end end @@ -151,7 +155,8 @@ module Jekyll post.render(self.layouts, site_payload) end - self.categories.values.map { |cats| cats.sort! { |a, b| b <=> a} } + self.categories.values.map { |ps| ps.sort! { |a, b| b <=> a} } + self.tags.values.map { |ps| ps.sort! { |a, b| b <=> a} } rescue Errno::ENOENT => e # ignore missing layout dir end @@ -186,11 +191,14 @@ module Jekyll directories.delete('_posts') read_posts(dir) end + [directories, files].each do |entries| entries.each do |f| if File.directory?(File.join(base, f)) next if self.dest.sub(/\/$/, '') == File.join(base, f) transform_pages(File.join(dir, f)) + elsif Pager.pagination_enabled?(self.config, f) + paginate_posts(f, dir) else first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) } @@ -225,15 +233,13 @@ module Jekyll # # Returns {"site" => {"time" => <Time>, # "posts" => [<Post>], - # "categories" => [<Post>], - # "topics" => [<Post>] }} + # "categories" => [<Post>]} def site_payload - {"site" => { - "time" => Time.now, - "posts" => self.posts.sort { |a,b| b <=> a }, - "categories" => post_attr_hash('categories'), - "topics" => post_attr_hash('topics') - }} + {"site" => self.config.merge({ + "time" => Time.now, + "posts" => self.posts.sort { |a,b| b <=> a }, + "categories" => post_attr_hash('categories'), + "tags" => post_attr_hash('tags')})} end # Filter out any files/directories that are hidden or backup files (start @@ -243,11 +249,32 @@ module Jekyll def filter_entries(entries) entries = entries.reject do |e| unless ['_posts', '.htaccess'].include?(e) - # Reject backup/hidden - ['.', '_', '#'].include?(e[0..0]) or e[-1..-1] == '~' + ['.', '_', '#'].include?(e[0..0]) || e[-1..-1] == '~' || self.exclude.include?(e) end end end + # Paginates the blog's posts. Renders the index.html file into paginated directories, ie: page2, page3... + # and adds more wite-wide data + # + # {"paginator" => { "page" => <Number>, + # "per_page" => <Number>, + # "posts" => [<Post>], + # "total_posts" => <Number>, + # "total_pages" => <Number>, + # "previous_page" => <Number>, + # "next_page" => <Number> }} + def paginate_posts(file, dir) + all_posts = self.posts.sort { |a,b| b <=> a } + pages = Pager.calculate_pages(all_posts, self.config['paginate'].to_i) + pages += 1 + (1..pages).each do |num_page| + pager = Pager.new(self.config, num_page, all_posts, pages) + page = Page.new(self, self.source, dir, file) + page.render(self.layouts, site_payload.merge({'paginator' => pager.to_hash})) + suffix = "page#{num_page}" if num_page > 1 + page.write(self.dest, suffix) + end + end end end lib/jekyll/site.rb @@ -30,9 +30,9 @@ module Jekyll end def render_pygments(context, code) - if context["content_type"] == :markdown + if context["content_type"] == "markdown" return "\n" + Albino.new(code, @lang).to_s(@options) + "\n" - elsif context["content_type"] == :textile + elsif context["content_type"] == "textile" return "<notextile>" + Albino.new(code, @lang).to_s(@options) + "</notextile>" else return Albino.new(code, @lang).to_s(@options) lib/jekyll/tags/highlight.rb @@ -1,3 +1,6 @@ +require 'rubygems' +gem 'RedCloth', '= 4.2.1' + require File.join(File.dirname(__FILE__), *%w[.. lib jekyll]) require 'test/unit' test/helper.rb @@ -37,5 +37,13 @@ class TestFilters < Test::Unit::TestCase assert_equal "AT&amp;T", @filter.xml_escape("AT&T") assert_equal "&lt;code&gt;command &amp;lt;filename&amp;gt;&lt;/code&gt;", @filter.xml_escape("<code>command &lt;filename&gt;</code>") end + + should "escape space as plus" do + assert_equal "my+things", @filter.cgi_escape("my things") + end + + should "escape special characters" do + assert_equal "hey%21", @filter.cgi_escape("hey!") + end end end test/test_filters.rb @@ -17,11 +17,8 @@ class TestGeneratedSite < Test::Unit::TestCase assert @index.include?("#{@site.posts.size} Posts") end - should "render post.content" do - latest_post = Dir[source_dir('_posts', '*')].sort.last - post = Post.new(@site, source_dir, '', File.basename(latest_post)) - post.transform - assert @index.include?(post.content) + should "render latest post's content" do + assert @index.include?(@site.posts.last.content) end should "hide unpublished posts" do @@ -34,5 +31,10 @@ class TestGeneratedSite < Test::Unit::TestCase should "not copy _posts directory" do assert !File.exist?(dest_dir('_posts')) end + + should "process other static files and generate correct permalinks" do + assert File.exists?(dest_dir('/about/index.html')) + assert File.exists?(dest_dir('/contacts.html')) + end end end test/test_generated_site.rb @@ -41,6 +41,8 @@ class TestPost < Test::Unit::TestCase assert_equal Time.parse("2008-10-19"), @post.date assert_equal "foo-bar", @post.slug assert_equal ".textile", @post.ext + assert_equal "/2008/10/19", @post.dir + assert_equal "/2008/10/19/foo-bar", @post.id end should "create url based on date and title" do @@ -49,16 +51,114 @@ class TestPost < Test::Unit::TestCase assert_equal "/2008/10/19/foo-bar.html", @post.url end - should "respect permalink" do + should "CGI escape urls" do + @post.categories = [] + @post.process("2009-03-12-hash-#1.markdown") + assert_equal "/2009/03/12/hash-%231.html", @post.url + assert_equal "/2009/03/12/hash-#1", @post.id + end + + should "respect permalink in yaml front matter" do file = "2008-12-03-permalinked-post.textile" @post.process(file) @post.read_yaml(@source, file) assert_equal "my_category/permalinked-post", @post.permalink - assert_equal "my_category/", @post.dir + assert_equal "my_category", @post.dir assert_equal "my_category/permalinked-post", @post.url end + context "with CRLF linebreaks" do + setup do + @real_file = "2009-05-24-yaml-linebreak.markdown" + @source = source_dir('win/_posts') + end + should "read yaml front-matter" do + @post.read_yaml(@source, @real_file) + + assert_equal({"title" => "Test title", "layout" => "post", "tag" => "Ruby"}, @post.data) + assert_equal "\r\nThis is the content", @post.content + end + end + + context "with site wide permalink" do + setup do + @post.categories = [] + end + + context "with unspecified (date) style" do + setup do + @post.process(@fake_file) + end + + should "process the url correctly" do + assert_equal "/:categories/:year/:month/:day/:title.html", @post.template + assert_equal "/2008/10/19/foo-bar.html", @post.url + end + end + + context "with unspecified (date) style and a category" do + setup do + @post.categories << "beer" + @post.process(@fake_file) + end + + should "process the url correctly" do + assert_equal "/:categories/:year/:month/:day/:title.html", @post.template + assert_equal "/beer/2008/10/19/foo-bar.html", @post.url + end + end + + context "with unspecified (date) style and categories" do + setup do + @post.categories << "food" + @post.categories << "beer" + @post.process(@fake_file) + end + + should "process the url correctly" do + assert_equal "/:categories/:year/:month/:day/:title.html", @post.template + assert_equal "/beer/food/2008/10/19/foo-bar.html", @post.url + end + end + + context "with none style" do + setup do + @post.site.permalink_style = :none + @post.process(@fake_file) + end + + should "process the url correctly" do + assert_equal "/:categories/:title.html", @post.template + assert_equal "/foo-bar.html", @post.url + end + end + + context "with pretty style" do + setup do + @post.site.permalink_style = :pretty + @post.process(@fake_file) + end + + should "process the url correctly" do + assert_equal "/:categories/:year/:month/:day/:title/", @post.template + assert_equal "/2008/10/19/foo-bar/", @post.url + end + end + + context "with prefix style and no extension" do + setup do + @post.site.permalink_style = "/prefix/:title" + @post.process(@fake_file) + end + + should "process the url correctly" do + assert_equal "/prefix/:title", @post.template + assert_equal "/prefix/foo-bar", @post.url + end + end + end + should "read yaml front-matter" do @post.read_yaml(@source, @real_file) @@ -124,6 +224,28 @@ class TestPost < Test::Unit::TestCase assert post.categories.include?('baz') end + should "recognize tag in yaml" do + post = setup_post("2009-05-18-tag.textile") + assert post.tags.include?('code') + end + + should "recognize tags in yaml" do + post = setup_post("2009-05-18-tags.textile") + assert post.tags.include?('food') + assert post.tags.include?('cooking') + assert post.tags.include?('pizza') + end + + should "allow no yaml" do + post = setup_post("2009-06-22-no-yaml.textile") + assert_equal "No YAML.", post.content + end + + should "allow empty yaml" do + post = setup_post("2009-06-22-empty-yaml.textile") + assert_equal "Empty YAML.", post.content + end + context "rendering" do setup do clear_dest @@ -144,6 +266,16 @@ class TestPost < Test::Unit::TestCase assert File.exists?(File.join(dest_dir, '2008', '10', '18', 'foo-bar.html')) end + should "write properly without html extension" do + post = setup_post("2008-10-18-foo-bar.textile") + post.site.permalink_style = ":title" + do_render(post) + post.write(dest_dir) + + assert File.directory?(dest_dir) + assert File.exists?(File.join(dest_dir, 'foo-bar', 'index.html')) + end + should "insert data" do post = setup_post("2008-11-21-complex.textile") do_render(post) @@ -164,7 +296,6 @@ class TestPost < Test::Unit::TestCase should "generate categories and topics" do post = Post.new(@site, File.join(File.dirname(__FILE__), *%w[source]), 'foo', 'bar/2008-12-12-topical-post.textile') assert_equal ['foo'], post.categories - assert_equal ['bar'], post.topics end end test/test_post.rb @@ -9,6 +9,10 @@ class TestSite < Test::Unit::TestCase @site = Site.new(Jekyll.configuration) end + should "have an empty tag hash by default" do + assert_equal Hash.new, @site.tags + end + should "reset data before processing" do clear_dest @site.process @@ -38,7 +42,7 @@ class TestSite < Test::Unit::TestCase @site.process posts = Dir[source_dir("**", "_posts", "*")] - categories = %w(bar baz category foo z_category publish_test).sort + categories = %w(bar baz category foo z_category publish_test win).sort assert_equal posts.size - 1, @site.posts.size assert_equal categories, @site.categories.keys.sort @@ -53,5 +57,29 @@ class TestSite < Test::Unit::TestCase assert_equal %w[foo.markdown bar.markdown baz.markdown], @site.filter_entries(ent1) assert_equal ent2, @site.filter_entries(ent2) end + + should "filter entries with exclude" do + excludes = %w[README TODO] + includes = %w[index.html site.css] + + @site.exclude = excludes + assert_equal includes, @site.filter_entries(excludes + includes) + end + + context 'with an invalid markdown processor in the configuration' do + + should 'give a meaningful error message' do + bad_processor = 'not a processor name' + begin + Site.new(Jekyll.configuration.merge({ 'markdown' => bad_processor })) + flunk 'Invalid markdown processors should cause a failure on site creation' + rescue RuntimeError => e + assert e.to_s =~ /invalid|bad/i + assert e.to_s =~ %r{#{bad_processor}} + end + end + + end + end end test/test_site.rb @@ -1,35 +1,116 @@ require File.dirname(__FILE__) + '/helper' class TestTags < Test::Unit::TestCase - context "tagging" do - setup do - @content = <<CONTENT + + def create_post(content, override = {}, markdown = true) + stub(Jekyll).configuration do + Jekyll::DEFAULTS.merge({'pygments' => true}).merge(override) + end + site = Site.new(Jekyll.configuration) + info = { :filters => [Jekyll::Filters], :registers => { :site => site } } + + if markdown + payload = {"content_type" => "markdown"} + else + payload = {"content_type" => "textile"} + end + + @result = Liquid::Template.parse(content).render(payload, info) + + if markdown + @result = site.markdown(@result) + else + @result = site.textile(@result) + end + end + + def fill_post(code, override = {}) + content = <<CONTENT --- -layout: post title: This is a test - --- + This document results in a markdown error with maruku -{% highlight ruby %} -puts "hi" +{% highlight text %} +#{code} +{% endhighlight %} +CONTENT + create_post(content, override) + end + + context "post content has highlight tag" do + setup do + fill_post("test") + end + + should "not cause a markdown error" do + assert_no_match /markdown\-html\-error/, @result + end + + should "render markdown with pygments line handling" do + assert_match %{<pre>test\n</pre>}, @result + end + end -puts "bye" + context "post content has highlight tag with UTF character" do + setup do + fill_post("Æ") + end + + should "render markdown with pygments line handling" do + assert_match %{<pre>Æ\n</pre>}, @result + end + end + + context "simple post with markdown and pre tags" do + setup do + @content = <<CONTENT +--- +title: Maruku vs. RDiscount +--- + +_FIGHT!_ + +{% highlight ruby %} +puts "3..2..1.." {% endhighlight %} +*FINISH HIM* CONTENT end - should "render markdown with pygments line handling" do - stub(Jekyll).configuration do - Jekyll::DEFAULTS.merge({'pygments' => true}) + context "using Textile" do + setup do + create_post(@content, {}, false) + end + + # Broken in RedCloth 4.1.9 + should "not textilize highlight block" do + assert_no_match %r{3\.\.2\.\.1\.\.&quot;</span><br />}, @result + end + end + + context "using Maruku" do + setup do + create_post(@content) end - site = Site.new(Jekyll.configuration) - info = { :filters => [Jekyll::Filters], :registers => { :site => site } } - result = Liquid::Template.parse(@content).render({}, info) - result = site.markdown(result) - assert_no_match(/markdown\-html\-error/,result) + should "parse correctly" do + assert_match %r{<em>FIGHT!</em>}, @result + assert_match %r{<em>FINISH HIM</em>}, @result + end + end + + context "using RDiscount" do + setup do + create_post(@content, 'markdown' => 'rdiscount') + end + + should "parse correctly" do + assert_match %r{<em>FIGHT!</em>}, @result + assert_match %r{<em>FINISH HIM</em>}, @result + end end end end test/test_tags.rb TODO 596f69a84b69d755b432585a310d46249dc4b482 f1c8e388e406e2cc022354562d8bd683d1262072 sixones sixones@me.com http://github.com/sixones/jekyll/commit/448d490c9ba3434c5cabe9f7a1f7b0a031c61994 448d490c9ba3434c5cabe9f7a1f7b0a031c61994 2009-06-28T07:59:35-07:00 2009-06-28T07:59:35-07:00 updated to use latest jekyll, fixed conflicts 15bb2f8a609ce464d2e0cb5913c4c2db397dbfd5 sixones sixones@me.com