jekyll-sass-converter 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e214a22000c306efb48b4912d4c7b6e9d78990a
-  data.tar.gz: 08c40d1cfb885f62ba399078cc3cbba2407dcf86
+  metadata.gz: 645b96822c506f0d86f27cce5dc09793c4842982
+  data.tar.gz: 9eff7d0b5b3f471bc4d898edeb447aae620f3601
 SHA512:
-  metadata.gz: 543425ee1744268bf5999cae33e8faca593181b99b4b90f098751f3803a68d570d1ea6476821ed67886bc12b49a4908fdc2d65ed84c96c6602c4d7cb0c4d3dad
-  data.tar.gz: 6ccb8315e233073715dd970ad7076a18de04d370130e606b2136df72e22ce202c09226e6fbcb74c28b20a38f5040ec85cb7829165857e9641b354d2cac22a798
+  metadata.gz: d06aefb9977c5861b8871db35659fc9b0e50b7870f329f83eeef738f3a5ef74ccba66c48ea989aed5f16152fc808fe0fe375c209c7938e96f9f9d16e2e4e8ee5
+  data.tar.gz: 2bf05d542e7e713970b2b5b3e7f4c25c95ba2b5d6f05fdaf6d1c217aa93527b911191dbe969fed816885dbeecfd1ccbd9700ed695b7ab0ff40a61e0f147e0712

data/lib/jekyll-sass-converter/version.rb

@@ -1,3 +1,3 @@
 module JekyllSassConverter
-  VERSION = "1.3.0"
+  VERSION = "1.5.0"
 end

data/lib/jekyll/converters/scss.rb

@@ -1,9 +1,12 @@
+# encoding: utf-8
+
 require 'sass'
 require 'jekyll/utils'
 
 module Jekyll
   module Converters
     class Scss < Converter
+      BYTE_ORDER_MARK = /^\xEF\xBB\xBF/
       SyntaxError = Class.new(ArgumentError)
 
       safe true
@@ -68,21 +71,42 @@ module Jekyll
       end
 
       def sass_dir_relative_to_site_source
-        Jekyll.sanitized_path(@config["source"], sass_dir)
+        Jekyll.sanitized_path(site_source, sass_dir)
       end
 
       def sass_load_paths
+        paths = user_sass_load_paths + [sass_dir_relative_to_site_source]
+
         if safe?
-          [sass_dir_relative_to_site_source]
-        else
-          (user_sass_load_paths + [sass_dir_relative_to_site_source]).uniq
-        end.select { |load_path| File.directory?(load_path) }
+          # Sanitize paths to prevent any attack vectors (.e.g. `/**/*`)
+          paths.map! { |path| Jekyll.sanitized_path(site_source, path) }
+        end
+
+        # Expand file globs (e.g. `node_modules/*/node_modules` )
+        Dir.chdir(site_source) do
+          paths = paths.map { |path| Dir.glob(path) }.flatten.uniq
+
+          paths.map! do |path|
+            if safe?
+              # Sanitize again in case globbing was able to do something crazy.
+              Jekyll.sanitized_path(site_source, path)
+            else
+              File.expand_path(path)
+            end
+          end
+        end
+
+        paths.select { |path| File.directory?(path) }
       end
 
       def allow_caching?
         !safe?
       end
 
+      def add_charset?
+        !!jekyll_sass_configuration["add_charset"]
+      end
+
       def sass_configs
         sass_build_configuration_options({
           "syntax"     => syntax,
@@ -92,10 +116,17 @@ module Jekyll
       end
 
       def convert(content)
-        ::Sass.compile(content, sass_configs)
+        output = ::Sass.compile(content, sass_configs)
+        replacement = add_charset? ? '@charset "UTF-8";' : ''
+        output.sub(BYTE_ORDER_MARK, replacement)
       rescue ::Sass::SyntaxError => e
         raise SyntaxError.new("#{e.to_s} on line #{e.sass_line}")
       end
+
+      private
+      def site_source
+        @site_source ||= File.expand_path(@config["source"]).freeze
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-sass-converter
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +70,14 @@ dependencies:
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 description: 
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A basic Sass converter for Jekyll.