nanoc 4.5.1 → 4.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 963a654167126da5b235c766f7e80032c6497ca7
-  data.tar.gz: d89d08f5f6415db09415371dfa025b54ce67ca30
+  metadata.gz: 64b516baea97186cbb7ad99448ae7c02e9ce9ab2
+  data.tar.gz: 0ff4539f5c80a3c1f75838b7cb60014d3ab13a0a
 SHA512:
-  metadata.gz: 2e9ee6b3b3b960be731c3b4b0dac5364c6b7e52364cf8ea78701b70178bbc7ab127a98f0e7fe7ec318a0cd4177840ada2d71a8f7378fdab9debc38de897a24d1
-  data.tar.gz: af88ecb08d44f280983a7e2abed64109597244d6c353451103acc8e67e93b51e62e4f2102d9965ae387106c8467d9d8ad9b15d63258fded42602a692cb9428e6
+  metadata.gz: 75b0aa1a6e74954ae178edbb234d46090310344ec13f00fde190cc0ab6822c136662a57c46f418fb68310a30ab194491ad42c3283a5e3f488913e7ccfa473c80
+  data.tar.gz: 242c70e3aa96b2730ce5614ee2d7a371cce65a8df888d40e8fc45b15f7deb73742643a5e509cdae79b6fd7a4ff8e3b6985fe2128b67d1e9087f784908d8ed65c

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/bbatsov/rubocop.git
-  revision: 29ffb9ae6a9c21da55c370dd41463faf58209937
+  revision: c8d652dfa521526ff91cbf769e0d3551d50e1f3e
   specs:
     rubocop (0.46.0)
       parser (>= 2.3.3.1, < 3.0)
@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.5.1)
+    nanoc (4.5.2)
       cri (~> 2.3)
       ddplugin (~> 1.0)
       hamster (~> 3.0)
@@ -251,7 +251,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.10)
+    lumberjack (1.0.11)
     m (1.5.0)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
@@ -354,7 +354,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff
     xml-simple (1.1.5)
-    yard (0.9.6)
+    yard (0.9.7)
     yard-contracts (0.1.5)
       contracts (~> 0.7)
       yard (~> 0.8)

data/NEWS.md

@@ -1,5 +1,13 @@
 # Nanoc news
 
+## 4.5.2 (2017-01-11)
+
+Fixes:
+
+* Fixed handling of periods in full identifiers (#1022, #1059)
+* Fixed “cannot layout binary items” error message (#1058)
+* Fixed escaping of URLs in sitemaps (#1052, #1054)
+
 ## 4.5.1 (2017-01-09)
 
 Fixes:

data/lib/nanoc.rb

@@ -39,6 +39,7 @@ require 'tempfile'
 require 'thread'
 require 'time'
 require 'yaml'
+require 'uri'
 require 'English'
 
 # Load Nanoc

data/lib/nanoc/base/errors.rb

@@ -125,7 +125,7 @@ module Nanoc::Int
       # @param [Nanoc::Int::ItemRep] rep The item representation that was attempted
       #   to be laid out
       def initialize(rep)
-        super("The “{rep.item.identifier}” item (rep “#{rep.name}”) cannot be laid out because it is a binary item. If you are getting this error for an item that should be textual instead of binary, make sure that its extension is included in the text_extensions array in the site configuration.")
+        super("The “#{rep.item.identifier}” item (rep “#{rep.name}”) cannot be laid out because it is a binary item. If you are getting this error for an item that should be textual instead of binary, make sure that its extension is included in the text_extensions array in the site configuration.")
       end
     end
 

data/lib/nanoc/data_sources/filesystem.rb

@@ -302,9 +302,9 @@ module Nanoc::DataSources
 
       regex =
         if filename =~ /(^|\/)index(\.[^\/]+)?$/
-          @config && @config[:allow_periods_in_identifiers] ? /\/?(index)?(\.[^\/\.]+)?$/ : /\/?index(\.[^\/]+)?$/
+          allow_periods_in_identifiers? ? /\/?(index)?(\.[^\/\.]+)?$/ : /\/?index(\.[^\/]+)?$/
         else
-          @config && @config[:allow_periods_in_identifiers] ? /\.[^\/\.]+$/ : /\.[^\/]+$/
+          allow_periods_in_identifiers? ? /\.[^\/\.]+$/ : /\.[^\/]+$/
         end
       Nanoc::Identifier.new(filename.sub(regex, ''), type: :legacy)
     end
@@ -329,13 +329,21 @@ module Nanoc::DataSources
     #
     # @return [Regex]
     def extension_regex
-      if @config && @config[:allow_periods_in_identifiers]
+      if allow_periods_in_identifiers?
         /(\.[^\/\.]+$)/
       else
         /(\.[^\/]+$)/
       end
     end
 
+    def allow_periods_in_identifiers?
+      if @config
+        @config[:allow_periods_in_identifiers] || @config[:identifier_type] == 'full'
+      else
+        false
+      end
+    end
+
     # @return [ParseResult]
     def parse(content_filename, meta_filename)
       if meta_filename

data/lib/nanoc/helpers/xml_sitemap.rb

@@ -30,7 +30,7 @@ module Nanoc::Helpers
           reps.reject! { |r| !select_proc[r] } if select_proc
           reps.sort_by { |r| r.name.to_s }.each do |rep|
             xml.url do
-              xml.loc @config[:base_url] + rep.path
+              xml.loc URI.escape(@config[:base_url] + rep.path)
               xml.lastmod item[:mtime].__nanoc_to_iso8601_date unless item[:mtime].nil?
               xml.changefreq item[:changefreq] unless item[:changefreq].nil?
               xml.priority item[:priority] unless item[:priority].nil?

data/lib/nanoc/version.rb

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

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

@@ -383,7 +383,10 @@ describe Nanoc::Int::Executor do
       let(:content) { Nanoc::Int::BinaryContent.new(File.expand_path('donkey.md')) }
 
       it 'raises' do
-        expect { subject }.to raise_error(Nanoc::Int::Errors::CannotLayoutBinaryItem)
+        expect { subject }.to raise_error(
+          Nanoc::Int::Errors::CannotLayoutBinaryItem,
+          'The “/index.md” item (rep “donkey”) cannot be laid out because it is a binary item. If you are getting this error for an item that should be textual instead of binary, make sure that its extension is included in the text_extensions array in the site configuration.',
+        )
       end
     end
 

data/spec/nanoc/regressions/gh_1022_spec.rb

@@ -0,0 +1,24 @@
+describe 'GH-1022', site: true, stdio: true do
+  before do
+    File.write('content/ubuntu-16.10-server-amd64.iso.txt', 'torrent contents')
+    File.write('content/ubuntu-16.10-server-amd64.iso.yaml', 'distro: Ubuntu')
+
+    File.write('layouts/default.erb', '<%= @item[:distro] %> / <%= yield %>')
+
+    File.write('Rules', <<EOS)
+  compile '/**/*' do
+    layout '/default.*'
+    write item.identifier
+  end
+
+  layout '/*.erb', :erb
+EOS
+  end
+
+  it 'recompiles all reps of a changed item' do
+    Nanoc::CLI.run(%w(compile))
+
+    expect(File.file?('output/ubuntu-16.10-server-amd64.iso.txt')).to be
+    expect(File.read('output/ubuntu-16.10-server-amd64.iso.txt')).to eq('Ubuntu / torrent contents')
+  end
+end

data/test/data_sources/test_filesystem.rb

@@ -649,6 +649,32 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
     end
   end
 
+  def test_basename_of_with_full_style_identifiers
+    # Create data source
+    config = { identifier_type: 'full' }
+    data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, config)
+
+    # Get input and expected output
+    expected = {
+      '/'                 => '/',
+      '/foo'              => '/foo',
+      '/foo.html'         => '/foo',
+      '/foo.xyz.html'     => '/foo.xyz',
+      '/foo/bar'          => '/foo/bar',
+      '/foo/bar.html'     => '/foo/bar',
+      '/foo/bar.xyz.html' => '/foo/bar.xyz',
+    }
+
+    # Check
+    expected.each_pair do |input, expected_output|
+      actual_output = data_source.send(:basename_of, input)
+      assert_equal(
+        expected_output, actual_output,
+        "basename_of(#{input.inspect}) should equal #{expected_output.inspect}, not #{actual_output.inspect}"
+      )
+    end
+  end
+
   def test_basename_of_allowing_periods_in_identifiers
     # Create data source
     data_source = Nanoc::DataSources::Filesystem.new(nil, nil, nil, allow_periods_in_identifiers: true)

data/test/helpers/test_xml_sitemap.rb

@@ -186,6 +186,33 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
     end
   end
 
+  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
+      create_item_rep(item.unwrap, :default, '/cool projects/проверка')
+
+      # Create sitemap item
+      @item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/'), @view_context)
+
+      # Create site
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+
+      # Build sitemap
+      res = xml_sitemap(items: @items)
+
+      # Check
+      doc = Nokogiri::XML(res)
+      urlsets = doc.css('> urlset')
+      assert_equal 1, urlsets.size
+      urls = urlsets.css('> url')
+      assert_equal 1, urls.size
+      assert_equal 'http://example.com/cool%20projects/%D0%BF%D1%80%D0%BE%D0%B2%D0%B5%D1%80%D0%BA%D0%B0', urls[0].css('> loc').inner_text
+    end
+  end
+
   protected
 
   def create_item_rep(item, name, path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.5.2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -405,6 +405,7 @@ files:
 - spec/nanoc/integration/outdatedness_integration_spec.rb
 - spec/nanoc/integration/partial_recompilation_spec.rb
 - spec/nanoc/regressions/gh_1015_spec.rb
+- 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_1040_spec.rb