middleman-blog 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9607656cf709f1ad3a4cc7ec060e3c3cd5e73ae3
-  data.tar.gz: 169bd0122267d51e7768885fdfa3a782d6a7f9af
+  metadata.gz: 22770d35db1f34d0390f3f54b1e81f83f82db571
+  data.tar.gz: 2881759a6e49a107f918874b861e582dd606091c
 SHA512:
-  metadata.gz: 0bacecc695f007c53ba6df3b8dd259768b151b2b783f16a19762dad8fe5a90014c62c453e3c26c31614ebac8c58feb79cdaf85eeecc2eed8daeff8ec48ebe5cb
-  data.tar.gz: fbc3ce009ad08ccce6c644b4741dde9e36cdb1d4a00ca10514d4bd9afd1fa0218af78ad70f788a3d6d7eb783e2136c6f37d6ff08e5150a509a09b9719ec5351a
+  metadata.gz: 50e210cc5210809498128aa105265f4056b39e31af63d0dc37faa18a015dd6b43ca10af5cd89f282bad0775472bace318f6e5aee61573f5763b866ba739fa311
+  data.tar.gz: 93fde692a714779f015ec18a2a6fcb46c72eba7912c90b12fdb7d6fd2c7cd15b5cf1efaefc59425ed54b92fc773d6e1f6392ab1adaa7bf38be43c7e944d61868

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+3.5.2
+===
+
+* Ignored pages won't be processed by the blog extension.
+* Avoid creating an empty-string collection when a post does not have a custom collection property set. #192
+* Fix blog sources matching blog entries that are in a subdirectory that's not explicitly stated as part of the blog.sources template. #196
+* Fixed tag and year links in blog template. #195
+* An article's language can be set via the {lang} parameter in its sources URL template. #187
+* Tags that are just a number work now. #188
+
 3.5.1
 ===
 

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "middleman-core", :github => "middleman/middleman"
+gem "middleman-core", :github => "middleman/middleman", :branch => 'v3-stable'
 
 # Specify your gem's dependencies in middleman-blog.gemspec
 gemspec

data/features/blog_sources.feature

@@ -25,3 +25,8 @@ Feature: Flexible article sources
     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"

data/features/custom_collections.feature

@@ -10,6 +10,8 @@ Feature: Custom collection pages
     Then I should see "/2011-01-02-another-article.html"
     When I go to "/index.html"
     Then I should see "Category Path: '/categories/ruby-on-rails.html'"
+    When I go to "/categories/.html"
+    Then I should see "Not Found"
 
   Scenario: Collection pages are accessbile from preview server with directory_indexes
     Given a fixture app "custom-collections-app"

data/features/ignored_files.feature

@@ -0,0 +1,25 @@
+Feature: Files can be ignored from within blog
+  Scenario: A file can be ignored
+    Given a fixture app "preview-app"
+    And a file named "config.rb" with:
+      """
+      activate :blog do |blog|
+        blog.sources = ":year/:month/:day/:title.html"
+      end
+      ignore '2011/01/02/newer-article.html'
+      """
+    # This file would give an error if it weren't ignored
+    And a file named "source/2011/01/02/newer-article.html.markdown" with:
+      """
+      ---
+      title: "Newer Article"
+      date: 2013-01-15
+      ---
+
+      Newer Article Content
+      """
+    Given the Server is running
+    When I go to "/2011/01/01/new-article.html"
+    Then I should see "Article"
+    When I go to "/2011/01/02/newer-article.html"
+    Then I should see "Not Found"

data/features/language.feature

@@ -23,6 +23,14 @@ Feature: Internationalized articles
     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:

data/features/tags.feature

@@ -9,6 +9,9 @@ Feature: Tag pages
     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'"
 

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

@@ -0,0 +1,4 @@
+activate :blog do |blog|
+  blog.sources = "blog/:title.html"
+  blog.permalink = "blog/{title}"
+end

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

@@ -0,0 +1,3 @@
+<% page_articles.each do |post| %>
+  <li><%= link_to post.title, post %></li>
+<% end %>

data/fixtures/blog-sources-subdirs-app/source/blog/another-post.md.erb

@@ -0,0 +1,8 @@
+---
+title: "Another post"
+published: true
+date: 2014/01/15
+---
+
+Lorem ipsum dolor sit amet
+

data/fixtures/blog-sources-subdirs-app/source/blog/subdir/yet-another-post.md.erb

@@ -0,0 +1,8 @@
+---
+title: "Yet another post"
+published: true
+date: 2014/01/15
+---
+
+Lorem ipsum dolor sit amet
+

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

@@ -0,0 +1 @@
+<%= yield %>

data/fixtures/custom-collections-app/source/blog/2011-01-03-no-category-article.html.markdown

@@ -0,0 +1,6 @@
+---
+title: "No category"
+date: 2011-01-03
+---
+
+This post has no category!

data/fixtures/lang-path-app/config.rb

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

data/fixtures/lang-path-app/source/blog/2013-12-24-a-humble-test.en.html.markdown

@@ -0,0 +1,5 @@
+---
+title: 'A humble test'
+---
+
+English!

data/fixtures/lang-path-app/source/blog/2013-12-24-a-humble-test.ru.html.markdown

@@ -0,0 +1,5 @@
+---
+title: 'A humble test'
+---
+
+Russian!

data/fixtures/lang-path-app/source/layouts/layout.erb

@@ -0,0 +1,6 @@
+<html>
+  <head></head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/fixtures/tags-app/source/blog/2011-01-02-another-article.html.markdown

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

data/lib/middleman-blog/blog_article.rb

@@ -124,7 +124,7 @@ module Middleman
         if article_tags.is_a? String
           article_tags.split(',').map(&:strip)
         else
-          Array(article_tags)
+          Array(article_tags).map(&:to_s)
         end
       end
 
@@ -136,11 +136,8 @@ module Middleman
       #
       # @return [Symbol] Language code (for example, +:en+ or +:de+)
       def lang
-        frontmatter_lang = data["lang"]
-
-        if blog_options.sources.include? ":lang"
-          filename_lang = path_part("lang")
-        end
+        frontmatter_lang = data['lang']
+        filename_lang = path_part('lang')
 
         if frontmatter_lang && filename_lang && frontmatter_lang != filename_lang
           raise "The lang in #{path}'s filename (#{filename_lang.inspect}) doesn't match the lang in its frontmatter (#{frontmatter_lang.inspect})"
@@ -232,7 +229,7 @@ module Middleman
       # @param [String] part The part of the path, e.g. "lang", "year", "month", "day", "title"
       # @return [String]
       def path_part(part)
-        @_path_parts ||= blog_data.source_template.extract(path)
+        @_path_parts ||= Blog::UriTemplates.extract_params(blog_data.source_template, path)
         @_path_parts[part.to_s]
       end
     end

data/lib/middleman-blog/blog_data.rb

@@ -78,6 +78,12 @@ module Middleman
         used_resources = []
 
         resources.each do |resource|
+          if resource.ignored?
+            # Don't bother blog-processing ignored stuff
+            used_resources << resource
+            next
+          end
+
           if (params = extract_params(@source_template, resource.path))
             article = convert_to_article(resource)
             next unless publishable?(article)

data/lib/middleman-blog/commands/article.rb

@@ -31,7 +31,7 @@ module Middleman
         desc: "The language to create the post with (defaults to I18n.default_locale if avaliable)"
       method_option "blog",
         aliases: "-b",
-        desc: "The name of the blog to creat the post inside (for multi-blog apps, defaults to the only blog in single-blog apps)"
+        desc: "The name of the blog to create the post inside (for multi-blog apps, defaults to the only blog in single-blog apps)"
       def article(title)
         shared_instance = ::Middleman::Application.server.inst
 

data/lib/middleman-blog/custom_pages.rb

@@ -26,7 +26,9 @@ module Middleman
       end
 
       def manipulate_resource_list(resources)
-        articles_by_property = @blog_data.articles.group_by { |a| a.metadata[:page][property.to_s] }
+        articles_by_property = @blog_data.articles.
+          select {|a| a.metadata[:page][property.to_s] }.
+          group_by {|a| a.metadata[:page][property.to_s] }
         resources + articles_by_property.map do |property_value, articles|
           build_resource(link(property_value), property_value, articles)
         end

data/lib/middleman-blog/template/source/layout.erb

@@ -23,14 +23,14 @@
       <h2>Tags</h2>
       <ol>
         <% blog.tags.each do |tag, articles| %>
-          <li><%= link_to tag, tag_path(tag) %> (<%= articles.size %>)</a></li>
+          <li><%= link_to "#{tag} (#{articles.size})", tag_path(tag) %></li>
         <% end %>
       </ol>
 
       <h2>By Year</h2>
       <ol>
         <% blog.articles.group_by {|a| a.date.year }.each do |year, articles| %>
-          <li><%= link_to year, blog_year_path(year) %> (<%= articles.size %>)</a></li>
+          <li><%= link_to "#{year} (#{articles.size})", blog_year_path(year) %></li>
         <% end %>
       </ol>
     </aside>

data/lib/middleman-blog/uri_templates.rb

@@ -49,7 +49,7 @@ module Middleman
         sep = '-'
 
         # Reimplementation of http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-parameterize that preserves un-transliterate-able multibyte chars.
-        parameterized_string = ActiveSupport::Inflector.transliterate(str).downcase
+        parameterized_string = ActiveSupport::Inflector.transliterate(str.to_s).downcase
         parameterized_string.gsub!(/[^a-z0-9\-_\?]+/, sep)
 
         parameterized_string.chars.to_a.each_with_index do |char, i|

data/lib/middleman-blog/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Blog
-    VERSION = "3.5.1"
+    VERSION = "3.5.2"
   end
 end

data/spec/uri_templates_spec.rb

@@ -22,6 +22,10 @@ describe 'Middleman::Blog::UriTemplates' do
     it "can handle mixed strings" do
       safe_parameterize('What ☆☆☆!').should == 'what-☆☆☆'
     end
+
+    it "can handle numbers" do
+      safe_parameterize(1).should == '1'
+    end
   end
 
   describe 'extract_params' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-blog
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.5
 description: Blog engine for Middleman
@@ -61,10 +61,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gemtest"
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -83,6 +83,7 @@ files:
 - features/directory_indexes.feature
 - features/filename_date.feature
 - features/future_date.feature
+- features/ignored_files.feature
 - features/language.feature
 - features/layouts.feature
 - features/multiblog.feature
@@ -110,6 +111,11 @@ files:
 - 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/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/layout.erb
 - fixtures/calendar-and-tag-app/config-directory-indexes.rb
 - fixtures/calendar-and-tag-app/config.rb
 - fixtures/calendar-and-tag-app/source/archive.html.erb
@@ -142,6 +148,7 @@ files:
 - fixtures/custom-collections-app/config.rb
 - fixtures/custom-collections-app/source/blog/2011-01-01-new-article.html.markdown
 - fixtures/custom-collections-app/source/blog/2011-01-02-another-article.html.markdown
+- fixtures/custom-collections-app/source/blog/2011-01-03-no-category-article.html.markdown
 - fixtures/custom-collections-app/source/category.html.erb
 - fixtures/custom-collections-app/source/index.html.erb
 - fixtures/custom-collections-app/source/layout.erb
@@ -193,6 +200,10 @@ files:
 - fixtures/indexes-app/source/2011/01/01/new-article.html.markdown
 - fixtures/indexes-app/source/index.html.erb
 - fixtures/indexes-app/source/layout.erb
+- fixtures/lang-path-app/config.rb
+- fixtures/lang-path-app/source/blog/2013-12-24-a-humble-test.en.html.markdown
+- fixtures/lang-path-app/source/blog/2013-12-24-a-humble-test.ru.html.markdown
+- fixtures/lang-path-app/source/layouts/layout.erb
 - fixtures/language-app/config.rb
 - fixtures/language-app/locales/en.yml
 - fixtures/language-app/locales/ru.yml
@@ -353,17 +364,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Blog engine for Middleman
@@ -380,6 +391,7 @@ test_files:
 - features/directory_indexes.feature
 - features/filename_date.feature
 - features/future_date.feature
+- features/ignored_files.feature
 - features/language.feature
 - features/layouts.feature
 - features/multiblog.feature
@@ -407,6 +419,11 @@ test_files:
 - 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/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/layout.erb
 - fixtures/calendar-and-tag-app/config-directory-indexes.rb
 - fixtures/calendar-and-tag-app/config.rb
 - fixtures/calendar-and-tag-app/source/archive.html.erb
@@ -439,6 +456,7 @@ test_files:
 - fixtures/custom-collections-app/config.rb
 - fixtures/custom-collections-app/source/blog/2011-01-01-new-article.html.markdown
 - fixtures/custom-collections-app/source/blog/2011-01-02-another-article.html.markdown
+- fixtures/custom-collections-app/source/blog/2011-01-03-no-category-article.html.markdown
 - fixtures/custom-collections-app/source/category.html.erb
 - fixtures/custom-collections-app/source/index.html.erb
 - fixtures/custom-collections-app/source/layout.erb
@@ -490,6 +508,10 @@ test_files:
 - fixtures/indexes-app/source/2011/01/01/new-article.html.markdown
 - fixtures/indexes-app/source/index.html.erb
 - fixtures/indexes-app/source/layout.erb
+- fixtures/lang-path-app/config.rb
+- fixtures/lang-path-app/source/blog/2013-12-24-a-humble-test.en.html.markdown
+- fixtures/lang-path-app/source/blog/2013-12-24-a-humble-test.ru.html.markdown
+- fixtures/lang-path-app/source/layouts/layout.erb
 - fixtures/language-app/config.rb
 - fixtures/language-app/locales/en.yml
 - fixtures/language-app/locales/ru.yml