nanoc 1.5 → 1.6

data/ChangeLog

@@ -1,11 +1,25 @@
-== 1.5
+nanoc Release Notes
+===================
+
+1.6
+---
+
+* Added support for post-layout filters
+* Added support for getting a File object for the page, so you can now e.g.
+  easily get the modification time for a given page (`@page.file.mtime`).
+* Cleaned up the source code a lot
+* Removed deprecated asset-copying functionality
+
+1.5
+---
 
 * Added support for custom filters
 * Improved Liquid support -- Liquid is now a first-class nanoc citizen
 * Deprecated assets -- use something like rsync instead
 * Added eruby_engine option, which can be 'erb' or 'erubis'
 
-== 1.4
+1.4
+---
 
 * nanoc now supports ERB (as well as Erubis); Erubis no longer is a dependency
 * meta.yaml can now have haml_options property, which is passed to Haml
@@ -14,12 +28,14 @@
 * Pages now know in what order they should be compiled, eliminating the need
   for custom page ordering [Dennis Sutch]
 
-== 1.3.1
+1.3.1
+-----
 
 * The contents of the 'assets' directory are now copied into the output
   directory specified in 'config.yaml'
 
-== 1.3
+1.3
+---
 
 * The @pages array now also contains uncompiled pages
 * Pages with 'skip_output' set to true will not be outputted
@@ -29,9 +45,10 @@
 * nanoc now warns before overwriting in create_site, create_page and
   create_template (but not in compile)
 
-== 1.2
+1.2
+---
 
-* Sites now have an 'assets' directory, whose contents are copied to the 
+* Sites now have an 'assets' directory, whose contents are copied to the
   'output' directory when compiling [Soryu]
 * Added support for non-eRuby layouts (Markaby, Haml, Liquid, ...)
 * Added more filters (Markaby, Haml, Liquid, RDoc [Dmitry Bilunov])
@@ -41,16 +58,19 @@
 * Page attributes can now be accessed using dot notation, i.e. @page.title as
   well as @page[:title]
 
-== 1.1.3
+1.1.3
+-----
 
 * Fixed bug which would cause layoutless pages to be outputted incorrectly
 
-== 1.1.2
+1.1.2
+-----
 
 * Backup files (files ending with a “~”) are now ignored
 * Fixed bug which would cause subpages not to be generated correctly
 
-== 1.1
+1.1
+---
 
 * Added support for nested layouts
 * Added coloured logging
@@ -59,12 +79,14 @@
   directory they are in [Colin Barrett]
 * It is now possible to access @page in the page’s content file
 
-== 1.0.1
+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 bug which would cause pages not to be sorted by order before compiling
 
-== 1.0
+1.0
+---
 
 * Initial release

data/lib/nanoc/compiler.rb

@@ -23,6 +23,8 @@ module Nanoc
       :layout       => 'default'
     }
 
+    attr_reader :config, :stack, :pages
+
     def initialize
       @filters = {}
     end
@@ -38,17 +40,23 @@ module Nanoc
       # Require all Ruby source files in lib/
       Dir['lib/*.rb'].each { |f| require f }
 
-      # Create output assets directory if necessary
+      # Create output directory if necessary
       FileUtils.mkdir_p(@config[:output_dir])
 
-      # Copy assets to output directory
-      copy_assets
+      # Get all pages
+      @pages = find_uncompiled_pages
+
+      # Filter, layout, and filter again
+      filter(:pre)
+      layout
+      filter(:post)
 
-      # Compile and layout pages
-      pages = find_uncompiled_pages
-      pages = layout(compile(pages))
+      # Save pages
+      save_pages
     end
 
+    # Filter management
+
     def register_filter(name, &block)
       @filters[name.to_sym] = block
     end
@@ -57,137 +65,81 @@ module Nanoc
       @filters[name.to_sym]
     end
 
-    def config
-      @config
-    end
-
   private
 
-    # Returns the path for the given page
-    def path_for_page(page)
-      if page.attributes[:custom_path].nil?
-        @config[:output_dir] + page.attributes[:path] +
-          page.attributes[:filename] + '.' + page.attributes[:extension]
-      else
-        @config[:output_dir] + page.attributes[:custom_path]
-      end
-    end
-
-    # Returns the layout for the given page
-    def layout_for_page(page)
-      if page.attributes[:layout].nil?
-        { :type => :eruby, :content => "<%= @page.content %>" }
-      else
-        filenames = Dir["layouts/#{page.attributes[:layout]}.*"]
-        filenames.ensure_single('layout files', page.attributes[:layout])
-        filename = filenames[0]
-
-        { :type => FILE_TYPES[File.extname(filename)], :content => File.read(filename) }
-      end
-    end
-
-    def copy_assets
-      # Check for assets
-      if Dir['assets/*'].size > 0
-        deprecate 'Asset-copying functionality is deprecated as of nanoc 1.5,' +
-                  'and will be removed in nanoc 1.6. Please use a Rake task that' +
-                  'copies assets using something like rsync instead.'
-      end
-
-      # Remove existing assets
-      Dir['assets/*'].each do |f|
-        FileUtils.remove_entry_secure(f.sub('assets/', @config[:output_dir] + '/'), true)
-      end
-
-      # Copy assets
-      if File.directory?('assets') and !Dir['assets/*'].empty?
-        FileUtils.cp_r(Dir['assets/*'], @config[:output_dir])
-      end
-    end
+    # Main methods
 
     def find_uncompiled_pages
       # Read all meta files
-      pages = Dir['content/**/meta.yaml'].collect do |filename|
+      Dir['content/**/meta.yaml'].inject([]) do |pages, filename|
         # Read the meta file
-        page = @global_page.merge(YAML.load_file_and_clean(filename))
+        hash = @global_page.merge(YAML.load_file_and_clean(filename))
 
         # Fix the path
-        page[:path] = filename.sub(/^content/, '').sub('meta.yaml', '')
+        hash[:path] = filename.sub(/^content/, '').sub('meta.yaml', '')
+
+        # Convert to a Page instance
+        page = Page.new(hash, self)
 
         # Get the content filename
-        content_filenames = Dir[filename.sub('meta.yaml', File.basename(File.dirname(filename)) + '.*')]
-        content_filenames.reject! { |f| f =~ /~$/ }
-        content_filenames += Dir["#{File.dirname(filename)}/index.*"] # fallback for nanoc 1.0
-        content_filenames.ensure_single('content files', File.dirname(filename))
-        page[:_content_filename] = content_filenames[0]
+        page.content_filename = content_filename_for_meta_filename(filename)
 
-        page
+        # Skip drafts
+        hash[:is_draft] ? pages : pages + [ page ]
       end
-
-      # Ignore drafts
-      pages.reject! { |page| page[:is_draft] }
-
-      pages
     end
 
-    def compile(pages)
-      # Create page objects from given pages
-      given_pages = []
-      pages.each { |page| given_pages << Page.new(page) }
+    def filter(stage)
+      # Reset filter stack
+      @stack = []
 
-      # Compile pages
-      Page.compile(given_pages)
-
-      given_pages
-    end
-
-    def layouted_page(page, pages)
-      # Find layout
-      layout = layout_for_page(page)
-
-      # Build params
-      if layout[:type] == :liquid
-        public_page   = page.to_liquid
-        public_pages  = pages.map { |p| p.to_liquid }
-      else
-        public_page   = page.to_proxy
-        public_pages  = pages.map { |p| p.to_proxy }
-      end
-      params = { :assigns => { :page => public_page, :pages => public_pages } }
-      params[:haml_options] = (page.attributes[:haml_options] || {}).symbolize_keys
-
-      # Layout
-      case layout[:type]
-      when :eruby
-        content = layout[:content].eruby(params)
-      when :haml
-        content = layout[:content].haml(params)
-      when :markaby
-        content = layout[:content].markaby(params)
-      when :liquid
-        content = layout[:content].liquid(params)
-      else
-        content = nil
+      # Prepare pages
+      @pages.each do |page|
+        page.stage        = stage
+        page.is_filtered  = false
       end
 
-      content
+      # Filter pages
+      @pages.each { |page| page.filter! }
     end
 
-    def layout(pages)
-      pages.reject { |page| page.attributes[:skip_output] }.each do |page|
+    def layout
+      # For each page (ignoring drafts)
+      @pages.reject { |page| page.attributes[:skip_output] }.each do |page|
         begin
-          # Prepare layout content
-          content = layouted_page(page, pages)
-
-          # Write page with layout
-          FileManager.create_file(path_for_page(page)) { content }
+          # Layout the page
+          page.layout!
         rescue => exception
-          p = page.attributes[:_content_filename]
-          l = page.attributes[:layout]
-          handle_exception(exception, "layouting page '#{p}' in layout '#{l}'")
+          handle_exception(exception, "layouting page '#{page.content_filename}' in layout '#{page.attributes[:layout]}'")
         end
       end
     end
 
+    def save_pages
+      @pages.reject { |page| page.attributes[:skip_output] }.each do |page|
+        # Write page with layout
+        FileManager.create_file(page.path) { page.content }
+      end
+    end
+
+    # Helper methods
+
+    def content_filename_for_meta_filename(filename)
+      # Find all files with base name of parent directory
+      content_filenames = Dir[filename.sub('meta.yaml', File.basename(File.dirname(filename)) + '.*')]
+
+      # Find all index.* files (used to be a fallback for nanoc 1.0, kinda...)
+      content_filenames += Dir["#{File.dirname(filename)}/index.*"]
+
+      # Reject backups
+      content_filenames.reject! { |f| f =~ /~$/ }
+
+      # Make sure there is only one content file
+      content_filenames.ensure_single('content files', File.dirname(filename))
+
+      # Return the first (and only one)
+      content_filenames[0]
+    end
+
   end
 end

data/lib/nanoc/core_ext/hash.rb

@@ -1,5 +1,7 @@
 class Hash
-  # Cleans up the hash by performing the following operations:
+  # Cleans up the hash and returns the result. It performs the following
+  # operations:
+  #
   # * Values with keys ending in _at and _on are converted into Times and
   #   Dates, respectively
   # * All keys are converted to symbols

data/lib/nanoc/core_ext/yaml.rb

@@ -1,8 +1,10 @@
 require 'yaml'
 
 module YAML
+
   # Loads a YAML file, cleans it using Hash#clean, and returns the result
   def self.load_file_and_clean(a_filename)
     (YAML.load_file(a_filename) || {}).clean
   end
+
 end

data/lib/nanoc/creator.rb

@@ -6,7 +6,6 @@ module Nanoc
       ensure_nonexistant(a_sitename)
 
       FileManager.create_dir a_sitename do
-        FileManager.create_dir 'assets'
         FileManager.create_dir 'output'
 
         FileManager.create_file 'config.yaml' do
@@ -20,7 +19,7 @@ module Nanoc
           "# Built-in\n" +
           "layout:    \"default\"\n" +
           "filters:   []\n" +
-          "filename:  \"index\"\n" + 
+          "filename:  \"index\"\n" +
           "extension: \"html\"\n" +
           "\n" +
           "# Custom\n"
@@ -101,7 +100,7 @@ module Nanoc
 
       # Sanitize page name
       if a_pagename =~ /^[\/\.]+/
-        $stderr.puts 'ERROR: page name starts with dots and/or slashes, aborting' unless $quiet == true
+        $stderr.puts 'ERROR: page name starts with dots and/or slashes, aborting' unless $quiet
         return
       end
 
@@ -109,12 +108,26 @@ module Nanoc
       template = a_params[:template] || 'default'
       begin
         template_meta = File.read("templates/#{template}/meta.yaml")
+
+        # Find all files
         template_content_filenames = Dir["templates/#{template}/#{template}.*"]
+
+        # Find all index.* files (used to be a fallback for nanoc 1.0, kinda...)
         template_content_filenames += Dir["templates/#{template}/index.*"]
+
+        # Reject backups
+        template_content_filenames.reject! { |f| f =~ /~$/ }
+
+        # Make sure there is only one content file
+        template_content_filenames.ensure_single('template files', template)
+
+        # Get the first (and only one)
         template_content_filename = template_content_filenames[0]
+
         template_index = File.read(template_content_filename)
-      rescue
-        $stderr.puts 'ERROR: no such template' unless $quiet == true
+      rescue => e
+        puts e.inspect
+        $stderr.puts 'ERROR: no such template' unless $quiet
         exit
       end
       template_meta = template_meta.eruby

data/lib/nanoc/enhancements.rb

@@ -1,4 +1,16 @@
-def try_require(s) ; begin ; require s ; rescue LoadError ; end ; end
+def try_require(s)
+  require s
+rescue LoadError
+end
+
+def nanoc_require(s)
+  require s
+rescue LoadError
+  $stderr.puts "ERROR: You need '#{s}' to compile this site." unless $quiet
+  exit
+end
+
+try_require 'rubygems'
 
 require 'fileutils'
 
@@ -8,11 +20,7 @@ def handle_exception(exception, text)
     $stderr.puts exception
     $stderr.puts exception.backtrace.join("\n")
   end
-  exit
-end
-
-def deprecate(str)
-  $stderr.puts 'DEPRECATION WARNING: ' + str unless $quiet
+  exit(1)
 end
 
 class FileLogger

data/lib/nanoc/filters/eruby_filter.rb

@@ -1,10 +1,3 @@
-def try_require(s) ; begin ; require s ; rescue LoadError ; end ; end
-
-try_require 'rubygems'
-
-require 'erb'
-try_require 'erubis'
-
 class ERBContext
 
   def initialize(hash)
@@ -28,11 +21,13 @@ class String
 
   # Converts the string using Erubis
   def erubis(params={})
+    nanoc_require 'erubis'
     Erubis::Eruby.new(self).evaluate(params[:assigns] || {})
   end
 
   # Converts the string using ERB
   def erb(params={})
+    nanoc_require 'erb'
     ERB.new(self).result(ERBContext.new(params[:assigns] || {}).get_binding)
   end
 

data/lib/nanoc/filters/haml_filter.rb

@@ -1,19 +1,13 @@
-def try_require(s) ; begin ; require s ; rescue LoadError ; end ; end
-
-try_require 'rubygems'
-
-try_require 'haml'
-
 class String
 
   # Converts the string using Haml
   def haml(params={})
+    nanoc_require 'haml'
+
     options = (params[:haml_options] || {})
     options[:locals] = params[:assigns] unless params[:assigns].nil?
+
     Haml::Engine.new(self, options).to_html
-  rescue NameError
-    $stderr.puts 'ERROR: String#haml failed (Haml not installed?)' unless $quiet
-    exit
   end
 
 end

data/lib/nanoc/filters/liquid_filter.rb

@@ -1,21 +1,22 @@
-def try_require(s) ; begin ; require s ; rescue LoadError ; end ; end
-
-try_require 'rubygems'
-
-try_require 'liquid'
+# Filter
 
 class String
 
-  # Converts the string using Liquid
   def liquid(params={})
+    nanoc_require 'liquid'
+
     Liquid::Template.parse(self).render((params[:assigns] || {}).stringify_keys)
-  rescue NameError
-    $stderr.puts 'ERROR: String#liquid failed (Liquid not installed?)' unless $quiet
-    exit
   end
 
 end
 
+register_filter 'liquid' do |page, pages, config|
+  assigns = { :page => page, :pages => pages }
+  page.content.liquid(:assigns => assigns)
+end
+
+# Render tag
+
 begin
   class Nanoc::LiquidRenderTag < ::Liquid::Tag
     Syntax = /(['"])([^'"]+)\1/
@@ -44,8 +45,3 @@ begin
   Liquid::Template.register_tag('render', Nanoc::LiquidRenderTag)
 rescue NameError
 end
-
-register_filter 'liquid' do |page, pages, config|
-  assigns = { :page => page, :pages => pages }
-  page.content.liquid(:assigns => assigns)
-end

data/lib/nanoc/filters/markaby_filter.rb

@@ -1,20 +1,10 @@
-def try_require(s) ; begin ; require s ; rescue LoadError ; end ; end
-
-try_require 'rubygems'
-
-require 'erb'
-
-try_require 'markaby'
-
 class String
 
   # Converts the string using Markaby
   # TODO perhaps add support for helpers
   def markaby(params={})
+    nanoc_require 'markaby'
     Markaby::Builder.new((params[:assigns] || {})).instance_eval(self).to_s
-  rescue NameError
-    $stderr.puts 'ERROR: String#markaby failed (Markaby not installed?)' unless $quiet
-    exit
   end
 
 end

data/lib/nanoc/filters/markdown_filter.rb

@@ -1,17 +1,9 @@
-def try_require(s) ; begin ; require s ; rescue LoadError ; end ; end
-
-try_require 'rubygems'
-
-try_require 'bluecloth'
-
 class String
 
-  # Converts the string to HTML using BlueCloth/Markdown.
+  # Converts the string using Markdown
   def markdown
+    nanoc_require 'bluecloth'
     BlueCloth.new(self).to_html
-  rescue NameError
-    $stderr.puts 'ERROR: String#markdown failed: BlueCloth not installed' unless $quiet
-    exit
   end
 
 end

data/lib/nanoc/filters/rdoc_filter.rb

@@ -1,14 +1,10 @@
-def try_require(s) ; begin ; require s ; rescue LoadError ; end ; end
-
-try_require 'rubygems'
-
-try_require 'rdoc/markup/simple_markup'
-try_require 'rdoc/markup/simple_markup/to_html'
-
 class String
 
   # Converts the string using RDoc
   def rdoc
+    nanoc_require 'rdoc/markup/simple_markup'
+    nanoc_require 'rdoc/markup/simple_markup/to_html'
+
     SM::SimpleMarkup.new.convert(self, SM::ToHtml.new)
   end
 

data/lib/nanoc/filters/sass_filter.rb

@@ -1,13 +1,8 @@
-def try_require(s) ; begin ; require s ; rescue LoadError ; end ; end
-
-try_require 'rubygems'
-
-try_require 'haml'
-
 class String
 
   # Converts the string using Sass
   def sass
+    nanoc_require 'haml'
     Sass::Engine.new(self).render
   end
 

data/lib/nanoc/filters/smartypants_filter.rb

@@ -1,17 +1,9 @@
-def try_require(s) ; begin ; require s ; rescue LoadError ; end ; end
-
-try_require 'rubygems'
-
-try_require 'rubypants'
-
 class String
 
   # Converts the string using RubyPants/SmartyPants
   def smartypants
+    nanoc_require 'rubypants'
     RubyPants.new(self).to_html
-  rescue NameError
-    $stderr.puts 'ERROR: String#smartypants failed (RubyPants not installed?)' unless $quiet
-    exit
   end
 
 end

data/lib/nanoc/filters/textile_filter.rb

@@ -1,17 +1,9 @@
-def try_require(s) ; begin ; require s ; rescue LoadError ; end ; end
-
-try_require 'rubygems'
-
-try_require 'redcloth'
-
 class String
 
   # Converts the string using RedCloth/Textile
   def textile
+    nanoc_require 'redcloth'
     RedCloth.new(self).to_html
-  rescue NameError
-    $stderr.puts 'ERROR: String#textile failed (RedCloth not installed?)' unless $quiet
-    exit
   end
 
 end

data/lib/nanoc/page.rb

@@ -1,64 +1,13 @@
-def try_require(s) ; begin ; require s ; rescue LoadError ; end ; end
-
-try_require 'rubygems'
-try_require 'liquid'
-
 module Nanoc
 
-  # Page drop
-
-  begin
-    class PageDrop < ::Liquid::Drop
-      def initialize(page)
-        @page = page
-      end
-
-      def before_method(name)
-        name == 'content' ? @page.content : @page.attributes[name.to_sym]
-      end
-    end
-  rescue NameError
-    class PageDrop
-      def initialize(*args)
-        $stderr.puts 'ERROR: Liquid not installed; cannot use Liquid in layouts.'
-        exit
-      end
-    end
-  end
-
-  # Page proxy
-
-  class PageProxy
-    def initialize(page, params={})
-      @page       = page
-      @do_compile = (params[:compile] != false)
-    end
-
-    def [](key)
-      if key.to_sym == :content and @do_compile
-        @page.content
-      else
-        if key.to_s.starts_with?('_')
-          nil
-        elsif key.to_s.ends_with?('?')
-          @page.attributes[key.to_s[0..-2].to_sym]
-        else
-          @page.attributes[key]
-        end
-      end
-    end
-
-    def method_missing(method, *args)
-      self[method]
-    end
-  end
-
-  # Page
-
   class Page
 
-    def initialize(hash={})
+    attr_accessor :stage, :is_filtered, :content_filename
+
+    def initialize(hash, compiler)
       @attributes = hash
+      @compiler   = compiler
+      @stage      = nil
     end
 
     def attributes
@@ -66,79 +15,159 @@ module Nanoc
     end
 
     def content
-      compile
+      filter!
       @attributes[:content]
     end
 
+    def stage=(s) ; @stage = s ; puts 'NEW STAGE = ' + s.to_s ; end
+
     # Proxy/Liquid support
 
     def to_proxy(params={})
-      PageProxy.new(self, :compile => params[:compile])
+      PageProxy.new(self, :filter => params[:filter])
     end
 
     def to_liquid
+      nanoc_require 'liquid'
       PageDrop.new(self)
     end
 
-    # Compiling
+    # Helper methods
 
-    def self.compile(pages)
-      @@compilation_stack = []
-      @@pages = pages
+    def path
+      if @attributes[:custom_path].nil?
+        @compiler.config[:output_dir] + @attributes[:path] +
+          @attributes[:filename] + '.' + @attributes[:extension]
+      else
+        @compiler.config[:output_dir] + @attributes[:custom_path]
+      end
+    end
 
-      # Compile all pages
-      pages.each { |page| page.compile }
+    def file
+      File.new(@content_filename)
     end
 
-    def compile
+    def find_layout
+      if @attributes[:layout].nil?
+        { :type => :eruby, :content => "<%= @page.content %>" }
+      else
+        # Find all layouts
+        filenames = Dir["layouts/#{@attributes[:layout]}.*"]
+
+        # Reject backups
+        filenames.reject! { |f| f =~ /~$/ }
+
+        # Make sure there is only one content file
+        filenames.ensure_single('layout files', @attributes[:layout])
+
+        # Get the first (and only one)
+        filename = filenames[0]
+
+        { :type => Nanoc::Compiler::FILE_TYPES[File.extname(filename)], :content => File.read(filename) }
+      end
+    end
+
+    # Filtering
+
+    def filter!
+      # Get stack and list of other pages
+      stack       = @compiler.stack
+      other_pages = @compiler.pages
+
       # Check for recursive call
-      if @@compilation_stack.include?(self)
-        # Print compilation stack
+      if stack.include?(self)
+        # Print stack
         unless $quiet
           $stderr.puts 'ERROR: Recursive call to page content.'
-          print_compilation_stack
+          print_stack
         end
 
         exit
-      # Compile if not yet compiled
-      elsif @attributes[:content].nil?
-        @@compilation_stack.pushing(self) do
+      end
+
+      # Get filters
+      if @stage == :pre
+        filters = @attributes[:filters_pre] || @attributes[:filters] || []
+      elsif @stage == :post
+        filters = @attributes[:filters_post] || []
+      else
+        puts '?????!!!!!!!!'
+        puts `pwd`
+      end
+
+      # Filter if not yet filtered
+      unless @is_filtered
+        stack.pushing(self) do
           # Read page
-          content = File.read(@attributes[:_content_filename])
+          content = @attributes[:content] || File.read(@content_filename)
 
           begin
             # Get params
-            page   = self.to_proxy(:compile => false)
-            pages  = @@pages.map { |p| p.to_proxy }
+            page   = self.to_proxy(:filter => false)
+            pages  = other_pages.map { |p| p.to_proxy }
             config = $nanoc_compiler.config
 
             # Filter page
             @attributes[:content] = content
-            @attributes[:filters].each do |filter_name|
+            filters.each do |filter_name|
               filter = $nanoc_compiler.filter_named(filter_name)
               if filter.nil?
                 $stderr.puts 'WARNING: Unknown filter: ' + filter_name unless $quiet
               else
                 @attributes[:content] = filter.call(page, pages, config)
+                @is_filtered = true
               end
             end
           rescue Exception => exception
-            handle_exception(exception, "compiling page '#{@attributes[:_content_filename]}'")
+            handle_exception(exception, "filter page '#{@content_filename}'")
           end
         end
       end
     end
 
-    def print_compilation_stack
-      # Determine relevant part of compilation stack
-      stack_begin = @@compilation_stack.index(self)
-      stack_end   = @@compilation_stack.size
-      relevant_stack_part = @@compilation_stack.last(stack_end - stack_begin)
+    def layout!
+      # Get list of other pages
+      other_pages = @compiler.pages
+
+      # Find layout
+      layout = self.find_layout
+
+      # Build params
+      if layout[:type] == :liquid
+        public_page   = self.to_liquid
+        public_pages  = other_pages.map { |p| p.to_liquid }
+      else
+        public_page   = self.to_proxy
+        public_pages  = other_pages.map { |p| p.to_proxy }
+      end
+      params = { :assigns => { :page => public_page, :pages => public_pages } }
+      params[:haml_options] = (@attributes[:haml_options] || {}).symbolize_keys
+
+      # Layout
+      case layout[:type]
+      when :eruby
+        @attributes[:content] = layout[:content].eruby(params)
+      when :haml
+        @attributes[:content] = layout[:content].haml(params)
+      when :markaby
+        @attributes[:content] = layout[:content].markaby(params)
+      when :liquid
+        @attributes[:content] = layout[:content].liquid(params)
+      else
+        @attributes[:content] = nil
+      end
+    end
+
+    def print_stack
+      # Determine relevant part of stack
+      stack_begin = @compiler.stack.index(self)
+      stack_end   = @compiler.stack.size
+      relevant_stack_part = @compiler.stack.last(stack_end - stack_begin)
 
-      # Print relevant part of compilation stack
-      $stderr.puts 'Page compilation stack:'
+      # Print relevant part of stack
+      $stderr.puts 'Page filter stack:'
       relevant_stack_part.each_with_index do |page, i|
-        $stderr.puts "#{i}  #{page.attributes[:_content_filename]}"
+        $stderr.puts "#{i}  #{page.content_filename}"
       end
     end
 

data/lib/nanoc/page_drop.rb

@@ -0,0 +1,18 @@
+try_require 'liquid'
+
+module Nanoc
+
+  begin
+    class PageDrop < ::Liquid::Drop
+      def initialize(page)
+        @page = page
+      end
+
+      def before_method(name)
+        name == 'content' ? @page.content : @page.attributes[name.to_sym]
+      end
+    end
+  rescue NameError
+  end
+
+end

data/lib/nanoc/page_proxy.rb

@@ -0,0 +1,26 @@
+module Nanoc
+  class PageProxy
+
+    def initialize(page, params={})
+      @page       = page
+      @do_filter  = (params[:filter] != false)
+    end
+
+    def [](key)
+      if key.to_sym == :content and @do_filter
+        @page.content
+      elsif key.to_sym == :file
+        @page.file
+      elsif key.to_s.ends_with?('?')
+        @page.attributes[key.to_s[0..-2].to_sym]
+      else
+        @page.attributes[key]
+      end
+    end
+
+    def method_missing(method, *args)
+      self[method]
+    end
+
+  end
+end

data/lib/nanoc.rb

@@ -1,6 +1,6 @@
 module Nanoc
 
-  VERSION = '1.5'
+  VERSION = '1.6'
 
   def self.ensure_in_site
     unless in_site?
@@ -27,6 +27,8 @@ module Nanoc
 
 end
 
+require File.dirname(__FILE__) + '/nanoc/enhancements.rb'
+
 require File.dirname(__FILE__) + '/nanoc/creator.rb'
 require File.dirname(__FILE__) + '/nanoc/compiler.rb'
 
@@ -34,6 +36,7 @@ $nanoc_creator  = Nanoc::Creator.new
 $nanoc_compiler = Nanoc::Compiler.new
 
 require File.dirname(__FILE__) + '/nanoc/core_ext.rb'
-require File.dirname(__FILE__) + '/nanoc/enhancements.rb'
 require File.dirname(__FILE__) + '/nanoc/filters.rb'
 require File.dirname(__FILE__) + '/nanoc/page.rb'
+require File.dirname(__FILE__) + '/nanoc/page_drop.rb'
+require File.dirname(__FILE__) + '/nanoc/page_proxy.rb'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: nanoc
 version: !ruby/object:Gem::Version 
-  version: "1.5"
-date: 2007-09-10 00:00:00 +02:00
+  version: "1.6"
+date: 2007-10-13 00:00:00 +02:00
 summary: a CMS that doesn't run on your server
 require_paths: 
 - lib
@@ -56,6 +56,8 @@ files:
 - lib/nanoc/filters/textile_filter.rb
 - lib/nanoc/filters.rb
 - lib/nanoc/page.rb
+- lib/nanoc/page_drop.rb
+- lib/nanoc/page_proxy.rb
 - lib/nanoc.rb
 test_files: []