middleman-blog 3.6.0.beta.2 → 4.0.0

data/lib/middleman-blog/calendar_pages.rb

@@ -19,6 +19,9 @@ module Middleman
         @day_template = blog_options.day_template
         @month_template = blog_options.month_template
         @year_template = blog_options.year_template
+        @generate_year_pages = blog_options.generate_year_pages
+        @generate_month_pages = blog_options.generate_month_pages
+        @generate_day_pages = blog_options.generate_day_pages
       end
 
       # Get a path to the given calendar page, based on the :year_link, :month_link or :day_link setting.
@@ -45,17 +48,17 @@ module Middleman
 
         # Set up date pages if the appropriate templates have been specified
         @blog_data.articles.group_by {|a| a.date.year }.each do |year, year_articles|
-          if @year_template
+          if @generate_year_pages && @year_template
             new_resources << year_page_resource(year, year_articles)
           end
 
           year_articles.group_by {|a| a.date.month }.each do |month, month_articles|
-            if @month_template
+            if @generate_month_pages && @month_template
               new_resources << month_page_resource(year, month, month_articles)
             end
 
             month_articles.group_by {|a| a.date.day }.each do |day, day_articles|
-              if @day_template
+              if @generate_day_pages && @day_template
                 new_resources << day_page_resource(year, month, day, day_articles)
               end
             end
@@ -68,9 +71,7 @@ module Middleman
       private
 
       def year_page_resource(year, year_articles)
-        Sitemap::Resource.new(@sitemap, link(year)).tap do |p|
-          p.proxy_to(@year_template)
-
+        Sitemap::ProxyResource.new(@sitemap, link(year), @year_template).tap do |p|
           # Add metadata in local variables so it's accessible to
           # later extensions
           p.add_metadata locals: {
@@ -83,9 +84,7 @@ module Middleman
       end
 
       def month_page_resource(year, month, month_articles)
-        Sitemap::Resource.new(@sitemap, link(year, month)).tap do |p|
-          p.proxy_to(@month_template)
-
+        Sitemap::ProxyResource.new(@sitemap, link(year, month), @month_template).tap do |p|
           p.add_metadata locals: {
             'page_type' => 'month',
             'year' => year,
@@ -97,9 +96,7 @@ module Middleman
       end
 
       def day_page_resource(year, month, day, day_articles)
-        Sitemap::Resource.new(@sitemap, link(year, month, day)).tap do |p|
-          p.proxy_to(@day_template)
-
+        Sitemap::ProxyResource.new(@sitemap, link(year, month, day), @day_template).tap do |p|
           p.add_metadata locals: {
             'page_type' => 'day',
             'year' => year,

data/lib/middleman-blog/custom_pages.rb

@@ -27,8 +27,8 @@ module Middleman
 
       def manipulate_resource_list(resources)
         articles_by_property = @blog_data.articles.
-          select {|a| a.metadata[:page][property.to_s] }.
-          group_by {|a| a.metadata[:page][property.to_s] }
+          select {|a| a.data[property] }.
+          group_by {|a| a.data[property] }
         resources + articles_by_property.map do |property_value, articles|
           build_resource(link(property_value), property_value, articles)
         end
@@ -38,8 +38,7 @@ module Middleman
 
       def build_resource(path, value, articles)
         articles = articles.sort_by(&:date).reverse
-        Sitemap::Resource.new(@sitemap, path).tap do |p|
-          p.proxy_to(@page_template)
+        Sitemap::ProxyResource.new(@sitemap, path, @page_template).tap do |p|
           p.add_metadata locals: {
             "page_type"       => property.to_s,
             property          => value,

data/lib/middleman-blog/extension.rb

@@ -5,8 +5,12 @@ require 'middleman-blog/helpers'
 
 module Middleman
   class BlogExtension < Extension
+    extend Forwardable
+
     self.supports_multiple_instances = true
 
+    def_delegator :app, :logger
+
     option :name, nil, 'Unique ID for telling multiple blogs apart'
     option :prefix, nil, 'Prefix to mount the blog at (modifies permalink, sources, taglink, year_link, month_link, day_link to start with the prefix)'
     option :permalink, '/{year}/{month}/{day}/{title}.html', 'Path articles are generated at. Tokens can be omitted or duplicated, and you can use tokens defined in article frontmatter.'
@@ -24,6 +28,10 @@ module Middleman
     option :month_template, nil, 'Template path (no template extension) for monthly archive pages. Defaults to the :calendar_template.'
     option :day_template, nil, 'Template path (no template extension) for daily archive pages. Defaults to the :calendar_template.'
     option :tag_template, nil, 'Template path (no template extension) for tag archive pages.'
+    option :generate_year_pages, true, 'Whether to generate year pages.'
+    option :generate_month_pages, true, 'Whether to generate month pages.'
+    option :generate_day_pages, true, 'Whether to generate day pages.'
+    option :generate_tag_pages, true, 'Whether to generate tag pages.'
     option :paginate, false, 'Whether to paginate lists of articles'
     option :per_page, 10, 'Number of articles per page when paginating'
     option :page_link, 'page/{num}', 'Path to append for additional pages when paginating'
@@ -86,7 +94,15 @@ module Middleman
     end
 
     def after_configuration
-      @name ||= :"blog#{::Middleman::Blog.instances.keys.length}"
+      @name ||= begin
+        found_name = nil
+
+        app.extensions[:blog].values.each_with_index do |ext, i|
+          found_name = "blog#{i+1}" if ext == self
+        end
+
+        found_name
+      end
 
       # TODO: break up into private methods?
 
@@ -96,8 +112,6 @@ module Middleman
       @app.ignore(options.day_template) if options.day_template
       @app.ignore options.tag_template if options.tag_template
 
-      ::Middleman::Blog.instances[@name] = self
-
       # Make sure ActiveSupport's TimeZone stuff has something to work with,
       # allowing people to set their desired time zone via Time.zone or
       # set :time_zone
@@ -112,20 +126,20 @@ module Middleman
       # Initialize blog with options
       @data = Blog::BlogData.new(@app, self, options)
 
-      @app.sitemap.register_resource_list_manipulator(:"blog_#{name}_articles", @data, false)
+      @app.sitemap.register_resource_list_manipulator(:"blog_#{name}_articles", @data)
 
       if options.tag_template
         @app.ignore options.tag_template
 
         require 'middleman-blog/tag_pages'
         @tag_pages = Blog::TagPages.new(@app, self)
-        @app.sitemap.register_resource_list_manipulator(:"blog_#{name}_tags", @tag_pages, false)
+        @app.sitemap.register_resource_list_manipulator(:"blog_#{name}_tags", @tag_pages)
       end
 
       if options.year_template || options.month_template || options.day_template
         require 'middleman-blog/calendar_pages'
         @calendar_pages = Blog::CalendarPages.new(@app, self)
-        @app.sitemap.register_resource_list_manipulator(:"blog_#{name}_calendar", @calendar_pages, false)
+        @app.sitemap.register_resource_list_manipulator(:"blog_#{name}_calendar", @calendar_pages)
       end
 
       if options.custom_collections
@@ -136,8 +150,10 @@ module Middleman
       if options.paginate
         require 'middleman-blog/paginator'
         @paginator = Blog::Paginator.new(@app, self)
-        @app.sitemap.register_resource_list_manipulator(:"blog_#{name}_paginate", @paginator, false)
+        @app.sitemap.register_resource_list_manipulator(:"blog_#{name}_paginate", @paginator)
       end
+
+      logger.info "== Blog Sources: #{options.sources} (:prefix + :sources)"
     end
 
     private
@@ -166,7 +182,7 @@ module Middleman
         @app.ignore options[:template]
 
         @custom_pages[property] = Blog::CustomPages.new(property, @app, self, options)
-        @app.sitemap.register_resource_list_manipulator(:"blog_#{name}_#{property}", @custom_pages[property], false)
+        @app.sitemap.register_resource_list_manipulator(:"blog_#{name}_#{property}", @custom_pages[property])
 
         Blog::Helpers.generate_custom_helper(property)
       end

data/lib/middleman-blog/helpers.rb

@@ -1,26 +1,19 @@
 module Middleman
   module Blog
-    def self.instances
-      @blog_instances ||= {}
-    end
-
-    def self.instances=(v)
-      @blog_instances = v
-    end
-
     # Blog-related helpers that are available to the Middleman application in +config.rb+ and in templates.
     module Helpers
-      def self.included(base)
-        ::Middleman::Blog.instances = {}
-      end
-
       # All the blog instances known to this Middleman app, keyed by name. A new blog is added
       # every time the blog extension is activated. Name them by setting the +:name+
       # option when activating - otherwise they get an automatic name like 'blog0', 'blog1', etc.
       #
       # @return [Hash<Symbol,BlogExtension>] a hash of all blog instances by name
       def blog_instances
-        ::Middleman::Blog.instances
+        return nil unless app.extensions[:blog]
+
+        app.extensions[:blog].keys.each_with_object({}) do |k, sum|
+          ext = app.extensions[:blog][k]
+          sum[ext.name.to_sym] = ext
+        end
       end
 
       # Retrieve a {BlogExtension} instance.
@@ -35,7 +28,7 @@ module Middleman
       # @return [BlogExtension]
       def blog_controller(blog_name=nil)
         if !blog_name && current_resource
-          blog_name = current_resource.metadata[:page]["blog"]
+          blog_name = current_resource.metadata[:page][:blog]
 
           if !blog_name
             blog_controller = current_resource.blog_controller if current_resource.respond_to?(:blog_controller)
@@ -49,7 +42,7 @@ module Middleman
         end
 
         # Warn if a non-existent blog name provided
-        if blog_name && !blog_instances.keys.include?(blog_name)
+        if blog_name && !blog_instances.keys.include?(blog_name.to_sym)
           raise "Non-existent blog name provided: #{blog_name}."
         end
 
@@ -132,12 +125,12 @@ module Middleman
       # @return [Array<Middleman::Sitemap::Resource>]
       def page_articles(blog_name=nil)
         meta = current_resource.metadata
-        limit = meta[:page]["per_page"]
+        limit = current_resource.data[:per_page]
 
         # "articles" local variable is populated by Calendar and Tag page generators
         # If it's not set then use the complete list of articles
         articles = meta[:locals]["articles"] || blog(blog_name).articles
-
+        
         limit ? articles.first(limit) : articles
       end
 

data/lib/middleman-blog/paginator.rb

@@ -25,7 +25,7 @@ module Middleman
           # Avoid recomputing metadata over and over
           md = res.metadata
 
-          next unless md[:page]["pageable"]
+          next unless md[:page][:pageable]
 
           # Skip other blogs' resources
           next unless match_blog(res, md)
@@ -36,8 +36,8 @@ module Middleman
           articles = md[:locals]["articles"] || @blog_controller.data.articles
 
           # Allow blog.per_page and blog.page_link to be overridden in the frontmatter
-          per_page  = md[:page]["per_page"] || @per_page
-          page_link = uri_template(md[:page]["page_link"] || @page_link)
+          per_page  = md[:page][:per_page] || @per_page
+          page_link = uri_template(md[:page][:page_link] || @page_link)
 
           num_pages = (articles.length / per_page.to_f).ceil
 
@@ -73,7 +73,7 @@ module Middleman
       def match_blog(res, md)
         res_controller = md[:locals]["blog_controller"] || (res.respond_to?(:blog_controller) && res.blog_controller)
         return false if res_controller && res_controller != @blog_controller
-        override_controller = md[:page]["blog"]
+        override_controller = md[:page][:blog]
         return false if override_controller && override_controller.to_s != @blog_controller.name.to_s
 
         true
@@ -85,9 +85,11 @@ module Middleman
       # @param [String] page_link The pagination link path component template
       def page_resource(res, page_num, page_link)
         path = page_sub(res, page_num, page_link)
-        Sitemap::Resource.new(@app.sitemap, path, res.source_file).tap do |p|
-          # Copy the proxy state from the base page.
-          p.proxy_to(res.proxied_to) if res.proxy?
+
+        if res.is_a? Sitemap::ProxyResource
+          Sitemap::ProxyResource.new(@app.sitemap, path, res.target)
+        else
+          Sitemap::Resource.new(@app.sitemap, path, res.source_file)
         end
       end
 

data/lib/middleman-blog/tag_pages.rb

@@ -13,6 +13,8 @@ module Middleman
         @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.
@@ -25,6 +27,8 @@ module Middleman
       # Update the main sitemap resource list
       # @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)
         end
@@ -33,9 +37,7 @@ module Middleman
       private
 
       def tag_page_resource(tag, articles)
-        Sitemap::Resource.new(@sitemap, link(tag)).tap do |p|
-          p.proxy_to(@tag_template)
-
+        Sitemap::ProxyResource.new(@sitemap, link(tag), @tag_template).tap do |p|
           # Add metadata in local variables so it's accessible to
           # later extensions
           p.add_metadata locals: {

data/lib/middleman-blog/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Blog
-    VERSION = "3.6.0.beta.2"
+    VERSION = "4.0.0"
   end
 end

data/middleman-blog.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   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 = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
 
-  s.add_dependency("middleman-core", [">= 3.3"])
+  s.add_dependency("middleman-core", [">= 4.0.0"])
   s.add_dependency("tzinfo", [">= 0.3.0"])
-  s.add_dependency("addressable", ["~> 2.3.5"])
+  s.add_dependency("addressable", ["~> 2.4.0"])
 end

data/spec/uri_templates_spec.rb

@@ -7,24 +7,24 @@ describe 'Middleman::Blog::UriTemplates' do
 
   describe 'safe_parameterize' do
     it 'can parameterize normal strings' do
-      safe_parameterize('Some FUN stuff!').should == 'some-fun-stuff'
+      expect(safe_parameterize('Some FUN stuff!')) == 'some-fun-stuff'
     end
 
     it "doesn't mangle unicode strings" do
-      safe_parameterize('☆☆☆').should == '☆☆☆'
-      safe_parameterize('明日がある').should == '明日がある'
+      expect(safe_parameterize('☆☆☆')) == '☆☆☆'
+      expect(safe_parameterize('明日がある')) == '明日がある'
     end
 
     it "still transliterates when it's safe" do
-      safe_parameterize('Schlagwörter').should == 'schlagworter'
+      expect(safe_parameterize('Schlagwörter')) == 'schlagworter'
     end
 
     it "can handle mixed strings" do
-      safe_parameterize('What ☆☆☆!').should == 'what-☆☆☆'
+      expect(safe_parameterize('What ☆☆☆!')) == 'what-☆☆☆'
     end
 
     it "can handle numbers" do
-      safe_parameterize(1).should == '1'
+      expect(safe_parameterize(1)) == '1'
     end
   end
 
@@ -33,16 +33,16 @@ 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')
 
-      params['year'].should == '2013'
-      params['month'].should == '12'
-      params['day'].should == '13'
-      params['title'].should == 'foo-bar'
-      params['path'].should == 'foo/bar.html'
+      expect(params['year']) == '2013'
+      expect(params['month']) == '12'
+      expect(params['day']) == '13'
+      expect(params['title']) == 'foo-bar'
+      expect(params['path']) == 'foo/bar.html'
     end
 
     it 'returns nil if there is no match' do
       template = uri_template('{year}/{month}/{day}/{title}/{+path}')
-      extract_params(template, 'foo/bar.html').should == nil
+      expect(extract_params(template, 'foo/bar.html')) == nil
     end
 
     it 'returns nil if there is no match in the date bits' do
@@ -54,11 +54,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')
 
-      params['year'].should == '2013'
-      params['month'].should == '12'
-      params['day'].should == '13'
-      params['title'].should == 'foo - bar'
-      params['path'].should == 'foo/bar.html'
+      expect(params['year']) == '2013'
+      expect(params['month']) == '12'
+      expect(params['day']) == '13'
+      expect(params['title']) == 'foo - bar'
+      expect(params['path']) == 'foo/bar.html'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-blog
 version: !ruby/object:Gem::Version
-  version: 3.6.0.beta.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 2.4.0
 description: Blog engine for Middleman
 email:
 - me@tdreyno.com
@@ -71,7 +71,6 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- features/article_cli.feature
 - features/article_dirs.feature
 - features/blog_sources.feature
 - features/calendar-and-tag.feature
@@ -113,8 +112,8 @@ files:
 - fixtures/blog-sources-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.md.erb
-- fixtures/blog-sources-subdirs-app/source/blog/subdir/yet-another-post.md.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/layout.erb
 - fixtures/calendar-and-tag-app/config-directory-indexes.rb
 - fixtures/calendar-and-tag-app/config.rb
@@ -124,6 +123,7 @@ files:
 - fixtures/calendar-and-tag-app/source/index.html.erb
 - fixtures/calendar-and-tag-app/source/layout.erb
 - fixtures/calendar-app/config-directory-indexes.rb
+- fixtures/calendar-app/config-only-year.rb
 - fixtures/calendar-app/config.rb
 - fixtures/calendar-app/source/blog/2011-01-01-new-article.html.markdown
 - fixtures/calendar-app/source/blog/2011-01-02-another-article.html.markdown
@@ -217,8 +217,8 @@ files:
 - fixtures/layouts-app/source/2011/01/01/first-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.markdown
-- fixtures/layouts-app/source/2011/01/03/article-without-layout.markdown
+- fixtures/layouts-app/source/2011/01/02/article-in-normal-layout.html.markdown
+- fixtures/layouts-app/source/2011/01/03/article-without-layout.html.markdown
 - fixtures/layouts-app/source/layouts/first.html.erb
 - fixtures/layouts-app/source/layouts/layout.erb
 - fixtures/layouts-app/source/layouts/second.html.erb
@@ -307,6 +307,7 @@ files:
 - fixtures/summary-app/source/2013-05-08-article-with-custom-separator.html.markdown
 - fixtures/summary-app/source/index.html.erb
 - fixtures/tags-app/config-directory-indexes.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
@@ -332,22 +333,11 @@ files:
 - lib/middleman-blog/blog_article.rb
 - lib/middleman-blog/blog_data.rb
 - lib/middleman-blog/calendar_pages.rb
-- lib/middleman-blog/commands/article.rb
-- lib/middleman-blog/commands/article.tt
 - lib/middleman-blog/custom_pages.rb
 - lib/middleman-blog/extension.rb
 - lib/middleman-blog/helpers.rb
 - lib/middleman-blog/paginator.rb
 - lib/middleman-blog/tag_pages.rb
-- lib/middleman-blog/template.rb
-- lib/middleman-blog/template/config.tt
-- lib/middleman-blog/template/shared/Gemfile.tt
-- lib/middleman-blog/template/source/2012-01-01-example-article.html.markdown
-- lib/middleman-blog/template/source/calendar.html.erb
-- lib/middleman-blog/template/source/feed.xml.builder
-- lib/middleman-blog/template/source/index.html.erb
-- lib/middleman-blog/template/source/layout.erb
-- lib/middleman-blog/template/source/tag.html.erb
 - lib/middleman-blog/truncate_html.rb
 - lib/middleman-blog/uri_templates.rb
 - lib/middleman-blog/version.rb
@@ -367,20 +357,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Blog engine for Middleman
 test_files:
-- features/article_cli.feature
 - features/article_dirs.feature
 - features/blog_sources.feature
 - features/calendar-and-tag.feature
@@ -422,8 +411,8 @@ test_files:
 - fixtures/blog-sources-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.md.erb
-- fixtures/blog-sources-subdirs-app/source/blog/subdir/yet-another-post.md.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/layout.erb
 - fixtures/calendar-and-tag-app/config-directory-indexes.rb
 - fixtures/calendar-and-tag-app/config.rb
@@ -433,6 +422,7 @@ test_files:
 - fixtures/calendar-and-tag-app/source/index.html.erb
 - fixtures/calendar-and-tag-app/source/layout.erb
 - fixtures/calendar-app/config-directory-indexes.rb
+- fixtures/calendar-app/config-only-year.rb
 - fixtures/calendar-app/config.rb
 - fixtures/calendar-app/source/blog/2011-01-01-new-article.html.markdown
 - fixtures/calendar-app/source/blog/2011-01-02-another-article.html.markdown
@@ -526,8 +516,8 @@ test_files:
 - fixtures/layouts-app/source/2011/01/01/first-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.markdown
-- fixtures/layouts-app/source/2011/01/03/article-without-layout.markdown
+- fixtures/layouts-app/source/2011/01/02/article-in-normal-layout.html.markdown
+- fixtures/layouts-app/source/2011/01/03/article-without-layout.html.markdown
 - fixtures/layouts-app/source/layouts/first.html.erb
 - fixtures/layouts-app/source/layouts/layout.erb
 - fixtures/layouts-app/source/layouts/second.html.erb
@@ -616,6 +606,7 @@ test_files:
 - fixtures/summary-app/source/2013-05-08-article-with-custom-separator.html.markdown
 - fixtures/summary-app/source/index.html.erb
 - fixtures/tags-app/config-directory-indexes.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