nanoc3 3.0.7 → 3.0.8

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2009 Denis Defreyne and contributors
+Copyright (c) 2007-2010 Denis Defreyne and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.rdoc

@@ -1,5 +1,12 @@
 = nanoc News
 
+== 3.0.8
+
+* #atom_tag_for now works with base_urls that contain a path [Eric Sunshine]
+* Generated root URLs in #atom_feed now end with a slash [Eric Sunshine]
+* Autocompiler now recognises requests to index files
+* Blogging helper now allows created_at to be a Time instance
+
 == 3.0.7
 
 * Fixed bug which could cause layout rules not be matched in order

data/README.rdoc

@@ -69,9 +69,11 @@ You may need to manually install the rdoc gem and update the rubygems installati
 
 * Colin Barrett
 * Dmitry Bilunov
+* Brian Candler
 * Christian Plessl
 * Šime Ramov
 * "Soryu"
+* Eric Sunshine
 * Dennis Sutch
 
 Special thanks to Ale Muñoz.

data/lib/nanoc3/cli/base.rb

@@ -200,7 +200,7 @@ module Nanoc3::CLI
     def handle_option(option)
       case option
       when :version
-        puts "nanoc #{Nanoc3::VERSION} (c) 2007-2009 Denis Defreyne."
+        puts "nanoc #{Nanoc3::VERSION} (c) 2007-2010 Denis Defreyne."
         puts "Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) running on #{RUBY_PLATFORM}"
         exit 0
       when :verbose

data/lib/nanoc3/extra/auto_compiler.rb

@@ -29,7 +29,10 @@ module Nanoc3::Extra
         # Find rep
         path = Rack::Utils::unescape(env['PATH_INFO'])
         reps = site.items.map { |i| i.reps }.flatten
-        rep = reps.find { |r| r.path == path }
+        rep = reps.find do |r|
+          r.path == path ||
+            r.raw_path == site.config[:output_dir] + path
+        end
 
         if rep
           serve(rep)

data/lib/nanoc3/helpers/blogging.rb

@@ -32,7 +32,10 @@ module Nanoc3::Helpers
     # articles appear first).
     def sorted_articles
       require 'time'
-      articles.sort_by { |a| Time.parse(a[:created_at]) }.reverse
+      articles.sort_by do |a|
+        time = a[:created_at]
+        time.is_a?(String) ? Time.parse(time) : time
+      end.reverse
     end
 
     # Returns a string representing the atom feed containing recent articles,
@@ -142,7 +145,10 @@ module Nanoc3::Helpers
       end
 
       # Get sorted relevant articles
-      sorted_relevant_articles = relevant_articles.sort_by { |a| Time.parse(a[:created_at]) }.reverse.first(limit)
+      sorted_relevant_articles = relevant_articles.sort_by do |a|
+        time = a[:created_at]
+        time.is_a?(String) ? Time.parse(time) : time
+      end.reverse.first(limit)
 
       # Get most recent article
       last_article = sorted_relevant_articles.first
@@ -154,15 +160,18 @@ module Nanoc3::Helpers
       # Build feed
       xml.instruct!
       xml.feed(:xmlns => 'http://www.w3.org/2005/Atom') do
+        root_url = @site.config[:base_url] + '/'
+
         # Add primary attributes
-        xml.id      @site.config[:base_url] + '/'
+        xml.id      root_url
         xml.title   @item[:title]
 
         # Add date
-        xml.updated Time.parse(last_article[:created_at]).to_iso8601_time
+        time = last_article[:created_at]
+        xml.updated (time.is_a?(String) ? Time.parse(time) : time).to_iso8601_time
 
         # Add links
-        xml.link(:rel => 'alternate', :href => @site.config[:base_url])
+        xml.link(:rel => 'alternate', :href => root_url)
         xml.link(:rel => 'self',      :href => feed_url)
 
         # Add author information
@@ -183,7 +192,8 @@ module Nanoc3::Helpers
             xml.title     a[:title], :type => 'html'
 
             # Add dates
-            xml.published Time.parse(a[:created_at]).to_iso8601_time
+            time = a[:created_at]
+            xml.published (time.is_a?(String) ? Time.parse(time) : time).to_iso8601_time
             xml.updated   a.mtime.to_iso8601_time
 
             # Add link
@@ -234,10 +244,12 @@ module Nanoc3::Helpers
     def atom_tag_for(item)
       require 'time'
 
-      hostname        = @site.config[:base_url].sub(/.*:\/\/(.+?)\/?$/, '\1')
-      formatted_date  = Time.parse(item[:created_at]).to_iso8601_date
+      hostname, base_dir = %r{^.+?://([^/]+)(.*)$}.match(@site.config[:base_url])[1..2]
+
+      time = item[:created_at]
+      formatted_date = (time.is_a?(String) ? Time.parse(time) : time).to_iso8601_date
 
-      'tag:' + hostname + ',' + formatted_date + ':' + (item.reps[0].path || item.identifier)
+      'tag:' + hostname + ',' + formatted_date + ':' + base_dir + (item.reps[0].path || item.identifier)
     end
 
   end

data/lib/nanoc3.rb

@@ -3,7 +3,7 @@
 module Nanoc3
 
   # The current nanoc version.
-  VERSION = '3.0.7'
+  VERSION = '3.0.8'
 
 end
 

data/vendor/cri/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Denis Defreyne and contributors
+Copyright (c) 2009‒2010 Denis Defreyne and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc3
 version: !ruby/object:Gem::Version 
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 +01:00
+date: 2010-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: []