nanoc 2.1.5 → 2.1.6

data/ChangeLog

@@ -1,6 +1,17 @@
 nanoc Release Notes
 ===================
 
+2.1.6
+-----
+
+* The FilesystemCombined data source now supports empty metadata sections
+* The RDoc filter now works for both RDoc 1.x and 2.x
+* The autocompiler now serves a 500 when an exception occurs outside
+  compilation
+* The autocompiler no longer serves index files when the request path does not
+  end with a slash
+* The autocompiler now always serves asset content correctly
+
 2.1.5
 -----
 

data/Rakefile

@@ -5,14 +5,7 @@ require 'rake'
 require 'rake/clean'
 require 'rake/gempackagetask'
 require 'rake/testtask'
-
-# Rdoc
-begin
-  require 'hanna/rdoctask'
-rescue LoadError
-  warn "Tried loading hanna but failed; falling back to the normal RDoc template"
-  require 'rake/rdoctask'
-end
+require 'rake/rdoctask'
 
 # nanoc itself
 require File.dirname(__FILE__) + '/lib/nanoc.rb'
@@ -90,7 +83,9 @@ spec = Gem::Specification.new do |s|
                               '--exclude' << 'lib/nanoc/binary_filters' <<
                               '--exclude' << 'lib/nanoc/extra/vcses'    <<
                               '--exclude' << 'lib/nanoc/filters'        <<
+                              '--exclude' << 'doc'                      <<
                               '--exclude' << 'test'                     <<
+                              '--exclude' << 'vendor'                   <<
                               '--line-numbers'
 
   s.files                 = %w( README LICENSE ChangeLog Rakefile ) + Dir[File.join('{bin,lib}', '**', '*')]

data/lib/nanoc.rb

@@ -1,7 +1,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '2.1.5'
+  VERSION = '2.1.6'
 
   # Generic error. Superclass for all nanoc-specific errors.
   class Error < RuntimeError ; end

data/lib/nanoc/data_sources/filesystem_combined.rb

@@ -484,7 +484,7 @@ module Nanoc::DataSources
       end
 
       # Parse
-      meta    = YAML.load(pieces[1])
+      meta    = YAML.load(pieces[1]) || {}
       content = pieces[2..-1].join.strip
 
       [ meta, content ]

data/lib/nanoc/extra/auto_compiler.rb

@@ -98,7 +98,13 @@ END
       end
 
       # Build Rack app
-      app = lambda { |env| handle_request(env['PATH_INFO']) }
+      app = lambda do |env|
+        begin
+          handle_request(env['PATH_INFO'])
+        rescue Exception => exception
+          return serve_500(nil, exception)
+        end
+      end
 
       # Run Rack app
       port ||= 3000
@@ -173,14 +179,13 @@ END
         # Reload site data
         @site.load_data(true)
 
-        # Get paths
-        rep_path  = path.cleaned_path
+        # Get file path
         file_path = @site.config[:output_dir] + path
 
         # Find rep
         objs = @site.pages + @site.assets
         reps = objs.map { |o| o.reps }.flatten
-        rep = reps.find { |r| r.web_path == rep_path }
+        rep = reps.find { |r| r.web_path == path }
 
         if rep.nil?
           # Get list of possible filenames
@@ -271,7 +276,7 @@ END
       [
         200,
         { 'Content-Type' => mime_type_of(rep.disk_path, 'text/html') },
-        [ rep.content(:post) ]
+        [ File.read(rep.disk_path) ]
       ]
     end
 

data/lib/nanoc/filters/rdoc.rb

@@ -4,11 +4,19 @@ module Nanoc::Filters
     identifiers :rdoc
 
     def run(content)
-      require 'rdoc/markup'
-      require 'rdoc/markup/to_html'
+      begin
+        # new RDoc
+        require 'rdoc/markup'
+        require 'rdoc/markup/to_html'
+        
+        ::RDoc::Markup.new.convert(content, ::RDoc::Markup::ToHtml.new)
+      rescue LoadError
+        # old RDoc
+        require 'rdoc/markup/simple_markup'
+        require 'rdoc/markup/simple_markup/to_html'
 
-      # Get result
-      ::RDoc::Markup.new.convert(content, ::RDoc::Markup::ToHtml.new)
+        ::SM::SimpleMarkup.new.convert(content, ::SM::ToHtml.new)
+      end
     end
 
   end

data/lib/nanoc/helpers/link_to.rb

@@ -51,10 +51,10 @@ module Nanoc::Helpers
     #
     # Examples:
     #
-    #   link_to('Blog', '/blog/')
+    #   link_to_unless_current('Blog', '/blog/')
     #   # => '<a href="/blog/">Blog</a>'
     #
-    #   link_to('This Page', @page_rep)
+    #   link_to_unless_current('This Page', @page_rep)
     #   # => '<span class="active">This Page</span>'
     def link_to_unless_current(text, path_or_rep, attributes={})
       # Find path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc
 version: !ruby/object:Gem::Version 
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-01 00:00:00 +01:00
+date: 2009-02-28 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -152,9 +152,12 @@ rdoc_options:
 - --exclude
 - lib/nanoc/filters
 - --exclude
+- doc
+- --exclude
 - test
+- --exclude
+- vendor
 - --line-numbers
-- --inline-source
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement