nanoc 4.4.2 → 4.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 321bc54ed62384061039f82d10745b494012e4ff
-  data.tar.gz: ec7e38daa14af1a0b6cc64bd71e3492585de9865
+  metadata.gz: 949b7676e2070a525cf434e0157e0423e1f694af
+  data.tar.gz: 2b1c582dd18c89efdec5ba5c8d89803dd938930f
 SHA512:
-  metadata.gz: 4e4fcde666aba2b332294e99ddb1381b3d988371f6cb8ee7a23501917f279694a69a0af19c9465c3c0608104243aecc3480732cf88c9e9d83ac9f313ee259a30
-  data.tar.gz: c233e8b716f68bc31569732bf7a1092ae7c4450b820281ccbc9c853ab63d3cbbd105a20dbead2f6cbef59ede2d9583d1df05a76548b5494263e7c1ea1df371c2
+  metadata.gz: cb85fb348177d808a2bc17d47b33564a4f226d98adbfb08bbbf543ab7a2efc6dc65710f7040b877f47d547a08daa5bad8726b4ab99f5fb9dd2a12ad6d1425179
+  data.tar.gz: 77d463b8d56a22823571ec42d870f044aaf33f8ded0fff69da80ddbaef09c19a9dc4ca163760a4b460a58858ce22d96c4a3a6eb1382f4640d3f2d20d5e7d4697

data/Gemfile.lock

@@ -1,15 +1,15 @@
 GIT
   remote: git://github.com/tmm1/pygments.rb.git
-  revision: 4ed8701d65f6db7d8778cc56291999a0a87c7eda
+  revision: fc7e79ef1a5c215abe5f3e5ac7d5fdd12dd8b73d
   specs:
-    pygments.rb (0.6.3)
+    pygments.rb (1.0.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.2)
 
 PATH
   remote: .
   specs:
-    nanoc (4.4.1)
+    nanoc (4.4.3)
       cri (~> 2.3)
       hamster (~> 3.0)
       parallel (~> 1.9)
@@ -36,7 +36,7 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.11.1)
+    coffee-script-source (1.12.2)
     colored (1.2)
     commonjs (0.2.7)
     compass (1.0.3)
@@ -53,15 +53,15 @@ GEM
       sass (>= 3.2, < 3.5)
     concurrent-ruby (1.0.2)
     contracts (0.14.0)
-    coveralls (0.8.16)
+    coveralls (0.8.17)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
-      term-ansicolor (~> 1.3.0)
+      term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-      tins (>= 1.6.0, < 2)
+      tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    cri (2.7.0)
+    cri (2.7.1)
       colored (~> 1.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
@@ -108,7 +108,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.12.0)
+    fog-aws (1.1.0)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -187,7 +187,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.5.1)
+    fog-vsphere (1.5.2)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.2.3)
@@ -242,7 +242,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
+    minitest (5.10.1)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
@@ -255,7 +255,7 @@ GEM
       shellany (~> 0.0)
     pandoc-ruby (2.0.1)
     parallel (1.10.0)
-    parser (2.3.2.0)
+    parser (2.3.3.1)
       ast (~> 2.2)
     posix-spawn (0.3.12)
     powerpack (0.1.1)
@@ -267,7 +267,7 @@ GEM
     rack (2.0.1)
     rainbow (2.1.0)
     rainpress (1.0)
-    rake (11.3.0)
+    rake (12.0.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
@@ -294,7 +294,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.45.0)
+    rubocop (0.46.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -316,26 +316,26 @@ GEM
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     temple (0.7.7)
-    term-ansicolor (1.3.2)
+    term-ansicolor (1.4.0)
       tins (~> 1.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.19.3)
+    thor (0.19.4)
     tilt (2.0.5)
     timecop (0.8.1)
     tins (1.13.0)
     trollop (2.1.2)
     typogruby (1.0.18)
       rubypants
-    uglifier (3.0.3)
+    uglifier (3.0.4)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.1.1)
+    unicode-display_width (1.1.2)
     vcr (3.0.3)
-    w3c_validators (1.2)
-      json
-      nokogiri
-    webmock (2.1.0)
+    w3c_validators (1.3)
+      json (~> 2.0)
+      nokogiri (~> 1.6)
+    webmock (2.3.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff

data/NEWS.md

@@ -1,5 +1,19 @@
 # Nanoc news
 
+## 4.4.3 (2016-12-17)
+
+Fixes:
+
+* Prevented stale data from making it into the compiled content cache and thereby blowing up in memory (#1004, #1013)
+* Fixed “about” and “IRC channel” links in default site
+* Fixed accuracy of `<updated>` in Atom feed (use most recent `updated_at` or `created_at`) (#1007, #1014)
+
+Enhancements:
+
+* Added support for non-legacy identifiers in `#breadcrumbs_trail` (#1010, #1011)
+* Defined checksum for `Nanoc::Int::Context` to make outdatedness checker more precise (#1008, #1012)
+* Made Nanoc raise an error when item reps are routed to a path that does not start with a slash (#1015, #1016)
+
 ## 4.4.2 (2016-11-27)
 
 Fixes:

data/lib/nanoc/base/contracts_support.rb

@@ -30,8 +30,7 @@ module Nanoc::Int
       Func        = Ignorer.instance
       RespondTo   = Ignorer.instance
 
-      def contract(*args)
-      end
+      def contract(*args); end
     end
 
     module EnabledContracts

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

@@ -4,9 +4,10 @@ module Nanoc::Int
   #
   # @api private
   class CompiledContentCache < ::Nanoc::Int::Store
-    def initialize(env_name: nil)
+    def initialize(env_name: nil, items:)
       super(Nanoc::Int::Store.tmp_path_for(env_name: env_name, store_name: 'compiled_content'), 2)
 
+      @items = items
       @cache = {}
     end
 
@@ -45,7 +46,15 @@ module Nanoc::Int
     end
 
     def data=(new_data)
-      @cache = new_data
+      @cache = {}
+
+      item_identifiers = Set.new(@items.map(&:identifier))
+
+      new_data.each_pair do |item_identifier, content_per_rep|
+        if item_identifiers.include?(item_identifier)
+          @cache[item_identifier] ||= content_per_rep
+        end
+      end
     end
   end
 end

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

@@ -85,8 +85,7 @@ module Nanoc
     # default implementation simply does nothing.
     #
     # @return [void]
-    def up
-    end
+    def up; end
 
     # Brings down the connection to the data. This method should undo the
     # effects of the {#up} method. For example, a database connection
@@ -96,8 +95,7 @@ module Nanoc
     # default implementation simply does nothing.
     #
     # @return [void]
-    def down
-    end
+    def down; end
 
     # Returns the collection of items (represented by {Nanoc::Int::Item}) in
     # this site. The default implementation simply returns an empty array.

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

@@ -109,16 +109,14 @@ module Nanoc::Int
     # by the subclass.
     #
     # @return [void]
-    def no_data_found
-    end
+    def no_data_found; end
 
     # Callback method that is called when a version mismatch is detected. By
     # default, this implementation does nothing, but it should probably be
     # overridden by the subclass.
     #
     # @return [void]
-    def version_mismatch_detected
-    end
+    def version_mismatch_detected; end
 
     private
 

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

@@ -96,6 +96,8 @@ module Nanoc::Int
           UnwrapUpdateBehavior
         when Nanoc::RuleDSL::RuleContext
           RuleContextUpdateBehavior
+        when Nanoc::Int::Context
+          ContextUpdateBehavior
         else
           RescueUpdateBehavior
         end
@@ -117,6 +119,17 @@ module Nanoc::Int
       end
     end
 
+    class ContextUpdateBehavior
+      def self.update(obj, digest)
+        obj.instance_variables.each do |var|
+          digest.update(var.to_s)
+          digest.update('=')
+          yield(obj.instance_variable_get(var))
+          digest.update(',')
+        end
+      end
+    end
+
     class UpdateBehavior
       def self.update(_obj, _digest)
         raise NotImpementedError

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

@@ -24,8 +24,14 @@ module Nanoc::Int
           reps: item_rep_repo,
         )
 
+      compiled_content_cache =
+        Nanoc::Int::CompiledContentCache.new(
+          env_name: site.config.env_name,
+          items: site.items,
+        )
+
       params = {
-        compiled_content_cache: Nanoc::Int::CompiledContentCache.new(env_name: site.config.env_name),
+        compiled_content_cache: compiled_content_cache,
         checksum_store: checksum_store,
         rule_memory_store: rule_memory_store,
         dependency_store: dependency_store,

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

@@ -10,16 +10,13 @@ module Nanoc::Int
       include Nanoc::Int::ContractsSupport
 
       contract C_OBJ, C_ARGS => C::Any
-      def enter(_obj, raw_content: false, attributes: false, compiled_content: false, path: false)
-      end
+      def enter(_obj, raw_content: false, attributes: false, compiled_content: false, path: false); end
 
       contract C_OBJ => C::Any
-      def exit
-      end
+      def exit; end
 
       contract C_OBJ, C_ARGS => C::Any
-      def bounce(_obj, raw_content: false, attributes: false, compiled_content: false, path: false)
-      end
+      def bounce(_obj, raw_content: false, attributes: false, compiled_content: false, path: false); end
     end
 
     def initialize(dependency_store)

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

@@ -9,6 +9,12 @@ module Nanoc::Int
       end
     end
 
+    class RouteWithoutSlashError < ::Nanoc::Error
+      def initialize(output_path, rep)
+        super("The item representation #{rep.inspect} is routed to #{output_path}, which does not start with a slash, as required.")
+      end
+    end
+
     def initialize(reps, action_provider, site)
       @reps = reps
       @action_provider = action_provider
@@ -29,6 +35,10 @@ module Nanoc::Int
       return if basic_path.nil?
       basic_path = basic_path.encode('UTF-8')
 
+      unless basic_path.start_with?('/')
+        raise RouteWithoutSlashError.new(basic_path, rep)
+      end
+
       # Check for duplicate paths
       if paths_to_reps.key?(basic_path)
         raise IdenticalRoutesError.new(basic_path, paths_to_reps[basic_path], rep)

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

@@ -24,8 +24,7 @@ module Nanoc::CLI::Commands
     #
     # @abstract Subclasses must override {#start} and may override {#stop}.
     class Listener
-      def initialize(*)
-      end
+      def initialize(*); end
 
       # @param [Nanoc::CLI::CommandRunner] command_runner The command runner for this listener
       #
@@ -48,8 +47,7 @@ module Nanoc::CLI::Commands
       # Stops the listener. The default implementation removes self from all notification center observers.
       #
       # @return [void]
-      def stop
-      end
+      def stop; end
 
       # @api private
       def start_safely

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

@@ -278,14 +278,13 @@ EOS
     <div id="sidebar">
       <h2>Documentation</h2>
       <ul>
-        <li><a href="http://nanoc.ws/about/">About</a></li>
         <li><a href="http://nanoc.ws/doc/">Documentation</a></li>
         <li><a href="http://nanoc.ws/doc/tutorial/">Tutorial</a></li>
       </ul>
       <h2>Community</h2>
       <ul>
         <li><a href="http://groups.google.com/group/nanoc/">Discussion group</a></li>
-        <li><a href="irc://chat.freenode.net/#nanoc">IRC channel</a></li>
+        <li><a href="https://gitter.im/nanoc/nanoc">Gitter channel</a></li>
         <li><a href="http://nanoc.ws/contributing/">Contributing</a></li>
       </ul>
     </div>

data/lib/nanoc/data_sources/filesystem.rb

@@ -47,12 +47,10 @@ module Nanoc::DataSources
   # @api private
   class Filesystem < Nanoc::DataSource
     # See {Nanoc::DataSource#up}.
-    def up
-    end
+    def up; end
 
     # See {Nanoc::DataSource#down}.
-    def down
-    end
+    def down; end
 
     def content_dir_name
       config.fetch(:content_dir, 'content')

data/lib/nanoc/helpers/blogging.rb

@@ -72,6 +72,10 @@ module Nanoc::Helpers
         sorted_relevant_articles.first
       end
 
+      def updated
+        relevant_articles.map { |a| attribute_to_time(a[:updated_at] || a[:created_at]) }.max
+      end
+
       def validate_config
         if @config[:base_url].nil?
           raise Nanoc::Int::Errors::GenericTrivial.new('Cannot build Atom feed: site configuration has no base_url')
@@ -109,7 +113,7 @@ module Nanoc::Helpers
           xml.title title
 
           # Add date
-          xml.updated(attribute_to_time(last_article[:created_at]).__nanoc_to_iso8601_time)
+          xml.updated(updated.__nanoc_to_iso8601_time)
 
           # Add links
           xml.link(rel: 'alternate', href: root_url)

data/lib/nanoc/helpers/breadcrumbs.rb

@@ -1,31 +1,25 @@
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#breadcrumbs
   module Breadcrumbs
-    class CannotGetBreadcrumbsForNonLegacyItem < Nanoc::Int::Errors::Generic
-      def initialize(identifier)
-        super("You cannot build a breadcrumbs trail for an item that has a “full” identifier (#{identifier}). Doing so is only possible for items that have a legacy identifier.")
-      end
-    end
-
     # @return [Array]
     def breadcrumbs_trail
-      unless @item.identifier.legacy?
-        raise CannotGetBreadcrumbsForNonLegacyItem.new(@item.identifier)
-      end
+      # e.g. ['', '/foo', '/foo/bar']
+      components = item.identifier.components
+      prefixes = components.inject(['']) { |acc, elem| acc + [acc.last + '/' + elem] }
 
-      trail      = []
-      idx_start  = 0
-
-      loop do
-        idx = @item.identifier.to_s.index('/', idx_start)
-        break if idx.nil?
-
-        idx_start = idx + 1
-        identifier = @item.identifier.to_s[0..idx]
-        trail << @items[identifier]
+      if @item.identifier.legacy?
+        prefixes.map { |pr| @items[Nanoc::Identifier.new('/' + pr, type: :legacy)] }
+      else
+        prefixes
+          .reject { |pr| pr =~ /^\/index\./ }
+          .map do |pr|
+            if pr == ''
+              @items['/index.*']
+            else
+              @items[Nanoc::Identifier.new(pr).without_ext + '.*']
+            end
+          end
       end
-
-      trail
     end
   end
 end

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.4.2'.freeze
+  VERSION = '4.4.3'.freeze
 end

data/test/base/test_compiler.rb

@@ -12,7 +12,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
     action_provider = Nanoc::Int::ActionProvider.named(:rule_dsl).for(site)
 
     params = {
-      compiled_content_cache: Nanoc::Int::CompiledContentCache.new,
+      compiled_content_cache: Nanoc::Int::CompiledContentCache.new(items: site.items),
       checksum_store: Nanoc::Int::ChecksumStore.new(site: site),
       rule_memory_store: Nanoc::Int::RuleMemoryStore.new,
       dependency_store: Nanoc::Int::DependencyStore.new(

data/test/checking/checks/test_html.rb

@@ -1,5 +1,11 @@
 class Nanoc::Checking::Checks::HTMLTest < Nanoc::TestCase
   def test_run_ok
+    require 'w3c_validators'
+
+    if ::W3CValidators::VERSION == '1.3'
+      skip 'broken (see https://github.com/w3c-validators/w3c_validators/issues/25)'
+    end
+
     VCR.use_cassette('html_run_ok') do
       with_site do |site|
         # Create files

data/test/cli/test_logger.rb

@@ -1,4 +1,3 @@
 class Nanoc::CLI::LoggerTest < Nanoc::TestCase
-  def test_stub
-  end
+  def test_stub; end
 end

data/test/fixtures/vcr_cassettes/css_run_error.yml

@@ -1,12 +1,17 @@
 ---
 http_interactions:
 - request:
-    method: get
-    uri: http://jigsaw.w3.org/css-validator/validator?output=soap12&profile=css3&text=h1%20%7B%20coxlor:%20rxed%3B%20%7D
+    method: post
+    uri: http://jigsaw.w3.org/css-validator/validator
     body:
-      encoding: US-ASCII
-      string: ''
+      encoding: UTF-8
+      string: "--349832898984244898448024464570528145\r\nContent-Disposition: form-data;
+        name=\"profile\"\r\n\r\ncss3\r\n--349832898984244898448024464570528145\r\nContent-Disposition:
+        form-data; name=\"text\"\r\n\r\nh1 { coxlor: rxed; }\r\n--349832898984244898448024464570528145\r\nContent-Disposition:
+        form-data; name=\"output\"\r\n\r\nsoap12\r\n--349832898984244898448024464570528145--\r\n"
     headers:
+      Content-Type:
+      - multipart/form-data; boundary=349832898984244898448024464570528145
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
@@ -21,7 +26,7 @@ http_interactions:
       Cache-Control:
       - no-cache
       Date:
-      - Thu, 24 Apr 2014 07:25:20 GMT
+      - Sat, 17 Dec 2016 08:33:23 GMT
       Pragma:
       - no-cache
       Transfer-Encoding:
@@ -42,9 +47,9 @@ http_interactions:
       encoding: UTF-8
       string: "<?xml version='1.0' encoding=\"utf-8\"?>\n<env:Envelope xmlns:env=\"http://www.w3.org/2003/05/soap-envelope\">\n
         \   <env:Body>\n        <m:cssvalidationresponse\n            env:encodingStyle=\"http://www.w3.org/2003/05/soap-encoding\"\n
-        \           xmlns:m=\"http://www.w3.org/2005/07/css-validator\">\n            <m:uri>file://localhost/TextArea</m:uri>\n
+        \           xmlns:m=\"http://www.w3.org/2005/07/css-validator\">\n            <m:uri>TextArea</m:uri>\n
         \           <m:checkedby>http://jigsaw.w3.org/css-validator/</m:checkedby>\n
-        \           <m:csslevel>css3</m:csslevel>\n            <m:date>2014-04-24T07:25:20Z</m:date>\n
+        \           <m:csslevel>css3</m:csslevel>\n            <m:date>2016-12-17T08:33:23Z</m:date>\n
         \           <m:validity>false</m:validity>\n            <m:result>\n                <m:errors
         xml:lang=\"en\">\n                    <m:errorcount>1</m:errorcount>\n                                                                    \n
         \               <m:errorlist>\n                    <m:uri>file://localhost/TextArea</m:uri>\n
@@ -61,5 +66,5 @@ http_interactions:
         \               </m:warnings>\n            </m:result>\n        </m:cssvalidationresponse>\n
         \   </env:Body>\n</env:Envelope>\n\n"
     http_version: 
-  recorded_at: Thu, 24 Apr 2014 07:25:20 GMT
-recorded_with: VCR 2.9.0
+  recorded_at: Sat, 17 Dec 2016 08:33:24 GMT
+recorded_with: VCR 3.0.3

data/test/fixtures/vcr_cassettes/css_run_ok.yml

@@ -1,12 +1,17 @@
 ---
 http_interactions:
 - request:
-    method: get
-    uri: http://jigsaw.w3.org/css-validator/validator?output=soap12&profile=css3&text=h1%20%7B%20color:%20red%3B%20%7D
+    method: post
+    uri: http://jigsaw.w3.org/css-validator/validator
     body:
-      encoding: US-ASCII
-      string: ''
+      encoding: UTF-8
+      string: "--349832898984244898448024464570528145\r\nContent-Disposition: form-data;
+        name=\"profile\"\r\n\r\ncss3\r\n--349832898984244898448024464570528145\r\nContent-Disposition:
+        form-data; name=\"text\"\r\n\r\nh1 { color: red; }\r\n--349832898984244898448024464570528145\r\nContent-Disposition:
+        form-data; name=\"output\"\r\n\r\nsoap12\r\n--349832898984244898448024464570528145--\r\n"
     headers:
+      Content-Type:
+      - multipart/form-data; boundary=349832898984244898448024464570528145
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
@@ -21,7 +26,7 @@ http_interactions:
       Cache-Control:
       - no-cache
       Date:
-      - Thu, 24 Apr 2014 07:25:20 GMT
+      - Sat, 17 Dec 2016 08:33:24 GMT
       Pragma:
       - no-cache
       Transfer-Encoding:
@@ -31,7 +36,7 @@ http_interactions:
       Content-Type:
       - application/soap+xml;charset=utf-8
       Server:
-      - Jigsaw/2.3.0-beta3
+      - Jigsaw/2.3.0-beta2
       Vary:
       - Accept-Language
       X-W3c-Validator-Errors:
@@ -42,14 +47,14 @@ http_interactions:
       encoding: UTF-8
       string: "<?xml version='1.0' encoding=\"utf-8\"?>\n<env:Envelope xmlns:env=\"http://www.w3.org/2003/05/soap-envelope\">\n
         \   <env:Body>\n        <m:cssvalidationresponse\n            env:encodingStyle=\"http://www.w3.org/2003/05/soap-encoding\"\n
-        \           xmlns:m=\"http://www.w3.org/2005/07/css-validator\">\n            <m:uri>file://localhost/TextArea</m:uri>\n
+        \           xmlns:m=\"http://www.w3.org/2005/07/css-validator\">\n            <m:uri>TextArea</m:uri>\n
         \           <m:checkedby>http://jigsaw.w3.org/css-validator/</m:checkedby>\n
-        \           <m:csslevel>css3</m:csslevel>\n            <m:date>2014-04-24T07:25:20Z</m:date>\n
+        \           <m:csslevel>css3</m:csslevel>\n            <m:date>2016-12-17T08:33:24Z</m:date>\n
         \           <m:validity>true</m:validity>\n            <m:result>\n                <m:errors
         xml:lang=\"en\">\n                    <m:errorcount>0</m:errorcount>\n    \n
         \               </m:errors>\n                <m:warnings xml:lang=\"en\">\n
         \                   <m:warningcount>0</m:warningcount>\n                </m:warnings>\n
         \           </m:result>\n        </m:cssvalidationresponse>\n    </env:Body>\n</env:Envelope>\n\n"
     http_version: 
-  recorded_at: Thu, 24 Apr 2014 07:25:20 GMT
-recorded_with: VCR 2.9.0
+  recorded_at: Sat, 17 Dec 2016 08:33:24 GMT
+recorded_with: VCR 3.0.3

data/test/fixtures/vcr_cassettes/css_run_parse_error.yml

@@ -1,12 +1,17 @@
 ---
 http_interactions:
 - request:
-    method: get
-    uri: http://jigsaw.w3.org/css-validator/validator?output=soap12&profile=css3&text=h1%20%7B%20%3B%20%7B
+    method: post
+    uri: http://jigsaw.w3.org/css-validator/validator
     body:
-      encoding: US-ASCII
-      string: ''
+      encoding: UTF-8
+      string: "--349832898984244898448024464570528145\r\nContent-Disposition: form-data;
+        name=\"profile\"\r\n\r\ncss3\r\n--349832898984244898448024464570528145\r\nContent-Disposition:
+        form-data; name=\"text\"\r\n\r\nh1 { ; {\r\n--349832898984244898448024464570528145\r\nContent-Disposition:
+        form-data; name=\"output\"\r\n\r\nsoap12\r\n--349832898984244898448024464570528145--\r\n"
     headers:
+      Content-Type:
+      - multipart/form-data; boundary=349832898984244898448024464570528145
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
@@ -21,7 +26,7 @@ http_interactions:
       Cache-Control:
       - no-cache
       Date:
-      - Sat, 06 Dec 2014 11:12:00 GMT
+      - Sat, 17 Dec 2016 08:33:24 GMT
       Pragma:
       - no-cache
       Transfer-Encoding:
@@ -31,7 +36,7 @@ http_interactions:
       Content-Type:
       - application/soap+xml;charset=utf-8
       Server:
-      - Jigsaw/2.3.0-beta2
+      - Jigsaw/2.3.0-beta3
       Vary:
       - Accept-Language
       X-W3c-Validator-Errors:
@@ -42,9 +47,9 @@ http_interactions:
       encoding: UTF-8
       string: "<?xml version='1.0' encoding=\"utf-8\"?>\n<env:Envelope xmlns:env=\"http://www.w3.org/2003/05/soap-envelope\">\n
         \   <env:Body>\n        <m:cssvalidationresponse\n            env:encodingStyle=\"http://www.w3.org/2003/05/soap-encoding\"\n
-        \           xmlns:m=\"http://www.w3.org/2005/07/css-validator\">\n            <m:uri>file://localhost/TextArea</m:uri>\n
+        \           xmlns:m=\"http://www.w3.org/2005/07/css-validator\">\n            <m:uri>TextArea</m:uri>\n
         \           <m:checkedby>http://jigsaw.w3.org/css-validator/</m:checkedby>\n
-        \           <m:csslevel>css3</m:csslevel>\n            <m:date>2014-12-06T11:12:00Z</m:date>\n
+        \           <m:csslevel>css3</m:csslevel>\n            <m:date>2016-12-17T08:33:24Z</m:date>\n
         \           <m:validity>false</m:validity>\n            <m:result>\n                <m:errors
         xml:lang=\"en\">\n                    <m:errorcount>1</m:errorcount>\n                                                                    \n
         \               <m:errorlist>\n                    <m:uri>file://localhost/TextArea</m:uri>\n
@@ -61,5 +66,5 @@ http_interactions:
         \               </m:warnings>\n            </m:result>\n        </m:cssvalidationresponse>\n
         \   </env:Body>\n</env:Envelope>\n\n"
     http_version: 
-  recorded_at: Sat, 06 Dec 2014 11:12:00 GMT
-recorded_with: VCR 2.9.3
+  recorded_at: Sat, 17 Dec 2016 08:33:24 GMT
+recorded_with: VCR 3.0.3

data/test/fixtures/vcr_cassettes/html_run_error.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: http://validator.w3.org/check
+    uri: https://validator.w3.org/check
     body:
       encoding: UTF-8
       string: "--349832898984244898448024464570528145\r\nContent-Disposition: form-data;
@@ -24,9 +24,9 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Thu, 24 Apr 2014 07:25:20 GMT
+      - Sat, 17 Dec 2016 08:33:18 GMT
       Server:
-      - Apache/2.2.16 (Debian)
+      - Apache/2.4.10 (Debian)
       X-W3c-Validator-Recursion:
       - '1'
       X-W3c-Validator-Status:
@@ -35,23 +35,38 @@ http_interactions:
       - '2'
       X-W3c-Validator-Warnings:
       - '4'
-      Content-Type:
-      - application/soap+xml; charset=UTF-8
-      Connection:
-      - close
       Transfer-Encoding:
       - chunked
+      Content-Type:
+      - application/soap+xml; charset=UTF-8
+      Strict-Transport-Security:
+      - max-age=15552015; preload
+      Public-Key-Pins:
+      - pin-sha256="cN0QSpPIkuwpT6iP2YjEo1bEwGpH/yiUn6yhdy+HNto="; pin-sha256="WGJkyYjx1QMdMe0UqlyOKXtydPDVrk7sl2fV+nNm1r4=";
+        pin-sha256="LrKdTxZLRTvyHM4/atX2nquX9BeHRZMCxg3cf4rhc2I="; max-age=864000
+      X-Frame-Options:
+      - deny
+      X-Xss-Protection:
+      - 1; mode=block
     body:
       encoding: UTF-8
       string: "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<env:Envelope xmlns:env=\"http://www.w3.org/2003/05/soap-envelope\">\n<env:Body>\n<m:markupvalidationresponse
         env:encodingStyle=\"http://www.w3.org/2003/05/soap-encoding\" xmlns:m=\"http://www.w3.org/2005/10/markup-validator\">\n
         \   \n    <m:uri>output/blah.html</m:uri>\n    <m:checkedby>http://validator.w3.org/</m:checkedby>\n
         \   <m:doctype></m:doctype>\n    <m:charset>utf-8</m:charset>\n    <m:validity>false</m:validity>\n
-        \   <m:errors>\n        <m:errorcount>2</m:errorcount>\n        <m:errorlist>\n
-        \         \n            <m:error>\n                <m:line>1</m:line>\n                <m:col>1</m:col>\n
-        \               <m:message>no document type declaration; will parse without
-        validation</m:message>\n                <m:messageid>187</m:messageid>\n                <m:explanation>
-        \ <![CDATA[\n                      <p class=\"helpwanted\">\n      <a\n        href=\"feedback.html?uri=;errmsg_id=187#errormsg\"\n\ttitle=\"Suggest
+        \   <m:warnings>\n        <m:warningcount>4</m:warningcount>\n        <m:warninglist>\n
+        \          \n\n\n\n\n  <m:warning><m:messageid>W04</m:messageid><m:message>No
+        Character Encoding Found!\n    \n      Falling back to \n    \n    UTF-8.\n
+        \ </m:message></m:warning>\n\n\n\n  <m:warning><m:messageid>W06</m:messageid><m:message>Unable
+        to Determine Parse Mode!</m:message></m:warning>\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
+        \ <m:warning><m:messageid>W27</m:messageid><m:message>No Character encoding
+        declared at document level</m:message></m:warning>\n\n\n\n\n\n\n\n        </m:warninglist>\n
+        \   </m:warnings>\n    <m:errors>\n        <m:errorcount>2</m:errorcount>\n
+        \       <m:errorlist>\n\n            <m:error>\n                <m:line>1</m:line>\n
+        \               <m:col>1</m:col>\n                <m:message>no document type
+        declaration; will parse without validation</m:message>\n                <m:messageid>187</m:messageid>\n
+        \               <m:explanation>  <![CDATA[\n                      <p class=\"helpwanted\">\n
+        \     <a\n        href=\"feedback.html?uri=;errmsg_id=187#errormsg\"\n\ttitle=\"Suggest
         improvements on this error message through our feedback channels\" \n      >&#x2709;</a>\n
         \   </p>\n\n    <div class=\"ve mid-187\">\n    <p>The document type could
         not be determined, because the document had no correct DOCTYPE declaration.
@@ -81,14 +96,7 @@ http_interactions:
         entry</a>.\n    </p>\n  </div>\n\n                  ]]>\n                </m:explanation>\n
         \               <m:source><![CDATA[&#60;h2&#62;Hi!&#60;/h1<strong title=\"Position
         where error was detected.\">&#62;</strong>]]></m:source>\n            </m:error>\n
-        \          \n        </m:errorlist>\n    </m:errors>\n    <m:warnings>\n        <m:warningcount>4</m:warningcount>\n
-        \       <m:warninglist>\n        \n\n\n\n  <m:warning><m:messageid>W04</m:messageid><m:message>No
-        Character Encoding Found!\n    \n      Falling back to \n    \n    UTF-8.\n
-        \ </m:message></m:warning>\n\n\n\n  <m:warning><m:messageid>W06</m:messageid><m:message>Unable
-        to Determine Parse Mode!</m:message></m:warning>\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
-        \ <m:warning><m:messageid>W27</m:messageid><m:message>No Character encoding
-        declared at document level</m:message></m:warning>\n\n\n\n\n\n\n\n        \n
-        \       </m:warninglist>\n    </m:warnings>\n</m:markupvalidationresponse>\n</env:Body>\n</env:Envelope>\n"
+        \          \n        </m:errorlist>\n    </m:errors>\n</m:markupvalidationresponse>\n</env:Body>\n</env:Envelope>\n"
     http_version: 
-  recorded_at: Thu, 24 Apr 2014 07:25:21 GMT
-recorded_with: VCR 2.9.0
+  recorded_at: Sat, 17 Dec 2016 08:33:19 GMT
+recorded_with: VCR 3.0.3

data/test/fixtures/vcr_cassettes/html_run_ok.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: http://validator.w3.org/check
+    uri: https://validator.w3.org/check
     body:
       encoding: UTF-8
       string: "--349832898984244898448024464570528145\r\nContent-Disposition: form-data;
@@ -20,37 +20,105 @@ http_interactions:
       - Ruby
   response:
     status:
-      code: 200
-      message: OK
+      code: 307
+      message: Temporary Redirect
     headers:
       Date:
-      - Thu, 24 Apr 2014 07:25:21 GMT
+      - Sat, 17 Dec 2016 08:36:04 GMT
       Server:
-      - Apache/2.2.16 (Debian)
-      X-W3c-Validator-Recursion:
-      - '1'
-      X-W3c-Validator-Status:
-      - Valid
-      X-W3c-Validator-Errors:
-      - '0'
-      X-W3c-Validator-Warnings:
-      - '1'
-      Content-Type:
-      - application/soap+xml; charset=UTF-8
-      Connection:
-      - close
+      - Apache/2.4.10 (Debian)
+      Location:
+      - https://validator.w3.org/nu/#file
       Transfer-Encoding:
       - chunked
+      Strict-Transport-Security:
+      - max-age=15552015; preload
+      Public-Key-Pins:
+      - pin-sha256="cN0QSpPIkuwpT6iP2YjEo1bEwGpH/yiUn6yhdy+HNto="; pin-sha256="WGJkyYjx1QMdMe0UqlyOKXtydPDVrk7sl2fV+nNm1r4=";
+        pin-sha256="LrKdTxZLRTvyHM4/atX2nquX9BeHRZMCxg3cf4rhc2I="; max-age=864000
+      X-Frame-Options:
+      - deny
+      X-Xss-Protection:
+      - 1; mode=block
     body:
       encoding: UTF-8
-      string: "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<env:Envelope xmlns:env=\"http://www.w3.org/2003/05/soap-envelope\">\n<env:Body>\n<m:markupvalidationresponse
+      string: "Status: 302 Found\r\nLocation: https://validator.w3.org/nu/?doc=output%2Fblah.html\r\n\r\nContent-Type:
+        application/soap+xml; charset=UTF-8\nX-W3C-Validator-Recursion: 1\nX-W3C-Validator-Status:
+        Valid\nX-W3C-Validator-Errors: 0\nX-W3C-Validator-Warnings: 1\n\n<?xml version=\"1.0\"
+        encoding=\"UTF-8\"?>\n<env:Envelope xmlns:env=\"http://www.w3.org/2003/05/soap-envelope\">\n<env:Body>\n<m:markupvalidationresponse
         env:encodingStyle=\"http://www.w3.org/2003/05/soap-encoding\" xmlns:m=\"http://www.w3.org/2005/10/markup-validator\">\n
         \   \n    <m:uri>output/blah.html</m:uri>\n    <m:checkedby>http://validator.w3.org/</m:checkedby>\n
         \   <m:doctype>HTML5</m:doctype>\n    <m:charset>utf-8</m:charset>\n    <m:validity>true</m:validity>\n
-        \   <m:errors>\n        <m:errorcount>0</m:errorcount>\n        <m:errorlist>\n
-        \         \n        </m:errorlist>\n    </m:errors>\n    <m:warnings>\n        <m:warningcount>1</m:warningcount>\n
-        \       <m:warninglist>\n        \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
-        \       \n        </m:warninglist>\n    </m:warnings>\n</m:markupvalidationresponse>\n</env:Body>\n</env:Envelope>\n"
+        \   <m:warnings>\n        <m:warningcount>1</m:warningcount>\n        <m:warninglist>\n
+        \            <m:warning>\n                <m:message>This interface to HTML5
+        document checking is obsolete. Use an interface to https://validator.w3.org/nu/
+        instead.</m:message>\n                <m:messageid>obsolete-interface</m:messageid>\n
+        \               <m:explanation>  <![CDATA[\n                    <div class=\"ve
+        obsolete-interface\">\n                      <p>\n                        The
+        method you used to check this document relies on an obsolete interface\n                        that
+        will become permanently unavailable in the near future.\n                        The
+        currently-supported method is to instead use the W3C Nu Html Checker at\n
+        \                       <a href=\"https://validator.w3.org/nu/\">https://validator.w3.org/nu/</a>.\n
+        \                       See the documentation on the W3C Nu Html Checker's\n
+        \                       <a href=\"https://github.com/validator/validator/wiki/Service:-Input:-GET\">GET
+        interface</a>,\n                        <a href=\"https://github.com/validator/validator/wiki/Service:-Input:-POST-body\">POST
+        interface</a>,\n                        and\n                        <a href=\"https://github.com/validator/validator/wiki/Service:-Common-parameters\">the
+        parameters</a>\n                        that both interfaces provide, such
+        as the\n                        <a href=\"https://github.com/validator/validator/wiki/Output%3A-JSON\">out=json</a>,\n
+        \                       <a href=\"https://github.com/validator/validator/wiki/Output:-XML\">out=xml</a>,\n
+        \                       and\n                        <a href=\"https://github.com/validator/validator/wiki/Output:-GNU\">out=gnu</a>\n
+        \                       parameters/output-formats.\n                      </p>\n
+        \                     <p>\n                        For comments or questions
+        about this message, send mail to\n                        <a href=\"mailto:www-validator@w3.org\">www-validator@w3.org</a>\n
+        \                       or to\n                        <a href=\"https://twitter.com/w3c\">@w3c</a>
+        on twitter.\n                      </p>\n                    </div>\n                  ]]>\n
+        \               </m:explanation>\n                <m:source></m:source>\n
+        \           </m:warning>\n        </m:warninglist>\n    </m:warnings>\n    <m:errors>\n
+        \       <m:errorcount>0</m:errorcount>\n        <m:errorlist>\n\n        </m:errorlist>\n
+        \   </m:errors>\n</m:markupvalidationresponse>\n</env:Body>\n</env:Envelope>\n"
+    http_version: 
+  recorded_at: Sat, 17 Dec 2016 08:36:05 GMT
+- request:
+    method: post
+    uri: https://validator.w3.org/check
+    body:
+      encoding: UTF-8
+      string: "--349832898984244898448024464570528145\r\nContent-Disposition: form-data;
+        name=\"url\"\r\n\r\nhttps://validator.w3.org/nu/#file\r\n--349832898984244898448024464570528145--\r\n"
+    headers:
+      Content-Type:
+      - multipart/form-data; boundary=349832898984244898448024464570528145
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 302
+      message: Found
+    headers:
+      Date:
+      - Sat, 17 Dec 2016 08:36:05 GMT
+      Server:
+      - Apache/2.4.10 (Debian)
+      Location:
+      - http://validator.w3.org/check?uri=https%3A%2F%2Fvalidator.w3.org%2Fnu%2F%23file
+      Content-Length:
+      - '0'
+      Strict-Transport-Security:
+      - max-age=15552015; preload
+      Public-Key-Pins:
+      - pin-sha256="cN0QSpPIkuwpT6iP2YjEo1bEwGpH/yiUn6yhdy+HNto="; pin-sha256="WGJkyYjx1QMdMe0UqlyOKXtydPDVrk7sl2fV+nNm1r4=";
+        pin-sha256="LrKdTxZLRTvyHM4/atX2nquX9BeHRZMCxg3cf4rhc2I="; max-age=864000
+      X-Frame-Options:
+      - deny
+      X-Xss-Protection:
+      - 1; mode=block
+    body:
+      encoding: UTF-8
+      string: ''
     http_version: 
-  recorded_at: Thu, 24 Apr 2014 07:25:21 GMT
-recorded_with: VCR 2.9.0
+  recorded_at: Sat, 17 Dec 2016 08:36:06 GMT
+recorded_with: VCR 3.0.3

data/test/helpers/test_blogging.rb

@@ -93,6 +93,68 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
     end
   end
 
+  def test_atom_feed_updated_is_most_recent
+    if_have 'builder' do
+      # Create items
+      @items = [mock_item, mock_article, mock_article]
+
+      # Create item 1
+      @items[1].stubs(:[]).with(:updated_at).returns(nil)
+      @items[1].stubs(:[]).with(:created_at).returns(Time.parse('2016-12-01 17:20:00 +00:00'))
+      @items[1].expects(:compiled_content).returns('item 1 content')
+
+      # Create item 2
+      @items[2].stubs(:[]).with(:updated_at).returns(nil)
+      @items[2].stubs(:[]).with(:created_at).returns(Time.parse('2016-12-01 18:40:00 +00:00'))
+      @items[2].expects(:compiled_content).returns('item 2 content')
+
+      # Mock site
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+
+      # Create feed item
+      @item = mock
+      @item.stubs(:[]).with(:title).returns('My Cool Blog')
+      @item.stubs(:[]).with(:author_name).returns('Denis Defreyne')
+      @item.stubs(:[]).with(:author_uri).returns('http://stoneship.org/')
+      @item.stubs(:[]).with(:feed_url).returns(nil)
+      @item.stubs(:path).returns('/journal/feed/')
+
+      # Check
+      assert_match(%r{<title>My Cool Blog</title>\n  <updated>2016-12-01T18:40:00Z</updated>}, atom_feed)
+    end
+  end
+
+  def test_atom_feed_updated_is_most_recent_updated_at
+    if_have 'builder' do
+      # Create items
+      @items = [mock_item, mock_article, mock_article]
+
+      # Create item 1
+      @items[1].stubs(:[]).with(:updated_at).returns(Time.parse('2016-12-01 19:20:00 +00:00'))
+      @items[1].stubs(:[]).with(:created_at).returns(Time.parse('2016-12-01 17:20:00 +00:00'))
+      @items[1].expects(:compiled_content).returns('item 1 content')
+
+      # Create item 2
+      @items[2].stubs(:[]).with(:updated_at).returns(Time.parse('2016-12-01 20:40:00 +00:00'))
+      @items[2].stubs(:[]).with(:created_at).returns(Time.parse('2016-12-01 18:40:00 +00:00'))
+      @items[2].expects(:compiled_content).returns('item 2 content')
+
+      # Mock site
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+
+      # Create feed item
+      @item = mock
+      @item.stubs(:[]).with(:title).returns('My Cool Blog')
+      @item.stubs(:[]).with(:author_name).returns('Denis Defreyne')
+      @item.stubs(:[]).with(:author_uri).returns('http://stoneship.org/')
+      @item.stubs(:[]).with(:feed_url).returns(nil)
+      @item.stubs(:path).returns('/journal/feed/')
+
+      # Check
+      assert_match(%r{<title>My Cool Blog</title>\n  <updated>2016-12-01T20:40:00Z</updated>}, atom_feed)
+    end
+  end
+
   def test_atom_feed_without_articles
     if_have 'builder' do
       # Mock items

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.4.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2016-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri