nanoc 4.0.0rc2 → 4.0.0rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce4a238700e7502d74064d9e013beb617db329ec
-  data.tar.gz: 89e4fd37145ee9fad99eb7f3675cc2bba2205d81
+  metadata.gz: a702d1af4491144cc70a378338ebb2db5a62003d
+  data.tar.gz: 90dbc13b34f0c10d11ff49625057340012a1b0b2
 SHA512:
-  metadata.gz: 8d62477b536a1ebee8555c3e025eeed536a355bd11c2caa1b1fd7865696f899f0857c10eb2c12224f884541e3a16bb67e75e4d87f96f272ec68f18b2f1a6ae0b
-  data.tar.gz: 2d5e7a0dd2238702dd44df29e66fc5c81abed4a48f752066a55f03e300fecc702a877c4a4cbeb47e1bf59b0150a278842ce0cc617826237f8098f8749d311eaa
+  metadata.gz: 8affe17459068c8137cc7b279ca6802011dc92956de4ce242015ae8fe09aca41655c117ab229f539c34de63583f26abb57e1a5a11f7a2e73b9574f8f654a40df
+  data.tar.gz: 791dd43b1f816385256dbf3335abaf178368385bf846f4967f9c48123a28cfef51ad2d011a88e989a3338981efabff87f3f2f4a17e9268b4cb167e1269a98789

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.0.0rc2)
+    nanoc (4.0.0rc3)
       cri (~> 2.3)
 
 GEM
@@ -12,9 +12,9 @@ GEM
     addressable (2.3.8)
     adsf (1.2.0)
       rack (>= 1.0.0)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
+    ast (2.1.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
     bluecloth (2.2.0)
     builder (3.2.2)
     chunky_png (1.3.4)
@@ -44,17 +44,18 @@ GEM
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    excon (0.45.3)
-    execjs (2.5.2)
+    excon (0.45.4)
+    execjs (2.6.0)
     ffi (1.9.10)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.32.0)
+    fog (1.34.0)
       fog-atmos
       fog-aws (>= 0.6.0)
       fog-brightbox (~> 0.4)
       fog-core (~> 1.32)
-      fog-ecloud (= 0.1.1)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
       fog-google (>= 0.0.2)
       fog-json
       fog-local
@@ -75,26 +76,30 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.6.0)
+    fog-aws (0.7.6)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-brightbox (0.7.2)
+    fog-brightbox (0.9.0)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.32.0)
+    fog-core (1.32.1)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-    fog-ecloud (0.1.1)
+    fog-dynect (0.0.2)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.3.0)
       fog-core
       fog-xml
-    fog-google (0.0.6)
+    fog-google (0.0.7)
       fog-core
       fog-json
       fog-xml
@@ -107,7 +112,7 @@ GEM
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
-    fog-profitbricks (0.0.3)
+    fog-profitbricks (0.0.5)
       fog-core
       fog-xml
       nokogiri
@@ -119,7 +124,7 @@ GEM
       fog-core
       fog-json
       fog-xml
-    fog-sakuracloud (1.0.1)
+    fog-sakuracloud (1.1.1)
       fog-core
       fog-json
     fog-serverlove (0.1.2)
@@ -145,7 +150,7 @@ GEM
       nokogiri (~> 1.5, >= 1.5.11)
     formatador (0.2.5)
     fssm (0.2.10)
-    haml (4.0.6)
+    haml (4.0.7)
       tilt
     handlebars (0.7.0)
       handlebars-source (~> 3.0.0)
@@ -156,11 +161,11 @@ GEM
     inflecto (0.0.2)
     ipaddress (0.8.0)
     json (1.8.3)
-    kramdown (1.7.0)
+    kramdown (1.8.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.11)
-    listen (3.0.1)
+    listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     markaby (0.8.0)
@@ -168,12 +173,12 @@ GEM
     maruku (0.7.2)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.1)
+    multi_json (1.11.2)
     mustache (1.0.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -197,28 +202,28 @@ GEM
     rainbow (2.0.0)
     rainpress (1.0)
     rake (10.4.2)
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdiscount (2.1.8)
     rdoc (4.2.0)
     redcarpet (3.3.2)
-    ref (1.0.5)
+    ref (2.0.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rouge (1.9.0)
+    rouge (1.10.1)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
       rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
+    rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
@@ -249,10 +254,10 @@ GEM
       ref
     thor (0.19.1)
     tilt (2.0.1)
-    tins (1.5.4)
+    tins (1.6.0)
     typogruby (1.0.18)
       rubypants
-    uglifier (2.7.1)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.4)
@@ -322,4 +327,4 @@ DEPENDENCIES
   yuicompressor
 
 BUNDLED WITH
-   1.10.5
+   1.10.6

data/NEWS.md

@@ -1,5 +1,28 @@
 # Nanoc news
 
+## 4.0.0rc3 (2015-09-20)
+
+Features:
+
+* Added `Identifier#without_exts` and `Identifier#exts` (#644, #696) [Rémi Barraquand]
+* Added `DocumentView#attributes` (#699, #702)
+
+Fixes:
+
+* Fixed issue when comparing document views (#680, #693)
+
+Enhancements:
+
+* Made `#base_url` argument in `#tags_for` optional (#687) [Croath Liu]
+* Allowed `IdentifiableCollection#[]` to be passed an identifier (#681, #695)
+* Improved `Pattern.from` error message (#683, #692)
+* Let default site use a direct link to the stylesheet (#685, #701)
+
+Changes:
+
+* Removed `Identifier#with_ext` because its behavior was confusing (#697, #700)
+* Disallowed storing document (views) in attributes (#682, #694)
+
 ## 4.0.0rc2 (2015-07-11)
 
 Fixes:

data/README.md

@@ -19,4 +19,4 @@ Contributions are greatly appreciated! Consult the [Development guidelines](http
 
 Many thanks to everyone who has contributed to Nanoc in one way or another:
 
-Ale Muñoz, Alexander Mankuta, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Chris Eppstein, Christian Plessl, Colin Barrett, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Go Maeda, Gregory Pakosz, Grégory Karékinian, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Louis T., Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Michal Cichra, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Peter Aronoff, Raphael von der Grün, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Simon South, Spencer Whitt, Stanley Rost, Starr Horne, Stefan Bühler, Stuart Montgomery, Takashi Uchibe, Toon Willems, Tuomas Kareinen, Ursula Kallio, Vincent Driessen, Xavier Shay, Zaiste de Grengolada, Šime Ramov
+Ale Muñoz, Alexander Mankuta, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Chris Eppstein, Christian Plessl, Colin Barrett, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Go Maeda, Gregory Pakosz, Grégory Karékinian, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Louis T., Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Michal Cichra, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Peter Aronoff, Raphael von der Grün, Rémi Barraquand, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Šime Ramov, Simon South, Spencer Whitt, Stanley Rost, Starr Horne, Stefan Bühler, Stuart Montgomery, Takashi Uchibe, Toon Willems, Tuomas Kareinen, Ursula Kallio, Vincent Driessen, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada

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

@@ -106,37 +106,20 @@ module Nanoc
     end
 
     # @return [String]
-    def with_ext(ext)
+    def without_ext
       unless full?
         raise UnsupportedLegacyOperationError
       end
 
-      # Strip extension, if any
       extname = File.extname(@string)
-      string =
-        if extname.size > 0
-          @string[0..-extname.size - 1]
-        else
-          @string
-        end
 
-      # Add extension
-      if ext.size > 0
-        if ext.start_with?('.')
-          string + ext
-        else
-          string + '.' + ext
-        end
+      if extname.size > 0
+        @string[0..-extname.size - 1]
       else
-        string
+        @string
       end
     end
 
-    # @return [String]
-    def without_ext
-      with_ext('')
-    end
-
     # @return [String] The extension, without a leading dot.
     def ext
       unless full?
@@ -147,6 +130,26 @@ module Nanoc
       s && s[1..-1]
     end
 
+    # @return [String]
+    def without_exts
+      extname = exts.join('.')
+      if extname.size > 0
+        @string[0..-extname.size - 2]
+      else
+        @string
+      end
+    end
+
+    # @return [Array] List of extensions, without a leading dot.
+    def exts
+      unless full?
+        raise UnsupportedLegacyOperationError
+      end
+
+      s = File.basename(@string)
+      s ? s.split('.', -1).drop(1) : []
+    end
+
     def to_s
       @string
     end

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

@@ -10,7 +10,7 @@ module Nanoc::Int
       when Regexp
         Nanoc::Int::RegexpPattern.new(obj)
       else
-        raise ArgumentError, "Do not know how to convert #{obj} into a Nanoc::Pattern"
+        raise ArgumentError, "Do not know how to convert `#{obj.inspect}` into a Nanoc::Pattern"
       end
     end
 

data/lib/nanoc/base/identifiable_collection.rb

@@ -24,6 +24,8 @@ module Nanoc::Int
 
     def [](arg)
       case arg
+      when Nanoc::Identifier
+        object_with_identifier(arg)
       when String
         object_with_identifier(arg) || object_matching_glob(arg)
       when Regexp

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

@@ -15,7 +15,7 @@ module Nanoc
 
     # @see Object#==
     def ==(other)
-      identifier == other.identifier
+      other.respond_to?(:identifier) && identifier == other.identifier
     end
     alias_method :eql?, :==
 
@@ -37,6 +37,14 @@ module Nanoc
       unwrap.attributes[key]
     end
 
+    # @return [Hash]
+    def attributes
+      Nanoc::Int::NotificationCenter.post(:visit_started, unwrap)
+      Nanoc::Int::NotificationCenter.post(:visit_ended,   unwrap)
+
+      unwrap.attributes
+    end
+
     # @see Hash#fetch
     def fetch(key, fallback = NONE, &_block)
       Nanoc::Int::NotificationCenter.post(:visit_started, unwrap)

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

@@ -1,11 +1,34 @@
 module Nanoc
   module MutableDocumentViewMixin
+    # @api private
+    class DisallowedAttributeValueError < Nanoc::Error
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+
+      def message
+        "The #{value.class} cannot be stored inside an attribute. Store its identifier instead."
+      end
+    end
+
     # Sets the value for the given attribute.
     #
     # @param [Symbol] key
     #
     # @see Hash#[]=
     def []=(key, value)
+      disallowed_value_classes = Set.new([
+        Nanoc::Int::Item,
+        Nanoc::Int::Layout,
+        Nanoc::ItemView,
+        Nanoc::LayoutView,
+      ])
+      if disallowed_value_classes.include?(value.class)
+        raise DisallowedAttributeValueError.new(value)
+      end
+
       unwrap.attributes[key] = value
     end
 

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

@@ -254,7 +254,7 @@ EOS
   <head>
     <meta charset="utf-8">
     <title>A Brand New Nanoc Site - <%= @item[:title] %></title>
-    <link rel="stylesheet" href="<%= @items['/stylesheet.*'].path %>">
+    <link rel="stylesheet" href="/stylesheet.css">
 
     <!-- you don't need to keep this, but it's cool for stats! -->
     <meta name="generator" content="Nanoc <%= Nanoc::VERSION %>">

data/lib/nanoc/helpers/tagging.rb

@@ -16,7 +16,9 @@ module Nanoc::Helpers
     # HTML-escaping rules for {#link_for_tag} apply here as well.
     #
     # @option params [String] base_url The URL to which the tag will be appended
-    #   to construct the link URL. This URL must have a trailing slash.
+    #   to construct the link URL. This URL must have a trailing slash. The
+    #   function would return a tags string without tag page link if the param
+    #   is not provided.
     #
     # @option params [String] none_text ("(none)") The text to display when
     #   the item has no tags
@@ -26,14 +28,14 @@ module Nanoc::Helpers
     #
     # @return [String] A hyperlinked list of tags for the given item
     def tags_for(item, params = {})
-      base_url  = params.fetch(:base_url)
+      base_url  = params[:base_url]
       none_text = params[:none_text] || '(none)'
       separator = params[:separator] || ', '
 
       if item[:tags].nil? || item[:tags].empty?
         none_text
       else
-        item[:tags].map { |tag| link_for_tag(tag, base_url) }.join(separator)
+        item[:tags].map { |tag| base_url ? link_for_tag(tag, base_url) : tag }.join(separator)
       end
     end
 

data/lib/nanoc/version.rb

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

data/test/helpers/test_tagging.rb

@@ -47,6 +47,14 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
     )
   end
 
+  def test_tags_for_without_base_url
+    # Create item
+    item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', { tags: %w(foo bar) }, '/path/'))
+
+    # Check
+    assert_equal('foo, bar', tags_for(item))
+  end
+
   def test_items_with_tag
     # Create items
     @items = Nanoc::ItemCollectionView.new([

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.0.0rc2
+  version: 4.0.0rc3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri