jekyll 2.0.3 → 2.1.0

data/test/test_utils.rb

@@ -15,9 +15,9 @@ class TestUtils < Test::Unit::TestCase
         assert_equal [], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
       end
 
-      should "return empty array with matching nil singular" do
+      should "return plural array with nil singular" do
         data = { 'foo' => 'bar', 'tag' => nil, 'tags' => ['dog', 'cat'] }
-        assert_equal [], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
+        assert_equal ['dog', 'cat'], Utils.pluralized_array_from_hash(data, 'tag', 'tags')
       end
 
       should "return single value array with matching singular" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-06-29 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.5
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: classifier
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: jekyll-paginate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: jekyll-gist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jekyll-coffeescript
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: jekyll-watch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -346,20 +374,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -463,6 +477,7 @@ files:
 - features/permalinks.feature
 - features/post_data.feature
 - features/post_excerpts.feature
+- features/rendering.feature
 - features/site_configuration.feature
 - features/site_data.feature
 - features/step_definitions/jekyll_steps.rb
@@ -496,10 +511,10 @@ files:
 - lib/jekyll/filters.rb
 - lib/jekyll/frontmatter_defaults.rb
 - lib/jekyll/generator.rb
-- lib/jekyll/generators/pagination.rb
 - lib/jekyll/layout.rb
 - lib/jekyll/layout_reader.rb
 - lib/jekyll/liquid_extensions.rb
+- lib/jekyll/log_adapter.rb
 - lib/jekyll/mime.types
 - lib/jekyll/page.rb
 - lib/jekyll/plugin.rb
@@ -511,7 +526,6 @@ files:
 - 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
 - lib/jekyll/tags/post_url.rb
@@ -586,10 +600,13 @@ files:
 - site/_posts/2014-03-27-jekyll-1-5-1-released.markdown
 - site/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
 - site/_posts/2014-05-08-jekyll-2-0-3-released.markdown
+- site/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown
+- site/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown
 - site/css/screen.css
 - site/docs/assets.md
 - site/docs/collections.md
 - site/docs/configuration.md
+- site/docs/continuous-integration.md
 - site/docs/contributing.md
 - site/docs/datafiles.md
 - site/docs/deployment-methods.md
@@ -628,6 +645,7 @@ files:
 - site/img/article-footer.png
 - site/img/footer-arrow.png
 - site/img/footer-logo.png
+- site/img/jekyll-sticker.jpg
 - site/img/logo-2x.png
 - site/img/logo-rss.png
 - site/img/octojekyll.png
@@ -646,7 +664,9 @@ files:
 - test/source/+/foo.md
 - test/source/.htaccess
 - test/source/_config.dev.toml
+- test/source/_data/categories/dairy.yaml
 - test/source/_data/languages.yml
+- test/source/_data/members.json
 - test/source/_data/members.yaml
 - test/source/_data/products.yml
 - test/source/_drafts/draft-properties.text
@@ -675,6 +695,7 @@ files:
 - test/source/_posts/2009-01-27-category.textile
 - test/source/_posts/2009-01-27-empty-categories.textile
 - test/source/_posts/2009-01-27-empty-category.textile
+- test/source/_posts/2009-01-27-no-category.textile
 - test/source/_posts/2009-03-12-hash-#1.markdown
 - test/source/_posts/2009-05-18-empty-tag.textile
 - test/source/_posts/2009-05-18-empty-tags.textile
@@ -704,6 +725,10 @@ files:
 - test/source/_posts/2014-03-22-escape-+ %20[].markdown
 - test/source/_posts/es/2008-11-21-nested.textile
 - test/source/_sass/_grid.scss
+- test/source/_slides/example-slide-1.html
+- test/source/_slides/example-slide-2.html
+- test/source/_with.dots/all.dots/2.4.0.md
+- test/source/_with.dots/file.with.dots.md
 - test/source/about.html
 - test/source/category/_posts/2008-9-23-categories.textile
 - test/source/contacts.html
@@ -712,6 +737,7 @@ files:
 - test/source/css/main.scss
 - test/source/css/screen.css
 - test/source/deal.with.dots.html
+- test/source/environment.html
 - test/source/exploit.md
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile
 - test/source/index.html
@@ -726,6 +752,7 @@ files:
 - test/source/win/_posts/2009-05-24-yaml-linebreak.markdown
 - test/source/z_category/_posts/2008-9-23-categories.textile
 - test/suite.rb
+- test/test_cleaner.rb
 - test/test_coffeescript.rb
 - test/test_collections.rb
 - test/test_command.rb
@@ -740,9 +767,9 @@ files:
 - test/test_kramdown.rb
 - test/test_layout_reader.rb
 - test/test_liquid_extensions.rb
+- test/test_log_adapter.rb
 - test/test_new_command.rb
 - test/test_page.rb
-- test/test_pager.rb
 - test/test_path_sanitization.rb
 - test/test_post.rb
 - test/test_rdiscount.rb
@@ -754,7 +781,7 @@ files:
 - test/test_tags.rb
 - test/test_url.rb
 - test/test_utils.rb
-homepage: http://github.com/jekyll/jekyll
+homepage: https://github.com/jekyll/jekyll
 licenses:
 - MIT
 metadata: {}
@@ -792,6 +819,7 @@ test_files:
 - features/permalinks.feature
 - features/post_data.feature
 - features/post_excerpts.feature
+- features/rendering.feature
 - features/site_configuration.feature
 - features/site_data.feature
 - features/step_definitions/jekyll_steps.rb
@@ -806,7 +834,9 @@ test_files:
 - test/source/+/foo.md
 - test/source/.htaccess
 - test/source/_config.dev.toml
+- test/source/_data/categories/dairy.yaml
 - test/source/_data/languages.yml
+- test/source/_data/members.json
 - test/source/_data/members.yaml
 - test/source/_data/products.yml
 - test/source/_drafts/draft-properties.text
@@ -835,6 +865,7 @@ test_files:
 - test/source/_posts/2009-01-27-category.textile
 - test/source/_posts/2009-01-27-empty-categories.textile
 - test/source/_posts/2009-01-27-empty-category.textile
+- test/source/_posts/2009-01-27-no-category.textile
 - test/source/_posts/2009-03-12-hash-#1.markdown
 - test/source/_posts/2009-05-18-empty-tag.textile
 - test/source/_posts/2009-05-18-empty-tags.textile
@@ -864,6 +895,10 @@ test_files:
 - test/source/_posts/2014-03-22-escape-+ %20[].markdown
 - test/source/_posts/es/2008-11-21-nested.textile
 - test/source/_sass/_grid.scss
+- test/source/_slides/example-slide-1.html
+- test/source/_slides/example-slide-2.html
+- test/source/_with.dots/all.dots/2.4.0.md
+- test/source/_with.dots/file.with.dots.md
 - test/source/about.html
 - test/source/category/_posts/2008-9-23-categories.textile
 - test/source/contacts.html
@@ -872,6 +907,7 @@ test_files:
 - test/source/css/main.scss
 - test/source/css/screen.css
 - test/source/deal.with.dots.html
+- test/source/environment.html
 - test/source/exploit.md
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile
 - test/source/index.html
@@ -886,6 +922,7 @@ test_files:
 - test/source/win/_posts/2009-05-24-yaml-linebreak.markdown
 - test/source/z_category/_posts/2008-9-23-categories.textile
 - test/suite.rb
+- test/test_cleaner.rb
 - test/test_coffeescript.rb
 - test/test_collections.rb
 - test/test_command.rb
@@ -900,9 +937,9 @@ test_files:
 - test/test_kramdown.rb
 - test/test_layout_reader.rb
 - test/test_liquid_extensions.rb
+- test/test_log_adapter.rb
 - test/test_new_command.rb
 - test/test_page.rb
-- test/test_pager.rb
 - test/test_path_sanitization.rb
 - test/test_post.rb
 - test/test_rdiscount.rb

data/lib/jekyll/generators/pagination.rb

@@ -1,217 +0,0 @@
-module Jekyll
-  module Generators
-    class Pagination < Generator
-      # This generator is safe from arbitrary code execution.
-      safe true
-
-      # This generator should be passive with regard to its execution
-      priority :lowest
-
-      # Generate paginated pages if necessary.
-      #
-      # site - The Site.
-      #
-      # Returns nothing.
-      def generate(site)
-        if Pager.pagination_enabled?(site)
-          if template = template_page(site)
-            paginate(site, template)
-          else
-            Jekyll.logger.warn "Pagination:", "Pagination is enabled, but I couldn't find " +
-            "an index.html page to use as the pagination template. Skipping pagination."
-          end
-        end
-      end
-
-      # Paginates the blog's posts. Renders the index.html file into paginated
-      # directories, e.g.: page2/index.html, page3/index.html, etc and adds more
-      # site-wide data.
-      #
-      # site - The Site.
-      # page - The index.html Page that requires pagination.
-      #
-      # {"paginator" => { "page" => <Number>,
-      #                   "per_page" => <Number>,
-      #                   "posts" => [<Post>],
-      #                   "total_posts" => <Number>,
-      #                   "total_pages" => <Number>,
-      #                   "previous_page" => <Number>,
-      #                   "next_page" => <Number> }}
-      def paginate(site, page)
-        all_posts = site.site_payload['site']['posts']
-        pages = Pager.calculate_pages(all_posts, site.config['paginate'].to_i)
-        (1..pages).each do |num_page|
-          pager = Pager.new(site, num_page, all_posts, pages)
-          if num_page > 1
-            newpage = Page.new(site, site.source, page.dir, page.name)
-            newpage.pager = pager
-            newpage.dir = Pager.paginate_path(site, num_page)
-            site.pages << newpage
-          else
-            page.pager = pager
-          end
-        end
-      end
-
-      # Static: Fetch the URL of the template page. Used to determine the
-      #         path to the first pager in the series.
-      #
-      # site - the Jekyll::Site object
-      #
-      # Returns the url of the template page
-      def self.first_page_url(site)
-        if page = Pagination.new.template_page(site)
-          page.url
-        else
-          nil
-        end
-      end
-
-      # Public: Find the Jekyll::Page which will act as the pager template
-      #
-      # site - the Jekyll::Site object
-      #
-      # Returns the Jekyll::Page which will act as the pager template
-      def template_page(site)
-        site.pages.dup.select do |page|
-          Pager.pagination_candidate?(site.config, page)
-        end.sort do |one, two|
-          two.path.size <=> one.path.size
-        end.first
-      end
-    end
-  end
-
-  class Pager
-    attr_reader :page, :per_page, :posts, :total_posts, :total_pages,
-      :previous_page, :previous_page_path, :next_page, :next_page_path
-
-    # Calculate the number of pages.
-    #
-    # all_posts - The Array of all Posts.
-    # per_page  - The Integer of entries per page.
-    #
-    # Returns the Integer number of pages.
-    def self.calculate_pages(all_posts, per_page)
-      (all_posts.size.to_f / per_page.to_i).ceil
-    end
-
-    # Determine if pagination is enabled the site.
-    #
-    # site - the Jekyll::Site object
-    #
-    # Returns true if pagination is enabled, false otherwise.
-    def self.pagination_enabled?(site)
-     !site.config['paginate'].nil? &&
-       site.pages.size > 0
-    end
-
-    # Static: Determine if a page is a possible candidate to be a template page.
-    #         Page's name must be `index.html` and exist in any of the directories
-    #         between the site source and `paginate_path`.
-    #
-    # config - the site configuration hash
-    # page   - the Jekyll::Page about which we're inquiring
-    #
-    # Returns true if the
-    def self.pagination_candidate?(config, page)
-      page_dir = File.dirname(File.expand_path(remove_leading_slash(page.path), config['source']))
-      paginate_path = remove_leading_slash(config['paginate_path'])
-      paginate_path = File.expand_path(paginate_path, config['source'])
-      page.name == 'index.html' &&
-        in_hierarchy(config['source'], page_dir, File.dirname(paginate_path))
-    end
-
-    # Determine if the subdirectories of the two paths are the same relative to source
-    #
-    # source        - the site source
-    # page_dir      - the directory of the Jekyll::Page
-    # paginate_path - the absolute paginate path (from root of FS)
-    #
-    # Returns whether the subdirectories are the same relative to source
-    def self.in_hierarchy(source, page_dir, paginate_path)
-      return false if paginate_path == File.dirname(paginate_path)
-      return false if paginate_path == Pathname.new(source).parent
-      page_dir == paginate_path ||
-        in_hierarchy(source, page_dir, File.dirname(paginate_path))
-    end
-
-    # Static: Return the pagination path of the page
-    #
-    # site     - the Jekyll::Site object
-    # num_page - the pagination page number
-    #
-    # Returns the pagination path as a string
-    def self.paginate_path(site, num_page)
-      return nil if num_page.nil?
-      return Generators::Pagination.first_page_url(site) if num_page <= 1
-      format = site.config['paginate_path']
-      format = format.sub(':num', num_page.to_s)
-      ensure_leading_slash(format)
-    end
-
-    # Static: Return a String version of the input which has a leading slash.
-    #         If the input already has a forward slash in position zero, it will be
-    #         returned unchanged.
-    #
-    # path - a String path
-    #
-    # Returns the path with a leading slash
-    def self.ensure_leading_slash(path)
-      path[0..0] == "/" ? path : "/#{path}"
-    end
-
-    # Static: Return a String version of the input without a leading slash.
-    #
-    # path - a String path
-    #
-    # Returns the input without the leading slash
-    def self.remove_leading_slash(path)
-      ensure_leading_slash(path)[1..-1]
-    end
-
-    # Initialize a new Pager.
-    #
-    # site     - the Jekyll::Site object
-    # page      - The Integer page number.
-    # all_posts - The Array of all the site's Posts.
-    # num_pages - The Integer number of pages or nil if you'd like the number
-    #             of pages calculated.
-    def initialize(site, page, all_posts, num_pages = nil)
-      @page = page
-      @per_page = site.config['paginate'].to_i
-      @total_pages = num_pages || Pager.calculate_pages(all_posts, @per_page)
-
-      if @page > @total_pages
-        raise RuntimeError, "page number can't be greater than total pages: #{@page} > #{@total_pages}"
-      end
-
-      init = (@page - 1) * @per_page
-      offset = (init + @per_page - 1) >= all_posts.size ? all_posts.size : (init + @per_page - 1)
-
-      @total_posts = all_posts.size
-      @posts = all_posts[init..offset]
-      @previous_page = @page != 1 ? @page - 1 : nil
-      @previous_page_path = Pager.paginate_path(site, @previous_page)
-      @next_page = @page != @total_pages ? @page + 1 : nil
-      @next_page_path = Pager.paginate_path(site, @next_page)
-    end
-
-    # Convert this Pager's data to a Hash suitable for use by Liquid.
-    #
-    # Returns the Hash representation of this Pager.
-    def to_liquid
-      {
-        'page' => page,
-        'per_page' => per_page,
-        'posts' => posts,
-        'total_posts' => total_posts,
-        'total_pages' => total_pages,
-        'previous_page' => previous_page,
-        'previous_page_path' => previous_page_path,
-        'next_page' => next_page,
-        'next_page_path' => next_page_path
-      }
-    end
-  end
-end