1528cfe1cd
adding safe_yaml to protect against object instantiation from yaml
2013-01-23 11:30:24 -06:00
607b4c84fd
Only running simplecov if RUBY_VERSION is 1.9 or greater, and COVERAGE env is set to 'true'
2013-01-20 22:16:23 -05:00
2c45150545
Update tag classes moving into a module
2013-01-19 23:50:44 +00:00
663a1321d2
Update converter classes moving into a module
2013-01-19 23:07:38 +00:00
f231ef7644
Merge pull request #684 from mattr-/issue-680.
2013-01-18 10:28:14 -05:00
ce798a5956
Added test for all-String categories.
2013-01-17 21:57:21 -05:00
5e08cddb98
filter out test files in coverage results
2013-01-16 22:27:23 -06:00
00d74fa53f
Add SimpleCov to the unit tests
2013-01-16 22:20:34 -06:00
f460a6cf71
Merge branch 'master' into issue-653
2013-01-16 21:52:32 -06:00
e383bfe65d
Merge pull request #743 from mccxj/master
...
add glob support to include, exclude option
2013-01-12 22:16:07 -08:00
5a3e05dbff
Ensuring that layout is only set to the default value if layout is not specified
2013-01-12 15:31:14 -08:00
e2affb2257
Added passing tests for #616
2013-01-12 00:14:00 -08:00
a05b9159d9
Merge pull request #616 from hokaccha/fix_pygments_opt
...
fixed pygments linenos options for pygments.rb
2013-01-12 00:11:18 -08:00
d2e750cc74
removed extraneous whitespace in test_site.rb
2013-01-11 15:54:57 -08:00
0fa55418e9
merge lastest from mojombo/jekyll master
2013-01-11 12:23:53 +01:00
9b8b5b2bda
Dont test kramdown
...
It should have it's own tests for that
2013-01-11 11:02:07 +00:00
660e5e0e14
Merge remote-tracking branch 'jekyll/master'
2013-01-11 15:45:54 +08:00
3cf29eeee2
add Enumerable#glob_include?
2013-01-11 15:33:11 +08:00
92eb926bf8
Look for plugins under the source directory by default
2013-01-10 21:24:28 -06:00
a5c908ac3f
no good reason for making 'name' an instance variable
2013-01-10 14:13:11 -08:00
cf42c56630
stick to good coding standards
2013-01-10 14:07:10 -08:00
3e7f00ae19
test the path, not the parts
2013-01-10 13:01:50 -08:00
5d48c5390d
Add test/unit
2013-01-10 20:47:55 +00:00
ba48870ead
outputting full path when file does not parse
2013-01-10 12:29:04 -08:00
adba101734
update test for include,exclude glob support
2013-01-09 16:44:53 +08:00
655cf3b3a8
Update test/test_site.rb
2013-01-09 16:23:58 +08:00
6eed91871f
Changes based on @mojombo's feedback
2013-01-08 23:17:06 +01:00
da096f307b
Add testcases for YAML syntax error and non UTF-8 encoding
2012-12-30 02:39:02 +02:00
c23302f4fa
Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection
2012-12-26 14:02:41 -07:00
3a8ebb4b71
Merge branch 'fix/front-matter-regexp' of https://github.com/zimbatm/jekyll into zimbatm-fix/front-matter-regexp
2012-12-15 22:09:41 -08:00
0b62b37122
Remove newline to fix failing Redcarpet test.
2012-12-15 16:34:32 -08:00
8fb4e8fcca
Convert slashes in titles to dashes when migrating from WordPress
...
When a post has a title that contains a slash, such as 'This is my cool
blog post part 1/2', convert the slash to a dash so that the post
filename is created correctly.
Fixes issue #680
2012-12-04 20:45:20 -06:00
7c800d3b07
Added a configuration variable: keep_files (default: ['.git']), based on this pull request: https://github.com/mojombo/jekyll/pull/556
2012-08-23 12:07:30 +02:00
7f706f47fc
Update redcarpet support to version 2
2012-08-13 15:03:33 +01:00
3d2664d983
pygments options for pygments.rb
2012-08-09 00:34:44 +09:00
da4e8f2ee1
Front-matter should be at start of file
...
It's the theme of the moment ; regexp checking.
Just in case we have two line start with --- in the file, we want to
make sure it's not interpreted as a front-matter.
2012-05-25 18:59:26 +01:00
8a0fbf02f5
Cleanup for RDiscount TOC support. Closes #333 .
2012-04-23 16:15:55 -07:00
6471ebf0ef
Fixed helper inclusion in redcarpet test
2012-04-23 15:57:06 -07:00
fd5447a6e6
Added a test case for rdiscount toc rendering.
2012-04-23 15:56:46 -07:00
e29490c1c6
Allow setting of Kramdown smart_quotes. Fixes #482 .
2012-04-23 15:34:54 -07:00
4090500c5a
Added path in url.
...
Page#dir was returning the wrong dir ('/') for pages in directories.
2012-04-09 03:08:41 +03:00
604b60c9ba
Add checks to prevent accidental deletion of the source directory
2012-04-03 22:05:18 -05:00
8368485fa0
Remove deletion of dot files on cleanup.
...
This is a potentially very dangerous action that's impossible to test that it's correct.
If the '..' check line ever disappears, even running the tests will start deleting
everything accessible on the person's computer.
All dot-files that are generated are already known by Jekyll as either a static file or
a page (yaml front matter), only remove those files.
2012-04-03 21:33:35 -05:00
02366ae5ff
Merge branch 'PluginsAsArray' of https://github.com/simensen/jekyll into simensen-PluginsAsArray
2012-01-29 12:32:59 -08:00
e6d89c6a0f
More testing, whitespace and comment cleanup.
2012-01-22 22:17:25 -08:00
dcf546275b
Tweaked plugin directory handling, tests.
2012-01-22 22:10:12 -08:00
16a4855200
Merge branch 'post_url' of https://github.com/thatguystone/jekyll into thatguystone-post_url
2012-01-22 16:03:10 -08:00
65890da3d1
Merge branch 'categories_with_space' of https://github.com/spk/jekyll into spk-categories_with_space
2012-01-21 19:36:09 -08:00
d0d143452a
Merge branch 'master' of https://github.com/laumann/jekyll
2012-01-15 20:39:55 -08:00
c14eb346a3
Allow [+.#-] in highlight lang shortnames. Fixes #282 .
2012-01-15 20:35:09 -08:00
89180169a4
Merge branch 'include' of https://github.com/lukebayes/jekyll into lukebayes-include
...
Conflicts:
lib/jekyll.rb
lib/jekyll/site.rb
2012-01-14 19:48:04 -08:00
d80c773b01
New solution for passing restrictions to RedCloth - all tests pass with ruby 1.8 (just invoking rake)
2011-11-28 14:05:34 +01:00
69e7f4abef
Add test cases for default values with no explicit config. for `hard_breaks`.
2011-11-03 11:54:49 -07:00
5cffe5ecb5
Adding in the ability to link to posts internally. Syntax: {% post_url 2010-07-21-name-of-post %}; useful for: [Some Link]({% post_url 2010-07-21-name-of-post %})
2011-07-21 19:49:09 -04:00
1356e75811
Generate escaped url for categories with space.
...
Space in URLs should be encoded.
Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
2011-07-10 23:56:56 +02:00
fccb6c7f74
Merge git://github.com/mojombo/jekyll
2011-06-29 12:07:21 +02:00
851172b5ef
Replace rdiscount filter with config-aware markdownify.
2011-05-31 14:40:21 -07:00
cae0eaf19c
Merge remote-tracking branch 'mjschultz/master'
...
Conflicts:
lib/jekyll/filters.rb
2011-05-30 12:27:11 -07:00
da9930657e
Merge remote-tracking branch 'derekprior/configurable_coverter_file_extensions'
2011-05-30 11:38:59 -07:00
2ad0fbc8ff
Merge remote-tracking branch 'MattHall/redcarpet'
2011-05-29 21:38:34 -07:00
20d1bd1f10
Merge https://github.com/mojombo/jekyll
2011-05-09 12:01:17 +02:00
6a31e650f3
Tests and specs run under 1.9.
2011-04-24 18:39:27 +08:00
093a5efbe1
Merge remote-tracking branch 'jbw/ruby-v1.9' into devel
2011-04-23 18:08:34 +08:00
cf779b2760
Added Redcarpet for MD conversion
2011-04-20 10:04:42 +01:00
d2377b2581
Fixed mistake in default markdown extensions
2011-04-12 17:30:56 -04:00
5801220a98
Added the ability to configure the file extensions to be processed by each converter. Test cases included.
2011-04-12 17:03:28 -04:00
3f889ef077
added test case to hard_breaks (disable/enable in _config.yml)
2011-03-23 18:17:14 +01:00
dce4ccc5a4
Better error message for invalid post date.
2011-03-11 17:52:25 -08:00
9e3ad69922
- added rdiscount filter for templating system (like the textilize filter, but for markdown)
2011-03-03 08:14:52 -06:00
717a2540e1
Added support for 'include' configuration parameter. This parameter
...
should work just like 'exclude', except it gives us the ability
to enumerate any files that should not be ignored - even if they
begin with the dastardly dot or underscore.
2010-12-30 16:41:34 -08:00
5b680f8dd8
remove orphaned files in destination
2010-12-01 18:04:50 +01:00
61acd47ed2
Merge remote branch 'jasongraham/kramdown-support'
2010-11-22 19:26:58 -08:00
f85e229a9e
Add support for kramdown HTML converter options
...
http://kramdown.rubyforge.org/converter/html.html#options
Example: In the _config.yaml,
markdown: kramdown
kramdown:
auto_ids: true
2010-11-20 17:40:27 -08:00
ac7a0cc95f
Add Kramdown support and tests
2010-11-20 17:40:27 -08:00
f7ab019a39
Merge remote branch 'claco/uri-escape'
2010-11-17 15:30:34 -06:00
4afee1bda1
Merge remote branch 'jlecour/master'
...
Conflicts:
lib/jekyll/page.rb
2010-11-17 15:25:55 -06:00
054b796b9f
Merge remote branch 'cblunt/limit_posts'
2010-11-17 14:56:32 -06:00
4c08643c50
Added uri_escape for cases where cgi_escape isn't appropriate
2010-11-12 11:15:30 -05:00
f688c9df81
Added limit-posts option to site configuration.
...
* Added unit tests for limit-posts.
* Added feature for limit-posts.
* Added --limit_posts option to bin/jekyll options parser
2010-09-13 00:31:52 +01:00
16c19ecd19
Add a failing test for rendering dotfiles
...
The test uses a simple ".htaccess" file that needs to be rendered
as any other page, like the sitemap.xml, …
2010-09-09 09:37:51 +02:00
b1049c84cd
Correctly generates file basename. Fixes #208 .
...
The previous procedure generated invalid basenames when the filename had
more than one dot.
2010-09-05 18:11:09 -03:00
de7e0011f9
Add some colouring to the unit tests.
2010-08-31 03:41:00 +01:00
dc7a7d0090
Updated for 1.9 encoding support.
2010-08-30 23:03:04 +01:00
4aae2a7bc7
RedGreen is broken in 1.9.2. Test::Unit has colouring ability now.
2010-08-30 22:57:13 +01:00
e53a5407b9
Test::Unit is no longer ships with Ruby.
2010-08-30 22:55:39 +01:00
e054202c2b
fix load errors in ruby 1.9.2.
2010-08-30 22:35:15 +01:00
391d1a9677
Merge remote branch 'ctrochalakis/rdiscount_extensions'
2010-08-24 15:19:47 -07:00
d9bc00c804
Highlight should not be able to render local files.
2010-08-24 15:05:28 -07:00
a56eeb8289
Add support for rdiscount extensions
...
Specify extensions at your _config.yml file:
...
rdiscount:
extensions: [smart, autolink]
Available extensions can be found here:
http://rdoc.info/projects/rtomayko/rdiscount
closes #173
2010-06-25 16:38:45 +03:00
f8484570b7
Merge remote branch 'christianhellsten/master' into next
2010-06-22 16:01:48 -07:00
de8bd48154
Maruku is now the only processor dependency installed by default. Closes #57 .
...
Other processors will be lazy-loaded when necessary (and prompt the
user to install them when necessary).
2010-06-22 15:17:39 -07:00
46a95bc036
git merge mojombo/master
2010-06-22 15:42:51 +03:00
f91954be76
optimization: write static file to the destination only if source file timestamp differs
...
Also make sure static files get regenerated when they are missing in destination.
This is useful in --server --auto mode when it reduces disk/cpu load and also plays nice with xrefresh-server (which was my main motivation) -> soft CSS refresh works again!
2010-06-20 08:02:16 +02:00
5335debfb2
Merge remote branch 'technoweenie/no-leading-zeroes'
...
Conflicts:
lib/jekyll/post.rb
2010-06-18 15:34:56 -07:00
f6ef6f21ae
whitespace
2010-06-03 16:09:33 -07:00
e8d119ef0a
add :i_day and :i_month permalink values so you can get urls like /2010/6/1/title
2010-05-31 23:28:39 -07:00
84b26a31da
removed use of content_type strings in the highlighting tag
2010-02-28 00:11:43 +00:00
cedda3afa3
move converters to classes
2010-02-27 22:14:27 +00:00
80b13a81fa
added usage of site.html_pages to test source sitemap.xml
2010-02-27 14:11:06 +00:00
cd946a587b
removed tabs and made into a better example for sitemap times
2010-02-26 22:07:26 +00:00
e4a2319bf3
added tests to show how date and tags can end up having the wrong value when rendered
2010-02-26 21:24:32 +00:00
98fa570c86
added support for consistent site.time in payload, generating the site at a specific time and limiting future posts
...
squish
2010-02-26 20:52:41 +00:00
a4f3f5c583
Merge commit '0a1e3cd2508c797d7b8d1038636a6e7111e5cd3d'. Fixes #33 .
...
Conflicts:
features/post_data.feature
2010-01-14 20:00:19 -08:00
a0aa3fa6dc
Merge branch 'enh_post_date_in_front_matter_issue_62'
2010-01-10 21:58:34 +00:00
a1550b3378
allow date to be specified in the front matter and override the value from the file name, fixes #62 and #38
2010-01-10 21:55:54 +00:00
ce228ac1c4
removed accessor method and fixed tests
2010-01-10 16:24:56 +00:00
2292e4268c
added tests for handling of tags and catergories, see #73 and #84
2010-01-10 16:12:41 +00:00
e0e4a47af1
added pluralized_array method to Hash and tests
2010-01-10 16:09:24 +00:00
6b74454a07
resetting to upstream
2010-01-10 10:11:44 +00:00
2a7b1cbd98
merged 'mojombo/master' at 'v0.5.6'
2010-01-09 09:03:59 +00:00
8d4b96084a
Merge commit 'e3bd1c88e9ad6c9d6c89a543ca72c82a289b6bd7'
2010-01-08 18:19:36 -08:00
473f3ffc11
Merge commit '597c7a7904198d92aa5eacad356019165685c311'
2010-01-08 18:08:17 -08:00
4c1021d597
don't prematurely terminate front matter on mid-line triple dashes. fixes #93
2010-01-08 18:04:36 -08:00
1adf9a7c64
Merge commit 'krisb/fix_for_test_redcloth_version'
2010-01-08 17:19:41 -08:00
7806a0d6bb
separated up the attrs required by convertible and made tags and categories always non-nil as empty front matter entries could cause them to be nil
2010-01-06 15:19:39 +00:00
d80c643681
Merge branch 'fix_for_render_order_issue71'
2010-01-05 22:21:58 +00:00
0cb1ebcda1
split process handling into phases to allow pages to have access to full and complete site payload and added some test improvements
2010-01-05 17:05:44 +00:00
5ea06f3ad9
fixes issue #78 , including comprehensive scenarios and tests
2010-01-04 09:39:54 +00:00
39a487cdf0
redcloth set to >= 4.2.1
2010-01-02 13:17:58 +00:00
597c7a7904
changes to stdout and -err - tests and behaviour
...
By using $stdin adn $stderr instead of STDIN and
STDERR it is possible to capture or redirect them
using in process ruby code without the need
to manage pipes and external processes
2009-11-24 21:42:22 +01:00
52342fe6e1
Fixed bug where including includes from an include threw an exception.
2009-10-28 02:12:47 +02:00
4cc0873172
updated pygments output to wrap code blocks with <code> tags
2009-10-22 21:14:05 -07:00
176c047ff1
bugfix for permalinks
...
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-07-14 19:17:44 -04:00
8b678a8f01
Merge commit 'bahuvrihi/master'
2009-06-24 17:33:57 -04:00
237df13778
Upgrading RedCloth to 4.2.1, which fixed <notextile> tags
2009-06-24 07:53:13 -04:00
ca98cd0152
updated convertible to allow for posts with no, or empty YAML
2009-06-23 20:55:13 -06:00
b616a4ceca
fixed test for CRLF (extra newline was being picked up)
2009-06-23 20:54:26 -06:00
150ff1e5e4
Fixed small bug in test_generated_site and updating history with latest fixes
2009-06-23 08:10:42 -04:00
e39810c984
Fix exception that causes jekyll to fail when using CRLF (0d0a) linebreaks in YAML front matter.
...
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-06-23 08:10:38 -04:00
5468548948
creating a Site with an invalid Markdown processor fails sooner and gives a better error message
...
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-06-23 08:10:33 -04:00
e0ceee2e89
Added trailing slash to pretty url template
...
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-06-23 08:10:27 -04:00
52fbd940c3
Merging in eugenebolshakov/permalinks_for_pages
2009-06-22 18:32:18 -04:00
535d78de7d
change features and tests to make sure categories in urls follow the order specified by directory layout or in yaml
2009-06-08 19:26:03 -05:00
486ae25fc1
Validating the configuration loads properly and is a hash, based on jrk's implementation. Closes #22 .
2009-05-31 21:33:27 -04:00
86b1450234
Adding tags to the site payload. Derived mostly from Henrik's implementation in 072d9e7
2009-05-18 18:28:56 -04:00
99098dd8c7
Removing the extremely brittle generated_site test and moving the tags check into post.rb so pages don't break
2009-05-18 18:28:56 -04:00
102f6be6a2
Added tags to posts. Based off Henrik's implementation in 072d9e7.
2009-05-18 18:28:56 -04:00
921aee23d3
Removing topics for good
2009-05-18 18:28:56 -04:00
49c39f43a1
the index page should always have index.html permalink no matter what
2009-05-10 15:29:05 +04:00
ee0167d706
Made pages respect permalinks style and permalinks in yml front matter
2009-05-10 14:53:00 +04:00
605adf88d5
Shoulda-izing the pager test and correcting some formatting issues
2009-05-09 11:45:36 -04:00
e1dbda47ed
Merging in calavera's pagination branch
2009-05-09 11:44:34 -04:00
a42690dd38
Freezing to RedCloth 4.1.0 just for the tests
2009-05-06 12:41:16 -07:00
d948e0da91
Removing RedCloth gem lock and adding notes in for deps
2009-05-06 12:41:16 -07:00
6968346703
Added cgi_escape filter
2009-05-02 00:44:33 +02:00
53368cc3e1
Making sure excludes can work with a YAML array
2009-05-01 08:28:00 -04:00
26f9ad3d98
Testing for RedCloth notextile issue and locking to 4.1.0, which parses the tag correctly
2009-04-29 09:07:29 -04:00
4bcece18ae
Issue 7: CGI escape post titles
...
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-04-28 08:09:42 -04:00
e0477e32cc
Adding failing test for RDiscount parsing issue with highlight tags.
2009-04-27 08:29:54 -04:00
6342a3842c
Adding failing test for UTF-8 pygments issue GH-8
2009-04-25 23:27:46 -04:00
Ben Toews
Parker Moore
Tom Bell
Matt Rogers
edeustace
Piotr Usewicz
mccxj
Eric Theise
stereobooster
Tom Preston-Werner
hokaccha
Jonas Pfenniger
Michishige Kaito
Fotos Georgiadis
Jason Roelofs
Beau Simensen
Thomas Laumann
Carl Groner
Andrew Stone
Laurent Arnoud
MattHall
Derek Prior
Michael J Schultz
lukebayes
Stefan Schüßler
Jason Graham
Christopher H. Laco
cblunt
Jeremy Lecour
Leandro Lisboa Penz
Jason Watson
Christos Trochalakis
Christian Hellsten
Antonin Hildebrand
rick
Kris Brown
Gregor Schmidt
Patrick Crowley
Jeffry Degrande
Nick Quaranto
Simon Chiang
Stefan Saasen
Gaius Novus
eugenebolshakov
Thomas Jack
Martin Vilcans
Bjørn Arild Mæland