nanoc 4.10.4 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49248486c259abaff30695129879e162907c8c2d4dd7d732b4fdcc2da85d2b3f
-  data.tar.gz: f3ffb726ca647c372279f04063e44001a834e7a2fae0640a72bf216f7fcc950c
+  metadata.gz: 24b2704181c12e6dc71bf46b7bb87dc14e31c18d7d4530a0420dd2c98ffb3e9b
+  data.tar.gz: 913ca912414ce823d274704ba45e06ace2a4e603081472a6815fe0b9076dd1b2
 SHA512:
-  metadata.gz: 6be653b479fc1ac3d883ce735c956315331569e4851e5bef853094df8549a479c41a42cc266defbf9fbd881cc7e0ea8847a04ce726c5489d7e0531bcb938ee26
-  data.tar.gz: 417abf05a59af571b5402d8e0869308012ed04abd4e070c1c633170c5b66904d0931f80b1a6f670f5743f0fdf6f71fde425481806aaf0a3e144015cc464b7756
+  metadata.gz: cb662339340e2682df52518b85d5295bab537b18014a9fcd001f65fe31cb62aae1ab9bccca0c877ba196025a1e839ac6cd6fd26538e4df00b6b250a06dff7b61
+  data.tar.gz: d1b82c96c958141bdeb7d82511fd06d4a9499c251f6b656e300ea9120041377fcfde2c6562758c733e0d5e4eef593ba36fff5b3d16d4f719cc81f451014e2edb

data/NEWS.md

@@ -1,5 +1,12 @@
 # Nanoc news
 
+## 4.11.0 (2018-12-01)
+
+Features:
+
+* Added support for generating inline source maps for Sass (#1376) [Gregory Pakosz]
+* Added `:tiebreaker` option to the breadcrumbs helper, so that it can deal with ambiguity (#1368)
+
 ## 4.10.4 (2018-12-01)
 
 Fixes:

data/lib/nanoc.rb

@@ -38,6 +38,7 @@ module Nanoc
 end
 
 # Load general requirements
+require 'base64'
 require 'cgi'
 require 'digest'
 require 'English'

data/lib/nanoc/base/feature.rb

@@ -93,8 +93,8 @@ end
 
 # Tracking issue:
 # https://github.com/nanoc/features/issues/24
-Nanoc::Feature.define('live_cmd', version: '4.10')
+Nanoc::Feature.define('live_cmd', version: '4.11')
 
 # Tracking issue:
 # https://github.com/nanoc/features/issues/40
-Nanoc::Feature.define('toml', version: '4.10')
+Nanoc::Feature.define('toml', version: '4.11')

data/lib/nanoc/filters/sass.rb

@@ -25,11 +25,25 @@ module Nanoc::Filters
         filename: rep.item.identifier.to_s,
         cache: false,
       )
+      css_path = options.delete(:css_path) || filter.object_id.to_s
       sourcemap_path = options.delete(:sourcemap_path)
+      if sourcemap_path == :inline
+        sourcemap_path = Nanoc::Int::TempFilenameFactory.instance.create('sass_sourcemap')
+        inline = true
+      end
 
       engine = ::Sass::Engine.new(content, options)
       css, sourcemap = sourcemap_path ? engine.render_with_sourcemap(sourcemap_path) : engine.render
-      [css, sourcemap&.to_json(css_uri: rep.path, type: rep.path.nil? ? :inline : :auto)]
+
+      if inline
+        sourcemap = sourcemap&.to_json(css_uri: css_path)
+        encoded = "data:application/json;base64,#{Base64.urlsafe_encode64(sourcemap)}"
+        [css.gsub(%r{^/\*#\s+sourceMappingURL=\s*#{sourcemap_path}\s*\*/$}, "/*# sourceMappingURL=#{encoded} */")]
+      else
+        sourcemap = sourcemap&.to_json(css_path: css_path, sourcemap_path: sourcemap_path, type: params[:sources_content] ? :inline : :auto)
+        sourcemap = sourcemap&.split("\n")&.reject { |l| l =~ /^\s*"file":\s*"#{filter.object_id.to_s}"\s*$/ }&.join("\n")
+        [css, sourcemap]
+      end
     end
   end
 

data/lib/nanoc/helpers/breadcrumbs.rb

@@ -3,8 +3,34 @@
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#breadcrumbs
   module Breadcrumbs
+    class AmbiguousAncestorError < Nanoc::Int::Errors::Generic
+      def initialize(pattern, items)
+        @pattern = pattern
+        @items = items
+      end
+
+      def message
+        "expected only one item to match #{@pattern}, but found #{@items.size}"
+      end
+    end
+
     # @api private
     module Int
+      DEFAULT_TIEBREAKER =
+        lambda do |items, pattern|
+          identifiers = items.map(&:identifier).sort
+          $stderr.puts <<~WARNING
+            Warning: The breadcrumbs trail (generated by #breadcrumbs_trail) found more than one potential parent item at #{pattern} (found #{identifiers.join(', ')}). Nanoc will pick the first item as the parent. Consider eliminating the ambiguity by making only one item match #{pattern}, or by passing a `:tiebreaker` option to `#breadcrumbs_trail`. (This situation will be an error in the next major version of Nanoc.)
+          WARNING
+
+          items.min_by(&:identifier)
+        end
+
+      ERROR_TIEBREAKER =
+        lambda do |items, pattern|
+          raise AmbiguousAncestorError.new(pattern, items)
+        end
+
       # e.g. unfold(10.class, &:superclass)
       # => [Integer, Numeric, Object, BasicObject]
       def self.unfold(obj, &blk)
@@ -29,10 +55,26 @@ module Nanoc::Helpers
 
         prefixes.map { |pr| pr + '.*' }
       end
+
+      def self.find_one(items, pat, tiebreaker)
+        res = items.find_all(pat)
+        case res.size
+        when 0
+          nil
+        when 1
+          res.first
+        else
+          if tiebreaker.arity == 1
+            tiebreaker.call(res)
+          else
+            tiebreaker.call(res, pat)
+          end
+        end
+      end
     end
 
     # @return [Array]
-    def breadcrumbs_trail
+    def breadcrumbs_trail(tiebreaker: Int::DEFAULT_TIEBREAKER)
       # The design of this function is a little complicated.
       #
       # We can’t use #parent_of from the ChildParent helper, because the
@@ -65,6 +107,8 @@ module Nanoc::Helpers
       components = item.identifier.components
       prefixes = components.inject(['']) { |acc, elem| acc + [acc.last + '/' + elem] }
 
+      tiebreaker = Int::ERROR_TIEBREAKER if tiebreaker == :error
+
       if @item.identifier.legacy?
         prefixes.map { |pr| @items[Nanoc::Identifier.new('/' + pr, type: :legacy)] }
       else
@@ -75,7 +119,7 @@ module Nanoc::Helpers
               @items['/index.*']
             else
               prefix_patterns = Int.patterns_for_prefix(pr)
-              prefix_patterns.lazy.map { |pat| @items[pat] }.find(&:itself)
+              prefix_patterns.lazy.map { |pat| Int.find_one(@items, pat, tiebreaker) }.find(&:itself)
             end
           end
         ancestral_items + [item]

data/lib/nanoc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.10.4
+  version: 4.11.0
 platform: ruby
 authors:
 - Denis Defreyne