nanoc 4.7.5 → 4.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab8752a7ee706e88d3de7f0161673dd839a2edd2
-  data.tar.gz: 418c19a9d06ab842d45f5ece1b51d98eba42f9b6
+  metadata.gz: a40c3389c6ef42f0924566370507dfc3a2e361f8
+  data.tar.gz: '09906841a6aa6ba7dc5d4bdc06e5914a4678d274'
 SHA512:
-  metadata.gz: 051aa20802e5b97c886dc8b33051af32dac210a78efbae3a1f4595e6c181f49d2f7eda56e502f4d15323963ccf420f7e81a94040e3dac9e9e07ef83f37d56aa1
-  data.tar.gz: ef1423214832df499234d8320496f67a65f709f1d6eee68fa320b33c458598f921dfc38872e7cf1989e027d7269d7d82679a547c9375b1a0641ed6e88777a3ea
+  metadata.gz: 91221955a35dfd5786f068f6fca88f6c3d2ee06cc9ece04e85aedd769c5d66147aec8d37c663c1dcc2e208ce32c38d0939a78d1539dd963f3380fe427d76d854
+  data.tar.gz: 4ef5eac2bd6d99bbeb5c1276fa13dd498f7cf8e70cce12132945ff682cf90a02a8d11c459bb88300934fd1686f61c6c069a371c196ca51f605516c7454017c89

data/Gemfile

@@ -48,12 +48,13 @@ group :plugins do
   gem 'mime-types'
   gem 'mustache', '~> 1.0'
   gem 'nokogiri', '~> 1.6'
+  gem 'nokogumbo', '~> 1.4'
   gem 'pandoc-ruby'
-  gem 'pygments.rb', '~> 1.1', '>= 1.1.1', platforms: %i(ruby mswin)
+  gem 'pygments.rb', '~> 1.1', '>= 1.1.1', platforms: %i[ruby mswin]
   gem 'rack'
   gem 'rainpress'
-  gem 'rdiscount', '~> 2.2', platforms: %i(ruby mswin)
-  gem 'redcarpet', platforms: %i(ruby mswin)
+  gem 'rdiscount', '~> 2.2', platforms: %i[ruby mswin]
+  gem 'redcarpet', platforms: %i[ruby mswin]
   gem 'RedCloth', platforms: :ruby
   gem 'rouge'
   gem 'rubypants'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 GIT
   remote: https://github.com/bbatsov/rubocop.git
-  revision: f0990436f0c766747bbd37b164f43b00fb2d9785
+  revision: cf07b9a493feed28577032c307ddab3cb7b8c2fc
   specs:
-    rubocop (0.48.0)
+    rubocop (0.48.1)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -12,8 +13,8 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.7.5)
-      cri (~> 2.3)
+    nanoc (4.7.6)
+      cri (~> 2.8)
       ddplugin (~> 1.0)
       hamster (~> 3.0)
       ref (~> 2.0)
@@ -68,7 +69,7 @@ GEM
       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    cri (2.7.1)
+    cri (2.8.0)
       colored (~> 1.2)
     ddplugin (1.0.1)
     diff-lcs (1.3)
@@ -196,7 +197,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.9.0)
+    fog-vsphere (1.9.1)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.3.0)
@@ -232,7 +233,7 @@ GEM
     hashdiff (0.3.2)
     inflecto (0.0.2)
     ipaddress (0.8.3)
-    json (2.0.3)
+    json (2.0.4)
     kramdown (1.13.2)
     less (2.6.0)
       commonjs (~> 0.2.7)
@@ -262,10 +263,13 @@ GEM
     nenv (0.3.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
+    nokogumbo (1.4.10)
+      nokogiri
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
     pandoc-ruby (2.0.1)
+    parallel (1.11.1)
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -274,7 +278,7 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
-    pygments.rb (1.1.1)
+    pygments.rb (1.1.2)
       multi_json (>= 1.0.0)
     rack (2.0.1)
     rainbow (2.2.1)
@@ -283,7 +287,7 @@ GEM
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rbvmomi (1.10.0)
+    rbvmomi (1.11.0)
       builder (~> 3.0)
       json (>= 1.8)
       nokogiri (~> 1.5)
@@ -325,7 +329,7 @@ GEM
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     temple (0.7.7)
-    term-ansicolor (1.5.0)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
@@ -337,15 +341,15 @@ GEM
     trollop (2.1.2)
     typogruby (1.0.18)
       rubypants
-    uglifier (3.1.12)
+    uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.2.1)
     url (0.3.2)
     vcr (3.0.3)
     w3c_validators (1.3.2)
       json (>= 1.8)
       nokogiri (~> 1.6)
-    webmock (2.3.2)
+    webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -392,6 +396,7 @@ DEPENDENCIES
   mustache (~> 1.0)
   nanoc!
   nokogiri (~> 1.6)
+  nokogumbo (~> 1.4)
   pandoc-ruby
   pry
   pygments.rb (~> 1.1, >= 1.1.1)

data/NEWS.md

@@ -1,10 +1,16 @@
 # Nanoc news
 
+## 4.7.6 (2017-04-15)
+
+Enhancements:
+
+* Added support for `:html5` in `relativize_paths` and `colorize_syntax` filters (#1153)
+
 ## 4.7.5 (2017-04-01)
 
 Fixes:
 
-* Recognize `--verbose` when calling `nanoc` without subcommand (#1145, #1146)
+* Made `--verbose` be recognised when calling `nanoc` without subcommand (#1145, #1146)
 
 Enhancements:
 

data/Rakefile

@@ -14,7 +14,7 @@ end
 
 RSpec::Core::RakeTask.new(:spec)
 
-task test: %i(spec test_all rubocop)
-task test_ci: %i(test coveralls:push)
+task test: %i[spec test_all rubocop]
+task test_ci: %i[test coveralls:push]
 
 task default: :test

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

@@ -3,6 +3,9 @@ module Nanoc::Int
     include Nanoc::Int::ContractsSupport
     include Enumerable
 
+    attr_reader :item_rep
+    attr_reader :actions
+
     def initialize(item_rep, actions: [])
       @item_rep = item_rep
       @actions = actions
@@ -71,18 +74,6 @@ module Nanoc::Int
       )
     end
 
-    def compact_snapshots
-      actions = []
-      @actions.each do |action|
-        if [actions.last, action].all? { |a| a.is_a?(Nanoc::Int::ProcessingActions::Snapshot) }
-          actions[-1] = actions.last.update(snapshot_names: action.snapshot_names, paths: action.paths)
-        else
-          actions << action
-        end
-      end
-      self.class.new(@item_rep, actions: actions)
-    end
-
     def snapshots_defs
       is_binary = @item_rep.item.content.binary?
       snapshot_defs = []

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

@@ -22,9 +22,9 @@ module Nanoc::Int
     # that lacks some options, the default value will be taken from
     # `DEFAULT_CONFIG`.
     DEFAULT_CONFIG = {
-      text_extensions: %w(adoc asciidoc atom css erb haml htm html js less markdown md php rb sass scss txt xhtml xml coffee hb handlebars mustache ms slim rdoc).sort,
-      lib_dirs: %w(lib),
-      commands_dirs: %w(commands),
+      text_extensions: %w[adoc asciidoc atom css erb haml htm html js less markdown md php rb sass scss txt xhtml xml coffee hb handlebars mustache ms slim rdoc].sort,
+      lib_dirs: %w[lib],
+      commands_dirs: %w[commands],
       output_dir: 'output',
       data_sources: [{}],
       index_filenames: ['index.html'],

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

@@ -81,10 +81,9 @@ module Nanoc::Int
     end
 
     contract C::Any => C::Maybe[C::RespondTo[:identifier]]
-    def get_memoized(arg)
+    memoized def get_memoized(arg)
       get_unmemoized(arg)
     end
-    memoize :get_memoized
 
     contract C::Any => C::IterOf[C::RespondTo[:identifier]]
     def find_all_unmemoized(arg)
@@ -93,10 +92,9 @@ module Nanoc::Int
     end
 
     contract C::Any => C::IterOf[C::RespondTo[:identifier]]
-    def find_all_memoized(arg)
+    memoized def find_all_memoized(arg)
       find_all_unmemoized(arg)
     end
-    memoize :find_all_memoized
 
     def object_with_identifier(identifier)
       if frozen?

data/lib/nanoc/base/memoization.rb

@@ -75,5 +75,6 @@ module Nanoc::Int
         end
       end
     end
+    alias memoized memoize
   end
 end

data/lib/nanoc/base/repos/config_loader.rb

@@ -26,7 +26,7 @@ module Nanoc::Int
 
     # @return [String]
     def self.config_filename_for_cwd
-      filenames = %w(nanoc.yaml config.yaml)
+      filenames = %w[nanoc.yaml config.yaml]
       candidate = filenames.find { |f| File.file?(f) }
       candidate && File.expand_path(candidate)
     end

data/lib/nanoc/base/services/compilation_context.rb

@@ -13,11 +13,11 @@ module Nanoc::Int
     end
 
     def filter_name_and_args_for_layout(layout)
-      mem = @action_provider.action_sequence_for(layout)
-      if mem.nil? || mem.size != 1 || !mem[0].is_a?(Nanoc::Int::ProcessingActions::Filter)
+      seq = @action_provider.action_sequence_for(layout)
+      if seq.nil? || seq.size != 1 || !seq[0].is_a?(Nanoc::Int::ProcessingActions::Filter)
         raise Nanoc::Int::Errors::UndefinedFilterForLayout.new(layout)
       end
-      [mem[0].filter_name, mem[0].params]
+      [seq[0].filter_name, seq[0].params]
     end
 
     def create_view_context(dependency_tracker)

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

@@ -93,11 +93,10 @@ module Nanoc::Int
     private
 
     def run_stage(stage, *args)
-      name = stage.class.to_s
-      Nanoc::Int::NotificationCenter.post(:stage_started, name)
+      Nanoc::Int::NotificationCenter.post(:stage_started, stage.class)
       stage.run(*args)
     ensure
-      Nanoc::Int::NotificationCenter.post(:stage_ended, name)
+      Nanoc::Int::NotificationCenter.post(:stage_ended, stage.class)
     end
 
     def preprocess_stage

data/lib/nanoc/base/services/compiler/stages/cleanup.rb

@@ -26,7 +26,7 @@ module Nanoc::Int::Compiler::Stages
     end
 
     def cleanup_old_stores
-      %w(checksums compiled_content dependencies outdatedness action_sequence).each do |fn|
+      %w[checksums compiled_content dependencies outdatedness action_sequence].each do |fn|
         full_fn = File.join('tmp', fn)
         if File.file?(full_fn)
           FileUtils.rm_f(full_fn)

data/lib/nanoc/base/services/filter.rb

@@ -27,14 +27,6 @@ module Nanoc
     # @api private
     TMP_BINARY_ITEMS_DIR = 'binary_items'.freeze
 
-    # A hash containing variables that will be made available during
-    # filtering.
-    #
-    # @return [Hash]
-    #
-    # @api private
-    attr_reader :assigns
-
     extend DDPlugin::Plugin
 
     class << self
@@ -196,10 +188,10 @@ module Nanoc
     #
     # @api private
     def filename
-      if assigns[:layout]
-        "layout #{assigns[:layout].identifier}"
-      elsif assigns[:item]
-        "item #{assigns[:item].identifier} (rep #{assigns[:item_rep].name})"
+      if @layout
+        "layout #{@layout.identifier}"
+      elsif @item
+        "item #{@item.identifier} (rep #{@item_rep.name})"
       else
         '?'
       end

data/lib/nanoc/base/services/item_rep_router.rb

@@ -36,9 +36,9 @@ module Nanoc::Int
           route_rep(rep, paths, snapshot_names, {})
         end
 
-        mem = @action_provider.action_sequence_for(rep)
-        action_sequences[rep] = mem
-        mem.paths.each do |(snapshot_names, paths)|
+        seq = @action_provider.action_sequence_for(rep)
+        action_sequences[rep] = seq
+        seq.paths.each do |(snapshot_names, paths)|
           route_rep(rep, paths, snapshot_names, assigned_paths)
         end
 

data/lib/nanoc/base/services/outdatedness_checker.rb

@@ -37,7 +37,7 @@ module Nanoc::Int
       end
 
       contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] => C::Maybe[OutdatednessStatus]
-      def outdatedness_status_for(obj)
+      memoized def outdatedness_status_for(obj)
         case obj
         when Nanoc::Int::ItemRep
           apply_rules(RULES_FOR_ITEM_REP, obj)
@@ -49,7 +49,6 @@ module Nanoc::Int
           raise Nanoc::Int::Errors::InternalInconsistency, "do not know how to check outdatedness of #{obj.inspect}"
         end
       end
-      memoize :outdatedness_status_for
 
       private
 

data/lib/nanoc/base/services/outdatedness_rules/attributes_modified.rb

@@ -7,7 +7,7 @@ module Nanoc::Int::OutdatednessRules
     affects_props :attributes, :compiled_content
 
     contract C::Or[Nanoc::Int::ItemRep, Nanoc::Int::Item, Nanoc::Int::Layout], C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Int::OutdatednessReasons::Generic]
-    def apply(obj, outdatedness_checker)
+    memoized def apply(obj, outdatedness_checker)
       case obj
       when Nanoc::Int::ItemRep
         apply(obj.item, outdatedness_checker)
@@ -29,6 +29,5 @@ module Nanoc::Int::OutdatednessRules
         raise ArgumentError
       end
     end
-    memoize :apply
   end
 end

data/lib/nanoc/base/services/outdatedness_rules/code_snippets_modified.rb

@@ -14,13 +14,12 @@ module Nanoc::Int::OutdatednessRules
 
     private
 
-    def any_snippets_modified?(outdatedness_checker)
+    memoized def any_snippets_modified?(outdatedness_checker)
       outdatedness_checker.site.code_snippets.any? do |cs|
         ch_old = outdatedness_checker.checksum_store[cs]
         ch_new = Nanoc::Int::Checksummer.calc(cs)
         ch_old != ch_new
       end
     end
-    memoize :any_snippets_modified?
   end
 end

data/lib/nanoc/base/services/outdatedness_rules/configuration_modified.rb

@@ -12,12 +12,11 @@ module Nanoc::Int::OutdatednessRules
 
     private
 
-    def config_modified?(outdatedness_checker)
+    memoized def config_modified?(outdatedness_checker)
       obj = outdatedness_checker.site.config
       ch_old = outdatedness_checker.checksum_store[obj]
       ch_new = Nanoc::Int::Checksummer.calc(obj)
       ch_old != ch_new
     end
-    memoize :config_modified?
   end
 end

data/lib/nanoc/base/services/outdatedness_rules/paths_modified.rb

@@ -5,12 +5,12 @@ module Nanoc::Int::OutdatednessRules
     def apply(obj, outdatedness_checker)
       # FIXME: Prefer to not work on serialised version
 
-      mem_old = outdatedness_checker.action_sequence_store[obj]
-      mem_new = outdatedness_checker.action_sequence_for(obj).serialize
-      return true if mem_old.nil?
+      seq_old = outdatedness_checker.action_sequence_store[obj]
+      seq_new = outdatedness_checker.action_sequence_for(obj).serialize
+      return true if seq_old.nil?
 
-      paths_old = mem_old.select { |pa| pa[0] == :snapshot }
-      paths_new = mem_new.select { |pa| pa[0] == :snapshot }
+      paths_old = seq_old.select { |pa| pa[0] == :snapshot }
+      paths_new = seq_new.select { |pa| pa[0] == :snapshot }
 
       if paths_old != paths_new
         Nanoc::Int::OutdatednessReasons::PathsModified

data/lib/nanoc/base/services/outdatedness_rules/rules_modified.rb

@@ -3,9 +3,9 @@ module Nanoc::Int::OutdatednessRules
     affects_props :compiled_content, :path
 
     def apply(obj, outdatedness_checker)
-      mem_old = outdatedness_checker.action_sequence_store[obj]
-      mem_new = outdatedness_checker.action_sequence_for(obj).serialize
-      unless mem_old.eql?(mem_new)
+      seq_old = outdatedness_checker.action_sequence_store[obj]
+      seq_new = outdatedness_checker.action_sequence_for(obj).serialize
+      unless seq_old.eql?(seq_new)
         Nanoc::Int::OutdatednessReasons::RulesModified
       end
     end