Commit Graph

1326 Commits

Author SHA1 Message Date
Parker Moore 81a2d03e58 WIP – fixing tests. 2013-06-09 18:31:09 +02:00
Parker Moore bd0e45c1b9 Fixed bugs with pagination in a subdirectory. 2013-06-09 18:31:09 +02:00
Parker Moore 700d840a06 Release 1.0.3 2013-06-07 21:02:13 +02:00
Parker Moore 86e5a1f7a9 Merge pull request #1189 from mojombo/private-gist-support
Support new private gist syntax.
2013-06-07 11:55:09 -07:00
Parker Moore 1c18394afc Catch and print errors when MaRuKu freaks out, and exit with an error code other than 0. 2013-06-07 01:41:30 +02:00
Parker Moore 066912556e Support new private gist syntax. 2013-06-07 00:34:23 +02:00
Matt Rogers cd3732e612 Merge pull request #1170 from mojombo/remove-ids-from-site-template
For template site, convert #post to .post. Fixes #1161.
2013-06-03 08:07:09 -07:00
Parker Moore 2d27deaec7 For template site, convert #post to .post. 2013-06-02 18:48:45 +02:00
Brian Kim 1083bfd533 Fix typo in Stevenson 2013-05-31 17:23:57 -04:00
Parker Moore 14a4e32bbe Use singleton instance variable instead of class variable 2013-05-29 12:04:50 +02:00
Parker Moore 1f59e9c757 Use Jekyll.logger instead of Jekyll::Stevenson to log things. 2013-05-29 11:58:35 +02:00
Mikael Konutgan 9adfd6ddeb Document uri_escape 2013-05-23 20:18:08 +02:00
Matt Rogers 1eab13c068 Merge pull request #1063 from Kelsin/fixing-paginate_path-for-windows
Fixing pagination on windows
2013-05-22 12:26:54 -07:00
Matt Rogers 7c012a9e0c Merge pull request #1115 from clang1234/master
Add --force flag to new command
2013-05-17 21:15:17 -07:00
Matt Rogers 2b84173eca Merge pull request #1121 from mojombo/non-zero-exit-on-liquid-exception
Non zero exit on Liquid exception
2013-05-17 20:41:04 -07:00
Matt Rogers ddba4cde8b Merge pull request #1114 from mojombo/backwards-compatibilize-exclude-include
Backwards-compatibilize 'exclude' and 'include' config tags
2013-05-17 19:56:48 -07:00
Parker Moore ff8cf7c868 provide access to the layout name so when shit goes down we get the name of the layout which couldn't be processed 2013-05-17 22:45:39 +02:00
Parker Moore a95fa70d72 raise things when there's a yaml exception (non-zero exit code 2013-05-17 22:44:46 +02:00
maul.esel 96efa9ed06 delete old files that have been replaced by a directory
Fixes #417.
Replaces #1086, more logical code.
2013-05-17 17:45:51 +02:00
Casey Lang fafacc43ca Add ? to preserve_source_location 2013-05-16 16:15:21 -05:00
Casey Lang 00dd37d2e4 Extract check for force to improve readability 2013-05-16 16:13:13 -05:00
Sebastian Morr 151ffab6fe Removed space characters in empty lines 2013-05-16 20:27:27 +02:00
Casey Lang 2ce39bc20a Add '--force' to 'new' command. Implements #1104 2013-05-15 17:29:27 -05:00
Parker Moore 8e3ab9ea36 Backwards-compatibilize 'exclude' and 'include' config tags. Fixes #1109 2013-05-16 00:25:16 +02:00
Parker Moore ef48cbefec Merge pull request #1057 from mojombo/refactor-related-posts
Move the building of related posts into their own class
2013-05-15 07:25:53 -07:00
Parker Moore 5258e3afa3 Logger ~> Stevenson and don't inherit from Ruby Logger. #1106. 2013-05-15 15:15:00 +02:00
Matt Rogers 98aff03595 Use Jekyll::Stevenson#formatted_topic for printing messages
Beats trying to line them up yourself. :-)
2013-05-14 22:04:34 -05:00
Matt Rogers ff600bfcd9 Merge branch 'master' into refactor-related-posts 2013-05-14 21:54:12 -05:00
Parker Moore 35f4f09c3e Rename Jekyll::Logger ~> Jekyll::Stevenson to fix inheritance problem
Problem described here: ca888cad76
2013-05-14 21:07:23 +02:00
Parker Moore 8051df0f4c Release 1.0.2 2013-05-12 15:26:45 +02:00
Parker Moore 179a746091 Merge pull request #1066 from Rowno/data-language
Add a `data-lang` attribute to code blocks
2013-05-12 03:11:11 -07:00
Parker Moore 28b9e351c4 Merge pull request #1081 from mojombo/relative-permalinks
Backwards-compatibilize relative permalinks
2013-05-12 02:55:49 -07:00
Parker Moore f9502dc9f5 Merge pull request #1078 from maul-esel/fix-num-category
Fix number category
2013-05-12 02:52:39 -07:00
Parker Moore c59cfcfd2e Not automatically deprecated. 2013-05-12 01:19:04 +02:00
Parker Moore d9f0dce67d make sure relative_permalinks is set to TRUE 2013-05-12 01:16:52 +02:00
Parker Moore 2e1316ec8b Ensure the page is in a subdir. That's the only time it's eff'd. 2013-05-12 01:08:33 +02:00
Parker Moore 6167747440 Say happy things when everything is cool 2013-05-12 01:07:58 +02:00
maul.esel 1b80fc8cc8 always be polite to the user :) 2013-05-11 20:03:55 +02:00
maul.esel a8788f4a0a copy over deprecated config option to new one 2013-05-11 19:57:11 +02:00
maul.esel c44d4248ac warn on use of deprecated "server_port" option 2013-05-11 19:54:06 +02:00
Parker Moore 0e82b4eb2f Use site config to determine whether permalinks should be relative. 2013-05-11 18:26:20 +02:00
Parker Moore 161244fd78 Add better language and link to Upgrading page in docs for relative permalinks deprecation msg 2013-05-11 18:06:33 +02:00
Parker Moore 1f23bc4dc0 Add support for relative permalinks 2013-05-11 18:03:03 +02:00
Parker Moore 19bc54bb07 Add doctor command 2013-05-11 18:02:53 +02:00
Parker Moore 6294c4a204 Better-formatted output with relation to 'Generating... done.' 2013-05-11 17:56:42 +02:00
Parker Moore b355ef6469 Add jekyll doctor command 2013-05-11 17:49:20 +02:00
Parker Moore e22b1bb74a Add deprecation support for pages in subfolders with relative permalinks. 2013-05-11 17:40:00 +02:00
maul.esel eae3ae8479 fix handling of number categories 2013-05-10 14:07:23 +02:00
Roland Warmerdam 2a6c722e78 Add a `data-lang` attribute to code blocks 2013-05-10 19:18:13 +12:00
Matt Rogers 08b49ec9db Update the display of the LSI progress output
It now fits more in line with what the other messages display.
2013-05-08 22:02:23 -05:00
Matt Rogers 64f8a7b228 Move the require for related_posts to jekyll.rb 2013-05-08 07:39:00 -05:00
Parker Moore 0c04e5d55b Catching that the Redcarpet gem has been installed. Fixes #1059 2013-05-08 11:55:19 +02:00
Christopher Giroir 09fafd6418 Fixing paginate_path on windows 2013-05-07 23:24:10 -07:00
Matt Rogers f67f7f3db4 Move the building of related posts into their own class 2013-05-07 22:27:38 -05:00
Parker Moore c758f8d24f Release 1.0.1 2013-05-08 01:03:14 +02:00
Parker Moore 739f752580 Properly wrap and encode non-pygmentized code. 2013-05-08 00:45:55 +02:00
Parker Moore 62b4fd77ac Using modules instead of classes for Redcarpet with/without Pygments. 2013-05-08 00:28:51 +02:00
Parker Moore 2114bb3c2e Respect pygments config option in Redcarpet renderer. 2013-05-08 00:10:18 +02:00
Parker Moore 1d2f172d6b Check to make sure there is a toc_token before trying to use it. Fixes #1047 2013-05-07 18:12:47 +02:00
Parker Moore f9e3cf21f9 Provide backwards-compatibility for change in #1037. 2013-05-07 16:45:06 +02:00
Parker Moore 6b9ef70d7b Merge pull request #1037 from djui/patch-1
Add newer `language-` class name prefix to code blocks
2013-05-07 07:41:08 -07:00
Matt Rogers 39d33b48b0 Fix the index build with LSI 2013-05-07 06:58:54 -05:00
Parker Moore d0a9948eed Let Commander handle bad args after printing of deprecation warning. Fixes #1040. 2013-05-07 13:15:03 +02:00
Parker Moore a0ad8a4031 Don't print deprecation warning if no arg is specified. Fixes #1041. 2013-05-07 13:10:29 +02:00
Uwe Dauernheim 3770bcbdb7 Use newer `language-` class name prefix
This change makes it partly possible to use Jekyll+RedCarpet+Prism.js without using a plugin.

Another change will respect Jekyll's `pygments` configuration option and not render the code block using Pygments. Together, these two changes allow using prism.js with Jekyll out of the box.
2013-05-07 02:33:58 +03:00
Pascal Borreli 29b3dc97f0 Fixed typos 2013-05-06 20:27:00 +01:00
Pascal Borreli 410e5912a2 Fixed html 2013-05-06 20:26:39 +01:00
Parker Moore c7b707cdfd Ignore --help and --version in Deprecator. Fixes #1030 2013-05-06 20:17:28 +02:00
Parker Moore 4d9d6b689b Cleaning up the site template CSS. 2013-05-06 01:00:00 +02:00
Parker Moore 06beb4b72b Bump version for 1.0.0. 2013-05-05 23:02:45 +02:00
Parker Moore 0b1d22dd61 Merge pull request #1016 from mojombo/fix-pagination
Paginate in subdirectories properly
2013-05-05 14:01:29 -07:00
Parker Moore ce999f12fc Merge pull request #992 from maul-esel/consistent-page.url
add leading slash to page.url and post.url
2013-05-05 13:56:15 -07:00
Parker Moore 50d66831ff Merge pull request #964 from benbalter/html-template-site
Make Template site HTML5
2013-05-05 12:05:47 -07:00
Benjamin J. Balter 8ec08fceb6 Downgrade default site template for Internet exploder
Swap `<header>` and `<footer>` tags to `<div>`s, so we can support IE without the need for an html5 shim.
2013-05-05 14:28:58 -04:00
Parker Moore 050e982006 Add extra question to ensure that the index.html file is in thepagination path's directory 2013-05-05 17:26:29 +02:00
Parker Moore ea71036e8c Paginate in subdirectories properly. Fixes #878. 2013-05-05 15:40:13 +02:00
Parker Moore 9179f56ed7 Quick clean-up from #998. 2013-05-05 14:59:50 +02:00
Parker Moore 290ba131e2 Merge pull request #998 from dhcole/master
Use post's directory path when matching for the post_url tag
2013-05-05 05:16:39 -07:00
Parker Moore 1b994a9682 Merge pull request #1015 from mojombo/loose-pygments-dep
Loosen Pygments Dependency
2013-05-05 04:48:37 -07:00
Parker Moore dcf3911176 Merge pull request #1014 from mojombo/string-times
Parse strings into Time objects for date-related parsing
2013-05-05 04:42:26 -07:00
Parker Moore ca888cad76 When pygments is required after Jekyll::Logger is required, its internal require to Ruby's stdlib Logger class chokes. This is an ugly-ass work-around. 2013-05-04 15:31:02 +02:00
Parker Moore 3feb18bb56 Redcarpet Parser requires pygments 2013-05-04 15:29:43 +02:00
Parker Moore 3c218d2dcd Only require pygments where it's needed. 2013-05-04 15:04:57 +02:00
Parker Moore 67aaada839 Clean up some copy in the limit_posts error handling. 2013-05-04 14:57:27 +02:00
Parker Moore 7554c4ce61 Parse strings into Time objects for date-related parsing. Fixes #997. 2013-05-04 14:01:44 +02:00
Parker Moore c32b570114 Checking the arguments to ensure we have a subcommand before proceeding. (#1008) 2013-04-30 22:17:22 +02:00
Michael Klishin 82ec02905e Catch all exceptions, not just StandardError descendents
We've hit a few edge cases in Liquid/Markdown rendering
with http://clojurewerkz.org documentation sites.
They resulted in exceptions Jekyll silently swallowed because
they were not StandardException subclasses.
2013-04-30 23:33:08 +04:00
Parker Moore 7efd0a8d11 Merge pull request #1004 from uu59/fix_limit_posts_from_cli
Fix `jekyll serve --limit_posts n` failed
2013-04-30 06:53:05 -07:00
uu59 0f52f15cc2 Clean up code #1104 2013-04-29 21:07:46 +09:00
uu59 94756340cd Remove to_i. Let commander gem do it #1004 2013-04-29 15:56:02 +09:00
Parker Moore b4b66d5713 Merge pull request #1001 from mojombo/refactoring-convertible
Refactoring Jekyll::Convertible
2013-04-28 16:43:38 -07:00
uu59 20a837d15c Change default value of limit_posts from nil to 0 (see #1004)
Before this commit meaning of limit_posts:
  nil: no limit. generate all posts
  0: raise error
  n ( > 0): generate n posts only
  n ( < 0): raise error
  else: raise error

After this commit:
  nil: same as 0
  0: no limit. generate all posts
  n ( > 0): generate n posts only
  n ( < 0): raise error
  else: almost same as 0 (depend on `to_i` result)
2013-04-29 01:41:22 +09:00
Parker Moore f7fde70f5f 'The Best of Both Worlds,' à la @chad's comment 2013-04-28 15:21:17 +02:00
uu59 ad2c706a34 Fix `jekyll serve --limit_posts n` failed 2013-04-28 02:03:08 +09:00
Parker Moore 5f13e00791 Comments for Convertible.render_all_layouts and Convertible.render_liquid 2013-04-26 21:09:02 +02:00
Parker Moore fcbab9a3ca Post#is_published ~> Post#published? 2013-04-26 21:00:47 +02:00
Parker Moore f7841d1713 Remove unnecessary self.tags.flatten! in favour of a one-line sol'n. 2013-04-26 20:59:54 +02:00
Parker Moore 422a4bd5cd Renamed tag- and category-instantiation methods 2013-04-26 20:25:07 +02:00
Parker Moore 6d9845a58b Refactor Post category instantiation 2013-04-26 20:23:58 +02:00
Parker Moore 482986e346 Refactored setting of Post.published flag 2013-04-26 20:21:17 +02:00
Parker Moore 266a52b161 The call to Post#read_yaml was in an unnecessary begin...rescue block. 2013-04-26 20:09:18 +02:00
Parker Moore 09c1c01d07 Refactor Post#related_posts to build the index in a different method 2013-04-26 20:05:52 +02:00
Parker Moore ffa93c22f1 Refactor Post#to_liquid 2013-04-26 20:03:57 +02:00
Parker Moore 29a1c18300 Refactoring Jekyll::Convertible 2013-04-26 19:36:52 +02:00
Dave Cole fc09ac4862 Use post's directory path when matching for the post_url tag 2013-04-25 13:58:05 -04:00
Parker Moore 61c24c601a Add UTF-8 encoding where we read in YAML so it reads in UTF-8 characters properly. Fixes #836. 2013-04-25 02:15:25 +02:00
Stephen McDonald a38902b5a7 Use valid css class names when pygments language contains invalid chars, eg html+jango 2013-04-23 06:48:31 +10:00
Parker Moore 24aabbe05f Moving comparison for PostUrl tag to the PostComparer class 2013-04-22 12:57:52 +02:00
maul.esel d73841c961 always ADD a leading slash to page.url or post.url 2013-04-20 13:15:40 +02:00
maul.esel c6df2e150a remove leading slash from page.url and post.url 2013-04-19 16:37:48 +02:00
Parker Moore ba64a9fe30 Fail if destination directory for jekyll new exists and is not empty. Fixes #981. 2013-04-16 18:24:10 +02:00
Benjamin J. Balter 11419868dc CSS reorganization
1. Fix regression on s/.footer/footer/
2. Fix whitespace and tabbing
3. Reorganize properties more logically
2013-04-16 09:48:18 -04:00
Parker Moore 6ed41e373c Remove code duplication: #write in Page and Post is the same. 2013-04-16 02:55:31 +02:00
Parker Moore c0c0150bb5 Release 1.0.0.rc1 2013-04-16 00:47:31 +02:00
Parker Moore 82f32d5c02 Merge configuration properly. Closes #978. 2013-04-16 00:41:10 +02:00
Benjamin J. Balter 55b890b407 Move site title to H1 tag, wrap header in header tag. 2013-04-15 16:50:01 -04:00
Benjamin J. Balter 223dbdc155 86'd conditional IE classes 2013-04-15 13:37:05 -04:00
Parker Moore e7546a98f6 Remove unnecessary override of #read_yaml in Page. 2013-04-15 19:24:23 +02:00
Benjamin J. Balter 14ca57893f 86'd Chrome Frame in template site 2013-04-15 12:04:27 -04:00
maul.esel b7064a4bc3 remove 'post' and 'page' default layouts 2013-04-15 17:24:09 +02:00
Parker Moore b4f68baafb Jekyll.set_timezone accepts just the timezone, not the config 2013-04-15 15:39:36 +02:00
Parker Moore c0a2d0f888 Fixed syntax error 2013-04-15 00:42:13 +02:00
Parker Moore b249289b9d Set the timezone for the process 2013-04-15 00:42:13 +02:00
Parker Moore d33f45ff05 Merge branch 'master' of github.com:mojombo/jekyll
* 'master' of github.com:mojombo/jekyll:
  Print deprecation warnings for 'server', 'watch' and 'auto' when loaded from files. Fixes #972
  Fixes multiple config loading. Closes #973. Rel: #945.
2013-04-15 00:32:17 +02:00
Parker Moore f7310f554e Whitespace in post.rb 2013-04-15 00:32:04 +02:00
Parker Moore 55a964a7da Print deprecation warnings for 'server', 'watch' and 'auto' when loaded from files. Fixes #972 2013-04-14 23:18:47 +02:00
Parker Moore e531925cae Fixes multiple config loading. Closes #973. Rel: #945. 2013-04-14 23:04:20 +02:00
Parker Moore e0335e2167 .formatted_topic has moved back to Jekyll::Logger. Update Build.watch to use it 2013-04-14 20:21:39 +02:00
Parker Moore 398cd633b6 Merge pull request #959 from mojombo/deprecator
Refactor Logging and Deprecation Messaging
2013-04-14 11:05:07 -07:00
Parker Moore 4ef107f3e8 Remove Logger methods from main Jekyll module. 2013-04-14 19:27:19 +02:00
Benjamin J. Balter ba2281c4a3 Strip CSS, JS, and IMG from template site
Per #964, just upgrade the template site from XHTML to HTML5,
leaving the existing CSS. No need to get fancy.

The HTML is essentially HTML5 Boilerplate. No need for a holy war.

Look and feel should remain the same.
2013-04-14 12:52:27 -04:00
Parker Moore 81e44bf5f4 Merge pull request #955 from mojombo/refactor-markdown
Refactor Markdown Parser Logic
2013-04-13 20:25:37 -07:00
Parker Moore 7a7990fb9a Moved markdown converters into lib/jekyll/converters/markdown 2013-04-14 05:23:42 +02:00
Parker Moore c708d1d71b Merge pull request #907 from advatar/pkpass_mime_type_support
Added pkpass to the list
2013-04-13 19:17:35 -07:00
Parker Moore ef51b0f9e4 Error message is red 2013-04-13 20:27:44 +02:00
Parker Moore ef9d8ddb7d Matching tests to new colorized output 2013-04-13 20:24:45 +02:00
Parker Moore b99baeae27 Colorize warns as yellow 2013-04-13 19:58:41 +02:00
Parker Moore 9b5ebb874f Merge pull request #961 from benbalter/default-markdown-engine
Move template site to default markdown renderer
2013-04-13 10:26:34 -07:00
Benjamin J. Balter 1163fa905e Make template site HTML5
It would really pain me if the default Jekyll site were XHTML. That'd be bad for the internet.

Instead, use Twitter Bootstrap as a base (while still keeping @mojombo's origin design), to give users a great initial baseline to build beautiful, simple sites.

Defaults are more than just the starting point. It's what 80% of users are going to use. Look at WordPress and the default theme. May as well lead by example and start the user off right.

* Add Bootstrap base CSS as a better reset and base layer
* Update default layout to HTML5 with boilerplate best practices
* Add title and post date to post.html (rather than including in the post itself)
* Make site title a variable and add to _config.yml
* Add page title to header
* Add default .gitignore to ignore `_site`
* Remove unused `rss.png` and `.gitkeep`
* Add Modernizr for legacy IE support
2013-04-13 13:15:31 -04:00
maul.esel 40e44a2051 do not force the permalink to be a dir if it ends on .html
Fixes #798.
2013-04-13 18:45:40 +02:00
Benjamin J. Balter 485b37e3d1 move template site to default markdown renderer 2013-04-13 12:41:03 -04:00
Brian Kim 028e580bb8 Remove short-circuits from Site 2013-04-13 12:39:49 -04:00
Brian Kim e7815d873c Add implicit defaults to DEFAULTS 2013-04-13 12:37:38 -04:00
Parker Moore 17f97cdbab Move manual printing to Jekyll.info and Jekyll.warn 2013-04-13 18:22:34 +02:00
Parker Moore c5f6e527b5 Bring Logger and Deprecator into the fold 2013-04-13 18:05:03 +02:00
Parker Moore bc6748f139 Add Jekyll::Deprecator 2013-04-13 18:03:38 +02:00
Parker Moore 61465053eb Add Jekyll::Logger 2013-04-13 18:02:16 +02:00
Parker Moore 891ccbd656 Merge pull request #953 from mojombo/refactor-configuration
Refactor Jekyll Configuration
2013-04-13 07:19:03 -07:00
Parker Moore a971fec801 rescue block for the method and added redcarpet as option for parser 2013-04-13 02:13:50 +02:00
Parker Moore 3bc497c1c9 Moved out conversion logic 2013-04-13 01:55:03 +02:00
Parker Moore 63cdd21353 Move initialization of parsers to separate classes 2013-04-13 01:47:40 +02:00
maul.esel 968f3b0911 allow overriding page.path in YAML frontmatter 2013-04-13 00:05:49 +02:00
Parker Moore 6881d3bfbf Refactored Configuration#config_files 2013-04-12 23:59:37 +02:00
Parker Moore 92db4ed89f Merge pull request #951 from maul-esel/liquid-file-path
Expose file path to Liquid
2013-04-12 14:33:19 -07:00
Parker Moore bd8d271ce3 Moving the backwards-compatibilizing to Configuration#read_config_files. @mattr- 2013-04-12 23:11:38 +02:00
Parker Moore 879b08a0b0 In Configuration#config_files, cascade to the Configuration's value of 'source' before the default 2013-04-12 22:29:52 +02:00
Parker Moore f2f20d18f0 TomDoc Jekyll::Configuration 2013-04-12 21:38:30 +02:00
Parker Moore 810a29c719 Rescue the entire method instead of just a `begin` block 2013-04-12 22:25:58 +03:00
Parker Moore e2967c96cd Jekyll.configuration should use the new Jekyll::Configuration class 2013-04-12 21:20:30 +02:00
Parker Moore 64f224933b Add Jekyll::Configuration 2013-04-12 21:20:14 +02:00
Parker Moore 04fd68a232 Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS 2013-04-12 21:19:20 +02:00
Parker Moore 0884a52fea Add TomDoc for Jekyll::Command.process_site 2013-04-12 20:01:25 +02:00
Parker Moore 5f54507204 Remove code duplication 2013-04-12 19:35:46 +02:00
maul.esel dc4d7c0bf4 fix path for posts: must include "_posts" 2013-04-12 18:17:57 +02:00
maul.esel d64fd1e8fe expose file path relative to source dir to liquid
Fixes #633.
2013-04-12 17:37:16 +02:00
Parker Moore bee8cd9d77 Merge pull request #946 from maul-esel/preserve_excerpt
Preserve 'excerpt` in YAML Front-Matter
2013-04-12 06:24:51 -07:00
maul.esel 2b238786a2 one more indentation fix 2013-04-12 12:05:07 +02:00
maul.esel bcda51f97b do not allow markdown etc. in excerpt
Adjust the tests accordingly. Also
add a message for one of the tests.
2013-04-11 21:02:08 +02:00
Alex Kessinger 14a669530e Fixing tests, and making it more ruby friendly 2013-04-11 10:17:59 -07:00
maul.esel 951ee09a75 remove useless attr_reader for excerpt (is a method now) 2013-04-11 19:05:28 +02:00
maul.esel 654d598fcf rework excerpt to be an accessor method
Instead of setting self.excerpt, make it a method
that returns either the custom excerpt or the pre-
viously extracted excerpt.
2013-04-11 17:13:15 +02:00
maul.esel 069e70d1b3 do not override custom excerpt set in YAML frontmatter
Fixes #933.
2013-04-11 14:25:47 +02:00
Alex Kessinger 1e209c9bf3 Upgrade --config to accept an array of files 2013-04-10 11:38:49 -07:00
Alex Kessinger df1efeff25 Accept multiple config files from command line
Parse config as if it can contain multiple references to config files.
This allows you to pass in multiple config files from the command line

Helps with issues #514 and #703
2013-04-10 10:19:48 -07:00
Parker Moore abb8e5039e Merge pull request #413 from sethladd/master
add page variable to liquid custom tags and blocks
2013-04-09 16:54:20 -07:00
Lucas Jenss cfcbe1f830 Refactor URL processing/generation into separate module
This is done to prepare for improved permalink generation
for URLs containing special characters, as proposed in
issue #782
2013-04-09 23:53:46 +02:00
Parker Moore 1319b823f8 Release 1.0.0.beta4 2013-04-09 21:31:23 +02:00
Parker Moore 88f92729bc Use paginate_path and don't help too much 2013-04-09 21:00:27 +02:00
Parker Moore 9c296f04a9 Join the path with baseurl in Pager.paginate_url 2013-04-09 20:26:08 +02:00
Parker Moore b9e7a31ab8 Return nil if num_page is nil 2013-04-09 20:25:43 +02:00
Parker Moore e5bf5aa09e Documentation for Pager.paginate_url 2013-04-09 20:25:33 +02:00
Parker Moore b10939912f Add paginator.previous_page_path and paginator.next_page_path 2013-04-09 19:48:41 +02:00
Parker Moore b667a6a1a8 Merge pull request #935 from mojombo/baseurl-normalization
Fix cascade problem with site.baseurl.
2013-04-07 15:19:23 -07:00
Parker Moore dbb3dd3a1a Move port and host configuration options to Jekyll::DEFAULTS so Commander doesn't override in serving awkwardly. 2013-04-07 23:55:04 +02:00
Parker Moore 8bf55ef8fa Merge pull request #928 from danieldriver/ordinal_date
add ordinal date permalink style (/YYYY/DDD/slug.html)
2013-04-07 13:52:30 -07:00
Parker Moore 1526aa3b1d Fix cascade problem with site.baseurl. Fixes #931. 2013-04-07 22:47:55 +02:00
Parker Moore ae462afb76 Backwards-compatibility for 'auto'. Fixes #821. 2013-04-07 22:29:30 +02:00
Parker Moore 0f2c9d29ee Merge pull request #875 from mojombo/posts-cant-be-dirs
Directories with valid post names should be filtered out
2013-04-07 12:54:42 -07:00
Parker Moore 7b36d26240 Merge pull request #892 from rafaelrosafu/master
Added date_to_rfc822 used on RSS feeds
2013-04-07 12:43:50 -07:00
Daniel Driver ea753130e6 add ordinal date permalink style (/YYYY/DDD/slug.html) 2013-04-06 08:17:02 -04:00
Parker Moore 483a0b68b6 Merge pull request #890 from zachgersh/abbreviated_month
Added abbreviated month + test.
2013-04-05 09:44:50 -07:00
Parker Moore 28097a9ebb Updated version to 1.0.0.beta3. 2013-04-04 16:14:54 +02:00
Parker Moore cf461ea1a5 Merge pull request #909 from x3ro/symlinked-static-files
Fix symlinked static files not being correctly built in unsafe mode
2013-04-03 14:10:35 -07:00
Alexander Ekdahl 8810dc6479 Preloads directory_watcher glob 2013-04-02 17:46:07 +02:00
Lucas Jenss 2c7325223f Fix symlinked assets not being included, even in unsafe mode 2013-03-31 20:49:43 +02:00
Johan Sellström 8d1b6720c3 Added pkpass to the list 2013-03-31 18:22:41 +03:00
zachgersh e931414b77 Changed to short_month and re-ran tests. 2013-03-27 08:40:58 -07:00
Rafael Rosa Fu 186b68adb0 Added filter date_to_rfc822
According to the W3C RSS Feed Validator, feeds must format dates as described
on RFC-822 to be valid. Refer to their site to get more info:
http://feedvalidator.org/docs/error/InvalidRFC2822Date.html

I also added a couple of missing unit tests to the other date filters
2013-03-27 02:21:48 -04:00
zachgersh 6657f2add9 Added abbreviated month + test. 2013-03-26 23:06:34 -07:00
Matt Rogers fa39a97bc6 Remove unused code 2013-03-25 21:22:42 -05:00
Aleksey V. Zapparov 196e26b580 Flatten tags and categories lists. Fixes #741. 2013-03-19 23:16:53 +01:00
Parker Moore a72cdc9293 Auto-regeneration fails loudly. Fixes #470. 2013-03-19 22:31:37 +01:00
Parker Moore 6f6ad001d2 Ignore entries if they are directories. 2013-03-19 21:59:06 +01:00
Parker Moore de8f0c986c Update version for 1.0.0.beta2. 2013-03-19 00:08:56 +01:00
Parker Moore 73ca35ee81 Ensure all categories are downcase. Fix for #842. 2013-03-17 23:43:37 +01:00
Parker Moore 9d814a4eb7 Add method String#force_encoding to 1.8.7 2013-03-17 23:35:46 +01:00
Dave Wasmer f7f64576e5 Force encoding of the rdiscount TOC to UTF8 to avoid conversion errors 2013-03-17 22:28:52 +01:00
Parker Moore a054ce2788 Merge pull request #861 from danielgrieve/gist-tag
display single files from gist
2013-03-17 13:33:10 -07:00
Parker Moore 7ba5a27a74 Merge pull request #871 from mojombo/gh-pages-mime-types
Use GH Pages MIME types.
2013-03-17 13:22:51 -07:00
Parker Moore 4400e89898 Expect a 'baseurl' to be passed in to Site 2013-03-17 21:18:45 +01:00
Tom Preston-Werner 8c6c33a6c8 Use GH Pages MIME types. 2013-03-17 13:14:35 -07:00
Parker Moore ee697a6308 Add Jekyll::DEFAULTS['baseurl'] and set the default pygments option to _true_ 2013-03-17 21:09:58 +01:00
Parker Moore ebcf3eb385 Merge pull request #869 from mojombo/baseurl-in-liquid
Expose site.baseurl to Liquid templates.
2013-03-17 12:53:27 -07:00
Parker Moore 6c1a08ce87 Merge pull request #862 from mojombo/fix-autogen-dest-prob
Stop DirectoryWatcher from watching the destination directory
2013-03-17 12:48:30 -07:00
Parker Moore d5ed4fc5d0 Add baseurl to Site attr_accessor list. 2013-03-17 20:42:11 +01:00
Parker Moore eef13d7d43 Expose site.baseurl to Liquid templates. 2013-03-17 17:26:33 +01:00
Daniel Grieve b9cbce5e5f fix regex 2013-03-17 15:04:03 +00:00
Parker Moore 936ed1f849 Merge pull request #837 from ixti/feature-excerpt
Adds excerpt to posts
2013-03-17 07:53:41 -07:00
Parker Moore aa7a234c18 Merge master into jekyll-new 2013-03-17 15:45:37 +01:00
Aleksey V Zapparov 66c5ef2556 Fix typos and remove some obtrusive code 2013-03-17 13:42:46 +01:00
Daniel Grieve 22d1fdab54 tie down the regex match on gist filenames 2013-03-17 11:29:42 +00:00
paco 23a01e7766 Patch for multibyte URI problem. Closes #723. 2013-03-16 21:20:11 +01:00
Daniel Grieve 6c5d001986 replace \s with space 2013-03-16 19:20:54 +00:00
Parker Moore 5d34a4c533 Merge pull request #864 from mojombo/prioritize_plugins
Prioritize plugins & DRY subclass instantiation
2013-03-16 12:09:43 -07:00
Tommy Sullivan caa6a4ebfd Sort instantiated subclasses in Site. 2013-03-16 15:24:34 +01:00
Matt Rogers 10ee5c8999 Remove the duplication when creating Converters and Generators
Encapsulate it in a method and give the method the class to walk the
subclass tree for to create new objects.
2013-03-16 15:20:11 +01:00
Parker Moore 7e1100962c Load in config from --config switch 2013-03-16 14:44:49 +01:00
Parker Moore 8acb1b29bd Using 1.8.7-compliant File.expand_path instead of >1.9 File.realpath 2013-03-16 14:24:34 +01:00
Parker Moore 1d920f52f1 Fix bug where Command.globs didn't delete the destination directory.
There was often a mix between absolute and relative paths and in the
previous version, the destination argument was usually an absolute
path where the glob array (from Dir['*']) was a relative path.
2013-03-16 13:57:28 +01:00
Daniel Grieve 92d9c4301b display single files from gist 2013-03-15 22:37:14 +00:00
Parker Moore 5c35a84662 Updated version and gemspec to reflect 1.0.0.beta1 release 2013-03-14 21:26:06 +01:00
Parker Moore dbc356f9f4 Bump version to 1.0.0.pre. 2013-03-14 21:23:34 +01:00
Daniel Grieve 4be5dfdb9a fix copying of site template files 2013-03-13 21:27:41 +00:00
Daniel Grieve 099fcc27d6 raise ArgumentError if no args. rename sample post 2013-03-13 19:21:11 +00:00
Parker Moore df9964c3b5 Merge pull request #838 from mattr-/dedupe-entry-generation
Remove code duplication during site generation
2013-03-12 11:27:56 -07:00
Parker Moore 2473bdbd7c Merge pull request #847 from mojombo/mime_file
Load in Apache MIME Types
2013-03-12 11:06:26 -07:00
Jonathan Roes 7a86d901f1 Refactor Commands::New a bit and remove scaffold post once copied. 2013-03-12 00:48:22 -04:00
Jonathan Roes b71ec624f8 Add commands/new and scaffold post to gemspec so they get copied over. 2013-03-12 00:47:42 -04:00
Parker Moore 725b127f9b Merge pull request #536 from fotos/fix_page_dir
Added path in url.
2013-03-09 17:07:16 -08:00
Fotos Georgiadis f79662719b Fix indentation. 2013-03-09 15:07:27 +02:00
Parker Moore 524aa1f36a Jekyll::Commands::Serve reads in mime.types file. 2013-03-08 20:12:52 +01:00
Parker Moore 5e6c2f6e4b Added mime.types file from Apache SVN repo. 2013-03-08 20:12:21 +01:00
Matt Rogers 6399ec9b2b Remove duplication when aggregating post information 2013-03-05 19:11:07 -06:00
Matt Rogers 2dd98816d4 Remove duplication when generating list of entries to process
Posts and Drafts share the same logic to get the list of files to
process into objects when generating the site. Factor this logic into
its own method and use it when reading posts and reading drafts.
2013-03-05 19:06:20 -06:00
Aleksey V Zapparov 22dcc4e20f Adds excerpt to posts 2013-03-04 17:13:25 +01:00
larrylv 035bbdf99f Fix typo. 2013-03-04 14:59:34 +08:00
Tom Preston-Werner 3a9ca0a796 Merge branch 'drafts-fixup'
Add a drafts feature. This allows you to place draft posts into an _drafts
folder in the site root while you're working on them, and then request that
they be rendered as normal posts via a command line switch.

Draft files should be named just like normal posts, except they must not
contain the date prefix. When you're ready to make a post live, rename it
with the date and move it to the proper place.

To preview your drafts, run Jekyll with the `--drafts` switch. This will
render all the posts with a date corresponding to the last time the file
was modified.
2013-03-03 18:57:36 -08:00
Tom Preston-Werner b46000f6af Kill unnecessary return keyword. 2013-03-03 18:43:54 -08:00
Parker Moore 0d3ea5b710 Forgot to escape newlines. 2013-03-04 03:41:18 +01:00
Tom Preston-Werner 2b9b613687 Normalize CLI options to match configuration expectations. 2013-03-03 18:23:02 -08:00
Parker Moore 5af8e1f40c Applying a more 'Ruby' style to post_url.rb 2013-03-04 03:20:59 +01:00
Tom Preston-Werner 4caf613be8 Merge branch 'drafts' of https://github.com/scribu/jekyll into scribu-drafts 2013-03-03 12:57:55 -08:00
Daniel Hilgarth 87f6f8c971 Fix invalid ordering of posts published on the same day and move post_url specific comparison of posts where it belongs: Into post_url 2013-03-03 15:36:16 +01:00
Daniel Hilgarth ce8e1afba6 Add support for Ruby < 1.9 2013-03-03 15:12:21 +01:00
Daniel Hilgarth cc83501489 Fix broken post_url with posts with a time in their YAML front matter. 2013-03-03 14:56:18 +01:00
scribu 1a351284ca rename get_base() to containing_dir() 2013-03-03 12:56:12 +02:00
Parker Moore 7258b10f88 We don't need YAML in the new command. 2013-02-28 22:19:38 +01:00
Parker Moore 149b95d767 Typos in sample post. 2013-02-28 22:17:24 +01:00
Fotos Georgiadis 441eddf1ca Fix pretty url style paths.
Ignore the basename if the page is an index page, preserve it if it's just an
html page and use the full path in every other case.
2013-02-28 03:49:39 +02:00
Parker Moore bd9a112ff1 Merge pull request #785 from lenniboy/master
Improve debugability of error message for a malformed highlight tag
2013-02-26 16:58:36 -08:00
Parker Moore 63d0eef646 Merge pull request #824 from sinamt/symlinked_folders
Allow symlinked folders in unsafe mode (with tests). Closes #796, resolves #233.
2013-02-26 16:54:52 -08:00
Matt Rogers d58859570d Fix up the whitespace.
Remove an extra blank line and fix another whitespace error pointed out
by git diff
2013-02-25 13:24:37 -06:00
Matt Rogers 5a9c20983d Rename setup_plugins to plugins_path 2013-02-25 13:20:32 -06:00
Matt Rogers d2c79a8841 Merge branch 'master' into issue-653 2013-02-25 13:08:23 -06:00
Parker Moore f8a90d711f Using https protocol instead of http. 2013-02-24 01:54:13 +01:00
Parker Moore cdd3c0ef0c Remove 'type' attribute from script tag in gist liquid tag. 2013-02-24 01:30:41 +01:00
Parker Moore 7e7cee6e56 Strip space from the gist number, add test for gist tag 2013-02-24 00:58:13 +01:00
sterebooster 425f466842 'gist' liquid tag by @stereobooster. Fixes #463. 2013-02-24 00:38:19 +01:00
Parker Moore 7457cbae25 Fix issue with watching (auto-regeneration) continuously running if destination is not '_site'. #457. 2013-02-22 00:59:44 +01:00
Parker Moore 5d8e012899 Fixed merge with new log output in lib/jekyll.rb 2013-02-20 23:10:42 +01:00
Parker Moore 9eb79ff135 Improved output for auto-regeneration. 2013-02-20 23:09:54 +01:00
Parker Moore bf79b0ac37 Fixed merge with new log output in lib/jekyll.rb 2013-02-20 23:09:34 +01:00
Parker Moore 11eb1ecae1 Safe loading of files and YAML. 2013-02-10 19:07:38 +01:00
scribu 538c2086a5 whitespace fixes 2013-02-10 04:49:27 +02:00
scribu 3e164d6daf don't check if draft is published or if its date is in the future 2013-02-09 23:48:38 +02:00
scribu 2588d681c9 fix draft filename processing 2013-02-09 23:38:13 +02:00
scribu 78831d94cd don't mess with dir parameter 2013-02-09 23:19:35 +02:00
scribu 642349f797 implement and use Draft.valid? 2013-02-09 22:41:47 +02:00
scribu 1ac46b17c4 Don't require date in draft filenames. 2013-02-09 21:35:41 +02:00
Alexander Ekdahl 4cd7c22ee7 Now uses the more semantically correct AND operator 2013-02-04 22:17:03 +01:00
Alexander Ekdahl 7512e6bb66 Allow symlinked folders in unsafe mode 2013-02-04 17:16:01 +01:00
Parker Moore 28a074ff7a Remove Jekyll::Commands::Migrate 2013-01-31 00:18:22 +01:00
Parker Moore b70c59667c Requiring jekyll-import gem. Printing error and exiting if it does not exist. 2013-01-30 23:43:26 +01:00
Parker Moore cff4ec72ea Using .erb file for the new post 2013-01-30 21:05:52 +01:00
Leonard Ehrenfried a7f0d04bda Improve error message for malformed highlight tags 2013-01-29 12:16:33 +01:00
Parker Moore 704307d7fe Added very basic code snippet example to sample post 2013-01-27 23:30:32 +01:00
Parker Moore bf78fe9b75 Move post scaffold content to a separate method. 2013-01-27 23:23:53 +01:00
Parker Moore a68b67c65e Added newline to New command for stylistic congruence. 2013-01-27 23:21:31 +01:00
Parker Moore ac691a1465 removed related posts segment of scaffold site. 2013-01-27 23:21:02 +01:00
Parker Moore a8671ed52b Using modularized commands (Jekyll::Commands) as per @tombell's latest PR merge 2013-01-27 23:17:45 +01:00
Parker Moore 272dd5ef35 Added the NewCommand class 2013-01-27 23:16:34 +01:00
Parker Moore ce7e307cba Scaffold site, based on @mojombo's site (with permission). 2013-01-27 23:16:34 +01:00
Parker Moore b4bea4a586 Merge branch 'code-cleanup' of git://github.com/tombell/jekyll into code-cleanup
Module Cleanup

* 'code-cleanup' of git://github.com/tombell/jekyll:
  Remove new lines between module and class
  Update tag classes moving into a module
  Update pagination classes moving into a module
  Update converter classes moving into a module
  Strip extra newlines
  Update command classes moving into a module

Conflicts:
	lib/jekyll/commands/serve.rb
2013-01-27 23:13:16 +01:00
Parker Moore b736676904 Merge pull request #775 from metamatt/issue773
Address issue 773 (bugs preventing tumblr.rb from running)
2013-01-27 14:06:41 -08:00
Parker Moore 409eedafd8 Merge pull request #767 from mojombo/string-categories
Force Categories to be Strings
2013-01-26 13:32:26 -08:00
Matt Ginzton c95c5e3b7d Use Dir.pwd instead of "." as the source argument to Post.new, since
this has historically supplied an absolute path in this call.
2013-01-25 15:57:45 -08:00
Parker Moore 4041579b70 Merge pull request #777 from mastahyeti/safe_yaml
Safe YAML
2013-01-25 08:22:10 -08:00
Jordon Bedwell 4f7881ba40 Add SVG support to Jekyll/Webrick. Fixes #406. 2013-01-25 06:20:07 +01:00
Ben Toews 1528cfe1cd adding safe_yaml to protect against object instantiation from yaml 2013-01-23 11:30:24 -06:00
Matt Ginzton fbc9d0c663 Fix truncation of overly long post names.
Delete the old truncate_post_name; it was called too late (if url rewriting
is enabled which it is by default), didn't run (it tried to use + to concat
a Fixnum onto a String), and even with those problems fixed, didn't actually
shorten the string enough to use as a pathname.

Instead, apply simple string truncation at the point we generate the slug,
which is used in the filename and is the part that could be unboundedly
long. I arbitrarily chose 200 as the maximum length; even shorter might be
better (really long slugs are just visually ugly); it might also be nicer
to truncate at a hyphen boundary.

This fixes the rest of issue #773 (subissue 4).
2013-01-22 10:25:07 -08:00
Matt Ginzton 863643c7e8 Look for _posts directory relative to cwd, not relative to tumblr.rb.
That's where we put it earlier, so that's where we'll find it now.

This addresses part of issue #773 (subissue 3).
2013-01-22 10:24:33 -08:00
scribu 0ad623fb85 first pass at --drafts flag 2013-01-20 05:23:56 +02:00
Tom Bell 517e6f81d3 Remove new lines between module and class 2013-01-20 00:00:49 +00:00
Tom Bell 2c45150545 Update tag classes moving into a module 2013-01-19 23:50:44 +00:00
Tom Bell 10d980b6e1 Update pagination classes moving into a module 2013-01-19 23:42:40 +00:00
Tom Bell 663a1321d2 Update converter classes moving into a module 2013-01-19 23:07:38 +00:00
Tom Bell 6514fe2d22 Strip extra newlines 2013-01-19 22:38:51 +00:00
Tom Bell e03f48085a Update command classes moving into a module 2013-01-19 22:36:46 +00:00
Parker Moore f231ef7644 Merge pull request #684 from mattr-/issue-680. 2013-01-18 10:28:14 -05:00
Parker Moore 2615291e6d Printing error message in WP.com migrator. #671. 2013-01-17 22:33:37 -05:00
Parker Moore 3bca5c3297 Merge pull request #671 from fzero/master
Rescue from import errors on Wordpress.com plugin.
2013-01-17 19:30:51 -08:00
Parker Moore cd05f6be78 Ensures that categories are Strings before escaping. Fixes #759. 2013-01-17 21:55:01 -05:00
Matt Rogers f460a6cf71 Merge branch 'master' into issue-653 2013-01-16 21:52:32 -06:00
Parker Moore faf5e44c47 Merge pull request #664 from Jashank/faster_lsi
faster_lsi: Massively accelerate LSI performance.
2013-01-16 18:36:01 -08:00
Parker Moore 2e76edd837 Merge pull request #496 from dunsmoreb/issue/481
Truncate post slugs when importing from Tumblr.
2013-01-16 18:34:21 -08:00
Parker Moore e383bfe65d Merge pull request #743 from mccxj/master
add glob support to include, exclude option
2013-01-12 22:16:07 -08:00
Parker Moore 5a3e05dbff Ensuring that layout is only set to the default value if layout is not specified 2013-01-12 15:31:14 -08:00
7rans e8c74fe7a8 Layouts default to page or post depending upon type. 2013-01-12 13:49:45 -08:00
Parker Moore 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
Tom Bell 7f072ed578 Merge branch 'master' 2013-01-12 01:18:41 +00:00
edeustace 0fa55418e9 merge lastest from mojombo/jekyll master 2013-01-11 12:23:53 +01:00
Jashank Jeremy 68333cd221 Slight stylistic tweak to LSI initialisation.
Recommended-by: parkr
2013-01-11 20:02:31 +11:00
mccxj 660e5e0e14 Merge remote-tracking branch 'jekyll/master' 2013-01-11 15:45:54 +08:00
mccxj 3cf29eeee2 add Enumerable#glob_include? 2013-01-11 15:33:11 +08:00
Parker Moore 6253f79de2 Added space between arguments in Convertible errors 2013-01-10 22:11:13 -08:00
Matt Rogers 151275d09e Add TomDoc 2013-01-10 21:53:21 -06:00
Matt Rogers 92eb926bf8 Look for plugins under the source directory by default 2013-01-10 21:24:28 -06:00
Matt Rogers f3f181484d Merge remote-tracking branch 'upstream/master' into issue-653 2013-01-10 20:41:32 -06:00
Tom Bell e210a0603f Revert "Remove migrators"
This reverts commit b9da30bc8f.
2013-01-11 00:30:17 +00:00
Eric Theise ba48870ead outputting full path when file does not parse 2013-01-10 12:29:04 -08:00
xiaojian cai b3e27f2c5d fixed a syntax error 2013-01-10 19:41:11 +08:00
xiaojian cai c627cd3519 use any? instead 2013-01-10 09:16:09 +08:00
Tom Bell b70b57cb89 Merge branch 'master' into 'jekyll-command-redux' 2013-01-09 23:40:27 +00:00
xiaojian cai 1e892678bc Update lib/jekyll/site.rb 2013-01-09 16:06:43 +08:00
edeustace 6eed91871f Changes based on @mojombo's feedback 2013-01-08 23:17:06 +01:00
xiaojian cai 44822a252e add regexp support for option 'include','exclude' 2013-01-06 21:23:31 +08:00
Tom Preston-Werner dd0e208daa Merge branch 'patch-1' of https://github.com/jlecour/jekyll into jlecour-patch-1 2013-01-03 22:26:09 -08:00
Tom Preston-Werner 4c70c036e7 TomDoc lib/jekyll/post.rb. 2013-01-03 22:20:42 -08:00
Tom Preston-Werner 9328a1a0dd Merge branch 'docs' of https://github.com/icco/jekyll into icco-docs 2013-01-03 22:06:50 -08:00
Tom Preston-Werner 72c8ceba4e Merge pull request #651 from alagu/master
Posterous importer update
2012-12-31 18:24:43 -08:00
stereobooster a5a6900948 fix error for case with broken encoding 2012-12-30 00:07:21 +02:00
stereobooster 2dbce8ca9f fix error for case with wrong encoding or error in YAML 2012-12-29 23:32:34 +02:00
Tom Preston-Werner c23302f4fa Merge branch 'deletion_protection' of https://github.com/jasonroelofs/jekyll into jasonroelofs-deletion_protection 2012-12-26 14:02:41 -07:00
Fabio Neves 12a19eaf3a Merge branch 'master' of git://github.com/mojombo/jekyll 2012-12-26 14:23:32 -05:00
Tom Preston-Werner d58a0c1088 Release 0.12.0 2012-12-22 16:46:30 -07:00
Tom Bell b9da30bc8f Remove migrators 2012-12-22 17:49:33 +00:00
Tom Bell a151a16f09 Remove command options from default config
Removing command line options from the config is a path towards cleaning up the
configuration file and not including options which don't really belong there.
2012-12-19 18:23:34 +00:00
Tom Bell b7944c5274 Add initial MigrateCommand
Not all migrators can actually be calld from the comand line. Some require
options which are not passed in and have to be called by other means.
2012-12-19 17:50:21 +00:00
Nat Welch 934495b272 Adds some random docs for stuff I saw while skimming the code. 2012-12-18 22:42:42 -08:00
Tom Bell dc139e2ac9 Update the sym->str key conversion 2012-12-18 22:13:17 +00:00
Tom Bell bd1c8fe760 Update Jekyll.configuration to convert symbol keys
Because Commander uses symbol keys in the options hash and I don't want to go
back backport every hash string key to symbols in Jekyll. 
2012-12-18 21:55:00 +00:00
Tom Bell 5b2e95b443 Add missing ] in self.watch string 2012-12-18 21:54:01 +00:00
Tom Bell d8f328b87c Update loop position so trap handler is used 2012-12-18 21:41:18 +00:00
Tom Bell 3b4feb41f0 Add initial serve command
The `ServeCommand` will let you serve your site locally for development. You
can specify `--port`, `--host` and `--baseurl` options if you wish to change the
defaults.

Additionally the `BuildCommand` will be called before the processing of the
serve command, this makes sure that the site is actually built. This means you
are able to pass the `--watch` option to auto-regenerate your site, even while
serving it locally.
2012-12-18 21:00:24 +00:00
Tom Bell 14766497c8 Add bin/jekyll2 and initial BuildCommand
The `BuildCommand` class is responsible for handling the building of the site.
It can also optionally watch for changes to files and regenerate the site if
needed.

The `Command` class holds any methods which are used by any command
implementation.
2012-12-18 20:34:09 +00:00
Tom Preston-Werner 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
Tom Preston-Werner 22f4b12836 Clean up default config spec. 2012-12-15 22:09:21 -08:00
Tom Preston-Werner 583f9e0019 Merge branch 'master' of https://github.com/Neil-Smithline/jekyll into Neil-Smithline-master 2012-12-15 16:42:26 -08:00
Tom Preston-Werner 26f8d60542 Merge branch 'master' of https://github.com/wbrady/jekyll into wbrady-master 2012-12-15 16:35:45 -08:00
edeustace 4bae42a671 use Array.join instead of Array.inject, add .svn to defaults 2012-12-09 11:43:49 +01:00
Matt Rogers 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
Tom Bell 38ac55381b Only pass first class to Pygments
This prevents an exception if something like the following is used:

~~~ {foo bar}
some code
~~~
2012-11-13 07:59:36 +00:00
Fabio Neves 20ac62d30e Making sure errors don't halt the import.
Wrapped file operations in a begin/rescue block.
2012-11-11 23:28:10 -05:00
Jashank Jeremy 85f2dfffa6 faster_lsi: Massively accelerate LSI performance.
Currently, Classifier::LSI rebuilds the index every time an entry is
added.  This runs into massive performance overheads on my website;
theoretically, disabling automatic index rebuilds, and explicitly
rebuilding the LSI index at the end of the LSI repopulation should
speed things up nicely.

As a side note, here, I use pandoc-ruby to provide a more featureful
Markdown transformer, so be mindful that the numbers I quote here have
artifically imposed I/O overheads.

With just the 76 posts I wrote this year (abysmal, I know), I come up
with the following figures:

    Without faster_lsi:
      jekyll --lsi  16.91s user 0.88s system 97% cpu 18.302 total
    With faster_lsi:
      jekyll --lsi  2.72s user 0.77s system 88% cpu 3.940 total

With 109 posts, we begin to see even better improvements:

    Without faster_lsi:
      jekyll --lsi  51.00s user 1.47s system 98% cpu 53.060 total
    With faster_lsi:
      jekyll --lsi  5.04s user 1.12s system 91% cpu 6.735 total

At this point, we begin to see I/O overheads being slower than LSI
when faster_lsi is active.  I call that fairly conclusive.  But wait,
there's more.  I have 273 posts lying around... I wonder what happens
if I feed them all in.  With faster_lsi, it was nice and clippy.
Without it, I simply gave up, and went and refilled my cup of tea.
And it was still going.

    Without faster_lsi:
      jekyll --lsi  1277.86s user 10.90s system 99% cpu 21:30.29 total
    With faster_lsi:
      jekyll --lsi  34.62s user 4.43s system 96% cpu 40.430 total

That is, in anyone's books, a major improvement.  Note, however, that
I don't know just how well this will perform with `jekyll --auto`
because I don't know how it does the LSI rebuilds.  I _think_ (but
please, don't commit me on this) that the LSI is rebuilt every time
Jekyll picks up a file change.

So, all up, the performance improvement is massive, and scales
depending on how many files you have.  At the last point, the
improvement is just on 3200%.

A more optimal solution would be to cache the LSI index and/or content
data somehow.  I'll leave that to when faster_lsi takes over ten
minutes to run.
2012-10-31 22:19:59 +11:00
Matt Rogers bab29f64f7 Look for plugins under the source directory
When generating the site, Jekyll will now look for plugins under the
source directory by default. The plugin location can still be changed in
_config.yml
2012-10-12 22:43:20 -05:00
Alagu 2726a5f27c Merge branch 'master' of git://github.com/mojombo/jekyll 2012-10-03 19:33:21 -07:00
edeustace 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
Will Brady 336ea66983 Better error reporting on Liquid exceptions 2012-08-14 17:35:41 -04:00
Tom Bell 7f706f47fc Update redcarpet support to version 2 2012-08-13 15:03:33 +01:00
hokaccha 3d2664d983 pygments options for pygments.rb 2012-08-09 00:34:44 +09:00
Neil-Smithline 3904fd9257 make yaml parsing errors more informative 2012-06-29 12:08:57 -04:00
Tom Preston-Werner ee402dd18a Merge branch 'switch-to-pygmentsrb' of https://github.com/tombell/jekyll into tombell-switch-to-pygmentsrb 2012-06-11 15:53:44 -07:00
Tom Preston-Werner 202894c196 Merge branch 'custom-layout-directory' of https://github.com/tombell/jekyll into tombell-custom-layout-directory
Conflicts:
	lib/jekyll/site.rb
2012-06-11 15:40:22 -07:00
Tom Preston-Werner 47090ffd2a Fix up a few TomDocs. 2012-06-06 11:59:49 -07:00
Tom Preston-Werner 0e9e7fbc85 Simplify Site#read_layouts. 2012-06-06 11:59:49 -07:00
Tom Bell b2a1d61c04 Swap out albino for pygments.rb 2012-05-31 15:51:34 -04:00
Tom Bell df2ad2ac59 Allow a custom 'layouts' directory
* Add 'layouts' option to change the dir from '_layouts' to anything relative
  to the source directory
* Add cucumber scenario for testing an alternative directory '_theme'
* Closes #563
2012-05-30 21:39:43 -04:00
Jonas Pfenniger 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
Luca Grulla 7d88f72409 avoiding to call site_payload one time per each post and page. Speed site creation up of a 20%. 2012-04-29 00:27:11 -07:00
Tom Preston-Werner 4533e60489 Merge branch 'master' of https://github.com/daneharrigan/jekyll into daneharrigan-master
Conflicts:
	lib/jekyll.rb
2012-04-23 16:48:18 -07:00
Tom Preston-Werner 8a0fbf02f5 Cleanup for RDiscount TOC support. Closes #333. 2012-04-23 16:15:55 -07:00
Michishige Kaito f5b2acf8cd Added support for inline TOCs with RDiscount 2012-04-23 15:56:28 -07:00
Tom Preston-Werner e29490c1c6 Allow setting of Kramdown smart_quotes. Fixes #482. 2012-04-23 15:34:54 -07:00
Fotos Georgiadis 4090500c5a Added path in url.
Page#dir was returning the wrong dir ('/') for pages in directories.
2012-04-09 03:08:41 +03:00
Jason Roelofs 604b60c9ba Add checks to prevent accidental deletion of the source directory 2012-04-03 22:05:18 -05:00
Jason Roelofs 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
Dane Harrigan 316cc8559c moved paginate_path to default config 2012-02-26 20:58:14 -08:00
Jérémy Lecour 41f2805b7f No need to have a variable assignment, especially if it has the same name as the method parameter. 2012-02-11 09:05:59 +01:00
dunsmoreb 5fb801474e Truncate post slugs when importing from Tumblr.
Fixes #481.
2012-02-01 06:44:01 -06:00
Tom Preston-Werner 4499df8033 Shorten plugin loading code and update history. 2012-01-29 12:49:57 -08:00
Tom Preston-Werner 02366ae5ff Merge branch 'PluginsAsArray' of https://github.com/simensen/jekyll into simensen-PluginsAsArray 2012-01-29 12:32:59 -08:00
Tom Preston-Werner 9d70088f01 Properly select dotfiles during directory scan.
Fixes #363.
Fixes #431.
Fixes #377.
2012-01-23 00:21:08 -08:00
Beau Simensen e6d89c6a0f More testing, whitespace and comment cleanup. 2012-01-22 22:17:25 -08:00
Beau Simensen dcf546275b Tweaked plugin directory handling, tests. 2012-01-22 22:10:12 -08:00
Beau Simensen 0284b8b22f Handle Posterous rate limiting 2012-01-22 20:58:56 -08:00
Beau Simensen 5d6e87bbf3 Merge remote-tracking branch 'origin/alagu-master' into alagu-posterous-importer-rebased
Conflict created due to #472.

Conflicts:
	lib/jekyll/migrators/posterous.rb
2012-01-22 19:35:25 -08:00
Tom Preston-Werner e27e2554d9 Merge pull request #472 from nfm/patch-1
Update Posterous migrator to take an api_token
2012-01-22 16:27:32 -08:00
Tom Preston-Werner 16a4855200 Merge branch 'post_url' of https://github.com/thatguystone/jekyll into thatguystone-post_url 2012-01-22 16:03:10 -08:00
Tom Preston-Werner c04a9549ea Make note of self.name requirement for Convertible. 2012-01-22 15:02:41 -08:00
Tom Preston-Werner 3c2519f07d Merge pull request #419 from vjt/master
Exception handler in Convertible references nonexisting method .name
2012-01-22 00:25:55 -08:00
Tom Preston-Werner 613a7a46a3 Merge pull request #460 from kendagriff/master
RSS Migrator
2012-01-22 00:20:33 -08:00
Tom Preston-Werner 8adfaea339 Merge pull request #426 from joshbrown/master
Added a Joomla migrator
2012-01-22 00:19:35 -08:00
Tom Preston-Werner 22159b3d61 Merge pull request #368 from jacius/wordpress
Greatly improved and extended the wordpress.rb migrator.
2012-01-22 00:18:33 -08:00
Tom Preston-Werner 1292c02ec0 Merge pull request #384 from voxpelli/drupal-alias-redirect
Added redirects for Drupal posts' URL-aliases
2012-01-21 20:04:40 -08:00
Tom Preston-Werner 6e921c5852 Merge pull request #383 from voxpelli/drupal-db-prefix
Added table prefix option to Drupal migration
2012-01-21 20:03:09 -08:00
Tom Preston-Werner 574e933d81 Merge branch 'master' of https://github.com/jpravetz/jekyll into jpravetz-master 2012-01-21 19:59:05 -08:00
Tom Preston-Werner d36a1064a7 Merge pull request #437 from stephenmcd/master
Improved Tumblr Support
2012-01-21 19:54:00 -08:00
Tom Preston-Werner d00bc8e8fe Merge branch 'master' of https://github.com/tmtk75/jekyll into tmtk75-master 2012-01-21 19:49:08 -08:00
Tom Preston-Werner c797d420c4 Merge branch 'patch-1' of https://github.com/hypertexthero/jekyll into hypertexthero-patch-1 2012-01-21 19:45:24 -08:00
Tom Preston-Werner 03ad973523 Update history. 2012-01-21 19:43:32 -08:00
Tom Preston-Werner 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
Nicholas Firth-McCoy 19fc8cb488 Oops, still need email and pass. Update usage comment 2012-01-18 11:08:02 +11:00
Nicholas Firth-McCoy c3b12457a0 Update Posterous migrator to take an api_token instead of email and pass
The Posterous API call for retrieving a user's API token (`/api/2/auth/token`) is no longer supported and returns 410 GONE. This patch updates the #process method to accept an API token instead of an email address and password. A user's API token can be retrieved from http://posterous.com/api.
2012-01-18 10:55:58 +11:00
Tom Preston-Werner d0d143452a Merge branch 'master' of https://github.com/laumann/jekyll 2012-01-15 20:39:55 -08:00
Tom Preston-Werner c14eb346a3 Allow [+.#-] in highlight lang shortnames. Fixes #282. 2012-01-15 20:35:09 -08:00
Tom Preston-Werner 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
Stephen McDonald f2502dfab2 Added handling for Tumblr missing image extensions. 2011-12-30 23:25:09 +11:00
Stephen McDonald c26bd30318 Fix photo link URL. 2011-12-29 11:58:11 +11:00
Stephen McDonald bab178d9f8 Strip HTML from any caption-based titles. 2011-12-29 11:37:46 +11:00
Stephen McDonald 743e01f231 Fixed a change in Tumblr's API whereby photos no longer have a single URL field. 2011-12-29 11:37:06 +11:00
Tom Preston-Werner b66840ca46 Release 0.11.2 2011-12-27 17:53:50 -07:00
Tom Preston-Werner 4ece77300b Gah, did not commit these for v0.11.1 version release. 2011-12-27 17:48:00 -07:00
Stephen McDonald 3ab7658d1f Fixed Tumblr URL redirects. 2011-12-28 08:16:19 +11:00
Stephen McDonald 886b9740f2 Fixed grab_images handling. 2011-12-27 10:09:59 +11:00
Kendall Buchanan 9523c3990e Adding migrator for RSS feeds. 2011-12-22 12:33:15 -07:00
Simon Griffee 06d9446ade Added missing <code>require 'yaml'</code>, without which the TextPattern migrator script was failing. 2011-12-04 23:35:36 +01:00
jpravetz 9a3429dc74 Update lib/jekyll/convertible.rb 2011-12-04 08:37:42 -08:00
Stephen McDonald 0f51c81cfa Added support for rewriting Tumblr URLs to Jekyll URLs in posts, meta redirects for Github pages, and automatic addition of Pygments highlight tags. 2011-12-04 12:01:37 +11:00
Thomas Laumann 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
Tomotaka Sakuma 76fa7f016b Fix an issue NoMethodError happens in case number of files under _posts is less than limit_posts. 2011-11-28 16:32:20 +09:00
Tom Preston-Werner 1da88bb30a Update and clarify dependencies. 2011-11-26 18:48:51 -08:00
Beau Simensen 840b0c14ae YAML front matter fix, cleaned up slug generation, added tags and store some posterous information from the original post. 2011-11-25 19:06:16 -06:00
Stephen McDonald bc20ba9be9 Preserve HTML tables as per markdown's support for tables. 2011-11-25 06:11:09 +11:00
Stephen McDonald ab85c82356 Use Tumblr's JSON format instead of XML, to correctly preserve white-space when converting to markdown. 2011-11-24 06:11:57 +11:00
Beau Simensen ab08acace9 Support plugins being a list of directories to scan. 2011-11-21 21:09:39 -06:00
Stephen McDonald 1b3abb61d8 Clean up extraneous newlines left by html2text. 2011-11-21 05:49:49 +11:00
Stephen McDonald b762a1d5c5 Add a format option for converting posts to markdown via Python's html2text. 2011-11-20 22:15:36 +11:00
Stephen McDonald 87316894cc Quote the post's title so reserved yaml chars don't blow up. 2011-11-20 22:13:01 +11:00
Stephen McDonald 6826317e00 Use the post's title for the filename rather than its ID, as per Jekyll's naming convention. 2011-11-20 22:09:43 +11:00
Stephen McDonald 06f5b7d2e3 Fixed cgi module name. 2011-11-20 22:07:56 +11:00
Thomas Laumann ab3927499f Forgot to remove debugging code :-/ 2011-11-04 17:41:47 +01:00
Thomas Laumann 8c4edb655e Have TextileConverter pass any arguments set to true in config's redcloth section to RedCloth constructor as an array of symbols.
This means explicitly setting (for example):

  redcloth:
    hard_breaks: false
    lite_mode: true
    no_span_caps: true

will cause RedCloth to be invoked thusly:

  RedCloth.new(content, [:lite_mode, :no_span_caps])

(Notice that hard_breaks is ignored.) This means, however, anything set to true in the redcloth section in _config.yml _will_ be passed to RedCloth. Mayhem may ensue.
2011-11-04 17:33:53 +01:00
Carl Groner 69e7f4abef Add test cases for default values with no explicit config. for `hard_breaks`. 2011-11-03 11:54:49 -07:00
Thomas Laumann a78f86f1ac Merge github.com:mojombo/jekyll 2011-11-03 11:47:47 +01:00
Josh Brown bb37858e67 Added a sweet Joomla 1.5 migrator 2011-10-24 14:09:22 -04:00
Marcello Barnaba f0f99eae8a Fix exception thrown in exception handler at convertible.rb:81 2011-10-18 23:05:39 +02:00
Peter Wagenet 4a9094f2d4 Fix non-pygments code highlighting 2011-09-26 23:47:04 -07:00
Seth Ladd e09f058a06 add page variable to liquid custom tags and blocks. thx to mike west for the patch 2011-09-20 13:03:31 -07:00
Alagu ddd5dbb5fb Change to new posterous API 2011-09-16 15:31:01 -07:00
Pelle Wessman 2ce0eb00e7 Added redirects for Drupal posts' URL-aliases 2011-08-08 16:19:02 +02:00
Pelle Wessman e8f604b5ae Added table prefix option to Drupal migration
It's good practice in the Drupal community to always prefix the tables with something so that if you ever need to host two sites in the same database then you will easily know which tables belongs to which site.

This commit adds an option to the Drupal migration scripts that makes it possible to add such a prefix to the migration query.
2011-08-08 15:22:25 +02:00
Andrew Stone 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
John Croisant 1b2b5ff278 Greatly improved and extended the wordpress.rb migrator.
* It can now export comments, categories, and tags.
* It can convert non-ASCII chars into HTML entities.
* It can export published, draft, private, and/or revision posts.
* It can process "<!-- more -->" tags to automatically generate
  a post excerpt and #anchors.

Read the big documentation comment for all the available options.
2011-07-17 17:00:55 -05:00
Tom Preston-Werner 72b7b1f056 Release 0.11.0 2011-07-10 15:14:25 -07:00
Laurent Arnoud 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
Thomas Laumann ed7f914459 removed unused code 2011-07-07 11:29:40 +02:00
Thomas Laumann 0aab73e156 Merge https://github.com/mojombo/jekyll 2011-07-07 11:14:32 +02:00
Tom Preston-Werner 3241d882b5 Merge remote-tracking branch 'kou/fix-error-message' 2011-07-05 22:31:25 -07:00
Tom Preston-Werner 3c94ff3480 Merge remote-tracking branch 'richbecks/master' 2011-07-05 22:25:51 -07:00
Richard Jones 00a0d14702 Tidied up indentation 2011-07-04 05:09:50 -07:00
Richard Jones 8c35cc957b Create import_hash with .new(0) so that we don't have to check if
a hash exists before incrementing it.
2011-07-04 04:59:40 -07:00
Matt Palmer eebeaf5dfb Give name of file that generated YAML exception message
It's not much good saying "hey, there was a problem" if you don't know where
the problem *is*.  Hunting through several hundred YAML files is no fun.
2011-07-02 10:35:41 +10:00
Thomas Laumann fccb6c7f74 Merge git://github.com/mojombo/jekyll 2011-06-29 12:07:21 +02:00
Richard Jones eb6a2b9bd0 Now creates _<directory> for each post type (e.g. _posts, _pages, _attachments) 2011-06-28 07:21:45 -07:00
Richard Jones 29c4808f2a Drafts are now marked as published:false 2011-06-28 06:31:03 -07:00
Richard Jones 3389c6d508 Sometimes wp:post_name can be empty (e.g. when a post is still draft), in this case we make up an appropriate permalink_title that will be used as the filename. The importer can always rename the file later on, and at least the file is unlikely to have been overwritten by another draft on the same day. 2011-06-28 02:31:42 -07:00
Richard Jones 365f57e8b3 Added meta tag import goodness. This for instance allows you to preserve all your hard-worked on WP SEO keywords, images, alternative images and other yummy-ness.
Replaced PubDate with wp:post_date, this is better than PubDate since some of the posts you import could be a draft (in this case the pubDate is invalid and contains a non-sensical value).
Added wp:status so we now know whether the post is published, draft or in the trash.
Added wp:post_type so we differentiate between posts and image or other post types
2011-06-28 02:05:51 -07:00
Kouhei Sutou 70aaded1e9 fix path name in syntax error message. 2011-06-20 22:46:38 +09:00
Dane Harrigan 2b8017dfdc can now set a custom pagination location with pagination_path 2011-06-05 14:57:53 -04:00
Lee Jarvis 6a756881f9 clean up some warnings 2011-06-03 23:38:39 +01:00
Tom Preston-Werner 851172b5ef Replace rdiscount filter with config-aware markdownify. 2011-05-31 14:40:21 -07:00
Tom Preston-Werner cae0eaf19c Merge remote-tracking branch 'mjschultz/master'
Conflicts:
	lib/jekyll/filters.rb
2011-05-30 12:27:11 -07:00
Tom Preston-Werner da9930657e Merge remote-tracking branch 'derekprior/configurable_coverter_file_extensions' 2011-05-30 11:38:59 -07:00
Tom Preston-Werner 13f1cf5832 Merge pull request #328 from shoaibkamil/master
Bugfix in tumblr importer
2011-05-30 11:22:23 -07:00
Tom Preston-Werner 5568e5698c Merge remote-tracking branch 'vazexqi/patch-1' 2011-05-30 11:20:29 -07:00
Tom Preston-Werner 56ddf6a3c8 Merge branch 'next' 2011-05-29 22:46:10 -07:00
Tom Preston-Werner 2ad0fbc8ff Merge remote-tracking branch 'MattHall/redcarpet' 2011-05-29 21:38:34 -07:00
Aman Gupta 22585d4b7f avoid infinite recursion while rendering layouts 2011-05-23 17:23:21 -04:00
Nicholas Chen 5788ca88f8 Changed [:state] check RE and required YAML
1) The published state is actually stored as "published" in the database but the regular expression checks for "Published" and thus will actually skip all published posts.

2) The to_yaml method is not immediately available without the "require 'yaml'" directive. This caused the migration script to fail while executing it following the instructions. 

Tested with Typo 5.3
2011-05-14 10:09:59 -07:00
shoaibkamil 1f4dd4ed61 Fixed bug in "conversation" importing where <section> and <dialog> tags were not being closed. 2011-05-11 22:06:53 -07:00
Thomas Laumann 20d1bd1f10 Merge https://github.com/mojombo/jekyll 2011-05-09 12:01:17 +02:00
Tom Preston-Werner f808c98232 Clean up Enki importer and update History. 2011-05-09 00:59:40 -07:00
Tom Preston-Werner 0dc55aacff Merge remote-tracking branch 'rodrigopinto/master' 2011-05-09 00:55:55 -07:00
Tom Preston-Werner b86bc97c5f Clean up Tumblr importer and update History. 2011-05-09 00:54:26 -07:00
Tom Preston-Werner 9cc9c233d0 Merge remote-tracking branch 'tonycosentini/master' 2011-05-09 00:41:07 -07:00
Tom Preston-Werner 0ce425443f Better Pager.calculate_pages implementation. 2011-05-08 23:44:20 -07:00
Tom Preston-Werner 82bd83fe7f More TomDoc and formatting cleanup. 2011-05-08 23:40:35 -07:00
Tom Preston-Werner aa0d82fa96 Clean up migrators formatting. 2011-05-08 15:08:53 -07:00
Tom Preston-Werner a428acec1c TomDoc some things. 2011-05-08 14:49:19 -07:00
Tony Cosentini e12cbdbea2 Added Tumblr migrator. 2011-05-02 14:31:01 -04:00
Rodrigo Pinto 55f42d26be adding enki migrator 2011-04-28 21:28:13 -03:00
MattHall cf779b2760 Added Redcarpet for MD conversion 2011-04-20 10:04:42 +01:00
Derek Prior d2377b2581 Fixed mistake in default markdown extensions 2011-04-12 17:30:56 -04:00
Derek Prior 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
Thomas Laumann 3f889ef077 added test case to hard_breaks (disable/enable in _config.yml) 2011-03-23 18:17:14 +01:00
Tom Preston-Werner dce4ccc5a4 Better error message for invalid post date. 2011-03-11 17:52:25 -08:00
Tom Preston-Werner 6c94db1486 TomDoc convertible.rb. 2011-03-11 16:00:32 -08:00
Tom Preston-Werner 68eaadd13a Merge remote-tracking branch 'MattHall/cli' into test 2011-03-10 23:01:18 -08:00
Tom Preston-Werner 01a90904e2 Merge remote-tracking branch 'phatblat/master' into test 2011-03-10 22:51:58 -08:00
Tom Preston-Werner d2814cf750 Merge remote-tracking branch 'elia/master' into devel 2011-03-10 22:38:17 -08:00
Tom Preston-Werner f58a821e20 Merge remote-tracking branch 'MattHall/posterous' into devel 2011-03-10 21:20:38 -08:00
Tom Preston-Werner a31780a1ec Move require to jekyll.rb and update history. 2011-03-10 21:15:29 -08:00
Tom Preston-Werner 5f4dfe388f Merge remote-tracking branch 'zenspider/master' into devel 2011-03-10 21:10:18 -08:00
Aman Gupta 13cc44fb12 sanitize urls and ignore symlinks 2011-03-10 20:14:38 -08:00
Aman Gupta be8b7715d3 speed up cleanup 2011-03-10 20:11:45 -08:00
Aman Gupta 08725eb234 use the new albino gem 2011-03-06 01:57:08 -08:00
Michael J Schultz 9e3ad69922 - added rdiscount filter for templating system (like the textilize filter, but for markdown) 2011-03-03 08:14:52 -06:00
Ryan Davis bd01e647a7 Cleaned up unnecessary string munging 2011-03-02 00:24:17 -08:00
laumann 3468f0a2c3 expanded config yaml to allow setting hard_breaks=false on RedCloth, modified textile converter to take this option into account 2011-02-09 01:37:30 +01:00
Elia Schito 034b06431e Remove double directory creation. 2011-01-27 13:13:12 +01:00
Elia Schito c70dac3cee Take permalink name directly from worpress export file. 2011-01-27 13:12:08 +01:00
Elia Schito ca48ea91e6 Merged wordpress.com migrator fix from 'heuripedes/jekyll' 2011-01-27 12:14:22 +01:00
Elia Schito f68bbcbe8d The Wordpress.com migrator now works and gathers categories as tags. 2011-01-27 02:12:42 -08:00
Ben Chatelain d61c1e930a Fix compile error by making QUERY lowercase (local instead of const) 2011-01-23 15:30:41 -07:00
Ben Chatelain bc3771aa22 Change TABLE_PREFIX from class member to 4th parameter of process method (now lowercase)
Move QUERY into process method
2011-01-23 15:25:33 -07:00
Ben Chatelain e902bb9c30 Change TABLE_PREFIX back to default 2011-01-23 15:21:29 -07:00
Ben Chatelain 42f63f919f Add Jekyll::WordPress.TABLE_PREFIX and inclusion in QUERY 2011-01-23 15:19:26 -07:00
Jeff Hodges b3634b522a adding date to wordpress migrator 2011-01-12 19:37:38 -08:00
lukebayes 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
Matt Hall 84c1a72443 Updating CLI for importing 2010-12-19 17:38:14 +00:00
Matt Hall c1f0e070c9 Adding Posterous Importer 2010-12-19 16:27:22 +00:00
Tom Preston-Werner 13df722073 Release 0.10.0 2010-12-16 16:29:48 -08:00
Tom Preston-Werner a8a837cc8e Release 0.9.0 2010-12-15 15:36:15 -08:00
Higor Eurípedes 9e0eb75170 updated/fixed wordpress.com migration script 2010-12-15 15:44:01 -03:00
Tom Preston-Werner 36b1f8f9b1 Add Marley migrator. Closes #28. 2010-12-14 15:12:12 -08:00
Tom Preston-Werner c1ed790534 Merge remote branch 'sos4nt/remove-orphaned-files' 2010-12-13 21:18:21 -08:00
Tom Preston-Werner 9bd48752e6 Merge remote branch 'MattHall/master' 2010-12-13 21:12:21 -08:00
MattHall 226c7cc121 Rescue exception when parsing invalid yaml. Prevents silent fail in auto and server mode 2010-12-11 14:30:44 +00:00
MattHall 0a58d78338 Catch Liquid template exceptions, and write out their details. Prevents silent fail of template parsing 2010-12-11 14:23:12 +00:00
Stefan Schüßler 5b680f8dd8 remove orphaned files in destination 2010-12-01 18:04:50 +01:00
Matt Di Pasquale e8fd7ebbc3 Add Drupal migrator 2010-11-30 17:11:23 -05:00
Tom Preston-Werner 31901ee15b Release 0.8.0 2010-11-22 23:08:56 -08:00
Tom Preston-Werner 3ab016870d Prevent _includes dir from being a symlink. 2010-11-22 21:45:35 -08:00
Tom Preston-Werner 61acd47ed2 Merge remote branch 'jasongraham/kramdown-support' 2010-11-22 19:26:58 -08:00
Jason Graham dca30c3ad1 Add kramdown's support for coderay
- no test added so that coderay isn't added to list of developer
    dependencies
2010-11-20 17:46:16 -08:00
Jason Graham 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
Jason Graham ac7a0cc95f Add Kramdown support and tests 2010-11-20 17:40:27 -08:00
Tom Preston-Werner 53b999418c Merge remote branch 'stmpjmpr/master' 2010-11-20 11:37:22 -06:00
Scott Hill 00146909f9 Merge remote branch 'remotes/mojombo/master' 2010-11-19 02:38:50 -08:00
Scott Hill a556e4f29e Swapping a '-' for the word separator for imported entries since that's the MT style, and I don't want to break existing permalinks. 2010-11-19 02:36:56 -08:00
Tomasz Stachewicz 9396c9d04c migrators now open Sequel connection to mysql with utf8 encoding. Closes GH-220 2010-11-18 18:14:08 +01:00
Tom Preston-Werner f7ab019a39 Merge remote branch 'claco/uri-escape' 2010-11-17 15:30:34 -06:00
Tom Preston-Werner 054b796b9f Merge remote branch 'cblunt/limit_posts' 2010-11-17 14:56:32 -06:00
Tom Preston-Werner c1a7662311 Merge remote branch 'lpenz/master'
Conflicts:
	History.txt
2010-11-17 12:35:29 -06:00
Christopher H. Laco 4c08643c50 Added uri_escape for cases where cgi_escape isn't appropriate 2010-11-12 11:15:30 -05:00
cblunt 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
Leandro Lisboa Penz 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
Matt Hall b6678d4e43 Added Wordpress.com migrator 2010-09-02 13:36:31 +01:00
Tom Preston-Werner 3fa9af17fa Release 0.7.0 2010-08-24 15:35:18 -07:00
Tom Preston-Werner 391d1a9677 Merge remote branch 'ctrochalakis/rdiscount_extensions' 2010-08-24 15:19:47 -07:00