middleman-blog 3.5.3 → 3.6.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23f47f0936e797509009d946ca8e2cf1c5c7cc37
-  data.tar.gz: 444623757d6de91c8c90a3c50945c440c588263f
+  metadata.gz: 6fd8e5447b47c113fc7c58ae2cd7555cc070adcf
+  data.tar.gz: d4586b9545fc038a1af9d415255952b0e3cdda76
 SHA512:
-  metadata.gz: d46bbcd2deb299eb086603cc98a1d8b2246d8c50b114033e0852498de57d62747a9ae9f0aa92c4fa3fe8fad4f5d6b57c2b14c6a91ecd9a7507e60f0d2d2a517e
-  data.tar.gz: 7914d29e266f0c96bf0d31aa3053c9c65838036d2da5f734b1133c54fff92abf3095b1a0c141160a6ad0a6a9c2ff0de5dbe5b89d9b4b10e547802ece075b6d79
+  metadata.gz: f35f5e4c6bb2c3b56e3bde38ff60928ecd49b56656acba2a338b7752ad6406d707b323fbea63e82041ad2fa5837205cdcefedbd791b65defd7741138814aa8c0
+  data.tar.gz: d8fbcc07cce2c0c330e1b0969ffe0eee303d1964752398d2d5f4d028394f6a09df65b43932c943fb41c6bd8c279fe7460968b0d07d60cef6fb870840ab5bccdc

data/features/paginate.feature

@@ -50,6 +50,31 @@ Feature: Pagination
     Then I should not see "/2011-01-04-test-article.html"
     Then I should not see "/2011-01-03-test-article.html"
 
+    When I go to "/categories/ruby-on-rails.html"
+    Then I should see "Paginate: true"
+    Then I should see "Article Count: 2"
+    Then I should see "Num Pages: 3"
+    Then I should see "Page Start: 1"
+    Then I should see "Page End: 2"
+    Then I should see "Next Page: '/categories/ruby-on-rails/page/2.html'"
+    Then I should see "Prev Page: ''"
+    Then I should see "/2011-01-05-test-article.html"
+    Then I should see "/2011-01-04-test-article.html"
+    Then I should not see "/2011-01-03-test-article.html"
+    Then I should not see "/2011-01-02-test-article.html"
+
+    When I go to "/categories/ruby-on-rails/page/2.html"
+    Then I should see "Article Count: 2"
+    Then I should see "Num Pages: 3"
+    Then I should see "Page Start: 3"
+    Then I should see "Page End: 4"
+    Then I should see "Next Page: '/categories/ruby-on-rails/page/3.html'"
+    Then I should see "Prev Page: '/categories/ruby-on-rails.html'"
+    Then I should not see "/2011-01-05-test-article.html"
+    Then I should not see "/2011-01-04-test-article.html"
+    Then I should see "/2011-01-03-test-article.html"
+    Then I should see "/2011-01-02-test-article.html"
+
   Scenario: Index pages are accessible from preview server, with pagination off
     Given a fixture app "paginate-app"
     And app "paginate-app" is using config "paginate-off"
@@ -96,6 +121,21 @@ Feature: Pagination
     Then I should not see "/2011-01-04-test-article.html"
     Then I should not see "/2011-01-03-test-article.html"
 
+    When I go to "/categories/ruby-on-rails.html"
+    Then I should see "Paginate: false"
+    Then I should see "Article Count: 2"
+    Then I should see "/2011-01-05-test-article.html"
+    Then I should see "/2011-01-04-test-article.html"
+    Then I should not see "/2011-01-03-test-article.html"
+    Then I should not see "/2011-01-02-test-article.html"
+
+    When I go to "/categories/travel.html"
+    Then I should see "Paginate: false"
+    Then I should see "Article Count: 2"
+    Then I should see "/2011-02-02-test-article.html"
+    Then I should see "/2011-02-01-test-article.html"
+    Then I should not see "/2011-01-05-test-article.html"
+
   Scenario: Index pages are accessible from preview server, with directory_indexes on
     Given a fixture app "paginate-app"
     And app "paginate-app" is using config "directory-indexes"
@@ -114,19 +154,27 @@ Feature: Pagination
     When I go to "/tags/bar/"
     Then I should see "Next Page: '/tags/bar/page/2/'"
 
+    When I go to "/categories/ruby-on-rails/"
+    Then I should see "Next Page: '/categories/ruby-on-rails/page/2/'"
+
   Scenario: Index pages also get built
     Given a successfully built app at "paginate-app"
     When I cd to "build"
     Then the following files should exist:
-    | tags/foo.html        |
-    | tags/bar.html        |
-    | tags/bar/page/2.html |
-    | tags/bar/page/3.html |
-    | 2011.html            |
-    | 2011/page/2.html     |
+    | tags/foo.html                        |
+    | tags/bar.html                        |
+    | tags/bar/page/2.html                 |
+    | tags/bar/page/3.html                 |
+    | categories/ruby-on-rails.html        |
+    | categories/ruby-on-rails/page/2.html |
+    | categories/ruby-on-rails/page/3.html |
+    | categories/travel.html               |
+    | 2011.html                            |
+    | 2011/page/2.html                     |
     Then the following files should not exist:
     | tags.html     |
     | calendar.html |
+    | category.html |
 
     And the file "2011/page/2.html" should contain "Year: '2011'"
     And the file "2011/page/2.html" should contain "Month: ''"
@@ -148,6 +196,13 @@ Feature: Pagination
     And the file "tags/bar/page/3.html" should contain "Next Page: ''"
     And the file "tags/bar/page/3.html" should contain "/2011-01-03-test-article.html"
 
+    And the file "categories/ruby-on-rails/page/2.html" should contain "Category: ruby-on-rails"
+    And the file "categories/ruby-on-rails/page/2.html" should contain "Article Count: 2"
+    And the file "categories/ruby-on-rails/page/2.html" should contain "Prev Page: '/categories/ruby-on-rails.html'"
+    And the file "categories/ruby-on-rails/page/2.html" should contain "Next Page: '/categories/ruby-on-rails/page/3.html'"
+    And the file "categories/ruby-on-rails/page/2.html" should contain "/2011-01-03-test-article.html"
+    And the file "categories/ruby-on-rails/page/2.html" should contain "/2011-01-02-test-article.html"
+
   Scenario: Adding a tag to a post in preview adds a new index page
     Given the Server is running at "paginate-app"
     When I go to "/tags/foo.html"
@@ -163,6 +218,7 @@ Feature: Pagination
       title: "Newest Article"
       date: 2011-02-03
       tags: foo
+      category: ruby-on-rails
       ---
 
       Newer Article Content
@@ -174,3 +230,11 @@ Feature: Pagination
 
     When I go to "/tags/foo/page/2.html"
     Then I should see "/2011-01-01-test-article.html"
+
+    When I go to "/categories/ruby-on-rails.html"
+    Then I should see "Next Page: '/categories/ruby-on-rails/page/2.html'"
+    Then I should see "/2011-02-03-new-article.html"
+    Then I should not see "/2011-01-04-test-article.html"
+
+    When I go to "/categories/ruby-on-rails/page/2.html"
+    Then I should see "/2011-01-04-test-article.html"

data/fixtures/paginate-app/config-directory-indexes.rb

@@ -5,6 +5,13 @@ activate :blog do |blog|
   blog.tag_template      = 'tag.html'
   blog.paginate          = true
   blog.per_page          = 5
+
+  blog.custom_collections = {
+    :category => {
+      :link     => '/categories/:category.html',
+      :template => '/category.html'
+    }
+  }
 end
 
 activate :directory_indexes

data/fixtures/paginate-app/config-paginate-off.rb

@@ -5,4 +5,11 @@ activate :blog do |blog|
   blog.tag_template      = 'tag.html'
   #blog.paginate          = true
   blog.per_page          = 5
+
+  blog.custom_collections = {
+    :category => {
+      :link     => '/categories/:category.html',
+      :template => '/category.html'
+    }
+  }
 end

data/fixtures/paginate-app/config.rb

@@ -5,4 +5,11 @@ activate :blog do |blog|
   blog.tag_template      = 'tag.html'
   blog.paginate          = true
   blog.per_page          = 5
+
+  blog.custom_collections = {
+    :category => {
+      :link     => '/categories/:category.html',
+      :template => '/category.html'
+    }
+  }
 end

data/fixtures/paginate-app/source/blog/2011-01-01-test-article.html.markdown

@@ -2,5 +2,6 @@
 title: "Test Article"
 date: 2011-01-01
 tags: foo
+category: ruby-on-rails
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-02-test-article.html.markdown

@@ -2,5 +2,6 @@
 title: "Test Article"
 date: 2011-01-02
 tags: foo
+category: ruby-on-rails
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-03-test-article.html.markdown

@@ -2,5 +2,6 @@
 title: "Test Article"
 date: 2011-01-03
 tags: bar
+category: ruby-on-rails
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-04-test-article.html.markdown

@@ -2,5 +2,6 @@
 title: "Test Article"
 date: 2011-01-04
 tags: bar
+category: ruby-on-rails
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-01-05-test-article.html.markdown

@@ -2,5 +2,6 @@
 title: "Test Article"
 date: 2011-01-05
 tags: bar
+category: ruby-on-rails
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-02-01-test-article.html.markdown

@@ -2,5 +2,6 @@
 title: "Test Article"
 date: 2011-02-01
 tags: bar
+category: travel
 ---
 Test Article Content

data/fixtures/paginate-app/source/blog/2011-02-02-test-article.html.markdown

@@ -2,5 +2,6 @@
 title: "Test Article"
 date: 2011-02-02
 tags: bar
+category: travel
 ---
 Test Article Content

data/fixtures/paginate-app/source/category.html.erb

@@ -0,0 +1,23 @@
+---
+pageable: true
+per_page: 2
+---
+Category: <%= category %>
+
+Paginate: <%= paginate %>
+Article Count: <%= page_articles.size %>
+<% if paginate %>
+Page Num: <%= page_number %>
+Num Pages: <%= num_pages %>
+Per Page: <%= per_page %>
+Page Start: <%= page_start %>
+Page End: <%= page_end %>
+Next Page: '<%= next_page.url if next_page %>'
+Prev Page: '<%= prev_page.url if prev_page %>'
+<% end %>
+
+<% if page_articles %>
+  <% page_articles.each do |article| %>
+    <li><a href="<%= article.url %>"><%= article.title %></a> <time><%= article.date.strftime('%b %e') %></time></li>
+  <% end %>
+<% end %>

data/lib/middleman-blog.rb

@@ -1,7 +1,13 @@
 require "middleman-core"
 
 require "middleman-blog/version"
-require "middleman-blog/template"
+
+begin
+  require "middleman-blog/template"
+rescue LoadError
+  # v4
+end
+
 require "middleman-blog/commands/article"
 
 ::Middleman::Extensions.register(:blog) do

data/lib/middleman-blog/blog_article.rb

@@ -57,7 +57,7 @@ module Middleman
       # An article is considered published in the following scenarios:
       #
       # 1. Frontmatter does not set +published+ to false and either
-      # 2. The blog option +published_future_dated+ is true or
+      # 2. The blog option +publish_future_dated+ is true or
       # 3. The article's date is after the current time
       # @return [Boolean]
       def published?

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

@@ -28,7 +28,7 @@ module Middleman
         desc: "The date to create the post with (defaults to now)"
       method_option "lang",
         aliases: "-l",
-        desc: "The language to create the post with (defaults to I18n.default_locale if avaliable)"
+        desc: "The language to create the post with (defaults to I18n.default_locale if available)"
       method_option "blog",
         aliases: "-b",
         desc: "The name of the blog to create the post inside (for multi-blog apps, defaults to the only blog in single-blog apps)"

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

@@ -1,6 +1,6 @@
 ---
 title: <%= @title %>
-date: <%= @date.strftime('%F %R %Z') %>
+date: <%= @date.strftime('%F %R %z') %>
 tags:
 ---
 

data/lib/middleman-blog/extension.rb

@@ -86,7 +86,7 @@ module Middleman
     end
 
     def after_configuration
-      @name ||= :"blog#{@app.blog_instances.keys.length}"
+      @name ||= :"blog#{::Middleman::Blog.instances.keys.length}"
 
       # TODO: break up into private methods?
 
@@ -96,7 +96,7 @@ module Middleman
       @app.ignore(options.day_template) if options.day_template
       @app.ignore options.tag_template if options.tag_template
 
-      @app.blog_instances[@name] = self
+      ::Middleman::Blog.instances[@name] = self
 
       # Make sure ActiveSupport's TimeZone stuff has something to work with,
       # allowing people to set their desired time zone via Time.zone or
@@ -128,16 +128,16 @@ module Middleman
         @app.sitemap.register_resource_list_manipulator(:"blog_#{name}_calendar", @calendar_pages, false)
       end
 
+      if options.custom_collections
+        require 'middleman-blog/custom_pages'
+        register_custom_pages
+      end
+
       if options.paginate
         require 'middleman-blog/paginator'
         @paginator = Blog::Paginator.new(@app, self)
         @app.sitemap.register_resource_list_manipulator(:"blog_#{name}_paginate", @paginator, false)
       end
-
-      if options.custom_collections
-        require 'middleman-blog/custom_pages'
-        register_custom_pages
-      end
     end
 
     private

data/lib/middleman-blog/helpers.rb

@@ -1,14 +1,26 @@
 module Middleman
   module Blog
+    def self.instances
+      @blog_instances ||= {}
+    end
+
+    def self.instances=(v)
+      @blog_instances = v
+    end
+
     # Blog-related helpers that are available to the Middleman application in +config.rb+ and in templates.
     module Helpers
+      def self.included(base)
+        ::Middleman::Blog.instances = {}
+      end
+
       # All the blog instances known to this Middleman app, keyed by name. A new blog is added
       # every time the blog extension is activated. Name them by setting the +:name+
       # option when activating - otherwise they get an automatic name like 'blog0', 'blog1', etc.
       #
       # @return [Hash<Symbol,BlogExtension>] a hash of all blog instances by name
       def blog_instances
-        @blog_instances ||= {}
+        ::Middleman::Blog.instances
       end
 
       # Retrieve a {BlogExtension} instance.
@@ -33,7 +45,12 @@ module Middleman
 
         # In multiblog situations, force people to specify the blog
         if !blog_name && blog_instances.size > 1
-          raise "You must either specify the blog name in calling this method or in your page frontmatter (using the 'blog' blog_name)"
+          raise "You have more than one blog so you must either use the flag --blog (ex. --blog 'myBlog') when calling this method, or add blog: [blog_name] to your page's frontmatter"
+        end
+
+        # Warn if a non-existent blog name provided
+        if blog_name && !blog_instances.keys.include?(blog_name)
+          raise "Non-existent blog name provided: #{blog_name}."
         end
 
         blog_name ||= blog_instances.keys.first

data/lib/middleman-blog/paginator.rb

@@ -144,9 +144,9 @@ module Middleman
           res.path
         else
           page_url = apply_uri_template page_link, num: page_num
-          index_re = %r{(^|/)#{Regexp.escape(@app.index_file)}$}
+          index_re = %r{(^|/)#{Regexp.escape(@app.config[:index_file])}$}
           if res.path =~ index_re
-            res.path.sub(index_re, "\\1#{page_url}/#{@app.index_file}")
+            res.path.sub(index_re, "\\1#{page_url}/#{@app.config[:index_file]}")
           else
             res.path.sub(%r{(^|/)([^/]*)\.([^/]*)$}, "\\1\\2/#{page_url}.\\3")
           end

data/lib/middleman-blog/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Blog
-    VERSION = "3.5.3"
+    VERSION = "3.6.0.beta.2"
   end
 end

data/middleman-blog.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency("middleman-core", ["~> 3.2"])
+  s.add_dependency("middleman-core", [">= 3.3"])
   s.add_dependency("tzinfo", [">= 0.3.0"])
   s.add_dependency("addressable", ["~> 2.3.5"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-blog
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.6.0.beta.2
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-12-24 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'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -252,6 +252,7 @@ files:
 - fixtures/paginate-app/source/blog/2011-02-01-test-article.html.markdown
 - fixtures/paginate-app/source/blog/2011-02-02-test-article.html.markdown
 - fixtures/paginate-app/source/calendar.html.erb
+- fixtures/paginate-app/source/category.html.erb
 - fixtures/paginate-app/source/index.html.erb
 - fixtures/paginate-app/source/layout.erb
 - fixtures/paginate-app/source/tag.html.erb
@@ -369,9 +370,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -560,6 +561,7 @@ test_files:
 - fixtures/paginate-app/source/blog/2011-02-01-test-article.html.markdown
 - fixtures/paginate-app/source/blog/2011-02-02-test-article.html.markdown
 - fixtures/paginate-app/source/calendar.html.erb
+- fixtures/paginate-app/source/category.html.erb
 - fixtures/paginate-app/source/index.html.erb
 - fixtures/paginate-app/source/layout.erb
 - fixtures/paginate-app/source/tag.html.erb