jekyll-remote-theme 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8b60407212cb023740ee7d4258e9a02c862bed37246db406607af4d3e6228e8
-  data.tar.gz: 448d9d30e4f0e0a2efa300c1ab7bdd8199ff82fcc4afd97264227892d6ab5fe3
+  metadata.gz: 5e01afd90316ec162cddd29765466d934ae241d626f473bcd9acfd9976a1fd01
+  data.tar.gz: '00945458c1ed12cb8bdc2a21aa41d11d22e3cc8060a67eb65b494e9bc1ac0775'
 SHA512:
-  metadata.gz: 36eacae972f56890144e128ec284067fa33f03f528b4f70047b0c60e4f90e80f04426990a6abb6ea87d1d6cbecac1b12effec5dcafbe89c7eb6abd9d1160c357
-  data.tar.gz: '0871deb358244f78aa294b171af43415eb0bed1367c3224554992c1723dbae092d48d0bc321c116fd0297b1e22d7847e030599c748a6fef5b5192a9f1ccdfa93'
+  metadata.gz: 12c833b553ab123f001a1ec6610a01551265b675349045cd322e73816e2f421e3033174cad40a542b18087272f30edb945c838fe24b4e1d21b095d0453d2c9e4
+  data.tar.gz: 267ffe076935719f7e91cfc4ce4673ff29d437a908068b89b296e456d17d9a61128af54ddda2008e1d1fff5e58e430542d623b7925ae39e6b722afdbee1a2d4c

data/lib/jekyll-remote-theme/munger.rb

@@ -40,7 +40,7 @@ module Jekyll
       # On a rebuild, reuse the theme configured by the first run rather than
       # building a new one, which would create another temp directory.
       def theme
-        @theme ||= munged? ? site.theme : Theme.new(raw_theme)
+        @theme ||= munged? ? site.theme : Theme.new(raw_theme, site)
       end
 
       def raw_theme

data/lib/jekyll-remote-theme/theme.rb

@@ -21,7 +21,10 @@ module Jekyll
       # 5. /absolute/path/to/theme - an absolute local file path
       # 6. ../relative/path/to/theme - a relative local file path
       # 7. ~/path/to/theme - a home directory relative path
-      def initialize(raw_theme)
+      #
+      # Local paths are only valid when a site is given and it isn't in safe mode.
+      def initialize(raw_theme, site = nil)
+        @site = site
         original_theme = raw_theme.to_s.strip
         local_path = looks_like_local_path?(original_theme)
         @raw_theme = local_path ? original_theme : original_theme.downcase
@@ -70,7 +73,9 @@ module Jekyll
       end
 
       def root
-        @root ||= local_theme? ? expanded_local_path : File.realpath(Dir.mktmpdir(TEMP_PREFIX))
+        return (expanded_local_path if local_path_valid?) if local_theme?
+
+        @root ||= File.realpath(Dir.mktmpdir(TEMP_PREFIX))
       end
 
       def inspect
@@ -84,6 +89,15 @@ module Jekyll
 
       private
 
+      # A rejected local theme has no root. Jekyll 3's Theme#initialize resolves
+      # the theme's Sass path straight away, so return no paths rather than
+      # passing a nil root to Jekyll.sanitized_path.
+      def path_for(folder)
+        return if root.nil?
+
+        super
+      end
+
       def looks_like_local_path?(path)
         # Check if it looks like a local path
         # Supports: /, ./, ../, ~/ (Unix-style) and drive letters (Windows-style)
@@ -94,7 +108,11 @@ module Jekyll
         @expanded_local_path ||= File.expand_path(@raw_theme)
       end
 
+      # Local paths can reference any directory on the host, so they're never
+      # allowed in safe mode (or without a site to check).
       def local_path_valid?
+        return false if @site.nil? || @site.safe
+
         Dir.exist?(expanded_local_path)
       end
 

data/lib/jekyll-remote-theme/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module RemoteTheme
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-remote-theme
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ben Balter