nanoc 1.2 → 1.3

data/ChangeLog

@@ -1,11 +1,24 @@
+== 1.3
+
+* The @pages array now also contains uncompiled pages
+* Pages with 'skip_output' set to true will not be outputted
+* Added new filters
+	* Textile/RedCloth
+	* Sass
+* nanoc now warns before overwriting in create_site, create_page and
+  create_template (but not in compile)
+
 == 1.2
 
-* Sites now have an 'assets' directory, whose contents are copied to the 'output' directory when compiling
+* Sites now have an 'assets' directory, whose contents are copied to the 
+  'output' directory when compiling
 * Added support for non-eRuby layouts (Markaby, Haml, Liquid, ...)
 * Added many more filters
 * Improved error reporting
-* Accessing page attributes using instance variables, and not through @page, is no longer possible
-* Page attributes can now be accessed using dot notation, i.e. @page.title as well as @page[:title]
+* Accessing page attributes using instance variables, and not through @page,
+  is no longer possible
+* Page attributes can now be accessed using dot notation, i.e. @page.title as
+  well as @page[:title]
 
 == 1.1.3
 
@@ -21,12 +34,14 @@
 * Added support for nested layouts
 * Added coloured logging
 * @page now hold the page that is currently being processed
-* Index files are now called “content” files and are now named after the directory they are in [Colin Barrett]
+* Index files are now called “content” files and are now named after the
+  directory they are in [Colin Barrett]
 * It is now possible to access @page in the page’s content file
 
 == 1.0.1
 
-* Fixed a bug which would cause a “no such template” error to be displayed when the template existed but compiling it would raise an exception
+* Fixed a bug which would cause a “no such template” error to be displayed
+  when the template existed but compiling it would raise an exception
 * Fixed bug which would cause pages not to be sorted by order before compiling
 
 == 1.0

data/lib/compiler.rb

@@ -39,31 +39,23 @@ module Nanoc
 
       # Put pages in their layouts
       pages.each do |page|
-        # Prepare layout content
-        content = nil
-        context = { :page => page.merge(:_content_filename => nil), :pages => pages }
-        layout = layout_for_page(page)
+        # Skip pages that should not be outputed
+        next if page.skip_output
+
         begin
-          case layout[:type]
-          when :eruby
-            content = layout[:content].eruby(context)
-          when :haml
-            content = layout[:content].haml(context)
-          when :markaby
-            content = layout[:content].markaby(context)
-          when :liquid
-            content = layout[:content].liquid(context)
-          end
+          # Prepare layout content
+          content = layouted_page(page, pages)
+
+          # Write page with layout
+          FileManager.create_file(path_for_page(page)) { content }
         rescue => exception
-          $stderr.puts "Exception occured while layouting page" +
+          $stderr.puts "Exception occured while layouting page " +
             "'#{page[:_content_filename]}' in layout '#{page[:layout]}':" unless $quiet
           $stderr.puts exception unless $quiet
           $stderr.puts exception.backtrace.join("\n") unless $quiet
           exit
         end
 
-        # Write page with layout
-        FileManager.create_file(path_for_page(page)) { content }
       end
     end
 
@@ -133,27 +125,61 @@ module Nanoc
 
     # Compiles the given pages and returns the compiled pages
     def compile_pages(a_pages)
-      a_pages.inject([]) do |pages, page|
+      # Create page objects from given pages
+      given_pages       = []
+      a_pages.each { |page| given_pages << Page.new(page) }
+
+      # Create arrays for two kinds of pages
+      compiled_pages    = []
+      uncompiled_pages  = []
+      given_pages.each { |page| uncompiled_pages << page }
+
+      # Compile all pages
+      given_pages.each do |page|
         # Read page
-        content = File.read(page[:_content_filename])
+        content = File.read(page._content_filename)
 
-        # Filter page
+        # Compile page
         begin
-          content = content.filter(page[:filters], :assigns => { :page => Page.new(page), :pages => pages })
+          content = content.filter(page.filters, :assigns => { :page => page, :pages => uncompiled_pages + compiled_pages })
         rescue Exception => exception
-          $stderr.puts "Exception occured while compiling page" +
+          $stderr.puts "Exception occured while compiling page " +
             "'#{page[:_content_filename]}':" unless $quiet
             $stderr.puts exception unless $quiet
             $stderr.puts exception.backtrace.join("\n") unless $quiet
           exit
         end
 
+        # Move from uncompiled to compiled
+        uncompiled_pages  -= [ page ]
+        compiled_pages    += [ page ]
+
         # Create compiled page
-        compiled_page = page.merge( :content => content )
+        page[:content] = content
+      end
 
-        # Remember page
-        pages + [ Page.new(compiled_page) ]
+      # Return all pages
+      compiled_pages
+    end
+
+    # Layouts the page
+    def layouted_page(a_page, a_pages)
+      context = { :page => a_page.merge(:_content_filename => nil), :pages => a_pages }
+      layout = layout_for_page(a_page)
+
+      content = nil
+      case layout[:type]
+      when :eruby
+        content = layout[:content].eruby(context)
+      when :haml
+        content = layout[:content].haml(context)
+      when :markaby
+        content = layout[:content].markaby(context)
+      when :liquid
+        content = layout[:content].liquid(context)
       end
+
+      content
     end
 
   end

data/lib/creator.rb

@@ -3,6 +3,13 @@ module Nanoc
   class Creator
 
     def self.create_site(a_sitename)
+      # Make sure we're not accidentally overwriting anything
+      if File.exist?(a_sitename)
+        $stderr.puts 'ERROR: A file or directory named ' + a_sitename +
+          ' already exists.' unless $quiet
+        exit
+      end
+
       FileManager.create_dir a_sitename do
         FileManager.create_dir 'assets'
         FileManager.create_dir 'output'
@@ -96,6 +103,13 @@ module Nanoc
     def self.create_page(a_pagename, a_params={})
       Nanoc.ensure_in_site
 
+      # Make sure we're not accidentally overwriting anything
+      if File.exist?(File.join(['content', a_pagename]))
+        $stderr.puts 'ERROR: A file or directory named ' + a_pagename +
+          ' already exists.' unless $quiet
+        exit
+      end
+
       # Sanitize page name
       if a_pagename =~ /^[\/\.]+/
         $stderr.puts 'ERROR: page name starts with dots and/or slashes, aborting' unless $quiet == true
@@ -136,6 +150,13 @@ module Nanoc
     def self.create_template(a_templatename)
       Nanoc.ensure_in_site
 
+      # Make sure we're not accidentally overwriting anything
+      if File.exist?(File.join(['templates', a_templatename]))
+        $stderr.puts 'ERROR: A file or directory named ' + a_templatename +
+          ' already exists.' unless $quiet
+        exit
+      end
+
       FileManager.create_dir 'templates' do
         FileManager.create_dir a_templatename do
           FileManager.create_file "#{a_templatename}.txt" do

data/lib/enhancements.rb

@@ -7,6 +7,7 @@ require 'fileutils'
 require 'yaml'
 
 try_require 'bluecloth'
+try_require 'redcloth'
 try_require 'rubypants'
 try_require 'markaby'
 try_require 'liquid'
@@ -75,12 +76,16 @@ class String
         result.replace(result.liquid(a_params[:assigns]))
       when 'markaby'
         result.replace(result.markaby(a_params[:assigns]))
-      when 'markdown'
+      when 'markdown', 'bluecloth'
         result.replace(result.markdown)
       when 'rdoc'
         result.replace(result.rdoc)
-      when 'smartypants'
+      when 'sass'
+        result.replace(result.sass)
+      when 'smartypants', 'rubypants'
         result.replace(result.smartypants)
+      when 'textile', 'redcloth'
+        result.replace(result.textile)
       end
     end
   end
@@ -128,6 +133,11 @@ class String
     SM::SimpleMarkup.new.convert(self, SM::ToHtml.new)
   end
 
+  # Converts the string using Sass
+  def sass
+    Sass::Engine.new(self).render
+  end
+
   # Converts the string using RedCloth/Textile
   def textile
     RedCloth.new(self).to_html

data/lib/nanoc.rb

@@ -1,5 +1,5 @@
 module Nanoc
-  VERSION = '1.2'
+  VERSION = '1.3'
 
   def self.ensure_in_site
     unless in_site?

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: nanoc
 version: !ruby/object:Gem::Version 
-  version: "1.2"
-date: 2007-06-05 00:00:00 +02:00
+  version: "1.3"
+date: 2007-06-24 00:00:00 +02:00
 summary: a CMS that doesn't run on your server
 require_paths: 
 - lib