jekyll 2.5.2 → 2.5.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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a6bb5f77c26304b1534b5f360dcbbd3e12188bcd
4
- data.tar.gz: 1120d5f07030ca80d947b105ac97f9930671335d
3
+ metadata.gz: 7c787f506ca8765ba861f91e8eb2bd9f0f323f7d
4
+ data.tar.gz: 69946ba3e330326aa40f8eb4dfff680b48fb4a99
5
5
  SHA512:
6
- metadata.gz: a5bc63775da2b18f8e14519012360a16863cee75f1da7cbeb95fc682d5239b1c46ac301feebb24bce7a396ba978b89fbd6be997df2a040fecd9b290257cc3c5b
7
- data.tar.gz: 2c56872f244a6623296f7387fdccd7c93829b160562f6c126918863311c347068e5503207cfff7c551d2328cd7dfb295caef9f3bd906dede493584c92767e1bf
6
+ metadata.gz: 7d3e0f40edb819f100b09334100b81dd9c644d69bcc2fc1e5d66579ed7a0355751f2301fcb3c2a4656621adb5918d26a7a09a43b38f47660f363cf4f57f6eee3
7
+ data.tar.gz: 59b59b0f45acbe8872e596e3d7b9485546f735cb076cb88574409c9cd4cae657bfbf945352b1b8033d41b6abb5078f785a4d53c3211189aa16c12f9b8f018a39
@@ -48,7 +48,7 @@ module Jekyll
48
48
 
49
49
  def extname_matches_regexp
50
50
  @extname_matches_regexp ||= Regexp.new(
51
- '(' + @config['markdown_ext'].gsub(',','|') +')$',
51
+ '^\.(' + @config['markdown_ext'].gsub(',','|') +')$',
52
52
  Regexp::IGNORECASE
53
53
  )
54
54
  end
@@ -328,14 +328,23 @@ module Jekyll
328
328
 
329
329
  def as_liquid(item)
330
330
  case item
331
- when String, Numeric, nil
332
- item.to_liquid
333
331
  when Hash
334
- Hash[item.map { |k, v| [as_liquid(k), as_liquid(v)] }]
332
+ pairs = item.map { |k, v| as_liquid([k, v]) }
333
+ Hash[pairs]
335
334
  when Array
336
335
  item.map{ |i| as_liquid(i) }
337
336
  else
338
- item.respond_to?(:to_liquid) ? as_liquid(item.to_liquid) : item
337
+ if item.respond_to?(:to_liquid)
338
+ liquidated = item.to_liquid
339
+ # prevent infinite recursion for simple types (which return `self`)
340
+ if liquidated == item
341
+ item
342
+ else
343
+ as_liquid(liquidated)
344
+ end
345
+ else
346
+ item
347
+ end
339
348
  end
340
349
  end
341
350
  end
@@ -1,3 +1,3 @@
1
1
  module Jekyll
2
- VERSION = '2.5.2'
2
+ VERSION = '2.5.3'
3
3
  end
@@ -1,12 +1,12 @@
1
1
  <head>
2
2
  <meta charset="utf-8">
3
3
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
4
- <meta name="viewport" content="width=device-width initial-scale=1">
4
+ <meta name="viewport" content="width=device-width, initial-scale=1">
5
5
 
6
6
  <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
7
7
  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
8
8
 
9
9
  <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
10
10
  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
11
- <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
11
+ <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
12
12
  </head>
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: 2.5.2
4
+ version: 2.5.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: 2014-11-23 00:00:00.000000000 Z
11
+ date: 2014-12-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: liquid