nanoc 2.0.4 → 2.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: "2.1"
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 +02:00
+date: 2008-08-17 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -19,8 +19,8 @@ executables:
 - nanoc
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
 files: 
 - README
 - LICENSE
@@ -29,41 +29,131 @@ files:
 - bin/nanoc
 - lib/nanoc
 - lib/nanoc/base
-- lib/nanoc/base/auto_compiler.rb
+- lib/nanoc/base/asset.rb
+- lib/nanoc/base/asset_defaults.rb
+- lib/nanoc/base/asset_rep.rb
+- lib/nanoc/base/binary_filter.rb
+- lib/nanoc/base/code.rb
 - lib/nanoc/base/compiler.rb
 - lib/nanoc/base/core_ext
 - lib/nanoc/base/core_ext/hash.rb
+- lib/nanoc/base/core_ext/string.rb
 - lib/nanoc/base/data_source.rb
+- lib/nanoc/base/defaults.rb
 - lib/nanoc/base/enhancements.rb
 - lib/nanoc/base/filter.rb
-- lib/nanoc/base/layout_processor.rb
+- lib/nanoc/base/layout.rb
+- lib/nanoc/base/notification_center.rb
 - lib/nanoc/base/page.rb
-- lib/nanoc/base/page_proxy.rb
+- lib/nanoc/base/page_defaults.rb
+- lib/nanoc/base/page_rep.rb
 - lib/nanoc/base/plugin.rb
-- lib/nanoc/base/plugin_manager.rb
+- lib/nanoc/base/proxies
+- lib/nanoc/base/proxies/asset_proxy.rb
+- lib/nanoc/base/proxies/asset_rep_proxy.rb
+- lib/nanoc/base/proxies/layout_proxy.rb
+- lib/nanoc/base/proxies/page_proxy.rb
+- lib/nanoc/base/proxies/page_rep_proxy.rb
+- lib/nanoc/base/proxy.rb
+- lib/nanoc/base/router.rb
 - lib/nanoc/base/site.rb
+- lib/nanoc/base/template.rb
+- lib/nanoc/binary_filters
+- lib/nanoc/binary_filters/image_science_thumbnail.rb
+- lib/nanoc/cli
+- lib/nanoc/cli/base.rb
+- lib/nanoc/cli/cli.rb
+- lib/nanoc/cli/command.rb
+- lib/nanoc/cli/commands
+- lib/nanoc/cli/commands/autocompile.rb
+- lib/nanoc/cli/commands/compile.rb
+- lib/nanoc/cli/commands/create_layout.rb
+- lib/nanoc/cli/commands/create_page.rb
+- lib/nanoc/cli/commands/create_site.rb
+- lib/nanoc/cli/commands/create_template.rb
+- lib/nanoc/cli/commands/help.rb
+- lib/nanoc/cli/commands/info.rb
+- lib/nanoc/cli/commands/switch.rb
+- lib/nanoc/cli/commands/update.rb
+- lib/nanoc/cli/ext.rb
+- lib/nanoc/cli/logger.rb
+- lib/nanoc/cli/option_parser.rb
+- lib/nanoc/cli.rb
 - lib/nanoc/data_sources
-- lib/nanoc/data_sources/database.rb
 - lib/nanoc/data_sources/filesystem.rb
-- lib/nanoc/data_sources/trivial.rb
+- lib/nanoc/data_sources/filesystem_combined.rb
+- lib/nanoc/extra
+- lib/nanoc/extra/auto_compiler.rb
+- lib/nanoc/extra/context.rb
+- lib/nanoc/extra/core_ext
+- lib/nanoc/extra/core_ext/hash.rb
+- lib/nanoc/extra/core_ext/time.rb
+- lib/nanoc/extra/file_proxy.rb
+- lib/nanoc/extra/vcs.rb
+- lib/nanoc/extra/vcses
+- lib/nanoc/extra/vcses/bazaar.rb
+- lib/nanoc/extra/vcses/dummy.rb
+- lib/nanoc/extra/vcses/git.rb
+- lib/nanoc/extra/vcses/mercurial.rb
+- lib/nanoc/extra/vcses/subversion.rb
 - lib/nanoc/filters
+- lib/nanoc/filters/bluecloth.rb
 - lib/nanoc/filters/erb.rb
+- lib/nanoc/filters/erubis.rb
 - lib/nanoc/filters/haml.rb
 - lib/nanoc/filters/markaby.rb
-- lib/nanoc/filters/markdown.rb
+- lib/nanoc/filters/maruku.rb
+- lib/nanoc/filters/old.rb
+- lib/nanoc/filters/rdiscount.rb
 - lib/nanoc/filters/rdoc.rb
-- lib/nanoc/filters/smartypants.rb
-- lib/nanoc/filters/textile.rb
-- lib/nanoc/layout_processors
-- lib/nanoc/layout_processors/erb.rb
-- lib/nanoc/layout_processors/haml.rb
-- lib/nanoc/layout_processors/markaby.rb
+- lib/nanoc/filters/redcloth.rb
+- lib/nanoc/filters/rubypants.rb
+- lib/nanoc/filters/sass.rb
+- lib/nanoc/helpers
+- lib/nanoc/helpers/blogging.rb
+- lib/nanoc/helpers/capturing.rb
+- lib/nanoc/helpers/html_escape.rb
+- lib/nanoc/helpers/link_to.rb
+- lib/nanoc/helpers/render.rb
+- lib/nanoc/helpers/tagging.rb
+- lib/nanoc/helpers/xml_sitemap.rb
+- lib/nanoc/routers
+- lib/nanoc/routers/default.rb
+- lib/nanoc/routers/no_dirs.rb
+- lib/nanoc/routers/versioned.rb
 - lib/nanoc.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://nanoc.stoneship.org/
-post_install_message: 
-rdoc_options: []
-
+post_install_message: |-
+  ------------------------------------------------------------------------------
+  Thanks for installing nanoc 2.1! Here are some resources to help you get started:
+  
+  * The tutorial at <http://nanoc.stoneship.org/help/tutorial/>
+  * The manual at <http://nanoc.stoneship.org/help/manual/>
+  * The discussion group at <http://groups.google.com/group/nanoc>
+  
+  Because nanoc 2.1 has a lot of new features, be sure to check out the nanoc blog at <http://nanoc.stoneship.org/blog/> for details about this release.
+  
+  Enjoy!
+  ------------------------------------------------------------------------------
+rdoc_options: 
+- --title
+- nanoc
+- --main
+- README
+- --charset
+- utf-8
+- --exclude
+- lib/nanoc/cli/commands
+- --exclude
+- lib/nanoc/binary_filters
+- --exclude
+- lib/nanoc/extra/vcses
+- --exclude
+- lib/nanoc/filters
+- --exclude
+- test
+- --line-numbers
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -81,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: nanoc
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: a tool that runs on your local computer and compiles Markdown, Textile, Haml, ... documents into static web pages

data/lib/nanoc/base/auto_compiler.rb

@@ -1,132 +0,0 @@
-require 'webrick'
-
-module Nanoc
-
-  class AutoCompiler
-
-    ERROR_404 = <<END
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<title>404 File Not Found</title>
-		<style type="text/css">
-			body { padding: 10px; border: 10px solid #f00; margin: 10px; font-family: Helvetica, Arial, sans-serif; }
-		</style>
-	</head>
-	<body>
-		<h1>404 File Not Found</h1>
-		<p>The file you requested, <i><%=h path %></i>, was not found on this server.</p>
-	</body>
-</html>
-END
-
-    ERROR_500 = <<END
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<title>500 Server Error</title>
-		<style type="text/css">
-			body { padding: 10px; border: 10px solid #f00; margin: 10px; font-family: Helvetica, Arial, sans-serif; }
-		</style>
-	</head>
-	<body>
-		<h1>500 Server Error</h1>
-		<p>An error occurred while compiling the page you requested, <i><%=h path %></i>.</p>
-		<p>If you think this is a bug in nanoc, please do <a href="http://nanoc.stoneship.org/trac/newticket">report it</a>&mdash;thanks!</p>
-		<p>Message:</p>
-		<blockquote><p><%=h exception.message %></p></blockquote>
-		<p>Backtrace:</p>
-		<ol>
-<% exception.backtrace.each do |line| %>
-			<li><%= line %></li>
-<% end %>
-		</ol>
-	</body>
-</html>
-END
-
-    def initialize(site)
-      # Set site
-      @site = site
-    end
-
-    def start(port)
-      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) }
-
-      # Start server
-      trap('INT') { @server.shutdown }
-      @server.start
-    end
-
-    def handle_request(request, response)
-      # Reload site data
-      @site.load_data(true)
-
-      # Get page or file
-      page      = @site.pages.find { |page| page.path == request.path }
-      file_path = @site.config[:output_dir] + request.path
-
-      if page.nil?
-        # Serve file
-        if File.file?(file_path)
-          serve_file(file_path, response)
-        else
-          serve_404(request.path, response)
-        end
-      else
-        # Serve page
-        serve_page(page, response)
-      end
-    end
-
-    def h(s)
-      ERB::Util.html_escape(s)
-    end
-
-    def serve_404(path, response)
-      response.status           = 404
-      response['Content-Type']  = 'text/html'
-      response.body             = ERB.new(ERROR_404).result(binding)
-    end
-
-    def serve_500(path, exception, response)
-      response.status           = 500
-      response['Content-Type']  = 'text/html'
-      response.body             = ERB.new(ERROR_500).result(binding)
-    end
-
-    def serve_file(path, response)
-      response.status           = 200
-      response['Content-Type']  = MIME::Types.of(path).first || 'application/octet-stream'
-      response.body             = File.read(path)
-    end
-
-    def serve_page(page, response)
-      # Recompile page
-      begin
-        @site.compiler.run(page)
-      rescue => exception
-        serve_500(page.path, exception, response)
-        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']  = mime_type
-      response.body             = page.layouted_content
-    end
-
-  end
-
-end

data/lib/nanoc/base/layout_processor.rb

@@ -1,33 +0,0 @@
-module Nanoc
-  class LayoutProcessor < Plugin
-
-    def initialize(page, pages, config, site, other_assigns={})
-      @page          = page
-      @pages         = pages
-      @config        = config
-      @site          = site
-      @other_assigns = other_assigns
-    end
-
-    def run(layout)
-      error 'LayoutProcessor#run must be overridden'
-    end
-
-    # Extensions
-
-    class << self
-      attr_accessor :_extensions
-    end
-
-    def self.extensions(*extensions)
-      self._extensions = [] unless instance_variables.include?('@_extensions')
-      extensions.empty? ? self._extensions || [] : self._extensions = (self._extensions || []) + extensions
-    end
-
-    def self.extension(extension=nil)
-      self._extensions = [] unless instance_variables.include?('@_extensions')
-      extension.nil? ? self.extensions.first : self.extensions(extension)
-    end
-
-  end
-end

data/lib/nanoc/base/page_proxy.rb

@@ -1,31 +0,0 @@
-module Nanoc
-  class PageProxy
-
-    def initialize(page)
-      @page = page
-    end
-
-    def [](key)
-      real_key = key.to_s.sub(/\?$/, '').to_sym
-
-      if real_key == :content
-        @page.content
-      elsif real_key == :parent
-        @page.parent.nil? ? nil : @page.parent.to_proxy
-      elsif real_key == :children
-        @page.children.map { |page| page.to_proxy }
-      else
-        @page.attribute_named(real_key)
-      end
-    end
-
-    def []=(key, value)
-      @page.attributes[key.to_sym] = value
-    end
-
-    def method_missing(method, *args)
-      self[method]
-    end
-
-  end
-end

data/lib/nanoc/base/plugin_manager.rb

@@ -1,33 +0,0 @@
-module Nanoc
-  class PluginManager
-
-    @@data_sources       = {}
-    @@filters            = {}
-    @@layout_processors  = {}
-
-    def self.subclasses_of(superclass)
-      subclasses = []
-      ObjectSpace.each_object(Class) { |subclass| subclasses << subclass if subclass < superclass }
-      subclasses
-    end
-
-    def self.data_source_named(name)
-      @@data_sources[name.to_sym] ||= subclasses_of(DataSource).find do |klass|
-        klass.identifiers.include?(name.to_sym)
-      end
-    end
-
-    def self.filter_named(name)
-      @@filters[name.to_sym] ||= subclasses_of(Filter).find do |klass|
-        klass.identifiers.include?(name.to_sym)
-      end
-    end
-
-    def self.layout_processor_for_extension(ext)
-      @@filters[ext.to_sym] ||= subclasses_of(LayoutProcessor).find do |klass|
-        klass.extensions.include?(ext)
-      end
-    end
-
-  end
-end

data/lib/nanoc/data_sources/database.rb

@@ -1,259 +0,0 @@
-begin ; require 'active_record' ; rescue LoadError ; end
-
-module Nanoc::DataSource::Database
-
-  ########## Helper classes ##########
-
-  begin
-
-    class DatabasePage < ActiveRecord::Base
-      set_table_name 'pages'
-    end
-
-    class DatabasePageDefault < ActiveRecord::Base
-      set_table_name 'page_defaults'
-    end
-
-    class DatabaseTemplate < ActiveRecord::Base
-      set_table_name 'templates'
-    end
-
-    class DatabaseLayout < ActiveRecord::Base
-      set_table_name 'layouts'
-    end
-
-    class DatabaseCodePiece < ActiveRecord::Base
-      set_table_name 'code_pieces'
-    end
-
-  rescue NameError
-  end
-
-  class DatabaseDataSource < Nanoc::DataSource
-
-    ########## Attributes ##########
-
-    identifier  :database
-
-    ########## Preparation ##########
-
-    def up
-      nanoc_require 'active_record'
-
-      # Connect to the database
-      ActiveRecord::Base.establish_connection(@site.config[:database])
-    end
-
-    def down
-      # Disconnect from the database
-      ActiveRecord::Base.remove_connection
-    end
-
-    def setup
-      # Create tables
-      schema = ActiveRecord::Schema
-      schema.verbose = false
-      schema.define do
-
-        create_table :pages, :force => true do |t|
-          t.column :content, :text
-          t.column :path,    :string
-          t.column :meta,    :text
-        end
-
-        create_table :page_defaults, :force => true do |t|
-          t.column :meta, :text
-        end
-
-        create_table :layouts, :force => true do |t|
-          t.column :name,      :string
-          t.column :content,   :text
-          t.column :extension, :string
-        end
-
-        create_table :templates, :force => true do |t|
-          t.column :content,  :text
-          t.column :name,     :string
-          t.column :meta,     :text
-        end
-
-        create_table :code_pieces, :force => true do |t|
-          t.column :name, :string
-          t.column :code, :text
-        end
-
-      end
-
-      # Create first page
-      DatabasePage.create(
-        :path    => '/',
-        :content => "I'm a brand new root page. Please edit me!\n",
-        :meta    => "# Built-in\n" +
-                    "\n" +
-                    "# Custom\n" +
-                    "title: \"A New Root Page\"\n"
-      )
-
-      # Create page defaults
-      DatabasePageDefault.create(
-        :meta => "# Built-in\n" +
-                 "custom_path:  none\n" +
-                 "extension:    \"html\"\n" +
-                 "filename:     \"index\"\n" +
-                 "filters_post: []\n" +
-                 "filters_pre:  []\n" +
-                 "is_draft:     false\n" +
-                 "layout:       \"default\"\n" +
-                 "skip_output:  false\n" +
-                 "\n" +
-                 "# Custom\n"
-      )
-
-      # Create default layout
-      DatabaseLayout.create(
-        :name      => 'default',
-        :content   => "<html>\n" +
-                      "  <head>\n" +
-                      "    <title><%= @page.title %></title>\n" +
-                      "  </head>\n" +
-                      "  <body>\n" +
-                      "<%= @page.content %>\n" +
-                      "  </body>\n" +
-                      "</html>",
-        :extension => '.erb'
-      )
-
-      # Create default template
-      DatabaseTemplate.create(
-        :name    => 'default',
-        :content => 'Hi, I\'m a new page!',
-        :meta    => "# Built-in\n" +
-                    "\n" +
-                    "# Custom\n" +
-                    "title: \"A New Page\"\n"
-      )
-
-      # Create default code piece
-      DatabaseCodePiece.create(
-        :name => 'default',
-        :code => "def html_escape(str)\n" +
-                 "  str.gsub('&', '&amp;').str('<', '&lt;').str('>', '&gt;').str('\"', '&quot;')\n" +
-                 "end\n" +
-                 "alias h html_escape\n"
-      )
-
-      log(:high, "Set up database schema.")
-    end
-
-    ########## Loading data ##########
-
-    def pages
-      # Create Pages for each database object
-      DatabasePage.find(:all).inject([]) do |pages, page|
-        # Read metadata
-        hash = (YAML.load(page.meta || '') || {}).clean
-
-        if hash[:is_draft]
-          # Skip drafts
-          pages
-        else
-          # Get extra info
-          extras = { :path => page.path, :uncompiled_content => page.content }
-
-          # Add to list of pages
-          pages + [ hash.merge(extras) ]
-        end
-      end
-    end
-
-    def page_defaults
-      YAML.load(DatabasePageDefault.find(:first).meta) || {}
-    end
-
-    def layouts
-      DatabaseLayout.find(:all).map do |layout|
-        {
-          :name      => layout.name,
-          :content   => layout.content,
-          :extension => layout.extension
-        }
-      end
-    end
-
-    def templates
-      DatabaseTemplate.find(:all).map do |template|
-        {
-          :name     => template.name,
-          :content  => template.content,
-          :meta     => template.meta
-        }
-      end
-    end
-
-    def code
-      DatabaseCodePiece.find(:all).map { |p| p.code }.join("\n")
-    end
-
-    ########## Creating data ##########
-
-    def create_page(path, template)
-      # Make sure path does not start or end with a slash
-      sanitized_path = ('/' + path + '/').gsub(/^\/+|\/+$/, '/')
-
-      # Make sure the page doesn't exist yet
-      unless DatabasePage.find_all_by_path(sanitized_path).empty?
-        error "A page named '#{sanitized_path}' already exists."
-      end
-
-      # Create page
-      DatabasePage.create(
-        :path    => sanitized_path,
-        :content => "I'm a brand new page. Please edit me!\n",
-        :meta    => "# Built-in\n\n# Custom\ntitle: A New Page\n"
-      )
-
-      log(:high, "Created page '#{sanitized_path}'.")
-    end
-
-    def create_layout(name)
-      # Make sure the layout doesn't exist yet
-      unless DatabaseLayout.find_all_by_name(name).empty?
-        error "A layout named '#{name}' already exists."
-      end
-
-      # Create layout
-      DatabaseLayout.create(
-        :name      => name,
-        :content   => "<html>\n" +
-                      "  <head>\n" +
-                      "    <title><%= @page.title %></title>\n" +
-                      "  </head>\n" +
-                      "  <body>\n" +
-                      "<%= @page.content %>\n" +
-                      "  </body>\n" +
-                      "</html>",
-        :extension => '.erb'
-      )
-
-      log(:high, "Created layout '#{name}'.")
-    end
-
-    def create_template(name)
-      # Make sure the layout doesn't exist yet
-      unless DatabaseTemplate.find_all_by_name(name).empty?
-        error "A template named '#{name}' already exists."
-      end
-
-      # Create template
-      DatabaseTemplate.create(
-        :name    => name,
-        :content => "Hi, I'm a brand new page!\n",
-        :meta    => "# Built-in\n\n# Custom\ntitle: A New Page\n"
-      )
-
-      log(:high,"Created template '#{name}'.")
-    end
-
-  end
-
-end