middleman-blog 4.0.1 → 4.0.2

data/Rakefile

@@ -5,28 +5,31 @@ require 'cucumber/rake/task'
 
 require 'middleman-core'
 
-Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  ENV["TEST"] = "true"
+Cucumber::Rake::Task.new( :cucumber, 'Run features that should pass' ) do | t |
+  ENV[ "TEST" ] = "true"
 
   exempt_tags = ""
   exempt_tags << "--tags ~@nojava " if RUBY_PLATFORM == "java"
 
-  t.cucumber_opts = "--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+  t.cucumber_opts = "--color --tags ~@wip #{ exempt_tags } --strict --format #{ ENV[ 'CUCUMBER_FORMAT' ] || 'pretty' }"
 end
 
 require 'rake/clean'
 
 desc "Run tests, both RSpec and Cucumber"
-task :test => [:spec, :cucumber]
+task test: [ :spec, :cucumber ]
 
 require 'rspec/core/rake_task'
+
 desc "Run RSpec"
-RSpec::Core::RakeTask.new do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rspec_opts = ['--color', '--format documentation']
+
+RSpec::Core::RakeTask.new do | spec |
+  spec.pattern    = 'spec/**/*_spec.rb'
+  spec.rspec_opts = [ '--color', '--format documentation' ]
 end
 
 desc "Build HTML documentation"
+
 task :doc do
   sh 'bundle exec yard'
 end

data/features/article_dirs.feature

@@ -1,7 +1,41 @@
 Feature: Article-specific subdirectories
+
   Scenario: Blog articles can have their own subdirectories for related files
+
     Given the Server is running at "article-dirs-app"
+
     When I go to "/blog/2011-01-01-new-article/example.txt"
     Then I should see "Not Found"
+
     When I go to "/2011/01/01/new-article/example.txt"
     Then I should see "Example Text"
+
+  Scenario: Blog articles with directory_indexes can have their own subdirectories for related files
+
+    Given a fixture app "article-dirs-app"
+      And app "article-dirs-app" is using config "directory-indexes"
+      And the Server is running
+
+    When I go to "/2011/01/01/new-article"
+    Then I should see "Newer Article Content"
+
+    When I go to "/2011-01-01-new-article/example.txt"
+    Then I should see "Not Found"
+
+    When I go to "/2011/01/01/new-article/example.txt"
+    Then I should see "Example Text"
+
+  Scenario: Blog articles with permalinks containing dots can have their own subdirectories for related files
+
+    Given a fixture app "article-dirs-app"
+      And app "article-dirs-app" is using config "permalink-with-dot"
+      And the Server is running
+
+    When I go to "/2011.01.01/new-article"
+    Then I should see "Newer Article Content"
+
+    When I go to "/2011-01-01-new-article/example.txt"
+    Then I should see "Not Found"
+
+    When I go to "/2011.01.01/new-article/example.txt"
+    Then I should see "Example Text"

data/features/blog_sources.feature

@@ -1,32 +1,61 @@
-Feature: Flexible article sources
+Feature: Blog sources
+
   Scenario: Blog articles can live under a different structure than their permalink
+
     Given the Server is running at "blog-sources-app"
+
     When I go to "/2011/01/01/new-article.html"
     Then I should see "/2011/01/01/new-article.html"
+
     When I go to "/blog/2001-01-01-new-article.html"
     Then I should see "Not Found"
+
     When I go to "/"
     Then I should see "/2011/01/01/new-article.html"
 
   Scenario: Blog articles can omit the day part
-    Given the Server is running at "no-day-app"
+
+    Given the Server is running at "blog-sources-no-day-app"
+
     When I go to "/2012/08/01/testing.html"
     Then I should see "Testing Article"
 
   Scenario: Blog article sources can omit the title part
-    Given the Server is running at "no-title-app"
+
+    Given the Server is running at "blog-sources-no-title-app"
+
     When I go to "/2013/08/07/testing-article.html"
-    Then I should see "Testing Article"
+    Then I should see "/2013/08/07/testing-article.html"
 
   Scenario: Slug can be specified in frontmatter
-    Given the Server is running at "no-title-app"
+
+    Given the Server is running at "blog-sources-no-title-app"
+
     When I go to "/2013/08/08/slug-from-frontmatter.html"
     Then I should see "Article with slug specified in frontmatter"
+
     Given the Server is running at "blog-sources-app"
+
     When I go to "/2013/08/08/slug-from-frontmatter.html"
     Then I should see "Article with slug specified in frontmatter"
 
   Scenario: There can be subdirectories in the blog sources dir
+
     Given the Server is running at "blog-sources-subdirs-app"
+
     When I go to "/blog.html"
-    Then I should see "Yet another post"
+    Then I should see "Yet another post"
+      And I should see "Another post"
+
+  Scenario: Blog sources may not include the date in the filename
+
+    Given the Server is running at "blog-sources-no-date-app"
+
+    When I go to "/2011/01/01/new-article.html"
+    Then I should see "/2011/01/01/new-article.html"
+
+    When I go to "/blog/new-article.html"
+    Then I should see "Not Found"
+
+    When I go to "/"
+    Then I should see "/2011/01/01/new-article.html"

data/features/filename_date.feature

@@ -1,9 +1,11 @@
 Feature: Derive article date from its source filename
+
   Scenario: Posts with dates in filenames and optionally frontmatter
+
     Given the Server is running at "filename-date-app"
+
     When I go to "/2011/01/01/new-article.html"
     Then I should see "Date: 2011-01-01T00:00:00"
+
     When I go to "/2011/01/03/filename-and-frontmatter.html"
     Then I should see "Date: 2011-01-03T10:15:00"
-
-

data/features/language.feature

@@ -1,78 +1,109 @@
+
 Feature: Internationalized articles
-  Scenario: Article has lang in frontmatter
-    Given the Server is running at "language-app"
-    When I go to "/index.html"
-    Then I should see "Some text in English. All is OK."
-    Then I should not see "Некоторый текст на русском языке. Всё отлично."
-    When I go to "/ru/index.html"
-    Then I should see "Некоторый текст на русском языке. Всё отлично."
-    Then I should not see "Some text in English. All is OK."
-
-  Scenario: Article has lang in path
-    Given a fixture app "language-app"
-    And a file named "config.rb" with:
-      """
-      activate :i18n
-      activate :blog, prefix: ":lang"
-      """
-    Given the Server is running at "language-app"
-    When I go to "/index.html"
-    Then I should see "Some text in English. All is OK."
-    Then I should not see "Некоторый текст на русском языке. Всё отлично."
-    When I go to "/ru/index.html"
-    Then I should see "Некоторый текст на русском языке. Всё отлично."
-    Then I should not see "Some text in English. All is OK."
-
-  Scenario: Article has lang in source path
-    Given a fixture app "lang-path-app"
-    Given the Server is running at "lang-path-app"
-    When I go to "/en/a-humble-test.html"
-    Then I should see "English!"
-    When I go to "/ru/a-humble-test.html"
-    Then I should see "Russian!"
-
-  Scenario: Custom locales in articles
-    Given a fixture app "language-app"
-    And a file named "config.rb" with:
-      """
-      activate :i18n
-      activate :blog, preserve_locale: true
-      """
-    Given the Server is running at "language-app"
-    When I go to "/index.html"
-    Then I should see "Some text in English. All is OK."
-    When I go to "/ru/index.html"
-    Then I should see "Некоторый текст на русском языке. Всё отлично."
-
-  Scenario: Layout's locale match article's locale on article page
-    Given a fixture app "language-app"
-    Given the Server is running at "language-app"
-    When I go to "/2013/09/07/english-article-with-lang-in-frontmatter.html"
-    Then I should see "Language: en"
-    Then I should see "Hello, world!"
-    Then I should not see "Язык: ru"
-    Then I should not see "Привет, мир!"
-    When I go to "/2013/09/07/russian-article-with-lang-in-frontmatter.html"
-    Then I should see "Язык: ru"
-    Then I should see "Привет, мир!"
-    Then I should not see "Language: en"
-    Then I should not see "Hello, world!"
-
-  Scenario: Custom locales on article pages
-    Given a fixture app "language-app"
-    And a file named "config.rb" with:
-      """
-      activate :i18n
-      activate :blog, preserve_locale: true
-      """
-    Given the Server is running at "language-app"
-    When I go to "/2013/09/07/english-article-with-lang-in-frontmatter.html"
-    Then I should see "Language: en"
-    Then I should see "Hello, world!"
-    Then I should not see "Язык: ru"
-    Then I should not see "Привет, мир!"
-    When I go to "/2013/09/07/russian-article-with-lang-in-frontmatter.html"
-    Then I should see "Language: en"
-    Then I should see "Hello, world!"
-    Then I should not see "Язык: ru"
-    Then I should not see "Привет, мир!"
+
+    Scenario: Article has lang in frontmatter
+
+        Given the Server is running at "language-app"
+
+            When I go to "/index.html"
+            Then I should see "Some text in English. All is OK."
+            Then I should not see "Некоторый текст на русском языке. Всё отлично."
+            When I go to "/ru/index.html"
+            Then I should see "Некоторый текст на русском языке. Всё отлично."
+            Then I should not see "Some text in English. All is OK."
+
+
+    Scenario: Article has lang in path
+
+        Given a fixture app "language-app"
+            And a file named "config.rb" with:
+                """
+                activate :i18n
+                activate :blog, prefix: ":lang"
+                """
+
+        Given the Server is running at "language-app"
+
+            When I go to "/index.html"
+            Then I should see "Some text in English. All is OK."
+            Then I should not see "Некоторый текст на русском языке. Всё отлично."
+            When I go to "/ru/index.html"
+            Then I should see "Некоторый текст на русском языке. Всё отлично."
+            Then I should not see "Some text in English. All is OK."
+
+
+    Scenario: Article has lang in source path
+
+        Given a fixture app "lang-path-app"
+        Given the Server is running at "lang-path-app"
+
+            When I go to "/en/a-humble-test.html"
+            Then I should see "English!"
+            When I go to "/ru/a-humble-test.html"
+            Then I should see "Russian!"
+
+
+    Scenario: Custom locales in articles
+
+        Given a fixture app "language-app"
+            And a file named "config.rb" with:
+              """
+              activate :i18n
+              activate :blog, preserve_locale: true
+              """
+
+        Given the Server is running at "language-app"
+
+            When I go to "/index.html"
+            Then I should see "Some text in English. All is OK."
+            When I go to "/ru/index.html"
+            Then I should see "Некоторый текст на русском языке. Всё отлично."
+
+    Scenario: Layout's locale match article's locale on article page
+
+        Given a fixture app "language-app"
+        Given the Server is running at "language-app"
+
+            When I go to "/2013/09/07/english-article-with-lang-in-frontmatter.html"
+            Then I should see "Language: en"
+            Then I should see "Hello, world!"
+            Then I should not see "Язык: ru"
+            Then I should not see "Привет, мир!"
+            When I go to "/2013/09/07/russian-article-with-lang-in-frontmatter.html"
+            Then I should see "Язык: ru"
+            Then I should see "Привет, мир!"
+            Then I should not see "Language: en"
+            Then I should not see "Hello, world!"
+
+    Scenario: Custom locales on article pages
+
+        Given a fixture app "language-app"
+
+            And a file named "config.rb" with:
+              """
+              activate :i18n
+              activate :blog, preserve_locale: true
+              """
+
+        Given the Server is running at "language-app"
+
+            When I go to "/2013/09/07/english-article-with-lang-in-frontmatter.html"
+            Then I should see "Language: en"
+            Then I should see "Hello, world!"
+            Then I should not see "Язык: ru"
+            Then I should not see "Привет, мир!"
+            When I go to "/2013/09/07/russian-article-with-lang-in-frontmatter.html"
+            Then I should see "Language: en"
+            Then I should see "Hello, world!"
+            Then I should not see "Язык: ru"
+            Then I should not see "Привет, мир!"
+
+    Scenario: Next and previous local article
+
+        Given a fixture app "language-app"
+
+            When I go to "/2013/09/07/english-article-with-lang-in-frontmatter.html"
+            Then I should see "Next: /2013/09/09/next-english-article.html"
+            Then I should not see "Next: /2013/09/08/next-russian-article.html"
+            Then I should see "Previous: /2013/09/05/previous-english-article.html"
+            Then I should not see "Previous: /2013/09/06/previous-russian-article.html"

data/features/layouts.feature

@@ -11,6 +11,9 @@ Feature: Layouts
     When I go to "/2011/01/01/third-article.html"
     Then I should see "Third Alternative Layout"
     And I should see "Third Article"
+    When I go to "/2011/01/01/fourth-article.html"
+    Then I should see "Default Layout"
+    And I should see "Fourth Article"
   Scenario: The default blog layout is used if none is set in front matter.
     When I go to "/2011/01/02/article-in-normal-layout.html"
     Then I should see "Default Layout"

data/features/multiblog.feature

@@ -48,4 +48,4 @@ Feature: Host Multiple Blogs with Middleman 3.1+
     And the file "index.html" should contain "blog_number_1 length: 1"
     And the file "index.html" should contain "blog_number_1 title: Other Article"
     And the file "index.html" should contain "blog_number_2 length: 1"
-    And the file "index.html" should contain "blog_number_2 title: Newer Article"
+    And the file "index.html" should contain "blog_number_2 title: Newer Article"

data/features/next_previous.feature

@@ -1,8 +1,11 @@
+
 Feature: Next and previous article
-  
-  Scenario: Articles know their next and previous article
-    Given the Server is running at "calendar-app"
-    When I go to "/blog/2011-01-01-new-article.html"
-    Then I should see "Next: /blog/2011-01-02-another-article.html"
-    When I go to "/blog/2011-01-02-another-article.html"
-    Then I should see "Previous: /blog/2011-01-01-new-article.html"
+
+    Scenario: Articles know their next and previous article
+
+        Given the Server is running at "calendar-app"
+
+            When I go to "/blog/2011-01-01-new-article.html"
+            Then I should see "Next: /blog/2011-01-02-another-article.html"
+            When I go to "/blog/2011-01-02-another-article.html"
+            Then I should see "Previous: /blog/2011-01-01-new-article.html"

data/features/permalink.feature

@@ -0,0 +1,17 @@
+
+Feature: Permalinks can include arbitrary data from frontmatter
+
+    Scenario: Articles list links using permalink with frontmatter data
+
+        Given the Server is running at "permalink-app"
+
+            When I go to "/index.html"
+            Then I should see "news/a-custom-string-2011-01-01-new-article.html"
+
+    Scenario: Articles can be accessed through permalinks with frontmatter data
+
+        Given the Server is running at "permalink-app"
+
+            When I go to "news/a-custom-string-2011-01-01-new-article.html"
+            Then I should see "Newer Article Content"
+                And I should see "Category : news"

data/features/summary.feature

@@ -2,7 +2,11 @@ Feature: Article summary generation
   Scenario: Article has no summary separator
     Given the Server is running at "summary-app"
     When I go to "/index.html"
-    Then I should see "<p>Summary from article with separator.</p>"
+    Then I should see:
+      """
+      <p>Summary from article with separator.
+      </p>
+      """
     Then I should not see "Extended part from article with separator."
     Then I should see "<p>Summary from article with no separator.</p>"
     Then I should not see "Extended part from article with no separator."
@@ -25,6 +29,24 @@ Feature: Article summary generation
     Then I should not see "Extended part from article with custom separator."
     Then I should see "Extended part from article with separator."
 
+  Scenario: Article has custom summary separator that's an HTML comment
+    Given a fixture app "summary-app"
+    And a file named "config.rb" with:
+      """
+      activate :blog do |blog|
+        blog.summary_separator = /<!--more-->/
+      end
+      """
+    Given the Server is running at "summary-app"
+    When I go to "/index.html"
+    Then I should see:
+      """
+      <p>Summary from article with HTML comment separator.
+      </p>
+      """
+    Then I should not see "Extended part from article with HTML comment separator."
+    Then I should see "Extended part from article with separator."
+
   Scenario: Using a custom summary generator
     Given a fixture app "summary-app"
     And a file named "config.rb" with:
@@ -79,4 +101,6 @@ Feature: Article summary generation
     Then I should see "Summary1"
     Then I should see "Summary2"
     Then I should see "Summary3"
-    Then I should see "Summary4"
+    # it has a custom separator, which overrides explicit length, so we show up to the separator
+    Then I should see "Summary from article with separator."
+    Then I should see "Summary5"