jekyll 1.0.2 → 1.0.3

data/test/source/_layouts/default.html

@@ -19,7 +19,7 @@
   <div class="title">
     Tom Preston-Werner
   </div>
-  
+
   {{ content }}
 </div>
 

data/test/test_configuration.rb

@@ -51,9 +51,11 @@ class TestConfiguration < Test::Unit::TestCase
   context "#backwards_compatibilize" do
     setup do
       @config = Configuration[{
-        "auto" => true,
-        "watch" => true,
-        "server" => true
+        "auto"    => true,
+        "watch"   => true,
+        "server"  => true,
+        "exclude" => "READ-ME.md, Gemfile,CONTRIBUTING.hello.markdown",
+        "include" => "STOP_THE_PRESSES.txt,.heloses, .git"
       }]
     end
     should "unset 'auto' and 'watch'" do
@@ -66,6 +68,16 @@ class TestConfiguration < Test::Unit::TestCase
       assert @config.has_key?("server")
       assert !@config.backwards_compatibilize.has_key?("server")
     end
+    should "transform string exclude into an array" do
+      assert @config.has_key?("exclude")
+      assert @config.backwards_compatibilize.has_key?("exclude")
+      assert_equal @config.backwards_compatibilize["exclude"], %w[READ-ME.md Gemfile CONTRIBUTING.hello.markdown]
+    end
+    should "transform string include into an array" do
+      assert @config.has_key?("include")
+      assert @config.backwards_compatibilize.has_key?("include")
+      assert_equal @config.backwards_compatibilize["include"], %w[STOP_THE_PRESSES.txt .heloses .git]
+    end
   end
   context "loading configuration" do
     setup do

data/test/test_page.rb

@@ -102,7 +102,7 @@ class TestPage < Test::Unit::TestCase
         assert_equal "/about/", @page.dir
       end
     end
-        
+
     context "with specified layout of nil" do
       setup do
         @page = setup_page('sitemap.xml')

data/test/test_pager.rb

@@ -11,6 +11,13 @@ class TestPager < Test::Unit::TestCase
     assert_equal(3, Pager.calculate_pages([1,2,3,4,5], '2'))
   end
 
+  should "determine the pagination path" do
+    assert_nil(Pager.paginate_path(Jekyll::Configuration::DEFAULTS, 1))
+    assert_equal("page2", Pager.paginate_path(Jekyll::Configuration::DEFAULTS, 2))
+    assert_nil(Pager.paginate_path(Jekyll::Configuration::DEFAULTS.merge('paginate_path' => '/blog/page-:num'), 1))
+    assert_equal("page-2", Pager.paginate_path(Jekyll::Configuration::DEFAULTS.merge('paginate_path' => '/blog/page-:num'), 2))
+  end
+
   context "pagination disabled" do
     setup do
       stub(Jekyll).configuration do

data/test/test_post.rb

@@ -139,7 +139,7 @@ class TestPost < Test::Unit::TestCase
             assert_equal "/2013/2008/09/09/foo-bar.html", @post.url
           end
         end
-        
+
         context "with specified layout of nil" do
           setup do
             file = '2013-01-12-nil-layout.textile'
@@ -422,7 +422,7 @@ class TestPost < Test::Unit::TestCase
         post = setup_post("2009-01-27-empty-categories.textile")
         assert_equal [], post.categories
       end
-      
+
       should "recognize number category in yaml" do
         post = setup_post("2013-05-10-number-category.textile")
         assert post.categories.include?('2013')
@@ -440,7 +440,7 @@ class TestPost < Test::Unit::TestCase
         assert post.tags.include?('cooking')
         assert post.tags.include?('pizza')
       end
-      
+
       should "recognize empty tag in yaml" do
         post = setup_post("2009-05-18-empty-tag.textile")
         assert_equal [], post.tags
@@ -528,46 +528,46 @@ class TestPost < Test::Unit::TestCase
       assert_equal ['foo'], post.categories
     end
   end
-  
+
   context "converter file extension settings" do
     setup do
       stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
       @site = Site.new(Jekyll.configuration)
     end
-    
+
     should "process .md as markdown under default configuration" do
       post = setup_post '2011-04-12-md-extension.md'
       conv = post.converter
       assert conv.kind_of? Jekyll::Converters::Markdown
     end
-    
+
     should "process .text as identity under default configuration" do
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
       assert conv.kind_of? Jekyll::Converters::Identity
     end
-    
+
     should "process .text as markdown under alternate configuration" do
       @site.config['markdown_ext'] = 'markdown,mdw,mdwn,md,text'
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
       assert conv.kind_of? Jekyll::Converters::Markdown
     end
-    
+
     should "process .md as markdown under alternate configuration" do
       @site.config['markdown_ext'] = 'markdown,mkd,mkdn,md,text'
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
       assert conv.kind_of? Jekyll::Converters::Markdown
     end
-    
+
     should "process .text as textile under alternate configuration" do
       @site.config['textile_ext'] = 'textile,text'
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
       assert conv.kind_of? Jekyll::Converters::Textile
     end
-    
+
   end
-  
+
 end

data/test/test_redcloth.rb

@@ -6,7 +6,7 @@ class TestRedCloth < Test::Unit::TestCase
     setup do
       @textile = Converters::Textile.new
     end
-    
+
     should "preserve single line breaks in HTML output" do 
       assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
     end
@@ -19,7 +19,7 @@ class TestRedCloth < Test::Unit::TestCase
         }
       @textile = Converters::Textile.new config
     end
-    
+
     should "preserve single line breaks in HTML output" do 
       assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
     end
@@ -34,7 +34,7 @@ class TestRedCloth < Test::Unit::TestCase
       }
       @textile = Converters::Textile.new config
     end
-    
+
     should "preserve single line breaks in HTML output" do 
       assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
     end

data/test/test_related_posts.rb

@@ -0,0 +1,41 @@
+require 'helper'
+
+class TestRelatedPosts < Test::Unit::TestCase
+  context "building related posts without lsi" 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 "use the most recent posts for related posts" do
+      @site.reset
+      @site.read
+      assert_equal @site.posts[0..9], Jekyll::RelatedPosts.new(@site.posts.last).build
+    end
+  end
+
+  context "building related posts with lsi" do
+    setup do
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir,
+                                               'destination' => dest_dir,
+                                               'lsi' => true})
+      end
+      @site = Site.new(Jekyll.configuration)
+    end
+
+    should "use lsi for the related posts" do
+      @site.reset
+      @site.read
+      require 'classifier'
+      any_instance_of(::Classifier::LSI) do |c|
+        stub(c).find_related { @site.posts[-1..-9] }
+        stub(c).build_index
+      end
+      assert_equal @site.posts[-1..-9], Jekyll::RelatedPosts.new(@site.posts.last).build
+    end
+  end
+end

data/test/test_site.rb

@@ -195,7 +195,7 @@ class TestSite < Test::Unit::TestCase
       @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]
@@ -284,7 +284,7 @@ class TestSite < Test::Unit::TestCase
         File.open(dest_dir('.svn/HEAD'), 'w')
         File.open(dest_dir('.hg/HEAD'), 'w')
       end
-      
+
       teardown do
         FileUtils.rm_f(dest_dir('obsolete.html'))
         FileUtils.rm_rf(dest_dir('qux'))
@@ -293,7 +293,7 @@ class TestSite < Test::Unit::TestCase
         FileUtils.rm_rf(dest_dir('.svn'))
         FileUtils.rm_rf(dest_dir('.hg'))
       end
-      
+
       should 'remove orphaned files in destination' do
         @site.process
         assert !File.exist?(dest_dir('obsolete.html'))
@@ -317,7 +317,7 @@ class TestSite < Test::Unit::TestCase
         assert File.exist?(dest_dir('.svn/HEAD'))
       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'
@@ -325,7 +325,7 @@ class TestSite < Test::Unit::TestCase
           Site.new(Jekyll.configuration.merge({ 'markdown' => bad_processor }))
         end
       end
-      
+
       should 'throw FatalException at process time' do
         bad_processor = 'not a processor name'
         s = Site.new(Jekyll.configuration.merge({ 'markdown' => bad_processor }))
@@ -334,6 +334,6 @@ class TestSite < Test::Unit::TestCase
         end
       end
     end
-    
+
   end
 end

data/test/test_tags.rb

@@ -253,6 +253,46 @@ CONTENT
       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
+
+      context "when invalid" 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 "Error parsing gist id", @result
+        end
+      end
+    end
+
     context "with specific file" do
       setup do
         @gist = 358471

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -363,13 +363,14 @@ files:
 - lib/jekyll/generator.rb
 - lib/jekyll/generators/pagination.rb
 - lib/jekyll/layout.rb
-- lib/jekyll/logger.rb
 - lib/jekyll/mime.types
 - lib/jekyll/page.rb
 - lib/jekyll/plugin.rb
 - lib/jekyll/post.rb
+- lib/jekyll/related_posts.rb
 - lib/jekyll/site.rb
 - lib/jekyll/static_file.rb
+- lib/jekyll/stevenson.rb
 - lib/jekyll/tags/gist.rb
 - lib/jekyll/tags/highlight.rb
 - lib/jekyll/tags/include.rb
@@ -408,6 +409,7 @@ files:
 - site/docs/frontmatter.md
 - site/docs/github-pages.md
 - site/docs/heroku.md
+- site/docs/history.md
 - site/docs/index.md
 - site/docs/installation.md
 - site/docs/migrations.md
@@ -505,6 +507,7 @@ files:
 - test/test_rdiscount.rb
 - test/test_redcarpet.rb
 - test/test_redcloth.rb
+- test/test_related_posts.rb
 - test/test_site.rb
 - test/test_tags.rb
 homepage: http://github.com/mojombo/jekyll
@@ -547,5 +550,6 @@ test_files:
 - test/test_rdiscount.rb
 - test/test_redcarpet.rb
 - test/test_redcloth.rb
+- test/test_related_posts.rb
 - test/test_site.rb
 - test/test_tags.rb