nanoc 4.0.0rc3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a702d1af4491144cc70a378338ebb2db5a62003d
-  data.tar.gz: 90dbc13b34f0c10d11ff49625057340012a1b0b2
+  metadata.gz: 76d4a414bdd518ff5a609bef5e8fdebe476ab1fc
+  data.tar.gz: 3155b99958dcda234715e583c1a87cb9d6c2dc7e
 SHA512:
-  metadata.gz: 8affe17459068c8137cc7b279ca6802011dc92956de4ce242015ae8fe09aca41655c117ab229f539c34de63583f26abb57e1a5a11f7a2e73b9574f8f654a40df
-  data.tar.gz: 791dd43b1f816385256dbf3335abaf178368385bf846f4967f9c48123a28cfef51ad2d011a88e989a3338981efabff87f3f2f4a17e9268b4cb167e1269a98789
+  metadata.gz: 6d9d6387aa77fd9dc6e3e0b9c35e7b52722a2273011b31cb2874879ebad7bdab958f7ce44b349c489226896a09f73f6c99c3b43fad8a9487f0bb81c0489cd9e8
+  data.tar.gz: c69890e971f56e7c504d2741d30bd1c7f741b1f13a1106378d05f101c2a2fe44f8d00abb25dd257f3841b47c3a7d623b86cc7604a040f557922550149a807b6d

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    nanoc (4.0.0rc3)
+    nanoc (4.0.0)
       cri (~> 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.1)
+    CFPropertyList (2.3.2)
     RedCloth (4.2.9)
     addressable (2.3.8)
     adsf (1.2.0)
@@ -17,7 +17,7 @@ GEM
       parser (~> 2.2)
     bluecloth (2.2.0)
     builder (3.2.2)
-    chunky_png (1.3.4)
+    chunky_png (1.3.5)
     coderay (1.1.0)
     coffee-script (2.4.1)
       coffee-script-source
@@ -29,7 +29,7 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
-    coveralls (0.8.2)
+    coveralls (0.8.3)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.10.0)
@@ -41,7 +41,7 @@ GEM
       colored (~> 1.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     excon (0.45.4)
@@ -49,14 +49,15 @@ GEM
     ffi (1.9.10)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.34.0)
+    fog (1.35.0)
+      fog-aliyun
       fog-atmos
       fog-aws (>= 0.6.0)
       fog-brightbox (~> 0.4)
       fog-core (~> 1.32)
       fog-dynect (~> 0.0.2)
       fog-ecloud (~> 0.1)
-      fog-google (>= 0.0.2)
+      fog-google (>= 0.1.1)
       fog-json
       fog-local
       fog-powerdns (>= 0.1.1)
@@ -70,9 +71,15 @@ GEM
       fog-terremark
       fog-vmfusion
       fog-voxel
+      fog-xenserver
       fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
+      nokogiri
+    fog-aliyun (0.1.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      ipaddress (~> 0.8)
+      xml-simple (~> 1.1)
     fog-atmos (0.1.0)
       fog-core
       fog-xml
@@ -99,7 +106,7 @@ GEM
     fog-ecloud (0.3.0)
       fog-core
       fog-xml
-    fog-google (0.0.7)
+    fog-google (0.1.1)
       fog-core
       fog-json
       fog-xml
@@ -124,13 +131,13 @@ GEM
       fog-core
       fog-json
       fog-xml
-    fog-sakuracloud (1.1.1)
+    fog-sakuracloud (1.3.3)
       fog-core
       fog-json
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (0.4.7)
+    fog-softlayer (1.0.2)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -145,6 +152,9 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
+    fog-xenserver (0.2.2)
+      fog-core
+      fog-xml
     fog-xml (0.1.2)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
@@ -156,16 +166,17 @@ GEM
       handlebars-source (~> 3.0.0)
       therubyracer (~> 0.12.1)
     handlebars-source (3.0.3)
+    hashdiff (0.2.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     inflecto (0.0.2)
     ipaddress (0.8.0)
     json (1.8.3)
-    kramdown (1.8.0)
+    kramdown (1.9.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
-    libv8 (3.16.14.11)
-    listen (3.0.3)
+    libv8 (3.16.14.13)
+    listen (3.0.4)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     markaby (0.8.0)
@@ -175,23 +186,23 @@ GEM
     method_source (0.8.2)
     mime-types (2.6.2)
     mini_portile (0.6.2)
-    minitest (5.8.0)
+    minitest (5.8.2)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.2)
     mustache (1.0.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    netrc (0.10.3)
+    net-ssh (3.0.1)
+    netrc (0.11.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     pandoc-ruby (1.0.0)
-    parser (2.2.2.6)
+    parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     posix-spawn (0.3.11)
     powerpack (0.1.1)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -207,7 +218,7 @@ GEM
       ffi (>= 0.5.0)
     rdiscount (2.1.8)
     rdoc (4.2.0)
-    redcarpet (3.3.2)
+    redcarpet (3.3.3)
     ref (2.0.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -263,13 +274,15 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
-    vcr (2.9.3)
+    vcr (3.0.0)
     w3c_validators (1.2)
       json
       nokogiri
-    webmock (1.21.0)
+    webmock (1.22.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
+    xml-simple (1.1.5)
     yajl-ruby (1.2.1)
     yard (0.8.7.6)
     yuicompressor (1.3.3)

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.0.0 (2015-11-07)
+
+Enhancements:
+
+* `#parent` and `#children` now raise an exception when used on items with a non-legacy identifier (#710)
+
 ## 4.0.0rc3 (2015-09-20)
 
 Features:

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

@@ -87,6 +87,12 @@ module Nanoc
       @type == :full
     end
 
+    # @return [Boolean] True if this is a legacy identifier (i.e. does not
+    #   include the extension), false otherwise
+    def legacy?
+      @type == :legacy
+    end
+
     # @return [String]
     def chop
       to_s.chop

data/lib/nanoc/base/errors.rb

@@ -185,5 +185,12 @@ module Nanoc::Int
         super("There are multiple #{type}s with the #{identifier} identifier.")
       end
     end
+
+    # Error that is raised when attempting to call #parent or #children on an item with a legacy identifier.
+    class CannotGetParentOrChildrenOfNonLegacyItem < Generic
+      def initialize(identifier)
+        super("You cannot get the parent or children of an item that has a “full” identifier (#{identifier}). Getting the parent or children of an item is only possible for items that have a legacy identifier.")
+      end
+    end
   end
 end

data/lib/nanoc/base/views/item_view.rb

@@ -40,6 +40,10 @@ module Nanoc
     #
     # @return [Enumerable<Nanoc::ItemView>]
     def children
+      unless unwrap.identifier.legacy?
+        raise Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem.new(unwrap.identifier)
+      end
+
       unwrap.children.map { |i| Nanoc::ItemView.new(i) }
     end
 
@@ -50,6 +54,10 @@ module Nanoc
     #
     # @return [nil] if the item has no parent
     def parent
+      unless unwrap.identifier.legacy?
+        raise Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem.new(unwrap.identifier)
+      end
+
       unwrap.parent && Nanoc::ItemView.new(unwrap.parent)
     end
 

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

@@ -266,15 +266,15 @@ EOS
     <div id="sidebar">
       <h2>Documentation</h2>
       <ul>
-        <li><a href="http://v4.nanoc.ws/about/">About</a></li>
-        <li><a href="http://v4.nanoc.ws/doc/">Documentation</a></li>
-        <li><a href="http://v4.nanoc.ws/doc/tutorial/">Tutorial</a></li>
+        <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="http://v4.nanoc.ws/contributing/">Contributing</a></li>
+        <li><a href="http://nanoc.ws/contributing/">Contributing</a></li>
       </ul>
     </div>
   </body>

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.0.0rc3'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.0.0rc3
+  version: 4.0.0
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -348,9 +348,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.7