jekyll 2.0.3 → 2.1.0

data/test/test_excerpt.rb

@@ -86,6 +86,17 @@ class TestExcerpt < Test::Unit::TestCase
         assert_equal %w[first second third jekyllrb.com], @excerpt.to_liquid["tags"]
         assert_equal "_posts/2013-07-22-post-excerpt-with-layout.markdown", @excerpt.to_liquid["path"]
       end
+
+      should "consider inheritance" do
+        klass = Class.new(Jekyll::Post)
+        assert_gets_called = false
+        klass.send(:define_method, :assert_gets_called) { assert_gets_called = true }
+        klass.const_set(:EXCERPT_ATTRIBUTES_FOR_LIQUID, Jekyll::Post::EXCERPT_ATTRIBUTES_FOR_LIQUID + ['assert_gets_called'])
+        post = klass.new(@site, source_dir, '', "2008-02-02-published.textile")
+        Jekyll::Excerpt.new(post).to_liquid
+
+        assert assert_gets_called, 'assert_gets_called did not get called on post.'
+      end
     end
 
     context "#content" do

data/test/test_filters.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'helper'
 
 class TestFilters < Test::Unit::TestCase
@@ -13,9 +15,10 @@ class TestFilters < Test::Unit::TestCase
 
   context "filters" do
     setup do
-      @filter = JekyllFilter.new({"source" => source_dir, "destination" => dest_dir})
+      @filter = JekyllFilter.new({"source" => source_dir, "destination" => dest_dir, "timezone" => "UTC"})
       @sample_time = Time.utc(2013, 03, 27, 11, 22, 33)
       @time_as_string = "September 11, 2001 12:46:30 -0000"
+      @time_as_numeric = 1399680607
       @array_of_objects = [
         { "color" => "red",  "size" => "large"  },
         { "color" => "red",  "size" => "medium" },
@@ -86,6 +89,24 @@ class TestFilters < Test::Unit::TestCase
           assert_equal "Tue, 11 Sep 2001 12:46:30 -0000", @filter.date_to_rfc822(@time_as_string)
         end
       end
+
+      context "with a Numeric object" do
+        should "format a date with short format" do
+          assert_equal "10 May 2014", @filter.date_to_string(@time_as_numeric)
+        end
+
+        should "format a date with long format" do
+          assert_equal "10 May 2014", @filter.date_to_long_string(@time_as_numeric)
+        end
+
+        should "format a time with xmlschema" do
+          assert_match /2014-05-10T00:10:07/, @filter.date_to_xmlschema(@time_as_numeric)
+        end
+
+        should "format a time according to RFC-822" do
+          assert_equal "Sat, 10 May 2014 00:10:07 +0000", @filter.date_to_rfc822(@time_as_numeric)
+        end
+      end
     end
 
     should "escape xml with ampersands" do
@@ -135,7 +156,7 @@ class TestFilters < Test::Unit::TestCase
             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 10, g["items"].size
+            assert_equal 11, g["items"].size
           end
         end
       end
@@ -161,6 +182,11 @@ class TestFilters < Test::Unit::TestCase
         assert_equal [{"a" => "10"}, {"a" => "2"}], @filter.sort([{"a" => "10"}, {"a" => "2"}], "a")
         assert_equal ["FOO", "Foo", "foo"], @filter.sort(["foo", "Foo", "FOO"])
         assert_equal ["_foo", "foo", "foo_"], @filter.sort(["foo_", "_foo", "foo"])
+        # Cyrillic
+        assert_equal ["ВУЗ", "Вуз", "вуз"], @filter.sort(["Вуз", "вуз", "ВУЗ"])
+        assert_equal ["_вуз", "вуз", "вуз_"], @filter.sort(["вуз_", "_вуз", "вуз"])
+        # Hebrew
+        assert_equal ["אלף", "בית"], @filter.sort(["בית", "אלף"])
       end
       should "return sorted by property array" do
         assert_equal [{"a" => 1}, {"a" => 2}, {"a" => 3}, {"a" => 4}],

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 41, @site.posts.size
+      assert_equal 42, @site.posts.size
     end
 
     should "insert site.posts into the index" do

data/test/test_log_adapter.rb

@@ -0,0 +1,59 @@
+require 'helper'
+
+class TestLogAdapter < Test::Unit::TestCase
+  class LoggerDouble
+    attr_accessor :level
+  end
+
+  context "#log_level=" do
+    should "set the writers logging level" do
+      subject = Jekyll::LogAdapter.new(LoggerDouble.new)
+      subject.log_level = :error
+      assert_equal Jekyll::LogAdapter::LOG_LEVELS[:error], subject.writer.level
+    end
+  end
+
+  context "#debug" do
+    should "call #debug on writer return true" do
+      writer = LoggerDouble.new
+      logger = Jekyll::LogAdapter.new(writer)
+      stub(writer).debug('topic '.rjust(20) + 'log message') { true }
+      assert logger.debug('topic', 'log message')
+    end
+  end
+
+  context "#info" do
+    should "call #info on writer return true" do
+      writer = LoggerDouble.new
+      logger = Jekyll::LogAdapter.new(writer)
+      stub(writer).info('topic '.rjust(20) + 'log message') { true }
+      assert logger.info('topic', 'log message')
+    end
+  end
+
+  context "#warn" do
+    should "call #warn on writer return true" do
+      writer = LoggerDouble.new
+      logger = Jekyll::LogAdapter.new(writer)
+      stub(writer).warn('topic '.rjust(20) + 'log message') { true }
+      assert logger.warn('topic', 'log message')
+    end
+  end
+
+  context "#error" do
+    should "call #error on writer return true" do
+      writer = LoggerDouble.new
+      logger = Jekyll::LogAdapter.new(writer)
+      stub(writer).error('topic '.rjust(20) + 'log message') { true }
+      assert logger.error('topic', 'log message')
+    end
+  end
+
+  context "#abort_with" do
+    should "call #error and abort" do
+      logger = Jekyll::LogAdapter.new(LoggerDouble.new)
+      stub(logger).error('topic', 'log message') { true }
+      assert_raise(SystemExit) { logger.abort_with('topic', 'log message') }
+    end
+  end
+end

data/test/test_post.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'helper'
 
 class TestPost < Test::Unit::TestCase
@@ -100,6 +102,14 @@ class TestPost < Test::Unit::TestCase
         assert_equal "/2014/03/22/escape-+ %20[]", @post.id
       end
 
+      should "return a UTF-8 escaped string" do
+        assert_equal Encoding::UTF_8, URL.escape_path("/rails笔记/2014/04/20/escaped/").encoding
+      end
+
+      should "return a UTF-8 unescaped string" do
+        assert_equal Encoding::UTF_8, URL.unescape_path("/rails%E7%AC%94%E8%AE%B0/2014/04/20/escaped/".encode(Encoding::ASCII)).encoding
+      end
+
       should "respect permalink in yaml front matter" do
         file = "2008-12-03-permalinked-post.textile"
         @post.process(file)
@@ -450,6 +460,17 @@ class TestPost < Test::Unit::TestCase
         assert_equal Time, post.to_liquid["date"].class
       end
 
+      should "to_liquid should consider inheritance" do
+        klass = Class.new(Jekyll::Post)
+        assert_gets_called = false
+        klass.send(:define_method, :assert_gets_called) { assert_gets_called = true }
+        klass.const_set(:EXCERPT_ATTRIBUTES_FOR_LIQUID, Jekyll::Post::EXCERPT_ATTRIBUTES_FOR_LIQUID + ['assert_gets_called'])
+        post = klass.new(@site, source_dir, '', "2008-02-02-published.textile")
+        do_render(post)
+
+        assert assert_gets_called, 'assert_gets_called did not get called on post.'
+      end
+
       should "recognize category in yaml" do
         post = setup_post("2009-01-27-category.textile")
         assert post.categories.include?('foo')
@@ -646,4 +667,60 @@ class TestPost < Test::Unit::TestCase
 
   end
 
+  context "site config with category" do
+    setup do
+      config = Jekyll::Configuration::DEFAULTS.merge({
+        'defaults' => [
+          'scope' => {
+            'path' => ''
+          },
+          'values' => {
+            'category' => 'article'
+          }
+        ]
+      })
+      @site = Site.new(config)
+    end
+
+    should "return category if post does not specify category" do
+      post = setup_post("2009-01-27-no-category.textile")
+      assert post.categories.include?('article'), "Expected post.categories to include 'article' but did not."
+    end
+
+    should "override site category if set on post" do
+      post = setup_post("2009-01-27-category.textile")
+      assert post.categories.include?('foo'), "Expected post.categories to include 'foo' but did not."
+      assert !post.categories.include?('article'), "Did not expect post.categories to include 'article' but it did."
+    end
+  end
+
+  context "site config with categories" do
+    setup do
+      config = Jekyll::Configuration::DEFAULTS.merge({
+        'defaults' => [
+          'scope' => {
+            'path' => ''
+          },
+          'values' => {
+            'categories' => ['article']
+          }
+        ]
+      })
+      @site = Site.new(config)
+    end
+
+    should "return categories if post does not specify categories" do
+      post = setup_post("2009-01-27-no-category.textile")
+      assert post.categories.include?('article'), "Expected post.categories to include 'article' but did not."
+    end
+
+    should "override site categories if set on post" do
+      post = setup_post("2009-01-27-categories.textile")
+      ['foo', 'bar', 'baz'].each do |category|
+        assert post.categories.include?(category), "Expected post.categories to include '#{category}' but did not."
+      end
+      assert !post.categories.include?('article'), "Did not expect post.categories to include 'article' but it did."
+    end
+  end
+
 end

data/test/test_site.rb

@@ -166,6 +166,7 @@ class TestSite < Test::Unit::TestCase
         coffeescript.coffee
         contacts.html
         deal.with.dots.html
+        environment.html
         exploit.md
         foo.md
         index.html
@@ -378,6 +379,26 @@ class TestSite < Test::Unit::TestCase
         assert_equal site.site_payload['site']['data']['languages'], file_content
       end
 
+      should 'auto load json files' do
+        site = Site.new(Jekyll.configuration)
+        site.process
+
+        file_content = SafeYAML.load_file(File.join(source_dir, '_data', 'members.json'))
+
+        assert_equal site.data['members'], file_content
+        assert_equal site.site_payload['site']['data']['members'], file_content
+      end
+
+      should 'auto load yaml files in subdirectory' do
+        site = Site.new(Jekyll.configuration)
+        site.process
+
+        file_content = SafeYAML.load_file(File.join(source_dir, '_data', 'categories', 'dairy.yaml'))
+
+        assert_equal site.data['categories']['dairy'], file_content
+        assert_equal site.site_payload['site']['data']['categories']['dairy'], file_content
+      end
+
       should "load symlink files in unsafe mode" do
         site = Site.new(Jekyll.configuration.merge({'safe' => false}))
         site.process
@@ -397,5 +418,35 @@ class TestSite < Test::Unit::TestCase
       end
 
     end
+
+    context "manipulating the Jekyll environment" do
+      setup do
+        @site = Site.new(site_configuration)
+        @site.process
+        @page = @site.pages.find { |p| p.name == "environment.html" }
+      end
+
+      should "default to 'development'" do
+        assert_equal "development", @page.content.strip
+      end
+
+      context "in production" do
+        setup do
+          ENV["JEKYLL_ENV"] = "production"
+          @site = Site.new(site_configuration)
+          @site.process
+          @page = @site.pages.find { |p| p.name == "environment.html" }
+        end
+
+        teardown do
+          ENV.delete("JEKYLL_ENV")
+        end
+
+        should "be overridden by JEKYLL_ENV" do
+          assert_equal "production", @page.content.strip
+        end
+      end
+    end
+
   end
 end

data/test/test_tags.rb

@@ -75,7 +75,13 @@ CONTENT
 
       tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl', ["test", "{% endhighlight %}", "\n"])
       assert_equal({ :cssclass => 'hl', :linenos => 'table' }, tag.instance_variable_get(:@options))
-
+      
+      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl hl_linenos=3', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => '3' }, tag.instance_variable_get(:@options))
+      
+      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl hl_linenos="3 5 6"', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({ :cssclass => 'hl', :linenos => 'table', :hl_linenos => ['3', '5', '6'] }, tag.instance_variable_get(:@options))
+      
       tag = Jekyll::Tags::HighlightBlock.new('highlight', 'Ruby ', ["test", "{% endhighlight %}", "\n"])
       assert_equal "ruby", tag.instance_variable_get(:@lang), "lexers should be case insensitive"
     end
@@ -91,11 +97,11 @@ CONTENT
     end
 
     should "render markdown with pygments" do
-      assert_match %{<pre><code class="text">test</code></pre>}, @result
+      assert_match %{<pre><code class="language-text" data-lang="text">test</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</code></pre>}, @result
+      assert_match %{<pre><code class="language-text" data-lang="text"><span class="lineno">1</span> test</code></pre>}, @result
     end
   end
 
@@ -105,7 +111,7 @@ CONTENT
     end
 
     should "not embed the file" do
-      assert_match %{<pre><code class="text">./jekyll.gemspec</code></pre>}, @result
+      assert_match %{<pre><code class="language-text" data-lang="text">./jekyll.gemspec</code></pre>}, @result
     end
   end
 
@@ -115,7 +121,7 @@ CONTENT
     end
 
     should "render markdown with pygments line handling" do
-      assert_match %{<pre><code class="text">Æ</code></pre>}, @result
+      assert_match %{<pre><code class="language-text" data-lang="text">Æ</code></pre>}, @result
     end
   end
 
@@ -259,115 +265,6 @@ CONTENT
     end
   end
 
-  context "gist tag" do
-    context "simple" do
-      setup do
-        @gist = 358471
-        content = <<CONTENT
----
-title: My Cool Gist
----
-
-{% gist #{@gist} %}
-CONTENT
-        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
-      end
-
-      should "write script tag" do
-        assert_match "<script src=\"https://gist.github.com/#{@gist}.js\">\s</script>", @result
-      end
-    end
-
-    context "for private gist" do
-      context "when valid" do
-        setup do
-          @gist = "mattr-/24081a1d93d2898ecf0f"
-          @filename = "myfile.ext"
-          content = <<CONTENT
-  ---
-  title: My Cool Gist
-  ---
-
-  {% gist #{@gist} #{@filename} %}
-CONTENT
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
-        end
-
-        should "write script tag with specific file in gist" do
-          assert_match "<script src=\"https://gist.github.com/#{@gist}.js?file=#{@filename}\">\s</script>", @result
-        end
-      end
-
-      should "raise ArgumentError when invalid" do
-        @gist = "mattr-24081a1d93d2898ecf0f"
-        @filename = "myfile.ext"
-        content = <<CONTENT
-  ---
-  title: My Cool Gist
-  ---
-
-  {% gist #{@gist} #{@filename} %}
-CONTENT
-
-        assert_raise ArgumentError do
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
-        end
-      end
-    end
-
-    context "with specific file" do
-      setup do
-        @gist = 358471
-        @filename = 'somefile.rb'
-        content = <<CONTENT
----
-title: My Cool Gist
----
-
-{% gist #{@gist} #{@filename} %}
-CONTENT
-        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
-      end
-
-      should "write script tag with specific file in gist" do
-        assert_match "<script src=\"https://gist.github.com/#{@gist}.js?file=#{@filename}\">\s</script>", @result
-      end
-    end
-
-    context "with blank gist id" do
-      should "raise ArgumentError" do
-        content = <<CONTENT
----
-title: My Cool Gist
----
-
-{% gist %}
-CONTENT
-
-        assert_raise ArgumentError do
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
-        end
-      end
-    end
-
-    context "with invalid gist id" do
-      should "raise ArgumentError" do
-        invalid_gist = 'invalid'
-        content = <<CONTENT
----
-title: My Cool Gist
----
-
-{% gist #{invalid_gist} %}
-CONTENT
-
-        assert_raise ArgumentError do
-          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
-        end
-      end
-    end
-  end
-
   context "include tag with parameters" do
 
     context "with symlink'd include" do