nanoc 4.10.3 → 4.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29fff0fd45abb2f33fe2ecd8b80531a166163bfea453b2f4633bd7796847624d
-  data.tar.gz: 8795f5b0c4d192c4d02cc3febc198a5af78410d073ba6df41c8ffbe32ad94f54
+  metadata.gz: 49248486c259abaff30695129879e162907c8c2d4dd7d732b4fdcc2da85d2b3f
+  data.tar.gz: f3ffb726ca647c372279f04063e44001a834e7a2fae0640a72bf216f7fcc950c
 SHA512:
-  metadata.gz: d208e075e74aa527b9384aa902a98b52d35ee0fc7432fc2ed93c142ebf66dd02ade7ecf169fce4a1ded36c680428afcf36b675d5de158553beb5d3e256850fcc
-  data.tar.gz: 5a8b4e5c7f3c367620fcf568491665d509dc6ccfab035994bb896962bf83403309b6b116d221836babf82afba750b8b944f38c9ef462d7c45a964fa82afd1877
+  metadata.gz: 6be653b479fc1ac3d883ce735c956315331569e4851e5bef853094df8549a479c41a42cc266defbf9fbd881cc7e0ea8847a04ce726c5489d7e0531bcb938ee26
+  data.tar.gz: 417abf05a59af571b5402d8e0869308012ed04abd4e070c1c633170c5b66904d0931f80b1a6f670f5743f0fdf6f71fde425481806aaf0a3e144015cc464b7756

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.10.4 (2018-12-01)
+
+Fixes:
+
+* Fixed an error when importing a Sass/SCSS file outside of Nanoc’s content directory (#1378, #1379)
+
 ## 4.10.3 (2018-10-28)
 
 Fixes:
@@ -988,11 +994,11 @@ Enhancements:
 
 * Added several convenience methods to view classes (#570, #572)
 
-See the [nanoc 4 upgrade guide](http://nanoc.ws/docs/nanoc-4-upgrade-guide/) for details.
+See the [nanoc 4 upgrade guide](http://nanoc.ws/doc/nanoc-4-upgrade-guide/) for details.
 
 ## 4.0.0a1 (2015-05-09)
 
-This is a major upgrade. For details on upgrading, see the [nanoc 4 upgrade guide](http://nanoc.ws/docs/nanoc-4-upgrade-guide/).
+This is a major upgrade. For details on upgrading, see the [nanoc 4 upgrade guide](http://nanoc.ws/doc/nanoc-4-upgrade-guide/).
 
 This release provides no new features, but streamlines the API and functionality, in order to easen future development, both for features and for optimisations.
 

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

@@ -77,7 +77,7 @@ module Nanoc::Int
       end
     end
 
-    ENCODING_REGEX = /\A#\s+(-\*-\s+)?(en)?coding: (?<encoding>[^\s]+)(\s+-\*-\s*)?\n{0,2}/
+    ENCODING_REGEX = /\A#\s+(-\*-\s+)?(en)?coding: (?<encoding>[^\s]+)(\s+-\*-\s*)?\n{0,2}/.freeze
 
     def encoding_from_magic_comment(raw)
       match = ENCODING_REGEX.match(raw)

data/lib/nanoc/checking/checks/mixed_content.rb

@@ -8,7 +8,7 @@ module Nanoc::Checking::Checks
   class MixedContent < ::Nanoc::Checking::Check
     identifier :mixed_content
 
-    PROTOCOL_PATTERN = /^(\w+):\/\//
+    PROTOCOL_PATTERN = /^(\w+):\/\//.freeze
 
     def run
       filenames = output_html_filenames

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

@@ -75,8 +75,8 @@ module Nanoc::CLI::Commands
     ].freeze
 
     PLUGIN_CLASSES = {
-      Nanoc::Filter          => 'Filters',
-      Nanoc::DataSource      => 'Data Sources',
+      Nanoc::Filter => 'Filters',
+      Nanoc::DataSource => 'Data Sources',
       Nanoc::Deploying::Deployer => 'Deployers',
     }.freeze
 

data/lib/nanoc/cli/error_handler.rb

@@ -180,45 +180,45 @@ module Nanoc::CLI
     # A hash that contains the name of the gem for a given required file. If a
     # `#require` fails, the gem name is looked up in this hash.
     GEM_NAMES = {
-      'adsf'           => 'adsf',
-      'asciidoctor'    => 'asciidoctor',
-      'bluecloth'      => 'bluecloth',
-      'builder'        => 'builder',
-      'coderay'        => 'coderay',
-      'coffee-script'  => 'coffee-script',
-      'cri'            => 'cri',
-      'erubi'          => 'erubi',
-      'erubis'         => 'erubis',
-      'escape'         => 'escape',
-      'fog'            => 'fog',
-      'haml'           => 'haml',
-      'handlebars'     => 'hbs',
-      'json'           => 'json',
-      'kramdown'       => 'kramdown',
-      'less'           => 'less',
-      'listen'         => 'listen',
-      'markaby'        => 'markaby',
-      'maruku'         => 'maruku',
-      'mime/types'     => 'mime-types',
-      'mustache'       => 'mustache',
-      'nanoc/live'     => 'nanoc-live',
-      'nokogiri'       => 'nokogiri',
-      'nokogumbo'      => 'nokogumbo',
-      'pandoc-ruby'    => 'pandoc-ruby',
-      'pry'            => 'pry',
-      'rack'           => 'rack',
-      'rack/cache'     => 'rack-cache',
-      'rainpress'      => 'rainpress',
-      'rdiscount'      => 'rdiscount',
-      'redcarpet'      => 'redcarpet',
-      'redcloth'       => 'RedCloth',
-      'rubypants'      => 'rubypants',
-      'sass'           => 'sass',
-      'slim'           => 'slim',
-      'typogruby'      => 'typogruby',
-      'uglifier'       => 'uglifier',
+      'adsf' => 'adsf',
+      'asciidoctor' => 'asciidoctor',
+      'bluecloth' => 'bluecloth',
+      'builder' => 'builder',
+      'coderay' => 'coderay',
+      'coffee-script' => 'coffee-script',
+      'cri' => 'cri',
+      'erubi' => 'erubi',
+      'erubis' => 'erubis',
+      'escape' => 'escape',
+      'fog' => 'fog',
+      'haml' => 'haml',
+      'handlebars' => 'hbs',
+      'json' => 'json',
+      'kramdown' => 'kramdown',
+      'less' => 'less',
+      'listen' => 'listen',
+      'markaby' => 'markaby',
+      'maruku' => 'maruku',
+      'mime/types' => 'mime-types',
+      'mustache' => 'mustache',
+      'nanoc/live' => 'nanoc-live',
+      'nokogiri' => 'nokogiri',
+      'nokogumbo' => 'nokogumbo',
+      'pandoc-ruby' => 'pandoc-ruby',
+      'pry' => 'pry',
+      'rack' => 'rack',
+      'rack/cache' => 'rack-cache',
+      'rainpress' => 'rainpress',
+      'rdiscount' => 'rdiscount',
+      'redcarpet' => 'redcarpet',
+      'redcloth' => 'RedCloth',
+      'rubypants' => 'rubypants',
+      'sass' => 'sass',
+      'slim' => 'slim',
+      'typogruby' => 'typogruby',
+      'uglifier' => 'uglifier',
       'w3c_validators' => 'w3c_validators',
-      'yuicompressor'  => 'yuicompressor',
+      'yuicompressor' => 'yuicompressor',
     }.freeze
 
     # Attempts to find a resolution for the given error, or nil if no

data/lib/nanoc/cli/transform.rb

@@ -4,7 +4,7 @@ module Nanoc::CLI
   # @api private
   module Transform
     module Port
-      RANGE = 0x0001..0xffff
+      RANGE = (0x0001..0xffff).freeze
 
       def self.call(data)
         Integer(data).tap do |int|

data/lib/nanoc/filters/sass/importer.rb

@@ -20,15 +20,16 @@ module Nanoc::Filters::SassCommon
       return unless raw_filename
 
       item = raw_filename_to_item(raw_filename)
-      # it doesn't make sense to import a file, from Nanoc's content if the corresponding item has been deleted
-      raise "unable to map #{raw_filename} to any item" if item.nil?
 
-      filter.depend_on([item])
+      content = item ? item.raw_content : File.read(raw_filename)
+      filename = item ? item.identifier.to_s : raw_filename
+
+      filter.depend_on([item]) if item
 
       options[:syntax] = syntax
-      options[:filename] = item.identifier.to_s
+      options[:filename] = filename
       options[:importer] = self
-      ::Sass::Engine.new(item.raw_content, options)
+      ::Sass::Engine.new(content, options)
     end
 
     def find(identifier, options)

data/lib/nanoc/spec.rb

@@ -167,19 +167,19 @@ module Nanoc
       def view_context
         compilation_context =
           Nanoc::Int::CompilationContext.new(
-            action_provider:        @action_provider,
-            reps:                   @reps,
-            site:                   @site,
+            action_provider: @action_provider,
+            reps: @reps,
+            site: @site,
             compiled_content_cache: :__compiled_content_cache,
-            snapshot_repo:          @snapshot_repo,
+            snapshot_repo: @snapshot_repo,
           )
 
         Nanoc::ViewContextForCompilation.new(
-          reps:                @reps,
-          items:               @items,
-          dependency_tracker:  @dependency_tracker,
+          reps: @reps,
+          items: @items,
+          dependency_tracker: @dependency_tracker,
           compilation_context: compilation_context,
-          snapshot_repo:       @snapshot_repo,
+          snapshot_repo: @snapshot_repo,
         )
       end
 

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.10.3
+  version: 4.10.4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-28 00:00:00.000000000 Z
+date: 2018-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -455,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.