nanoc 3.6.7 → 3.6.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDYwZDczMTNhNTI0MzcxNDYwZjAzY2ZhMzRiY2E1OTA5ZmJjZDZjZg==
+    Y2RmYzljOTcyNWE2NzhmYTEzZWI3MDhlNDAzNTQ2ZGZhMzhhYTliMg==
   data.tar.gz: !binary |-
-    NzhlNjQyMjdiMmQ0ZWEzZGM2NWMwNjRjZWI4NTVmN2YzYTE3MWM5NA==
+    YWYzNTkyNDZmYWU0ZjdiMWE0NWIwNDZiMmEzMDhjYmRhMTc5NDZmZg==
 SHA512:
   metadata.gz: !binary |-
-    MTY3NDMxNjY3ZWFlY2FkN2EwZjA2ZWNiMGI2MDJiYTRlY2Y5N2Y4Y2QxZjQ0
-    NThlYTg0ZTQ4OWU0YjA2YjM4ZDBlOTQwY2ExNTQxMDdhMTZhYzM1NmUyZDQx
-    YThkZDI5ZjdmYmZmMGE5NGU0ZDZjMzMyNjk0YWM1NTNlYzM3NmE=
+    ZWQ1N2I4MDVhOWJhMTYzNzI3Mjg5MmIwYWVlZmE0MzViMDk4NmI3ZDA3MTUx
+    MzJmNjhhMjFjNTdhZTMzZDBjMzIyODhhNzYxYTVlOTVhNDM2MzYwNWMyOTAx
+    ZTQyMTk2M2RmMGE1Nzg2NDhiOTVlZmEzNWUyMWZlZjhjZjAzZjA=
   data.tar.gz: !binary |-
-    NWEwMzcxMTY2ODBjMDBkYWE5NjUyNjI1MTEyMDU4MDNlNGI4NDcwMWI0ZTJj
-    OTVmNWY2YjU4ZTQ4N2I2YmRjNzdkYWQ3ZjhkY2RiNzdjN2FhN2VkNTQ0Mjc4
-    MGIyNWI2M2NlNmQ2ZWYyZmZmN2I1YTcwNzIxZTFhY2VmNmM4NGY=
+    NjQxYTNjMmZlYmQ0OTRlNWYzYjE4MWNiNDYyYjQ5MjI1N2U1ZjNjZDY4OWY0
+    YjU3Mjk2NjlkMTgxZTQ3YmE2OWRiMGY4MThiMzU5Mjc2MjFjMTc1MzI2YWY5
+    YWM5MzM3MzczZGMwMzI4ZDdiNjRjMDAyOWRlMWJjNTMyYjE2MmE=

data/CONTRIBUTING.md

@@ -4,22 +4,18 @@ Contributing
 Reporting bugs
 --------------
 
-If you find a bug in nanoc, you should report it! But before you do, make sure you have the latest version of nanoc (and dependencies) installed, and see if you can still reproduce the bug there. If you can, report it!
+If you find a bug in nanoc, you should report it! Some information that you should include in your bug report is the nanoc version (`nanoc --version`) and, if relevant, the crash log (`crash.log`).
 
-When reporting a bug, please make sure you include as many details as you can about the bug. Some information that you should include:
+For details, check the [*bug reporting* section of the development guide](http://nanoc.ws/development/#reporting-bugs).
 
-* The nanoc version (`nanoc --version`)
-* The `crash.log` file, if relevant
+Contributing code
+-----------------
 
-Submitting Patches
-------------------
+Pull requests are appreciated! When submitting a PR, be sure to submit it onto the right branch:
 
-If you want to submit a pull request, please review the following few guidelines:
+* For bug fixes, use the release branch, e.g. `release-3.6.x`
+* For features, use the `master` branch
 
-* If your pull request is a **bug fix**, submit it on the latest release branch. At the moment of writing, this is `release-3.4.x`. This ensures that the bug fix comes in the next patch release.
+When submitting a PR, make sure that your changes have covering tests, that the documentation remains up-to-date and that you retain backwards compatibility.
 
-* If your pull request is a new **feature** or extends an existing feature,  submit it on the `master` branch.
-
-In both cases, make sure that your changes have **test cases** that cover the bug fix or the new/changed functionality.
-
-Also note that **backwards compatibility** must be retained. This means that you cannot simply modify a feature to work in a different way. What you can do, is add an option to make it work in a different way, but do double-check with me (@ddfreyne) first.
+For details, check the [*contributing code* section of the development guide](http://nanoc.ws/development/#contributing-code).

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 
@@ -18,6 +18,8 @@ gem 'listen'
 gem 'markaby'
 gem 'maruku'
 gem 'mime-types'
+gem 'minitest', '~> 4.0'
+gem 'mocha'
 gem 'mustache'
 gem 'nokogiri', '~> 1.5.5'
 gem 'pandoc-ruby'
@@ -30,6 +32,7 @@ gem 'rdiscount'
 gem 'rdoc'
 gem 'redcarpet'
 gem 'RedCloth'
+gem 'rubocop'
 gem 'rubypants'
 gem 'sass', '~> 3.2.2'
 gem 'slim'
@@ -38,3 +41,4 @@ gem 'typogruby'
 gem 'uglifier'
 gem 'w3c_validators'
 gem 'yuicompressor'
+gem 'yard'

data/Gemfile.lock

@@ -5,79 +5,95 @@ PATH
       cri (~> 2.3)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    adsf (1.1.1)
+    adsf (1.2.0)
       rack (>= 1.0.0)
+    ast (1.1.0)
     bluecloth (2.2.0)
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    chunky_png (1.2.9)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    chunky_png (1.3.0)
     coderay (1.1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.0)
     colored (1.2)
     commonjs (0.2.7)
-    compass (0.12.2)
+    compass (0.12.4)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.1)
-    cri (2.4.0)
+      sass (~> 3.2.17)
+    cri (2.5.0)
       colored (>= 1.2)
     erubis (2.7.0)
-    excon (0.28.0)
+    excon (0.32.1)
     execjs (2.0.2)
     ffi (1.9.3)
-    fog (1.18.0)
+    fog (1.21.0)
+      fog-brightbox
+      fog-core (~> 1.21, >= 1.21.1)
+      fog-json
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-brightbox (0.0.1)
+      fog-core
+      fog-json
+    fog-core (1.21.1)
       builder
-      excon (~> 0.28.0)
+      excon (~> 0.32)
       formatador (~> 0.2.0)
       mime-types
-      multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
+    fog-json (1.0.0)
+      multi_json (~> 1.0)
     formatador (0.2.4)
     fssm (0.2.10)
-    haml (4.0.4)
+    haml (4.0.5)
       tilt
-    handlebars (0.5.0)
-      commonjs (~> 0.2.3)
-      handlebars-source (~> 1.0.12)
+    handlebars (0.6.0)
+      handlebars-source (~> 1.3.0)
       therubyracer (~> 0.12.0)
-    handlebars-source (1.0.12)
+    handlebars-source (1.3.0)
     json (1.8.1)
-    kramdown (1.2.0)
-    less (2.4.0)
+    kramdown (1.3.3)
+    less (2.5.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.3)
-    listen (2.2.0)
+    listen (2.7.1)
       celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    markaby (0.7.2)
-      builder (>= 2.0.0)
-    maruku (0.7.0)
-    metaclass (0.0.1)
+    markaby (0.8.0)
+      builder
+    maruku (0.7.1)
+    metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.0)
+    mime-types (2.2)
     minitest (4.7.5)
-    mocha (0.14.0)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
+    multi_json (1.9.2)
     mustache (0.99.5)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-    nokogiri (1.5.10)
+    net-ssh (2.8.0)
+    nio4r (1.0.0)
+    nokogiri (1.5.11)
     pandoc-ruby (0.7.5)
-    posix-spawn (0.3.6)
-    pry (0.9.12.4)
+    parser (2.1.7)
+      ast (~> 1.1)
+      slop (~> 3.4, >= 3.4.5)
+    posix-spawn (0.3.8)
+    powerpack (0.0.9)
+    pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
@@ -85,33 +101,40 @@ GEM
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
+    rainbow (2.0.0)
     rainpress (1.0)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
       ffi (>= 0.5.0)
     rdiscount (2.1.7)
-    rdoc (4.0.1)
+    rdoc (4.1.1)
       json (~> 1.4)
-    redcarpet (3.0.0)
+    redcarpet (3.1.1)
     ref (1.0.5)
-    ruby-hmac (0.4.0)
+    rubocop (0.19.1)
+      json (>= 1.7.7, < 2)
+      parser (~> 2.1.7)
+      powerpack (~> 0.0.6)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.4.2)
     rubypants (0.2.0)
-    sass (3.2.12)
+    sass (3.2.17)
     slim (2.0.2)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
-    slop (3.4.7)
-    systemu (2.5.2)
+    slop (3.5.0)
+    systemu (2.6.4)
     temple (0.6.7)
-    therubyracer (0.12.0)
+    therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    tilt (1.4.1)
+    tilt (2.0.1)
     timers (1.1.0)
     typogruby (1.0.16)
       rubypants
-    uglifier (2.3.1)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     w3c_validators (1.2)
@@ -119,7 +142,7 @@ GEM
       nokogiri
     yajl-ruby (1.1.0)
     yard (0.8.7.3)
-    yuicompressor (1.2.1)
+    yuicompressor (1.3.3)
 
 PLATFORMS
   ruby
@@ -129,6 +152,7 @@ DEPENDENCIES
   adsf
   bluecloth
   builder
+  bundler (~> 1.5)
   coderay
   coffee-script
   compass
@@ -156,6 +180,7 @@ DEPENDENCIES
   rdiscount
   rdoc
   redcarpet
+  rubocop
   rubypants
   sass (~> 3.2.2)
   slim

data/NEWS.md

@@ -1,5 +1,19 @@
 # nanoc news
 
+## 3.6.8 (2014-03-22)
+
+Fixes:
+
+* Fixed issue with missing compilation durations (#374, #379)
+* Made XSL filter transform item rather than layout (#399, #401) [Simon South]
+* Made XSL filter honor omit-xml-declaration (#403, #404) [Simon South]
+* Removed "see full crash log" line from crash log (#397, #402)
+
+Enhancements:
+
+* Added warning when multiple preprocessors are defined (#389)
+* Improve stylesheet handling in default site (#339, #395)
+
 ## 3.6.7 (2013-12-09)
 
 Fixes:
@@ -10,7 +24,7 @@ Fixes:
 * Fixed crash in watcher (#358)
 * Fixed huge durations when showing skipped items after compilation (#360, #364)
 * Fixed output of `--verbose` compilation statistics (#359, #365)
-* Fixed issue with Sass files not recompiling (#350, 370)
+* Fixed issue with Sass files not recompiling (#350, #370)
 
 Enhancements:
 

data/README.md

@@ -1,129 +1,22 @@
 [![Build Status](https://travis-ci.org/nanoc/nanoc.png)](https://travis-ci.org/nanoc/nanoc)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/nanoc/nanoc)
+[![Code Climate](https://codeclimate.com/github/nanoc/nanoc.png)](https://codeclimate.com/github/nanoc/nanoc)
+[![Coverage Status](https://coveralls.io/repos/nanoc/nanoc/badge.png?branch=master)](https://coveralls.io/r/nanoc/nanoc)
+[![Gem Version](https://badge.fury.io/rb/nanoc.png)](http://badge.fury.io/rb/nanoc)
 
-**Please take a moment and [donate](http://pledgie.com/campaigns/9282) to nanoc. A lot of time has gone into developing nanoc, and I would like to keep the current pace. Your support will ensure that nanoc will continue to improve.**
+![nanoc logo](https://avatars1.githubusercontent.com/u/3260163?s=140)
 
-# nanoc 3
+# nanoc
 
-nanoc is a simple but very flexible static site generator written in Ruby.
-It operates on local files, and therefore does not run on the server. nanoc
-“compiles” the local source files into HTML (usually), by evaluating eRuby,
-Markdown, etc.
+nanoc is a flexible static site generator written in Ruby. See the [nanoc web site](http://nanoc.ws) for more information.
 
-Note: This documentation looks best with Yardoc, not RDoc.
+**Please take a moment and [donate](http://pledgie.com/campaigns/9282) to nanoc. A lot of time has gone into developing nanoc, and I would like to keep it going. Your support will ensure that nanoc will continue to improve.**
 
-## Resources
+## Contributing
 
-The [nanoc web site](http://nanoc.ws) contains a few useful resources to help you get started with nanoc. If you need further assistance, the following places will help you out:
+Contributions are greatly appreciated! Consult the [Development guidelines](http://nanoc.ws/development/) for information on how you can contribute.
 
-* The [discussion group](http://groups.google.com/group/nanoc)
-* The [IRC channel](irc://chat.freenode.net/#nanoc)
+### Contributors
 
-## Versioning
+Many thanks to everyone who has contributed to nanoc in one way or another:
 
-nanoc uses [Semantic Versioning](http://semver.org/).
-
-## Source Code Documentation
-
-The source code is located in `lib/nanoc` and is structured in a few
-directories:
-
-* `base` contains the bare essentials necessary for nanoc to function
-  * `source_data` contains raw, uncompiled content that will be compiled
-  * `result_data` contains the compiled content
-  * `compilation` contains the compilation functionality
-* `cli` contains the commandline interface
-* `data_sources` contains the standard data sources ({Nanoc::DataSource}
-  subclasses), such as the filesystem data source
-* `extra` contains stuff that is not needed by nanoc itself, but which may
-  be used by helpers, data sources, filters or VCSes.
-* `filters` contains the standard filters ({Nanoc::Filter} subclasses)
-  such as ERB, Markdown, Haml, …
-* `helpers` contains helpers, which provide functionality some sites
-  may find useful, such as the blogging and tagging helpers
-* `tasks` contains rake tasks that perform a variety of functions such as
-  validating HTML and CSS, uploading compiled files, …
-
-The namespaces (modules) are organised like this:
-
-* {Nanoc} is the namespace for everything nanoc-related (obviously). The
-  classes in `lib/nanoc/base` are part of this module (not `Nanoc::Base`)
-* {Nanoc::CLI} containing everything related to the commandline tool.
-* {Nanoc::DataSources} contains the data sources
-* {Nanoc::Helpers} contains the helpers
-* {Nanoc::Extra} contains useful stuff not needed by nanoc itself
-* {Nanoc::Filters} contains the (textual) filters
-
-The central class in nanoc is {Nanoc::Site}, so you should start there if
-you want to explore nanoc from a technical perspective.
-
-## Dependencies
-
-nanoc has few dependencies. It is possible to use nanoc programmatically
-without any dependencies at all, but if you want to use nanoc in a proper way,
-you’ll likely need some dependencies:
-
-* The **commandline frontend** depends on `cri`.
-* The **autocompiler** depends on `mime-types` and `rack`.
-* Filters and helpers likely have dependencies on their own too.
-
-If you’re developing for nanoc, such as writing custom filters or helpers, you
-may be interested in the development dependencies:
-
-* For **documentation generation** you’ll need `yard`.
-* For **packaging** you’ll need `rubygems` (1.3 or newer).
-* For **testing** you’ll need `mocha` and `minitest`.
-
-## Contributors
-
-(In alphabetical order)
-
-* Ben Armston
-* Colin Barrett
-* Bil Bas
-* Dmitry Bilunov
-* Fabian Buch
-* Devon Luke Buchanan
-* Stefan Bühler
-* Dan Callahan
-* Brian Candler
-* Jack Chu
-* Michal Cichra
-* Zaiste de Grengolada
-* Vincent Driessen
-* Chris Eppstein
-* Jeff Forcier
-* Riley Goodside
-* Felix Hanley
-* Justin Hileman
-* Starr Horne
-* Daniel Hofstetter
-* Tuomas Kareinen
-* Greg Karékinian
-* Matt Keveney
-* Kevin Lynagh
-* Go Maeda
-* Nikhil Marathe
-* Daniel Mendler
-* Stuart Montgomery
-* Ale Muñoz
-* John Nishinaga
-* Gregory Pakosz
-* Nicky Peeters
-* Christian Plessl
-* Damien Pollet
-* Šime Ramov
-* Xavier Shay
-* Arnau Siches
-* “Soryu”
-* Eric Sunshine
-* Dennis Sutch
-* Takashi Uchibe
-* Matthias Vallentin
-* Ruben Verborgh
-* Scott Vokes
-* Toon Willems
-
-## Contact
-
-You can reach me at <denis.defreyne@stoneship.org>.
+Ale Muñoz, Alexander Mankuta, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Chris Eppstein, Christian Plessl, Colin Barrett, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Everitt, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Go Maeda, Gregory Pakosz, Grégory Karékinian, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Louis T., Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Michal Cichra, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Peter Aronoff, Raphael von der Grün, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Simon South, Spencer Whitt, Stanley Rost, Starr Horne, Stefan Bühler, Stuart Montgomery, Takashi Uchibe, Toon Willems, Tuomas Kareinen, Ursula Kallio, Vincent Driessen, Xavier Shay, Zaiste de Grengolada, Šime Ramov

data/doc/yardoc_handlers/identifier.rb

@@ -0,0 +1,34 @@
+class NanocIdentifierHandler < ::YARD::Handlers::Ruby::AttributeHandler
+
+  # e.g. identifier :foo, :bar
+
+  handles method_call(:identifier), method_call(:identifiers)
+  namespace_only
+
+  def process
+    identifiers = statement.parameters(false).map { |param| param.jump(:ident)[0] }
+    namespace['nanoc_identifiers'] = identifiers
+  end
+
+end
+
+class NanocRegisterFilterHandler < ::YARD::Handlers::Ruby::AttributeHandler
+
+  # e.g. Nanoc::Filter.register '::Nanoc::Filters::AsciiDoc', :asciidoc
+
+  handles method_call(:register)
+  namespace_only
+
+  def process
+    target = statement.jump(:const_path_ref)
+    return if target != s(:const_path_ref, s(:var_ref, s(:const, "Nanoc")), s(:const, "Filter"))
+
+    class_name = statement.jump(:string_literal).jump(:tstring_content)[0]
+    identifier = statement.jump(:symbol_literal).jump(:ident)[0]
+
+    obj = YARD::Registry.at(class_name.sub(/^::/, ''))
+    obj['nanoc_identifiers'] ||= []
+    obj['nanoc_identifiers'] << identifier
+  end
+
+end

data/lib/nanoc/base/compilation/checksum_store.rb

@@ -10,10 +10,10 @@ module Nanoc
 
     # @option params [Nanoc::Site] site The site where this checksum store
     #   belongs to
-    def initialize(params={})
+    def initialize(params = {})
       super('tmp/checksums', 1)
 
-      @site = params[:site] if params.has_key?(:site)
+      @site = params[:site] if params.key?(:site)
 
       @checksums = {}
     end

data/lib/nanoc/base/compilation/compiler.rb

@@ -169,7 +169,7 @@ module Nanoc
       end
 
       # Calculate checksums
-      self.objects.each do |obj|
+      objects.each do |obj|
         checksum_store[obj] = obj.checksum
       end
 
@@ -239,7 +239,7 @@ module Nanoc
           basic_path = rule.apply_to(rep, :compiler => self)
           next if basic_path.nil?
           if basic_path !~ %r{^/}
-            raise RuntimeError, "The path returned for the #{rep.inspect} item representation, “#{basic_path}”, does not start with a slash. Please ensure that all routing rules return a path that starts with a slash."
+            raise "The path returned for the #{rep.inspect} item representation, “#{basic_path}”, does not start with a slash. Please ensure that all routing rules return a path that starts with a slash."
           end
 
           # Get raw path by prepending output directory
@@ -250,7 +250,7 @@ module Nanoc
           @site.config[:index_filenames].each do |index_filename|
             if rep.paths[snapshot][-index_filename.length..-1] == index_filename
               # Strip and stop
-              rep.paths[snapshot] = rep.paths[snapshot][0..-index_filename.length-1]
+              rep.paths[snapshot] = rep.paths[snapshot][0..-index_filename.length - 1]
               break
             end
           end

data/lib/nanoc/base/compilation/compiler_dsl.rb

@@ -25,6 +25,11 @@ module Nanoc
     #
     # @return [void]
     def preprocess(&block)
+      if @rules_collection.preprocessor
+        warn 'WARNING: A preprocess block is already defined. Defining ' \
+          'another preprocess block overrides the previously one.'
+      end
+
       @rules_collection.preprocessor = block
     end
 
@@ -60,9 +65,9 @@ module Nanoc
     #     compile '/bar/', :rep => :raw do
     #       # do nothing
     #     end
-    def compile(identifier, params={}, &block)
+    def compile(identifier, params = {}, &block)
       # Require block
-      raise ArgumentError.new("#compile requires a block") unless block_given?
+      raise ArgumentError.new('#compile requires a block') unless block_given?
 
       # Get rep name
       rep_name = params[:rep] || :default
@@ -104,9 +109,9 @@ module Nanoc
     #     route '/bar/', :rep => :raw do
     #       '/raw' + item.identifier + 'index.txt'
     #     end
-    def route(identifier, params={}, &block)
+    def route(identifier, params = {}, &block)
       # Require block
-      raise ArgumentError.new("#route requires a block") unless block_given?
+      raise ArgumentError.new('#route requires a block') unless block_given?
 
       # Get rep name
       rep_name      = params[:rep] || :default
@@ -141,7 +146,7 @@ module Nanoc
     # @example Using custom filter arguments for a layout
     #
     #     layout '/custom/',  :haml, :format => :html5
-    def layout(identifier, filter_name, params={})
+    def layout(identifier, filter_name, params = {})
       @rules_collection.layout_filter_mapping[identifier_to_regex(identifier)] = [ filter_name, params ]
     end
 
@@ -170,15 +175,15 @@ module Nanoc
     # @example Copying the `:raw` rep of the `/bar/` item as-is
     #
     #     passthrough '/bar/', :rep => :raw
-    def passthrough(identifier, params={})
+    def passthrough(identifier, params = {})
       # Require no block
-      raise ArgumentError.new("#passthrough does not require a block") if block_given?
+      raise ArgumentError.new('#passthrough does not require a block') if block_given?
 
       # Get rep name
       rep_name = params[:rep] || :default
 
       # Create compilation rule
-      compilation_block = proc { }
+      compilation_block = proc {}
       compilation_rule = Rule.new(identifier_to_regex(identifier), rep_name, compilation_block)
       @rules_collection.add_item_compilation_rule(compilation_rule)
 
@@ -213,15 +218,15 @@ module Nanoc
     # @example Suppressing compilation and output for all all `/foo/*` items.
     #
     #     ignore '/foo/*'
-    def ignore(identifier, params={})
-      raise ArgumentError.new("#ignore does not require a block") if block_given?
+    def ignore(identifier, params = {})
+      raise ArgumentError.new('#ignore does not require a block') if block_given?
 
       rep_name = params[:rep] || :default
 
-      compilation_rule = Rule.new(identifier_to_regex(identifier), rep_name, proc { })
+      compilation_rule = Rule.new(identifier_to_regex(identifier), rep_name, proc {})
       @rules_collection.add_item_compilation_rule(compilation_rule)
 
-      routing_rule = Rule.new(identifier_to_regex(identifier), rep_name, proc { }, :snapshot_name => :last)
+      routing_rule = Rule.new(identifier_to_regex(identifier), rep_name, proc {}, :snapshot_name => :last)
       @rules_collection.add_item_routing_rule(routing_rule)
     end
 
@@ -241,7 +246,7 @@ module Nanoc
       filename = [ "#{name}", "#{name}.rb", "./#{name}", "./#{name}.rb" ].find { |f| File.file?(f) }
       raise Nanoc::Errors::NoRulesFileFound.new if filename.nil?
 
-      self.instance_eval(File.read(filename), filename)
+      instance_eval(File.read(filename), filename)
     end
 
   private
@@ -254,8 +259,8 @@ module Nanoc
       if identifier.is_a? String
         # Add leading/trailing slashes if necessary
         new_identifier = identifier.dup
-        new_identifier[/^/] = '/' if identifier[0,1] != '/'
-        new_identifier[/$/] = '/' unless [ '*', '/' ].include?(identifier[-1,1])
+        new_identifier[/^/] = '/' if identifier[0, 1] != '/'
+        new_identifier[/$/] = '/' unless [ '*', '/' ].include?(identifier[-1, 1])
 
         /^#{new_identifier.gsub('*', '(.*?)').gsub('+', '(.+?)')}$/
       else

data/lib/nanoc/base/compilation/dependency_tracker.rb

@@ -55,7 +55,7 @@ module Nanoc
       Nanoc::NotificationCenter.on(:visit_started, self) do |obj|
         if !@stack.empty?
           Nanoc::NotificationCenter.post(:dependency_created, @stack.last, obj)
-          self.record_dependency(@stack.last, obj)
+          record_dependency(@stack.last, obj)
         end
         @stack.push(obj)
       end
@@ -72,7 +72,7 @@ module Nanoc
     def stop
       # Sanity check
       if !@stack.empty?
-        raise "Internal inconsistency: dependency tracker stack not empty at end of compilation"
+        raise 'Internal inconsistency: dependency tracker stack not empty at end of compilation'
       end
 
       # Unregister
@@ -159,12 +159,12 @@ module Nanoc
 
     # @deprecated Use {#store} instead
     def store_graph
-      self.store
+      store
     end
 
     # @deprecated Use {#load} instead
     def load_graph
-      self.load
+      load
     end
 
     # @see Nanoc::Store#unload