jekyll 1.0.4 → 1.1.1

data/test/test_related_posts.rb

@@ -13,7 +13,12 @@ class TestRelatedPosts < Test::Unit::TestCase
     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
+
+      last_post     = @site.posts.last
+      related_posts = Jekyll::RelatedPosts.new(last_post).build
+
+      last_10_recent_posts = (@site.posts.reverse - [last_post]).first(10)
+      assert_equal last_10_recent_posts, related_posts
     end
   end
 

data/test/test_tags.rb

@@ -347,4 +347,94 @@ CONTENT
       end
     end
   end
+
+  context "include tag with parameters" do
+    context "with one parameter" do
+      setup do
+        content = <<CONTENT
+---
+title: Include tag parameters
+---
+
+{% include sig.markdown myparam="test" %}
+
+{% include params.html param="value" %}
+CONTENT
+        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+      end
+
+      should "correctly output include variable" do
+        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
+      end
+    end
+
+    context "with invalid parameter syntax" do
+      should "throw a SyntaxError" do
+        content = <<CONTENT
+---
+title: Invalid parameter syntax
+---
+
+{% include params.html param s="value" %}
+CONTENT
+        assert_raise SyntaxError, 'Did not raise exception on invalid "include" syntax' do
+          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+        end
+
+        content = <<CONTENT
+---
+title: Invalid parameter syntax
+---
+
+{% include params.html params="value %}
+CONTENT
+        assert_raise SyntaxError, 'Did not raise exception on invalid "include" syntax' do
+          create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+        end
+      end
+    end
+
+    context "with several parameters" do
+      setup do
+        content = <<CONTENT
+---
+title: multiple include parameters
+---
+
+{% include params.html param1="new_value" param2="another" %}
+CONTENT
+        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+      end
+
+      should "list all parameters" do
+        assert_match '<li>param1 = new_value</li>', @result
+        assert_match '<li>param2 = another</li>', @result
+      end
+
+      should "not include previously used parameters" do
+        assert_match "<span id='include-param' />", @result
+      end
+    end
+
+    context "without parameters" do
+      setup do
+        content = <<CONTENT
+---
+title: without parameters
+---
+
+{% include params.html %}
+CONTENT
+        create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+      end
+
+      should "include file with empty parameters" do
+        assert_match "<span id='include-param' />", @result
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: classifier
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +227,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 1.2.4
   type: :development
@@ -223,7 +237,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 1.2.4
 - !ruby/object:Gem::Dependency
@@ -255,85 +269,87 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: simplecov-gem-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: simplecov-gem-adapter
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 3.2.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 3.2.13
 description: Jekyll is a simple, blog aware, static site generator.
 email: tom@mojombo.com
 executables:
 - jekyll
 extensions: []
 extra_rdoc_files:
-- README.textile
+- README.markdown
 - LICENSE
 files:
-- CONTRIBUTING.md
+- CONTRIBUTING.markdown
 - Gemfile
 - History.markdown
 - LICENSE
-- README.textile
+- README.markdown
 - Rakefile
 - bin/jekyll
 - cucumber.yml
 - features/create_sites.feature
 - features/drafts.feature
 - features/embed_filters.feature
+- features/include_tag.feature
 - features/markdown.feature
 - features/pagination.feature
 - features/permalinks.feature
 - features/post_data.feature
+- features/post_excerpts.feature
 - features/site_configuration.feature
 - features/site_data.feature
 - features/step_definitions/jekyll_steps.rb
@@ -359,6 +375,7 @@ files:
 - lib/jekyll/deprecator.rb
 - lib/jekyll/draft.rb
 - lib/jekyll/errors.rb
+- lib/jekyll/excerpt.rb
 - lib/jekyll/filters.rb
 - lib/jekyll/generator.rb
 - lib/jekyll/generators/pagination.rb
@@ -393,11 +410,22 @@ files:
 - site/_includes/docs_contents_mobile.html
 - site/_includes/footer.html
 - site/_includes/header.html
+- site/_includes/news_contents.html
+- site/_includes/news_contents_mobile.html
+- site/_includes/news_item.html
 - site/_includes/primary-nav-items.html
 - site/_includes/section_nav.html
 - site/_includes/top.html
 - site/_layouts/default.html
 - site/_layouts/docs.html
+- site/_layouts/news.html
+- site/_layouts/news_item.html
+- site/_posts/2013-05-06-jekyll-1-0-0-released.markdown
+- site/_posts/2013-05-08-jekyll-1-0-1-released.markdown
+- site/_posts/2013-05-12-jekyll-1-0-2-released.markdown
+- site/_posts/2013-06-07-jekyll-1-0-3-released.markdown
+- site/_posts/2013-07-14-jekyll-1-1-0-released.markdown
+- site/_posts/2013-07-24-jekyll-1-1-1-released.markdown
 - site/css/gridism.css
 - site/css/normalize.css
 - site/css/pygments.css
@@ -405,6 +433,7 @@ files:
 - site/docs/configuration.md
 - site/docs/contributing.md
 - site/docs/deployment-methods.md
+- site/docs/drafts.md
 - site/docs/extras.md
 - site/docs/frontmatter.md
 - site/docs/github-pages.md
@@ -418,6 +447,7 @@ files:
 - site/docs/permalinks.md
 - site/docs/plugins.md
 - site/docs/posts.md
+- site/docs/quickstart.md
 - site/docs/resources.md
 - site/docs/sites.md
 - site/docs/structure.md
@@ -427,6 +457,8 @@ files:
 - site/docs/usage.md
 - site/docs/variables.md
 - site/favicon.png
+- site/feed.xml
+- site/freenode.txt
 - site/img/article-footer.png
 - site/img/footer-arrow.png
 - site/img/footer-logo.png
@@ -436,13 +468,17 @@ files:
 - site/img/tube1x.png
 - site/index.html
 - site/js/modernizr-2.5.3.min.js
+- site/news/index.md
+- site/news/releases/index.md
 - test/fixtures/broken_front_matter1.erb
 - test/fixtures/broken_front_matter2.erb
 - test/fixtures/broken_front_matter3.erb
 - test/fixtures/exploit_front_matter.erb
 - test/fixtures/front_matter.erb
 - test/helper.rb
+- test/source/+/foo.md
 - test/source/.htaccess
+- test/source/_includes/params.html
 - test/source/_includes/sig.markdown
 - test/source/_layouts/default.html
 - test/source/_layouts/simple.html
@@ -478,6 +514,7 @@ files:
 - test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep
 - test/source/_posts/2013-04-11-custom-excerpt.markdown
 - test/source/_posts/2013-05-10-number-category.textile
+- test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown
 - test/source/_posts/es/2008-11-21-nested.textile
 - test/source/about.html
 - test/source/category/_posts/2008-9-23-categories.textile
@@ -497,6 +534,7 @@ files:
 - test/test_configuration.rb
 - test/test_convertible.rb
 - test/test_core_ext.rb
+- test/test_excerpt.rb
 - test/test_filters.rb
 - test/test_generated_site.rb
 - test/test_kramdown.rb
@@ -521,12 +559,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -540,6 +578,7 @@ test_files:
 - test/test_configuration.rb
 - test/test_convertible.rb
 - test/test_core_ext.rb
+- test/test_excerpt.rb
 - test/test_filters.rb
 - test/test_generated_site.rb
 - test/test_kramdown.rb

data/README.textile

@@ -1,45 +0,0 @@
-h1. Jekyll
-
-!https://travis-ci.org/mojombo/jekyll.png?branch=master!:https://travis-ci.org/mojombo/jekyll
-"!https://codeclimate.com/github/mojombo/jekyll.png!":https://codeclimate.com/github/mojombo/jekyll
-
-By Tom Preston-Werner, Nick Quaranto, and many awesome contributors!
-
-Jekyll is a simple, blog aware, static site generator. It takes a template directory (representing the raw form of a website), runs it through Textile or Markdown and Liquid converters, and spits out a complete, static website suitable for serving with Apache or your favorite web server. This is also the engine behind "GitHub Pages":http://pages.github.com, which you can use to host your project's page or blog right here from GitHub.
-
-h2. Getting Started
-
-* "Install":http://jekyllrb.com/docs/installation/ the gem
-* Read up about its "Usage":http://jekyllrb.com/docs/usage/ and "Configuration":http://jekyllrb.com/docs/configuration/
-* Take a gander at some existing "Sites":http://wiki.github.com/mojombo/jekyll/sites
-* Fork and "Contribute":https://github.com/mojombo/jekyll/blob/master/CONTRIBUTING.md your own modifications
-* Have questions? Post them on the "Mailing List":http://groups.google.com/group/jekyll-rb
-
-h2. Diving In
-
-* "Migrate":http://jekyllrb.com/docs/migrations/ from your previous system
-* Learn how the "YAML Front Matter":http://jekyllrb.com/docs/frontmatter/ works
-* Put information on your site with "Variables":http://jekyllrb.com/docs/variables/
-* Customize the "Permalinks":http://jekyllrb.com/docs/permalinks/ your posts are generated with
-* Use the built-in "Liquid Extensions":http://jekyllrb.com/docs/templates/ to make your life easier
-* Use custom "Plugins":http://jekyllrb.com/docs/plugins/ to generate content specific to your site
-
-h2. Runtime Dependencies
-
-* Classifier: Generating related posts (Ruby)
-* Directory Watcher: Auto-regeneration of sites (Ruby)
-* Kramdown: Markdown-superset converter (Ruby)
-* Liquid: Templating system (Ruby)
-* Maruku: Default markdown engine (Ruby)
-
-h2. Developer Dependencies
-
-* RDiscount: Discount Markdown Processor (Ruby)
-* RedCloth: Textile support (Ruby)
-* RedGreen: Nicer test output (Ruby)
-* RR: Mocking (Ruby)
-* Shoulda: Test framework (Ruby)
-
-h2. License
-
-See "LICENSE":https://github.com/mojombo/jekyll/blob/master/LICENSE.