nanoc 4.7.11 → 4.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99eef92742ae4e7c6eec52f7efc9c456a44b72ca
-  data.tar.gz: 2d4f5da906f23c186cf965541a582175a91fe38f
+  metadata.gz: fc70bc281ec6b39ca3de14107a1c2374d13e2807
+  data.tar.gz: 0f16fd6cd14eb18bafd194ee2d0e0421fae93765
 SHA512:
-  metadata.gz: 95a74693fa0cc09e0789bbaca9cc2c8f846f5936ae3e57f49ce8bba64721b970809438f200057aa3d7c8d3c520795015a19a7c220a462dfae6d0f7bbb048b8b8
-  data.tar.gz: d1bd24af79448f4e22250c95ce4ebc1a3fab8e9e827d24b130bc5c486154c8db099dace97e669903d9d7c8f8559d43134afcb1478875d177938fbecde08c46a6
+  metadata.gz: ea4bfbf259d607544769201bf1cb950c5f8f9d4cbfe80aa48f53be0aaaa68db8b861949374a557700afb91193922c66dc62c16c510a2b2dddc99e4ea2d2b5858
+  data.tar.gz: 3be571aecf8dbf7c742894aa1415726c915ee7eee916506f31f79c0d0ae986589176f76bfd90c8564111e11194fcd7ded82fe5aa1694340f4cddd9abf0facf10

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at denis+nanoc-coc@stoneship.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/NEWS.md

@@ -1,5 +1,15 @@
 # Nanoc news
 
+## 4.7.12 (2017-06-23)
+
+Fixes:
+
+* Fixed an issue in which the fog deployer could run out of open file descriptors (#1189)
+
+Enhancements:
+
+* Made changes to `@config` only cause outdatedness of items that depend on `@config` (#1188)
+
 ## 4.7.11 (2017-06-17)
 
 Fixes:

data/README.md

@@ -1,4 +1,5 @@
 [![Gem version](http://img.shields.io/gem/v/nanoc.svg)](http://rubygems.org/gems/nanoc)
+[![Gem downloads](https://img.shields.io/gem/dt/nanoc.svg)](http://rubygems.org/gems/nanoc)
 [![Build status](http://img.shields.io/travis/nanoc/nanoc.svg)](https://travis-ci.org/nanoc/nanoc)
 [![Code Climate](http://img.shields.io/codeclimate/github/nanoc/nanoc.svg)](https://codeclimate.com/github/nanoc/nanoc)
 [![Code Coverage](https://img.shields.io/codecov/c/github/nanoc/nanoc.svg)](https://codecov.io/gh/nanoc/nanoc)

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

@@ -80,6 +80,12 @@ module Nanoc::Int
       @wrapped
     end
 
+    # For compat
+    contract C::None => Hash
+    def attributes
+      to_h
+    end
+
     contract C::Any => C::Bool
     def key?(key)
       @wrapped.key?(key)

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

@@ -27,11 +27,6 @@ module Nanoc::Int
       Props.new(raw_content: true, attributes: true, compiled_content: true, path: true),
     )
 
-    ConfigurationModified = Generic.new(
-      'The site configuration has been modified since the last time the site was compiled.',
-      Props.new(raw_content: true, attributes: true, compiled_content: true, path: true),
-    )
-
     DependenciesOutdated = Generic.new(
       'This item uses content or attributes that have changed since the last time the site was compiled.',
     )

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

@@ -31,6 +31,9 @@ module Nanoc::Int
     def add(obj)
       if obj.is_a?(Nanoc::Int::Document)
         @checksums[[obj.reference, :content]] = Nanoc::Int::Checksummer.calc_for_content_of(obj)
+      end
+
+      if obj.is_a?(Nanoc::Int::Document) || obj.is_a?(Nanoc::Int::Configuration)
         @checksums[[obj.reference, :each_attribute]] = Nanoc::Int::Checksummer.calc_for_each_attribute_of(obj)
       end
 

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

@@ -8,7 +8,7 @@ module Nanoc::Int
     attr_accessor :items
     attr_accessor :layouts
 
-    def initialize(items, layouts, site: nil)
+    def initialize(items, layouts, config, site: nil)
       super(Nanoc::Int::Store.tmp_path_for(site: site, store_name: 'dependencies'), 4)
 
       @items = items
@@ -17,6 +17,7 @@ module Nanoc::Int
       @refs2objs = {}
       items.each   { |o| add_vertex_for(o) }
       layouts.each { |o| add_vertex_for(o) }
+      add_vertex_for(config)
 
       @new_objects = []
       @graph = Nanoc::Int::DirectedGraph.new([nil] + objs2refs(@items) + objs2refs(@layouts))

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

@@ -21,12 +21,17 @@ module Nanoc::Int::Compiler::Stages
         end
       end
 
-      [@items, @layouts, @code_snippets, [@config]].each do |objs|
+      [@items, @layouts, @code_snippets].each do |objs|
         objs.each do |obj|
           checksums[obj.reference] = Nanoc::Int::Checksummer.calc(obj)
         end
       end
 
+      checksums[@config.reference] =
+        Nanoc::Int::Checksummer.calc(@config)
+      checksums[[@config.reference, :each_attribute]] =
+        Nanoc::Int::Checksummer.calc_for_each_attribute_of(@config)
+
       Nanoc::Int::ChecksumCollection.new(checksums)
     end
   end

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

@@ -7,7 +7,7 @@ module Nanoc::Int
       action_sequence_store = Nanoc::Int::ActionSequenceStore.new(site: site)
 
       dependency_store =
-        Nanoc::Int::DependencyStore.new(site.items, site.layouts, site: site)
+        Nanoc::Int::DependencyStore.new(site.items, site.layouts, site.config, site: site)
 
       objects = site.items.to_a + site.layouts.to_a + site.code_snippets + [site.config]
 

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

@@ -19,7 +19,6 @@ module Nanoc::Int
           Rules::AttributesModified,
           Rules::NotWritten,
           Rules::CodeSnippetsModified,
-          Rules::ConfigurationModified,
           Rules::UsesAlwaysOutdatedFilter,
         ].freeze
 
@@ -31,13 +30,20 @@ module Nanoc::Int
           Rules::UsesAlwaysOutdatedFilter,
         ].freeze
 
+      RULES_FOR_CONFIG =
+        [
+          Rules::AttributesModified,
+        ].freeze
+
+      C_OBJ_MAYBE_REP = C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Configuration, Nanoc::Int::Layout]
+
       contract C::KeywordArgs[outdatedness_checker: OutdatednessChecker, reps: Nanoc::Int::ItemRepRepo] => C::Any
       def initialize(outdatedness_checker:, reps:)
         @outdatedness_checker = outdatedness_checker
         @reps = reps
       end
 
-      contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] => C::Maybe[OutdatednessStatus]
+      contract C_OBJ_MAYBE_REP => C::Maybe[OutdatednessStatus]
       memoized def outdatedness_status_for(obj)
         case obj
         when Nanoc::Int::ItemRep
@@ -46,6 +52,8 @@ module Nanoc::Int
           apply_rules_multi(RULES_FOR_ITEM_REP, @reps[obj])
         when Nanoc::Int::Layout
           apply_rules(RULES_FOR_LAYOUT, obj)
+        when Nanoc::Int::Configuration
+          apply_rules(RULES_FOR_CONFIG, obj)
         else
           raise Nanoc::Int::Errors::InternalInconsistency, "do not know how to check outdatedness of #{obj.inspect}"
         end
@@ -53,7 +61,7 @@ module Nanoc::Int
 
       private
 
-      contract C::ArrayOf[Class], C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout], OutdatednessStatus => C::Maybe[OutdatednessStatus]
+      contract C::ArrayOf[Class], C_OBJ_MAYBE_REP, OutdatednessStatus => C::Maybe[OutdatednessStatus]
       def apply_rules(rules, obj, status = OutdatednessStatus.new)
         rules.inject(status) do |acc, rule|
           if !acc.useful_to_apply?(rule)
@@ -69,7 +77,7 @@ module Nanoc::Int
         end
       end
 
-      contract C::ArrayOf[Class], C::ArrayOf[C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout]] => C::Maybe[OutdatednessStatus]
+      contract C::ArrayOf[Class], C::ArrayOf[C_OBJ_MAYBE_REP] => C::Maybe[OutdatednessStatus]
       def apply_rules_multi(rules, objs)
         objs.inject(OutdatednessStatus.new) { |acc, elem| apply_rules(rules, elem, acc) }
       end
@@ -88,7 +96,7 @@ module Nanoc::Int
 
     Reasons = Nanoc::Int::OutdatednessReasons
 
-    C_OBJ = C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout]
+    C_OBJ = C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Configuration, Nanoc::Int::Layout]
     C_ACTION_SEQUENCES = C::HashOf[C_OBJ => Nanoc::Int::ActionSequence]
 
     contract C::KeywordArgs[site: Nanoc::Int::Site, checksum_store: Nanoc::Int::ChecksumStore, checksums: Nanoc::Int::ChecksumCollection, dependency_store: Nanoc::Int::DependencyStore, action_sequence_store: Nanoc::Int::ActionSequenceStore, action_sequences: C_ACTION_SEQUENCES, reps: Nanoc::Int::ItemRepRepo] => C::Any
@@ -113,7 +121,7 @@ module Nanoc::Int
       outdatedness_reasons_for(obj).any?
     end
 
-    contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] => C::IterOf[Reasons::Generic]
+    contract C_OBJ => C::IterOf[Reasons::Generic]
     def outdatedness_reasons_for(obj)
       reasons = basic.outdatedness_status_for(obj).reasons
       if reasons.any?
@@ -132,7 +140,7 @@ module Nanoc::Int
       @_basic ||= Basic.new(outdatedness_checker: self, reps: @reps)
     end
 
-    contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout], Hamster::Set => C::Bool
+    contract C_OBJ, Hamster::Set => C::Bool
     def outdated_due_to_dependencies?(obj, processed = Hamster::Set.new)
       # Convert from rep to item if necessary
       obj = obj.item if obj.is_a?(Nanoc::Int::ItemRep)

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

@@ -6,12 +6,12 @@ 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]
+    contract C::Or[Nanoc::Int::ItemRep, Nanoc::Int::Item, Nanoc::Int::Configuration, Nanoc::Int::Layout], C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Int::OutdatednessReasons::Generic]
     def apply(obj, outdatedness_checker)
       case obj
       when Nanoc::Int::ItemRep
         apply(obj.item, outdatedness_checker)
-      when Nanoc::Int::Item, Nanoc::Int::Layout
+      when Nanoc::Int::Item, Nanoc::Int::Layout, Nanoc::Int::Configuration
         if outdatedness_checker.checksum_store[obj] == outdatedness_checker.checksums.checksum_for(obj)
           return nil
         end

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

@@ -8,7 +8,6 @@ end
 
 require_relative 'outdatedness_rules/attributes_modified'
 require_relative 'outdatedness_rules/code_snippets_modified'
-require_relative 'outdatedness_rules/configuration_modified'
 require_relative 'outdatedness_rules/content_modified'
 require_relative 'outdatedness_rules/not_written'
 require_relative 'outdatedness_rules/rules_modified'

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

@@ -71,13 +71,23 @@ module Nanoc::CLI::Commands
       puts '  p = dependency on the path'
       puts
 
+      sorter =
+        lambda do |dep|
+          case dep
+          when Nanoc::Int::Document
+            dep.from.identifier.to_s
+          else
+            ''
+          end
+        end
+
       sorted_with_prev(items) do |item, prev|
         puts if prev
         puts "item #{item.identifier} depends on:"
         dependencies =
           dependency_store
           .dependencies_causing_outdatedness_of(item)
-          .sort_by { |dep| dep.from ? dep.from.identifier : '' }
+          .sort_by(&sorter)
         dependencies.each do |dep|
           pred = dep.from
 
@@ -85,10 +95,20 @@ module Nanoc::CLI::Commands
             case pred
             when Nanoc::Int::Layout
               'layout'
-            when Nanoc::Int::ItemRep
-              'item rep'
             when Nanoc::Int::Item
               'item'
+            when Nanoc::Int::Configuration
+              'config'
+            else
+              raise Nanoc::Int::Errors::InternalInconsistency, "unexpected pred type #{pred}"
+            end
+
+          pred_identifier =
+            case pred
+            when Nanoc::Int::Document
+              pred.identifier.to_s
+            when Nanoc::Int::Configuration
+              nil
             end
 
           props = String.new
@@ -98,7 +118,7 @@ module Nanoc::CLI::Commands
           props << (dep.props.path? ? 'p' : '_')
 
           if pred
-            puts "  [ #{format '%6s', type} ] (#{props}) #{pred.identifier}"
+            puts "  [ #{format '%6s', type} ] (#{props}) #{pred_identifier}"
           else
             puts '  ( removed item )'
           end

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

@@ -35,12 +35,13 @@ module Nanoc::Deploying::Deployers
         log_effectful("uploading #{source_filename} -> #{destination_key}")
 
         unless dry_run?
-          # FIXME: source_filename file is never closed
-          @directory.files.create(
-            key: destination_key,
-            body: File.open(source_filename),
-            public: true,
-          )
+          File.open(source_filename) do |io|
+            @directory.files.create(
+              key: destination_key,
+              body: io,
+              public: true,
+            )
+          end
         end
       end
 

data/lib/nanoc/version.rb

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

data/nanoc.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = 'Nanoc is a static-site generator focused on flexibility. It transforms content from a format such as Markdown or AsciiDoc into another format, usually HTML, and lays out pages consistently to retain the site’s look and feel throughout. Static sites built with Nanoc can be deployed to any web server.'
 
   s.author  = 'Denis Defreyne'
-  s.email   = 'denis.defreyne@stoneship.org'
+  s.email   = 'denis@stoneship.org'
   s.license = 'MIT'
 
   s.files              = `git ls-files -z`.split("\x0")

data/spec/nanoc/base/compiler_spec.rb

@@ -17,7 +17,7 @@ describe Nanoc::Int::Compiler do
   let(:checksum_store) { Nanoc::Int::ChecksumStore.new(objects: items) }
   let(:action_sequence_store) { Nanoc::Int::ActionSequenceStore.new }
 
-  let(:dependency_store) { Nanoc::Int::DependencyStore.new(items, layouts) }
+  let(:dependency_store) { Nanoc::Int::DependencyStore.new(items, layouts, config) }
   let(:reps) { Nanoc::Int::ItemRepRepo.new }
 
   let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(site: site, reps: reps) }

data/spec/nanoc/base/repos/dependency_store_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe Nanoc::Int::DependencyStore do
-  let(:store) { described_class.new(items, layouts) }
+  let(:store) { described_class.new(items, layouts, config) }
 
   let(:item_a) { Nanoc::Int::Item.new('a', {}, '/a.md') }
   let(:item_b) { Nanoc::Int::Item.new('b', {}, '/b.md') }

data/spec/nanoc/base/services/compiler/stages/calculate_checksums_spec.rb

@@ -61,6 +61,9 @@ describe Nanoc::Int::Compiler::Stages::CalculateChecksums do
     it 'checksums config' do
       expect(subject.checksum_for(config))
         .to eq(Nanoc::Int::Checksummer.calc(config))
+
+      expect(subject.attributes_checksum_for(config))
+        .to eq(Nanoc::Int::Checksummer.calc_for_each_attribute_of(config))
     end
 
     it 'checksums code snippets' do

data/spec/nanoc/base/services/compiler/stages/compile_reps_spec.rb

@@ -28,7 +28,7 @@ describe Nanoc::Int::Compiler::Stages::CompileReps do
   let(:snapshot_repo) { Nanoc::Int::SnapshotRepo.new }
 
   let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(site: site, reps: reps) }
-  let(:dependency_store) { Nanoc::Int::DependencyStore.new(items, layouts) }
+  let(:dependency_store) { Nanoc::Int::DependencyStore.new(items, layouts, config) }
 
   let(:rep) { Nanoc::Int::ItemRep.new(item, :default) }
   let(:item) { Nanoc::Int::Item.new('<%= 1 + 2 %>', {}, '/hi.md') }

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

@@ -3,7 +3,7 @@
 describe Nanoc::Int::DependencyTracker do
   let(:tracker) { described_class.new(store) }
 
-  let(:store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection) }
+  let(:store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection, config) }
 
   let(:item_a) { Nanoc::Int::Item.new('a', {}, '/a.md') }
   let(:item_b) { Nanoc::Int::Item.new('b', {}, '/b.md') }

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

@@ -25,7 +25,7 @@ describe Nanoc::Int::OutdatednessChecker do
   end
 
   let(:dependency_store) do
-    Nanoc::Int::DependencyStore.new(items, layouts)
+    Nanoc::Int::DependencyStore.new(items, layouts, config)
   end
 
   let(:items) { Nanoc::Int::IdentifiableCollection.new(config, [item]) }
@@ -324,6 +324,46 @@ describe Nanoc::Int::OutdatednessChecker do
       end
     end
 
+    context 'generic dependency on config' do
+      before do
+        dependency_store.record_dependency(item, config, attributes: true)
+      end
+
+      context 'nothing changed' do
+        it { is_expected.not_to be }
+      end
+
+      context 'attribute changed' do
+        before { config[:title] = 'omg new title' }
+        it { is_expected.to be }
+      end
+
+      context 'other attribute changed' do
+        before { config[:subtitle] = 'tagline here' }
+        it { is_expected.to be }
+      end
+    end
+
+    context 'specific dependency on config' do
+      before do
+        dependency_store.record_dependency(item, config, attributes: [:title])
+      end
+
+      context 'nothing changed' do
+        it { is_expected.not_to be }
+      end
+
+      context 'attribute changed' do
+        before { config[:title] = 'omg new title' }
+        it { is_expected.to be }
+      end
+
+      context 'other attribute changed' do
+        before { config[:subtitle] = 'tagline here' }
+        it { is_expected.not_to be }
+      end
+    end
+
     context 'only raw content dependency' do
       before do
         dependency_store.record_dependency(item, other_item, raw_content: true)

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

@@ -35,7 +35,7 @@ describe Nanoc::Int::OutdatednessRules do
 
     let(:action_sequences) { {} }
     let(:reps) { Nanoc::Int::ItemRepRepo.new }
-    let(:dependency_store) { Nanoc::Int::DependencyStore.new(items, layouts) }
+    let(:dependency_store) { Nanoc::Int::DependencyStore.new(items, layouts, config) }
     let(:action_sequence_store) { Nanoc::Int::ActionSequenceStore.new }
     let(:checksum_store) { Nanoc::Int::ChecksumStore.new(objects: objects) }
 
@@ -84,27 +84,6 @@ describe Nanoc::Int::OutdatednessRules do
       end
     end
 
-    context 'ConfigurationModified' do
-      let(:rule_class) { Nanoc::Int::OutdatednessRules::ConfigurationModified }
-
-      context 'non-outdated' do
-        let(:config) { Nanoc::Int::Configuration.new }
-
-        before { checksum_store.add(config) }
-
-        it { is_expected.not_to be }
-      end
-
-      context 'outdated' do
-        let(:config) { Nanoc::Int::Configuration.new }
-        let(:config_old) { Nanoc::Int::Configuration.new(hash: { foo: 125 }) }
-
-        before { checksum_store.add(config_old) }
-
-        it { is_expected.to be }
-      end
-    end
-
     context 'NotWritten' do
       let(:rule_class) { Nanoc::Int::OutdatednessRules::NotWritten }
 
@@ -311,6 +290,10 @@ describe Nanoc::Int::OutdatednessRules do
           end
         end
       end
+
+      context 'config' do
+        # TODO
+      end
     end
 
     context 'RulesModified' do

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

@@ -14,7 +14,7 @@ shared_examples 'a document view' do
   end
 
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(dependency_store) }
-  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection) }
+  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection, config) }
   let(:base_item) { Nanoc::Int::Item.new('base', {}, '/base.md') }
 
   let(:empty_identifiable_collection) do

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

@@ -17,7 +17,7 @@ describe Nanoc::ItemRepView do
   let(:snapshot_repo) { Nanoc::Int::SnapshotRepo.new }
 
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(dependency_store) }
-  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection) }
+  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection, config) }
   let(:base_item) { Nanoc::Int::Item.new('base', {}, '/base.md') }
 
   let(:empty_identifiable_collection) do

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

@@ -18,7 +18,7 @@ describe Nanoc::ItemWithRepsView do
   let(:reps) { [] }
   let(:items) { [] }
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(dependency_store) }
-  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection) }
+  let(:dependency_store) { Nanoc::Int::DependencyStore.new(empty_identifiable_collection, empty_identifiable_collection, config) }
   let(:compilation_context) { double(:compilation_context) }
   let(:snapshot_repo) { Nanoc::Int::SnapshotRepo.new }
 

data/spec/nanoc/cli/commands/show_data_spec.rb

@@ -30,7 +30,7 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
     let(:config) { Nanoc::Int::Configuration.new }
 
     let(:dependency_store) do
-      Nanoc::Int::DependencyStore.new(items, layouts)
+      Nanoc::Int::DependencyStore.new(items, layouts, config)
     end
 
     let(:layouts) do
@@ -55,6 +55,24 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
       end
     end
 
+    context 'dependency (without props) from config to dog' do
+      before do
+        dependency_store.record_dependency(item_dog, config)
+      end
+
+      it 'outputs no dependencies for /about.md' do
+        expect { subject }.to output(%r{^item /about.md depends on:\n  \(nothing\)$}m).to_stdout
+      end
+
+      it 'outputs dependencies for /dog.md' do
+        expect { subject }.to output(%r{^item /dog.md depends on:\n  \[ config \] \(racp\) $}m).to_stdout
+      end
+
+      it 'outputs no dependencies for /other.dat' do
+        expect { subject }.to output(%r{^item /other.dat depends on:\n  \(nothing\)$}m).to_stdout
+      end
+    end
+
     context 'dependency (without props) from about to dog' do
       before do
         dependency_store.record_dependency(item_dog, item_about)
@@ -93,6 +111,16 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
       end
     end
 
+    context 'dependency (with attributes prop) from config to dog' do
+      before do
+        dependency_store.record_dependency(item_dog, config, attributes: true)
+      end
+
+      it 'outputs dependencies for /dog.md' do
+        expect { subject }.to output(%r{^item /dog.md depends on:\n  \[ config \] \(_a__\) $}m).to_stdout
+      end
+    end
+
     context 'dependency (with compiled_content prop) from about to dog' do
       before do
         dependency_store.record_dependency(item_dog, item_about, compiled_content: true)

data/spec/nanoc/deploying/fog_spec.rb

@@ -48,6 +48,10 @@ describe Nanoc::Deploying::Deployers::Fog, stdio: true do
           'remote/bucky/woof',
         ])
     end
+
+    it 'does not leave lingering open files' do
+      expect { subject }.not_to leak_open_files
+    end
   end
 
   context 'dry run' do

data/spec/nanoc/integration/outdatedness_integration_spec.rb

@@ -20,7 +20,7 @@ describe 'Outdatedness integration', site: true, stdio: true do
           filter :erb
           write '/bar.html'
         end
-EOS
+      EOS
     end
 
     before { Nanoc::CLI.run(%w[compile]) }
@@ -71,6 +71,57 @@ EOS
     end
   end
 
+  context 'only attribute dependency on config' do
+    let(:time) { Time.now }
+
+    before do
+      File.write('content/bar.md', '<%= @config[:title] %>')
+
+      FileUtils.touch('content/bar.md', mtime: time)
+
+      File.write('nanoc.yaml', <<~EOS)
+        title: The Original
+      EOS
+
+      File.write('Rules', <<~EOS)
+        compile '/foo.*' do
+          write '/foo.html'
+        end
+
+        compile '/bar.*' do
+          filter :erb
+          write '/bar.html'
+        end
+      EOS
+    end
+
+    before { Nanoc::CLI.run(%w[compile]) }
+
+    it 'shows default rep outdatedness' do
+      expect { Nanoc::CLI.run(%w[show-data --no-color]) }.to(
+        output(/^item \/bar\.md, rep default:\n  is not outdated/).to_stdout,
+      )
+    end
+
+    it 'shows file as outdated after modification' do
+      File.write('content/bar.md', 'JUST BAR!')
+      FileUtils.touch('content/bar.md', mtime: time)
+
+      expect { Nanoc::CLI.run(%w[show-data --no-color]) }.to(
+        output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout,
+      )
+    end
+
+    it 'shows file and dependencies as outdated after title modification' do
+      File.write('nanoc.yaml', 'title: Totes Newz')
+      FileUtils.touch('nanoc.yaml', mtime: time)
+
+      expect { Nanoc::CLI.run(%w[show-data --no-color]) }.to(
+        output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout,
+      )
+    end
+  end
+
   context 'only raw content dependency' do
     before do
       File.write('content/foo.md', "---\ntitle: hello\n---\n\nfoo")
@@ -85,7 +136,7 @@ EOS
           filter :erb
           write '/bar.html'
         end
-EOS
+      EOS
     end
 
     before { Nanoc::CLI.run(%w[compile]) }
@@ -147,7 +198,7 @@ EOS
           filter :erb
           write '/bar.html'
         end
-EOS
+      EOS
     end
 
     before { Nanoc::CLI.run(%w[compile]) }
@@ -205,7 +256,7 @@ EOS
           filter :erb
           write '/bar.html'
         end
-EOS
+      EOS
 
       expect { Nanoc::CLI.run(%w[show-data --no-color]) }.to(
         output(/^item \/foo\.md, rep default:\n  is outdated:/).to_stdout,

data/spec/spec_helper.rb

@@ -277,3 +277,42 @@ RSpec::Matchers.define :send_notification do |name, *expected_args|
     "expected that proc would not send notification #{name.inspect} with args #{expected_args.inspect}"
   end
 end
+
+RSpec::Matchers.define :leak_open_files do |_name, *_expected_args|
+  # Some remarks:
+  #
+  # • This matcher relies on global state (list of file descriptors and their
+  #   state), which means that a test case that uses this matcher can fail if
+  #   tests are being run in parallel.
+  #
+  # • This matcher assumes that file descriptors are closed explicitly, rather
+  #   than implicitly through garbage collection. This means that a test case
+  #   that uses this matcher can fail if the code exercised by the test case
+  #   relies on file descriptors to be closed when they are garbage collected.
+
+  supports_block_expectations
+
+  match do |actual|
+    open_files_before = []
+    ObjectSpace.each_object(File) { |f| open_files_before << f.fileno unless f.closed? }
+
+    actual.call
+
+    open_files_after = []
+    ObjectSpace.each_object(File) { |f| open_files_after << f.fileno unless f.closed? }
+
+    open_files_before.sort != open_files_after.sort
+  end
+
+  description do
+    'leak open files'
+  end
+
+  failure_message do |_actual|
+    'expected that proc would leak open files'
+  end
+
+  failure_message_when_negated do |_actual|
+    'expected that proc would not leak open files'
+  end
+end

data/test/base/test_dependency_tracker.rb

@@ -13,7 +13,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts)
+    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
 
     # Verify no dependencies yet
     assert_empty store.objects_causing_outdatedness_of(items.to_a[0])
@@ -30,7 +30,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts)
+    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
 
     # Record some dependencies
     store.record_dependency(items.to_a[0], items.to_a[1])
@@ -49,7 +49,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts)
+    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
 
     # Record some dependencies
     store.record_dependency(items.to_a[0], items.to_a[0])
@@ -69,7 +69,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts)
+    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
 
     # Record some dependencies
     store.record_dependency(items.to_a[0], items.to_a[1])
@@ -91,7 +91,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts)
+    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
 
     # Record some dependencies
     store.record_dependency(items.to_a[0], items.to_a[1])
@@ -113,7 +113,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts)
+    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
 
     # Record some dependencies
     store.record_dependency(items.to_a[0], items.to_a[1])
@@ -125,7 +125,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     assert File.file?(store.filename)
 
     # Re-create
-    store = Nanoc::Int::DependencyStore.new(items, layouts)
+    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
 
     # Load
     store.load
@@ -153,7 +153,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     new_items = Nanoc::Int::IdentifiableCollection.new(config, [items.to_a[0], items.to_a[1], items.to_a[2]])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(old_items, layouts)
+    store = Nanoc::Int::DependencyStore.new(old_items, layouts, config)
 
     # Record some dependencies
     store.record_dependency(items.to_a[0], items.to_a[1])
@@ -165,7 +165,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     assert File.file?(store.filename)
 
     # Re-create
-    store = Nanoc::Int::DependencyStore.new(new_items, layouts)
+    store = Nanoc::Int::DependencyStore.new(new_items, layouts, config)
 
     # Load
     store.load
@@ -187,7 +187,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts)
+    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
 
     # Record some dependencies
     store.record_dependency(items.to_a[0], items.to_a[1])
@@ -198,7 +198,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     assert File.file?(store.filename)
 
     # Re-create
-    store = Nanoc::Int::DependencyStore.new(items, layouts)
+    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
 
     # Load
     store.load
@@ -219,7 +219,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts)
+    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
 
     # Record some dependencies
     store.record_dependency(items.to_a[0], items.to_a[1])
@@ -230,7 +230,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     assert File.file?(store.filename)
 
     # Re-create
-    store = Nanoc::Int::DependencyStore.new(items, layouts)
+    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
 
     # Load
     store.load
@@ -251,7 +251,7 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
     ])
 
     # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts)
+    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
 
     # Record some dependencies
     store.record_dependency(items.to_a[0], items.to_a[1])

data/test/filters/test_xsl.rb

@@ -92,7 +92,7 @@ EOS
     items = Nanoc::Int::IdentifiableCollection.new(config)
     layouts = Nanoc::Int::IdentifiableCollection.new(config)
 
-    @dependency_store = Nanoc::Int::DependencyStore.new(items, layouts)
+    @dependency_store = Nanoc::Int::DependencyStore.new(items, layouts, config)
     @dependency_tracker = Nanoc::Int::DependencyTracker.new(@dependency_store)
 
     @base_item = Nanoc::Int::Item.new('base', {}, '/base.md')

data/test/helpers/test_blogging.rb

@@ -34,7 +34,7 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
     config = Nanoc::Int::Configuration.new.with_defaults
     items = Nanoc::Int::IdentifiableCollection.new(config)
     layouts = Nanoc::Int::IdentifiableCollection.new(config)
-    dep_store = Nanoc::Int::DependencyStore.new(items, layouts)
+    dep_store = Nanoc::Int::DependencyStore.new(items, layouts, config)
     dependency_tracker = Nanoc::Int::DependencyTracker.new(dep_store)
 
     @view_context = Nanoc::ViewContext.new(

data/test/helpers/test_xml_sitemap.rb

@@ -11,7 +11,7 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
     config = Nanoc::Int::Configuration.new.with_defaults
     items = Nanoc::Int::IdentifiableCollection.new(config)
     layouts = Nanoc::Int::IdentifiableCollection.new(config)
-    dep_store = Nanoc::Int::DependencyStore.new(items, layouts)
+    dep_store = Nanoc::Int::DependencyStore.new(items, layouts, config)
     dependency_tracker = Nanoc::Int::DependencyTracker.new(dep_store)
 
     @reps = Nanoc::Int::ItemRepRepo.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.7.11
+  version: 4.7.12
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -104,7 +104,7 @@ description: Nanoc is a static-site generator focused on flexibility. It transfo
   content from a format such as Markdown or AsciiDoc into another format, usually
   HTML, and lays out pages consistently to retain the site’s look and feel throughout.
   Static sites built with Nanoc can be deployed to any web server.
-email: denis.defreyne@stoneship.org
+email: denis@stoneship.org
 executables:
 - nanoc
 extensions: []
@@ -121,6 +121,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
+- CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -222,7 +223,6 @@ files:
 - lib/nanoc/base/services/outdatedness_rules.rb
 - lib/nanoc/base/services/outdatedness_rules/attributes_modified.rb
 - lib/nanoc/base/services/outdatedness_rules/code_snippets_modified.rb
-- lib/nanoc/base/services/outdatedness_rules/configuration_modified.rb
 - lib/nanoc/base/services/outdatedness_rules/content_modified.rb
 - lib/nanoc/base/services/outdatedness_rules/not_written.rb
 - lib/nanoc/base/services/outdatedness_rules/rules_modified.rb

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc::Int::OutdatednessRules
-  class ConfigurationModified < Nanoc::Int::OutdatednessRule
-    extend Nanoc::Int::Memoization
-
-    affects_props :raw_content, :attributes, :compiled_content, :path
-
-    def apply(_obj, outdatedness_checker)
-      if config_modified?(outdatedness_checker)
-        Nanoc::Int::OutdatednessReasons::ConfigurationModified
-      end
-    end
-
-    private
-
-    memoized def config_modified?(outdatedness_checker)
-      obj = outdatedness_checker.site.config
-      ch_old = outdatedness_checker.checksum_store[obj]
-      ch_new = outdatedness_checker.checksums.checksum_for(obj)
-      ch_old != ch_new
-    end
-  end
-end