nanoc 2.1.4 → 2.1.5

data/ChangeLog

@@ -1,6 +1,13 @@
 nanoc Release Notes
 ===================
 
+2.1.5
+-----
+
+* Added Ruby 1.9 compatibility
+* The Filesystem and FilesystemCombined data sources now preserve custom
+  extensions
+
 2.1.4
 -----
 

data/Rakefile

@@ -1,14 +1,33 @@
 ##### Requirements
 
+# Rake etc
 require 'rake'
-
 require 'rake/clean'
 require 'rake/gempackagetask'
-require 'rake/rdoctask'
 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
+
+# nanoc itself
 require File.dirname(__FILE__) + '/lib/nanoc.rb'
 
+##### Test Ruby 1.9
+
+if RUBY_VERSION >= '1.9'
+  # Check presence of vendor/mocha
+  unless File.directory?('vendor/mocha')
+    warn "You appear to be running Ruby 1.9. Please make sure that, before " +
+         "running the tests, you have a version of mocha that is " +
+         "compatible with Ruby 1.9."
+  end
+end
+
 ##### General details
 
 NAME      = 'nanoc'

data/lib/nanoc.rb

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

data/lib/nanoc/base/filter.rb

@@ -79,7 +79,9 @@ module Nanoc
       # Deprecated
       def extensions(*extensions) # :nodoc:
         # Initialize
-        @extensions = [] unless instance_variables.include?('@extensions')
+        if !instance_variables.include?('@extensions') && !instance_variables.include?(:'@extensions')
+          @extensions = []
+        end
 
         if extensions.empty?
           @extensions
@@ -92,7 +94,9 @@ module Nanoc
       # Deprecated
       def extension(extension=nil) # :nodoc:
         # Initialize
-        @extensions = [] unless instance_variables.include?('@extensions')
+        if !instance_variables.include?('@extensions') && !instance_variables.include?(:'@extensions')
+          @extensions = []
+        end
 
         if extension.nil?
           @extensions.first

data/lib/nanoc/base/page_rep.rb

@@ -270,6 +270,8 @@ module Nanoc
         # Run filter
         Nanoc::NotificationCenter.post(:filtering_started, self, klass.identifier)
         content = filter.run(content)
+        # FIXME hacky
+        content.force_encoding('utf-8') if content.respond_to?(:'force_encoding')
         Nanoc::NotificationCenter.post(:filtering_ended,   self, klass.identifier)
       end
 

data/lib/nanoc/base/plugin.rb

@@ -19,7 +19,9 @@ module Nanoc
       # symbols for this plugin.
       def identifiers(*identifiers)
         # Initialize
-        @identifiers = [] unless instance_variables.include?('@identifiers')
+        if !instance_variables.include?('@identifiers') && !instance_variables.include?(:'@identifiers')
+          @identifiers = []
+        end
 
         if identifiers.empty?
           @identifiers
@@ -35,7 +37,9 @@ module Nanoc
       # When given nothing, returns the identifier for this plugin.
       def identifier(identifier=nil)
         # Initialize
-        @identifiers = [] unless instance_variables.include?('@identifiers')
+        if !instance_variables.include?('@identifiers') && !instance_variables.include?(:'@identifiers')
+          @identifiers = []
+        end
 
         if identifier.nil?
           @identifiers.first

data/lib/nanoc/base/proxy.rb

@@ -5,7 +5,7 @@ module Nanoc
   # calling destructive methods.
   class Proxy
 
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+    instance_methods.each { |m| undef_method m unless m =~ /^__/ || m.to_s == 'object_id' }
 
     # Creates a proxy for the given object.
     def initialize(obj)

data/lib/nanoc/cli/base.rb

@@ -32,7 +32,8 @@ module Nanoc::CLI
 
         # Handle version option
         if parsed_arguments[:options].has_key?(:version)
-          puts "nanoc #{Nanoc::VERSION} (c) 2007-2008 Denis Defreyne."
+          puts "nanoc #{Nanoc::VERSION} (c) 2007-2009 Denis Defreyne."
+          puts "Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) running on #{RUBY_PLATFORM}"
           exit 1
         # Handle help option
         elsif parsed_arguments[:options].has_key?(:help)

data/lib/nanoc/cli/commands/create_site.rb

@@ -207,14 +207,10 @@ EOS
 
       # Build entire site
       FileUtils.mkdir_p(path)
-      begin
-        FileUtils.cd(File.join(path))
-
+      FileUtils.cd(File.join(path)) do
         site_create_minimal(data_source)
         site_setup
         site_populate
-      ensure
-        FileUtils.cd(File.join(path.map { |n| '..' }))
       end
 
       puts "Created a blank nanoc site at '#{path}'. Enjoy!"

data/lib/nanoc/data_sources/filesystem.rb

@@ -220,7 +220,7 @@ module Nanoc::DataSources
         content_file = File.new(content_filename)
 
         # Get attributes
-        attributes = meta.merge(:extension => File.extname(content_filename)[1..-1])
+        attributes = { 'extension' => File.extname(content_filename)[1..-1] }.merge(meta)
 
         # Get path
         path = meta_filename.sub(/^assets/, '').sub(/[^\/]+\.yaml$/, '')
@@ -363,8 +363,7 @@ module Nanoc::DataSources
 
     def layouts # :nodoc:
       # Determine what layout directory structure is being used
-      dir_count = Dir[File.join('layouts', '*')].select { |f| File.directory?(f) }.size
-      is_old_school = (dir_count == 0)
+      is_old_school = (Dir['layouts/*'].select { |f| File.file?(f) }.size > 0)
 
       if is_old_school
         # Warn about deprecation
@@ -414,8 +413,8 @@ module Nanoc::DataSources
 
     def save_layout(layout) # :nodoc:
       # Determine what layout directory structure is being used
-      layout_file_count = Dir[File.join('layouts', '*')].select { |f| File.file?(f) }.size
-      error_outdated if layout_file_count > 0
+      is_old_school = (Dir['layouts/*'].select { |f| File.file?(f) }.size > 0)
+      error_outdated if is_old_school
 
       # Get paths
       last_component    = layout.path.split('/')[-1]

data/lib/nanoc/data_sources/filesystem_combined.rb

@@ -205,7 +205,7 @@ module Nanoc::DataSources
         return nil if meta[:is_draft]
 
         # Get attributes
-        attributes = meta.merge(:extension => File.extname(filename)[1..-1])
+        attributes = { 'extension' => File.extname(filename)[1..-1] }.merge(meta)
 
         # Get actual path
         if filename =~ /\/index\.[^\/]+$/

data/lib/nanoc/extra/file_proxy.rb

@@ -8,7 +8,7 @@ module Nanoc::Extra
   # proxy will make sure the File object is not created until it is used.
   class FileProxy
 
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+    instance_methods.each { |m| undef_method m unless m =~ /^__/ || m.to_s == 'object_id' }
 
     # Creates a new file proxy for the given path. This is similar to
     # creating a File object with the same path, except that the File object

data/lib/nanoc/filters/rdoc.rb

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

data/lib/nanoc/helpers/blogging.rb

@@ -15,6 +15,10 @@ module Nanoc::Helpers
   # the documentation for these functions.
   #
   # The two main functions are sorted_articles and atom_feed.
+  #
+  # To activate this helper, +include+ it, like this:
+  #
+  #   include Nanoc::Helpers::Blogging
   module Blogging
 
     # Returns the list of articles, sorted by descending creation date (so

data/lib/nanoc/helpers/capturing.rb

@@ -30,6 +30,10 @@ module Nanoc::Helpers
   # When the site is compiled, the sidebar of the about page will say “On
   # this page, the purpose of nanoc is described, blah blah blah,” as
   # expected.
+  #
+  # To activate this helper, +include+ it, like this:
+  #
+  #   include Nanoc::Helpers::Capturing
   module Capturing
 
     # Captures the content inside the block into a page attribute named

data/lib/nanoc/helpers/html_escape.rb

@@ -2,6 +2,8 @@ module Nanoc::Helpers
 
   # Nanoc::Helpers::HTMLEscape contains functionality for HTML-escaping
   # strings.
+  #
+  # This helper is activated automatically.
   module HTMLEscape
 
     # Returns the HTML-escaped representation of the given string. Only &, <,

data/lib/nanoc/helpers/link_to.rb

@@ -1,6 +1,10 @@
 module Nanoc::Helpers
 
   # Nanoc::Helpers::LinkTo contains functions for linking to pages.
+  #
+  # To activate this helper, +include+ it, like this:
+  #
+  #   include Nanoc::Helpers::LinkTo
   module LinkTo
 
     include Nanoc::Helpers::HTMLEscape

data/lib/nanoc/helpers/render.rb

@@ -2,6 +2,8 @@ module Nanoc::Helpers
 
   # Nanoc::Helpers::Render provides functionality for rendering layouts as
   # partials.
+  #
+  # This helper is activated automatically.
   module Render
 
     # Returns a string containing the rendered given layout.

data/lib/nanoc/helpers/tagging.rb

@@ -5,6 +5,10 @@ module Nanoc::Helpers
   # tags that should be applied to the page. For example:
   #
   #   tags: [ 'foo', 'bar', 'baz' ]
+  #
+  # To activate this helper, +include+ it, like this:
+  #
+  #   include Nanoc::Helpers::Tagging
   module Tagging
 
     # Returns a formatted list of tags for the given page as a string. Several

data/lib/nanoc/helpers/xml_sitemap.rb

@@ -3,6 +3,10 @@ module Nanoc::Helpers
   # Nanoc::Helpers::XMLSitemap contains functionality for building XML
   # sitemaps that will be crawled by search engines. See the Sitemaps protocol
   # web site, http://www.sitemaps.org, for details.
+  #
+  # To activate this helper, +include+ it, like this:
+  #
+  #   include Nanoc::Helpers::XMLSitemap
   module XMLSitemap
 
     # Returns the XML sitemap as a string.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc
 version: !ruby/object:Gem::Version 
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-15 00:00:00 +01:00
+date: 2009-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -154,6 +154,7 @@ rdoc_options:
 - --exclude
 - test
 - --line-numbers
+- --inline-source
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -171,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: nanoc
-rubygems_version: 1.2.0
+rubygems_version: 1.3.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