middleman-blog 4.0.1 → 4.0.2

data/lib/middleman-blog/tag_pages.rb

@@ -1,53 +1,90 @@
 require 'middleman-blog/uri_templates'
 
 module Middleman
+
   module Blog
-    # A sitemap resource manipulator that adds a tag page to the sitemap
-    # for each tag in the associated blog
+
+    ##
+    # A sitemap resource manipulator that adds a tag page to the sitemap for
+    # each tag in the associated blog
+    ##
     class TagPages
-      include UriTemplates
 
-      def initialize(app, blog_controller)
-        @sitemap = app.sitemap
-        @blog_controller = blog_controller
-        @tag_link_template = uri_template blog_controller.options.taglink
-        @tag_template = blog_controller.options.tag_template
-        @blog_data = blog_controller.data
+      include UriTemplates
 
+      ##
+      # Initialise Tag pages
+      #
+      # @param  app             [Object] Middleman app
+      # @param  blog_controller [Object] Blog controller
+      ##
+      def initialize( app, blog_controller )
+        @sitemap            = app.sitemap
+        @blog_controller    = blog_controller
+        @tag_link_template  = uri_template blog_controller.options.taglink
+        @tag_template       = blog_controller.options.tag_template
+        @blog_data          = blog_controller.data
         @generate_tag_pages = blog_controller.options.generate_tag_pages
       end
 
+      ##
       # Get a path to the given tag, based on the :taglink setting.
-      # @param [String] tag
-      # @return [String]
-      def link(tag)
-        apply_uri_template @tag_link_template, tag: safe_parameterize(tag)
+      #
+      # @param  tag [String] Tag name
+      # @return     [String] Safe Tag URL
+      ##
+      def link( tag )
+        apply_uri_template @tag_link_template, tag: safe_parameterize( tag )
       end
 
+      ##
       # Update the main sitemap resource list
-      # @return [void]
-      def manipulate_resource_list(resources)
+      #
+      # @param  resources [Object] Tag name
+      # @return           [void]
+      ##
+      def manipulate_resource_list( resources )
+
         return resources unless @generate_tag_pages
 
-        resources + @blog_data.tags.map do |tag, articles|
-          tag_page_resource(tag, articles)
+        resources + @blog_data.tags.map do | tag, articles |
+          tag_page_resource( tag, articles )
         end
+
       end
 
       private
 
-      def tag_page_resource(tag, articles)
-        Sitemap::ProxyResource.new(@sitemap, link(tag), @tag_template).tap do |p|
-          # Add metadata in local variables so it's accessible to
-          # later extensions
+      ##
+      # Create the tag page resources
+      #
+      # @param  tag      [String] Tag name
+      # @param  articles [Object] Articles
+      # @return          [Object] Sitemap
+      #
+      # @todo Can we inject the correct locale into the metadata here
+      ##
+      def tag_page_resource( tag, articles )
+
+        Sitemap::ProxyResource.new( @sitemap, link( tag ), @tag_template ).tap do | p |
+
+          # Detect "formatted" tag in first article - trying to guess the correct format to show
+          # tagname = articles.first.tags.detect { |article_tag| safe_parameterize(article_tag) == tag }
+
+          # Add metadata in local variables so it's accessible to later extensions
           p.add_metadata locals: {
-            'page_type' => 'tag',
-            'tagname' => tag,
-            'articles' => articles,
+            'page_type'       => 'tag',
+            'tagname'         => tag,
+            'articles'        => articles,
             'blog_controller' => @blog_controller
           }
+
         end
+
       end
+
     end
+
   end
+
 end

data/lib/middleman-blog/truncate_html.rb

@@ -9,13 +9,8 @@ end
 module TruncateHTML
   def self.truncate_at_separator(text, separator)
     text = text.encode('UTF-8') if text.respond_to?(:encode)
-    doc = Nokogiri::HTML::DocumentFragment.parse text
-    length = doc.inner_text =~ Regexp.new(separator)
-    if length
-      doc.truncate(length - 1, '').inner_html
-    else
-      text
-    end
+    doc = Nokogiri::HTML::DocumentFragment.parse text.split(separator).first
+    doc.inner_html
   end
 
   def self.truncate_at_length(text, max_length, ellipsis = "...")
@@ -24,7 +19,7 @@ module TruncateHTML
     doc = Nokogiri::HTML::DocumentFragment.parse text
     content_length = doc.inner_text.length
     actual_length = max_length - ellipsis_length
-    if content_length > actual_length 
+    if content_length > actual_length
       doc.truncate(actual_length, ellipsis).inner_html
     else
       text
@@ -70,4 +65,4 @@ end
 Nokogiri::HTML::DocumentFragment.send(:include, NokogiriTruncator::NodeWithChildren)
 Nokogiri::XML::Element.send(:include, NokogiriTruncator::NodeWithChildren)
 Nokogiri::XML::Text.send(:include, NokogiriTruncator::TextNode)
-Nokogiri::XML::Comment.send(:include, NokogiriTruncator::CommentNode)
+Nokogiri::XML::Comment.send(:include, NokogiriTruncator::CommentNode)

data/lib/middleman-blog/uri_templates.rb

@@ -4,18 +4,22 @@ require 'active_support/inflector'
 require 'active_support/inflector/transliterate'
 
 module Middleman
+
   module Blog
+
     # Handy methods for dealing with URI templates. Mix into whatever class.
     module UriTemplates
 
       module_function
 
-      # Given a URI template string, make an Addressable::Template
-      # This supports the legacy middleman-blog/Sinatra style :colon
-      # URI templates as well as RFC6570 templates.
+      ##
+      # Given a URI template string, make an Addressable::Template This supports
+      # the legacy middleman-blog/Sinatra style :colon URI templates as well as
+      # RFC6570 templates.
       #
       # @param [String] tmpl_src URI template source
       # @return [Addressable::Template] a URI template
+      ##
       def uri_template(tmpl_src)
         # Support the RFC6470 templates directly if people use them
         if tmpl_src.include?(':')
@@ -25,65 +29,73 @@ module Middleman
         Addressable::Template.new ::Middleman::Util.normalize_path(tmpl_src)
       end
 
+      ##
       # Apply a URI template with the given data, producing a normalized
       # Middleman path.
       #
       # @param [Addressable::Template] template
       # @param [Hash] data
       # @return [String] normalized path
+      ##
       def apply_uri_template(template, data)
         ::Middleman::Util.normalize_path Addressable::URI.unencode(template.expand(data)).to_s
       end
 
+      ##
       # Use a template to extract parameters from a path, and validate some special (date)
       # keys. Returns nil if the special keys don't match.
       #
       # @param [Addressable::Template] template
       # @param [String] path
+      ##
       def extract_params(template, path)
         template.extract(path, BlogTemplateProcessor)
       end
 
-      # Parameterize a string preserving any multibyte characters
+      ##
+      # Parametrize a string preserving any multi-byte characters
+      # Reimplementation of this, preserves un-transliterate-able multibyte chars.
+      #
+      # @see http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-parameterize
+      ##
       def safe_parameterize(str)
-        sep = '-'
-
-        # Reimplementation of http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-parameterize that preserves un-transliterate-able multibyte chars.
-        parameterized_string = ActiveSupport::Inflector.transliterate(str.to_s).downcase
-        parameterized_string.gsub!(/[^a-z0-9\-_\?]+/, sep)
-
-        parameterized_string.chars.to_a.each_with_index do |char, i|
-          if char == '?' && str[i].bytes.count != 1
-            parameterized_string[i] = str[i]
-          end
-        end
-
-        re_sep = Regexp.escape(sep)
-        # No more than one of the separator in a row.
-        parameterized_string.gsub!(/#{re_sep}{2,}/, sep)
-        # Remove leading/trailing separator.
-        parameterized_string.gsub!(/^#{re_sep}|#{re_sep}$/, '')
-
-        parameterized_string
+        parameterized_string = ::ActiveSupport::Inflector.transliterate(str.to_s)
+        parameterized_string.parameterize
       end
 
-      # Convert a date into a hash of components to strings
-      # suitable for using in a URL template.
+      ##
+      # Convert a date into a hash of components to strings suitable for using
+      # in a URL template.
+      #
       # @param [DateTime] date
       # @return [Hash] parameters
+      ##
       def date_to_params(date)
         return {
           year: date.year.to_s,
-          month: date.month.to_s.rjust(2,'0'),
-          day: date.day.to_s.rjust(2,'0')
+          month: date.month.to_s.rjust(2, '0'),
+          day: date.day.to_s.rjust(2, '0')
         }
       end
+
+      ##
+      #
+      ##
+      def extract_directory_path( article_path )
+        uri = Addressable::URI.parse article_path
+
+        # Remove file extension from the article path
+        directory_path = uri.path.gsub( uri.extname, '' )
+      end
+
     end
 
-    # A special template processor that validates date fields
-    # and has an extra-permissive default regex.
+    ##
+    # A special template processor that validates date fields and has an extra-
+    # permissive default regex.
     #
-    # See https://github.com/sporkmonger/addressable/blob/master/lib/addressable/template.rb#L279
+    # @see https://github.com/sporkmonger/addressable/blob/master/lib/addressable/template.rb#L279
+    ##
     class BlogTemplateProcessor
       def self.match(name)
         case name
@@ -94,5 +106,7 @@ module Middleman
         end
       end
     end
+
   end
+
 end

data/lib/middleman-blog/version.rb

@@ -1,5 +1,7 @@
 module Middleman
+
   module Blog
-    VERSION = "4.0.1"
+    VERSION = '4.0.2'
   end
+
 end

data/middleman-blog.gemspec

@@ -1,23 +1,25 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "middleman-blog/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'middleman-blog/version'
 
 Gem::Specification.new do |s|
-  s.name = "middleman-blog"
-  s.version = Middleman::Blog::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.authors = ["Thomas Reynolds", "Ben Hollis"]
-  s.email = ["me@tdreyno.com", "ben@benhollis.net"]
-  s.homepage = "https://github.com/middleman/middleman-blog"
-  s.summary = %q{Blog engine for Middleman}
-  s.description = %q{Blog engine for Middleman}
-  s.license = "MIT"
-  s.files = `git ls-files -z`.split("\0")
-  s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0")
-  s.require_paths = ["lib"]
+
+  s.name                  = 'middleman-blog'
+  s.version               = Middleman::Blog::VERSION
+  s.platform              = Gem::Platform::RUBY
+  s.authors               = ['Thomas Reynolds', 'Ben Hollis', 'Ian Warner']
+  s.email                 = ['me@tdreyno.com', 'ben@benhollis.net', 'ian.warner@drykiss.com']
+  s.homepage              = 'https://github.com/middleman/middleman-blog'
+  s.summary               = %q{ Blog engine for Middleman }
+  s.description           = %q{ Blog engine for Middleman }
+  s.license               = 'MIT'
+  s.files                 = `git ls-files -z`.split("\0")
+  s.test_files            = `git ls-files -z -- {fixtures,features}/*`.split("\0")
+  s.require_paths         = ['lib']
   s.required_ruby_version = '>= 2.0.0'
 
-  s.add_dependency("middleman-core", [">= 4.0.0"])
-  s.add_dependency("tzinfo", [">= 0.3.0"])
-  s.add_dependency("addressable", ["~> 2.3"])
+  s.add_dependency('middleman-core', ['~> 4.0'])
+  s.add_dependency('tzinfo',         ['>= 0.3.0'])
+  s.add_dependency('addressable',    ['~> 2.3'])
+
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'simplecov'
-SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/..'))
+SimpleCov.root( File.expand_path( File.dirname( __FILE__ ) + '/..' ) )
 
 require 'coveralls'
 Coveralls.wear!

data/spec/uri_templates_spec.rb

@@ -33,11 +33,11 @@ describe 'Middleman::Blog::UriTemplates' do
       template = uri_template('{year}/{month}/{day}/{title}/{+path}')
       params = extract_params(template, '2013/12/13/foo-bar/foo/bar.html')
 
-      expect(params['year']) == '2013'
+      expect(params['year'])  == '2013'
       expect(params['month']) == '12'
-      expect(params['day']) == '13'
+      expect(params['day'])   == '13'
       expect(params['title']) == 'foo-bar'
-      expect(params['path']) == 'foo/bar.html'
+      expect(params['path'])  == 'foo/bar.html'
     end
 
     it 'returns nil if there is no match' do
@@ -54,11 +54,26 @@ describe 'Middleman::Blog::UriTemplates' do
       template = uri_template('{year}/{month}/{day}/{title}/{+path}')
       params = extract_params(template, '2013/12/13/foo - bar/foo/bar.html')
 
-      expect(params['year']) == '2013'
+      expect(params['year'])  == '2013'
       expect(params['month']) == '12'
-      expect(params['day']) == '13'
+      expect(params['day'])   == '13'
       expect(params['title']) == 'foo - bar'
-      expect(params['path']) == 'foo/bar.html'
+      expect(params['path'])  == 'foo/bar.html'
     end
   end
+
+  describe 'extract_directory_path' do
+
+    it 'can extract a directory path' do
+
+      template     = uri_template( '{year}/{month}/{day}/{title}/{+path}' )
+      params       = extract_params( template, '2013/12/13/foo-bar/foo/bar.html' )
+      article_path = apply_uri_template template, params
+
+      expect( extract_directory_path( article_path ) ) == '2013-12-13-foo-bar-foo-bar'
+
+    end
+
+  end
+
 end

metadata

@@ -1,30 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: middleman-blog
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Thomas Reynolds
 - Ben Hollis
+- Ian Warner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -53,21 +54,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-description: Blog engine for Middleman
+description: " Blog engine for Middleman "
 email:
 - me@tdreyno.com
 - ben@benhollis.net
+- ian.warner@drykiss.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemtest"
+- ".editorconfig"
 - ".gitignore"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- ISSUE_TEMPLATE.md
 - LICENSE.md
 - README.md
 - Rakefile
@@ -87,10 +90,9 @@ files:
 - features/layouts.feature
 - features/multiblog.feature
 - features/next_previous.feature
-- features/no_date.feature
 - features/paginate.feature
 - features/paginate_multiblog.feature
-- features/permalink-data.feature
+- features/permalink.feature
 - features/preview.feature
 - features/published.feature
 - features/summary.feature
@@ -99,21 +101,33 @@ files:
 - features/tags.feature
 - features/tags_multiblog.feature
 - features/time_zone.feature
+- fixtures/article-dirs-app/config-directory-indexes.rb
+- fixtures/article-dirs-app/config-permalink-with-dot.rb
 - fixtures/article-dirs-app/config.rb
 - fixtures/article-dirs-app/source/blog/2011-01-01-new-article.html.markdown
 - fixtures/article-dirs-app/source/blog/2011-01-01-new-article/example.txt
 - fixtures/article-dirs-app/source/index.html.erb
 - fixtures/article-dirs-app/source/layout.erb
 - fixtures/blog-sources-app/config.rb
-- fixtures/blog-sources-app/source/_article_template.erb
 - fixtures/blog-sources-app/source/blog/2011-01-01-new-article.html.markdown
 - fixtures/blog-sources-app/source/blog/2013-08-08-slug-from-filename.html.markdown
 - fixtures/blog-sources-app/source/index.html.erb
 - fixtures/blog-sources-app/source/layout.erb
+- fixtures/blog-sources-no-date-app/config.rb
+- fixtures/blog-sources-no-date-app/source/blog/new-article.html.markdown
+- fixtures/blog-sources-no-date-app/source/index.html.erb
+- fixtures/blog-sources-no-date-app/source/layout.erb
+- fixtures/blog-sources-no-day-app/config.rb
+- fixtures/blog-sources-no-day-app/source/2012-08-testing.html.markdown
+- fixtures/blog-sources-no-day-app/source/layout.erb
+- fixtures/blog-sources-no-title-app/config.rb
+- fixtures/blog-sources-no-title-app/source/2013-08-07.html.markdown
+- fixtures/blog-sources-no-title-app/source/2013-08-08.html.markdown
+- fixtures/blog-sources-no-title-app/source/layout.erb
 - fixtures/blog-sources-subdirs-app/config.rb
 - fixtures/blog-sources-subdirs-app/source/blog.html.erb
-- fixtures/blog-sources-subdirs-app/source/blog/another-post.html.md.erb
-- fixtures/blog-sources-subdirs-app/source/blog/subdir/yet-another-post.html.md.erb
+- fixtures/blog-sources-subdirs-app/source/blog/another-post.html.markdown
+- fixtures/blog-sources-subdirs-app/source/blog/subdir/yet-another-post.html.markdown
 - fixtures/blog-sources-subdirs-app/source/layout.erb
 - fixtures/calendar-and-tag-app/config-directory-indexes.rb
 - fixtures/calendar-and-tag-app/config.rb
@@ -207,14 +221,19 @@ files:
 - fixtures/language-app/config.rb
 - fixtures/language-app/locales/en.yml
 - fixtures/language-app/locales/ru.yml
+- fixtures/language-app/source/2013-09-05-previous-english-article.html.erb
+- fixtures/language-app/source/2013-09-06-previous-russian-article.html.erb
 - fixtures/language-app/source/2013-09-07-english-article-with-lang-in-frontmatter.html.erb
 - fixtures/language-app/source/2013-09-07-russian-article-with-lang-in-frontmatter.html.erb
+- fixtures/language-app/source/2013-09-08-next-russian-article.html.erb
+- fixtures/language-app/source/2013-09-09-next-english-article.html.erb
 - fixtures/language-app/source/en/2013-09-07-english-article-with-lang-in-path.html.erb
 - fixtures/language-app/source/layouts/layout.erb
 - fixtures/language-app/source/localizable/index.html.erb
 - fixtures/language-app/source/ru/2013-09-07-russian-article-with-lang-in-path.html.erb
 - fixtures/layouts-app/config.rb
 - fixtures/layouts-app/source/2011/01/01/first-article.html.markdown
+- fixtures/layouts-app/source/2011/01/01/fourth-article.html.markdown
 - fixtures/layouts-app/source/2011/01/01/second-article.html.markdown
 - fixtures/layouts-app/source/2011/01/01/third-article.html.markdown
 - fixtures/layouts-app/source/2011/01/02/article-in-normal-layout.html.markdown
@@ -229,18 +248,6 @@ files:
 - fixtures/multiblog-app/source/blog2/2011/01/01/new-article.html.markdown
 - fixtures/multiblog-app/source/index.html.erb
 - fixtures/multiblog-app/source/layout.erb
-- fixtures/no-date-app/config.rb
-- fixtures/no-date-app/source/_article_template.erb
-- fixtures/no-date-app/source/blog/new-article.html.markdown
-- fixtures/no-date-app/source/index.html.erb
-- fixtures/no-date-app/source/layout.erb
-- fixtures/no-day-app/config.rb
-- fixtures/no-day-app/source/2012-08-testing.html.markdown
-- fixtures/no-day-app/source/layout.erb
-- fixtures/no-title-app/config.rb
-- fixtures/no-title-app/source/2013-08-07.html.markdown
-- fixtures/no-title-app/source/2013-08-08.html.markdown
-- fixtures/no-title-app/source/layout.erb
 - fixtures/paginate-app/config-directory-indexes.rb
 - fixtures/paginate-app/config-paginate-off.rb
 - fixtures/paginate-app/config.rb
@@ -287,10 +294,10 @@ files:
 - fixtures/paginate-multiblog-app/source/tag1.html.erb
 - fixtures/paginate-multiblog-app/source/tag2.html.erb
 - fixtures/paginate-multiblog-app/source/tag3.html.erb
-- fixtures/permalink-data-app/config.rb
-- fixtures/permalink-data-app/source/index.html.erb
-- fixtures/permalink-data-app/source/layout.erb
-- fixtures/permalink-data-app/source/news/2011-01-01-new-article.html.markdown
+- fixtures/permalink-app/config.rb
+- fixtures/permalink-app/source/index.html.erb
+- fixtures/permalink-app/source/layout.erb
+- fixtures/permalink-app/source/news/2011-01-01-new-article.html.markdown
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/2011/01/01/new-article.html.markdown
 - fixtures/preview-app/source/index.html.erb
@@ -307,12 +314,15 @@ files:
 - fixtures/summary-app/source/2011-01-01-article-with-standard-summary-separator.html.markdown
 - fixtures/summary-app/source/2012-06-19-article-with-no-summary-separator.html.markdown
 - fixtures/summary-app/source/2013-05-08-article-with-custom-separator.html.markdown
+- fixtures/summary-app/source/2016-05-21-article-with-comment-separator.html.markdown
 - fixtures/summary-app/source/index.html.erb
 - fixtures/tags-app/config-directory-indexes.rb
+- fixtures/tags-app/config-filters.rb
 - fixtures/tags-app/config-no-tags.rb
 - fixtures/tags-app/config.rb
 - fixtures/tags-app/source/blog/2011-01-01-new-article.html.markdown
 - fixtures/tags-app/source/blog/2011-01-02-another-article.html.markdown
+- fixtures/tags-app/source/blog/2011-01-03-no-taga.html.markdown
 - fixtures/tags-app/source/index.html.erb
 - fixtures/tags-app/source/layout.erb
 - fixtures/tags-app/source/tag.html.erb
@@ -369,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Blog engine for Middleman
@@ -390,10 +400,9 @@ test_files:
 - features/layouts.feature
 - features/multiblog.feature
 - features/next_previous.feature
-- features/no_date.feature
 - features/paginate.feature
 - features/paginate_multiblog.feature
-- features/permalink-data.feature
+- features/permalink.feature
 - features/preview.feature
 - features/published.feature
 - features/summary.feature
@@ -402,21 +411,33 @@ test_files:
 - features/tags.feature
 - features/tags_multiblog.feature
 - features/time_zone.feature
+- fixtures/article-dirs-app/config-directory-indexes.rb
+- fixtures/article-dirs-app/config-permalink-with-dot.rb
 - fixtures/article-dirs-app/config.rb
 - fixtures/article-dirs-app/source/blog/2011-01-01-new-article.html.markdown
 - fixtures/article-dirs-app/source/blog/2011-01-01-new-article/example.txt
 - fixtures/article-dirs-app/source/index.html.erb
 - fixtures/article-dirs-app/source/layout.erb
 - fixtures/blog-sources-app/config.rb
-- fixtures/blog-sources-app/source/_article_template.erb
 - fixtures/blog-sources-app/source/blog/2011-01-01-new-article.html.markdown
 - fixtures/blog-sources-app/source/blog/2013-08-08-slug-from-filename.html.markdown
 - fixtures/blog-sources-app/source/index.html.erb
 - fixtures/blog-sources-app/source/layout.erb
+- fixtures/blog-sources-no-date-app/config.rb
+- fixtures/blog-sources-no-date-app/source/blog/new-article.html.markdown
+- fixtures/blog-sources-no-date-app/source/index.html.erb
+- fixtures/blog-sources-no-date-app/source/layout.erb
+- fixtures/blog-sources-no-day-app/config.rb
+- fixtures/blog-sources-no-day-app/source/2012-08-testing.html.markdown
+- fixtures/blog-sources-no-day-app/source/layout.erb
+- fixtures/blog-sources-no-title-app/config.rb
+- fixtures/blog-sources-no-title-app/source/2013-08-07.html.markdown
+- fixtures/blog-sources-no-title-app/source/2013-08-08.html.markdown
+- fixtures/blog-sources-no-title-app/source/layout.erb
 - fixtures/blog-sources-subdirs-app/config.rb
 - fixtures/blog-sources-subdirs-app/source/blog.html.erb
-- fixtures/blog-sources-subdirs-app/source/blog/another-post.html.md.erb
-- fixtures/blog-sources-subdirs-app/source/blog/subdir/yet-another-post.html.md.erb
+- fixtures/blog-sources-subdirs-app/source/blog/another-post.html.markdown
+- fixtures/blog-sources-subdirs-app/source/blog/subdir/yet-another-post.html.markdown
 - fixtures/blog-sources-subdirs-app/source/layout.erb
 - fixtures/calendar-and-tag-app/config-directory-indexes.rb
 - fixtures/calendar-and-tag-app/config.rb
@@ -510,14 +531,19 @@ test_files:
 - fixtures/language-app/config.rb
 - fixtures/language-app/locales/en.yml
 - fixtures/language-app/locales/ru.yml
+- fixtures/language-app/source/2013-09-05-previous-english-article.html.erb
+- fixtures/language-app/source/2013-09-06-previous-russian-article.html.erb
 - fixtures/language-app/source/2013-09-07-english-article-with-lang-in-frontmatter.html.erb
 - fixtures/language-app/source/2013-09-07-russian-article-with-lang-in-frontmatter.html.erb
+- fixtures/language-app/source/2013-09-08-next-russian-article.html.erb
+- fixtures/language-app/source/2013-09-09-next-english-article.html.erb
 - fixtures/language-app/source/en/2013-09-07-english-article-with-lang-in-path.html.erb
 - fixtures/language-app/source/layouts/layout.erb
 - fixtures/language-app/source/localizable/index.html.erb
 - fixtures/language-app/source/ru/2013-09-07-russian-article-with-lang-in-path.html.erb
 - fixtures/layouts-app/config.rb
 - fixtures/layouts-app/source/2011/01/01/first-article.html.markdown
+- fixtures/layouts-app/source/2011/01/01/fourth-article.html.markdown
 - fixtures/layouts-app/source/2011/01/01/second-article.html.markdown
 - fixtures/layouts-app/source/2011/01/01/third-article.html.markdown
 - fixtures/layouts-app/source/2011/01/02/article-in-normal-layout.html.markdown
@@ -532,18 +558,6 @@ test_files:
 - fixtures/multiblog-app/source/blog2/2011/01/01/new-article.html.markdown
 - fixtures/multiblog-app/source/index.html.erb
 - fixtures/multiblog-app/source/layout.erb
-- fixtures/no-date-app/config.rb
-- fixtures/no-date-app/source/_article_template.erb
-- fixtures/no-date-app/source/blog/new-article.html.markdown
-- fixtures/no-date-app/source/index.html.erb
-- fixtures/no-date-app/source/layout.erb
-- fixtures/no-day-app/config.rb
-- fixtures/no-day-app/source/2012-08-testing.html.markdown
-- fixtures/no-day-app/source/layout.erb
-- fixtures/no-title-app/config.rb
-- fixtures/no-title-app/source/2013-08-07.html.markdown
-- fixtures/no-title-app/source/2013-08-08.html.markdown
-- fixtures/no-title-app/source/layout.erb
 - fixtures/paginate-app/config-directory-indexes.rb
 - fixtures/paginate-app/config-paginate-off.rb
 - fixtures/paginate-app/config.rb
@@ -590,10 +604,10 @@ test_files:
 - fixtures/paginate-multiblog-app/source/tag1.html.erb
 - fixtures/paginate-multiblog-app/source/tag2.html.erb
 - fixtures/paginate-multiblog-app/source/tag3.html.erb
-- fixtures/permalink-data-app/config.rb
-- fixtures/permalink-data-app/source/index.html.erb
-- fixtures/permalink-data-app/source/layout.erb
-- fixtures/permalink-data-app/source/news/2011-01-01-new-article.html.markdown
+- fixtures/permalink-app/config.rb
+- fixtures/permalink-app/source/index.html.erb
+- fixtures/permalink-app/source/layout.erb
+- fixtures/permalink-app/source/news/2011-01-01-new-article.html.markdown
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/2011/01/01/new-article.html.markdown
 - fixtures/preview-app/source/index.html.erb
@@ -610,12 +624,15 @@ test_files:
 - fixtures/summary-app/source/2011-01-01-article-with-standard-summary-separator.html.markdown
 - fixtures/summary-app/source/2012-06-19-article-with-no-summary-separator.html.markdown
 - fixtures/summary-app/source/2013-05-08-article-with-custom-separator.html.markdown
+- fixtures/summary-app/source/2016-05-21-article-with-comment-separator.html.markdown
 - fixtures/summary-app/source/index.html.erb
 - fixtures/tags-app/config-directory-indexes.rb
+- fixtures/tags-app/config-filters.rb
 - fixtures/tags-app/config-no-tags.rb
 - fixtures/tags-app/config.rb
 - fixtures/tags-app/source/blog/2011-01-01-new-article.html.markdown
 - fixtures/tags-app/source/blog/2011-01-02-another-article.html.markdown
+- fixtures/tags-app/source/blog/2011-01-03-no-taga.html.markdown
 - fixtures/tags-app/source/index.html.erb
 - fixtures/tags-app/source/layout.erb
 - fixtures/tags-app/source/tag.html.erb
@@ -634,4 +651,3 @@ test_files:
 - fixtures/tags-multiblog-app/source/tag2.html.erb
 - fixtures/time-zone-app/config.rb
 - fixtures/time-zone-app/source/blog/2013-06-24-hello.html.erb
-has_rdoc: