jekyll 3.0.2 → 3.0.3
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of jekyll might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/lib/jekyll.rb +2 -1
- data/lib/jekyll/document.rb +6 -3
- data/lib/jekyll/entry_filter.rb +1 -1
- data/lib/jekyll/liquid_renderer/file.rb +1 -1
- data/lib/jekyll/page.rb +5 -2
- data/lib/jekyll/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d8d95eee0017fdee0b1bd50cd4ecd98ce21c1c93
|
4
|
+
data.tar.gz: 01041195decd799ee53f3f789a198e77a4fa64c4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2db44561c9c9a3c0e2ab910c001bdf10f5666eea637897d3ab84ca99964826bac9198de11a9d6ca4444d0928463d6f3d6591abf3e8b498aef9a138475800fe22
|
7
|
+
data.tar.gz: 63f973c0b2cd718f45076b6813cfa3acebf8eed763775ee335dfc670ab6079b5b16fb686d2265c41c2a67201af4dd46df3777a21976e8a8dfc1f27a14a1406c4
|
data/lib/jekyll.rb
CHANGED
@@ -153,8 +153,9 @@ module Jekyll
|
|
153
153
|
def sanitized_path(base_directory, questionable_path)
|
154
154
|
return base_directory if base_directory.eql?(questionable_path)
|
155
155
|
|
156
|
+
questionable_path.insert(0, '/') if questionable_path.start_with?('~')
|
156
157
|
clean_path = File.expand_path(questionable_path, "/")
|
157
|
-
clean_path
|
158
|
+
clean_path.sub!(/\A\w\:\//, '/')
|
158
159
|
|
159
160
|
unless clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/'))
|
160
161
|
File.join(base_directory, clean_path)
|
data/lib/jekyll/document.rb
CHANGED
@@ -235,8 +235,11 @@ module Jekyll
|
|
235
235
|
def destination(base_directory)
|
236
236
|
dest = site.in_dest_dir(base_directory)
|
237
237
|
path = site.in_dest_dir(dest, URL.unescape_path(url))
|
238
|
-
|
239
|
-
|
238
|
+
if url.end_with? "/"
|
239
|
+
path = File.join(path, "index.html")
|
240
|
+
else
|
241
|
+
path << output_ext unless path.end_with?(output_ext)
|
242
|
+
end
|
240
243
|
path
|
241
244
|
end
|
242
245
|
|
@@ -398,7 +401,7 @@ module Jekyll
|
|
398
401
|
def <=>(other)
|
399
402
|
return nil if !other.respond_to?(:data)
|
400
403
|
cmp = data['date'] <=> other.data['date']
|
401
|
-
cmp = path <=> other.path if cmp == 0
|
404
|
+
cmp = path <=> other.path if cmp.nil? || cmp == 0
|
402
405
|
cmp
|
403
406
|
end
|
404
407
|
|
data/lib/jekyll/entry_filter.rb
CHANGED
@@ -47,7 +47,7 @@ module Jekyll
|
|
47
47
|
|
48
48
|
def excluded?(entry)
|
49
49
|
excluded = glob_include?(site.exclude, relative_to_source(entry))
|
50
|
-
Jekyll.logger.debug "EntryFilter:", "excluded
|
50
|
+
Jekyll.logger.debug "EntryFilter:", "excluded #{relative_to_source(entry)}" if excluded
|
51
51
|
excluded
|
52
52
|
end
|
53
53
|
|
data/lib/jekyll/page.rb
CHANGED
@@ -135,8 +135,11 @@ module Jekyll
|
|
135
135
|
# Returns the destination file path String.
|
136
136
|
def destination(dest)
|
137
137
|
path = site.in_dest_dir(dest, URL.unescape_path(url))
|
138
|
-
|
139
|
-
|
138
|
+
if url.end_with? "/"
|
139
|
+
path = File.join(path, "index.html")
|
140
|
+
else
|
141
|
+
path << output_ext unless path.end_with?(output_ext)
|
142
|
+
end
|
140
143
|
path
|
141
144
|
end
|
142
145
|
|
data/lib/jekyll/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jekyll
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.
|
4
|
+
version: 3.0.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tom Preston-Werner
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-02-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: liquid
|