nanoc 2.0.2 → 2.0.3

data/ChangeLog

@@ -1,6 +1,13 @@
 nanoc Release Notes
 ===================
 
+2.0.3
+-----
+
+* autocompiler now honors custom paths
+* autocompiler now attempts to serve pages with the most appropriate MIME
+  type, instead of always serving everything as "text/html"
+
 2.0.2
 -----
 

data/lib/nanoc.rb

@@ -1,6 +1,6 @@
 module Nanoc
 
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 
   def self.load_file(*path)
     full_path = [ File.dirname(__FILE__), 'nanoc' ] + path

data/lib/nanoc/base/auto_compiler.rb

@@ -72,7 +72,7 @@ END
 
       if page.nil?
         # Serve file
-        if File.exist?(file_path)
+        if File.file?(file_path)
           serve_file(file_path, response)
         else
           serve_404(request.path, response)
@@ -114,8 +114,12 @@ END
         return
       end
 
+      # Determine most likely MIME type
+      mime_type = MIME::Types.of(page.path).first
+      mime_type = mime_type.nil? ? 'text/html' : mime_type.simplified
+
       response.status           = 200
-      response['Content-Type']  = 'text/html'
+      response['Content-Type']  = mime_type
       response.body             = page.layouted_content
     end
 

data/lib/nanoc/base/page.rb

@@ -59,8 +59,13 @@ module Nanoc
       @content[:post]
     end
 
-    def skip_output? ; attribute_named(:skip_output)  ; end
-    def path         ; attribute_named(:path)         ; end
+    def skip_output?
+      attribute_named(:skip_output)
+    end
+
+    def path
+      attribute_named(:custom_path) || attribute_named(:path)
+    end
 
     def path_on_filesystem
       if attribute_named(:custom_path).nil?

data/lib/nanoc/data_sources/filesystem.rb

@@ -152,10 +152,11 @@ module Nanoc::DataSource::Filesystem
     # processor; which extension maps to which layout processor is defined in
     # the layout processors.
     def layouts
-      Dir["layouts/*"].reject { |f| f =~ /~$/ }.map do |filename|
+      Dir["layouts/**/*"].reject { |f| f =~ /~$/ }.map do |filename|
         # Get layout details
         extension = File.extname(filename)
-        name      = File.basename(filename, extension)
+        #name      = File.basename(filename, extension)
+        name      = filename.gsub(/layouts\//,"").gsub(extension,"") 
         content   = File.read(filename)
 
         # Build hash for layout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-26 00:00:00 +01:00
+date: 2008-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: []