nanoc 4.8.2 → 4.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d77db1ef0d5fababb5232e354b5e1bed88749d7
-  data.tar.gz: 5b3cd5972c29fa74a0bea92a59212861e24eb5c7
+  metadata.gz: 7b1d74ffa8fb8b247dcda27d5663209908450d0e
+  data.tar.gz: e3df83ea0b47564aaa41837544282f5b9ae793b2
 SHA512:
-  metadata.gz: 0a5d0f6f801a97f57efce1d06c872dada0ff50a9c3f88f068b4c5a617509b81e513473b08a5c5dabb864ede7e18d96d3c6c465c46a259d5f3f06411782134b1b
-  data.tar.gz: 07a596f5a268ce116ac1d9dc1897ea0d1211bb051a5413965d2029d780008b3350668fe5224b4bb999eea52c505a83e3fc0b18db785ee7ea437470eda0fc37ae
+  metadata.gz: 02df11311b85cfe8d451e35afd31e6fae632ae468b2f79102dadb43be76881d15573a635c7b41c18f218d600294120f52790a9616b943c2b4d0fe449955668f1
+  data.tar.gz: 6f4c42e24182f4df836e10f4207c3fcb475462e439d2d0fd1e3e82a6bedda0d30a7e43ca0b82cd1ff4f03a793c8d078281cb42fdfdb15eee3c7fa28b15cfaa3b

data/NEWS.md

@@ -1,8 +1,20 @@
 # Nanoc news
 
+## 4.8.3 (2017-08-30)
+
+Fixes:
+
+* Disallowed full identifiers from ending with a slash (#1206)
+* Made `nanoc view` listen on 127.0.0.1, not 0.0.0.0, by default (#1205)
+
+Enhancements:
+
+* Made `nanoc view` print site URL (#1204)
+* Made `nanoc` search for parent directory containing Nanoc site (#1210)
+
 ## 4.8.2 (2017-08-19)
 
-Fixed:
+Fixes:
 
 * Fixed compatibility issue with guard-nanoc
 

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

@@ -15,7 +15,7 @@ module Nanoc
       end
 
       # @return [Nanoc::Identifier]
-      attr_accessor :identifier
+      attr_reader :identifier
 
       # @return [String, nil]
       attr_accessor :checksum_data
@@ -81,6 +81,11 @@ module Nanoc
         raise NotImplementedError
       end
 
+      contract C::Or[Nanoc::Identifier, String] => Nanoc::Identifier
+      def identifier=(new_identifier)
+        @identifier = Nanoc::Identifier.from(new_identifier)
+      end
+
       contract C::None => String
       def inspect
         "<#{self.class} identifier=\"#{identifier}\">"

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

@@ -12,6 +12,13 @@ module Nanoc
       end
     end
 
+    # @api private
+    class InvalidFullIdentifierError < ::Nanoc::Error
+      def initialize(string)
+        super("Invalid full identifier (ends with a slash): #{string.inspect}")
+      end
+    end
+
     # @api private
     class InvalidTypeError < ::Nanoc::Error
       def initialize(type)
@@ -60,9 +67,9 @@ module Nanoc
       when :legacy
         @string = "/#{string}/".gsub(/^\/+|\/+$/, '/').freeze
       when :full
-        if string !~ /\A\//
-          raise InvalidIdentifierError.new(string)
-        end
+        raise InvalidIdentifierError.new(string) if string !~ /\A\//
+        raise InvalidFullIdentifierError.new(string) if string =~ /\/\z/
+
         @string = string.dup.freeze
       else
         raise InvalidTypeError.new(@type)

data/lib/nanoc/cli/command_runner.rb

@@ -43,17 +43,40 @@ module Nanoc::CLI
     end
     alias is_in_site_dir? in_site_dir?
 
+    def self.find_site_dir
+      start_here = Dir.pwd
+
+      here = start_here
+      until Nanoc::Int::SiteLoader.cwd_is_nanoc_site?
+        Dir.chdir('..')
+        return nil if Dir.pwd == here
+        here = Dir.pwd
+      end
+      here
+    ensure
+      Dir.chdir(start_here)
+    end
+
+    def self.enter_site_dir
+      dir = find_site_dir
+      if dir.nil?
+        raise ::Nanoc::Int::Errors::GenericTrivial, 'The current working directory, nor any of its parents, seems to be a Nanoc site.'
+      end
+
+      return if Dir.getwd == dir
+      $stderr.puts "Using Nanoc site in #{dir}"
+      Dir.chdir(dir)
+    end
+
     # Asserts that the current working directory contains a site and loads the site into memory.
     #
     # @return [void]
     def load_site(preprocess: false)
+      self.class.enter_site_dir
+
       $stderr.print 'Loading site… '
       $stderr.flush
 
-      if site.nil?
-        raise ::Nanoc::Int::Errors::GenericTrivial, 'The current working directory does not seem to be a Nanoc site.'
-      end
-
       if preprocess
         site.compiler.action_provider.preprocess(site)
       end

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

@@ -9,7 +9,7 @@ description <<~EOS
 EOS
 
 required :H, :handler, 'specify the handler to use (webrick/mongrel/...)'
-required :o, :host,    'specify the host to listen on (default: 0.0.0.0)'
+required :o, :host,    'specify the host to listen on (default: 127.0.0.1)'
 required :p, :port,    'specify the port to listen on (default: 3000)'
 
 module Nanoc::CLI::Commands
@@ -25,7 +25,7 @@ module Nanoc::CLI::Commands
       # Set options
       options_for_rack = {
         Port: (options[:port] || 3000).to_i,
-        Host: (options[:host] || '0.0.0.0'),
+        Host: (options[:host] || '127.0.0.1'),
       }
 
       # Get handler
@@ -52,6 +52,10 @@ module Nanoc::CLI::Commands
         run Rack::File.new(site.config[:output_dir])
       end.to_app
 
+      # Print a link
+      url = "http://#{options_for_rack[:Host]}:#{options_for_rack[:Port]}/"
+      puts "View the site at #{url}"
+
       # Run autocompiler
       handler.run(app, options_for_rack)
     end

data/lib/nanoc/spec.rb

@@ -3,6 +3,16 @@
 module Nanoc
   # @api private
   module Spec
+    module Helper
+      def chdir(dir)
+        here = Dir.getwd
+        Dir.chdir(dir)
+        yield
+      ensure
+        Dir.chdir(here)
+      end
+    end
+
     class HelperContext
       # @return [Nanoc::Int::DependencyTracker]
       attr_reader :dependency_tracker

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.8.2'
+  VERSION = '4.8.3'
 end

data/spec/nanoc/base/entities/document_spec.rb

@@ -225,4 +225,34 @@ shared_examples 'a document' do
       expect(subject.attributes).to eq(at: 'ribut')
     end
   end
+
+  describe '#identifier=' do
+    let(:document) { described_class.new('stuff', {}, '/foo.md') }
+
+    it 'allows changing to a string that contains a full identifier' do
+      expect { document.identifier = '/thing' }.not_to raise_error
+
+      expect(document.identifier).to eq('/thing')
+      expect(document.identifier).to be_full
+    end
+
+    it 'refuses changing to a string that does not contain a full identifier' do
+      expect { document.identifier = '/thing/' }
+        .to raise_error(Nanoc::Identifier::InvalidFullIdentifierError)
+    end
+
+    it 'allos changing to a full identifier' do
+      document.identifier = Nanoc::Identifier.new('/thing')
+
+      expect(document.identifier.to_s).to eq('/thing')
+      expect(document.identifier).to be_full
+    end
+
+    it 'allos changing to a legacy identifier' do
+      document.identifier = Nanoc::Identifier.new('/thing/', type: :legacy)
+
+      expect(document.identifier).to eq('/thing/')
+      expect(document.identifier).to be_legacy
+    end
+  end
 end

data/spec/nanoc/base/entities/identifier_spec.rb

@@ -67,6 +67,16 @@ describe Nanoc::Identifier do
           .to raise_error(Nanoc::Identifier::InvalidIdentifierError)
       end
 
+      it 'refuses string ending with a slash' do
+        expect { described_class.new('/foo/') }
+          .to raise_error(Nanoc::Identifier::InvalidFullIdentifierError)
+      end
+
+      it 'refuses string with only slash' do
+        expect { described_class.new('/') }
+          .to raise_error(Nanoc::Identifier::InvalidFullIdentifierError)
+      end
+
       it 'has proper string representation' do
         expect(described_class.new('/foo').to_s).to eql('/foo')
       end
@@ -422,7 +432,7 @@ describe Nanoc::Identifier do
     end
 
     context 'full type' do
-      let(:identifier) { described_class.new('/foo/', type: :full) }
+      let(:identifier) { described_class.new('/foo', type: :full) }
       it { is_expected.to eql(false) }
     end
   end
@@ -436,7 +446,7 @@ describe Nanoc::Identifier do
     end
 
     context 'full type' do
-      let(:identifier) { described_class.new('/foo/', type: :full) }
+      let(:identifier) { described_class.new('/foo', type: :full) }
       it { is_expected.to eql(true) }
     end
   end
@@ -445,7 +455,7 @@ describe Nanoc::Identifier do
     subject { identifier.components }
 
     context 'no components' do
-      let(:identifier) { described_class.new('/') }
+      let(:identifier) { described_class.new('/', type: :legacy) }
       it { is_expected.to eql([]) }
     end
 

data/spec/nanoc/base/item_rep_writer_spec.rb

@@ -4,7 +4,7 @@ describe Nanoc::Int::ItemRepWriter do
   describe '#write' do
     let(:raw_path) { 'output/blah.dat' }
 
-    let(:item) { Nanoc::Int::Item.new(orig_content, {}, '/') }
+    let(:item) { Nanoc::Int::Item.new(orig_content, {}, '/foo') }
 
     let(:item_rep) do
       Nanoc::Int::ItemRep.new(item, :default).tap do |ir|

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

@@ -653,7 +653,7 @@ describe Nanoc::Int::Executor do
       let(:arg) { '/default' }
 
       let(:layouts) do
-        [Nanoc::Int::Layout.new('head <%= @foo %> foot', {}, '/default/')]
+        [Nanoc::Int::Layout.new('head <%= @foo %> foot', {}, Nanoc::Identifier.new('/default/', type: :legacy))]
       end
 
       it { is_expected.to eq(layouts[0]) }

data/spec/nanoc/base/views/document_view_spec.rb

@@ -27,7 +27,7 @@ shared_examples 'a document view' do
   end
 
   describe '#frozen?' do
-    let(:document) { entity_class.new('content', {}, '/asdf/') }
+    let(:document) { entity_class.new('content', {}, '/asdf') }
 
     subject { view.frozen? }
 
@@ -42,10 +42,10 @@ shared_examples 'a document view' do
   end
 
   describe '#== and #eql?' do
-    let(:document) { entity_class.new('content', {}, '/asdf/') }
+    let(:document) { entity_class.new('content', {}, '/asdf') }
 
     context 'comparing with document with same identifier' do
-      let(:other) { entity_class.new('content', {}, '/asdf/') }
+      let(:other) { entity_class.new('content', {}, '/asdf') }
 
       it 'is ==' do
         expect(view).to eq(other)
@@ -57,7 +57,7 @@ shared_examples 'a document view' do
     end
 
     context 'comparing with document with different identifier' do
-      let(:other) { entity_class.new('content', {}, '/fdsa/') }
+      let(:other) { entity_class.new('content', {}, '/fdsa') }
 
       it 'is not ==' do
         expect(view).not_to eq(other)
@@ -69,7 +69,7 @@ shared_examples 'a document view' do
     end
 
     context 'comparing with document view with same identifier' do
-      let(:other) { other_view_class.new(entity_class.new('content', {}, '/asdf/'), nil) }
+      let(:other) { other_view_class.new(entity_class.new('content', {}, '/asdf'), nil) }
 
       it 'is ==' do
         expect(view).to eq(other)
@@ -81,7 +81,7 @@ shared_examples 'a document view' do
     end
 
     context 'comparing with document view with different identifier' do
-      let(:other) { other_view_class.new(entity_class.new('content', {}, '/fdsa/'), nil) }
+      let(:other) { other_view_class.new(entity_class.new('content', {}, '/fdsa'), nil) }
 
       it 'is not ==' do
         expect(view).not_to eq(other)
@@ -106,7 +106,7 @@ shared_examples 'a document view' do
   end
 
   describe '#[]' do
-    let(:document) { entity_class.new('stuff', { animal: 'donkey' }, '/foo/') }
+    let(:document) { entity_class.new('stuff', { animal: 'donkey' }, '/foo') }
 
     subject { view[key] }
 
@@ -154,7 +154,7 @@ shared_examples 'a document view' do
   end
 
   describe '#attributes' do
-    let(:document) { entity_class.new('stuff', { animal: 'donkey' }, '/foo/') }
+    let(:document) { entity_class.new('stuff', { animal: 'donkey' }, '/foo') }
 
     subject { view.attributes }
 
@@ -179,7 +179,7 @@ shared_examples 'a document view' do
   end
 
   describe '#fetch' do
-    let(:document) { entity_class.new('stuff', { animal: 'donkey' }, '/foo/') }
+    let(:document) { entity_class.new('stuff', { animal: 'donkey' }, '/foo') }
 
     context 'with existant key' do
       let(:key) { :animal }
@@ -260,7 +260,7 @@ shared_examples 'a document view' do
   end
 
   describe '#key?' do
-    let(:document) { entity_class.new('stuff', { animal: 'donkey' }, '/foo/') }
+    let(:document) { entity_class.new('stuff', { animal: 'donkey' }, '/foo') }
 
     subject { view.key?(key) }
 
@@ -308,15 +308,15 @@ shared_examples 'a document view' do
   end
 
   describe '#hash' do
-    let(:document) { double(:document, identifier: '/foo/') }
+    let(:document) { double(:document, identifier: '/foo') }
 
     subject { view.hash }
 
-    it { should == described_class.hash ^ '/foo/'.hash }
+    it { should == described_class.hash ^ '/foo'.hash }
   end
 
   describe '#raw_content' do
-    let(:document) { entity_class.new('stuff', { animal: 'donkey' }, '/foo/') }
+    let(:document) { entity_class.new('stuff', { animal: 'donkey' }, '/foo') }
 
     subject { view.raw_content }
 

data/spec/nanoc/base/views/item_rep_view_spec.rb

@@ -31,7 +31,7 @@ describe Nanoc::ItemRepView do
 
   describe '#frozen?' do
     let(:item_rep) { Nanoc::Int::ItemRep.new(item, :jacques) }
-    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo/') }
+    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo') }
     let(:view) { described_class.new(item_rep, view_context) }
 
     subject { view.frozen? }
@@ -48,11 +48,11 @@ describe Nanoc::ItemRepView do
 
   describe '#== and #eql?' do
     let(:item_rep) { Nanoc::Int::ItemRep.new(item, :jacques) }
-    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo/') }
+    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo') }
     let(:view) { described_class.new(item_rep, view_context) }
 
     context 'comparing with item rep with same identifier' do
-      let(:other_item) { double(:other_item, identifier: '/foo/') }
+      let(:other_item) { double(:other_item, identifier: '/foo') }
       let(:other) { double(:other_item_rep, item: other_item, name: :jacques) }
 
       it 'is ==' do
@@ -65,7 +65,7 @@ describe Nanoc::ItemRepView do
     end
 
     context 'comparing with item rep with different identifier' do
-      let(:other_item) { double(:other_item, identifier: '/bar/') }
+      let(:other_item) { double(:other_item, identifier: '/bar') }
       let(:other) { double(:other_item_rep, item: other_item, name: :jacques) }
 
       it 'is not ==' do
@@ -78,7 +78,7 @@ describe Nanoc::ItemRepView do
     end
 
     context 'comparing with item rep with different name' do
-      let(:other_item) { double(:other_item, identifier: '/foo/') }
+      let(:other_item) { double(:other_item, identifier: '/foo') }
       let(:other) { double(:other_item_rep, item: other_item, name: :marvin) }
 
       it 'is not ==' do
@@ -91,7 +91,7 @@ describe Nanoc::ItemRepView do
     end
 
     context 'comparing with item rep with same identifier' do
-      let(:other_item) { double(:other_item, identifier: '/foo/') }
+      let(:other_item) { double(:other_item, identifier: '/foo') }
       let(:other) { described_class.new(double(:other_item_rep, item: other_item, name: :jacques), view_context) }
 
       it 'is ==' do
@@ -104,7 +104,7 @@ describe Nanoc::ItemRepView do
     end
 
     context 'comparing with item rep with different identifier' do
-      let(:other_item) { double(:other_item, identifier: '/bar/') }
+      let(:other_item) { double(:other_item, identifier: '/bar') }
       let(:other) { described_class.new(double(:other_item_rep, item: other_item, name: :jacques), view_context) }
 
       it 'is not equal' do
@@ -114,7 +114,7 @@ describe Nanoc::ItemRepView do
     end
 
     context 'comparing with item rep with different name' do
-      let(:other_item) { double(:other_item, identifier: '/foo/') }
+      let(:other_item) { double(:other_item, identifier: '/foo') }
       let(:other) { described_class.new(double(:other_item_rep, item: other_item, name: :marvin), view_context) }
 
       it 'is not equal' do
@@ -124,7 +124,7 @@ describe Nanoc::ItemRepView do
     end
 
     context 'comparing with something that is not an item rep' do
-      let(:other_item) { double(:other_item, identifier: '/foo/') }
+      let(:other_item) { double(:other_item, identifier: '/foo') }
       let(:other) { :donkey }
 
       it 'is not equal' do
@@ -136,12 +136,12 @@ describe Nanoc::ItemRepView do
 
   describe '#hash' do
     let(:item_rep) { Nanoc::Int::ItemRep.new(item, :jacques) }
-    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo/') }
+    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo') }
     let(:view) { described_class.new(item_rep, view_context) }
 
     subject { view.hash }
 
-    it { should == described_class.hash ^ Nanoc::Identifier.new('/foo/').hash ^ :jacques.hash }
+    it { should == described_class.hash ^ Nanoc::Identifier.new('/foo').hash ^ :jacques.hash }
   end
 
   describe '#snapshot?' do
@@ -349,7 +349,7 @@ describe Nanoc::ItemRepView do
 
   describe '#binary?' do
     let(:item_rep) { Nanoc::Int::ItemRep.new(item, :jacques) }
-    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo/') }
+    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo') }
     let(:view) { described_class.new(item_rep, view_context) }
 
     subject { view.binary? }
@@ -383,7 +383,7 @@ describe Nanoc::ItemRepView do
 
   describe '#item' do
     let(:item_rep) { Nanoc::Int::ItemRep.new(item, :jacques) }
-    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo/') }
+    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo') }
     let(:view) { described_class.new(item_rep, view_context) }
 
     subject { view.item }
@@ -399,11 +399,11 @@ describe Nanoc::ItemRepView do
 
   describe '#inspect' do
     let(:item_rep) { Nanoc::Int::ItemRep.new(item, :jacques) }
-    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo/') }
+    let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo') }
     let(:view) { described_class.new(item_rep, view_context) }
 
     subject { view.inspect }
 
-    it { is_expected.to eql('<Nanoc::ItemRepView item.identifier=/foo/ name=jacques>') }
+    it { is_expected.to eql('<Nanoc::ItemRepView item.identifier=/foo name=jacques>') }
   end
 end