jekyll 1.5.1 → 2.0.0.alpha.1

data/test/test_sass.rb

@@ -0,0 +1,122 @@
+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
+
+  context "importing partials" do
+    setup do
+      @site = Jekyll::Site.new(Jekyll.configuration({
+        "source" => source_dir,
+        "destination" => dest_dir
+      }))
+      @site.process
+      @test_css_file = dest_dir("css/main.css")
+    end
+
+    should "import SCSS partial" do
+      assert_equal ".half {\n  width: 50%; }\n", File.read(@test_css_file)
+    end
+  end
+end

data/test/test_site.rb

@@ -154,9 +154,12 @@ class TestSite < Test::Unit::TestCase
       assert_equal @site.generators.sort_by(&:class).map{|g|g.class.priority}, @site.generators.map{|g|g.class.priority}
     end
 
-    should "read layouts" do
-      @site.read_layouts
-      assert_equal ["default", "simple", "post/simple"].sort, @site.layouts.keys.sort
+    should "sort pages alphabetically" do
+      stub.proxy(Dir).entries { |entries| entries.reverse }
+      @site.process
+      # files in symlinked directories may appear twice
+      sorted_pages = %w(.htaccess about.html bar.html coffeescript.coffee contacts.html deal.with.dots.html foo.md index.html index.html main.scss main.scss properties.html sitemap.xml symlinked-file)
+      assert_equal sorted_pages, @site.pages.map(&:name)
     end
 
     should "read posts" do
@@ -176,7 +179,7 @@ class TestSite < Test::Unit::TestCase
 
       assert_equal posts.size - @num_invalid_posts, @site.posts.size
       assert_equal categories, @site.categories.keys.sort
-      assert_equal 4, @site.categories['foo'].size
+      assert_equal 5, @site.categories['foo'].size
     end
 
     context 'error handling' do
@@ -255,6 +258,52 @@ class TestSite < Test::Unit::TestCase
       end
     end
 
+    context 'using a non-default markdown processor in the configuration' do
+      should 'use the non-default markdown processor' do
+        class Jekyll::Converters::Markdown::CustomMarkdown
+          def initialize(*args)
+            @args = args
+          end
+
+          def convert(*args)
+            ""
+          end
+        end
+
+        custom_processor = "CustomMarkdown"
+        s = Site.new(Jekyll.configuration.merge({ 'markdown' => custom_processor }))
+        assert_nothing_raised do
+          s.process
+        end
+
+        # Do some cleanup, we don't like straggling stuff's.
+        Jekyll::Converters::Markdown.send(:remove_const, :CustomMarkdown)
+      end
+
+      should 'ignore, if there are any bad characters in the class name' do
+        module Jekyll::Converters::Markdown::Custom
+          class Markdown
+            def initialize(*args)
+              @args = args
+            end
+
+            def convert(*args)
+              ""
+            end
+          end
+        end
+
+        bad_processor = "Custom::Markdown"
+        s = Site.new(Jekyll.configuration.merge({ 'markdown' => bad_processor }))
+        assert_raise Jekyll::FatalException do
+          s.process
+        end
+
+        # Do some cleanup, we don't like straggling stuff's.
+        Jekyll::Converters::Markdown.send(:remove_const, :Custom)
+      end
+    end
+
     context 'with an invalid markdown processor in the configuration' do
       should 'not throw an error at initialization time' do
         bad_processor = 'not a processor name'
@@ -277,7 +326,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
@@ -287,7 +336,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
@@ -297,7 +346,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

data/test/test_tags.rb

@@ -6,7 +6,7 @@ class TestTags < Test::Unit::TestCase
 
   def create_post(content, override = {}, converter_class = Jekyll::Converters::Markdown)
     stub(Jekyll).configuration do
-      Jekyll::Configuration::DEFAULTS.deep_merge({'pygments' => true}).deep_merge(override)
+      Jekyll::Configuration::DEFAULTS.deep_merge({'highlighter' => 'pygments'}).deep_merge(override)
     end
     site = Site.new(Jekyll.configuration)
 
@@ -16,8 +16,8 @@ class TestTags < Test::Unit::TestCase
 
     info = { :filters => [Jekyll::Filters], :registers => { :site => site } }
     @converter = site.converters.find { |c| c.class == converter_class }
-    payload = { "pygments_prefix" => @converter.pygments_prefix,
-                "pygments_suffix" => @converter.pygments_suffix }
+    payload = { "highlighter_prefix" => @converter.highlighter_prefix,
+                "highlighter_suffix" => @converter.highlighter_suffix }
 
     @result = Liquid::Template.parse(content).render!(payload, info)
     @result = @converter.convert(@result)
@@ -54,7 +54,7 @@ CONTENT
   end
 
   context "initialized tag" do
-    should "work" do
+    should "set the correct options" do
       tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby ', ["test", "{% endhighlight %}", "\n"])
       assert_equal({}, tag.instance_variable_get(:@options))
 
@@ -85,11 +85,11 @@ CONTENT
     end
 
     should "render markdown with pygments" do
-      assert_match %{<pre><code class='text'>test\n</code></pre>}, @result
+      assert_match %{<pre><code class="text">test\n</code></pre>}, @result
     end
 
     should "render markdown with pygments with line numbers" do
-      assert_match %{<pre><code class='text'><span class='lineno'>1</span> test\n</code></pre>}, @result
+      assert_match %{<pre><code class="text"><span class="lineno">1</span> test\n</code></pre>}, @result
     end
   end
 
@@ -99,7 +99,7 @@ CONTENT
     end
 
     should "not embed the file" do
-      assert_match %{<pre><code class='text'>./jekyll.gemspec\n</code></pre>}, @result
+      assert_match %{<pre><code class="text">./jekyll.gemspec\n</code></pre>}, @result
     end
   end
 
@@ -109,7 +109,7 @@ CONTENT
     end
 
     should "render markdown with pygments line handling" do
-      assert_match %{<pre><code class='text'>Æ\n</code></pre>}, @result
+      assert_match %{<pre><code class="text">Æ\n</code></pre>}, @result
     end
   end
 
@@ -237,6 +237,22 @@ CONTENT
     end
   end
 
+  context "simple page with invalid post name linking" do
+    should "cause an error" do
+      content = <<CONTENT
+---
+title: Invalid post name linking
+---
+
+{% post_url abc2008-11-21-complex %}
+CONTENT
+
+      assert_raise ArgumentError do
+        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+      end
+    end
+  end
+
   context "gist tag" do
     context "simple" do
       setup do
@@ -252,7 +268,7 @@ CONTENT
       end
 
       should "write script tag" do
-        assert_match "<script src='https://gist.github.com/#{@gist}.js'><![CDATA[\s]]></script>", @result
+        assert_match "<script src=\"https://gist.github.com/#{@gist}.js\">\s</script>", @result
       end
     end
 
@@ -272,7 +288,7 @@ CONTENT
         end
 
         should "write script tag with specific file in gist" do
-          assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'><![CDATA[\s]]></script>", @result
+          assert_match "<script src=\"https://gist.github.com/#{@gist}.js?file=#{@filename}\">\s</script>", @result
         end
       end
 
@@ -308,7 +324,7 @@ CONTENT
       end
 
       should "write script tag with specific file in gist" do
-        assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'><![CDATA[\s]]></script>", @result
+        assert_match "<script src=\"https://gist.github.com/#{@gist}.js?file=#{@filename}\">\s</script>", @result
       end
     end
 
@@ -347,41 +363,6 @@ CONTENT
   end
 
   context "include tag with parameters" do
-
-    context "with symlink'd include" do
-
-      should "not allow symlink includes" do
-        File.open("/tmp/pages-test", 'w') { |file| file.write("SYMLINK TEST") }
-        assert_raise IOError do
-          content = <<CONTENT
----
-title: Include symlink
----
-
-{% include tmp/pages-test %}
-
-CONTENT
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true, 'safe' => true })
-        end
-        assert_no_match /SYMLINK TEST/, @result
-      end
-
-      should "not expose the existence of symlinked files" do
-        ex = assert_raise IOError do
-          content = <<CONTENT
----
-title: Include symlink
----
-
-{% include tmp/pages-test-does-not-exist %}
-
-CONTENT
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true, 'safe' => true })
-        end
-        assert_match /should exist and should not be a symlink/, ex.message
-      end
-    end
-
     context "with one parameter" do
       setup do
         content = <<CONTENT
@@ -397,11 +378,11 @@ CONTENT
       end
 
       should "correctly output include variable" do
-        assert_match "<span id='include-param'>value</span>", @result.strip
+        assert_match "<span id=\"include-param\">value</span>", @result.strip
       end
 
       should "ignore parameters if unused" do
-        assert_match "<hr />\n<p>Tom Preston-Werner github.com/mojombo</p>\n", @result
+        assert_match "<hr />\n<p>Tom Preston-Werner\ngithub.com/mojombo</p>\n", @result
       end
     end
 
@@ -449,7 +430,7 @@ CONTENT
       end
 
       should "not include previously used parameters" do
-        assert_match "<span id='include-param' />", @result
+        assert_match "<span id=\"include-param\"></span>", @result
       end
     end
 
@@ -466,7 +447,7 @@ CONTENT
       end
 
       should "include file with empty parameters" do
-        assert_match "<span id='include-param' />", @result
+        assert_match "<span id=\"include-param\"></span>", @result
       end
     end
 
@@ -483,7 +464,77 @@ CONTENT
       end
 
       should "include file with empty parameters within if statement" do
-        assert_match "<span id='include-param' />", @result
+        assert_match "<span id=\"include-param\"></span>", @result
+      end
+    end
+
+    context "with fenced code blocks with backticks" do
+
+      setup do
+        content = <<CONTENT
+```ruby
+puts "Hello world"
+```
+CONTENT
+        create_post(content, {
+          'markdown' => 'maruku',
+          'maruku' => {'fenced_code_blocks' => true}}
+        )
+      end
+
+      # todo: if #112 is merged into maruku, update to remove the newlines inside code block
+      should "render fenced code blocks" do
+        assert_match %r{<pre class=\"ruby\"><code class=\"ruby\">\nputs &quot;Hello world&quot;\n</code></pre>}, @result.strip
+      end
+    end
+
+    context "include missing file" do
+      setup do
+        @content = <<CONTENT
+---
+title: missing file
+---
+
+{% include missing.html %}
+CONTENT
+      end
+
+      should "raise error relative to source directory" do
+        exception = assert_raise IOError do
+          create_post(@content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+        end
+        assert_equal 'Included file \'_includes/missing.html\' not found', exception.message
+      end
+    end
+
+    context "include tag with variable and liquid filters" do
+      setup do
+        stub(Jekyll).configuration do
+          Jekyll::Configuration::DEFAULTS.deep_merge({'pygments' => true}).deep_merge({'source' => source_dir, 'destination' => dest_dir})
+        end
+
+        site = Site.new(Jekyll.configuration)
+        post = Post.new(site, source_dir, '', "2013-12-17-include-variable-filters.markdown")
+        layouts = { "default" => Layout.new(site, source_dir('_layouts'), "simple.html")}
+        post.render(layouts, {"site" => {"posts" => []}})
+        @content = post.content
+      end
+
+      should "include file as variable with liquid filters" do
+        assert_match %r{1 included}, @content
+        assert_match %r{2 included}, @content
+        assert_match %r{3 included}, @content
+      end
+
+      should "include file as variable and liquid filters with arbitrary whitespace" do
+        assert_match %r{4 included}, @content
+        assert_match %r{5 included}, @content
+        assert_match %r{6 included}, @content
+      end
+
+      should "include file as variable and filters with additional parameters" do
+        assert_match '<li>var1 = foo</li>', @content
+        assert_match '<li>var2 = bar</li>', @content
       end
     end
   end