nanoc 4.7.8 → 4.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd1bb8411c769f4fece915bf9569b5af2a1a1424
-  data.tar.gz: 23b8e4dfd52b52fc012c2ea22d528d294c3971bd
+  metadata.gz: ecb0f82b4846a49ddfdb86ced975609223aeb598
+  data.tar.gz: b9554789ff878f63f7b42fe9d42576c105d93c95
 SHA512:
-  metadata.gz: 862cb54cefa14a2312bfd417f3d3d744afe2b27740ed57bfb1c2b51c5eaabbe66cdb3130b5b10ea758dea3045a2ac7a6d3fa6caff10c358a76e9af2c1189a8aa
-  data.tar.gz: d33204921451b9e6cffa130bbc30fe02e6f1ea88d01854d8c6910d4e07e85fddea6a25448ff84c05bbd6b6407cae2eb7c4a8adbac3c7e4b19a1490a795c12e69
+  metadata.gz: 6ef8450a139b74d4eb3cfe84f5444c568d49e18046eddb5412f6c687a7aa22f64049d023a4da5b9406f677095e5d9fd0c94c700679ff9337cfdc1a24846f480d
+  data.tar.gz: 68b1f8b2fc52b50f2074b21271c45539b16f4db46b35c5fdf2bbee28dd0ae57ed31a975314fe2d48427eb8f2b815bb16eb4422b335a9397e68b41ed4e29394c1

data/Gemfile

@@ -59,7 +59,7 @@ group :plugins do
   gem 'rouge'
   gem 'rubypants'
   gem 'sass'
-  gem 'slim'
+  gem 'slim', '~> 3.0'
   gem 'therubyracer', '~> 0.12'
   gem 'typogruby'
   gem 'uglifier'

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/bbatsov/rubocop.git
-  revision: 9168e82c449bf275b4ce587ac01efff25bf80cc2
+  revision: cc04647e2b786ab5ef8337206f3dd71c0d843354
   specs:
     rubocop (0.48.1)
       parallel (~> 1.10)
@@ -13,7 +13,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.7.7)
+    nanoc (4.7.9)
       cri (~> 2.8)
       ddplugin (~> 1.0)
       hamster (~> 3.0)
@@ -60,8 +60,8 @@ GEM
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
     concurrent-ruby (1.0.5)
-    contracts (0.15.0)
-    coveralls (0.8.20)
+    contracts (0.16.0)
+    coveralls (0.8.21)
       json (>= 1.8, < 3)
       simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
@@ -132,10 +132,11 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.43.0)
+    fog-core (1.44.0)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
+      xmlrpc
     fog-dynect (0.0.3)
       fog-core
       fog-json
@@ -229,8 +230,8 @@ GEM
     handlebars (0.8.0)
       handlebars-source (~> 4.0.5)
       therubyracer (~> 0.12.1)
-    handlebars-source (4.0.6)
-    hashdiff (0.3.2)
+    handlebars-source (4.0.7)
+    hashdiff (0.3.4)
     inflecto (0.0.2)
     ipaddress (0.8.3)
     json (2.1.0)
@@ -288,7 +289,7 @@ GEM
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rbvmomi (1.11.0)
+    rbvmomi (1.11.2)
       builder (~> 3.0)
       json (>= 1.8)
       nokogiri (~> 1.5)
@@ -355,7 +356,8 @@ GEM
       crack (>= 0.3.2)
       hashdiff
     xml-simple (1.1.5)
-    yard (0.9.8)
+    xmlrpc (0.3.0)
+    yard (0.9.9)
     yard-contracts (0.1.5)
       contracts (~> 0.7)
       yard (~> 0.8)
@@ -416,7 +418,7 @@ DEPENDENCIES
   rubypants
   sass
   simplecov
-  slim
+  slim (~> 3.0)
   therubyracer (~> 0.12)
   timecop
   typogruby

data/NEWS.md

@@ -1,5 +1,17 @@
 # Nanoc news
 
+## 4.7.9 (2017-05-01)
+
+Fixes:
+
+* Fixed character set handling of code snippets (#1171, #1174)
+
+Enhancements:
+
+* Added `xml:base` support (#1172, #1173) [Chris Burkhardt]
+
+This release drops support for Ruby 2.2, as it is no longer maintained.
+
 ## 4.7.8 (2017-04-22)
 
 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, Andy Drop, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Cédric Boutillier, Chris Chapman, Chris Eppstein, Christian Plessl, Colin Barrett, Colin Seymour, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Denis Defreyne, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Garen Torikian, Go Maeda, Grégory Karékinian, Gregory Pakosz, Guilherme Garnier, Hugo Peixoto, Jack Chu, Jake Benilov, Jan M. Faber, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Lorin Werthen, Louis T., Lucas Vuotto, Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Micha Rosenbaum, Michal Cichra, Michal Papis, Mike Pennisi, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Paul Boone, 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, Vlatko Kosturjak, whitequark, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada
+Ale Muñoz, Alexander Mankuta, Andy Drop, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Cédric Boutillier, Chris Burkhardt, Chris Chapman, Chris Eppstein, Christian Plessl, Colin Barrett, Colin Seymour, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Denis Defreyne, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Garen Torikian, Go Maeda, Grégory Karékinian, Gregory Pakosz, Guilherme Garnier, Hugo Peixoto, Jack Chu, Jake Benilov, Jan M. Faber, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Lorin Werthen, Louis T., Lucas Vuotto, Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Micha Rosenbaum, Michal Cichra, Michal Papis, Mike Pennisi, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Paul Boone, 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, Vlatko Kosturjak, whitequark, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada

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

@@ -1,11 +1,6 @@
 module Nanoc::Int
   # @api private
   class Item < ::Nanoc::Int::Document
-    # Returns an object that can be used for uniquely identifying objects.
-    #
-    # @api private
-    #
-    # @return [Object] An unique reference to this object
     def reference
       [:item, identifier.to_s]
     end

data/lib/nanoc/base/repos/site_loader.rb

@@ -72,11 +72,31 @@ module Nanoc::Int
       config[:lib_dirs].flat_map do |lib|
         Dir["#{lib}/**/*.rb"].sort.map do |filename|
           Nanoc::Int::CodeSnippet.new(
-            File.read(filename),
+            read_code_snippet_contents(filename),
             filename,
           )
         end
       end
     end
+
+    ENCODING_REGEX = /\A#\s+(-\*-\s+)?(en)?coding: (?<encoding>[^\s]+)(\s+-\*-\s*)?\n{0,2}/
+
+    def encoding_from_magic_comment(raw)
+      match = ENCODING_REGEX.match(raw)
+      match ? match['encoding'] : nil
+    end
+
+    def read_code_snippet_contents(filename)
+      raw = File.read(filename, encoding: 'ASCII-8BIT')
+
+      enc = encoding_from_magic_comment(raw)
+      if enc
+        raw = raw.force_encoding(enc).encode('UTF-8').sub(ENCODING_REGEX, '')
+      else
+        raw.force_encoding('UTF-8')
+      end
+
+      raw
+    end
   end
 end

data/lib/nanoc/base/services/outdatedness_rules/attributes_modified.rb

@@ -1,17 +1,19 @@
 module Nanoc::Int::OutdatednessRules
   class AttributesModified < Nanoc::Int::OutdatednessRule
-    extend Nanoc::Int::Memoization
-
     include Nanoc::Int::ContractsSupport
 
     affects_props :attributes, :compiled_content
 
     contract C::Or[Nanoc::Int::ItemRep, Nanoc::Int::Item, Nanoc::Int::Layout], C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Int::OutdatednessReasons::Generic]
-    memoized def apply(obj, outdatedness_checker)
+    def apply(obj, outdatedness_checker)
       case obj
       when Nanoc::Int::ItemRep
         apply(obj.item, outdatedness_checker)
       when Nanoc::Int::Item, Nanoc::Int::Layout
+        if outdatedness_checker.checksum_store[obj] == outdatedness_checker.checksums.checksum_for(obj)
+          return nil
+        end
+
         old_checksums = outdatedness_checker.checksum_store.attributes_checksum_for(obj)
         unless old_checksums
           return Nanoc::Int::OutdatednessReasons::AttributesModified.new(true)

data/lib/nanoc/data_sources/filesystem.rb

@@ -431,24 +431,24 @@ module Nanoc::DataSources
         raise Errors::FileUnreadable.new(filename, e)
       end
 
-      # Fix
-      if data.respond_to?(:encode!)
-        if @config && @config[:encoding]
-          original_encoding = Encoding.find(@config[:encoding])
-          data.force_encoding(@config[:encoding])
-        else
-          original_encoding = data.encoding
-        end
+      # Set original encoding, if any
+      if @config && @config[:encoding]
+        original_encoding = Encoding.find(@config[:encoding])
+        data.force_encoding(@config[:encoding])
+      else
+        original_encoding = data.encoding
+      end
 
-        begin
-          data.encode!('UTF-8')
-        rescue
-          raise Errors::InvalidEncoding.new(filename, original_encoding)
-        end
+      # Set encoding to UTF-8
+      begin
+        data.encode!('UTF-8')
+      rescue
+        raise Errors::InvalidEncoding.new(filename, original_encoding)
+      end
 
-        unless data.valid_encoding?
-          raise Errors::InvalidEncoding.new(filename, original_encoding)
-        end
+      # Verify
+      unless data.valid_encoding?
+        raise Errors::InvalidEncoding.new(filename, original_encoding)
       end
 
       # Remove UTF-8 BOM (ugly)

data/lib/nanoc/helpers/blogging.rb

@@ -104,10 +104,9 @@ module Nanoc::Helpers
       end
 
       def build_for_feed(xml)
+        root_url = @config[:base_url] + '/'
         xml.instruct!
-        xml.feed(xmlns: 'http://www.w3.org/2005/Atom') do
-          root_url = @config[:base_url] + '/'
-
+        xml.feed(xmlns: 'http://www.w3.org/2005/Atom', 'xml:base' => root_url) do
           # Add primary attributes
           xml.id root_url
           xml.title title

data/lib/nanoc/version.rb

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

data/nanoc.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ['--main', 'README.md']
   s.extra_rdoc_files = ['LICENSE', 'README.md', 'NEWS.md']
 
-  s.required_ruby_version = '>= 2.1.0'
+  s.required_ruby_version = '>= 2.3.0'
 
   s.add_runtime_dependency('cri', '~> 2.8')
   s.add_runtime_dependency('hamster', '~> 3.0')

data/spec/nanoc/base/repos/site_loader_spec.rb

@@ -211,4 +211,52 @@ describe Nanoc::Int::SiteLoader do
       end
     end
   end
+
+  describe '#code_snippets_from_config' do
+    subject { loader.send(:code_snippets_from_config, config) }
+
+    let(:config) { Nanoc::Int::Configuration.new.with_defaults }
+
+    before { FileUtils.mkdir_p('lib') }
+
+    context 'no explicit encoding specified' do
+      example do
+        File.write('lib/asdf.rb', 'hi 🔥', encoding: 'utf-8')
+        expect(subject.size).to eq(1)
+        expect(subject.first.data).to eq('hi 🔥')
+      end
+    end
+
+    context '# encoding: x specified' do
+      example do
+        File.write('lib/asdf.rb', "# encoding: iso-8859-1\n\nBRØKEN", encoding: 'iso-8859-1')
+        expect(subject.size).to eq(1)
+        expect(subject.first.data).to eq('BRØKEN')
+      end
+    end
+
+    context '# coding: x specified' do
+      example do
+        File.write('lib/asdf.rb', "# coding: iso-8859-1\n\nBRØKEN", encoding: 'iso-8859-1')
+        expect(subject.size).to eq(1)
+        expect(subject.first.data).to eq('BRØKEN')
+      end
+    end
+
+    context '# -*- encoding: x -*- specified' do
+      example do
+        File.write('lib/asdf.rb', "# -*- encoding: iso-8859-1 -*-\n\nBRØKEN", encoding: 'iso-8859-1')
+        expect(subject.size).to eq(1)
+        expect(subject.first.data).to eq('BRØKEN')
+      end
+    end
+
+    context '# -*- coding: x -*- specified' do
+      example do
+        File.write('lib/asdf.rb', "# -*- coding: iso-8859-1 -*-\n\nBRØKEN", encoding: 'iso-8859-1')
+        expect(subject.size).to eq(1)
+        expect(subject.first.data).to eq('BRØKEN')
+      end
+    end
+  end
 end

data/spec/nanoc/regressions/gh_1171_spec.rb

@@ -0,0 +1,55 @@
+describe 'GH-1171', site: true, stdio: true do
+  before do
+    File.write('nanoc.yaml', <<EOS)
+data_sources:
+  -
+    type: filesystem
+    encoding: utf-8
+EOS
+  end
+
+  context 'UTF-8 code in ASCII env' do
+    before do
+      File.write('content/hi.md', '<%= ::EMOJI_🔥 %>', encoding: 'utf-8')
+      File.write('lib/asdf.rb', 'EMOJI_🔥 = "hot"', encoding: 'utf-8')
+
+      File.write('Rules', <<EOS)
+compile '/**/*' do
+  filter :erb
+  write '/last.html'
+end
+EOS
+    end
+
+    around do |ex|
+      orig_encoding = Encoding.default_external
+      Encoding.default_external = 'ASCII'
+      ex.run
+      Encoding.default_external = orig_encoding
+    end
+
+    it 'does not crash' do
+      Nanoc::CLI.run(%w[compile])
+      expect(File.read('output/last.html')).to eql('hot')
+    end
+  end
+
+  context 'ISO 8859-1 code UTF-8 env' do
+    before do
+      File.write('content/hi.md', '<%= ::BRØKEN %>')
+      File.write('lib/asdf.rb', "# encoding: iso-8859-1\n\nBRØKEN = 1", encoding: 'ISO-8859-1')
+
+      File.write('Rules', <<EOS)
+compile '/**/*' do
+  filter :erb
+  write '/last.html'
+end
+EOS
+    end
+
+    it 'detects manually specified encodings' do
+      Nanoc::CLI.run(%w[compile])
+      expect(File.read('output/last.html')).to eql('1')
+    end
+  end
+end

data/test/data_sources/test_filesystem.rb

@@ -486,12 +486,6 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
   end
 
   def test_compile_iso_8859_1_site
-    # Check encoding
-    unless ''.respond_to?(:encode)
-      skip 'Test only works on 1.9.x'
-      return
-    end
-
     # Create data source
     data_source = new_data_source
 
@@ -514,12 +508,6 @@ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
   end
 
   def test_compile_iso_8859_1_site_with_explicit_encoding
-    # Check encoding
-    unless ''.respond_to?(:encode)
-      skip 'Test only works on 1.9.x'
-      return
-    end
-
     # Create data source
     data_source = new_data_source({})
     data_source.config[:encoding] = 'ISO-8859-1'

data/test/helpers/test_blogging.rb

@@ -608,6 +608,27 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
     end
   end
 
+  def test_atom_feed_with_xml_base
+    if_have 'builder' do
+      # Mock article
+      @items = [mock_article]
+
+      # Mock site
+      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+
+      # Create feed item
+      @item = mock
+      @item.stubs(:[]).with(:title).returns('My Blog Or Something')
+      @item.stubs(:[]).with(:author_name).returns('J. Doe')
+      @item.stubs(:[]).with(:author_uri).returns('http://example.com/~jdoe')
+      @item.stubs(:[]).with(:feed_url).returns('http://example.com/feed')
+
+      # Check
+      result = atom_feed
+      assert_match 'xml:base="http://example.com/"', result
+    end
+  end
+
   def test_atom_feed_with_item_without_path
     if_have 'builder' do
       # Create items

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.7.8
+  version: 4.7.9
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -491,6 +491,7 @@ files:
 - spec/nanoc/regressions/gh_1130_spec.rb
 - spec/nanoc/regressions/gh_1134_spec.rb
 - spec/nanoc/regressions/gh_1145_spec.rb
+- spec/nanoc/regressions/gh_1171_spec.rb
 - spec/nanoc/regressions/gh_761_spec.rb
 - spec/nanoc/regressions/gh_767_spec.rb
 - spec/nanoc/regressions/gh_769_spec.rb
@@ -640,7 +641,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="