nanoc 4.6.1 → 4.6.2

data/test/fixtures/vcr_cassettes/html_run_error.yml

@@ -2,16 +2,13 @@
 http_interactions:
 - request:
     method: post
-    uri: https://validator.w3.org/check
+    uri: https://validator.nu/?out=json&parser=html&showsource=yes
     body:
       encoding: UTF-8
-      string: "--349832898984244898448024464570528145\r\nContent-Disposition: form-data;
-        name=\"output\"\r\n\r\nsoap12\r\n--349832898984244898448024464570528145\r\nContent-Disposition:
-        form-data; name=\"uploaded_file\"; filename=\"output/blah.html\"\r\nContent-Type:
-        text/html\r\n\r\n<h2>Hi!</h1>\r\n--349832898984244898448024464570528145--\r\n"
+      string: "<h2>Hi!</h1>"
     headers:
       Content-Type:
-      - multipart/form-data; boundary=349832898984244898448024464570528145
+      - text/html; charset=utf-8
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
@@ -23,80 +20,32 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      Date:
-      - Sat, 17 Dec 2016 08:33:18 GMT
       Server:
-      - Apache/2.4.10 (Debian)
-      X-W3c-Validator-Recursion:
-      - '1'
-      X-W3c-Validator-Status:
-      - Invalid
-      X-W3c-Validator-Errors:
-      - '2'
-      X-W3c-Validator-Warnings:
-      - '4'
+      - nginx/1.11.10
+      Date:
+      - Sat, 04 Mar 2017 21:33:40 GMT
+      Content-Type:
+      - application/json; charset=utf-8
       Transfer-Encoding:
       - chunked
-      Content-Type:
-      - application/soap+xml; charset=UTF-8
+      Connection:
+      - keep-alive
+      Accept-Encoding:
+      - gzip
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Headers:
+      - content-type
+      Expires:
+      - Thu, 01 Jan 1970 00:00:00 GMT
+      Cache-Control:
+      - no-cache
       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
+      - max-age=31536000; includeSubDomains; preload
     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: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.
-        The document does not look like HTML, therefore automatic fallback could not
-        be performed, and the document was only checked against basic markup syntax.</p>\n
-        \   <p>Learn <a href=\"docs/help.html#faq-doctype\">how to add a doctype to
-        your document</a> \n    from our <acronym title=\"Frequently Asked Questions\">FAQ</acronym>,
-        or use the validator's\n    <code>Document Type</code> option to validate
-        your document against a specific Document Type.</p>\n  </div>\n\n                  ]]>\n
-        \               </m:explanation>\n                <m:source><![CDATA[<strong
-        title=\"Position where error was detected.\">&#60;</strong>h2&#62;Hi!&#60;/h1&#62;]]></m:source>\n
-        \           </m:error>\n           \n            <m:error>\n                <m:line>1</m:line>\n
-        \               <m:col>12</m:col>\n                <m:message>end tag for
-        element &quot;H1&quot; which is not open</m:message>\n                <m:messageid>79</m:messageid>\n
-        \               <m:explanation>  <![CDATA[\n                      <p class=\"helpwanted\">\n
-        \     <a\n        href=\"feedback.html?uri=;errmsg_id=79#errormsg\"\n\ttitle=\"Suggest
-        improvements on this error message through our feedback channels\" \n      >&#x2709;</a>\n
-        \   </p>\n\n    <div class=\"ve mid-79\">\n    <p>\n      The Validator found
-        an end tag for the above element, but that element is\n      not currently
-        open. This is often caused by a leftover end tag from an\n      element that
-        was removed during editing, or by an implicitly closed\n      element (if
-        you have an error related to an element being used where it\n      is not
-        allowed, this is almost certainly the case). In the latter case\n      this
-        error will disappear as soon as you fix the original problem.\n    </p>\n
-        \   <p>\n      If this error occurred in a script section of your document,
-        you should probably\n      read this <a href=\"docs/help.html#faq-javascript\">FAQ
-        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:markupvalidationresponse>\n</env:Body>\n</env:Envelope>\n"
+      encoding: ASCII-8BIT
+      string: !binary |-
+        eyJtZXNzYWdlcyI6W3sidHlwZSI6ImVycm9yIiwibGFzdExpbmUiOjEsImxhc3RDb2x1bW4iOjQsImZpcnN0Q29sdW1uIjoxLCJtZXNzYWdlIjoiU3RhcnQgdGFnIHNlZW4gd2l0aG91dCBzZWVpbmcgYSBkb2N0eXBlIGZpcnN0LiBFeHBlY3RlZCBlLmcuIOKAnDwhRE9DVFlQRSBodG1sPuKAnS4iLCJleHRyYWN0IjoiPGgyPkhpITwvaCIsImhpbGl0ZVN0YXJ0IjowLCJoaWxpdGVMZW5ndGgiOjR9LHsidHlwZSI6ImVycm9yIiwibGFzdExpbmUiOjEsImxhc3RDb2x1bW4iOjQsImZpcnN0Q29sdW1uIjoxLCJtZXNzYWdlIjoiRWxlbWVudCDigJxoZWFk4oCdIGlzIG1pc3NpbmcgYSByZXF1aXJlZCBpbnN0YW5jZSBvZiBjaGlsZCBlbGVtZW50IOKAnHRpdGxl4oCdLiIsImV4dHJhY3QiOiI8aDI+SGkhPC9oIiwiaGlsaXRlU3RhcnQiOjAsImhpbGl0ZUxlbmd0aCI6NH0seyJ0eXBlIjoiZXJyb3IiLCJsYXN0TGluZSI6MSwibGFzdENvbHVtbiI6MTIsImZpcnN0Q29sdW1uIjo4LCJtZXNzYWdlIjoiRW5kIHRhZyDigJxoMeKAnSBzZWVuLCBidXQgdGhlcmUgd2VyZSBvcGVuIGVsZW1lbnRzLiIsImV4dHJhY3QiOiI8aDI+SGkhPC9oMT4iLCJoaWxpdGVTdGFydCI6NywiaGlsaXRlTGVuZ3RoIjo1fV0sInNvdXJjZSI6eyJ0eXBlIjoidGV4dC9odG1sIiwiZW5jb2RpbmciOiJVVEYtOCIsImNvZGUiOiI8aDI+SGkhPC9oMT4ifX0K
     http_version: 
-  recorded_at: Sat, 17 Dec 2016 08:33:19 GMT
+  recorded_at: Sat, 04 Mar 2017 21:33:40 GMT
 recorded_with: VCR 3.0.3

data/test/helpers/test_xml_sitemap.rb

@@ -19,30 +19,33 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   def test_xml_sitemap
     if_have 'builder', 'nokogiri' do
       # Create items
-      @items = Nanoc::Int::IdentifiableCollection.new({})
+      items = []
 
       # Create item 1
       item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'), @view_context)
-      @items << item
+      items << item
       create_item_rep(item.unwrap, :one_a, '/item-one/a/')
       create_item_rep(item.unwrap, :one_b, '/item-one/b/')
 
       # Create item 2
       item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 2', { is_hidden: true }, '/item-two/'), @view_context)
-      @items << item
+      items << item
 
       # Create item 3
       attrs = { mtime: Time.parse('2004-07-12 00:00:00 +02:00'), changefreq: 'daily', priority: 0.5 }
       item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 3', attrs, '/item-three/'), @view_context)
-      @items << item
+      items << item
       create_item_rep(item.unwrap, :three_a, '/item-three/a/')
       create_item_rep(item.unwrap, :three_b, '/item-three/b/')
 
       # Create item 4
       item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 4', {}, '/item-four/'), @view_context)
-      @items << item
+      items << item
       create_item_rep(item.unwrap, :four_a, nil)
 
+      # Create items
+      @items = Nanoc::Int::IdentifiableCollection.new({}, items)
+
       # Create sitemap item
       @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/'), @view_context)
 
@@ -80,13 +83,14 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   def test_sitemap_with_items_as_param
     if_have 'builder', 'nokogiri' do
       # Create items
-      @items = Nanoc::Int::IdentifiableCollection.new({})
-      @items << nil
+      items = []
+      items << nil
       item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'), @view_context)
-      @items << item
+      items << item
       create_item_rep(item.unwrap, :one_a, '/item-one/a/')
       create_item_rep(item.unwrap, :one_b, '/item-one/b/')
-      @items << nil
+      items << nil
+      @items = Nanoc::Int::IdentifiableCollection.new({})
 
       # Create sitemap item
       @item = Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/')
@@ -117,9 +121,8 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   def test_filter
     if_have 'builder', 'nokogiri' do
       # Create items
-      @items = Nanoc::Int::IdentifiableCollection.new({})
       item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'), @view_context)
-      @items << item
+      @items = Nanoc::Int::IdentifiableCollection.new({}, [item])
       create_item_rep(item.unwrap, :one_a, '/item-one/a/')
       create_item_rep(item.unwrap, :one_b, '/item-one/b/')
 
@@ -148,19 +151,20 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   def test_sorted
     if_have 'builder', 'nokogiri' do
       # Create items
-      @items = Nanoc::Int::IdentifiableCollection.new({})
+      items = []
       item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/george/'), @view_context)
-      @items << item
+      items << item
       create_item_rep(item.unwrap, :a_alice,   '/george/alice/')
       create_item_rep(item.unwrap, :b_zoey,    '/george/zoey/')
       item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/walton/'), @view_context)
-      @items << item
+      items << item
       create_item_rep(item.unwrap, :a_eve,     '/walton/eve/')
       create_item_rep(item.unwrap, :b_bob,     '/walton/bob/')
       item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/lucas/'), @view_context)
-      @items << item
+      items << item
       create_item_rep(item.unwrap, :a_trudy,   '/lucas/trudy/')
       create_item_rep(item.unwrap, :b_mallory, '/lucas/mallory/')
+      @items = Nanoc::Int::IdentifiableCollection.new({}, items)
 
       # Create sitemap item
       @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/'), @view_context)
@@ -189,9 +193,8 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   def test_url_escape
     if_have 'builder', 'nokogiri' do
       # Create items
-      @items = Nanoc::Int::IdentifiableCollection.new({})
       item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 1', {}, '/george/'), @view_context)
-      @items << item
+      @items = Nanoc::Int::IdentifiableCollection.new({}, [item])
       create_item_rep(item.unwrap, :default, '/cool projects/проверка')
 
       # Create sitemap item
@@ -217,8 +220,8 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
 
   def create_item_rep(item, name, path)
     rep = Nanoc::Int::ItemRep.new(item, name)
-    rep.paths     = { last: path }
-    rep.raw_paths = { last: path }
+    rep.paths     = { last: (path ? [path] : []) }
+    rep.raw_paths = { last: (path ? [path] : []) }
     @reps << rep
     rep
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.6.2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -161,13 +161,16 @@ files:
 - lib/nanoc/base/feature.rb
 - lib/nanoc/base/memoization.rb
 - lib/nanoc/base/repos.rb
+- lib/nanoc/base/repos/aggregate_data_source.rb
 - lib/nanoc/base/repos/checksum_store.rb
 - lib/nanoc/base/repos/compiled_content_cache.rb
 - lib/nanoc/base/repos/config_loader.rb
 - lib/nanoc/base/repos/data_source.rb
 - lib/nanoc/base/repos/dependency_store.rb
+- lib/nanoc/base/repos/in_mem_data_source.rb
 - lib/nanoc/base/repos/item_rep_repo.rb
 - lib/nanoc/base/repos/outdatedness_store.rb
+- lib/nanoc/base/repos/prefixed_data_source.rb
 - lib/nanoc/base/repos/rule_memory_store.rb
 - lib/nanoc/base/repos/site_loader.rb
 - lib/nanoc/base/repos/snapshot_repo.rb
@@ -339,6 +342,7 @@ files:
 - spec/nanoc/base/entities/configuration_spec.rb
 - spec/nanoc/base/entities/content_spec.rb
 - spec/nanoc/base/entities/document_spec.rb
+- spec/nanoc/base/entities/identifiable_collection_spec.rb
 - spec/nanoc/base/entities/identifier_spec.rb
 - spec/nanoc/base/entities/item_rep_spec.rb
 - spec/nanoc/base/entities/item_spec.rb
@@ -426,11 +430,21 @@ files:
 - spec/nanoc/regressions/gh_1022_spec.rb
 - spec/nanoc/regressions/gh_1031_spec.rb
 - spec/nanoc/regressions/gh_1035_spec.rb
+- spec/nanoc/regressions/gh_1037a_spec.rb
+- spec/nanoc/regressions/gh_1037b_spec.rb
 - spec/nanoc/regressions/gh_1040_spec.rb
 - spec/nanoc/regressions/gh_1045_spec.rb
 - spec/nanoc/regressions/gh_1047_spec.rb
 - spec/nanoc/regressions/gh_1064_spec.rb
 - spec/nanoc/regressions/gh_1067_spec.rb
+- spec/nanoc/regressions/gh_1082a_spec.rb
+- spec/nanoc/regressions/gh_1082b_spec.rb
+- spec/nanoc/regressions/gh_1082c_spec.rb
+- spec/nanoc/regressions/gh_1082d_spec.rb
+- spec/nanoc/regressions/gh_1093_spec.rb
+- spec/nanoc/regressions/gh_1097_spec.rb
+- spec/nanoc/regressions/gh_1100_spec.rb
+- spec/nanoc/regressions/gh_1102_spec.rb
 - spec/nanoc/regressions/gh_761_spec.rb
 - spec/nanoc/regressions/gh_767_spec.rb
 - spec/nanoc/regressions/gh_769_spec.rb