middleman-blog 4.0.1 → 4.0.2

data/features/support/env.rb

@@ -1,4 +1,5 @@
 require 'simplecov'
+
 SimpleCov.start do
   add_filter "/features/"
 end
@@ -6,10 +7,12 @@ end
 require 'coveralls'
 Coveralls.wear!
 
-ENV["TEST"] = "true"
-ENV["AUTOLOAD_SPROCKETS"] = "false"
+ENV[ "TEST" ]               = "true"
+ENV[ "AUTOLOAD_SPROCKETS" ] = "false"
+
+PROJECT_ROOT_PATH = File.dirname( File.dirname( File.dirname( __FILE__ ) ) )
 
-PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require "middleman-core"
 require "middleman-core/step_definitions"
-require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-blog')
+
+require File.join( PROJECT_ROOT_PATH, 'lib', 'middleman-blog' )

data/features/support/time_steps.rb

@@ -3,11 +3,11 @@ require 'active_support/core_ext/time/calculations'
 
 Time.zone = "UTC" if Time.zone.nil?
 
-Given /the timezone is "(.+?)"$/ do |zone|
-  Time.zone = zone
+Given /the timezone is "(.+?)"$/ do | zone |
+    Time.zone = zone
 end
 
-Given /the (date|time|date and time) is (.+?)$/ do |datetime, value|
+Given /the (date|time|date and time) is (.+?)$/ do | datetime, value |
   time = case datetime
          when "date"
            Date.parse(value)
@@ -16,9 +16,13 @@ Given /the (date|time|date and time) is (.+?)$/ do |datetime, value|
          when "date and time"
            Time.zone.parse(value)
          end
+
   Timecop.travel time
+
 end
 
 After do
+
   Timecop.return
+
 end

data/features/tags.feature

@@ -1,34 +1,50 @@
+##
+# @usage
+# bundle exec cucumber features/tags.feature
+##
 Feature: Tag pages
+
   Scenario: Tag pages are accessible from preview server
+
     Given the Server is running at "tags-app"
+
     When I go to "/tags/foo.html"
     Then I should see "/2011-01-01-new-article.html"
     Then I should see "/2011-01-02-another-article.html"
     Then I should see "Tag: foo"
+
     When I go to "/tags/bar.html"
     Then I should see "/2011-01-01-new-article.html"
     Then I should not see "/2011-01-02-another-article.html"
     Then I should see "Tag: bar"
+
     When I go to "/tags/120.html"
     Then I should see "/2011-01-02-another-article.html"
     Then I should see "Tag: 120"
+
     When I go to "/index.html"
     Then I should see "Tag Path: '/tags/foo.html'"
 
   Scenario: Tag pages are accessible from preview server with directory_indexes
+
     Given a fixture app "tags-app"
-    And app "tags-app" is using config "directory-indexes"
-    And the Server is running
+      And app "tags-app" is using config "directory-indexes"
+      And the Server is running
+
     When I go to "/tags/foo.html"
     Then I should see "File Not Found"
+
     When I go to "/tags/foo/"
     Then I should not see "/2011-01-01-new-article.html"
     Then I should see "/2011-01-01-new-article/"
+
     When I go to "/index.html"
     Then I should see "Tag Path: '/tags/foo/'"
 
   Scenario: Tag pages also get built
+
     Given a successfully built app at "tags-app"
+
     When I cd to "build"
     Then the following files should exist:
     | tags/foo.html |
@@ -36,57 +52,65 @@ Feature: Tag pages
     Then the following files should not exist:
     | tags.html |
 
-    And the file "tags/foo.html" should contain "Tag: foo"
-    And the file "tags/foo.html" should contain "/2011-01-01-new-article.html"
-    And the file "tags/foo.html" should contain "/2011-01-02-another-article.html"
+      And the file "tags/foo.html" should contain "Tag: foo"
+      And the file "tags/foo.html" should contain "/2011-01-01-new-article.html"
+      And the file "tags/foo.html" should contain "/2011-01-02-another-article.html"
 
-    And the file "tags/bar.html" should contain "Tag: bar"
-    And the file "tags/bar.html" should contain "/2011-01-01-new-article.html"
-    And the file "tags/bar.html" should not contain "/2011-01-02-another-article.html"
+      And the file "tags/bar.html" should contain "Tag: bar"
+      And the file "tags/bar.html" should contain "/2011-01-01-new-article.html"
+      And the file "tags/bar.html" should not contain "/2011-01-02-another-article.html"
 
   Scenario: Adding a tag to a post in preview adds a tag page
+
     Given the Server is running at "tags-app"
+
     When I go to "/tags/bar.html"
     Then I should see "/2011-01-01-new-article.html"
+
     When I go to "/tags/newtag.html"
     Then I should see "Not Found"
-    And the file "source/blog/2011-01-01-new-article.html.markdown" has the contents
-      """
-      ---
-      title: "Newest Article"
-      date: 2011-01-01
-      tags: newtag
-      ---
-
-      Newer Article Content
-      """
+      And the file "source/blog/2011-01-01-new-article.html.markdown" has the contents
+        """
+        ---
+        title: "Newest Article"
+        date: 2011-01-01
+        tags: newtag
+        ---
+
+        Newer Article Content
+        """
     When I go to "/tags/bar.html"
     Then I should see "Not Found"
+
     When I go to "/tags/newtag.html"
     Then I should see "/2011-01-01-new-article.html"
 
-  Scenario: Adding a non-ASCII tag to a post in preview adds a tag page
+  Scenario: Adding a completely non-ASCII tag to a post in preview adds a blank tag page
+
     Given the Server is running at "tags-app"
+
     When I go to "/tags/☆☆☆.html"
     Then I should see "Not Found"
-    And the file "source/blog/2011-01-01-new-article.html.markdown" has the contents
-      """
-      ---
-      title: "Newest Article"
-      date: 2011-01-01
-      tags: ☆☆☆
-      ---
-
-      Newer Article Content
-      """
-    When I go to "/tags/☆☆☆.html"
+      And the file "source/blog/2011-01-01-new-article.html.markdown" has the contents
+        """
+        ---
+        title: "Newest Article"
+        date: 2011-01-01
+        tags: ☆☆☆
+        ---
+
+        Newer Article Content
+        """
+
+    When I go to "/tags/.html"
     Then I should see "/2011-01-01-new-article.html"
 
   Scenario: Tag pages are not added when disabled in configuration
+
     Given a fixture app "tags-app"
-    And app "tags-app" is using config "no-tags"
-    And I run `middleman build`
-    And was successfully built
+      And app "tags-app" is using config "no-tags"
+      And I run `middleman build`
+      And was successfully built
 
     When I cd to "build"
     Then the following files should not exist:
@@ -94,4 +118,14 @@ Feature: Tag pages
     | tags/foo.html |
     | tags/bar.html |
 
-    And the file "index.html" should contain "Tag Path: ''"
+      And the file "index.html" should contain "Tag Path: ''"
+
+  Scenario: Tags respect filters
+
+    Given a fixture app "tags-app"
+      And app "tags-app" is using config "filters"
+      And the Server is running
+
+    When I go to "/tags/foo.html"
+    Then I should see "/2011-01-01-new-article.html"
+    Then I should not see "/2011-01-02-another-article.html"

data/fixtures/article-dirs-app/config-directory-indexes.rb

@@ -0,0 +1,6 @@
+activate :blog do |blog|
+  blog.permalink = "{year}/{month}/{day}/{title}"
+  blog.sources = "blog/:year-:month-:day-:title.html"
+end
+
+activate :directory_indexes

data/fixtures/article-dirs-app/config-permalink-with-dot.rb

@@ -0,0 +1,6 @@
+activate :blog do |blog|
+  blog.permalink = "{year}.{month}.{day}/{title}"
+  blog.sources = "blog/:year-:month-:day-:title.html"
+end
+
+activate :directory_indexes

data/fixtures/blog-sources-app/config.rb

@@ -1,3 +1,6 @@
-activate :blog do |blog|
-  blog.sources = "blog/:year-:month-:day-:title.html"
-end
+
+activate :blog do | blog |
+
+    blog.sources = "blog/:year-:month-:day-:title.html"
+
+end

data/fixtures/blog-sources-app/source/blog/2011-01-01-new-article.html.markdown

@@ -1,6 +1,8 @@
---- 
-title: "Newer Article"
-date: 2011-01-01
+---
+
+title : "Newer Article"
+date  : 2011-01-01
+
 ---
 
 Newer Article Content

data/fixtures/blog-sources-app/source/blog/2013-08-08-slug-from-filename.html.markdown

@@ -1,7 +1,9 @@
 ---
-title: "Testing Article"
-slug: slug-from-frontmatter
-date: 2013-08-08
+
+title : "Testing Article"
+slug  : slug-from-frontmatter
+date  : 2013-08-08
+
 ---
 
 Article with slug specified in frontmatter

data/fixtures/blog-sources-app/source/index.html.erb

@@ -1,9 +1,13 @@
-<% blog.articles[0...5].each_with_index do |article, i| %>
-  <article class="<%= (i == 0) ? 'first' : '' %>">
-    <h1><a href="<%= article.url %>"><%= article.title %></a> <span><%= article.date.strftime('%b %e %Y') %></span></h1>
-    
-    <%= article.summary %>
-    
-    <div class="more"><a href="<%= article.url %>">read on &raquo;</a></div>
-  </article>
+<% blog.articles[ 0...5 ].each_with_index do | article, i | %>
+
+    <article class="<%= ( i == 0 ) ? 'first' : '' %>">
+
+        <h1><a href="<%= article.url %>"><%= article.title %></a> <span><%= article.date.strftime( '%b %e %Y' ) %></span></h1>
+
+        <%= article.summary %>
+
+        <div class="more"><a href="<%= article.url %>">read on &raquo;</a></div>
+
+    </article>
+
 <% end %>

data/fixtures/blog-sources-app/source/layout.erb

@@ -1,13 +1,24 @@
 <!doctype html>
+
 <html>
-  <head>
-  </head>
-  <body>
-    <% if is_blog_article? %>
-      <%= yield %>
-      <%= current_article.url %>
-    <% else %>
-      <%= yield %>
-    <% end %>
-  </body>
+
+    <head>
+        <title>Blog sources app</title>
+    </head>
+
+    <body>
+
+        <% if is_blog_article? %>
+
+            <%= yield %>
+            <%= current_article.url %>
+
+        <% else %>
+
+            <%= yield %>
+
+        <% end %>
+
+    </body>
+
 </html>

data/fixtures/blog-sources-no-date-app/config.rb

@@ -0,0 +1,6 @@
+
+activate :blog do | blog |
+
+    blog.sources = "blog/:title.html"
+
+end

data/fixtures/blog-sources-no-date-app/source/blog/new-article.html.markdown

@@ -0,0 +1,8 @@
+---
+
+title : "Newer Article"
+date  : 2011-01-01
+
+---
+
+Newer Article Content

data/fixtures/blog-sources-no-date-app/source/index.html.erb

@@ -0,0 +1,13 @@
+<% blog.articles[ 0...5 ].each_with_index do | article, i | %>
+
+    <article class="<%= ( i == 0 ) ? 'first' : '' %>">
+
+        <h1><a href="<%= article.url %>"><%= article.title %></a> <span><%= article.date.strftime( '%b %e %Y' ) %></span></h1>
+
+        <%= article.summary %>
+
+        <div class="more"><a href="<%= article.url %>">read on &raquo;</a></div>
+
+    </article>
+
+<% end %>

data/fixtures/blog-sources-no-date-app/source/layout.erb

@@ -0,0 +1,24 @@
+<!doctype html>
+
+<html>
+
+    <head>
+        <title>Blog sources no title app</title>
+    </head>
+
+    <body>
+
+        <% if is_blog_article? %>
+
+            <%= yield %>
+            <%= current_article.url %>
+
+        <% else %>
+
+            <%= yield %>
+
+        <% end %>
+
+    </body>
+
+</html>

data/fixtures/blog-sources-no-day-app/config.rb

@@ -0,0 +1,6 @@
+
+activate :blog do | blog |
+
+    blog.sources = ":year-:month-:title.html"
+
+end

data/fixtures/blog-sources-no-day-app/source/2012-08-testing.html.markdown

@@ -0,0 +1,8 @@
+---
+
+title : "Testing Article"
+date  : 2012-08-01
+
+---
+
+Testing Article Content

data/fixtures/blog-sources-no-day-app/source/layout.erb

@@ -0,0 +1,24 @@
+<!doctype html>
+
+<html>
+
+    <head>
+        <title>Blog sources no day app</title>
+    </head>
+
+    <body>
+
+        <% if is_blog_article? %>
+
+            <%= yield %>
+            <%= current_article.url %>
+
+        <% else %>
+
+            <%= yield %>
+
+        <% end %>
+
+    </body>
+
+</html>

data/fixtures/{no-title-app → blog-sources-no-title-app}/config.rb

@@ -1,3 +1,6 @@
+
 activate :blog do |blog|
+
   blog.sources = ":year-:month-:day.html"
+
 end

data/fixtures/blog-sources-no-title-app/source/2013-08-07.html.markdown

@@ -0,0 +1,8 @@
+---
+
+title : "Testing Article"
+date  : 2013-08-07
+
+---
+
+Testing Article Content