nanoc 4.1.3 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 012ea17572e6f5ce450f61ab43b4d403b0c59d5e
-  data.tar.gz: f9d48bcf89fe052d434b9c03fb34b87164f2a04b
+  metadata.gz: ec5f1b744e1d1a155a6b2d1dc1d603874d2deb57
+  data.tar.gz: eb4aa79555b133ab4ce28878aefb88b1644d3d04
 SHA512:
-  metadata.gz: ec0466efe5a5c93b9b019da0d5d59b504bef75a08916ab12856998818e7f762303be85253295bbf788b455a6b45b4086b4c2ea940ce7c94f51e946706f618a41
-  data.tar.gz: 77af4db8c9cd838a30774bb7f599fae40fd147010f626a8b71c22dfc8ed6f2486de228157f765c03746115968234a9e7d2a0c85deada56c13adbd3795c992f47
+  metadata.gz: e144b54d2dd138af0e36e90274d2c4d20350aae065496aaeaf5a0e39f3a8506c7235adc1c0325dfc94d0e835657359d9bd883536665de12dabc6b36626b90654
+  data.tar.gz: f1192638a1b3c2182c6c21911f54de5a9f0fa8c17e2ee99adbb683e55e7f7847aab1e34dec1f425a73d3a016035507eb3206b90aca1513203bb3cc13e94a78f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.1.3)
+    nanoc (4.1.4)
       cri (~> 2.3)
 
 GEM
@@ -184,7 +184,7 @@ GEM
       handlebars-source (~> 3.0.0)
       therubyracer (~> 0.12.1)
     handlebars-source (3.0.3)
-    hashdiff (0.2.3)
+    hashdiff (0.3.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     inflecto (0.0.2)
@@ -194,9 +194,9 @@ GEM
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.13)
-    listen (3.0.5)
+    listen (3.0.6)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
+      rb-inotify (>= 0.9.7)
     lumberjack (1.0.10)
     markaby (0.8.0)
       builder
@@ -210,7 +210,7 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.11.2)
     mustache (1.0.2)
-    nenv (0.2.0)
+    nenv (0.3.0)
     netrc (0.11.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
@@ -218,7 +218,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     pandoc-ruby (1.0.0)
-    parser (2.3.0.2)
+    parser (2.3.0.5)
       ast (~> 2.2)
     posix-spawn (0.3.11)
     powerpack (0.1.1)
@@ -234,14 +234,15 @@ GEM
     rainpress (1.0)
     rake (10.5.0)
     rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rbvmomi (1.8.2)
       builder
       nokogiri (>= 1.4.1)
       trollop
     rdiscount (2.1.8)
-    rdoc (4.2.1)
+    rdoc (4.2.2)
+      json (~> 1.4)
     redcarpet (3.3.4)
     ref (2.0.0)
     rest-client (1.8.0)
@@ -262,17 +263,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.36.0)
-      parser (>= 2.3.0.0, < 3.0)
+    rubocop (0.37.2)
+      parser (>= 2.3.0.4, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 0.3)
     ruby-progressbar (1.7.5)
     rubypants (0.2.0)
     safe_yaml (1.0.4)
     sass (3.4.21)
     shellany (0.0.1)
-    simplecov (0.11.1)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
@@ -298,7 +300,8 @@ GEM
       json (>= 1.8.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
+    unf_ext (0.0.7.2)
+    unicode-display_width (0.3.1)
     vcr (3.0.1)
     w3c_validators (1.2)
       json

data/NEWS.md

@@ -1,5 +1,17 @@
 # Nanoc news
 
+## 4.1.4 (2016-02-13)
+
+Fixes:
+
+* Added missing `Configuration#key?` method (#815, #820)
+* Made output diff use correct snapshot rather than `:last` (#813, #814)
+
+Enhancements:
+
+* Sped up item resolution in Sass filter (#821)
+* Made `#link_to` more resilient to unsupported argument types (#816, #819)
+
 ## 4.1.3 (2016-01-30)
 
 Fixes:

data/lib/nanoc/base/compilation/filter.rb

@@ -88,7 +88,7 @@ module Nanoc
       #   Returns the required libraries for this filter.
       #   @return [Enumerable<String>] This filter’s list of library names that are required
       def requires(*requires)
-        if requires.size > 0
+        if requires.any?
           @requires = requires
         else
           @requires || []

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

@@ -51,6 +51,10 @@ module Nanoc::Int
       @wrapped
     end
 
+    def key?(key)
+      @wrapped.key?(key)
+    end
+
     def [](key)
       @wrapped[key]
     end

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

@@ -124,7 +124,7 @@ module Nanoc
 
       extname = File.extname(@string)
 
-      if extname.size > 0
+      if !extname.empty?
         @string[0..-extname.size - 1]
       else
         @string
@@ -144,7 +144,7 @@ module Nanoc
     # @return [String]
     def without_exts
       extname = exts.join('.')
-      if extname.size > 0
+      if !extname.empty?
         @string[0..-extname.size - 2]
       else
         @string

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

@@ -70,7 +70,7 @@ module Nanoc::CLI::Commands
           unless rep.binary?
             new_contents = File.file?(path) ? File.read(path) : nil
             if old_contents[rep] && new_contents
-              generate_diff_for(rep, old_contents[rep], new_contents)
+              generate_diff_for(path, old_contents[rep], new_contents)
             end
             old_contents.delete(rep)
           end
@@ -95,14 +95,14 @@ module Nanoc::CLI::Commands
         @diff_threads.each(&:join)
       end
 
-      def generate_diff_for(rep, old_content, new_content)
+      def generate_diff_for(path, old_content, new_content)
         return if old_content == new_content
 
         @diff_threads << Thread.new do
           # Generate diff
           diff = diff_strings(old_content, new_content)
-          diff.sub!(/^--- .*/,    '--- ' + rep.raw_path)
-          diff.sub!(/^\+\+\+ .*/, '+++ ' + rep.raw_path)
+          diff.sub!(/^--- .*/,    '--- ' + path)
+          diff.sub!(/^\+\+\+ .*/, '+++ ' + path)
 
           # Write diff
           @diff_lock.synchronize do

data/lib/nanoc/cli/commands/show-plugins.rb

@@ -10,7 +10,7 @@ module Nanoc::CLI::Commands
   class ShowPlugins < ::Nanoc::CLI::CommandRunner
     def run
       # Check arguments
-      if arguments.size != 0
+      if arguments.any?
         raise Nanoc::Int::Errors::GenericTrivial, "usage: #{command.usage}"
       end
 

data/lib/nanoc/extra/checking/checks/stale.rb

@@ -4,14 +4,6 @@ module Nanoc::Extra::Checking::Checks
     def run
       require 'set'
 
-      item_rep_paths =
-        Set.new(
-          @items
-            .flat_map(&:reps)
-            .map(&:unwrap)
-            .flat_map(&:raw_paths)
-            .flat_map(&:values))
-
       output_filenames.each do |f|
         next if pruner.filename_excluded?(f)
         next if item_rep_paths.include?(f)
@@ -24,6 +16,16 @@ module Nanoc::Extra::Checking::Checks
 
     protected
 
+    def item_rep_paths
+      @item_rep_paths ||=
+        Set.new(
+          @items
+            .flat_map(&:reps)
+            .map(&:unwrap)
+            .flat_map(&:raw_paths)
+            .flat_map(&:values))
+    end
+
     def pruner
       exclude_config = @config.fetch(:prune, {}).fetch(:exclude, [])
       @pruner ||= Nanoc::Extra::Pruner.new(@site, exclude: exclude_config)

data/lib/nanoc/filters/sass.rb

@@ -18,11 +18,24 @@ module Nanoc::Filters
       engine.render
     end
 
+    def self.item_filename_map_for_site(site, items)
+      @item_filename_map ||= {}
+      @item_filename_map[site] ||=
+        {}.tap do |map|
+          items.each do |item|
+            if item.raw_filename
+              path = Pathname.new(item.raw_filename).realpath.to_s
+              map[path] = item
+            end
+          end
+        end
+    end
+
     def imported_filename_to_item(filename)
-      @items.find do |i|
-        i.raw_filename &&
-          Pathname.new(i.raw_filename).realpath == Pathname.new(filename).realpath
-      end
+      realpath = Pathname.new(filename).realpath.to_s
+
+      map = self.class.item_filename_map_for_site(@site, @items)
+      map[realpath]
     end
   end
 end

data/lib/nanoc/helpers/link_to.rb

@@ -43,12 +43,16 @@ module Nanoc::Helpers
     #   # => '<a title="My super cool blog" href="/blog/">Blog</a>'
     def link_to(text, target, attributes = {})
       # Find path
-      if target.is_a?(String)
-        path = target
-      else
-        path = target.path
-        raise "Cannot create a link to #{target.inspect} because this target is not outputted (its routing rule returns nil)" if path.nil?
-      end
+      path =
+        case target
+        when String
+          target
+        when Nanoc::ItemWithRepsView, Nanoc::ItemWithoutRepsView, Nanoc::ItemRepView
+          raise "Cannot create a link to #{target.inspect} because this target is not outputted (its routing rule returns nil)" if target.path.nil?
+          target.path
+        else
+          raise ArgumentError, "Cannot link to #{target.inspect} (expected a string or an item, not a #{target.class.name})"
+        end
 
       # Join attributes
       attributes = attributes.reduce('') do |memo, (key, value)|

data/lib/nanoc/version.rb

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

data/test/helpers/test_link_to.rb

@@ -2,34 +2,39 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
   include Nanoc::Helpers::LinkTo
 
   def test_link_to_with_path
-    # Check
     assert_equal(
       '<a href="/foo/">Foo</a>',
       link_to('Foo', '/foo/'),
     )
   end
 
-  def test_link_to_with_rep
-    # Create rep
-    rep = mock
-    rep.stubs(:path).returns('/bar/')
+  def test_link_to_with_item_without_reps_view
+    target = Nanoc::ItemWithoutRepsView.new(mock, {})
+    target.stubs(:path).returns('/bar/')
 
-    # Check
     assert_equal(
       '<a href="/bar/">Bar</a>',
-      link_to('Bar', rep),
+      link_to('Bar', target),
     )
   end
 
-  def test_link_to_with_item
-    # Create rep
-    item = mock
-    item.stubs(:path).returns('/bar/')
+  def test_link_to_with_item_with_reps_view
+    target = Nanoc::ItemWithRepsView.new(mock, {})
+    target.stubs(:path).returns('/bar/')
+
+    assert_equal(
+      '<a href="/bar/">Bar</a>',
+      link_to('Bar', target),
+    )
+  end
+
+  def test_link_to_with_item_rep_view
+    target = Nanoc::ItemRepView.new(mock, {})
+    target.stubs(:path).returns('/bar/')
 
-    # Check
     assert_equal(
       '<a href="/bar/">Bar</a>',
-      link_to('Bar', item),
+      link_to('Bar', target),
     )
   end
 
@@ -50,13 +55,11 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
   end
 
   def test_link_to_to_nil_item_or_item_rep
-    obj = Object.new
-    def obj.path
-      nil
-    end
+    target = Nanoc::ItemRepView.new(mock, {})
+    target.stubs(:path).returns(nil)
 
     assert_raises RuntimeError do
-      link_to('Some Text', obj)
+      link_to('Some Text', target)
     end
   end
 
@@ -208,14 +211,18 @@ class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
     YARD.parse(LIB_DIR + '/nanoc/helpers/link_to.rb')
 
     # Mock
-    @items = [mock, mock, mock]
+    @items = [
+      Nanoc::ItemRepView.new(mock, {}),
+      Nanoc::ItemRepView.new(mock, {}),
+      Nanoc::ItemRepView.new(mock, {}),
+    ]
     @items[0].stubs(:identifier).returns('/about/')
     @items[0].stubs(:path).returns('/about.html')
     @items[1].stubs(:identifier).returns('/software/')
     @items[1].stubs(:path).returns('/software.html')
     @items[2].stubs(:identifier).returns('/software/nanoc/')
     @items[2].stubs(:path).returns('/software/nanoc.html')
-    about_rep_vcard = mock
+    about_rep_vcard = Nanoc::ItemRepView.new(mock, {})
     about_rep_vcard.stubs(:path).returns('/about.vcf')
     @items[0].stubs(:rep).with(:vcard).returns(about_rep_vcard)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-30 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -378,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.