content for entry1.
" in "_site/2007/12/31/entry1.html" And I should see "Post Layout:content for entry2.
" in "_site/2020/01/31/entry2.html" + + Scenario: Add a gem-based plugin + Given I have an "index.html" file that contains "Whatever" + And I have a configuration file with "gems" set to "[jekyll_test_plugin]" + When I run jekyll + Then the _site directory should exist + And I should see "Whatever" in "_site/index.html" + And I should see "this is a test" in "_site/test.txt" diff --git a/features/site_data.feature b/features/site_data.feature index 9ab94056..faa266b7 100644 --- a/features/site_data.feature +++ b/features/site_data.feature @@ -4,10 +4,10 @@ Feature: Site data In order to make the site slightly dynamic Scenario: Use page variable in a page - Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@me.com" + Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@example.com" When I run jekyll Then the _site directory should exist - And I should see "Contact: email@me.com" in "_site/contact.html" + And I should see "Contact: email@example.com" in "_site/contact.html" Scenario Outline: Use page.path variable in a page Given I have aIf you are importing your blog from Drupal 6,7, Joomla, - Mephisto, Movable Type, Textpattern, or Typo (with mysql db), you need to install - `mysql` and `sequel` gems. If you are importing from a WordPress database, you - need to install `mysql2` and `sequel` gems, and if you are importing from Enki - or Typo (with postgresql db) you need to install `pg` and `sequel` gems.
-- - Importers may not distinguish between published or private posts, so - you should always check that the content Jekyll generates for you appears as - you intended. - -
-If you are migrating from a WordPress.com account, you can - access the export tool at the following URL: - `https://YOUR-USER-NAME.wordpress.com/wp-admin/export.php`.
-_plugins and gems
+ can be used simultaneously
+ + You may use both of the aforementioned plugin options simultaneously in the + same site if you so choose. Use of one does not restrict the use of the other +
+{% raw %}{{ site.time | date_to_xmlschema }}{% endraw %}
- 2008-11-17T13:07:54-08:00
+ 2008-11-07T13:07:54-08:00
{% raw %}{{ site.time | date_to_rfc822 }}{% endraw %}
- Mon, 17 Nov 2008 13:07:54 -0800
+ Mon, 07 Nov 2008 13:07:54 -0800
{% raw %}{{ site.time | date_to_string }}{% endraw %}
- 17 Nov 2008
+ 07 Nov 2008
{% raw %}{{ site.time | date_to_long_string }}{% endraw %}
- 17 November 2008
+ 07 November 2008
Data To JSON
+Convert Hash or Array to JSON.
+
+ {% raw %}{{ site.data.projects | jsonify }}{% endraw %}
+
- Starting with Jekyll v1.1.0, `relative_permalinks` will default to `false`, + Starting with Jekyll v2.0, `relative_permalinks` will default to `false`, meaning all pages will be built using the absolute permalink behaviour. The switch will still exist until v2.0.
diff --git a/site/docs/usage.md b/site/docs/usage.md index 0a72e3d3..6db3a112 100644 --- a/site/docs/usage.md +++ b/site/docs/usage.md @@ -40,7 +40,7 @@ $ jekyll serve --watch # => Same as `jekyll serve`, but watch for changes and regenerate automatically. {% endhighlight %} -This is just a few of the available [configuration options](../configuration/). +These are just a few of the available [configuration options](../configuration/). Many configuration options can either be specified as flags on the command line, or alternatively (and more commonly) they can be specified in a `_config.yml` file at the root of the source directory. Jekyll will automatically use the diff --git a/test/source/_config.dev.toml b/test/source/_config.dev.toml new file mode 100644 index 00000000..7ac863f8 --- /dev/null +++ b/test/source/_config.dev.toml @@ -0,0 +1,2 @@ +baseurl = "/you-beautiful-blog-you" +title = "My magnificent site, wut" diff --git a/test/test_configuration.rb b/test/test_configuration.rb index c57408e5..d911b779 100644 --- a/test/test_configuration.rb +++ b/test/test_configuration.rb @@ -30,7 +30,7 @@ class TestConfiguration < Test::Unit::TestCase @config = Configuration[{"source" => source_dir}] @no_override = {} @one_config_file = {"config" => "config.yml"} - @multiple_files = {"config" => %w[config/site.yml config/deploy.yml configuration.yml]} + @multiple_files = {"config" => %w[config/site.yml config/deploy.toml configuration.yml]} end should "always return an array" do @@ -45,7 +45,7 @@ class TestConfiguration < Test::Unit::TestCase assert_equal %w[config.yml], @config.config_files(@one_config_file) end should "return an array of the config files if given many config files" do - assert_equal %w[config/site.yml config/deploy.yml configuration.yml], @config.config_files(@multiple_files) + assert_equal %w[config/site.yml config/deploy.toml configuration.yml], @config.config_files(@multiple_files) end end context "#backwards_compatibilize" do @@ -131,6 +131,7 @@ class TestConfiguration < Test::Unit::TestCase @paths = { :default => File.join(Dir.pwd, '_config.yml'), :other => File.join(Dir.pwd, '_config.live.yml'), + :toml => source_dir('_config.dev.toml'), :empty => "" } end @@ -153,12 +154,20 @@ class TestConfiguration < Test::Unit::TestCase assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({ "config" => @paths[:empty] }) end + should "successfully load a TOML file" do + Jekyll.logger.log_level = Jekyll::Stevenson::WARN + assert_equal Jekyll::Configuration::DEFAULTS.merge({ "baseurl" => "/you-beautiful-blog-you", "title" => "My magnificent site, wut" }), Jekyll.configuration({ "config" => [@paths[:toml]] }) + Jekyll.logger.log_level = Jekyll::Stevenson::INFO + 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(TOML).load_file(@paths[:toml]) { Hash.new } mock($stdout).puts("Configuration file: #{@paths[:default]}") mock($stdout).puts("Configuration file: #{@paths[:other]}") - assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({ "config" => [@paths[:default], @paths[:other]] }) + mock($stdout).puts("Configuration file: #{@paths[:toml]}") + assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({ "config" => [@paths[:default], @paths[:other], @paths[:toml]] }) end should "load multiple config files and last config should win" do diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb new file mode 100644 index 00000000..c295a57c --- /dev/null +++ b/test/test_entry_filter.rb @@ -0,0 +1,74 @@ +require 'helper' + +class TestEntryFilter < Test::Unit::TestCase + context "Filtering entries" do + setup do + stub(Jekyll).configuration do + Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) + end + @site = Site.new(Jekyll.configuration) + end + + should "filter entries" do + ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown# + .baz.markdow foo.markdown~ .htaccess _posts _pages] + + entries = EntryFilter.new(@site).filter(ent1) + assert_equal %w[foo.markdown bar.markdown baz.markdown .htaccess], entries + end + + should "filter entries with exclude" do + excludes = %w[README TODO] + files = %w[index.html site.css .htaccess] + + @site.exclude = excludes + ["exclude*"] + assert_equal files, @site.filter_entries(excludes + files + ["excludeA"]) + end + + should "not filter entries within include" do + includes = %w[_index.html .htaccess include*] + files = %w[index.html _index.html .htaccess includeA] + + @site.include = includes + assert_equal files, @site.filter_entries(files) + end + + should "filter symlink entries when safe mode enabled" do + stub(Jekyll).configuration do + Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true}) + end + site = Site.new(Jekyll.configuration) + stub(File).symlink?('symlink.js') {true} + files = %w[symlink.js] + assert_equal [], site.filter_entries(files) + end + + should "not filter symlink entries when safe mode disabled" do + stub(File).symlink?('symlink.js') {true} + files = %w[symlink.js] + assert_equal files, @site.filter_entries(files) + end + + should "not include symlinks in safe mode" do + stub(Jekyll).configuration do + Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true}) + end + site = Site.new(Jekyll.configuration) + + site.read_directories("symlink-test") + assert_equal [], site.pages + assert_equal [], site.static_files + end + + should "include symlinks in unsafe mode" do + stub(Jekyll).configuration do + Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => false}) + end + site = Site.new(Jekyll.configuration) + + site.read_directories("symlink-test") + assert_not_equal [], site.pages + assert_not_equal [], site.static_files + end + end +end diff --git a/test/test_filters.rb b/test/test_filters.rb index 6af0d705..28e9612d 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -98,5 +98,16 @@ class TestFilters < Test::Unit::TestCase should "escape space as %20" do assert_equal "my%20things", @filter.uri_escape("my things") end + + context "jsonify filter" do + should "convert hash to json" do + assert_equal "{\"age\":18}", @filter.jsonify({:age => 18}) + end + + should "convert array to json" do + assert_equal "[1,2]", @filter.jsonify([1, 2]) + assert_equal "[{\"name\":\"Jack\"},{\"name\":\"Smith\"}]", @filter.jsonify([{:name => 'Jack'}, {:name => 'Smith'}]) + end + end end end diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb index eed8b97f..1d4c09ff 100644 --- a/test/test_kramdown.rb +++ b/test/test_kramdown.rb @@ -12,24 +12,51 @@ class TestKramdown < Test::Unit::TestCase 'footnote_nr' => 1, 'entity_output' => 'as_char', 'toc_levels' => '1..6', - 'smart_quotes' => 'lsquo,rsquo,ldquo,rdquo' + 'smart_quotes' => 'lsquo,rsquo,ldquo,rdquo', + + 'use_coderay' => true, + 'coderay_bold_every'=> 12, + 'coderay' => { + 'coderay_css' => :style, + 'coderay_bold_every' => 8 + } } } + @config = Jekyll.configuration(@config) + @markdown = Converters::Markdown.new(@config) end # http://kramdown.rubyforge.org/converter/html.html#options should "pass kramdown options" do - markdown = Converters::Markdown.new(@config) - assert_equal "(“|“)Pit(’|’)hy(”|”)<\/p>/, markdown.convert(%{"Pit'hy"}).strip + assert_match /
(“|“)Pit(’|’)hy(”|”)<\/p>/, @markdown.convert(%{"Pit'hy"}).strip override = { 'kramdown' => { 'smart_quotes' => 'lsaquo,rsaquo,laquo,raquo' } } markdown = Converters::Markdown.new(@config.deep_merge(override)) assert_match /
(«|«)Pit(›|›)hy(»|»)<\/p>/, markdown.convert(%{"Pit'hy"}).strip end + + context "moving up nested coderay options" do + setup do + @markdown.convert('some markup') + @converter_config = @markdown.instance_variable_get(:@config)['kramdown'] + end + + should "work correctly" do + assert_equal :style, @converter_config['coderay_css'] + end + + should "also work for defaults" do + default = Jekyll::Configuration::DEFAULTS['kramdown']['coderay']['coderay_tab_width'] + assert_equal default, @converter_config['coderay_tab_width'] + end + + should "not overwrite" do + assert_equal 12, @converter_config['coderay_bold_every'] + end + end end end diff --git a/test/test_redcloth.rb b/test/test_redcloth.rb index 94cc9f49..964591be 100644 --- a/test/test_redcloth.rb +++ b/test/test_redcloth.rb @@ -7,7 +7,7 @@ class TestRedCloth < Test::Unit::TestCase @textile = Converters::Textile.new end - should "preserve single line breaks in HTML output" do + should "preserve single line breaks in HTML output" do assert_equal "
line1
\nline2
line1
\nline2
line1
\nline2