Commit Graph

276 Commits

Author SHA1 Message Date
Kris Brown a0aa3fa6dc Merge branch 'enh_post_date_in_front_matter_issue_62' 2010-01-10 21:58:34 +00:00
Kris Brown 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
Kris Brown ce228ac1c4 removed accessor method and fixed tests 2010-01-10 16:24:56 +00:00
Kris Brown 93c029d62e fixed #73 and #84 2010-01-10 16:14:25 +00:00
Kris Brown e0e4a47af1 added pluralized_array method to Hash and tests 2010-01-10 16:09:24 +00:00
Kris Brown 6b74454a07 resetting to upstream 2010-01-10 10:11:44 +00:00
Kris Brown 2a7b1cbd98 merged 'mojombo/master' at 'v0.5.6' 2010-01-09 09:03:59 +00:00
Tom Preston-Werner 8d4b96084a Merge commit 'e3bd1c88e9ad6c9d6c89a543ca72c82a289b6bd7' 2010-01-08 18:19:36 -08:00
Tom Preston-Werner 473f3ffc11 Merge commit '597c7a7904198d92aa5eacad356019165685c311' 2010-01-08 18:08:17 -08:00
Tom Preston-Werner 4c1021d597 don't prematurely terminate front matter on mid-line triple dashes. fixes #93 2010-01-08 18:04:36 -08:00
Tom Preston-Werner c89d8dd0f3 allow .mkd as a markdown extension 2010-01-08 17:26:48 -08:00
Kris Brown 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
Kris Brown b8c04dfb6d Merge branch 'jamie/master' 2010-01-05 22:59:43 +00:00
Kris Brown 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
Kris Brown 5ea06f3ad9 fixes issue #78, including comprehensive scenarios and tests 2010-01-04 09:39:54 +00:00
Alex Young b1a055f10d Call File.expand_path on source so liquid can see _includes in subdirectories 2009-11-30 17:27:57 +00:00
Jamie Macey fab5a715c5 safely allow loading jekyll customizations from inside a site 2009-11-29 13:25:00 -05:00
Gregor Schmidt 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
Christian Hellsten 52342fe6e1 Fixed bug where including includes from an include threw an exception. 2009-10-28 02:12:47 +02:00
Patrick Crowley e3bd1c88e9 refactored render_pygments to remove duplicate code 2009-10-23 08:03:25 -07:00
Patrick Crowley 4cc0873172 updated pygments output to wrap code blocks with <code> tags 2009-10-22 21:14:05 -07:00
Tom Preston-Werner 0dfb486c37 disallow symlinks 2009-08-24 00:10:09 -07:00
Jeffry Degrande 176c047ff1 bugfix for permalinks
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-07-14 19:17:44 -04:00
Nick Quaranto 8b678a8f01 Merge commit 'bahuvrihi/master' 2009-06-24 17:33:57 -04:00
Martin Vilcans 05e8deae8d Make configuration accessible from page.
For example, if you have the following in _config.yml:

  url: http://www.librador.com

...you can have the following in an HTML page:

  <a href="{{site.url}}">Home!</a>

This is a reapply of change 7b449239f0908e34f0290c213970e4b14ba2c2df on latest HEAD.

Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-06-24 08:26:25 -04:00
Simon Chiang ca98cd0152 updated convertible to allow for posts with no, or empty YAML 2009-06-23 20:55:13 -06:00
Simon Chiang b616a4ceca fixed test for CRLF (extra newline was being picked up) 2009-06-23 20:54:26 -06:00
Nick Quaranto 09946386b1 Adding Date#xmlschema from ActiveSupport for Ruby < 1.9. Closes #47 2009-06-23 18:22:27 -04:00
Stefan Saasen 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
Gaius Novus 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
eugenebolshakov e0ceee2e89 Added trailing slash to pretty url template
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-06-23 08:10:27 -04:00
Nick Quaranto 52fbd940c3 Merging in eugenebolshakov/permalinks_for_pages 2009-06-22 18:32:18 -04:00
Nick Quaranto 606269b33c Merge commit 'ujh/master' 2009-06-22 18:06:40 -04:00
Bjørn Arild Mæland 414dfbe26e Ruby 1.9 issue, must explicitly run to_s on the err object. Closes #14.
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-06-22 17:41:51 -04:00
Thomas Jack 0a1e3cd250 stop sorting post categories so they show up in order in the url 2009-06-08 19:26:29 -05:00
Urban Hafner 8379958d95 Order posts by slug name if the date is the same 2009-06-03 08:48:16 +03:00
Urban Hafner 5bbdf2239d Feature for the pagination templating 2009-06-02 11:11:04 +03:00
Urban Hafner a116eaf0ee As we are couting the pages from 1 we have to continue until pages+1 2009-06-02 10:44:34 +03:00
Urban Hafner d79d94277b Correct pagination 2009-06-01 13:12:52 +03:00
Nick Quaranto 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
Nick Quaranto 86b1450234 Adding tags to the site payload. Derived mostly from Henrik's implementation in 072d9e7 2009-05-18 18:28:56 -04:00
Nick Quaranto 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
Nick Quaranto 102f6be6a2 Added tags to posts. Based off Henrik's implementation in 072d9e7. 2009-05-18 18:28:56 -04:00
Nick Quaranto 921aee23d3 Removing topics for good 2009-05-18 18:28:56 -04:00
eugenebolshakov 49c39f43a1 the index page should always have index.html permalink no matter what 2009-05-10 15:29:05 +04:00
eugenebolshakov ee0167d706 Made pages respect permalinks style and permalinks in yml front matter 2009-05-10 14:53:00 +04:00
Nick Quaranto 605adf88d5 Shoulda-izing the pager test and correcting some formatting issues 2009-05-09 11:45:36 -04:00
Nick Quaranto e1dbda47ed Merging in calavera's pagination branch 2009-05-09 11:44:34 -04:00
Nick Quaranto d948e0da91 Removing RedCloth gem lock and adding notes in for deps 2009-05-06 12:41:16 -07:00
Nick Quaranto 35a467117e Using CGI.escapeHTML instead of manually replacing a few characters for xml_escape 2009-05-03 08:40:13 -04:00
Martin Vilcans 6968346703 Added cgi_escape filter 2009-05-02 00:44:33 +02:00
Nick Quaranto 53368cc3e1 Making sure excludes can work with a YAML array 2009-05-01 08:28:00 -04:00
Nick Quaranto 252ca94b81 Merging in duritong's exclude branch 2009-05-01 07:59:40 -04:00
Nick Quaranto 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
Bjørn Arild Mæland 4bcece18ae Issue 7: CGI escape post titles
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-04-28 08:09:42 -04:00
Nick Quaranto db75c8f588 Removing print statement for RDiscount. 2009-04-27 08:33:37 -04:00
Henrik N 3c39612d84 Work around RDiscount bug where Markdown after Pygments-highlighted code would not be parsed as Markdown.
See http://gist.github.com/97682 for a runnable example of the bug.

Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-04-27 08:29:54 -04:00
Henrik N bad2d172ec Make syntax highlighting (Albino, Pygmentize) not break on UTF-8 in code.
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-04-25 23:29:50 -04:00
Nick Quaranto 080108b0f0 Making sure permalinks were set right, and only generating the url once 2009-04-25 01:07:05 -04:00
Nick Quaranto 9da140fcb2 Getting there, prefixes work great 2009-04-25 00:58:28 -04:00
Nick Quaranto 288d5045d2 Changing to the template permalink system, only test_post passing so far 2009-04-25 00:17:10 -04:00
David Calavera 6eb29a4808 basename deleted 2009-04-25 00:03:26 +02:00
duritong 9a0485e812 Fix exclude to be an empty array
if no exclude is defined in the config file, the exclude should
simply be an empty array.
2009-04-24 10:04:27 +02:00
Nick Quaranto 563933f114 Update the help message and comments to use config.yml 2009-04-23 18:24:52 -04:00
duritong 5b540cf744 introduce an exclude config option
This is a YAML array for files in the root directory,
which should be excluded to be processed into '_site'.
This can be useful for README, Rakefiles etc.
2009-04-24 00:13:08 +02:00
Thomas Jack dd268fae95 sort posts before rendering so next and previous posts work
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-04-22 22:36:06 -04:00
Juan Lupion 2e187864cf Next and previous posts
Signed-off-by: Nick Quaranto <nick@quaran.to>
2009-04-22 19:51:41 -04:00
David Calavera f099d00cb0 posts' pagination 2009-04-04 12:45:40 +02:00
David Calavera 808d6c6a62 posts' pagination 2009-04-04 12:43:46 +02:00
Nick Quaranto 8d0e3dd0e2 Reset posts, layouts, and categories before processing to prevent duplication when regenerating 2009-04-03 08:39:40 -04:00
Nick Quaranto 829530be36 Adding the categories back into the post payload 2009-04-01 07:36:56 -04:00
Nick Quaranto a4082378f7 Supposedly the include tag was already fixed, merging that in 2009-03-17 23:58:22 -04:00
Nick Quaranto ab262a2ab5 Stubbing out configuration with RR and making sure include tags get rendered 2009-03-17 23:07:18 -04:00
Tom Preston-Werner 4c81c4a6b6 fix include tag to use register 2009-03-12 21:20:31 -07:00
Tom Preston-Werner 73d42b24ad Huge refactor to move all config into Jekyll::Site
This commit makes Jekyll threadsafe (or at least makes it possible to be so).
It also makes it a ton easier to use Jekyll as a library for scripted site
transformation. I did, however, break all the tests. =(
2009-03-12 19:05:43 -07:00
mreid cb13ea3000 Rebased with mojombo. All tests pass. Some conflicts with Liquid and Maruku 2009-03-12 21:25:34 +11:00
mreid 4b39c44664 configure now sets the source and dest fields so the Liquid include filter works again 2009-03-12 20:51:12 +11:00
Mark 6edfae8c26 Refactored configuration and command-line option code 2009-03-12 20:51:11 +11:00
Mark 6fec047631 Added ability to set Jekyll parameters via _config.yaml file 2009-03-12 20:46:33 +11:00
mreid e72cde12fa Added option to not put file date in permalink URL 2009-03-12 20:46:33 +11:00
Mark Reid 6a3680c60b Added wordpress converter 2009-03-12 20:44:02 +11:00
Tom Preston-Werner 872a221862 Merge commit '992c4a8e6f71334f6c1a422c3547fdc535e7c8c2' 2009-03-10 17:23:30 -07:00
Tom Preston-Werner fa53f5f7fe Merge commit 'fb4902799746b08424eb7c483f8219e26e20d3e3' 2009-03-10 16:58:22 -07:00
Tom Preston-Werner 54d713b26a Merge commit 'fab8442432f473ba647c682608bc8ff9ced6cca2' 2009-03-10 16:51:26 -07:00
Tom Preston-Werner 86e72a8b25 a few style changes and readme for pretty permalink 2009-03-10 16:39:44 -07:00
Tom Preston-Werner fa1043ca69 Merge commit '7655c745c46559d7598b5558fc9bf6fa8b215e28' 2009-03-10 16:15:32 -07:00
Brandon Dimcheff 992c4a8e6f prevented _posts from being copied to the destination directory 2009-03-04 01:24:52 -05:00
Tim Dysinger 7655c745c4 small patch to support wordpress style pretty blog urls 2009-02-26 09:13:45 -10:00
Ariejan de Vroom fb49027997 Only query required fields from the WP Database. 2009-02-26 10:29:01 +01:00
Bjørn Arild Mæland fab8442432 Factored the filtering code into a method 2009-02-25 21:44:07 +01:00
Ryan Tomayko c180bc47bf close open4 streams to prevent zombies
The popen4 that execs pygmetize leaves a bunch of zombie processes
around unless these streams are closed for some reason. It's not too
bad when running jekyll in one-shot mode but when running with
--server --auto --pygmentize, I eventually get "fork: resource not
available" errors :/ Closing the streams let's the processes die
while the parent stays running.
2009-02-23 22:48:23 -08:00
Bjørn Arild Mæland 25d4951f0b Also ignore Emacs autosave files 2009-02-22 22:58:47 +01:00
Bjørn Arild Mæland 0ec9a1330a Made it possible to enter categories from YAML as an array. 2009-02-22 19:09:16 +01:00
Elijah Miller 2135a53897 Using block syntax of popen4 to ensure that subprocesses are properly disposed of.
This fixes resource unavailable errors when jekyll is run with '--auto --pygments':
  Liquid error: Resource temporarily unavailable – fork(2)
  fork: Resource temporarily unavailable
2009-02-19 11:12:26 -08:00
Tom Preston-Werner e9ccc5d600 Merge commit 'ee65dadc9a5ae5fc8f19848754f7175ebd630375' 2009-02-19 00:16:43 -08:00
Kevin Marsh ee65dadc9a Add textilize filter for transforming input into HTML via RedCloth, so you can have Textile-formatted attributes other than the page's content (for example, an excerpt) 2009-02-12 18:21:40 -05:00
Nick Quaranto efdd5ef395 Making sure that posts flagged as published: false don't get rendered or copied. 2009-02-10 01:13:36 -05:00
Nick Quaranto ad617da4e0 Added publish flag to posts, not preventing it from being in the destination directory yet. 2009-02-10 01:13:31 -05:00
Nick Quaranto 1211f23b53 Adding support for setting post categories through YAML if not specified by directory structure 2009-02-10 01:12:20 -05:00
Tim Dysinger a3c18fb095 changed date format on wordpress converter (zeropadding) 2009-02-08 18:37:59 -10:00