Jekyll Plugins Wanted
diff --git a/site/docs/posts.md b/site/docs/posts.md
index f93eb6b5..a8f918f8 100644
--- a/site/docs/posts.md
+++ b/site/docs/posts.md
@@ -155,6 +155,8 @@ If you don't like the automatically-generated post excerpt, it can be overridden
`excerpt` to your post's YAML front-matter. Completely disable it by setting
your `excerpt_separator` to `""`.
+Also, as with any output generated by Liquid tags, you can pass the `| strip_html` flag to remove any html tags in the output. This is particularly helpful if you wish to output a post excerpt as a `meta="description"` tag within the post `head`, or anywhere else having html tags along with the content is not desirable.
+
## Highlighting code snippets
Jekyll also has built-in support for syntax highlighting of code snippets using
diff --git a/site/docs/structure.md b/site/docs/structure.md
index d03baee0..c178a65f 100644
--- a/site/docs/structure.md
+++ b/site/docs/structure.md
@@ -113,7 +113,7 @@ An overview of what each of these does:
- Your dynamic content, so to speak. The format of these files is
+ Your dynamic content, so to speak. The naming convention of these files is
important, and must follow the format:
YEAR-MONTH-DAY-title.MARKUP.
The permalinks can be customized for each
diff --git a/site/docs/variables.md b/site/docs/variables.md
index 89e11a52..96578311 100644
--- a/site/docs/variables.md
+++ b/site/docs/variables.md
@@ -244,6 +244,24 @@ following is a reference of the available data.
|
+
+ page.next
|
+
+
+ The next post relative to the position of the current post in
+ site.posts. Returns nil for the last entry.
+
+ |
+
+
+ page.previous
|
+
+
+ The previous post relative to the position of the current post in
+ site.posts. Returns nil for the first entry.
+
+ |
+
diff --git a/test/source/js/coffeescript.coffee b/test/source/js/coffeescript.coffee
new file mode 100644
index 00000000..e0e066b1
--- /dev/null
+++ b/test/source/js/coffeescript.coffee
@@ -0,0 +1,10 @@
+---
+---
+
+$ ->
+ list = [1, 2, 3, 4, 5]
+ square = (x) -> x * x
+ cube = (x) -> square(x) * x
+ cubes = (math.cube num for num in list)
+
+ alert "I knew it!" if elvis?
diff --git a/test/source/unpublished.html b/test/source/unpublished.html
new file mode 100644
index 00000000..265b6062
--- /dev/null
+++ b/test/source/unpublished.html
@@ -0,0 +1,7 @@
+---
+layout: default
+title: Not published!
+published: false
+---
+
+This should *not* be published!
diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb
new file mode 100644
index 00000000..cd052c05
--- /dev/null
+++ b/test/test_coffeescript.rb
@@ -0,0 +1,49 @@
+require 'helper'
+
+class TestCoffeeScript < Test::Unit::TestCase
+ context "converting CoffeeScript" do
+ setup do
+ @site = Jekyll::Site.new(Jekyll.configuration({
+ "source" => source_dir,
+ "destination" => dest_dir
+ }))
+ @site.process
+ @test_coffeescript_file = dest_dir("js/coffeescript.js")
+ @js_output = <<-JS
+(function() {
+ $(function() {
+ var cube, cubes, list, num, square;
+ list = [1, 2, 3, 4, 5];
+ square = function(x) {
+ return x * x;
+ };
+ cube = function(x) {
+ return square(x) * x;
+ };
+ cubes = (function() {
+ var _i, _len, _results;
+ _results = [];
+ for (_i = 0, _len = list.length; _i < _len; _i++) {
+ num = list[_i];
+ _results.push(math.cube(num));
+ }
+ return _results;
+ })();
+ if (typeof elvis !== \"undefined\" && elvis !== null) {
+ return alert(\"I knew it!\");
+ }
+ });
+
+}).call(this);
+JS
+ end
+
+ should "write a JS file in place" do
+ assert File.exists?(@test_coffeescript_file), "Can't find the converted CoffeeScript file in the dest_dir."
+ end
+
+ should "produce JS" do
+ assert_equal @js_output, File.read(@test_coffeescript_file)
+ end
+ end
+end
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 36e6cb1d..a96141fa 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -106,31 +106,36 @@ class TestConfiguration < Test::Unit::TestCase
end
should "fire warning with no _config.yml" do
- mock(YAML).safe_load_file(@path) { raise SystemCallError, "No such file or directory - #{@path}" }
+ mock(SafeYAML).load_file(@path) { raise SystemCallError, "No such file or directory - #{@path}" }
mock($stderr).puts("Configuration file: none".yellow)
assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
end
should "load configuration as hash" do
- mock(YAML).safe_load_file(@path) { Hash.new }
+ mock(SafeYAML).load_file(@path) { Hash.new }
mock($stdout).puts("Configuration file: #{@path}")
assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
end
should "fire warning with bad config" do
- mock(YAML).safe_load_file(@path) { Array.new }
+ mock(SafeYAML).load_file(@path) { Array.new }
mock($stderr).puts(("WARNING: ".rjust(20) + "Error reading configuration. Using defaults (and options).").yellow)
mock($stderr).puts("Configuration file: (INVALID) #{@path}".yellow)
assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
end
should "fire warning when user-specified config file isn't there" do
- mock(YAML).safe_load_file(@user_config) { raise SystemCallError, "No such file or directory - #{@user_config}" }
+ mock(SafeYAML).load_file(@user_config) { raise SystemCallError, "No such file or directory - #{@user_config}" }
mock($stderr).puts(("Fatal: ".rjust(20) + "The configuration file '#{@user_config}' could not be found.").red)
assert_raises LoadError do
Jekyll.configuration({'config' => [@user_config]})
end
end
+
+ should "not clobber YAML.load to the dismay of other libraries" do
+ assert_equal :foo, YAML.load(':foo')
+ # as opposed to: assert_equal ':foo', SafeYAML.load(':foo')
+ end
end
context "loading config from external file" do
setup do
@@ -143,19 +148,19 @@ class TestConfiguration < Test::Unit::TestCase
end
should "load default config if no config_file is set" do
- mock(YAML).safe_load_file(@paths[:default]) { Hash.new }
+ mock(SafeYAML).load_file(@paths[:default]) { Hash.new }
mock($stdout).puts("Configuration file: #{@paths[:default]}")
assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
end
should "load different config if specified" do
- mock(YAML).safe_load_file(@paths[:other]) { {"baseurl" => "http://wahoo.dev"} }
+ mock(SafeYAML).load_file(@paths[:other]) { {"baseurl" => "http://wahoo.dev"} }
mock($stdout).puts("Configuration file: #{@paths[:other]}")
assert_equal Jekyll::Configuration::DEFAULTS.deep_merge({ "baseurl" => "http://wahoo.dev" }), Jekyll.configuration({ "config" => @paths[:other] })
end
should "load default config if path passed is empty" do
- mock(YAML).safe_load_file(@paths[:default]) { Hash.new }
+ mock(SafeYAML).load_file(@paths[:default]) { Hash.new }
mock($stdout).puts("Configuration file: #{@paths[:default]}")
assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({ "config" => @paths[:empty] })
end
@@ -167,8 +172,8 @@ class TestConfiguration < Test::Unit::TestCase
end
should "load multiple config files" do
- mock(YAML).safe_load_file(@paths[:default]) { Hash.new }
- mock(YAML).safe_load_file(@paths[:other]) { Hash.new }
+ mock(SafeYAML).load_file(@paths[:default]) { Hash.new }
+ mock(SafeYAML).load_file(@paths[:other]) { Hash.new }
mock(TOML).load_file(@paths[:toml]) { Hash.new }
mock($stdout).puts("Configuration file: #{@paths[:default]}")
mock($stdout).puts("Configuration file: #{@paths[:other]}")
@@ -177,8 +182,8 @@ class TestConfiguration < Test::Unit::TestCase
end
should "load multiple config files and last config should win" do
- mock(YAML).safe_load_file(@paths[:default]) { {"baseurl" => "http://example.dev"} }
- mock(YAML).safe_load_file(@paths[:other]) { {"baseurl" => "http://wahoo.dev"} }
+ mock(SafeYAML).load_file(@paths[:default]) { {"baseurl" => "http://example.dev"} }
+ mock(SafeYAML).load_file(@paths[:other]) { {"baseurl" => "http://wahoo.dev"} }
mock($stdout).puts("Configuration file: #{@paths[:default]}")
mock($stdout).puts("Configuration file: #{@paths[:other]}")
assert_equal Jekyll::Configuration::DEFAULTS.deep_merge({ "baseurl" => "http://wahoo.dev" }), Jekyll.configuration({ "config" => [@paths[:default], @paths[:other]] })
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index c7398cd5..ea20a15f 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -32,6 +32,10 @@ class TestGeneratedSite < Test::Unit::TestCase
assert_equal "published.html", published.first
end
+ should "hide unpublished page" do
+ assert !File.exists?(dest_dir('/unpublished.html'))
+ end
+
should "not copy _posts directory" do
assert !File.exist?(dest_dir('_posts'))
end
diff --git a/test/test_page.rb b/test/test_page.rb
index 8924aeec..8e60922f 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -25,6 +25,11 @@ class TestPage < Test::Unit::TestCase
assert_equal "/contacts.html", @page.url
end
+ should "not published when published yaml is false" do
+ @page = setup_page("unpublished.html")
+ assert_equal false, @page.published?
+ end
+
context "in a directory hierarchy" do
should "create url based on filename" do
@page = setup_page('/contacts', 'bar.html')
diff --git a/test/test_post.rb b/test/test_post.rb
index 8145d755..66ca7e45 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -398,12 +398,12 @@ class TestPost < Test::Unit::TestCase
context "initializing posts" do
should "publish when published yaml is no specified" do
post = setup_post("2008-02-02-published.textile")
- assert_equal true, post.published
+ assert_equal true, post.published?
end
should "not published when published yaml is false" do
post = setup_post("2008-02-02-not-published.textile")
- assert_equal false, post.published
+ assert_equal false, post.published?
end
should "recognize date in yaml" do
diff --git a/test/test_sass.rb b/test/test_sass.rb
new file mode 100644
index 00000000..d13fbcfe
--- /dev/null
+++ b/test/test_sass.rb
@@ -0,0 +1,107 @@
+require 'helper'
+
+class TestSass < Test::Unit::TestCase
+ def site_configuration(overrides = {})
+ Jekyll::Configuration::DEFAULTS.deep_merge(overrides).deep_merge({
+ "source" => source_dir,
+ "destination" => dest_dir
+ })
+ end
+
+ def converter(overrides = {})
+ Jekyll::Sass.new(site_configuration({"sass" => overrides}))
+ end
+
+ def sass_content
+ <<-SASS
+$font-stack: Helvetica, sans-serif
+body
+ font-family: $font-stack
+ font-color: fuschia
+SASS
+ end
+
+ def scss_content
+ <<-SCSS
+$font-stack: Helvetica, sans-serif;
+body {
+ font-family: $font-stack;
+ font-color: fuschia;
+}
+SCSS
+ end
+
+ def css_output
+ <<-CSS
+body {\n font-family: Helvetica, sans-serif;\n font-color: fuschia; }
+CSS
+ end
+
+ context "matching file extensions" do
+ should "match .scss files" do
+ assert converter.matches(".scss")
+ end
+
+ should "match .sass files" do
+ assert converter.matches(".sass")
+ end
+ end
+
+ context "determining the output file extension" do
+ should "always outputs the .css file extension" do
+ assert_equal ".css", converter.output_ext(".always-css")
+ end
+ end
+
+ context "when building configurations" do
+ should "not allow caching in safe mode" do
+ verter = converter
+ verter.instance_variable_get(:@config)["safe"] = true
+ assert_equal false, verter.sass_configs[:cache]
+ end
+
+ should "allow caching in unsafe mode" do
+ assert_equal true, converter.sass_configs[:cache]
+ end
+
+ should "set the load paths to the _sass dir relative to site source" do
+ assert_equal [source_dir("_sass")], converter.sass_configs[:load_paths]
+ end
+
+ should "allow the user to specify a different sass dir" do
+ assert_equal [source_dir("_scss")], converter({"sass_dir" => "_scss"}).sass_configs[:load_paths]
+ end
+
+ should "set syntax :scss when SCSS content" do
+ assert_equal :scss, converter.sass_configs(scss_content)[:syntax]
+ end
+
+ should "set syntax :sass when Sass content" do
+ assert_equal :sass, converter.sass_configs(sass_content)[:syntax]
+ end
+
+ should "default to :sass syntax when content is empty" do
+ assert_equal :sass, converter.sass_configs[:syntax]
+ end
+
+ should "not allow sass_dirs outside of site source" do
+ assert_equal source_dir("etc/passwd"), converter({"sass_dir" => "/etc/passwd"}).sass_dir_relative_to_site_source
+ end
+
+ should "override user-set syntax based on content" do
+ assert_equal :sass, converter({"syntax" => :scss}).sass_configs(sass_content)[:syntax]
+ end
+ end
+
+ context "converting sass" do
+ should "produce CSS" do
+ assert_equal css_output, converter.convert(sass_content)
+ end
+ end
+
+ context "converting SCSS" do
+ should "produce CSS" do
+ assert_equal css_output, converter.convert(scss_content)
+ end
+ end
+end
diff --git a/test/test_site.rb b/test/test_site.rb
index aeaeba6c..5e639f50 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -157,7 +157,7 @@ class TestSite < Test::Unit::TestCase
should "sort pages alphabetically" do
stub.proxy(Dir).entries { |entries| entries.reverse }
@site.process
- sorted_pages = %w(.htaccess about.html bar.html contacts.html deal.with.dots.html exploit.md foo.md index.html index.html properties.html sitemap.xml symlinked-file)
+ sorted_pages = %w(.htaccess about.html bar.html coffeescript.coffee contacts.html deal.with.dots.html foo.md index.html index.html properties.html sitemap.xml symlinked-file)
assert_equal sorted_pages, @site.pages.map(&:name)
end
@@ -330,7 +330,7 @@ class TestSite < Test::Unit::TestCase
site = Site.new(Jekyll.configuration)
site.process
- file_content = YAML.safe_load_file(File.join(source_dir, '_data', 'members.yaml'))
+ file_content = SafeYAML.load_file(File.join(source_dir, '_data', 'members.yaml'))
assert_equal site.data['members'], file_content
assert_equal site.site_payload['site']['data']['members'], file_content
@@ -340,7 +340,7 @@ class TestSite < Test::Unit::TestCase
site = Site.new(Jekyll.configuration)
site.process
- file_content = YAML.safe_load_file(File.join(source_dir, '_data', 'languages.yml'))
+ file_content = SafeYAML.load_file(File.join(source_dir, '_data', 'languages.yml'))
assert_equal site.data['languages'], file_content
assert_equal site.site_payload['site']['data']['languages'], file_content
@@ -350,7 +350,7 @@ class TestSite < Test::Unit::TestCase
site = Site.new(Jekyll.configuration.merge({'safe' => false}))
site.process
- file_content = YAML.safe_load_file(File.join(source_dir, '_data', 'products.yml'))
+ file_content = SafeYAML.load_file(File.join(source_dir, '_data', 'products.yml'))
assert_equal site.data['products'], file_content
assert_equal site.site_payload['site']['data']['products'], file_content
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 37e1d583..e6887ef6 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -522,6 +522,25 @@ CONTENT
end
end
+ context "include missing file" do
+ setup do
+ @content = <