nanoc 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d4a414bdd518ff5a609bef5e8fdebe476ab1fc
-  data.tar.gz: 3155b99958dcda234715e583c1a87cb9d6c2dc7e
+  metadata.gz: d4aaeac805ae4631f3075442c8fa2382ae42085a
+  data.tar.gz: d7b42a8044e1ff67765bb93383e1951963cc2593
 SHA512:
-  metadata.gz: 6d9d6387aa77fd9dc6e3e0b9c35e7b52722a2273011b31cb2874879ebad7bdab958f7ce44b349c489226896a09f73f6c99c3b43fad8a9487f0bb81c0489cd9e8
-  data.tar.gz: c69890e971f56e7c504d2741d30bd1c7f741b1f13a1106378d05f101c2a2fe44f8d00abb25dd257f3841b47c3a7d623b86cc7604a040f557922550149a807b6d
+  metadata.gz: eb371cfa1c4843698736980aac9b42a914732bc8e04c6af2e022548aa220c9071ff05223b47e83cf547af07d586ceffb264648aa6deec7fe232fcc852939c9c7
+  data.tar.gz: 4e55855d72a97dfc6bc7eaeb620e6139e9a5254ca68ab727a61244e7883f7bebd506ceb39addba87a078c47c439dcc510581cd5f5262235e3c0834876ffd4407

data/Gemfile

@@ -41,7 +41,7 @@ gem 'redcarpet', platforms: [:ruby, :mswin]
 gem 'RedCloth'
 gem 'rouge'
 gem 'rspec'
-gem 'rubocop', '~> 0.31.0'
+gem 'rubocop'
 gem 'rubypants'
 gem 'sass', '~> 3.2.2'
 gem 'simplecov', require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.0.0)
+    nanoc (4.0.1)
       cri (~> 2.3)
 
 GEM
@@ -22,19 +22,20 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
+    coffee-script-source (1.10.0)
     colored (1.2)
     commonjs (0.2.7)
     compass (0.12.7)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
-    coveralls (0.8.3)
+    coveralls (0.8.9)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
+      tins (~> 1.6.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     cri (2.7.0)
@@ -49,15 +50,15 @@ GEM
     ffi (1.9.10)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.35.0)
-      fog-aliyun
+    fog (1.36.0)
+      fog-aliyun (>= 0.1.0)
       fog-atmos
       fog-aws (>= 0.6.0)
       fog-brightbox (~> 0.4)
       fog-core (~> 1.32)
       fog-dynect (~> 0.0.2)
       fog-ecloud (~> 0.1)
-      fog-google (>= 0.1.1)
+      fog-google (<= 0.1.0)
       fog-json
       fog-local
       fog-powerdns (>= 0.1.1)
@@ -74,7 +75,7 @@ GEM
       fog-xenserver
       fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
-      nokogiri
+      nokogiri (~> 1.5, >= 1.5.11)
     fog-aliyun (0.1.0)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
@@ -92,13 +93,10 @@ GEM
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.32.1)
+    fog-core (1.35.0)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
-      mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
     fog-dynect (0.0.2)
       fog-core
       fog-json
@@ -106,7 +104,7 @@ GEM
     fog-ecloud (0.3.0)
       fog-core
       fog-xml
-    fog-google (0.1.1)
+    fog-google (0.1.0)
       fog-core
       fog-json
       fog-xml
@@ -131,7 +129,7 @@ GEM
       fog-core
       fog-json
       fog-xml
-    fog-sakuracloud (1.3.3)
+    fog-sakuracloud (1.4.0)
       fog-core
       fog-json
     fog-serverlove (0.1.2)
@@ -176,7 +174,7 @@ GEM
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.13)
-    listen (3.0.4)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     markaby (0.8.0)
@@ -184,18 +182,15 @@ GEM
     maruku (0.7.2)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.6.2)
+    mime-types (2.99)
     mini_portile (0.6.2)
-    minitest (5.8.2)
+    minitest (5.8.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.2)
     mustache (1.0.2)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (3.0.1)
     netrc (0.11.0)
-    nokogiri (1.6.6.2)
+    nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
     pandoc-ruby (1.0.0)
     parser (2.2.3.0)
@@ -225,25 +220,26 @@ GEM
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rouge (1.10.1)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.31.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rubocop (0.35.1)
       astrolabe (~> 1.3)
-      parser (>= 2.2.2.1, < 3.0)
+      parser (>= 2.2.3.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
+      ruby-progressbar (~> 1.7)
+      tins (<= 1.6.0)
     ruby-progressbar (1.7.5)
     rubypants (0.2.0)
     safe_yaml (1.0.4)
@@ -326,7 +322,7 @@ DEPENDENCIES
   redcarpet
   rouge
   rspec
-  rubocop (~> 0.31.0)
+  rubocop
   rubypants
   sass (~> 3.2.2)
   simplecov

data/NEWS.md

@@ -1,5 +1,16 @@
 # Nanoc news
 
+## 4.0.1 (2015-11-28)
+
+Fixes:
+
+* Fixed params documentation for :rdiscount filter (#722)
+* Fixed crash when comparing item rep views (#735, #738)
+
+Enhancements:
+
+* Lowered minimum required Ruby version from 2.2 to 2.1 (#732)
+
 ## 4.0.0 (2015-11-07)
 
 Enhancements:

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

@@ -275,7 +275,7 @@ module Nanoc::Int
       end
 
       # TODO: Do not expose @site (necessary for captures store though…)
-      content_or_filename_assigns.merge({
+      content_or_filename_assigns.merge(
         item: Nanoc::ItemView.new(rep.item),
         rep: Nanoc::ItemRepView.new(rep),
         item_rep: Nanoc::ItemRepView.new(rep),
@@ -283,7 +283,7 @@ module Nanoc::Int
         layouts: Nanoc::LayoutCollectionView.new(site.layouts),
         config: Nanoc::ConfigView.new(site.config),
         site: Nanoc::SiteView.new(site),
-      })
+      )
     end
 
     # @return [Nanoc::Int::OutdatednessChecker] The outdatedness checker
@@ -291,7 +291,8 @@ module Nanoc::Int
       Nanoc::Int::OutdatednessChecker.new(
         site: @site,
         checksum_store: checksum_store,
-        dependency_tracker: dependency_tracker)
+        dependency_tracker: dependency_tracker,
+      )
     end
     memoize :outdatedness_checker
 
@@ -325,7 +326,7 @@ module Nanoc::Int
 
       # Listen to processing start/stop
       Nanoc::Int::NotificationCenter.on(:processing_started, self) { |obj| @stack.push(obj) }
-      Nanoc::Int::NotificationCenter.on(:processing_ended,   self) { |_obj| @stack.pop       }
+      Nanoc::Int::NotificationCenter.on(:processing_ended,   self) { |_obj| @stack.pop }
 
       # Assign snapshots
       reps.each do |rep|
@@ -402,7 +403,7 @@ module Nanoc::Int
       Nanoc::Int::NotificationCenter.post(:compilation_failed, rep, e)
       raise e
     ensure
-      Nanoc::Int::NotificationCenter.post(:visit_ended,       rep.item)
+      Nanoc::Int::NotificationCenter.post(:visit_ended, rep.item)
     end
 
     # Clears the list of dependencies for items that will be recompiled.
@@ -421,11 +422,11 @@ module Nanoc::Int
 
     # Returns a preprocessor context, creating one if none exists yet.
     def preprocessor_context
-      Nanoc::Int::Context.new({
+      Nanoc::Int::Context.new(
         config: Nanoc::MutableConfigView.new(@site.config),
         items: Nanoc::MutableItemCollectionView.new(@site.items),
         layouts: Nanoc::MutableLayoutCollectionView.new(@site.layouts),
-      })
+      )
     end
     memoize :preprocessor_context
 

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

@@ -266,8 +266,10 @@ module Nanoc::Int
       when 'legacy'
         Nanoc::Int::Pattern.from(identifier_to_regex(arg))
       else
-        raise Nanoc::Int::Errors::GenericTrivial,
-          "Invalid string_pattern_type: #{@config[:string_pattern_type]}"
+        raise(
+          Nanoc::Int::Errors::GenericTrivial,
+          "Invalid string_pattern_type: #{@config[:string_pattern_type]}",
+        )
       end
     end
 

data/lib/nanoc/base/entities/document.rb

@@ -44,13 +44,10 @@ module Nanoc
         self.class.hash ^ identifier.hash
       end
 
-      def eql?(other)
-        self.class == other.class && identifier == other.identifier
-      end
-
       def ==(other)
-        self.eql?(other)
+        other.respond_to?(:identifier) && identifier == other.identifier
       end
+      alias_method :eql?, :==
     end
   end
 end

data/lib/nanoc/base/entities/identifier.rb

@@ -65,7 +65,12 @@ module Nanoc
     end
 
     def ==(other)
-      to_s == other.to_s
+      case other
+      when Nanoc::Identifier, String
+        to_s == other.to_s
+      else
+        false
+      end
     end
     alias_method :eql?, :==
 

data/lib/nanoc/base/views/item_rep_view.rb

@@ -12,7 +12,7 @@ module Nanoc
 
     # @see Object#==
     def ==(other)
-      item.identifier == other.item.identifier && name == other.name
+      other.respond_to?(:item) && other.respond_to?(:name) && item == other.item && name == other.name
     end
     alias_method :eql?, :==
 

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

@@ -39,8 +39,10 @@ module Nanoc::CLI::Commands
 
     def validate_options_and_arguments
       if arguments.empty? && !options[:all] && !options[:deploy] && !options[:list]
-        raise Nanoc::Int::Errors::GenericTrivial,
-          'nothing to do (pass either --all, --deploy or --list or a list of checks)'
+        raise(
+          Nanoc::Int::Errors::GenericTrivial,
+          'nothing to do (pass either --all, --deploy or --list or a list of checks)',
+        )
       end
     end
   end

data/lib/nanoc/cli/commands/create-site.rb

@@ -290,9 +290,11 @@ EOS
 
       # Check whether site exists
       if File.exist?(path) && (!File.directory?(path) || !(Dir.entries(path) - %w(. ..)).empty?) && !options[:force]
-        raise Nanoc::Int::Errors::GenericTrivial,
+        raise(
+          Nanoc::Int::Errors::GenericTrivial,
           "The site was not created because '#{path}' already exists. " \
-          'Re-run the command using --force to create the site anyway.'
+          'Re-run the command using --force to create the site anyway.',
+        )
       end
 
       # Setup notifications

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

@@ -4,11 +4,11 @@ description "
 Deploys the compiled site. The compiled site contents in the output directory will be uploaded to the destination, which is specified using the `--target` option.
 "
 
-option :t, :target,           'specify the location to deploy to (default: `default`)', argument: :required
+option :t, :target,         'specify the location to deploy to (default: `default`)', argument: :required
 flag :C, :'no-check',       'do not run the issue checks marked for deployment'
 flag :L, :list,             'list available locations to deploy to'
 flag :D, :'list-deployers', 'list available deployers'
-option :n, :'dry-run',        'show what would be deployed'
+option :n, :'dry-run',      'show what would be deployed'
 
 module Nanoc::CLI::Commands
   class Deploy < ::Nanoc::CLI::CommandRunner

data/lib/nanoc/cli/commands/show-plugins.rb

@@ -17,7 +17,7 @@ module Nanoc::CLI::Commands
       # Get list of plugins (before and after)
       plugins_before = Nanoc::Int::PluginRegistry.instance.all
       site.code_snippets if site
-      plugins_after  = Nanoc::Int::PluginRegistry.instance.all
+      plugins_after = Nanoc::Int::PluginRegistry.instance.all
 
       # Divide list of plugins into builtin and custom
       plugins_builtin = plugins_before
@@ -32,7 +32,7 @@ module Nanoc::CLI::Commands
       PLUGIN_CLASS_ORDER.each do |superclass|
         plugins_with_this_superclass = {
           builtin: plugins_builtin.select { |p| p[:superclass] == superclass },
-          custom: plugins_custom.select  { |p| p[:superclass] == superclass },
+          custom: plugins_custom.select { |p| p[:superclass] == superclass },
         }
 
         # Print kind

data/lib/nanoc/cli/error_handler.rb

@@ -135,12 +135,12 @@ module Nanoc::CLI
       write_error_message(stream, error, verbose: true)
       write_compilation_stack(stream, error, verbose: true)
       write_stack_trace(stream, error, verbose: true)
-      write_version_information(stream,        verbose: true)
-      write_system_information(stream,        verbose: true)
-      write_installed_gems(stream,        verbose: true)
-      write_environment(stream,        verbose: true)
-      write_gemfile_lock(stream,        verbose: true)
-      write_load_paths(stream,        verbose: true)
+      write_version_information(stream, verbose: true)
+      write_system_information(stream, verbose: true)
+      write_installed_gems(stream, verbose: true)
+      write_environment(stream, verbose: true)
+      write_gemfile_lock(stream, verbose: true)
+      write_load_paths(stream, verbose: true)
     end
 
     protected

data/lib/nanoc/cli/logger.rb

@@ -41,12 +41,15 @@ module Nanoc::CLI
     def file(level, action, name, duration = nil)
       log(
         level,
-        format('%s%12s%s  %s%s',
+        format(
+          '%s%12s%s  %s%s',
           ACTION_COLORS[action.to_sym],
           action,
           "\e[0m",
           duration.nil? ? '' : format('[%2.2fs]  ', duration),
-          name))
+          name,
+        )
+      )
     end
 
     # Logs a message.

data/lib/nanoc/data_sources/filesystem.rb

@@ -297,7 +297,7 @@ module Nanoc::DataSources
       end
 
       # Remove UTF-8 BOM (ugly)
-      data.gsub!("\xEF\xBB\xBF", '')
+      data.delete!("\xEF\xBB\xBF")
 
       data
     end

data/lib/nanoc/extra/checking/checks/internal_links.rb

@@ -65,7 +65,7 @@ module Nanoc::Extra::Checking::Checks
     end
 
     def excluded?(href)
-      excludes =  @config.fetch(:checks, {}).fetch(:internal_links, {}).fetch(:exclude, [])
+      excludes = @config.fetch(:checks, {}).fetch(:internal_links, {}).fetch(:exclude, [])
       excludes.any? { |pattern| Regexp.new(pattern).match(href) }
     end
   end

data/lib/nanoc/extra/deployers/fog.rb

@@ -69,7 +69,7 @@ module Nanoc::Extra::Deployers
         truncated = set.is_truncated
         files += set
       end
-      keys_to_destroy = files.all.map(&:key)
+      keys_to_destroy = files.map(&:key)
       keys_to_invalidate = []
       etags = read_etags(files)
 

data/lib/nanoc/extra/filesystem_tools.rb

@@ -100,8 +100,10 @@ module Nanoc::Extra
       when Array
         patterns.concat(extra_files.map { |extra_file| "#{dir_name}/#{extra_file}" })
       else
-        raise Nanoc::Int::Errors::GenericTrivial,
-          "Do not know how to handle extra_files: #{extra_files.inspect}"
+        raise(
+          Nanoc::Int::Errors::GenericTrivial,
+          "Do not know how to handle extra_files: #{extra_files.inspect}",
+        )
       end
       Dir.glob(patterns)
     end

data/lib/nanoc/filters/colorize_syntax.rb

@@ -243,9 +243,9 @@ module Nanoc::Filters
     end
 
     SIMON_HIGHLIGHT_OPT_MAP = {
-        wrap: '-W',
-        include_style: '-I',
-        line_numbers: '-l',
+      wrap: '-W',
+      include_style: '-I',
+      line_numbers: '-l',
     }
 
     # Runs the content through [Highlight](http://www.andre-simon.de/doku/highlight/en/highlight.html).

data/lib/nanoc/filters/rdiscount.rb

@@ -5,7 +5,7 @@ module Nanoc::Filters
 
     # Runs the content through [RDiscount](http://github.com/rtomayko/rdiscount).
     #
-    # @option params [Array] :symbol ([]) A list of RDiscount extensions
+    # @option params [Array] :extensions ([]) A list of RDiscount extensions
     #
     # @param [String] content The content to filter
     #

data/lib/nanoc/filters/sass.rb

@@ -10,10 +10,10 @@ module Nanoc::Filters
     #
     # @return [String] The filtered content
     def run(content, params = {})
-      options = params.merge({
+      options = params.merge(
         nanoc_current_filter: self,
         filename: @item && @item.raw_filename,
-      })
+      )
       engine = ::Sass::Engine.new(content, options)
       engine.render
     end

data/lib/nanoc/filters/slim.rb

@@ -13,7 +13,7 @@ module Nanoc::Filters
     # @return [String] The filtered content
     def run(content, params = {})
       params = {
-        disable_capture: true,      # Capture managed by Nanoc
+        disable_capture: true, # Capture managed by Nanoc
         buffer: '_erbout', # Force slim to output to the buffer used by Nanoc
       }.merge params
 

data/lib/nanoc/helpers/link_to.rb

@@ -128,11 +128,11 @@ module Nanoc::Helpers
       end
 
       # Get source and destination paths
-      dst_path   = Pathname.new(path)
+      dst_path = Pathname.new(path)
       if @item_rep.path.nil?
         raise "Cannot get the relative path to #{path} because the current item representation, #{@item_rep.inspect}, is not outputted (its routing rule returns nil)"
       end
-      src_path   = Pathname.new(@item_rep.path)
+      src_path = Pathname.new(@item_rep.path)
 
       # Calculate the relative path (method depends on whether destination is
       # a directory or not).

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

data/tasks/rubocop.rake

@@ -2,5 +2,5 @@ require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new(:rubocop) do |task|
   task.options  = %w( --display-cop-names --format simple )
-  task.patterns = ['lib/**/*.rb']
+  task.patterns = ['bin/nanoc', 'lib/**/*.rb', 'spec/**/*.rb', 'test/**/*.rb']
 end

data/test/base/test_directed_graph.rb

@@ -4,7 +4,7 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
 
-    assert_equal [],    graph.direct_predecessors_of(1)
+    assert_equal [], graph.direct_predecessors_of(1)
     assert_equal [1], graph.direct_predecessors_of(2)
     assert_equal [2], graph.direct_predecessors_of(3)
   end
@@ -14,7 +14,7 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
     graph.add_edge(1, 2)
     graph.add_edge(2, 3)
 
-    assert_equal [],       graph.predecessors_of(1).sort
+    assert_equal [], graph.predecessors_of(1).sort
     assert_equal [1],    graph.predecessors_of(2).sort
     assert_equal [1, 2], graph.predecessors_of(3).sort
   end
@@ -26,7 +26,7 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
 
     assert_equal [2], graph.direct_successors_of(1)
     assert_equal [3], graph.direct_successors_of(2)
-    assert_equal [],    graph.direct_successors_of(3)
+    assert_equal [], graph.direct_successors_of(3)
   end
 
   def test_successors
@@ -36,7 +36,7 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
 
     assert_equal [2, 3], graph.successors_of(1).sort
     assert_equal [3],    graph.successors_of(2).sort
-    assert_equal [],       graph.successors_of(3).sort
+    assert_equal [], graph.successors_of(3).sort
   end
 
   def test_edges

data/test/base/test_outdatedness_checker.rb

@@ -40,8 +40,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::NotEnoughData,
-        outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::NotEnoughData, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 
@@ -66,8 +65,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::NotWritten,
-        outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::NotWritten, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 
@@ -93,8 +91,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/new/' }.reps[0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::SourceModified,
-        outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::SourceModified, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 
@@ -121,8 +118,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated,
-        outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 
@@ -155,8 +151,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/a/' }.reps[0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated,
-        outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 
@@ -192,8 +187,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/a/' }.reps[0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated,
-        outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 
@@ -226,8 +220,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/a/' }.reps[0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated,
-        outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 
@@ -262,8 +255,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/a/' }.reps[0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated,
-        outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::DependenciesOutdated, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 
@@ -289,8 +281,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::CodeSnippetsModified,
-        outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::CodeSnippetsModified, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 
@@ -321,8 +312,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::ConfigurationModified,
-        outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::ConfigurationModified, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 
@@ -389,8 +379,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       site.compiler.load
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.items.find { |i| i.identifier == '/' }.reps[0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::RulesModified,
-        outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::RulesModified, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 

data/test/cli/commands/test_compile.rb

@@ -121,8 +121,7 @@ class Nanoc::CLI::Commands::CompileTest < Nanoc::TestCase
       assert File.file?('output/stray.html')
       Nanoc::CLI.run %w( compile )
       refute File.file?('output/stray.html')
-      assert File.directory?('output/excluded_dir'),
-        'excluded_dir should still be there'
+      assert File.directory?('output/excluded_dir'), 'excluded_dir should still be there'
     end
   end
 

data/test/data_sources/test_filesystem.rb

@@ -449,7 +449,7 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     # Parse it
     result = data_source.instance_eval { parse('test.html', 'test.yaml', 'foobar') }
     assert_equal({ 'foo' => 'bar' }, result[0])
-    assert_equal('blah blah',       result[1])
+    assert_equal('blah blah', result[1])
   end
 
   def test_parse_internal_bad_metadata

data/test/data_sources/test_filesystem_unified.rb

@@ -41,12 +41,12 @@ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
     expected_out = [
       klass.new(
         'test 1',
-        { 'num' => 1, :filename => 'foo/bar.html',   :extension => 'html', mtime: File.mtime('foo/bar.html') },
+        { 'num' => 1, :filename => 'foo/bar.html', :extension => 'html', mtime: File.mtime('foo/bar.html') },
         '/bar/',
       ),
       klass.new(
         'test 2',
-        { 'num' => 2, :filename => 'foo/b.c.html',   :extension => 'c.html', mtime: File.mtime('foo/b.c.html') },
+        { 'num' => 2, :filename => 'foo/b.c.html', :extension => 'c.html', mtime: File.mtime('foo/b.c.html') },
         '/b/',
       ),
       klass.new(

data/test/extra/checking/checks/test_css.rb

@@ -32,8 +32,10 @@ class Nanoc::Extra::Checking::Checks::CSSTest < Nanoc::TestCase
         # Check
         refute check.issues.empty?
         assert_equal 1, check.issues.size
-        assert_equal 'line 1: Property coxlor doesn\'t exist: h1 { coxlor: rxed; }',
-          check.issues.to_a[0].description
+        assert_equal(
+          'line 1: Property coxlor doesn\'t exist: h1 { coxlor: rxed; }',
+          check.issues.to_a[0].description,
+        )
       end
     end
   end
@@ -53,8 +55,7 @@ class Nanoc::Extra::Checking::Checks::CSSTest < Nanoc::TestCase
         # Check
         refute check.issues.empty?
         assert_equal 1, check.issues.size
-        assert_equal 'line 1: Parse Error: h1 { ; {',
-          check.issues.to_a[0].description
+        assert_equal 'line 1: Parse Error: h1 { ; {', check.issues.to_a[0].description
       end
     end
   end

data/test/extra/checking/checks/test_stale.rb

@@ -6,7 +6,7 @@ class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
   def calc_issues
     site = Nanoc::Int::SiteLoader.new.new_from_cwd
     runner = Nanoc::Extra::Checking::Runner.new(site)
-    issues = runner.run_checks([check_class])
+    runner.run_checks([check_class])
   end
 
   def test_run_ok

data/test/filters/test_erb.rb

@@ -25,11 +25,11 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
     item_rep.expect(:name, :quux)
 
     # Create filter
-    filter = ::Nanoc::Filters::ERB.new({
+    filter = ::Nanoc::Filters::ERB.new(
       item: item,
       item_rep: item_rep,
       location: 'a cheap motel',
-    })
+    )
 
     # Run filter
     raised = false

data/test/filters/test_relativize_paths.rb

@@ -562,11 +562,12 @@ XML
 </foo>
 XML
 
-      actual_content = filter.setup_and_run(raw_content, {
+      options = {
         type: :xml,
         namespaces: { ex: 'http://example.org' },
         select: ['ex:a/@href'],
-      })
+      }
+      actual_content = filter.setup_and_run(raw_content, options)
 
       assert_match(/<foo xmlns="http:\/\/example.org">/,    actual_content)
       assert_match(/<bar><a href="..\/..">baz<\/a><\/bar>/, actual_content)

data/test/filters/test_xsl.rb

@@ -84,13 +84,9 @@ EOS
   def test_filter_as_layout
     if_have 'nokogiri' do
       # Create our data objects
-      item = Nanoc::Int::Item.new(SAMPLE_XML_IN,
-                             {},
-                             '/content/')
+      item = Nanoc::Int::Item.new(SAMPLE_XML_IN, {}, '/content/')
       item = Nanoc::ItemView.new(item)
-      layout = Nanoc::Int::Layout.new(SAMPLE_XSL,
-                                 {},
-                                 '/layout/')
+      layout = Nanoc::Int::Layout.new(SAMPLE_XSL, {}, '/layout/')
       layout = Nanoc::LayoutView.new(layout)
 
       # Create an instance of the filter
@@ -110,13 +106,9 @@ EOS
   def test_filter_with_params
     if_have 'nokogiri' do
       # Create our data objects
-      item = Nanoc::Int::Item.new(SAMPLE_XML_IN_WITH_PARAMS,
-                             {},
-                             '/content/')
+      item = Nanoc::Int::Item.new(SAMPLE_XML_IN_WITH_PARAMS, {}, '/content/')
       item = Nanoc::ItemView.new(item)
-      layout = Nanoc::Int::Layout.new(SAMPLE_XSL_WITH_PARAMS,
-                                 {},
-                                 '/layout/')
+      layout = Nanoc::Int::Layout.new(SAMPLE_XSL_WITH_PARAMS, {}, '/layout/')
       layout = Nanoc::LayoutView.new(layout)
 
       # Create an instance of the filter
@@ -137,13 +129,9 @@ EOS
   def test_filter_with_omit_xml_decl
     if_have 'nokogiri' do
       # Create our data objects
-      item = Nanoc::Int::Item.new(SAMPLE_XML_IN_WITH_OMIT_XML_DECL,
-                             {},
-                             '/content/')
+      item = Nanoc::Int::Item.new(SAMPLE_XML_IN_WITH_OMIT_XML_DECL, {}, '/content/')
       item = Nanoc::ItemView.new(item)
-      layout = Nanoc::Int::Layout.new(SAMPLE_XSL_WITH_OMIT_XML_DECL,
-                                 {},
-                                 '/layout/')
+      layout = Nanoc::Int::Layout.new(SAMPLE_XSL_WITH_OMIT_XML_DECL, {}, '/layout/')
       layout = Nanoc::LayoutView.new(layout)
 
       # Create an instance of the filter

data/test/helper.rb

@@ -199,22 +199,30 @@ EOS
         actual_out   = eval(pair.first, b)
         expected_out = eval(pair.last.match(/# ?=>(.*)/)[1], b)
 
-        assert_equal expected_out, actual_out,
-          "Incorrect example:\n#{pair.first}"
+        assert_equal(
+          expected_out,
+          actual_out,
+          "Incorrect example:\n#{pair.first}",
+        )
       end
     end
   end
 
   def assert_contains_exactly(expected, actual)
-    assert_equal expected.size, actual.size,
-      format('Expected %s to be of same size as %s', actual.inspect, expected.inspect)
+    assert_equal(
+      expected.size,
+      actual.size,
+      format('Expected %s to be of same size as %s', actual.inspect, expected.inspect),
+    )
     remaining = actual.dup.to_a
     expected.each do |e|
       index = remaining.index(e)
       remaining.delete_at(index) if index
     end
-    assert remaining.empty?,
-      format('Expected %s to contain all the elements of %s', actual.inspect, expected.inspect)
+    assert(
+      remaining.empty?,
+      format('Expected %s to contain all the elements of %s', actual.inspect, expected.inspect),
+    )
   end
 
   def assert_raises_frozen_error

data/test/helpers/test_blogging.rb

@@ -324,12 +324,12 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[1].expects(:compiled_content).with(snapshot: :pre).returns('asdf')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({
+      @config = Nanoc::ConfigView.new(
         author_name: 'Bob',
         author_uri: 'http://example.com/~bob/',
         title: 'My Blog Or Something',
         base_url: 'http://example.com',
-      })
+      )
 
       # Create feed item
       @item = mock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -353,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.