nanoc 4.8.5 → 4.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cafd3c0aac9622344c7d94be09957d8b616426a2
-  data.tar.gz: 1f239f61b0329e35bd5cb56bce1f6fe762898926
+  metadata.gz: 6d488b6ffac3f6bdcd6e411cb5d84625842b373c
+  data.tar.gz: 0c5c0e6bf848cf835f89cb36919059ac5e5486a4
 SHA512:
-  metadata.gz: ae453f24b6d9a652a8a9c9499bc121ac3bc056f0947713b83e43e62ea413e32ae1415a0897f3ccf982c38c9deaf77a15999918f0e7337ecdfa48150fcb77338f
-  data.tar.gz: b1ab390568886eaf34ce69704be75396f34f32859fa50fa073dac06d46ef2ca2171d4dd31f6acc2e3d6770e491ede4e4a62ecfafcabeb4ec10cfb0e40afe9554
+  metadata.gz: 83b4a5c841d3a75d164372d26577efb52075a9a5a1fed0f8de70741db075087a9808b15758f1603267bf41053aa26a0304f915e8028141f9decbd80846dd250a
+  data.tar.gz: 4f1570f8ebdba18d4acccd1b8775fed99138d1536a7a1851eef55be082bb009dda31173fb68fac93489727946556d61104a4c9047e3471ceae577bebb8e2f724

data/.rubocop.yml

@@ -5,22 +5,9 @@ AllCops:
   DisplayCopNames: true
 
 # We use filenames such as “create-site.rb” that translate to method names.
-FileName:
+Naming/FileName:
   Exclude:
     - 'lib/nanoc/cli/commands/*.rb'
-    - 'Appraisals'
-
-# A common pattern in tests is to define anonymous classes in which methods are defined, which trips
-# up Rubocop’s nested method definition cop.
-Lint/NestedMethodDefinition:
-  Exclude:
-    - 'test/**/*.rb'
-    - 'spec/**/*.rb'
-
-# This is used in tests, to verify the effect of state-changing functions.
-Style/GlobalVars:
-  Exclude:
-    - 'test/**/*.rb'
 
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: comma
@@ -28,40 +15,47 @@ Style/TrailingCommaInArguments:
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma
 
+Layout/IndentArray:
+  EnforcedStyle: consistent
+
+
+
+# ----- CONFIGURED (exceptions for tests) -----
+
+# This breaks RSpec on occasion, e.g. `expect { subject }.not_to change { foo }`,
+# and generally does not provide useful warnings
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - 'spec/**/*.rb'
+
 # `rescue nil` is useful in specs where the exception is not important, but
 # the size effects are.
 Style/RescueModifier:
   Exclude:
     - 'spec/**/*.rb'
 
-Layout/IndentArray:
-  EnforcedStyle: consistent
-
-Lint/DuplicateMethods:
+# A common pattern in tests is to define anonymous classes in which methods are defined, which trips
+# up Rubocop’s nested method definition cop.
+Lint/NestedMethodDefinition:
   Exclude:
-    - 'test/data_sources/test_filesystem.rb'
-    - 'spec/spec_helper.rb'
+    - 'test/**/*.rb'
+    - 'spec/**/*.rb'
 
-# This needs to be fixed in Ruby 2.4.
-Lint/UnifiedInteger:
-  Enabled: false
+# This is used in tests, to verify the effect of state-changing functions.
+Style/GlobalVars:
+  Exclude:
+    - 'test/**/*.rb'
 
-Layout/IndentHeredoc:
-  EnforcedStyle: squiggly
 
-# This breaks RSpec on occasion, e.g. `expect { subject }.not_to change { foo }`,
-# and generally does not provide useful warnings
-Lint/AmbiguousBlockAssociation:
-  Enabled: false
 
 # ----- TO ENABLE LATER -----
 
 # Valid cops, but fixing the offenses they report is non-trivial.
 
-RegexpLiteral:
+Style/RegexpLiteral:
   Enabled: false
 
-ClassAndModuleChildren:
+Style/ClassAndModuleChildren:
   Enabled: false
 
 Style/EmptyElse:
@@ -70,12 +64,11 @@ Style/EmptyElse:
 Style/Next:
   Enabled: false
 
+# This cop is broken (#4731, #4745)
+Style/SafeNavigation:
+  Enabled: false
 
-
-# ----- DISABLED (hard) -----
-
-# Rubocop trips up on this.
-Layout/LeadingCommentSpace:
+Naming/HeredocDelimiterNaming:
   Enabled: false
 
 
@@ -98,6 +91,7 @@ Security/Eval:
     - 'lib/nanoc/filters/erubi.rb'
 
 
+
 # ----- DISABLED (metrics) -----
 
 # Cops for metrics are disabled because they should not cause tests to fail.
@@ -138,37 +132,36 @@ Metrics/PerceivedComplexity:
 
 # We should embrace UTF-8, not avoid it. Since the Encoding cop is enabled,
 # there’s no point in enforcing ASCII comments.
-AsciiComments:
+Style/AsciiComments:
   Enabled: false
 
 # It does not make sense to enforce everything to have documentation.
-Documentation:
+Style/Documentation:
   Enabled: false
 
 # Nanoc suppresses exceptions for valid reasons in a few cases.
-HandleExceptions:
+Lint/HandleExceptions:
   Enabled: false
 
 # if/unless at the end of the line makes it too easy to oversee.
-IfUnlessModifier:
+Style/IfUnlessModifier:
   Enabled: false
 
 # Personal preference is to have decent constructors for exceptions rather than
 # just a class and a message.
-RaiseArgs:
-  Enabled: false
-
-# Personal preference is to use `raise` to signal exceptions (normal control
-# flow should not use exceptions anyway).
-SignalException:
+Style/RaiseArgs:
   Enabled: false
 
 # Some methods that appear to be accessors (return a single value or set a
 # single value) should still not be considered to be accessors. This is a purely
 # semantic difference.
-TrivialAccessors:
+Style/TrivialAccessors:
   Enabled: false
 
 # This does not always semantically make sense.
-GuardClause:
+Style/GuardClause:
+  Enabled: false
+
+# Used for “undo work, whatever error happens”
+Lint/RescueWithoutErrorClass:
   Enabled: false

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.8.6 (2017-09-17)
+
+Fixes:
+
+* Fixed issue which would cause items not to be considered as outdated when their content and/or attributes are changed in the preprocessor (#1216, #1217)
+
 ## 4.8.5 (2017-09-07)
 
 Enhancements:

data/lib/nanoc.rb

@@ -8,7 +8,7 @@ module Nanoc
   def self.version_information
     gem_info = defined?(Gem) ? "with RubyGems #{Gem::VERSION}" : 'without RubyGems'
     engine   = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
-    res = String.new
+    res = +''
     res << "Nanoc #{Nanoc::VERSION} © 2007-2017 Denis Defreyne.\n"
     res << "Running #{engine} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} #{gem_info}.\n"
     res
@@ -26,6 +26,7 @@ end
 require 'hamster'
 require 'ref'
 require 'ddplugin'
+require 'addressable'
 
 # Load general requirements
 require 'digest'

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

@@ -34,11 +34,11 @@ module Nanoc::Int
     # Returns a binding for this instance.
     #
     # @return [Binding] A binding for this instance
-    # rubocop:disable Style/AccessorMethodName
+    # rubocop:disable Naming/AccessorMethodName
     def get_binding
       binding
     end
-    # rubocop:enable Style/AccessorMethodName
+    # rubocop:enable Naming/AccessorMethodName
 
     def method_missing(method, *args, &blk)
       ivar_name = '@' + method.to_s

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

@@ -23,6 +23,11 @@ module Nanoc::Int
       @name = name
     end
 
+    contract C::None => String
+    def inspect
+      "<#{self.class}>"
+    end
+
     contract C::None => self
     def freeze
       @objects.freeze

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

@@ -44,16 +44,14 @@ module Nanoc::Int
       @modified = false
     end
 
-    contract C::HashOf[Symbol => C::IterOf[String]] => self
+    contract C::HashOf[Symbol => C::IterOf[String]] => C::HashOf[Symbol => C::IterOf[String]]
     def raw_paths=(val)
       @raw_paths = val
-      self
     end
 
-    contract C::HashOf[Symbol => C::IterOf[String]] => self
+    contract C::HashOf[Symbol => C::IterOf[String]] => C::HashOf[Symbol => C::IterOf[String]]
     def paths=(val)
       @paths = val
-      self
     end
 
     contract Symbol => C::Bool

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

@@ -72,7 +72,7 @@ module Nanoc::Int
     contract C::Or[Nanoc::Identifier, String] => C::Maybe[C::ArrayOf[String]]
     def captures(identifier)
       matches = @regexp.match(identifier.to_s)
-      matches && matches.captures
+      matches&.captures
     end
 
     contract C::None => String

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

@@ -39,7 +39,7 @@ module Nanoc::Int
 
     contract C::None => String
     def inspect
-      String.new.tap do |s|
+      (+'').tap do |s|
         s << 'Props('
         s << (raw_content? ? 'r' : '_')
         s << (attributes? ? 'a' : '_')

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

@@ -8,7 +8,7 @@ module Nanoc::Int
     attr_reader :code_snippets
     attr_reader :config
     attr_accessor :data_source
-    attr_accessor :compiler
+    attr_writer :compiler
 
     contract C::KeywordArgs[config: Nanoc::Int::Configuration, code_snippets: C::IterOf[Nanoc::Int::CodeSnippet], data_source: C::Maybe[C::Named['Nanoc::DataSource']]] => C::Any
     def initialize(config:, code_snippets:, data_source:)

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

@@ -26,7 +26,7 @@ module Nanoc::Int
       item_cache[rep.name]
     end
 
-    contract Nanoc::Int::ItemRep, C::HashOf[Symbol => Nanoc::Int::Content] => self
+    contract Nanoc::Int::ItemRep, C::HashOf[Symbol => Nanoc::Int::Content] => C::HashOf[Symbol => Nanoc::Int::Content]
     # Sets the compiled content for the given representation.
     #
     # This cached compiled content is a hash where the keys are the snapshot
@@ -34,7 +34,6 @@ module Nanoc::Int
     def []=(rep, content)
       @cache[rep.item.identifier] ||= {}
       @cache[rep.item.identifier][rep.name] = content
-      self
     end
 
     protected

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

@@ -5,8 +5,8 @@ module Nanoc::Int
   class DependencyStore < ::Nanoc::Int::Store
     include Nanoc::Int::ContractsSupport
 
-    attr_accessor :items
-    attr_accessor :layouts
+    attr_reader :items
+    attr_reader :layouts
 
     contract Nanoc::Int::ItemCollection, Nanoc::Int::LayoutCollection, Nanoc::Int::Configuration, C::KeywordArgs[site: C::Optional[C::Maybe[Nanoc::Int::Site]]] => C::Any
     def initialize(items, layouts, config, site: nil)
@@ -140,7 +140,7 @@ module Nanoc::Int
     protected
 
     def obj2ref(obj)
-      obj && obj.reference
+      obj&.reference
     end
 
     def ref2obj(reference)

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

@@ -10,7 +10,7 @@ module Nanoc::Int
   class Checksummer
     class VerboseDigest
       def initialize
-        @str = String.new
+        @str = +''
       end
 
       def update(str)

data/lib/nanoc/base/views/mixins/mutable_document_view_mixin.rb

@@ -16,6 +16,10 @@ module Nanoc
     end
 
     def raw_content=(arg)
+      # FIXME: clearing checksum data should be done in the document
+      unwrap.checksum_data = nil
+      unwrap.content_checksum_data = nil
+
       unwrap.content = Nanoc::Int::Content.create(arg)
     end
 
@@ -25,6 +29,10 @@ module Nanoc
     #
     # @see Hash#[]=
     def []=(key, value)
+      # FIXME: clearing checksum data should be done in the document
+      unwrap.checksum_data = nil
+      unwrap.attributes_checksum_data = nil
+
       disallowed_value_classes = Set.new([
         Nanoc::Int::Item,
         Nanoc::Int::Layout,
@@ -51,6 +59,10 @@ module Nanoc
     #
     # @return [self]
     def update_attributes(hash)
+      # FIXME: clearing checksum data should be done in the document
+      unwrap.checksum_data = nil
+      unwrap.attributes_checksum_data = nil
+
       hash.each { |k, v| unwrap.attributes[k] = v }
       self
     end

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

@@ -53,7 +53,7 @@ module Nanoc::Checking::Checks
       return true if path.empty?
 
       # Decode URL (e.g. '%20' -> ' ')
-      path = URI.unescape(path)
+      path = CGI.unescape(path)
 
       # Make absolute
       path =

data/lib/nanoc/cli/cleaning_stream.rb

@@ -140,11 +140,11 @@ module Nanoc::CLI
     end
 
     # @see ARGF.set_encoding
-    # rubocop:disable Style/AccessorMethodName
+    # rubocop:disable Naming/AccessorMethodName
     def set_encoding(*args)
       @stream.set_encoding(*args)
     end
-    # rubocop:enable Style/AccessorMethodName
+    # rubocop:enable Naming/AccessorMethodName
 
     protected
 

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

@@ -42,7 +42,7 @@ module Nanoc::CLI::Commands
         puts 'No deployment configurations.'
       else
         puts 'Available deployment configurations:'
-        deploy_configs.keys.each do |name|
+        deploy_configs.each_key do |name|
           puts "  #{name}"
         end
       end

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

@@ -115,7 +115,7 @@ module Nanoc::CLI::Commands
               nil
             end
 
-          props = String.new
+          props = +''
           props << (dep.props.raw_content? ? 'r' : '_')
           props << (dep.props.attributes? ? 'a' : '_')
           props << (dep.props.compiled_content? ? 'c' : '_')

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

@@ -46,7 +46,7 @@ module Nanoc::CLI::Commands
       puts "#{@c.c('Layout ' + layout.identifier, :bold, :yellow)}:"
 
       found = false
-      @rules.layout_filter_mapping.each do |pattern, _|
+      @rules.layout_filter_mapping.each_key do |pattern|
         if pattern.match?(layout.identifier)
           puts "  #{pattern}"
           found = true

data/lib/nanoc/cli/error_handler.rb

@@ -155,12 +155,12 @@ module Nanoc::CLI
 
     # @return [Nanoc::Int::Site] The site that is currently being processed
     def site
-      @command && @command.site
+      @command&.site
     end
 
     # @return [Nanoc::Int::Compiler] The compiler for the current site
     def compiler
-      site && site.compiler
+      site&.compiler
     end
 
     # @return [Hash<String, Array>] A hash containing the gem names as keys and gem versions as value

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

@@ -89,7 +89,7 @@ module Nanoc::Deploying::Deployers
       path     = config[:path]
       cdn_id   = config[:cdn_id]
 
-      if path && path.end_with?('/')
+      if path&.end_with?('/')
         raise "The path `#{path}` is not supposed to have a trailing slash"
       end
 

data/lib/nanoc/filters/colorize_syntax.rb

@@ -36,7 +36,7 @@ module Nanoc::Filters
 
         # Add language-something class
         unless extracted_language.from_class
-          klass = element['class'] || String.new
+          klass = element['class'] || +''
           klass << ' ' unless [' ', nil].include?(klass[-1, 1])
           klass << "language-#{extracted_language.language}"
           element['class'] = klass

data/lib/nanoc/filters/colorize_syntax/colorizers.rb

@@ -104,7 +104,7 @@ module Nanoc::Filters::ColorizeSyntax::Colorizers
       check_availability('highlight', '--version')
 
       cmd = ['highlight', '--syntax', language, '--fragment']
-      params.each do |key, _value|
+      params.each_key do |key|
         if SIMON_HIGHLIGHT_OPT_MAP[key]
           cmd << SIMON_HIGHLIGHT_OPT_MAP[key]
         else

data/lib/nanoc/filters/sass.rb

@@ -16,7 +16,7 @@ module Nanoc::Filters
     def run(content, params = {})
       options = params.merge(
         nanoc_current_filter: self,
-        filename: @item && @item.raw_filename,
+        filename: @item&.raw_filename,
       )
       engine = ::Sass::Engine.new(content, options)
       engine.render

data/lib/nanoc/helpers/blogging.rb

@@ -52,7 +52,7 @@ module Nanoc::Helpers
       end
 
       def build
-        buffer = String.new
+        buffer = +''
         xml = Builder::XmlMarkup.new(target: buffer, indent: 2)
         build_for_feed(xml)
         buffer

data/lib/nanoc/helpers/capturing.rb

@@ -130,7 +130,7 @@ module Nanoc::Helpers
               "of the capture, optionally params, and the content) but got #{args.size} instead"
           end
 
-        _erbout = String.new # rubocop:disable Lint/UnderscorePrefixedVariableName
+        _erbout = +'' # rubocop:disable Lint/UnderscorePrefixedVariableName
         SetContent.new(name, params, @item).run { _erbout << content }
       else # Get content
         if args.size != 2
@@ -157,7 +157,7 @@ module Nanoc::Helpers
       erbout_addition = erbout[erbout_length..-1]
 
       # Remove addition
-      erbout[erbout_length..-1] = String.new
+      erbout[erbout_length..-1] = +''
 
       # Depending on how the filter outputs, the result might be a
       # single string or an array of strings (slim outputs the latter).

data/lib/nanoc/helpers/link_to.rb

@@ -42,7 +42,7 @@ module Nanoc::Helpers
       # Find path
       path = target.is_a?(String) ? target : target.path
 
-      if @item_rep && @item_rep.path == path
+      if @item_rep&.path == path
         # Create message
         "<span class=\"active\">#{text}</span>"
       else

data/lib/nanoc/helpers/xml_sitemap.rb

@@ -15,7 +15,7 @@ module Nanoc::Helpers
       select_proc = params.fetch(:rep_select, nil)
 
       # Create builder
-      buffer = String.new
+      buffer = +''
       xml = Builder::XmlMarkup.new(target: buffer, indent: 2)
 
       # Check for required attributes
@@ -32,7 +32,7 @@ module Nanoc::Helpers
           reps.select! { |r| select_proc[r] } if select_proc
           reps.sort_by { |r| r.name.to_s }.each do |rep|
             xml.url do
-              xml.loc URI.escape(@config[:base_url] + rep.path)
+              xml.loc Addressable::URI.escape(@config[:base_url] + rep.path)
               xml.lastmod item[:mtime].__nanoc_to_iso8601_date unless item[:mtime].nil?
               xml.changefreq item[:changefreq] unless item[:changefreq].nil?
               xml.priority item[:priority] unless item[:priority].nil?

data/lib/nanoc/rule_dsl/recording_executor.rb

@@ -35,7 +35,7 @@ module Nanoc
       Pathlike = C::Maybe[C::Or[String, Nanoc::Identifier]]
       contract Symbol, C::KeywordArgs[path: C::Optional[Pathlike]] => nil
       def snapshot(snapshot_name, path: nil)
-        @action_sequence_builder.add_snapshot(snapshot_name, path && path.to_s)
+        @action_sequence_builder.add_snapshot(snapshot_name, path&.to_s)
         case snapshot_name
         when :last
           @last_snapshot = true

data/lib/nanoc/spec.rb

@@ -23,7 +23,7 @@ module Nanoc
       def initialize(mod)
         @mod = mod
 
-        @erbout = String.new
+        @erbout = +''
         @action_sequence = {}
         @config = Nanoc::Int::Configuration.new.with_defaults
         @reps = Nanoc::Int::ItemRepRepo.new

data/lib/nanoc/telemetry/table.rb

@@ -25,7 +25,7 @@ module Nanoc::Telemetry
     end
 
     def separator(column_lengths)
-      String.new.tap do |s|
+      (+'').tap do |s|
         s << '─' * column_lengths[0]
         s << '─┼─'
         s << column_lengths[1..-1].map { |l| '─' * l }.join('───')

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.8.5'
+  VERSION = '4.8.6'
 end

data/nanoc.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('hamster', '~> 3.0')
   s.add_runtime_dependency('ref', '~> 2.0')
   s.add_runtime_dependency('ddplugin', '~> 1.0')
+  s.add_runtime_dependency('addressable', '~> 2.5')
 
   s.add_development_dependency('bundler', '>= 1.7.10', '< 2.0')
   s.add_development_dependency('appraisal', '~> 2.1')

data/spec/nanoc/base/entities/code_snippet_spec.rb

@@ -19,7 +19,7 @@ describe Nanoc::Int::CodeSnippet do
         EOS
       end
 
-      it 'makes helper functions available in contexts' do
+      it 'makes helper functions available everywhere' do
         expect { subject }
           .to change { [Nanoc::Int::Context.new({}).respond_to?(:fe345b48e4), Complex.respond_to?(:fe345b48e4)] }
           .from([false, false])
@@ -40,7 +40,7 @@ describe Nanoc::Int::CodeSnippet do
         EOS
       end
 
-      it 'makes helper functions available everywhere' do
+      it 'makes helper functions available in helpers only' do
         expect { subject }
           .to change { [Nanoc::Int::Context.new({}).respond_to?(:e0f0c30b5e), Complex.respond_to?(:e0f0c30b5e)] }
           .from([false, false])

data/spec/nanoc/base/entities/identifiable_collection_spec.rb

@@ -13,6 +13,12 @@ describe Nanoc::Int::IdentifiableCollection do
       it { is_expected.to be_a(described_class) }
     end
 
+    describe '#inspect' do
+      subject { identifiable_collection.inspect }
+
+      it { is_expected.to eq("<#{described_class}>") }
+    end
+
     describe '#[]' do
       let(:objects) do
         [

data/spec/nanoc/base/entities/lazy_value_spec.rb

@@ -2,7 +2,7 @@
 
 describe Nanoc::Int::LazyValue do
   describe '#value' do
-    let(:value_arg) { 'Hello world'.dup }
+    let(:value_arg) { +'Hello world' }
     let(:lazy_value) { described_class.new(value_arg) }
 
     subject { lazy_value.value }

data/spec/nanoc/base/feature_spec.rb

@@ -8,7 +8,7 @@ describe Nanoc::Feature do
 
     before do
       Nanoc::Feature.reset_caches
-      ENV['NANOC_FEATURES'] = String.new
+      ENV['NANOC_FEATURES'] = +''
     end
 
     context 'not set' do
@@ -42,7 +42,7 @@ describe Nanoc::Feature do
 
     before do
       Nanoc::Feature.reset_caches
-      ENV['NANOC_FEATURES'] = String.new
+      ENV['NANOC_FEATURES'] = +''
     end
 
     context 'not set' do

data/spec/nanoc/base/services/outdatedness_rules_spec.rb

@@ -328,7 +328,7 @@ describe Nanoc::Int::OutdatednessRules do
       end
     end
 
-    describe '#{Content,Attributes}Modified' do
+    describe '#ContentModified, #AttributesModified' do
       subject do
         [
           Nanoc::Int::OutdatednessRules::ContentModified,

data/spec/nanoc/base/views/mutable_document_view_spec.rb

@@ -25,6 +25,33 @@ shared_examples 'a mutable document view' do
         .from('content')
         .to('donkey')
     end
+
+    context 'checksum_data set' do
+      before do
+        document.checksum_data = 'my checksum data'
+        document.content_checksum_data = 'my content checksum data'
+        document.attributes_checksum_data = 'my attributes checksum data'
+      end
+
+      it 'unsets checksum_data' do
+        expect { view.raw_content = 'donkey' }
+          .to change { document.checksum_data }
+          .from('my checksum data')
+          .to(nil)
+      end
+
+      it 'unsets content_checksum_data' do
+        expect { view.raw_content = 'donkey' }
+          .to change { document.content_checksum_data }
+          .from('my content checksum data')
+          .to(nil)
+      end
+
+      it 'keeps attributes_checksum_data' do
+        expect { view.raw_content = 'donkey' }
+          .not_to change { document.attributes_checksum_data }
+      end
+    end
   end
 
   describe '#[]=' do
@@ -54,6 +81,33 @@ shared_examples 'a mutable document view' do
       layout = Nanoc::LayoutView.new(Nanoc::Int::Layout.new('content', {}, '/foo.md'), nil)
       expect { view[:layout] = layout }.to raise_error(Nanoc::MutableDocumentViewMixin::DisallowedAttributeValueError)
     end
+
+    context 'checksum_data set' do
+      before do
+        document.checksum_data = 'my checksum data'
+        document.content_checksum_data = 'my content checksum data'
+        document.attributes_checksum_data = 'my attributes checksum data'
+      end
+
+      it 'unsets checksum_data' do
+        expect { view[:title] = 'Donkey' }
+          .to change { document.checksum_data }
+          .from('my checksum data')
+          .to(nil)
+      end
+
+      it 'unsets attributes_checksum_data' do
+        expect { view[:title] = 'Donkey' }
+          .to change { document.attributes_checksum_data }
+          .from('my attributes checksum data')
+          .to(nil)
+      end
+
+      it 'keeps content_checksum_data' do
+        expect { view[:title] = 'Donkey' }
+          .not_to change { document.content_checksum_data }
+      end
+    end
   end
 
   describe '#identifier=' do
@@ -102,5 +156,32 @@ shared_examples 'a mutable document view' do
     it 'returns self' do
       expect(subject).to equal(view)
     end
+
+    context 'checksum_data set' do
+      before do
+        document.checksum_data = 'my checksum data'
+        document.content_checksum_data = 'my content checksum data'
+        document.attributes_checksum_data = 'my attributes checksum data'
+      end
+
+      it 'unsets checksum_data' do
+        expect { subject }
+          .to change { document.checksum_data }
+          .from('my checksum data')
+          .to(nil)
+      end
+
+      it 'unsets attributes_checksum_data' do
+        expect { subject }
+          .to change { document.attributes_checksum_data }
+          .from('my attributes checksum data')
+          .to(nil)
+      end
+
+      it 'keeps content_checksum_data' do
+        expect { subject }
+          .not_to change { document.content_checksum_data }
+      end
+    end
   end
 end

data/spec/nanoc/deploying/git_spec.rb

@@ -14,8 +14,8 @@ describe Nanoc::Deploying::Deployers::Git, stdio: true do
   let(:forced_options) { {} }
 
   def run_and_get_stdout(*args)
-    stdout = String.new
-    stderr = String.new
+    stdout = +''
+    stderr = +''
     piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
     piper.run(args, '')
     stdout

data/spec/nanoc/helpers/capturing_spec.rb

@@ -9,7 +9,7 @@ describe Nanoc::Helpers::Capturing, helper: true do
     end
 
     describe 'setting content' do
-      let(:_erbout) { String.new('existing content') }
+      let(:_erbout) { +'existing content' }
 
       let(:params) { raise 'overwrite me' }
 
@@ -129,7 +129,7 @@ describe Nanoc::Helpers::Capturing, helper: true do
     describe 'with item + name' do
       subject { helper.content_for(item, :foo) }
 
-      let(:_erbout) { String.new('existing content') }
+      let(:_erbout) { +'existing content' }
 
       context 'requesting for same item' do
         let(:item) { ctx.item }
@@ -198,7 +198,7 @@ describe Nanoc::Helpers::Capturing, helper: true do
 
   describe '#capture' do
     context 'with string' do
-      let(:_erbout) { String.new('existing content') }
+      let(:_erbout) { +'existing content' }
 
       subject { helper.capture { _erbout << 'new content' } }
 
@@ -244,7 +244,7 @@ describe Nanoc::Helpers::Capturing, helper: true do
       context 'output field separator set to nothing' do
         around do |ex|
           orig_output_field_separator = $OUTPUT_FIELD_SEPARATOR
-          $OUTPUT_FIELD_SEPARATOR = String.new
+          $OUTPUT_FIELD_SEPARATOR = +''
           ex.run
           $OUTPUT_FIELD_SEPARATOR = orig_output_field_separator
         end

data/spec/nanoc/helpers/html_escape_spec.rb

@@ -10,7 +10,7 @@ describe Nanoc::Helpers::HTMLEscape, helper: true do
     end
 
     context 'given a block' do
-      let!(:_erbout) { String.new('moo') }
+      let!(:_erbout) { +'moo' }
 
       it 'adds escaped content to _erbout' do
         helper.html_escape { _erbout << '<h1>Stuff!</h1>' }

data/spec/nanoc/regressions/gh_1216_spec.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+describe 'GH-1216', site: true, stdio: true do
+  before do
+    FileUtils.mkdir_p('content/talks')
+    File.write('content/talks/aaa.html', 'A')
+    File.write('content/talks/bbb.html', 'B')
+    File.write('content/talks.html', '<%= @items.find_all("/talks/*").map { |i| i.raw_content + "=" + i[:status].to_s }.join(" ") %>')
+
+    File.write('Rules', <<~EOS)
+      compile '/**/*' do
+        filter :erb
+        write ext: 'html'
+      end
+    EOS
+  end
+
+  before do
+    Nanoc::CLI.run(%w[compile])
+  end
+
+  context 'attributes changed using #[]=' do
+    before do
+      File.write('Rules', <<~EOS)
+        preprocess do
+          @items['/talks/aaa.*'][:status] = 'archived'
+          @items['/talks/bbb.*'][:status] = 'archived'
+        end
+
+        compile '/**/*' do
+          filter :erb
+          write ext: 'html'
+        end
+      EOS
+    end
+
+    it 'changes output file' do
+      expect { Nanoc::CLI.run(%w[compile]) }
+        .to change { File.read('output/talks.html') }
+        .from('A= B=')
+        .to('A=archived B=archived')
+    end
+  end
+
+  context 'attributes changed using update_attributes' do
+    before do
+      File.write('Rules', <<~EOS)
+        preprocess do
+          @items['/talks/aaa.*'].update_attributes(status: 'archived')
+          @items['/talks/bbb.*'].update_attributes(status: 'archived')
+        end
+
+        compile '/**/*' do
+          filter :erb
+          write ext: 'html'
+        end
+      EOS
+    end
+
+    it 'changes output file' do
+      expect { Nanoc::CLI.run(%w[compile]) }
+        .to change { File.read('output/talks.html') }
+        .from('A= B=')
+        .to('A=archived B=archived')
+    end
+  end
+
+  context 'raw content changed' do
+    before do
+      File.write('Rules', <<~EOS)
+        preprocess do
+          @items['/talks/aaa.*'][:status] = 'archived'
+          @items['/talks/bbb.*'][:status] = 'current'
+          @items['/talks/aaa.*'].raw_content = 'AAH'
+        end
+
+        compile '/**/*' do
+          filter :erb
+          write ext: 'html'
+        end
+      EOS
+    end
+
+    it 'changes output file' do
+      expect { Nanoc::CLI.run(%w[compile]) }
+        .to change { File.read('output/talks.html') }
+        .from('A= B=')
+        .to('AAH=archived B=current')
+    end
+  end
+end

data/test/base/test_code_snippet.rb

@@ -3,18 +3,6 @@
 require 'helper'
 
 class Nanoc::Int::CodeSnippetTest < Nanoc::TestCase
-  def test_load
-    # Initialize
-    $complete_insane_parrot = 'meow'
-
-    # Create code and load it
-    code_snippet = Nanoc::Int::CodeSnippet.new("$complete_insane_parrot = 'woof'", 'parrot.rb')
-    code_snippet.load
-
-    # Ensure code is loaded
-    assert_equal('woof', $complete_insane_parrot)
-  end
-
   def test_load_with_toplevel_binding
     # Initialize
     @foo = 'meow'

data/test/base/test_item_array.rb

@@ -23,7 +23,7 @@ class Nanoc::Int::IdentifiableCollectionTest < Nanoc::TestCase
   end
 
   def test_enumerable
-    assert_equal @one, @items.find { |i| i.identifier == '/one' }
+    assert_equal @one, (@items.find { |i| i.identifier == '/one' })
   end
 
   def test_less_than_less_than

data/test/deploying/test_git.rb

@@ -34,7 +34,7 @@ class Nanoc::Deploying::Deployers::GitTest < Nanoc::TestCase
       git push origin master
 EOS
 
-    assert_match Regexp.new(/^#{commands.chomp}$/), git.instance_eval { @shell_cmd_args.join("\n") }
+    assert_match Regexp.new(/^#{commands.chomp}$/), (git.instance_eval { @shell_cmd_args.join("\n") })
   end
 
   def test_run_with_clean_repository
@@ -67,7 +67,7 @@ EOS
       git checkout master
 EOS
 
-    assert_match Regexp.new(/^#{commands.chomp}$/), git.instance_eval { @shell_cmd_args.join("\n") }
+    assert_match Regexp.new(/^#{commands.chomp}$/), (git.instance_eval { @shell_cmd_args.join("\n") })
   end
 
   def test_run_with_custom_options
@@ -103,7 +103,7 @@ EOS
       git push -f github gh-pages
 EOS
 
-    assert_match Regexp.new(/^#{commands.chomp}$/), git.instance_eval { @shell_cmd_args.join("\n") }
+    assert_match Regexp.new(/^#{commands.chomp}$/), (git.instance_eval { @shell_cmd_args.join("\n") })
   end
 
   def test_run_without_git_init
@@ -138,7 +138,7 @@ EOS
       git push origin master
 EOS
 
-    assert_match Regexp.new(/^#{commands.chomp}$/), git.instance_eval { @shell_cmd_args.join("\n") }
+    assert_match Regexp.new(/^#{commands.chomp}$/), (git.instance_eval { @shell_cmd_args.join("\n") })
   end
 
   def test_run_with_ssh_url
@@ -173,7 +173,7 @@ EOS
       git push git@github.com:myself/myproject.git master
 EOS
 
-    assert_match Regexp.new(/^#{commands.chomp}$/), git.instance_eval { @shell_cmd_args.join("\n") }
+    assert_match Regexp.new(/^#{commands.chomp}$/), (git.instance_eval { @shell_cmd_args.join("\n") })
   end
 
   def test_run_with_http_url
@@ -208,7 +208,7 @@ EOS
       git push https://github.com/nanoc/nanoc.git master
 EOS
 
-    assert_match Regexp.new(/^#{commands.chomp}$/), git.instance_eval { @shell_cmd_args.join("\n") }
+    assert_match Regexp.new(/^#{commands.chomp}$/), (git.instance_eval { @shell_cmd_args.join("\n") })
   end
 
   def test_clean_repo_on_a_clean_repo

data/test/filters/test_erb.rb

@@ -8,7 +8,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
     filter = ::Nanoc::Filters::ERB.new(location: 'a cheap motel')
 
     # Run filter
-    result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>')
+    result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>') # rubocop:disable Lint/InterpolationCheck
     assert_equal('I was hiding in a cheap motel.', result)
   end
 
@@ -17,7 +17,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
     filter = ::Nanoc::Filters::ERB.new(location: 'a cheap motel')
 
     # Run filter
-    result = filter.setup_and_run('<%= "I was hiding in #{location}." %>')
+    result = filter.setup_and_run('<%= "I was hiding in #{location}." %>') # rubocop:disable Lint/InterpolationCheck
     assert_equal('I was hiding in a cheap motel.', result)
   end
 
@@ -52,7 +52,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
     filter = ::Nanoc::Filters::ERB.new(content: 'a cheap motel')
 
     # Run filter
-    result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
+    result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>') # rubocop:disable Lint/InterpolationCheck
     assert_equal('I was hiding in a cheap motel.', result)
   end
 
@@ -62,7 +62,7 @@ class Nanoc::Filters::ERBTest < Nanoc::TestCase
 
     # Run filter
     assert_raises LocalJumpError do
-      filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
+      filter.setup_and_run('<%= "I was hiding in #{yield}." %>') # rubocop:disable Lint/InterpolationCheck
     end
   end
 

data/test/filters/test_erubi.rb

@@ -9,7 +9,7 @@ class Nanoc::Filters::ErubiTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::Erubi.new(location: 'a cheap motel')
 
       # Run filter
-      result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>')
+      result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>') # rubocop:disable Lint/InterpolationCheck
       assert_equal('I was hiding in a cheap motel.', result)
     end
   end
@@ -20,7 +20,7 @@ class Nanoc::Filters::ErubiTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::Erubi.new(location: 'a cheap motel')
 
       # Run filter
-      result = filter.setup_and_run('<%= "I was hiding in #{location}." %>')
+      result = filter.setup_and_run('<%= "I was hiding in #{location}." %>') # rubocop:disable Lint/InterpolationCheck
       assert_equal('I was hiding in a cheap motel.', result)
     end
   end
@@ -48,7 +48,7 @@ class Nanoc::Filters::ErubiTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::Erubi.new(content: 'a cheap motel')
 
       # Run filter
-      result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
+      result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>') # rubocop:disable Lint/InterpolationCheck
       assert_equal('I was hiding in a cheap motel.', result)
     end
   end
@@ -60,7 +60,7 @@ class Nanoc::Filters::ErubiTest < Nanoc::TestCase
 
       # Run filter
       assert_raises LocalJumpError do
-        filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
+        filter.setup_and_run('<%= "I was hiding in #{yield}." %>') # rubocop:disable Lint/InterpolationCheck
       end
     end
   end

data/test/filters/test_erubis.rb

@@ -9,7 +9,7 @@ class Nanoc::Filters::ErubisTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::Erubis.new(location: 'a cheap motel')
 
       # Run filter
-      result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>')
+      result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>') # rubocop:disable Lint/InterpolationCheck
       assert_equal('I was hiding in a cheap motel.', result)
     end
   end
@@ -20,7 +20,7 @@ class Nanoc::Filters::ErubisTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::Erubis.new(location: 'a cheap motel')
 
       # Run filter
-      result = filter.setup_and_run('<%= "I was hiding in #{location}." %>')
+      result = filter.setup_and_run('<%= "I was hiding in #{location}." %>') # rubocop:disable Lint/InterpolationCheck
       assert_equal('I was hiding in a cheap motel.', result)
     end
   end
@@ -49,7 +49,7 @@ class Nanoc::Filters::ErubisTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::Erubis.new(content: 'a cheap motel')
 
       # Run filter
-      result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
+      result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>') # rubocop:disable Lint/InterpolationCheck
       assert_equal('I was hiding in a cheap motel.', result)
     end
   end
@@ -61,7 +61,7 @@ class Nanoc::Filters::ErubisTest < Nanoc::TestCase
 
       # Run filter
       assert_raises LocalJumpError do
-        filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
+        filter.setup_and_run('<%= "I was hiding in #{yield}." %>') # rubocop:disable Lint/InterpolationCheck
       end
     end
   end

data/test/helpers/test_blogging.rb

@@ -312,24 +312,12 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       # TODO: Use xpath matchers for more specific test
       result = atom_feed
       # Still should keep feed level author
-      assert_match(
-        /#{Regexp.escape('<name>Denis Defreyne</name>')}/, #'
-        result,
-      )
-      assert_match(
-        /#{Regexp.escape('<uri>http://stoneship.org/</uri>')}/, #'
-        result,
-      )
+      assert_includes(result, '<name>Denis Defreyne</name>')
+      assert_includes(result, '<uri>http://stoneship.org/</uri>')
 
       # Overrides on specific items
-      assert_match(
-        /#{Regexp.escape('<name>Don Alias</name>')}/, #'
-        result,
-      )
-      assert_match(
-        /#{Regexp.escape('<uri>http://don.example.com/</uri>')}/, #'
-        result,
-      )
+      assert_includes(result, '<name>Don Alias</name>')
+      assert_includes(result, '<uri>http://don.example.com/</uri>')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.8.5
+  version: 4.8.6
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -513,6 +527,7 @@ files:
 - spec/nanoc/regressions/gh_1145_spec.rb
 - spec/nanoc/regressions/gh_1171_spec.rb
 - spec/nanoc/regressions/gh_1185_spec.rb
+- spec/nanoc/regressions/gh_1216_spec.rb
 - spec/nanoc/regressions/gh_761_spec.rb
 - spec/nanoc/regressions/gh_767_spec.rb
 - spec/nanoc/regressions/gh_769_spec.rb