Commit Graph

2166 Commits

Author SHA1 Message Date
Nick Fagerlund 9ca7f70d70 Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and Kramdown > 0.14.0
When using Ruby 1.8.7 and Kramdown 0.14.0 and newer, the following build error
would occur if any page in your site contained a `<name@example.com>` email
address link:

Generating...   Conversion error: There was an error converting 'contribute.markdown'.
/Users/nick/Documents/puppet-docs/vendor/bundle/ruby/1.8/gems/kramdown-1.0.2/lib/kramdown/converter/html.rb:404:in `obfuscate': undefined method `encoding' for "mailto":String (NoMethodError)

See also:
http://rubyforge.org/tracker/index.php?func=detail&aid=29750&group_id=7403&atid=28673

This problem traced back to the following line in the Kramdown source:

result.force_encoding(text.encoding) if result.respond_to?(:force_encoding)

Strings aren't supposed to respond to the :force_encoding method in Ruby < 1.9,
but lib/jekyll/core_ext.rb was modifying the string class like so:

def force_encoding(enc)
  self
end

Strings still won't respond to :encoding, though, so we get an error when
Kramdown tries to read the incoming encoding and everything will blow up.

An ack of the codebase suggests that this was only added so we could force an
encoding for rdiscount on 1.9 without having to check whether we were running
under 1.8. Since testing for said method to learn whether one is running under a
1.9-like encoding regime seems to be a thing in libraries we rely on, we
shouldn't insert this dummy method without also dummying every other part of the
Ruby 1.9+ encoding system.

This commit removes the dummy :force_encoding method to stop poisoning core
classes for libraries we use, and moves the adjustment for 1.9-like encoding
regimes to the one place where it's needed.
2013-08-07 20:07:54 -07:00
Parker Moore a87d6f9ddd Update history to reflect merge of #1390 2013-08-08 00:29:34 +02:00
Parker Moore cb52535c03 Merge pull request #1390 from mojombo/better-errors
Catch and fix (somehow) common configuration errors
2013-08-07 15:28:16 -07:00
Parker Moore 983c36f557 Update history to reflect merge of #1394 2013-08-07 23:43:41 +02:00
Parker Moore d05fd32732 Merge pull request #1394 from catsby/drafts_flag
Add -D short-form switch for drafts
2013-08-07 14:38:49 -07:00
Clint Shryock f4c8bcc317 Add -D short-form switch for drafts
Add -D short-form switch for the drafts option, to compliment --drafts
2013-08-07 16:01:21 -05:00
Parker Moore ab0a39fde9 Update history to reflect merge of #1364 2013-08-07 17:13:03 +02:00
Parker Moore 826293ebe3 Merge pull request #1364 from koron/write-in-binary-mode
use binary mode when writing file.
2013-08-07 08:12:27 -07:00
Parker Moore 46b0d5037b Add test for Configuration#fix_common_issues 2013-08-06 21:22:08 +02:00
Parker Moore d19c6983f2 paginate option cannot be 0. 2013-08-06 21:04:15 +02:00
Parker Moore 6eec3a7942 Print warning when `paginate` is set to `true`.
Related to #1105.

Sample output:
~/code/jekyll/tsite$ ../bin/jekyll build --trace
Configuration file: /Users/parker/code/jekyll/tsite/_config.yml
    Config Warning: The `paginate` key must be a positive integer or nil. It's currently set to 'true'.
            Source: /Users/parker/code/jekyll/tsite
       Destination: /Users/parker/code/jekyll/tsite/_site
      Generating... done.
2013-08-06 20:56:29 +02:00
Parker Moore 8f7e229e8c Cleaned up the deprecator a little 2013-08-06 20:56:20 +02:00
Parker Moore a7356f065d Update history to reflect merge of #1315 2013-08-06 20:12:26 +02:00
Parker Moore aee7a41bc3 Align {{ content }} call with its siblings in site template. 2013-08-06 20:12:26 +02:00
Wlodek Bzyl ece35e5e36 Remove div.container from the default html template 2013-08-06 20:12:26 +02:00
Parker Moore fbecb6b875 Update history to reflect closing of #1388. 2013-08-06 20:08:27 +02:00
Parker Moore e3abda9897 Fix 'undefined method `gsub' for nil:NilClass' when undefined method is called.
Closes #1388.
http://stackoverflow.com/questions/18037596/error-undefined-method-gsub-for-nilnilclass/18038912
2013-08-06 20:06:33 +02:00
Parker Moore 14daff8965 Update history to reflect merge of #1382 2013-08-06 18:48:49 +02:00
Parker Moore ae218dd0db Merge pull request #1382 from torsneyt/fix_md_ext
Markdown extension matching matches only exact matches
2013-08-06 09:47:33 -07:00
Parker Moore f17f799221 It's WordPress - capital P, dang it.
WordPress, like GitHub, is a camel-cased name that deserves to be
written properly. Props to @jeremyvisser for pointing this out.

Closes #1384
2013-08-06 18:44:20 +02:00
Thomas Torsney-Weir 627916bc54 force markdown match to match the full extension 2013-08-06 10:56:24 +02:00
Thomas Torsney-Weir c983f38cc9 add test to demonstrate issue with markdown extension parsing. adding mkd as an extension should not cause mkdn files to also be markdownified 2013-08-06 10:52:24 +02:00
Parker Moore 9193f5ea60 Update history to reflect merge of #1373. 2013-08-05 01:25:56 +02:00
Parker Moore 2e8b6e097e Merge pull request #1373 from indirect/patch-1
Add postfiles plugin
2013-08-04 16:25:04 -07:00
André Arko fdf14d3911 Escape tag literal 2013-08-04 12:30:06 -07:00
André Arko 73d03e5b54 Add postfiles plugin
Add my postfiles plugin to the list of plugins.
2013-08-04 01:21:17 -07:00
Parker Moore d08edc4ad6 Update history to reflect merge of #1370 2013-08-03 20:28:00 +02:00
Parker Moore af6c0ec9a0 Merge pull request #1370 from matze/add-ditaa-plugin
Add jekyll-ditaa to plugins list
2013-08-03 11:27:04 -07:00
Matthias Vogelgesang 0b9199bba5 Add jekyll-ditaa to plugins list 2013-08-02 16:57:11 +02:00
MURAOKA Taro 8a155e0a50 use binary mode when writing file. 2013-07-30 21:35:02 +09:00
Matt Rogers 51cf55ebec Update history to reflect merge of #1358 2013-07-29 12:55:49 -05:00
Matt Rogers 2fc2558b04 Update history to reflect merge of #1360 2013-07-29 12:42:53 -05:00
Matt Rogers 8025e4d8d4 Merge pull request #1360 from mojombo/readme-dep-updates
Update dependencies in README
2013-07-29 10:41:55 -07:00
Parker Moore 9f21c94a59 Update dependencies in README 2013-07-28 22:25:22 +02:00
Matt Rogers 8227f5e7b6 Update history to reflect merge of #1356 2013-07-26 10:01:16 -05:00
Matt Rogers d0f44deb5d Merge pull request #1356 from mojombo/remove-redundant-arg
Remove redundant argument in Jekyll::Commands::New#scaffold_post_content
2013-07-26 07:59:04 -07:00
Parker Moore e973e59306 Remove redundant argument in Jekyll::Commands::New#scaffold_post_content 2013-07-26 16:25:39 +02:00
Matt Rogers 09e50a5008 Update history to reflect merge of #1354 2013-07-25 13:53:36 -05:00
Matt Rogers 7bc98cba24 Merge pull request #1354 from agelber/add-jekyll-rss-to-plugins
Added jekyll-rss plugin to docs
2013-07-25 11:52:18 -07:00
Assaf Gelber 2c960bf4ed Added the word 'feed' :| 2013-07-25 21:50:19 +03:00
Parker Moore ee9939b101 Merge pull request #1346 from penibelst/patch-1
Use different quote types for HTML and Liquid
2013-07-25 11:19:43 -07:00
Matt Rogers a88493007c @parkr releases 1.1.2 and I'll release 1.1.4
Wonder twin powers, activate!
2013-07-25 12:48:01 -05:00
Assaf Gelber 67186e6318 Added jekyll-rss plugin to docs 2013-07-25 20:28:45 +03:00
Matt Rogers ec9d6ab693 Update history to reflect merge of #1353 2013-07-25 09:55:19 -05:00
Matt Rogers 8811333f91 Merge pull request #1353 from benbalter/1-1-2-blog-post
1.1.2/1.0.4 announcement posts improvements
2013-07-25 07:54:25 -07:00
Ben Balter f2481cf6c0 s/you are may/you may/ 2013-07-25 09:44:28 -04:00
Ben Balter 7d4a442cbf get the version # right 2013-07-25 09:37:57 -04:00
Ben Balter 2b56f0dd7c 💄 2013-07-25 09:36:47 -04:00
Ben Balter a1afe8918d Write blog posts for humans
* Polish blog-post language for a less-technical crowd
* Emphasize that it's not a core issue
* Emphasize that it doesn't affect sites without plugins
* Break into paragraphs for easier skimability
* Explain that it affects users with access to templates, not just plugin authors
2013-07-25 09:33:45 -04:00
Parker Moore 0db5dcf832 Release 1.1.2 2013-07-25 09:15:34 +02:00