jekyll 1.5.1 → 2.0.0.alpha.1

data/test/test_convertible.rb

@@ -36,16 +36,14 @@ class TestConvertible < Test::Unit::TestCase
       assert_no_match /undefined class\/module DoesNotExist/, out
     end
 
-    if RUBY_VERSION >= '1.9.2'
-      should "not parse if there is encoding error in file" do
-        name = 'broken_front_matter3.erb'
-        out = capture_stdout do
-          ret = @convertible.read_yaml(@base, name, :encoding => 'utf-8')
-          assert_equal({}, ret)
-        end
-        assert_match(/invalid byte sequence in UTF-8/, out)
-        assert_match(/#{File.join(@base, name)}/, out)
+    should "not parse if there is encoding error in file" do
+      name = 'broken_front_matter3.erb'
+      out = capture_stdout do
+        ret = @convertible.read_yaml(@base, name, :encoding => 'utf-8')
+        assert_equal({}, ret)
       end
+      assert_match(/invalid byte sequence in UTF-8/, out)
+      assert_match(/#{File.join(@base, name)}/, out)
     end
   end
 end

data/test/test_core_ext.rb

@@ -63,26 +63,4 @@ class TestCoreExt < Test::Unit::TestCase
     end
 
   end
-
-  context "enumerable" do
-    context "glob_include?" do
-      should "return false with no glob patterns" do
-        assert ![].glob_include?("a.txt")
-      end
-
-      should "return false with all not match path" do
-        data = ["a*", "b?"]
-        assert !data.glob_include?("ca.txt")
-        assert !data.glob_include?("ba.txt")
-      end
-
-      should "return true with match path" do
-        data = ["a*", "b?", "**/a*"]
-        assert data.glob_include?("a.txt")
-        assert data.glob_include?("ba")
-        assert data.glob_include?("c/a/a.txt")
-        assert data.glob_include?("c/a/b/a.txt")
-      end
-    end
-  end
 end

data/test/test_entry_filter.rb

@@ -18,8 +18,8 @@ class TestEntryFilter < Test::Unit::TestCase
     end
 
     should "filter entries with exclude" do
-      excludes = %w[README TODO]
-      files = %w[index.html site.css .htaccess]
+      excludes = %w[README TODO vendor/bundle]
+      files = %w[index.html site.css .htaccess vendor]
 
       @site.exclude = excludes + ["exclude*"]
       assert_equal files, @site.filter_entries(excludes + files + ["excludeA"])
@@ -71,4 +71,38 @@ class TestEntryFilter < Test::Unit::TestCase
       assert_not_equal [], site.static_files
     end
   end
+
+  context "#glob_include?" do
+    setup do
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+      end
+      @site = Site.new(Jekyll.configuration)
+      @filter = EntryFilter.new(@site)
+    end
+
+    should "return false with no glob patterns" do
+      assert !@filter.glob_include?([], "a.txt")
+    end
+
+    should "return false with all not match path" do
+      data = ["a*", "b?"]
+      assert !@filter.glob_include?(data, "ca.txt")
+      assert !@filter.glob_include?(data, "ba.txt")
+    end
+
+    should "return true with match path" do
+      data = ["a*", "b?", "**/a*"]
+      assert @filter.glob_include?(data, "a.txt")
+      assert @filter.glob_include?(data, "ba")
+      assert @filter.glob_include?(data, "c/a/a.txt")
+      assert @filter.glob_include?(data, "c/a/b/a.txt")
+    end
+
+    should "match even if there is no leading slash" do
+      data = ['vendor/bundle']
+      assert @filter.glob_include?(data, '/vendor/bundle')
+      assert @filter.glob_include?(data, 'vendor/bundle')
+    end
+  end
 end

data/test/test_excerpt.rb

@@ -35,6 +35,48 @@ class TestExcerpt < Test::Unit::TestCase
       @excerpt = @post.send :extract_excerpt
     end
 
+    context "#include(string)" do
+      
+      setup do
+        @excerpt.output = "Here is a fake output stub"
+      end
+
+      should "return true only if an excerpt output contains a specified string" do
+        assert @excerpt.include?("fake output")
+        refute @excerpt.include?("real output")
+      end
+    end
+
+    context "#id" do
+      should "contain the UID for the post" do
+        assert_equal @excerpt.id, "#{@post.id}/#excerpt"
+      end
+      should "return a string" do
+        assert_same @post.id.class, String
+      end
+    end
+
+    context "#to_s" do
+      should "return its content if no output present" do
+        assert_equal @excerpt.content, @excerpt.to_s
+      end
+
+      should "return its output if output present" do  
+        @excerpt.output = "Fake Output"
+        assert_equal @excerpt.output, @excerpt.to_s
+      end
+    end
+
+    context "#inspect" do
+      should "contain the excerpt id as a shorthand string identifier" do
+        assert_equal @excerpt.inspect, "<Excerpt: #{@excerpt.id}>"
+      end
+
+      should "return a string" do
+        assert_same @post.id.class, String
+      end
+    end
+
     context "#to_liquid" do
       should "contain the proper page data to mimick the post liquid" do
         assert_equal "Post Excerpt with Layout", @excerpt.to_liquid["title"]
@@ -66,7 +108,7 @@ class TestExcerpt < Test::Unit::TestCase
         end
 
         should "be the first paragraph of the page" do
-          assert_equal "<p>First paragraph with <a href=\"http://www.jekyllrb.com/\">link ref</a>.</p>", @extracted_excerpt.content
+          assert_equal "<p>First paragraph with <a href=\"http://www.jekyllrb.com/\">link ref</a>.</p>\n\n", @extracted_excerpt.content
         end
 
         should "link properly" do

data/test/test_filters.rb

@@ -3,18 +3,24 @@ require 'helper'
 class TestFilters < Test::Unit::TestCase
   class JekyllFilter
     include Jekyll::Filters
+    attr_accessor :site, :context
 
-    def initialize
-      site = Jekyll::Site.new(Jekyll.configuration({}))
-      @context = Liquid::Context.new({}, {}, { :site => site })
+    def initialize(opts = {})
+      @site = Jekyll::Site.new(Jekyll.configuration(opts))
+      @context = Liquid::Context.new({}, {}, { :site => @site })
     end
   end
 
   context "filters" do
     setup do
-      @filter = JekyllFilter.new
+      @filter = JekyllFilter.new({"source" => source_dir, "destination" => dest_dir})
       @sample_time = Time.utc(2013, 03, 27, 11, 22, 33)
       @time_as_string = "September 11, 2001 12:46:30 -0000"
+      @array_of_objects = [
+        { "color" => "red",  "size" => "large"  },
+        { "color" => "red",  "size" => "medium" },
+        { "color" => "blue", "size" => "medium" }
+      ]
     end
 
     should "textilize with simple string" do
@@ -22,7 +28,7 @@ class TestFilters < Test::Unit::TestCase
     end
 
     should "markdownify with simple string" do
-      assert_equal "<p>something <strong>really</strong> simple</p>", @filter.markdownify("something **really** simple")
+      assert_equal "<p>something <strong>really</strong> simple</p>\n", @filter.markdownify("something **really** simple")
     end
 
     should "convert array to sentence string with no args" do
@@ -109,5 +115,38 @@ class TestFilters < Test::Unit::TestCase
         assert_equal "[{\"name\":\"Jack\"},{\"name\":\"Smith\"}]", @filter.jsonify([{:name => 'Jack'}, {:name => 'Smith'}])
       end
     end
+
+    context "group_by filter" do
+      should "successfully group array of Jekyll::Page's" do
+        @filter.site.process
+        grouping = @filter.group_by(@filter.site.pages, "layout")
+        grouping.each do |g|
+          assert ["default", "nil", ""].include?(g["name"]), "#{g['name']} isn't a valid grouping."
+          case g["name"]
+          when "default"
+            assert g["items"].is_a?(Array), "The list of grouped items for 'default' is not an Array."
+            assert_equal 4, g["items"].size
+          when "nil"
+            assert g["items"].is_a?(Array), "The list of grouped items for 'nil' is not an Array."
+            assert_equal 2, g["items"].size
+          when ""
+            assert g["items"].is_a?(Array), "The list of grouped items for '' is not an Array."
+            assert_equal 8, g["items"].size
+          end
+        end
+      end
+    end
+
+    context "where filter" do
+      should "return any input that is not an array" do
+        assert_equal Hash.new, @filter.where(Hash.new, nil, nil)
+        assert_equal "some string", @filter.where("some string", "la", "le")
+      end
+
+      should "filter objects appropriately" do
+        assert_equal 2, @filter.where(@array_of_objects, "color", "red").length
+      end
+    end
+
   end
 end

data/test/test_generated_site.rb

@@ -14,7 +14,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "ensure post count is as expected" do
-      assert_equal 37, @site.posts.size
+      assert_equal 38, @site.posts.size
     end
 
     should "insert site.posts into the index" do
@@ -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

data/test/test_layout_reader.rb

@@ -0,0 +1,17 @@
+require 'helper'
+
+class TestLayoutReader < Test::Unit::TestCase
+  context "reading layouts" 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 "read layouts" do
+      layouts = LayoutReader.new(@site).read
+      assert_equal ["default", "simple", "post/simple"].sort, layouts.keys.sort
+    end
+  end
+end

data/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')
@@ -47,6 +52,29 @@ class TestPage < Test::Unit::TestCase
         assert_equal "deal.with.dots", @page.basename
       end
 
+      should "make properties accessible through #[]" do
+        page = setup_page('properties.html')
+        attrs = {
+          content: "All the properties.\n",
+          dir: "/properties/",
+          excerpt: nil,
+          foo: 'bar',
+          layout: 'default',
+          name: "properties.html",
+          path: "properties.html",
+          permalink: '/properties/',
+          published: nil,
+          title: 'Properties Page',
+          url: "/properties/"
+        }
+
+        attrs.each do |attr, val|
+          attr_str = attr.to_s
+          result = page[attr_str]
+          assert_equal val, result, "For <page[\"#{attr_str}\"]>:"
+        end
+      end
+
       context "with pretty url style" do
         setup do
           @site.permalink_style = :pretty
@@ -101,16 +129,6 @@ class TestPage < Test::Unit::TestCase
         assert_equal @page.permalink, @page.url
         assert_equal "/about/", @page.dir
       end
-
-      should "not be writable outside of destination" do
-        unexpected = File.expand_path("../../../baddie.html", dest_dir)
-        File.delete unexpected if File.exist?(unexpected)
-        page = setup_page("exploit.md")
-        do_render(page)
-        page.write(dest_dir)
-
-        assert !File.exist?(unexpected)
-      end
     end
 
     context "with specified layout of nil" do

data/test/test_post.rb

@@ -25,6 +25,34 @@ class TestPost < Test::Unit::TestCase
       assert !Post.valid?("blah")
     end
 
+    should "make properties accessible through #[]" do
+      post = setup_post('2013-12-20-properties.text')
+
+      attrs = {
+        categories: %w(foo bar baz),
+        content: "All the properties.\n\nPlus an excerpt.\n",
+        date: Time.new(2013, 12, 20),
+        dir: "/foo/bar/baz/2013/12/20",
+        excerpt: "All the properties.\n\n",
+        foo: 'bar',
+        id: "/foo/bar/baz/2013/12/20/properties",
+        layout: 'default',
+        name: nil,
+        # path: "properties.html",
+        permalink: nil,
+        published: nil,
+        tags: %w(ay bee cee),
+        title: 'Properties Post',
+        url: "/foo/bar/baz/2013/12/20/properties.html"
+      }
+
+      attrs.each do |attr, val|
+        attr_str = attr.to_s
+        result = post[attr_str]
+        assert_equal val, result, "For <post[\"#{attr_str}\"]>:"
+      end
+    end
+
     context "processing posts" do
       setup do
         @post = Post.allocate
@@ -75,17 +103,6 @@ class TestPost < Test::Unit::TestCase
         assert_equal "/my_category/permalinked-post", @post.url
       end
 
-      should "not be writable outside of destination" do
-        unexpected = File.expand_path("../../../baddie.html", dest_dir)
-        File.delete unexpected if File.exist?(unexpected)
-        post = setup_post("2014-01-06-permalink-traversal.md")
-        do_render(post)
-        post.write(dest_dir)
-
-        assert !File.exist?(unexpected)
-        assert File.exist?(File.expand_path("baddie.html", dest_dir))
-      end
-
       context "with CRLF linebreaks" do
         setup do
           @real_file = "2009-05-24-yaml-linebreak.markdown"
@@ -295,7 +312,7 @@ class TestPost < Test::Unit::TestCase
         end
 
         should "return rendered HTML" do
-          assert_equal "<p>First paragraph with <a href=\"http://www.jekyllrb.com/\">link ref</a>.</p>",
+          assert_equal "<p>First paragraph with <a href=\"http://www.jekyllrb.com/\">link ref</a>.</p>\n\n",
                        @post.excerpt
         end
 
@@ -370,12 +387,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
@@ -515,7 +532,7 @@ class TestPost < Test::Unit::TestCase
           post.site.source = File.join(File.dirname(__FILE__), 'source')
           do_render(post)
 
-          assert_equal "<<< <hr />\n<p>Tom Preston-Werner github.com/mojombo</p>\n\n<p>This <em>is</em> cool</p> >>>", post.output
+          assert_equal "<<< <hr />\n<p>Tom Preston-Werner\ngithub.com/mojombo</p>\n\n<p>This <em>is</em> cool</p>\n >>>", post.output
         end
 
         should "render date specified in front matter properly" do

data/test/test_redcarpet.rb

@@ -28,7 +28,7 @@ class TestRedcarpet < Test::Unit::TestCase
 
     context "with pygments enabled" do
       setup do
-        @markdown = Converters::Markdown.new @config.merge({ 'pygments' => true })
+        @markdown = Converters::Markdown.new @config.merge({ 'highlighter' => 'pygments' })
       end
 
       should "render fenced code blocks with syntax highlighting" do
@@ -42,9 +42,25 @@ puts "Hello world"
       end
     end
 
-    context "with pygments disabled" do
+    context "with rouge enabled" do
       setup do
-        @markdown = Converters::Markdown.new @config.merge({ 'pygments' => false })
+        @markdown = Converters::Markdown.new @config.merge({ 'highlighter' => 'rouge' })
+      end
+
+      should "render fenced code blocks with syntax highlighting" do
+        assert_equal "<div class=\"highlight\"><pre><code class=\"ruby language-ruby\" data-lang=\"ruby\"><span class=\"nb\">puts</span> <span class=\"s2\">\"Hello world\"</span>\n</code></pre></div>", @markdown.convert(
+          <<-EOS
+```ruby
+puts "Hello world"
+```
+          EOS
+        ).strip
+      end
+    end
+
+    context "without any highlighter" do
+      setup do
+        @markdown = Converters::Markdown.new @config.merge({ 'highlighter' => nil })
       end
 
       should "render fenced code blocks without syntax highlighting" do