jekyll 1.4.1 → 1.4.2

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: 24060aa80c98b5612f5e896317353d8972318ca8
4
- data.tar.gz: ad7096265d92cfb3ee9f7620d32133293bc5658b
3
+ metadata.gz: c1c80d86509b422187561c937696fdea84af56a9
4
+ data.tar.gz: 5fa354c59193e539e3e1f695c425232a64cf54f4
5
5
  SHA512:
6
- metadata.gz: c58c1355f8110a62c82b65106695a6f223004837de92e8878f4a6cddca21404c738d9d5681ad63be124d5f17ecf31b098f5edc6f65b68c82607dfe344c586349
7
- data.tar.gz: 7b756ecc80484030c97cd27e5552748ef85288ec193e2fd75885945f5aa36f268ca1ba138c50d9369edcc39f684de6cde49f6d82c0c1e6b4d348eef6d7e140d6
6
+ metadata.gz: ec82371ae5ccfdc0cc2d569b07bd3317e3d0f64bedc26bd21e7d9d2b1d2e100365441c71fdeb0ccb851dc7a63ce33f034607b36ab1d3ad9d4614b523d3ef6e9a
7
+ data.tar.gz: d32097a6783de0f1dfade3fcd4b2dda43ac139c7b585c62536297da1ff65f7997009f64a0cd246ebee09ccf6c40b7e932ea4a7bc4a47071d06bac8727b4633d3
@@ -10,6 +10,11 @@
10
10
 
11
11
  ### Site Enhancements
12
12
 
13
+ ## 1.4.2 / 2013-12-16
14
+
15
+ ### Bug Fixes
16
+ * Turn on Maruku fenced code blocks by default (#1830)
17
+
13
18
  ## 1.4.1 / 2013-12-09
14
19
 
15
20
  ### Major Enhancements
data/Rakefile CHANGED
@@ -233,7 +233,7 @@ namespace :site do
233
233
  post.puts("title: 'Jekyll #{release} Released'")
234
234
  post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}")
235
235
  post.puts("author: ")
236
- post.puts("version: #{version}")
236
+ post.puts("version: #{release}")
237
237
  post.puts("categories: [release]")
238
238
  post.puts("---")
239
239
  post.puts
@@ -28,3 +28,40 @@ Feature: Markdown
28
28
  And I should see "Index" in "_site/index.html"
29
29
  And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/index.html"
30
30
 
31
+ Scenario: Maruku fenced codeblocks
32
+ Given I have a configuration file with "markdown" set to "maruku"
33
+ And I have an "index.markdown" file with content:
34
+ """
35
+ ---
36
+ title: My title
37
+ ---
38
+
39
+ # My title
40
+
41
+ ```
42
+ My awesome code
43
+ ```
44
+ """
45
+ When I run jekyll
46
+ Then the _site directory should exist
47
+ And I should see "My awesome code" in "_site/index.html"
48
+ And I should see "<pre><code>\nMy awesome code\n</code></pre>" in "_site/index.html"
49
+
50
+ Scenario: Maruku fenced codeblocks
51
+ Given I have a configuration file with "markdown" set to "maruku"
52
+ And I have an "index.markdown" file with content:
53
+ """
54
+ ---
55
+ title: My title
56
+ ---
57
+
58
+ # My title
59
+
60
+ ```ruby
61
+ puts "My awesome string"
62
+ ```
63
+ """
64
+ When I run jekyll
65
+ Then the _site directory should exist
66
+ And I should see "My awesome string" in "_site/index.html"
67
+ And I should see "<pre class="ruby"><code class="ruby">\nputs &quot;My awesome string&quot;\n</code></pre>" in "_site/index.html"
@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
4
4
  s.rubygems_version = '1.3.5'
5
5
 
6
6
  s.name = 'jekyll'
7
- s.version = '1.4.1'
7
+ s.version = '1.4.2'
8
8
  s.license = 'MIT'
9
- s.date = '2013-12-09'
9
+ s.date = '2013-12-16'
10
10
  s.rubyforge_project = 'jekyll'
11
11
 
12
12
  s.summary = "A simple, blog aware, static site generator."
@@ -160,6 +160,7 @@ Gem::Specification.new do |s|
160
160
  site/_posts/2013-11-04-jekyll-1-3-0-released.markdown
161
161
  site/_posts/2013-11-26-jekyll-1-3-1-released.markdown
162
162
  site/_posts/2013-12-07-jekyll-1-4-0-released.markdown
163
+ site/_posts/2013-12-16-jekyll-1-4-2-released.markdown
163
164
  site/css/gridism.css
164
165
  site/css/normalize.css
165
166
  site/css/pygments.css
@@ -63,7 +63,7 @@ require_all 'jekyll/tags'
63
63
  SafeYAML::OPTIONS[:suppress_warnings] = true
64
64
 
65
65
  module Jekyll
66
- VERSION = '1.4.1'
66
+ VERSION = '1.4.2'
67
67
 
68
68
  # Public: Generate a Jekyll configuration Hash by merging the default
69
69
  # options with anything in _config.yml, and adding the given options on top.
@@ -45,6 +45,7 @@ module Jekyll
45
45
  'excerpt_separator' => "\n\n",
46
46
 
47
47
  'maruku' => {
48
+ 'fenced_code_blocks' => true,
48
49
  'use_tex' => false,
49
50
  'use_divs' => false,
50
51
  'png_engine' => 'blahtex',
@@ -8,6 +8,7 @@ module Jekyll
8
8
  @errors = []
9
9
  load_divs_library if @config['maruku']['use_divs']
10
10
  load_blahtext_library if @config['maruku']['use_tex']
11
+ enable_fenced_code_blocks if @config['maruku']['fenced_code_blocks']
11
12
  rescue LoadError
12
13
  STDERR.puts 'You are missing a library required for Markdown. Please run:'
13
14
  STDERR.puts ' $ [sudo] gem install maruku'
@@ -35,6 +36,10 @@ module Jekyll
35
36
  MaRuKu::Globals[:html_png_url] = @config['maruku']['png_url']
36
37
  end
37
38
 
39
+ def enable_fenced_code_blocks
40
+ MaRuKu::Globals[:fenced_code_blocks] = true
41
+ end
42
+
38
43
  def print_errors_and_fail
39
44
  print @errors.join
40
45
  raise MaRuKu::Exception, "MaRuKu encountered problem(s) while converting your markup."
@@ -0,0 +1,16 @@
1
+ ---
2
+ layout: news_item
3
+ title: 'Jekyll 1.4.2 Released'
4
+ date: 2013-12-16 19:48:13 -0500
5
+ author: parkr
6
+ version: 1.4.2
7
+ categories: [release]
8
+ ---
9
+
10
+ This release fixes [a regression][] where Maruku fenced code blocks were turned
11
+ off, instead of the previous default to on. We've added a new default
12
+ configuration to our `maruku` config key: `fenced_code_blocks` and set it to
13
+ default to `true`.
14
+
15
+ If you do not wish to use Maruku fenced code blocks, you may turn this option
16
+ off in your site's configuration file.
@@ -316,6 +316,7 @@ maruku:
316
316
  png_engine: blahtex
317
317
  png_dir: images/latex
318
318
  png_url: /images/latex
319
+ fenced_code_blocks: true
319
320
 
320
321
  rdiscount:
321
322
  extensions: []
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: 1.4.1
4
+ version: 1.4.2
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: 2013-12-09 00:00:00.000000000 Z
11
+ date: 2013-12-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: liquid
@@ -490,6 +490,7 @@ files:
490
490
  - site/_posts/2013-11-04-jekyll-1-3-0-released.markdown
491
491
  - site/_posts/2013-11-26-jekyll-1-3-1-released.markdown
492
492
  - site/_posts/2013-12-07-jekyll-1-4-0-released.markdown
493
+ - site/_posts/2013-12-16-jekyll-1-4-2-released.markdown
493
494
  - site/css/gridism.css
494
495
  - site/css/normalize.css
495
496
  - site/css/pygments.css
@@ -643,7 +644,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
643
644
  version: '0'
644
645
  requirements: []
645
646
  rubyforge_project: jekyll
646
- rubygems_version: 2.0.3
647
+ rubygems_version: 2.0.14
647
648
  signing_key:
648
649
  specification_version: 2
649
650
  summary: A simple, blog aware, static site generator.