middleman-blog 3.2.0 → 3.3.0

data/lib/middleman-blog/paginator.rb

@@ -4,8 +4,25 @@ module Middleman
     # A sitemap plugin that splits indexes (including tag
     # and calendar indexes) over multiple pages
     class Paginator
-      def initialize(app)
+      def initialize(app, controller=nil)
         @app = app
+        @blog_controller = controller
+      end
+
+      def blog_data
+        if @blog_controller
+          @blog_controller.data
+        else
+          @app.blog
+        end
+      end
+
+      def blog_options
+        if @blog_controller
+          @blog_controller.options
+        else
+          @app.blog.options
+        end
       end
 
       # Substitute the page number into the resource URL.
@@ -32,17 +49,24 @@ module Middleman
 
         resources.each do |res|
           next if res.ignored?
-
+          
           md = res.metadata
+
+          # Skip other blogs' resources
+          res_controller = md[:locals]["blog_controller"] || res.blog_controller
+          next if @blog_controller && res_controller && (res_controller != @blog_controller)
+          override_controller = md[:page]["blog"]
+          next if @blog_controller && override_controller && override_controller != @blog_controller.uid
+
           if md[:page]["pageable"]
             # "articles" local variable is populated by Calendar and Tag page generators
             # If it's not set then use the complete list of articles
             # TODO: Some way to allow the frontmatter to specify the article filter?
-            articles = md[:locals]["articles"] || @app.blog.articles
+            articles = md[:locals]["articles"] || self.blog_data.articles
 
             # Allow blog.per_page and blog.page_link to be overridden in the frontmatter
-            per_page  = md[:page]["per_page"] || @app.blog.options.per_page
-            page_link = md[:page]["page_link"] || @app.blog.options.page_link
+            per_page  = md[:page]["per_page"] || self.blog_options.per_page
+            page_link = md[:page]["page_link"] || self.blog_options.page_link
 
             num_pages = (articles.length / per_page.to_f).ceil
 
@@ -72,7 +96,8 @@ module Middleman
 
               # Include the articles so that non-proxied pages can use "articles" instead
               # of "blog.articles" for consistency with the calendar and tag templates.
-              'articles' => articles
+              'articles' => articles,
+              'blog_controller' => @blog_controller
             }
 
             prev_page_res = res
@@ -105,7 +130,8 @@ module Middleman
                 'next_page' => nil,
                 'prev_page' => prev_page_res,
                 'page_articles' => articles[page_start..page_end],
-                'articles' => articles
+                'articles' => articles,
+                'blog_controller' => @blog_controller
               }
 
               # Add a reference in the previous page to this page

data/lib/middleman-blog/tag_pages.rb

@@ -6,37 +6,54 @@ module Middleman
     class TagPages
       class << self
         # Get a path to the given tag, based on the :taglink setting.
-        # @param [Middleman::Application] app
+        # @param [Hash] blog_options
         # @param [String] tag
         # @return [String]
-        def link(app, tag)
-          ::Middleman::Util.normalize_path(
-            app.blog.options.taglink.sub(':tag', tag.parameterize))
+        def link(blog_options, tag)
+          ::Middleman::Util.normalize_path(blog_options.taglink.sub(':tag', tag.parameterize))
         end
       end
 
-      def initialize(app)
+      def initialize(app, controller=nil)
         @app = app
+        @blog_controller = controller
+      end
+
+      def blog_data
+        if @blog_controller
+          @blog_controller.data
+        else
+          @app.blog
+        end
+      end
+
+      def blog_options
+        if @blog_controller
+          @blog_controller.options
+        else
+          @app.blog.options
+        end
       end
       
       # Update the main sitemap resource list
       # @return [void]
       def manipulate_resource_list(resources)
-        resources + @app.blog.tags.map do |tag, articles|
-          path = TagPages.link(@app, tag)
+        resources + self.blog_data.tags.map do |tag, articles|
+          path = TagPages.link(self.blog_options, tag)
           
           p = ::Middleman::Sitemap::Resource.new(
             @app.sitemap,
             path
           )
-          p.proxy_to(@app.blog.options.tag_template)
+          p.proxy_to(self.blog_options.tag_template)
 
           # Add metadata in local variables so it's accessible to
           # later extensions
           p.add_metadata :locals => {
             'page_type' => 'tag',
             'tagname' => tag,
-            'articles' => articles
+            'articles' => articles,
+            'blog_controller' => @blog_controller
           }
           # Add metadata in instance variables for backwards compatibility
           p.add_metadata do

data/lib/middleman-blog/template/shared/Gemfile.tt

@@ -1,7 +1,9 @@
-source :rubygems
+# If you have OpenSSL installed, we recommend updating
+# the following line to use "https"
+source 'http://rubygems.org'
 
 gem "middleman", "~> <%= Middleman::VERSION %>"
 gem "middleman-blog", "~> <%= Middleman::Blog::VERSION %>"
 
 # For feed.xml.builder
-gem "builder", "~> 3.0.0"
+gem "builder", "~> 3.0"

data/lib/middleman-blog/template/source/calendar.html.erb

@@ -12,7 +12,7 @@ pageable: true
   <% end %>
 </h1>
 
-<% if paginate %>
+<% if paginate && num_pages > 1 %>
   <p>Page <%= page_number %> of <%= num_pages %></p>
 
   <% if prev_page %>

data/lib/middleman-blog/template/source/feed.xml.builder

@@ -1,23 +1,24 @@
 xml.instruct!
 xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
+  site_url = "http://blog.url.com/"
   xml.title "Blog Name"
   xml.subtitle "Blog subtitle"
-  xml.id "http://blog.url.com/"
-  xml.link "href" => "http://blog.url.com/"
-  xml.link "href" => "http://blog.url.com/feed.xml", "rel" => "self"
+  xml.id URI.join(site_url, blog.options.prefix.to_s)
+  xml.link "href" => URI.join(site_url, blog.options.prefix.to_s)
+  xml.link "href" => URI.join(site_url, current_page.path), "rel" => "self"
   xml.updated blog.articles.first.date.to_time.iso8601
   xml.author { xml.name "Blog Author" }
 
   blog.articles[0..5].each do |article|
     xml.entry do
       xml.title article.title
-      xml.link "rel" => "alternate", "href" => article.url
-      xml.id article.url
+      xml.link "rel" => "alternate", "href" => URI.join(site_url, article.url)
+      xml.id URI.join(site_url, article.url)
       xml.published article.date.to_time.iso8601
-      xml.updated article.date.to_time.iso8601
+      xml.updated File.mtime(article.source_file).iso8601
       xml.author { xml.name "Article Author" }
       # xml.summary article.summary, "type" => "html"
       xml.content article.body, "type" => "html"
     end
   end
-end
+end

data/lib/middleman-blog/template/source/index.html.erb

@@ -2,7 +2,7 @@
 pageable: true
 per_page: 10
 ---
-<% if paginate %>
+<% if paginate && num_pages > 1 %>
   <p>Page <%= page_number %> of <%= num_pages %></p>
 
   <% if prev_page %>

data/lib/middleman-blog/template/source/tag.html.erb

@@ -4,7 +4,7 @@ per_page: 12
 ---
 <h1>Articles tagged '<%= tagname %>'</h1>
 
-<% if paginate %>
+<% if paginate && num_pages > 1 %>
   <p>Page <%= page_number %> of <%= num_pages %></p>
 
   <% if prev_page %>

data/lib/middleman-blog/truncate_html.rb

@@ -8,7 +8,8 @@ end
 # MIT license
 module TruncateHTML
   def self.truncate_html(text, max_length, ellipsis = "...")
-    ellipsis_length = ellipsis.length     
+    ellipsis_length = ellipsis.length
+    text = text.encode('UTF-8') if text.respond_to?(:encode)
     doc = Nokogiri::HTML::DocumentFragment.parse text
     content_length = doc.inner_text.length
     actual_length = max_length - ellipsis_length
@@ -46,8 +47,16 @@ module NokogiriTruncator
     end
   end
 
+  module CommentNode
+    def truncate(*args)
+      # Don't truncate comments, since they aren't visible
+      self
+    end
+  end
+
 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)

data/lib/middleman-blog/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Blog
-    VERSION = "3.2.0"
+    VERSION = "3.3.0"
   end
 end

data/middleman-blog.gemspec

@@ -3,22 +3,19 @@ $:.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{A blog foundation using Middleman}
-  s.description = %q{A blog foundation using Middleman}
-
-  s.rubyforge_project = "middleman-blog"
-
-  s.files         = `git ls-files -z`.split("\0")
-  s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split("\0")
+  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.add_dependency("middleman-core", ["~> 3.0"])
-  s.add_dependency("maruku", ["~> 0.6.0"])
+  s.add_dependency("middleman-more", ["~> 3.0"])
   s.add_dependency("tzinfo", ["~> 0.3.0"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-blog
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -26,19 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: maruku
+  name: middleman-more
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
-description: A blog foundation using Middleman
+description: Blog engine for Middleman
 email:
 - me@tdreyno.com
 - ben@benhollis.net
@@ -66,8 +66,10 @@ files:
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
-- LICENSE
+- Gemfile-3.0
+- LICENSE.md
 - README.md
 - Rakefile
 - features/article_cli.feature
@@ -75,19 +77,24 @@ files:
 - features/blog_sources.feature
 - features/calendar-and-tag.feature
 - features/calendar.feature
+- features/calendar_multiblog.feature
 - features/directory_indexes.feature
-- features/encoding.feature
 - features/filename_date.feature
 - features/future_date.feature
 - features/layouts.feature
+- features/multiblog.feature
 - features/next_previous.feature
 - features/no_date.feature
 - features/paginate.feature
+- features/paginate_multiblog.feature
 - features/preview.feature
 - features/published.feature
+- features/summary.feature
 - features/support/env.rb
 - features/support/time_steps.rb
 - features/tags.feature
+- features/tags_multiblog.feature
+- features/time_zone.feature
 - 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
@@ -96,6 +103,7 @@ files:
 - 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/calendar-and-tag-app/config-directory-indexes.rb
@@ -112,6 +120,26 @@ files:
 - fixtures/calendar-app/source/calendar.html.erb
 - fixtures/calendar-app/source/index.html.erb
 - fixtures/calendar-app/source/layout.erb
+- fixtures/calendar-multiblog-app/config.rb
+- fixtures/calendar-multiblog-app/source/blog1/2011-01-01-new-article.html.markdown
+- fixtures/calendar-multiblog-app/source/blog1/2011-01-02-another-article.html.markdown
+- fixtures/calendar-multiblog-app/source/blog2/2011-01-01-new-article.html.markdown
+- fixtures/calendar-multiblog-app/source/blog2/2011-01-02-another-article.html.markdown
+- fixtures/calendar-multiblog-app/source/calendar1.html.erb
+- fixtures/calendar-multiblog-app/source/calendar2.html.erb
+- fixtures/calendar-multiblog-app/source/index.html.erb
+- fixtures/calendar-multiblog-app/source/layout.erb
+- fixtures/default-template-app/Gemfile
+- fixtures/default-template-app/config.rb
+- fixtures/default-template-app/source/2013-04-01-new-article.html.markdown
+- fixtures/default-template-app/source/about-me.html.erb
+- fixtures/default-template-app/source/archives.html.erb
+- fixtures/default-template-app/source/index.html.erb
+- fixtures/default-template-app/source/javascripts/_zepto.pjax.js
+- fixtures/default-template-app/source/javascripts/app.js
+- fixtures/default-template-app/source/javascripts/modernizr.js
+- fixtures/default-template-app/source/layouts/layout.erb
+- fixtures/default-template-app/source/stylesheets/app.css.scss
 - fixtures/filename-date-app/config.rb
 - fixtures/filename-date-app/source/2011-01-01-new-article.html.markdown
 - fixtures/filename-date-app/source/2011-01-03-filename-and-frontmatter.html.markdown
@@ -137,6 +165,11 @@ files:
 - fixtures/layouts-app/source/layouts/layout.erb
 - fixtures/layouts-app/source/layouts/second.html.erb
 - fixtures/layouts-app/source/layouts/third.html.erb
+- fixtures/multiblog-app/config.rb
+- fixtures/multiblog-app/source/blog1/2012-12-12-other-article.html.markdown
+- 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
@@ -145,6 +178,10 @@ files:
 - 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
@@ -159,6 +196,35 @@ files:
 - fixtures/paginate-app/source/index.html.erb
 - fixtures/paginate-app/source/layout.erb
 - fixtures/paginate-app/source/tag.html.erb
+- fixtures/paginate-multiblog-app/config.rb
+- fixtures/paginate-multiblog-app/source/blog1/2011-01-01-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog1/2011-01-02-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog1/2011-01-03-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog1/2011-01-04-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog1/2011-01-05-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog1/2011-02-01-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog1/index.html.erb
+- fixtures/paginate-multiblog-app/source/blog2/2011-01-01-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog2/2011-01-02-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog2/2011-01-03-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog2/2011-01-04-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog2/2011-01-05-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog2/index.html.erb
+- fixtures/paginate-multiblog-app/source/blog3/2011-01-01-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/2011-01-02-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/2011-01-03-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/2011-01-04-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/2011-01-05-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/2011-02-01-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/2011-02-02-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/index.html.erb
+- fixtures/paginate-multiblog-app/source/calendar1.html.erb
+- fixtures/paginate-multiblog-app/source/calendar2.html.erb
+- fixtures/paginate-multiblog-app/source/calendar3.html.erb
+- fixtures/paginate-multiblog-app/source/layout.erb
+- 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/preview-app/config.rb
 - fixtures/preview-app/source/2011/01/01/new-article.html.markdown
 - fixtures/preview-app/source/index.html.erb
@@ -170,6 +236,12 @@ files:
 - fixtures/published-app/source/blog/2012-06-19-draft-article/example.txt
 - fixtures/published-app/source/index.html.erb
 - fixtures/published-app/source/layout.erb
+- fixtures/summary-app/config.rb
+- fixtures/summary-app/source/2011-01-01-article-with-no-summary-separator-and-comments-in-the-summary.html.erb
+- 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/index.html.erb
 - fixtures/tags-app/config-directory-indexes.rb
 - fixtures/tags-app/config.rb
 - fixtures/tags-app/source/blog/2011-01-01-new-article.html.markdown
@@ -177,13 +249,25 @@ files:
 - fixtures/tags-app/source/index.html.erb
 - fixtures/tags-app/source/layout.erb
 - fixtures/tags-app/source/tag.html.erb
+- fixtures/tags-multiblog-app/config.rb
+- fixtures/tags-multiblog-app/source/blog1/2011-01-01-new-article.html.markdown
+- fixtures/tags-multiblog-app/source/blog1/2011-01-02-another-article.html.markdown
+- fixtures/tags-multiblog-app/source/blog2/2011-01-01-new-article.html.markdown
+- fixtures/tags-multiblog-app/source/blog2/2011-01-02-another-article.html.markdown
+- fixtures/tags-multiblog-app/source/index.html.erb
+- fixtures/tags-multiblog-app/source/layout.erb
+- fixtures/tags-multiblog-app/source/tag1.html.erb
+- 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
 - lib/middleman-blog.rb
 - 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/extension.rb
+- lib/middleman-blog/extension_3_0.rb
+- lib/middleman-blog/extension_3_1.rb
 - lib/middleman-blog/paginator.rb
 - lib/middleman-blog/tag_pages.rb
 - lib/middleman-blog/template.rb
@@ -200,7 +284,8 @@ files:
 - lib/middleman_extension.rb
 - middleman-blog.gemspec
 homepage: https://github.com/middleman/middleman-blog
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -217,30 +302,35 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: middleman-blog
-rubygems_version: 2.0.0
+rubyforge_project: 
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: A blog foundation using Middleman
+summary: Blog engine for Middleman
 test_files:
 - features/article_cli.feature
 - features/article_dirs.feature
 - features/blog_sources.feature
 - features/calendar-and-tag.feature
 - features/calendar.feature
+- features/calendar_multiblog.feature
 - features/directory_indexes.feature
-- features/encoding.feature
 - features/filename_date.feature
 - features/future_date.feature
 - features/layouts.feature
+- features/multiblog.feature
 - features/next_previous.feature
 - features/no_date.feature
 - features/paginate.feature
+- features/paginate_multiblog.feature
 - features/preview.feature
 - features/published.feature
+- features/summary.feature
 - features/support/env.rb
 - features/support/time_steps.rb
 - features/tags.feature
+- features/tags_multiblog.feature
+- features/time_zone.feature
 - 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
@@ -249,6 +339,7 @@ test_files:
 - 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/calendar-and-tag-app/config-directory-indexes.rb
@@ -265,6 +356,26 @@ test_files:
 - fixtures/calendar-app/source/calendar.html.erb
 - fixtures/calendar-app/source/index.html.erb
 - fixtures/calendar-app/source/layout.erb
+- fixtures/calendar-multiblog-app/config.rb
+- fixtures/calendar-multiblog-app/source/blog1/2011-01-01-new-article.html.markdown
+- fixtures/calendar-multiblog-app/source/blog1/2011-01-02-another-article.html.markdown
+- fixtures/calendar-multiblog-app/source/blog2/2011-01-01-new-article.html.markdown
+- fixtures/calendar-multiblog-app/source/blog2/2011-01-02-another-article.html.markdown
+- fixtures/calendar-multiblog-app/source/calendar1.html.erb
+- fixtures/calendar-multiblog-app/source/calendar2.html.erb
+- fixtures/calendar-multiblog-app/source/index.html.erb
+- fixtures/calendar-multiblog-app/source/layout.erb
+- fixtures/default-template-app/Gemfile
+- fixtures/default-template-app/config.rb
+- fixtures/default-template-app/source/2013-04-01-new-article.html.markdown
+- fixtures/default-template-app/source/about-me.html.erb
+- fixtures/default-template-app/source/archives.html.erb
+- fixtures/default-template-app/source/index.html.erb
+- fixtures/default-template-app/source/javascripts/_zepto.pjax.js
+- fixtures/default-template-app/source/javascripts/app.js
+- fixtures/default-template-app/source/javascripts/modernizr.js
+- fixtures/default-template-app/source/layouts/layout.erb
+- fixtures/default-template-app/source/stylesheets/app.css.scss
 - fixtures/filename-date-app/config.rb
 - fixtures/filename-date-app/source/2011-01-01-new-article.html.markdown
 - fixtures/filename-date-app/source/2011-01-03-filename-and-frontmatter.html.markdown
@@ -290,6 +401,11 @@ test_files:
 - fixtures/layouts-app/source/layouts/layout.erb
 - fixtures/layouts-app/source/layouts/second.html.erb
 - fixtures/layouts-app/source/layouts/third.html.erb
+- fixtures/multiblog-app/config.rb
+- fixtures/multiblog-app/source/blog1/2012-12-12-other-article.html.markdown
+- 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
@@ -298,6 +414,10 @@ test_files:
 - 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
@@ -312,6 +432,35 @@ test_files:
 - fixtures/paginate-app/source/index.html.erb
 - fixtures/paginate-app/source/layout.erb
 - fixtures/paginate-app/source/tag.html.erb
+- fixtures/paginate-multiblog-app/config.rb
+- fixtures/paginate-multiblog-app/source/blog1/2011-01-01-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog1/2011-01-02-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog1/2011-01-03-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog1/2011-01-04-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog1/2011-01-05-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog1/2011-02-01-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog1/index.html.erb
+- fixtures/paginate-multiblog-app/source/blog2/2011-01-01-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog2/2011-01-02-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog2/2011-01-03-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog2/2011-01-04-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog2/2011-01-05-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog2/index.html.erb
+- fixtures/paginate-multiblog-app/source/blog3/2011-01-01-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/2011-01-02-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/2011-01-03-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/2011-01-04-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/2011-01-05-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/2011-02-01-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/2011-02-02-test-article.html.markdown
+- fixtures/paginate-multiblog-app/source/blog3/index.html.erb
+- fixtures/paginate-multiblog-app/source/calendar1.html.erb
+- fixtures/paginate-multiblog-app/source/calendar2.html.erb
+- fixtures/paginate-multiblog-app/source/calendar3.html.erb
+- fixtures/paginate-multiblog-app/source/layout.erb
+- 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/preview-app/config.rb
 - fixtures/preview-app/source/2011/01/01/new-article.html.markdown
 - fixtures/preview-app/source/index.html.erb
@@ -323,6 +472,12 @@ test_files:
 - fixtures/published-app/source/blog/2012-06-19-draft-article/example.txt
 - fixtures/published-app/source/index.html.erb
 - fixtures/published-app/source/layout.erb
+- fixtures/summary-app/config.rb
+- fixtures/summary-app/source/2011-01-01-article-with-no-summary-separator-and-comments-in-the-summary.html.erb
+- 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/index.html.erb
 - fixtures/tags-app/config-directory-indexes.rb
 - fixtures/tags-app/config.rb
 - fixtures/tags-app/source/blog/2011-01-01-new-article.html.markdown
@@ -330,4 +485,15 @@ test_files:
 - fixtures/tags-app/source/index.html.erb
 - fixtures/tags-app/source/layout.erb
 - fixtures/tags-app/source/tag.html.erb
+- fixtures/tags-multiblog-app/config.rb
+- fixtures/tags-multiblog-app/source/blog1/2011-01-01-new-article.html.markdown
+- fixtures/tags-multiblog-app/source/blog1/2011-01-02-another-article.html.markdown
+- fixtures/tags-multiblog-app/source/blog2/2011-01-01-new-article.html.markdown
+- fixtures/tags-multiblog-app/source/blog2/2011-01-02-another-article.html.markdown
+- fixtures/tags-multiblog-app/source/index.html.erb
+- fixtures/tags-multiblog-app/source/layout.erb
+- fixtures/tags-multiblog-app/source/tag1.html.erb
+- 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: