jekyll 3.6.0.pre.beta1 → 3.6.0
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/commands/new.rb +6 -2
- data/lib/jekyll/drops/drop.rb +4 -5
- data/lib/jekyll/filters.rb +18 -11
- data/lib/jekyll/mime.types +32 -7
- data/lib/jekyll/readers/post_reader.rb +8 -3
- data/lib/jekyll/version.rb +1 -1
- metadata +5 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: da93bf4436506744efe0f36eb41c66e9db32ab8f
|
|
4
|
+
data.tar.gz: 75a3277262729b8ae2d7d991d6d88bb483c52910
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d9699661a32993139a9892f4624bfbde6f4cc5a932f0e284bf277d1f187d0a17a3542bd0512f2cbe904ba5b30674c669cb7e32a93c27ecf8db65e01405c7c3cf
|
|
7
|
+
data.tar.gz: 9a951053b8fdccd7b1112ece941b6b53a36a5c943fe0d147d97d6d8501532793b9bf34bb818736b3c7f93f3c4d48ec389e69f3d0ad028610b6eccc631a269cd8
|
data/lib/jekyll/commands/new.rb
CHANGED
|
@@ -128,7 +128,12 @@ RUBY
|
|
|
128
128
|
|
|
129
129
|
def after_install(path, options = {})
|
|
130
130
|
unless options["blank"] || options["skip-bundle"]
|
|
131
|
-
|
|
131
|
+
begin
|
|
132
|
+
require "bundler"
|
|
133
|
+
bundle_install path
|
|
134
|
+
rescue LoadError
|
|
135
|
+
Jekyll.logger.info "Could not load Bundler. Bundle install skipped."
|
|
136
|
+
end
|
|
132
137
|
end
|
|
133
138
|
|
|
134
139
|
Jekyll.logger.info "New jekyll site installed in #{path.cyan}."
|
|
@@ -136,7 +141,6 @@ RUBY
|
|
|
136
141
|
end
|
|
137
142
|
|
|
138
143
|
def bundle_install(path)
|
|
139
|
-
Jekyll::External.require_with_graceful_fail "bundler"
|
|
140
144
|
Jekyll.logger.info "Running bundle install in #{path.cyan}..."
|
|
141
145
|
Dir.chdir(path) do
|
|
142
146
|
process, output = Jekyll::Utils::Exec.run("bundle", "install")
|
data/lib/jekyll/drops/drop.rb
CHANGED
|
@@ -55,6 +55,7 @@ module Jekyll
|
|
|
55
55
|
fallback_data[key]
|
|
56
56
|
end
|
|
57
57
|
end
|
|
58
|
+
alias_method :invoke_drop, :[]
|
|
58
59
|
|
|
59
60
|
# Set a field in the Drop. If mutable, sets in the mutations and
|
|
60
61
|
# returns. If not mutable, checks first if it's trying to override a
|
|
@@ -103,11 +104,9 @@ module Jekyll
|
|
|
103
104
|
#
|
|
104
105
|
# Returns true if the given key is present
|
|
105
106
|
def key?(key)
|
|
106
|
-
if
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
!key.nil? && (respond_to?(key) || fallback_data.key?(key))
|
|
110
|
-
end
|
|
107
|
+
return false if key.nil?
|
|
108
|
+
return true if self.class.mutable? && @mutations.key?(key)
|
|
109
|
+
respond_to?(key) || fallback_data.key?(key)
|
|
111
110
|
end
|
|
112
111
|
|
|
113
112
|
# Generates a list of keys with user content as their values.
|
data/lib/jekyll/filters.rb
CHANGED
|
@@ -335,19 +335,26 @@ module Jekyll
|
|
|
335
335
|
end
|
|
336
336
|
|
|
337
337
|
private
|
|
338
|
+
|
|
339
|
+
# Sort the input Enumerable by the given property.
|
|
340
|
+
# If the property doesn't exist, return the sort order respective of
|
|
341
|
+
# which item doesn't have the property.
|
|
342
|
+
# We also utilize the Schwartzian transform to make this more efficient.
|
|
338
343
|
def sort_input(input, property, order)
|
|
339
|
-
input.
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
344
|
+
input.map { |item| [item_property(item, property), item] }
|
|
345
|
+
.sort! do |apple_info, orange_info|
|
|
346
|
+
apple_property = apple_info.first
|
|
347
|
+
orange_property = orange_info.first
|
|
348
|
+
|
|
349
|
+
if !apple_property.nil? && orange_property.nil?
|
|
350
|
+
- order
|
|
351
|
+
elsif apple_property.nil? && !orange_property.nil?
|
|
352
|
+
+ order
|
|
353
|
+
else
|
|
354
|
+
apple_property <=> orange_property
|
|
355
|
+
end
|
|
349
356
|
end
|
|
350
|
-
|
|
357
|
+
.map!(&:last)
|
|
351
358
|
end
|
|
352
359
|
|
|
353
360
|
private
|
data/lib/jekyll/mime.types
CHANGED
|
@@ -14,7 +14,7 @@ application/cdmi-domain cdmid
|
|
|
14
14
|
application/cdmi-object cdmio
|
|
15
15
|
application/cdmi-queue cdmiq
|
|
16
16
|
application/cu-seeme cu
|
|
17
|
-
application/dash+xml
|
|
17
|
+
application/dash+xml mpd
|
|
18
18
|
application/davmount+xml davmount
|
|
19
19
|
application/docbook+xml dbk
|
|
20
20
|
application/dssc+der dssc
|
|
@@ -26,16 +26,18 @@ application/exi exi
|
|
|
26
26
|
application/font-tdpfr pfr
|
|
27
27
|
application/font-woff woff
|
|
28
28
|
application/font-woff2 woff2
|
|
29
|
+
application/geo+json geojson
|
|
29
30
|
application/gml+xml gml
|
|
30
31
|
application/gpx+xml gpx
|
|
31
32
|
application/gxf gxf
|
|
33
|
+
application/gzip gz
|
|
32
34
|
application/hyperstudio stk
|
|
33
35
|
application/inkml+xml ink inkml
|
|
34
36
|
application/ipfix ipfix
|
|
35
37
|
application/java-archive jar war ear
|
|
36
38
|
application/java-serialized-object ser
|
|
37
39
|
application/java-vm class
|
|
38
|
-
application/javascript js
|
|
40
|
+
application/javascript js mjs
|
|
39
41
|
application/json json map
|
|
40
42
|
application/json5 json5
|
|
41
43
|
application/jsonml+json jsonml
|
|
@@ -142,6 +144,7 @@ application/vnd.anser-web-funds-transfer-initiation fti
|
|
|
142
144
|
application/vnd.antix.game-component atx
|
|
143
145
|
application/vnd.apple.installer+xml mpkg
|
|
144
146
|
application/vnd.apple.mpegurl m3u8
|
|
147
|
+
application/vnd.apple.pkpass pkpass
|
|
145
148
|
application/vnd.aristanetworks.swi swi
|
|
146
149
|
application/vnd.astraea-software.iota iota
|
|
147
150
|
application/vnd.audiograph aep
|
|
@@ -220,6 +223,9 @@ application/vnd.geonext gxt
|
|
|
220
223
|
application/vnd.geoplan g2w
|
|
221
224
|
application/vnd.geospace g3w
|
|
222
225
|
application/vnd.gmx gmx
|
|
226
|
+
application/vnd.google-apps.document gdoc
|
|
227
|
+
application/vnd.google-apps.presentation gslides
|
|
228
|
+
application/vnd.google-apps.spreadsheet gsheet
|
|
223
229
|
application/vnd.google-earth.kml+xml kml
|
|
224
230
|
application/vnd.google-earth.kmz kmz
|
|
225
231
|
application/vnd.grafeq gqf gqs
|
|
@@ -317,6 +323,7 @@ application/vnd.ms-htmlhelp chm
|
|
|
317
323
|
application/vnd.ms-ims ims
|
|
318
324
|
application/vnd.ms-lrm lrm
|
|
319
325
|
application/vnd.ms-officetheme thmx
|
|
326
|
+
application/vnd.ms-outlook msg
|
|
320
327
|
application/vnd.ms-pki.seccat cat
|
|
321
328
|
application/vnd.ms-pki.stl stl
|
|
322
329
|
application/vnd.ms-powerpoint ppt pps pot
|
|
@@ -422,6 +429,7 @@ application/vnd.stardivision.writer sdw vo
|
|
|
422
429
|
application/vnd.stardivision.writer-global sgl
|
|
423
430
|
application/vnd.stepmania.package smzip
|
|
424
431
|
application/vnd.stepmania.stepchart sm
|
|
432
|
+
application/vnd.sun.wadl+xml wadl
|
|
425
433
|
application/vnd.sun.xml.calc sxc
|
|
426
434
|
application/vnd.sun.xml.calc.template stc
|
|
427
435
|
application/vnd.sun.xml.draw sxd
|
|
@@ -481,6 +489,7 @@ application/wspolicy+xml wspoli
|
|
|
481
489
|
application/x-7z-compressed 7z
|
|
482
490
|
application/x-abiword abw
|
|
483
491
|
application/x-ace-compressed ace
|
|
492
|
+
application/x-arj arj
|
|
484
493
|
application/x-authorware-bin aab x32 u32 vox
|
|
485
494
|
application/x-authorware-map aam
|
|
486
495
|
application/x-authorware-seg aas
|
|
@@ -582,6 +591,14 @@ application/x-tex-tfm tfm
|
|
|
582
591
|
application/x-texinfo texinfo texi
|
|
583
592
|
application/x-tgif obj
|
|
584
593
|
application/x-ustar ustar
|
|
594
|
+
application/x-virtualbox-hdd hdd
|
|
595
|
+
application/x-virtualbox-ova ova
|
|
596
|
+
application/x-virtualbox-ovf ovf
|
|
597
|
+
application/x-virtualbox-vbox vbox
|
|
598
|
+
application/x-virtualbox-vbox-extpack vbox-extpack
|
|
599
|
+
application/x-virtualbox-vdi vdi
|
|
600
|
+
application/x-virtualbox-vhd vhd
|
|
601
|
+
application/x-virtualbox-vmdk vmdk
|
|
585
602
|
application/x-wais-source src
|
|
586
603
|
application/x-web-app-manifest+json webapp
|
|
587
604
|
application/x-x509-ca-cert der crt pem
|
|
@@ -594,7 +611,7 @@ application/xaml+xml xaml
|
|
|
594
611
|
application/xcap-diff+xml xdf
|
|
595
612
|
application/xenc+xml xenc
|
|
596
613
|
application/xhtml+xml xhtml xht
|
|
597
|
-
application/xml xml xsl xsd
|
|
614
|
+
application/xml xml xsl xsd rng
|
|
598
615
|
application/xml-dtd dtd
|
|
599
616
|
application/xop+xml xop
|
|
600
617
|
application/xproc+xml xpl
|
|
@@ -604,11 +621,13 @@ application/xv+xml mxml x
|
|
|
604
621
|
application/yang yang
|
|
605
622
|
application/yin+xml yin
|
|
606
623
|
application/zip zip
|
|
624
|
+
audio/3gpp 3gpp
|
|
607
625
|
audio/adpcm adp
|
|
608
626
|
audio/basic au snd
|
|
609
627
|
audio/midi mid midi kar rmi
|
|
610
|
-
audio/
|
|
611
|
-
audio/
|
|
628
|
+
audio/mp3 mp3
|
|
629
|
+
audio/mp4 m4a mp4a
|
|
630
|
+
audio/mpeg mpga mp2 mp2a m2a m3a
|
|
612
631
|
audio/ogg oga ogg spx
|
|
613
632
|
audio/s3m s3m
|
|
614
633
|
audio/silk sil
|
|
@@ -642,6 +661,7 @@ chemical/x-cmdf cmdf
|
|
|
642
661
|
chemical/x-cml cml
|
|
643
662
|
chemical/x-csml csml
|
|
644
663
|
chemical/x-xyz xyz
|
|
664
|
+
image/apng apng
|
|
645
665
|
image/bmp bmp
|
|
646
666
|
image/cgm cgm
|
|
647
667
|
image/g3fax g3
|
|
@@ -690,6 +710,8 @@ image/x-xbitmap xbm
|
|
|
690
710
|
image/x-xpixmap xpm
|
|
691
711
|
image/x-xwindowdump xwd
|
|
692
712
|
message/rfc822 eml mime
|
|
713
|
+
model/gltf+json gltf
|
|
714
|
+
model/gltf-binary glb
|
|
693
715
|
model/iges igs iges
|
|
694
716
|
model/mesh msh mesh silo
|
|
695
717
|
model/vnd.collada+xml dae
|
|
@@ -712,12 +734,14 @@ text/html html h
|
|
|
712
734
|
text/jade jade
|
|
713
735
|
text/jsx jsx
|
|
714
736
|
text/less less
|
|
737
|
+
text/markdown markdown md
|
|
715
738
|
text/mathml mml
|
|
716
739
|
text/n3 n3
|
|
717
740
|
text/plain txt text conf def list log in ini
|
|
718
741
|
text/prs.lines.tag dsc
|
|
719
742
|
text/richtext rtx
|
|
720
743
|
text/sgml sgml sgm
|
|
744
|
+
text/slim slim slm
|
|
721
745
|
text/stylus stylus styl
|
|
722
746
|
text/tab-separated-values tsv
|
|
723
747
|
text/troff t tr roff man me ms
|
|
@@ -744,7 +768,7 @@ text/x-fortran f for
|
|
|
744
768
|
text/x-handlebars-template hbs
|
|
745
769
|
text/x-java-source java
|
|
746
770
|
text/x-lua lua
|
|
747
|
-
text/x-markdown
|
|
771
|
+
text/x-markdown mkd
|
|
748
772
|
text/x-nfo nfo
|
|
749
773
|
text/x-opml opml
|
|
750
774
|
text/x-pascal p pas
|
|
@@ -753,11 +777,12 @@ text/x-sass sass
|
|
|
753
777
|
text/x-scss scss
|
|
754
778
|
text/x-setext etx
|
|
755
779
|
text/x-sfv sfv
|
|
780
|
+
text/x-suse-ymp ymp
|
|
756
781
|
text/x-uuencode uu
|
|
757
782
|
text/x-vcalendar vcs
|
|
758
783
|
text/x-vcard vcf
|
|
759
784
|
text/yaml yaml yml
|
|
760
|
-
video/3gpp 3gp
|
|
785
|
+
video/3gpp 3gp
|
|
761
786
|
video/3gpp2 3g2
|
|
762
787
|
video/h261 h261
|
|
763
788
|
video/h263 h263
|
|
@@ -36,10 +36,15 @@ module Jekyll
|
|
|
36
36
|
def read_publishable(dir, magic_dir, matcher)
|
|
37
37
|
read_content(dir, magic_dir, matcher).tap { |docs| docs.each(&:read) }
|
|
38
38
|
.select do |doc|
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
if doc.content.valid_encoding?
|
|
40
|
+
site.publisher.publish?(doc).tap do |will_publish|
|
|
41
|
+
if !will_publish && site.publisher.hidden_in_the_future?(doc)
|
|
42
|
+
Jekyll.logger.debug "Skipping:", "#{doc.relative_path} has a future date"
|
|
43
|
+
end
|
|
42
44
|
end
|
|
45
|
+
else
|
|
46
|
+
Jekyll.logger.debug "Skipping:", "#{doc.relative_path} is not valid UTF-8"
|
|
47
|
+
false
|
|
43
48
|
end
|
|
44
49
|
end
|
|
45
50
|
end
|
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.6.0
|
|
4
|
+
version: 3.6.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Tom Preston-Werner
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-
|
|
11
|
+
date: 2017-09-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: addressable
|
|
@@ -285,12 +285,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
285
285
|
version: 2.1.0
|
|
286
286
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
287
287
|
requirements:
|
|
288
|
-
- - "
|
|
288
|
+
- - ">="
|
|
289
289
|
- !ruby/object:Gem::Version
|
|
290
|
-
version:
|
|
290
|
+
version: '0'
|
|
291
291
|
requirements: []
|
|
292
292
|
rubyforge_project:
|
|
293
|
-
rubygems_version: 2.6.
|
|
293
|
+
rubygems_version: 2.6.13
|
|
294
294
|
signing_key:
|
|
295
295
|
specification_version: 2
|
|
296
296
|
summary: A simple, blog aware, static site generator.
|