middleman-blog 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 557a6f4be03e753999b53fa39a8d3310c13b8e89
-  data.tar.gz: a341051be4806dfdf9a6096b8efa3299bab8c57e
+  metadata.gz: 08ba0a40e858e3199220173897c437db62c6513e
+  data.tar.gz: 9d38d7176eb91b89ad0c8f125a2271553d3dbacc
 SHA512:
-  metadata.gz: 3423447600f0594c2a50a0553db7441c7ccf2cab3ef1eb5208c8dd2f6058c79e0f49b778fafa007ee58bbe95613908d9791978fcd384712686a6a5edf139acd0
-  data.tar.gz: 1910cadf0f09c54260ef60d41a9ecf89dc83d0aa65a46bcf5e3da4a67eb2b1e5cf8bab63f43dd28d92a57f536e96d2e583b31a0bf879a16312fb5d3e6a234645
+  metadata.gz: 888e2bf9c611950366eeb2c65d2cee9f08914d0e0ceec9acdb65f42a940f581b23aedcf38cacf5108005f19009263f607b39a0ae6308c899d391be8aa6d5da50
+  data.tar.gz: 18a3c29946fc65bf638b736a8fde6873ebc67eb9e9c99491e2dbd11598d37e0705795ec0e16a21d2bd50b99ff70d5acf3a273e4fa1807d36ac33a01fe640888d

data/.travis.yml

@@ -1,14 +1,8 @@
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
-  - jruby-18mode
   - jruby-19mode
 
-gemfile:
-  - Gemfile
-  - Gemfile-3.0
-
 script: "bundle exec rake test"
 
 env: TEST=true

data/CHANGELOG.md

@@ -1,6 +1,35 @@
 master
 ===
 
+* Add support for internationalization and locale-specific articles. #156
+* Drop support for Ruby 1.8 and Middleman 3.0.
+* Removed backwards compatibility patch that set instance variables for tag and calendar pages. Use locals instead.
+* Templated paths like :sources, :taglink, :year_link, :month_link, :day_link, :page_link, and custom_collections links can now be optionally expressed as RFC 6570 URI templates.
+* Arbitrary data from page frontmatter can be used in the :permalink template. Simply add a key to your :permalink template that matches a field from your frontmatter.
+* Data extracted from the :sources URL template can be used in the :permalink template. This information can also be used from templates via current_article.metadata[:page][<key>].
+* UTF-8 strings substituted into URLs are now preserved rather than being omitted. #176
+* "middleman article" command now works even when there are multiple blogs. Specify the blog you want using "--blog".
+* The template used to generate new articles via "middleman article" can be overridden by setting :new_article_template.
+* Removed `:blog_name`, `:blog_author`, `:blog_avatar` options and the `page_title` helper.
+
+3.4.1
+====
+
+* Require Middleman 3.2
+
+3.4.0
+====
+
+* Add `inspect` methods to `BlogData` and `BlogArticle` to avoid hangs on exceptions. #157
+* Generated feed.xml now works on blogs with no posts. #155
+* No longer depend on `middleman-more`.
+* Don't try to replace tokens that don't exist in the source path. #161
+* Support for including arbitrary frontmatter data in blog permalinks. #164
+* When using multiblog, fail immediately if the blog name isn't specified. #168
+
+3.3.0
+====
+
 * Experimental support for multiple blogs in a single site by activating
   `:blog` multiple times.
 * Works as a Middleman 3.1-style extension.
@@ -18,12 +47,14 @@ master
 * Fix setting time zone with `set :time_zone` in `config.rb`. #140
 * Articles can omit their :title from the filename and specify it in frontmatter
   instead. #148
+* Pages can choose which blog to use in multi-blog mode by specifying the correct
+  blog in frontmatter. #150
 
 3.2.0
 ====
 
 * The `summary` method on articles is now HTML-aware, and can be provided with
-  a different summary length or ellipsis string: `summary(1000, '&hellip;')`. 
+  a different summary length or ellipsis string: `summary(1000, '&hellip;')`.
   Nokogiri is required to use the summary.
 * The `summary_generator` option now recieves the rendered article (without
   layout) instead of the template source.

data/Gemfile

@@ -5,7 +5,7 @@ gem "middleman-core", :github => "middleman/middleman"
 # Specify your gem's dependencies in middleman-blog.gemspec
 gemspec
 
-gem "rake",     "~> 10.0.3", :require => false
+gem "rake",     "~> 10.1.0", :require => false
 gem "yard",     "~> 0.8.0", :require => false
 
 # Test tools
@@ -15,18 +15,14 @@ gem "aruba",    "~> 0.5.1"
 gem "rspec",    "~> 2.12"
 gem "simplecov"
 
-gem "timecop",  "~> 0.4.0"
-gem "nokogiri", "~> 1.5.0" # 1.6.0 requires Ruby 1.9+ but we still test on 1.8
+gem "timecop",  "~> 0.6.3"
+gem "nokogiri"
 gem "kramdown"
 
 # Code Quality
 gem "cane", :platforms => [:mri_19, :mri_20], :require => false
+gem 'coveralls', :require => false
 
 platforms :ruby do
-  gem "redcarpet", /^1\.8/.match(RUBY_VERSION) ? "~> 2.0" : "~> 3.0"
-end
-
-# Cross-templating language block fix for Ruby 1.8
-platforms :mri_18 do
-  gem "ruby18_source_location"
+  gem "redcarpet", "~> 3.0"
 end

data/README.md

@@ -31,7 +31,7 @@ Additionally, up-to-date generated code documentation is available on [RubyDoc].
 [![Build Status](https://travis-ci.org/middleman/middleman-blog.png)][travis]
 [![Dependency Status](https://gemnasium.com/middleman/middleman-blog.png?travis)][gemnasium]
 [![Code Quality](https://codeclimate.com/github/middleman/middleman-blog.png)][codeclimate]
-
+[![Code Coverage](https://coveralls.io/repos/middleman/middleman-blog/badge.png?branch=master)][coveralls]
 ## Community
 
 The official community forum is available at: http://forum.middlemanapp.com
@@ -62,5 +62,6 @@ Copyright (c) 2010-2013 Thomas Reynolds. MIT Licensed, see [LICENSE] for details
 [travis]: http://travis-ci.org/middleman/middleman-blog
 [gemnasium]: https://gemnasium.com/middleman/middleman-blog
 [codeclimate]: https://codeclimate.com/github/middleman/middleman-blog
+[coveralls]: https://coveralls.io/r/middleman/middleman-blog
 [rubydoc]: http://rubydoc.info/github/middleman/middleman-blog
-[LICENSE]: https://github.com/middleman/middleman-blog/blob/master/LICENSE.md
+[LICENSE]: https://github.com/middleman/middleman-blog/blob/master/LICENSE.md

data/features/article_cli.feature

@@ -4,4 +4,13 @@ Feature: New article CLI command
    And I run `middleman article "My New Article" --date 2012-03-17`
    Then the exit status should be 0
    Then the following files should exist:
-     | source/blog/2012-03-17-my-new-article.html.markdown |
+     | source/blog/2012-03-17-my-new-article.html.markdown |
+   And the file "source/blog/2012-03-17-my-new-article.html.markdown" should contain "tags"
+
+ Scenario: Create a new blog article with the CLI using a custom template
+   Given a fixture app "custom-article-template-app"
+   And I run `middleman article "My New Article" --date 2012-03-17`
+   Then the exit status should be 0
+   Then the following files should exist:
+     | source/2012-03-17-my-new-article.html.markdown |
+   And the file "source/2012-03-17-my-new-article.html.markdown" should contain "From a template!"

data/features/custom_collections.feature

@@ -68,3 +68,14 @@ Feature: Custom collection pages
     When I go to "/blog/categories/ruby-on-rails.html"
     Then I should see "/2011-01-01-new-article.html"
     Then I should not see "/2011-01-02-another-article.html"
+
+  Scenario: Collection property can use source path data
+    Given the Server is running at "custom-collections-sources-app"
+    When I go to "/categories/news.html"
+    Then I should see "/2011-01-01-new-article.html"
+    Then I should not see "/2011-01-02-another-article.html"
+    When I go to "/categories/articles.html"
+    Then I should not see "/2011-01-01-new-article.html"
+    Then I should see "/2011-01-02-another-article.html"
+    When I go to "/index.html"
+    Then I should see "Category Path: '/categories/articles.html'"

data/features/language.feature

@@ -0,0 +1,82 @@
+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: 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 "Некоторый текст на русском языке. Всё OK."
+
+  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: Creating article with lang from CLI
+    Given a fixture app "language-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n
+      activate :blog, prefix: ":lang"
+      """
+    And I run `middleman article "My New Article" --date 2013-09-07 --lang ru`
+    Then the exit status should be 0
+    Then the following files should exist:
+      | source/ru/2013-09-07-my-new-article.html.markdown |

data/features/multiblog.feature

@@ -1,12 +1,12 @@
 @three_one
 
 Feature: Host Multiple Blogs with Middleman 3.1+
-  
+
   Scenario: Preview
     Given a fixture app "multiblog-app"
     And a file named "config.rb" with:
       """
-      activate :blog, :name => "blog_number_1", :prefix => "blog1", :sources => ":year-:month-:day-:title.html"
+      activate :blog, :name => "blog_number_1", :prefix => "blog1", :sources => ":year-:month-:day-:title.html", :paginate => true
 
       activate :blog do |blog|
         blog.name    = "blog_number_2"
@@ -24,6 +24,8 @@ Feature: Host Multiple Blogs with Middleman 3.1+
     Then I should see "blog_number_1 title: Other Article"
     Then I should see "blog_number_2 length: 1"
     Then I should see "blog_number_2 title: Newer Article"
+    When I go to "/blog1/index.html"
+    Then I should see "Paginate: true"
 
   Scenario: Build
     Given a fixture app "multiblog-app"

data/features/permalink-data.feature

@@ -0,0 +1,12 @@
+Feature: Permalinks can include arbitrary data from frontmatter
+
+  Scenario: Articles list links using permalink with frontmatter data
+    Given the Server is running at "permalink-data-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-data-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

@@ -41,3 +41,16 @@ Feature: Article summary generation
     When I go to "/index.html"
     Then I should see "Summary from article with no summary separator and comments in the summary."
     Then I should not see "Extended part from article from article with no summary separator and comments in the summary."
+
+  Scenario: Summary is only limited by a optional summary separator and not by length
+    Given a fixture app "summary-app"
+    And a file named "config.rb" with:
+      """
+      activate :blog do |blog|
+        blog.summary_length = -1
+      end
+      """
+    Given the Server is running at "summary-app"
+    When I go to "/index.html"
+    Then I should see "Extended part from article with no separator."
+    Then I should not see "Extended part from article with separator."

data/features/support/env.rb

@@ -3,6 +3,9 @@ SimpleCov.start do
   add_filter "/features/"
 end
 
+require 'coveralls'
+Coveralls.wear!
+
 ENV["TEST"] = "true"
 ENV["AUTOLOAD_SPROCKETS"] = "false"
 

data/features/tags.feature

@@ -49,7 +49,7 @@ Feature: Tag pages
     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
@@ -61,3 +61,20 @@ Feature: Tag pages
     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
+    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"
+    Then I should see "/2011-01-01-new-article.html"

data/features/time_zone.feature

@@ -1,4 +1,4 @@
-Feature: Setup time zoen
+Feature: Setup time zone
   Scenario: Time.zone can be set through set at config.rb
     Given the Server is running at "time-zone-app"
     When I go to "/blog/2013/06/24/hello.html"

data/fixtures/custom-article-template-app/config.rb

@@ -0,0 +1,3 @@
+activate :blog do |blog|
+  blog.new_article_template = 'my_custom_article.tt'
+end

data/fixtures/custom-article-template-app/my_custom_article.tt

@@ -0,0 +1,7 @@
+---
+title: <%= @title %>
+date: <%= @date.strftime('%F %R %Z') %>
+tags: default
+---
+
+From a template!

data/fixtures/custom-article-template-app/source/index.html.erb

@@ -0,0 +1,9 @@
+<% data.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/custom-article-template-app/source/layout.erb

@@ -0,0 +1,30 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv='X-UA-Compatible' content='IE=edge;chrome=1' />
+    
+    <% if is_blog_article? %>
+      <title><%= current_article.title %></title>
+    <% end %>
+  </head>
+  <body>
+    
+    <div id="main" role="main">
+      <% if is_blog_article? %>
+        <article class="hentry">
+          <h1 class="entry-title">
+            <%= current_article.title %> 
+            <time class="updated"><%= current_article.date.strftime('%b %e %Y') %></time>
+          </h1>
+
+          <div class="entry-content">
+            <%= yield %>
+          </div>
+        </article>
+      <% else %>
+        <%= yield %>
+      <% end %>
+    </div>
+  </body>
+</html>

data/fixtures/custom-collections-sources-app/config.rb

@@ -0,0 +1,11 @@
+activate :blog do |blog|
+  blog.sources      = ":category/:year-:month-:day-:title.html"
+  blog.permalink    = "blog/:year-:month-:day-:title.html"
+
+  blog.custom_collections = {
+    :category => {
+      :link     => '/categories/:category.html',
+      :template => '/category.html'
+    }
+  }
+end

data/fixtures/custom-collections-sources-app/source/articles/2011-01-02-another-article.html.markdown

@@ -0,0 +1,8 @@
+---
+title: "Another Article"
+date: 2011-01-02
+tags:
+  - foo
+---
+
+Another Article Content

data/fixtures/custom-collections-sources-app/source/category.html.erb

@@ -0,0 +1,7 @@
+Category: <%= category %>
+
+<% if articles %>
+  <% articles[0...12].each do |article| %>
+    <li><a href="<%= article.url %>"><%= article.title %></a> <time><%= article.date.strftime('%b %e') %></time></li>
+  <% end %>
+<% end %>

data/fixtures/custom-collections-sources-app/source/index.html.erb

@@ -0,0 +1,5 @@
+ <% blog.articles[0...12].each do |article| %>
+      <li><a href="<%= article.url %>"><%= article.title %></a> <time><%= article.date.strftime('%b %e') %></time></li>
+    <% end %>
+
+Category Path: '<%= category_path("articles") %>'