nanoc3 3.1.0rc1 → 3.1.0

data/NEWS.md

@@ -1,6 +1,8 @@
-# nanoc News
+# nanoc news
 
-## 3.1
+## 3.1 (2010-04-03)
+
+New:
 
 * An `Item#rep_named(name)` function for quickly getting a certain rep
 * An `Item#compiled_content` function for quickly getting compiled content
@@ -10,7 +12,8 @@
 * A `debug` command that shows information about the items, reps and layouts
 * A `kramdown` filter ([kramdown site](http://kramdown.rubyforge.org/))
 * A diff between the previously compiled content and the last compiled content
-  is now written to `output.diff`
+  is now written to `output.diff` if the `enable_output_diff` site
+  configuration attribute is true
 * Assigns, such as `@items`, `@layouts`, `@item`, … are accessible without `@`
 * Support for binary items
 
@@ -32,6 +35,7 @@ Changed:
 * The `--server` autocompile option is now known as `--handler`
 * Assigns in filters are now available as instance variables and methods
 * The `#breadcrumbs_trail` function now allows missing parents
+* The `sass` filter now properly handles `@import` dependencies
 
 Deprecated:
 
@@ -40,30 +44,30 @@ Deprecated:
 * The `last_fm`, `delicious` and `twitter` data sources; fetch online content
   into a cache by a rake task and load data from this cache instead
 
-## 3.0.9
+## 3.0.9 (2010-02-24)
 
 * Fixed 1.8.x parsing bug due to lack of parens which could cause “undefined
   method `to_iso8601_time` for #<String:0x…>” errors
 
-## 3.0.8
+## 3.0.8 (2010-02-24)
 
 * `#atom_tag_for` now works with base_urls that contain a path [Eric Sunshine]
 * Generated root URLs in `#atom_feed` now end with a slash [Eric Sunshine]
 * Autocompiler now recognises requests to index files
 * `Blogging` helper now allows created_at to be a Time instance
 
-## 3.0.7
+## 3.0.7 (2010-01-29)
 
-* Fixed a bug which could cause layout rules not be matched in order
+* Fixed bug which could cause layout rules not be matched in order
 
-## 3.0.6
+## 3.0.6 (2010-01-17)
 
 * Error checking in `filesystem_combined` has been improved [Brian Candler]
 * Generated HTML files now have a default encoding of UTF-8
 * Periods in identifiers for layouts now behave correctly
 * The `relativize_paths` filter now correctly handles “/” [Eric Sunshine]
 
-## 3.0.5
+## 3.0.5 (2010-01-12)
 
 * Restored pre-3.0.3 behaviour of periods in identifiers. By default, a file
   can have multiple extensions (e.g. `content/foo.html.erb` will have the
@@ -72,13 +76,13 @@ Deprecated:
   `content/blog/stuff.entry.html` will have the identifier
   `/blog/stuff.entry/`).
 
-## 3.0.4
+## 3.0.4 (2010-01-07)
 
 * Fixed a bug which would cause the `filesystem_compact` data source to
   incorrectly determine the content filename, leading to weird “Expected 1
   content file but found 3” errors [Eric Sunshine]
 
-## 3.0.3
+## 3.0.3 (2010-01-06)
 
 * The `Blogging` helper now properly handles item reps without paths
 * The `relativize_paths` filter now only operates inside tags
@@ -90,14 +94,14 @@ Deprecated:
 * Required enumerator to make sure `#enum_with_index` always works
 * `Array#stringify_keys` now properly recurses
 
-## 3.0.2
+## 3.0.2 (2009-11-07)
 
 * Children-only identifier patterns no longer erroneously also match parent
   (e.g.` /foo/*/` no longer matches `/foo/`)
 * The `create_site` command no longer uses those ugly HTML entities
 * Install message now mentions the IRC channel
 
-## 3.0.1
+## 3.0.1 (2009-10-05)
 
 * The proper exception is now raised when no matching compilation rules can
   be found
@@ -107,7 +111,7 @@ Deprecated:
 * Several outdated URLs are now up-to-date
 * Error handling has been improved in general
 
-## 3.0
+## 3.0 (2009-08-14)
 
 New:
 
@@ -132,7 +136,7 @@ Removed:
 * `save_*`, `move_*` and `delete_*` methods in data sources
 * Processing instructions in metadata
 
-## 2.2.2
+## 2.2.2 (2009-05-18)
 
 * Removed `relativize_paths` filter; use `relativize_paths_in_html` or
   `relativize_paths_in_css` instead
@@ -141,14 +145,14 @@ Removed:
 * Fixed bug which would cause nanoc to complain about the open file limit
   being reached when using a large amount of assets
 
-## 2.2.1
+## 2.2.1 (2009-04-08)
 
 * Fixed bug which prevented `relative_path_to` from working
 * Split `relativize_paths` filter into two filter: `relativize_paths_in_html`
   and `relativize_paths_in_css`
 * Removed bundled mime-types library
 
-## 2.2
+## 2.2 (2009-04-06)
 
 New:
 
@@ -174,7 +178,7 @@ Removed:
 
 * deprecated extension-based code
 
-## 2.1.6
+## 2.1.6 (2009-02-28)
 
 * The `filesystem_combined` data source now supports empty metadata sections
 * The `rdoc` filter now works for both RDoc 1.x and 2.x
@@ -184,34 +188,34 @@ Removed:
   end with a slash
 * The autocompiler now always serves asset content correctly
 
-## 2.1.5
+## 2.1.5 (2009-02-01)
 
 * Added Ruby 1.9 compatibility
 * The `filesystem` and `filesystem_combined` data sources now preserve custom
   extensions
 
-## 2.1.4
+## 2.1.4 (2008-11-15)
 
 * Fixed an issue where the autocompiler in Windows would serve broken assets
 
-## 2.1.3
+## 2.1.3 (2008-09-27)
 
 * The `haml` and `sass` filters now correctly take their options from assets
 * The autocompiler now serves index files instead of 404s
 * Layouts named “index” are now handled correctly
 * The `filesystem_combined` data source now properly handles assets
 
-## 2.1.2
+## 2.1.2 (2008-09-08)
 
 * The utocompiler now compiles assets as well
 * The `sass` filter now takes options (just like the `haml` filter)
 * Haml/Sass options are now taken from the page *rep* instead of the page
 
-## 2.1.1
+## 2.1.1 (2008-08-18)
 
 * Fixed issue which would cause files not to be required in the right order
 
-## 2.1
+## 2.1 (2008-08-17)
 
 This is only a short summary of all changes in 2.1. For details, see the
 [nanoc web site](http://nanoc.stoneship.org/). Especially the blog and the
@@ -242,27 +246,27 @@ Removed:
 	* `markdown`: use `bluecloth`, `rdiscount` or `maruku` instead
 	* `textile`: use `redcloth` instead
 
-## 2.0.4
+## 2.0.4 (2008-05-04)
 
 * 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
+## 2.0.3 (2008-03-25)
 
 * The autocompiler 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
+## 2.0.2 (2008-01-26)
 
 * nanoc now requires Ruby 1.8.5 instead of 1.8.6
 
-## 2.0.1
+## 2.0.1 (2008-01-21)
 
 * Fixed a “too many open files” error that could appear during (auto)compiling
 
-## 2.0
+## 2.0 (2007-12-25)
 
 New:
 
@@ -283,15 +287,15 @@ Removed:
 * The `filters` property; use `filters_pre` instead
 * Support for Liquid
 
-## 1.6.2
+## 1.6.2 (2007-10-23)
 
 * Fixed an issue which prevented the content capturing plugin from working
 
-## 1.6.1
+## 1.6.1 (2007-10-14)
 
 * Removed a stray debug message
 
-## 1.6
+## 1.6 (2007-10-13)
 
 * Added support for post-layout filters
 * Added support for getting a File object for the page, so you can now e.g.
@@ -299,14 +303,14 @@ Removed:
 * Cleaned up the source code a lot
 * Removed deprecated asset-copying functionality
 
-## 1.5
+## 1.5 (2007-09-10)
 
 * 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 (2007-07-06)
 
 * 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
@@ -315,12 +319,12 @@ Removed:
 * 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 (2007-06-30)
 
 * The contents of the `assets` directory are now copied into the output
   directory specified in `config.yaml`
 
-## 1.3
+## 1.3 (2007-06-24)
 
 * The `@pages` array now also contains uncompiled pages
 * Pages with `skip_output` set to true will not be outputted
@@ -330,11 +334,11 @@ Removed:
 * nanoc now warns before overwriting in `create_site`, `create_page` and
   `create_template` (but not in compile)
 
-## 1.2
+## 1.2 (2007-06-05)
 
 * 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 support for non-eRuby layouts (Markaby, Haml, Liquid, …)
 * Added more filters (Markaby, Haml, Liquid, RDoc [Dmitry Bilunov])
 * Improved error reporting
 * Accessing page attributes using instance variables, and not through `@page`,
@@ -342,16 +346,16 @@ Removed:
 * Page attributes can now be accessed using dot notation, i.e. `@page.title`
   as well as `@page[:title]`
 
-## 1.1.3
+## 1.1.3 (2007-05-18)
 
 * Fixed bug which would cause layoutless pages to be outputted incorrectly
 
-## 1.1.2
+## 1.1.2 (2007-05-17)
 
 * Backup files (files ending with a “~”) are now ignored
 * Fixed bug which would cause subpages not to be generated correctly
 
-## 1.1
+## 1.1 (2007-05-08)
 
 * Added support for nested layouts
 * Added coloured logging
@@ -360,12 +364,12 @@ Removed:
   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 (2007-05-05)
 
 * 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 (2007-05-03)
 
 * Initial release

data/lib/nanoc3.rb

@@ -3,7 +3,7 @@
 module Nanoc3
 
   # The current nanoc version.
-  VERSION = '3.1.0rc1'
+  VERSION = '3.1.0'
 
 end
 

data/lib/nanoc3/base/compiler.rb

@@ -59,7 +59,6 @@ module Nanoc3
 
       # Load dependencies
       dependency_tracker.load_graph
-      dependency_tracker.print_graph if $DEBUG
 
       # Get items and reps to compile
       if item
@@ -176,10 +175,15 @@ module Nanoc3
         end
 
         # Retry
-        puts "*** No active reps left; activating all (#{inactive_reps.size}) inactive reps" if $DEBUG
-        puts if $DEBUG
-        active_reps   = inactive_reps
-        inactive_reps = []
+        if inactive_reps.empty?
+          puts "*** Nothing left to compile!" if $DEBUG
+          break
+        else
+          puts "*** No active reps left; activating all (#{inactive_reps.size}) inactive reps" if $DEBUG
+          puts if $DEBUG
+          active_reps   = inactive_reps
+          inactive_reps = []
+        end
       end
 
       # Notify skipped reps

data/lib/nanoc3/base/dependency_tracker.rb

@@ -57,11 +57,9 @@ module Nanoc3
 
       # Register start of visits
       Nanoc3::NotificationCenter.on(:visit_started, self) do |item|
-        $stderr.puts "*** IN stack.size=#{@stack.size} item=#{item.inspect}" if $DEBUG
-
         # Record possible dependency
         unless @stack.empty?
-          $stderr.puts "*** Recording dependency #{@stack[-1].inspect} -> #{item.inspect}" if $DEBUG
+          $stderr.puts "*** Recording dependency on #{item.inspect}" if $DEBUG
           self.record_dependency(@stack[-1], item)
         end
 
@@ -70,8 +68,6 @@ module Nanoc3
 
       # Register end of visits
       Nanoc3::NotificationCenter.on(:visit_ended, self) do |item|
-        $stderr.puts "*** OUT stack.size=#{@stack.size} item=#{item.inspect}" if $DEBUG
-
         @stack.pop
       end
     end

data/lib/nanoc3/base/errors.rb

@@ -133,7 +133,7 @@ module Nanoc3
       # compiled
       def initialize(rep)
         @rep = rep
-        super("The “#{rep.item.identifier}” item (rep “#{rep.name}”) cannot currently be compiled yet due to an unmet dependency.".make_compatible_with_env)
+        super("The current item cannot be compiled yet because of an unmet dependency on the “#{rep.item.identifier}” item (rep “#{rep.name}”).".make_compatible_with_env)
       end
 
     end

data/lib/nanoc3/base/filter.rb

@@ -66,13 +66,13 @@ module Nanoc3
       end
 
       # @return [Boolean] True if this filter can be applied to binary item
-      # representations, false otherwise
+      #   representations, false otherwise
       def from_binary?
         (@from || :text) == :binary
       end
 
       # @return [Boolean] True if this filter results in a binary item
-      # representation, false otherwise
+      #   representation, false otherwise
       def to_binary?
         (@to || :text) == :binary
       end
@@ -82,7 +82,7 @@ module Nanoc3
     # Creates a new filter that has access to the given assigns.
     #
     # @param [Hash] hash A hash containing variables that should be made
-    # available during filtering.
+    #   available during filtering.
     def initialize(hash={})
       @assigns = hash
       super
@@ -93,22 +93,22 @@ module Nanoc3
     # @abstract
     #
     # @param [String] content_or_filename The unprocessed content that should
-    # be filtered (if the item is a textual item) or the path to the file that
-    # should be fitlered (if the item is a binary item)
+    #   be filtered (if the item is a textual item) or the path to the file
+    #   that should be filtered (if the item is a binary item)
     #
     # @param [Hash] params A hash containing parameters. Filter subclasses can
-    # use these parameters to allow modifying the filter's behaviour.
+    #   use these parameters to allow modifying the filter's behaviour.
     #
-    # @return [String] The filtered content (if the item is a textual item) or
-    # a path to a newly generated file containing the filtered content (if the
-    # item is a binary item)
+    # @return [String, void] If the filter output binary content, the return
+    #   value is undefined; if the filter outputs textual content, the return
+    #   value will be the filtered content.
     def run(content_or_filename, params={})
       raise NotImplementedError.new("Nanoc3::Filter subclasses must implement #run")
     end
 
     # Returns a filename that is used to write data to. This method is only
-    # used on binary items. When running a binary filter on a file, the
-    # resulting file must end up in the location returned by this method.
+    #   used on binary items. When running a binary filter on a file, the
+    #   resulting file must end up in the location returned by this method.
     #
     # @return [String] The output filename
     def output_filename
@@ -125,7 +125,7 @@ module Nanoc3
     end
 
     # Returns the filename associated with the item that is being filtered.
-    # It is in the format `item <identifier> (rep <name>)`.
+    #   It is in the format `item <identifier> (rep <name>)`.
     #
     # @return [String] The filename
     def filename

data/lib/nanoc3/base/item_rep.rb

@@ -396,8 +396,6 @@ module Nanoc3
     # content in `diff(1)` format, or nil if there is no previous compiled
     # content
     def diff
-      return nil if !@item.site.config[:enable_output_diff]
-
       if self.binary?
         nil
       else
@@ -439,7 +437,7 @@ module Nanoc3
     end
 
     def generate_diff
-      if @old_content.nil? or self.raw_path.nil?
+      if @old_content.nil? || self.raw_path.nil? || !@item.site.config[:enable_output_diff]
         @diff = nil
       else
         @diff_thread = Thread.new do

data/lib/nanoc3/cli/commands/compile.rb

@@ -128,6 +128,13 @@ module Nanoc3::CLI::Commands
     end
 
     def write_diff_for(reps)
+      # Delete diff
+      FileUtils.rm('output.diff') if File.file?('output.diff')
+
+      # Don’t generate diffs when diffs are disabled
+      return if !@base.site.config[:enable_output_diff]
+
+      # Generate diff
       full_diff = ''
       reps.each do |rep|
         diff = rep.diff

data/lib/nanoc3/data_sources/filesystem.rb

@@ -82,7 +82,7 @@ module Nanoc3::DataSources
 
         # Read content and metadata
         is_binary = !!(content_filename && !@site.config[:text_extensions].include?(File.extname(content_filename)[1..-1]))
-        if is_binary
+        if is_binary && klass == Nanoc3::Item
           meta                = (meta_filename && YAML.load_file(meta_filename)) || {}
           content_or_filename = content_filename
         else

data/lib/nanoc3/filters/sass.rb

@@ -54,10 +54,15 @@ module Nanoc3::Filters
       imported_items = imported_filenames.map do |filename|
         normalized_filename = Pathname.new(filename).realpath
         @items.find { |i| Pathname.new(i[:filename]).realpath == normalized_filename }
-      end
+      end.compact
 
       # Require compilation of each item
       imported_items.each do |item|
+        # Notify
+        Nanoc3::NotificationCenter.post(:visit_started, item)
+        Nanoc3::NotificationCenter.post(:visit_ended,   item)
+
+        # Raise unmet dependency error if item is not yet compiled
         any_uncompiled_rep = item.reps.find { |r| !r.compiled? }
         raise Nanoc3::Errors::UnmetDependency.new(any_uncompiled_rep) if any_uncompiled_rep
       end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc3
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 3
   - 1
-  - 0rc1
-  version: 3.1.0rc1
+  - 0
+  version: 3.1.0
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 +01:00
+date: 2010-04-03 00:00:00 +02:00
 default_executable: nanoc3
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -179,13 +179,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: