middleman-blog 3.1.0 → 3.1.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+3.1.1
+====
+* Correctly handle time zone, allow setting time zone with `set :time_zone`. #76
+* Fix using `page_articles` in when `paginate` is false. #78
+
 3.1.0
 ====
 * Don't publish future-dated articles. #74

data/features/paginate.feature

@@ -65,9 +65,28 @@ Feature: Pagination
     Then I should see "/2011-02-01-test-article.html"
     Then I should see "/2011-02-02-test-article.html"
 
+    When I go to "/2011/01.html"
+    Then I should see "Paginate: false"
+    Then I should see "Article Count: 5"
+    Then I should see "/2011-01-01-test-article.html"
+    Then I should see "/2011-01-02-test-article.html"
+    Then I should see "/2011-01-03-test-article.html"
+    Then I should see "/2011-01-04-test-article.html"
+    Then I should see "/2011-01-05-test-article.html"
+    Then I should not see "/2011-02-01-test-article.html"
+    Then I should not see "/2011-02-02-test-article.html"
+
     When I go to "/2011/page/2.html"
     Then I should see "File Not Found"
 
+    When I go to "/tags/foo.html"
+    Then I should see "Paginate: false"
+    Then I should see "Article Count: 2"
+    Then I should not see "/2011-02-02-test-article.html"
+    Then I should not see "/2011-02-01-test-article.html"
+    Then I should see "/2011-01-02-test-article.html"
+    Then I should see "/2011-01-01-test-article.html"
+
     When I go to "/tags/bar.html"
     Then I should see "Paginate: false"
     Then I should see "Article Count: 2"

data/lib/middleman-blog/blog_article.rb

@@ -1,8 +1,6 @@
+require 'active_support/time_with_zone'
 require 'active_support/core_ext/time/calculations'
 
-# Default to UTC
-Time.zone = "UTC" if Time.zone.nil?
-
 module Middleman
   module Blog
     # A module that adds blog-article methods to Resources.

data/lib/middleman-blog/extension.rb

@@ -2,27 +2,27 @@ module Middleman
   module Blog
     class Options
       KEYS = [
-        :prefix,
-        :permalink,
-        :sources,
-        :taglink,
-        :layout,
-        :summary_separator,
-        :summary_length,
-        :summary_generator,
-        :year_link,
-        :month_link,
-        :day_link,
-        :default_extension,
-        :calendar_template,
-        :year_template,
-        :month_template,
-        :day_template,
-        :tag_template,
-        :paginate,
-        :per_page,
-        :page_link
-      ]
+              :prefix,
+              :permalink,
+              :sources,
+              :taglink,
+              :layout,
+              :summary_separator,
+              :summary_length,
+              :summary_generator,
+              :year_link,
+              :month_link,
+              :day_link,
+              :default_extension,
+              :calendar_template,
+              :year_template,
+              :month_template,
+              :day_template,
+              :tag_template,
+              :paginate,
+              :per_page,
+              :page_link
+             ]
       
       KEYS.each do |name|
         attr_accessor name
@@ -39,7 +39,10 @@ module Middleman
       def registered(app, options_hash={}, &block)
         require 'middleman-blog/blog_data'
         require 'middleman-blog/blog_article'
-        
+        require 'active_support/core_ext/time/zones'
+
+        app.set :time_zone, 'UTC'
+
         app.send :include, Helpers
         
         options = Options.new(options_hash)
@@ -82,45 +85,55 @@ module Middleman
         end
 
         app.after_configuration do
+          # Make sure ActiveSupport's TimeZone stuff has something to work with,
+          # allowing people to set their desired time zone via Time.zone or
+          # set :time_zone
+          time_zone = Time.zone if Time.zone
+          zone_default = Time.find_zone!(time_zone || 'UTC')
+          unless zone_default
+            raise 'Value assigned to time_zone not recognized.'
+          end
+          Time.zone_default = zone_default
+
           # Initialize blog with options
           blog(options)
           
           sitemap.register_resource_list_manipulator(
-            :blog_articles,
-            blog,
-            false
-          )
+                                                     :blog_articles,
+                                                     blog,
+                                                     false
+                                                     )
 
           if options.tag_template
             ignore options.tag_template
 
             require 'middleman-blog/tag_pages'
             sitemap.register_resource_list_manipulator(
-              :blog_tags,
-              TagPages.new(self),
-              false
-            )
+                                                       :blog_tags,
+                                                       TagPages.new(self),
+                                                       false
+                                                       )
           end
 
           if options.year_template || 
-             options.month_template || 
-             options.day_template
+              options.month_template || 
+              options.day_template
 
             require 'middleman-blog/calendar_pages'
             sitemap.register_resource_list_manipulator(
-              :blog_calendar,
-              CalendarPages.new(self),
-              false
-            )
+                                                       :blog_calendar,
+                                                       CalendarPages.new(self),
+                                                       false
+                                                       )
           end
 
           if options.paginate
             require 'middleman-blog/paginator'
             sitemap.register_resource_list_manipulator(
-              :blog_paginate,
-              Paginator.new(self),
-              false
-            )
+                                                       :blog_paginate,
+                                                       Paginator.new(self),
+                                                       false
+                                                       )
           end
         end
       end
@@ -192,7 +205,10 @@ module Middleman
       # @return [Array<Middleman::Sitemap::Resource>]
       def page_articles
         limit = (current_resource.metadata[:page]["per_page"] || 0) - 1
-        blog.articles[0..limit]
+
+        # "articles" local variable is populated by Calendar and Tag page generators
+        # If it's not set then use the complete list of articles
+        (current_resource.metadata[:locals]["articles"] || blog.articles)[0..limit]
       end
     end
   end

data/lib/middleman-blog/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Blog
-    VERSION = "3.1.0"
+    VERSION = "3.1.1"
   end
 end

metadata

@@ -1,76 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: middleman-blog
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 3
-  - 1
-  - 0
-  version: 3.1.0
+version: !ruby/object:Gem::Version
+  version: 3.1.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Thomas Reynolds
 - Ben Hollis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-10 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+date: 2012-09-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: middleman-core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 1
+      - !ruby/object:Gem::Version
         version: 3.0.1
-  name: middleman-core
-  requirement: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+- !ruby/object:Gem::Dependency
   name: maruku
-  requirement: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: *id003
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: A blog foundation using Middleman
-email: 
+email:
 - me@tdreyno.com
 - ben@benhollis.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
 - .travis.yml
@@ -208,37 +205,37 @@ files:
 - lib/middleman-blog/version.rb
 - lib/middleman_extension.rb
 - middleman-blog.gemspec
-has_rdoc: true
 homepage: https://github.com/middleman/middleman-blog
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+      hash: -3637459157260692446
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3637459157260692446
 requirements: []
-
 rubyforge_project: middleman-blog
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A blog foundation using Middleman
-test_files: 
+test_files:
 - features/article_cli.feature
 - features/article_dirs.feature
 - features/blog_sources.feature
@@ -346,3 +343,4 @@ test_files:
 - fixtures/tags-app/source/index.html.erb
 - fixtures/tags-app/source/layout.erb
 - fixtures/tags-app/source/tag.html.erb
+has_rdoc: