nanoc 2.0.3 → 2.0.4

data/ChangeLog

@@ -1,11 +1,18 @@
 nanoc Release Notes
 ===================
 
+2.0.4
+-----
+
+* Fixed default.rb's `html_escape`
+* Updated Haml filter and layout processor so that @page, @pages and @config
+  are now available as instance variables instead of local variables
+
 2.0.3
 -----
 
-* autocompiler now honors custom paths
-* autocompiler now attempts to serve pages with the most appropriate MIME
+* The utocompiler now honors custom paths
+* The 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/base/auto_compiler.rb

@@ -51,8 +51,12 @@ END
     end
 
     def start(port)
-      nanoc_require('mime/types', "'mime/types' is required to autocompile sites.")
-      
+      nanoc_require(
+        'mime/types',
+        "'mime/types' is required to autocompile sites. You may want to " +
+        "install the mime-types gem by running 'gem install mime-types'."
+      )
+
       # Create server
       @server = WEBrick::HTTPServer.new(:Port => port || 3000)
       @server.mount_proc("/") { |request, response| handle_request(request, response) }

data/lib/nanoc/data_sources/filesystem.rb

@@ -87,7 +87,7 @@ module Nanoc::DataSource::Filesystem
         "\# before nanoc starts compiling.\n" +
         "\n" +
         "def html_escape(str)\n" +
-        "  str.gsub('&', '&amp;').str('<', '&lt;').str('>', '&gt;').str('\"', '&quot;')\n" +
+        "  str.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;').gsub('\"', '&quot;')\n" +
         "end\n" +
         "alias h html_escape\n"
       end
@@ -152,11 +152,10 @@ 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      = filename.gsub(/layouts\//,"").gsub(extension,"") 
+        name      = File.basename(filename, extension)
         content   = File.read(filename)
 
         # Build hash for layout

data/lib/nanoc/filters/erb.rb

@@ -1,6 +1,6 @@
 module Nanoc::Filter::ERB
 
-  class ERBContext
+  class Context
 
     def initialize(hash)
       hash.each_pair do |key, value|
@@ -23,7 +23,7 @@ module Nanoc::Filter::ERB
 
       # Create context
       assigns = { :page => @page, :pages => @pages, :config => @config, :site => @site }
-      context = ERBContext.new(assigns)
+      context = Context.new(assigns)
 
       # Get result
       ::ERB.new(content).result(context.get_binding)

data/lib/nanoc/filters/haml.rb

@@ -1,4 +1,19 @@
 module Nanoc::Filter::Haml
+
+  class Context
+
+    def initialize(hash)
+      hash.each_pair do |key, value|
+        instance_variable_set('@' + key.to_s, value)
+      end
+    end
+
+    def get_binding
+      binding
+    end
+
+  end
+
   class HamlFilter < Nanoc::Filter
 
     identifiers :haml
@@ -6,11 +21,17 @@ module Nanoc::Filter::Haml
     def run(content)
       nanoc_require 'haml'
 
+      # Get options
       options = @page.haml_options || {}
-      options[:locals] = { :page => @page, :pages => @pages, :config => @config, :site => @site }
 
-      ::Haml::Engine.new(content, options).to_html
+      # Get assigns/locals
+      assigns = { :page => @page, :pages => @pages, :config => @config, :site => @site }
+      context = Context.new(assigns)
+
+      # Get result
+      ::Haml::Engine.new(content, options).render(context, assigns)
     end
 
   end
+
 end

data/lib/nanoc/layout_processors/haml.rb

@@ -1,18 +1,38 @@
 module Nanoc::LayoutProcessor::Haml
+
+  class Context
+
+    def initialize(hash)
+      hash.each_pair do |key, value|
+        instance_variable_set('@' + key.to_s, value)
+      end
+    end
+
+    def get_binding
+      binding
+    end
+
+  end
+
   class HamlLayoutProcessor < Nanoc::LayoutProcessor
 
     identifiers :haml
     extensions  '.haml'
 
-    def run(layout)
+    def run(content)
       nanoc_require 'haml'
 
-      options = @page[:haml_options] || {}
-      assigns = @other_assigns.merge({ :page => @page, :pages => @pages, :config => @config, :site => @site })
-      options[:locals] = assigns
+      # Get options
+      options = @page.haml_options || {}
 
-      ::Haml::Engine.new(layout, options).to_html
+      # Get assigns/locals
+      assigns = { :page => @page, :pages => @pages, :config => @config, :site => @site }
+      context = Context.new(assigns)
+
+      # Get result
+      ::Haml::Engine.new(content, options).render(context, assigns)
     end
 
   end
+
 end

data/lib/nanoc.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-25 00:00:00 +01:00
+date: 2008-05-04 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: nanoc
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: a tool that runs on your local computer and compiles Markdown, Textile, Haml, ... documents into static web pages