Permalink
Browse files

git merge mojombo/master

  • Loading branch information...
2 parents 8405d30 + 6932a40 commit 46a95bc0360355e4abaa37c0b1722d3a6ad33edd @christianhellsten christianhellsten committed Jun 22, 2010
Showing with 1,684 additions and 649 deletions.
  1. +112 −30 History.txt
  2. +21 −0 LICENSE
  3. +14 −15 README.textile
  4. +119 −51 Rakefile
  5. +0 −4 VERSION.yml
  6. +20 −1 bin/jekyll
  7. +1 −0 cucumber.yml
  8. +49 −1 features/create_sites.feature
  9. +3 −3 features/embed_filters.feature
  10. +30 −0 features/markdown.feature
  11. +12 −25 features/pagination.feature
  12. +18 −18 features/post_data.feature
  13. +41 −1 features/site_configuration.feature
  14. +20 −11 features/step_definitions/jekyll_steps.rb
  15. +120 −128 jekyll.gemspec
  16. +39 −19 lib/jekyll.rb
  17. +5 −7 lib/jekyll/albino.rb
  18. +43 −0 lib/jekyll/converter.rb
  19. +22 −0 lib/jekyll/converters/identity.rb
  20. +69 −0 lib/jekyll/converters/markdown.rb
  21. +23 −0 lib/jekyll/converters/textile.rb
  22. +23 −25 lib/jekyll/convertible.rb
  23. +22 −0 lib/jekyll/core_ext.rb
  24. +7 −0 lib/jekyll/generator.rb
  25. +87 −0 lib/jekyll/generators/pagination.rb
  26. 0 lib/jekyll/{converters → migrators}/csv.rb
  27. 0 lib/jekyll/{converters → migrators}/mephisto.rb
  28. 0 lib/jekyll/{converters → migrators}/mt.rb
  29. 0 lib/jekyll/{converters → migrators}/textpattern.rb
  30. 0 lib/jekyll/{converters → migrators}/typo.rb
  31. +1 −0 lib/jekyll/{converters → migrators}/wordpress.rb
  32. +33 −12 lib/jekyll/page.rb
  33. +0 −45 lib/jekyll/pager.rb
  34. +76 −0 lib/jekyll/plugin.rb
  35. +22 −32 lib/jekyll/post.rb
  36. +93 −127 lib/jekyll/site.rb
  37. +76 −0 lib/jekyll/static_file.rb
  38. +28 −12 lib/jekyll/tags/highlight.rb
  39. +1 −1 test/helper.rb
  40. +7 −0 test/source/_posts/2009-01-27-empty-categories.textile
  41. +7 −0 test/source/_posts/2009-01-27-empty-category.textile
  42. +6 −0 test/source/_posts/2009-05-18-empty-tag.textile
  43. +6 −0 test/source/_posts/2009-05-18-empty-tags.textile
  44. +5 −0 test/source/_posts/2010-01-08-triple-dash.markdown
  45. +7 −0 test/source/_posts/2010-01-09-date-override.textile
  46. +7 −0 test/source/_posts/2010-01-09-time-override.textile
  47. +7 −0 test/source/_posts/2010-01-09-timezone-override.textile
  48. +4 −0 test/source/_posts/2010-01-16-override-data.textile
  49. +27 −18 test/source/sitemap.xml
  50. +5 −5 test/test_configuration.rb
  51. +66 −0 test/test_core_ext.rb
  52. +4 −0 test/test_generated_site.rb
  53. +92 −26 test/test_pager.rb
  54. +108 −14 test/test_post.rb
  55. +68 −2 test/test_site.rb
  56. +8 −16 test/test_tags.rb
View
@@ -1,60 +1,133 @@
+== Edge
+ * Major Enhancements
+ * Proper plugin system (#19, #100)
+ * Add safe mode so unsafe converters/generators can be added
+ * Minor Enhancements
+ * Inclusion/exclusion of future dated posts (#59)
+ * Generation for a specific time (#59)
+ * Allocate site.time on render not per site_payload invocation (#59)
+ * Pages now present in the site payload and can be used through the
+ site.pages and site.html_pages variables
+ * Generate phase added to site#process and pagination is now a generator
+ * Switch to RakeGem for build/test process
+ * Only regenerate static files when they have changed (#142)
+ * Allow arbitrary options to Pygments (#31)
+ * Bug Fixes
+ * Render highlighted code for non markdown/textile pages (#116)
+ * Expand source to full path so includes work anywhere (#101)
+ * Fix highlighting on Ruby 1.9 (#65)
+ * Fix extension munging when pretty permalinks are enabled (#64)
+ * Stop sorting categories (#33)
+ * Preserve generated attributes over front matter (#119)
+
+== 0.5.7 / 2010-01-12
+ * Minor Enhancements
+ * Allow overriding of post date in the front matter (#62, #38)
+ * Bug Fixes
+ * Categories isn't always an array (#73)
+ * Empty tags causes error in read_posts (#84)
+ * Fix pagination to adhere to read/render/write paradigm
+ * Test Enhancement
+ * cucumber features no longer use site.ports.first where a better
+ alternative is available
+
+== 0.5.6 / 2010-01-08
+ * Bug Fixes
+ * Require redcloth >= 4.2.1 in tests (#92)
+ * Don't break on triple dashes in yaml frontmatter (#93)
+ * Minor Enhancements
+ * Allow .mkd as markdown extension
+ * Use $stdout/err instead of constants (#99)
+ * Properly wrap code blocks (#91)
+ * Add javascript mime type for webrick (#98)
+
+== 0.5.5 / 2010-01-08
+ * Bug Fixes
+ * Fix pagination % 0 bug (#78)
+ * Ensure all posts are processed first (#71)
+
+== NOTE
+ * After this point I will no longer be giving credit in the history;
+ that is what the commit log is for.
+
== 0.5.4 / 2009-08-23
* Bug Fixes
* Do not allow symlinks (security vulnerability)
== 0.5.3 / 2009-07-14
* Bug Fixes
- * Solving the permalink bug where non-html files wouldn't work [github.com/jeffrydegrande]
+ * Solving the permalink bug where non-html files wouldn't work
+ [github.com/jeffrydegrande]
== 0.5.2 / 2009-06-24
* Enhancements
- * Added --paginate option to the executable along with a paginator object for the payload [github.com/calavera]
- * Upgraded RedCloth to 4.2.1, which makes <notextile> tags work once again.
- * Configuration options set in config.yml are now available through the site payload [github.com/vilcans]
- * Posts can now have an empty YAML front matter or none at all [github.com/bahuvrihi]
+ * Added --paginate option to the executable along with a paginator object
+ for the payload [github.com/calavera]
+ * Upgraded RedCloth to 4.2.1, which makes <notextile> tags work once
+ again.
+ * Configuration options set in config.yml are now available through the
+ site payload [github.com/vilcans]
+ * Posts can now have an empty YAML front matter or none at all
+ [github.com/bahuvrihi]
* Bug Fixes
- * Fixing Ruby 1.9 issue that requires to_s on the err object [github.com/Chrononaut]
+ * Fixing Ruby 1.9 issue that requires to_s on the err object
+ [github.com/Chrononaut]
* Fixes for pagination and ordering posts on the same day [github.com/ujh]
- * Made pages respect permalinks style and permalinks in yml front matter [github.com/eugenebolshakov]
- * Index.html file should always have index.html permalink [github.com/eugenebolshakov]
- * Added trailing slash to pretty permalink style so Apache is happy [github.com/eugenebolshakov]
- * Bad markdown processor in config fails sooner and with better message [github.com/gcnovus]
+ * Made pages respect permalinks style and permalinks in yml front matter
+ [github.com/eugenebolshakov]
+ * Index.html file should always have index.html permalink
+ [github.com/eugenebolshakov]
+ * Added trailing slash to pretty permalink style so Apache is happy
+ [github.com/eugenebolshakov]
+ * Bad markdown processor in config fails sooner and with better message
+ [github.com/gcnovus]
* Allow CRLFs in yaml frontmatter [github.com/juretta]
* Added Date#xmlschema for Ruby versions < 1.9
== 0.5.1 / 2009-05-06
* Major Enhancements
- * Next/previous posts in site payload [github.com/pantulis, github.com/tomo]
+ * Next/previous posts in site payload [github.com/pantulis,
+ github.com/tomo]
* Permalink templating system
* Moved most of the README out to the GitHub wiki
- * Exclude option in configuration so specified files won't be brought over with generated site [github.com/duritong]
+ * Exclude option in configuration so specified files won't be brought over
+ with generated site [github.com/duritong]
* Bug Fixes
* Making sure config.yaml references are all gone, using only config.yml
* Fixed syntax highlighting breaking for UTF-8 code [github.com/henrik]
- * Worked around RDiscount bug that prevents Markdown from getting parsed after highlight [github.com/henrik]
+ * Worked around RDiscount bug that prevents Markdown from getting parsed
+ after highlight [github.com/henrik]
* CGI escaped post titles [github.com/Chrononaut]
== 0.5.0 / 2009-04-07
* Minor Enhancements
* Ability to set post categories via YAML [github.com/qrush]
- * Ability to set prevent a post from publishing via YAML [github.com/qrush]
+ * Ability to set prevent a post from publishing via YAML
+ [github.com/qrush]
* Add textilize filter [github.com/willcodeforfoo]
- * Add 'pretty' permalink style for wordpress-like urls [github.com/dysinger]
- * Made it possible to enter categories from YAML as an array [github.com/Chrononaut]
+ * Add 'pretty' permalink style for wordpress-like urls
+ [github.com/dysinger]
+ * Made it possible to enter categories from YAML as an array
+ [github.com/Chrononaut]
* Ignore Emacs autosave files [github.com/Chrononaut]
* Bug Fixes
- * Use block syntax of popen4 to ensure that subprocesses are properly disposed [github.com/jqr]
+ * Use block syntax of popen4 to ensure that subprocesses are properly
+ disposed [github.com/jqr]
* Close open4 streams to prevent zombies [github.com/rtomayko]
* Only query required fields from the WP Database [github.com/ariejan]
- * Prevent _posts from being copied to the destination directory [github.com/bdimcheff]
+ * Prevent _posts from being copied to the destination directory
+ [github.com/bdimcheff]
* Refactors
* Factored the filtering code into a method [github.com/Chrononaut]
- * Fix tests and convert to Shoulda [github.com/qrush, github.com/technicalpickles]
- * Add Cucumber acceptance test suite [github.com/qrush, github.com/technicalpickles]
+ * Fix tests and convert to Shoulda [github.com/qrush,
+ github.com/technicalpickles]
+ * Add Cucumber acceptance test suite [github.com/qrush,
+ github.com/technicalpickles]
== 0.4.1
* Minor Enhancements
- * Changed date format on wordpress converter (zeropadding) [github.com/dysinger]
+ * Changed date format on wordpress converter (zeropadding)
+ [github.com/dysinger]
* Bug Fixes
* Add jekyll binary as executable to gemspec [github.com/dysinger]
@@ -67,28 +140,35 @@
* Add array_to_sentence_string filter [github.com/mchung]
* Add a converter for textpattern [github.com/PerfectlyNormal]
* Add a working Mephisto / MySQL converter [github.com/ivey]
- * Allowing .htaccess files to be copied over into the generated site [github.com/briandoll]
+ * Allowing .htaccess files to be copied over into the generated site
+ [github.com/briandoll]
* Add option to not put file date in permalink URL [github.com/mreid]
* Add line number capabilities to highlight blocks [github.com/jcon]
* Bug Fixes
* Fix permalink behavior [github.com/cavalle]
- * Fixed an issue with pygments, markdown, and newlines [github.com/zpinter]
+ * Fixed an issue with pygments, markdown, and newlines
+ [github.com/zpinter]
* Ampersands need to be escaped [github.com/pufuwozu, github.com/ap]
* Test and fix the site.categories hash [github.com/zzot]
* Fix site payload available to files [github.com/matrix9180]
== 0.3.0 / 2008-12-24
* Major Enhancements
- * Added --server option to start a simple WEBrick server on destination directory [github.com/johnreilly and github.com/mchung]
+ * Added --server option to start a simple WEBrick server on destination
+ directory [github.com/johnreilly and github.com/mchung]
* Minor Enhancements
- * Added post categories based on directories containing _posts [github.com/mreid]
+ * Added post categories based on directories containing _posts
+ [github.com/mreid]
* Added post topics based on directories underneath _posts
* Added new date filter that shows the full month name [github.com/mreid]
- * Merge Post's YAML front matter into its to_liquid payload [github.com/remi]
+ * Merge Post's YAML front matter into its to_liquid payload
+ [github.com/remi]
* Restrict includes to regular files underneath _includes
* Bug Fixes
- * Change YAML delimiter matcher so as to not chew up 2nd level markdown headers [github.com/mreid]
- * Fix bug that meant page data (such as the date) was not available in templates [github.com/mreid]
+ * Change YAML delimiter matcher so as to not chew up 2nd level markdown
+ headers [github.com/mreid]
+ * Fix bug that meant page data (such as the date) was not available in
+ templates [github.com/mreid]
* Properly reject directories in _layouts
== 0.2.1 / 2008-12-15
@@ -111,9 +191,11 @@
* Code highlighting with Pygments if --pygments is specified
* Disable true LSI by default, enable with --lsi
* Minor Enhancements
- * Output informative message if RDiscount is not available [github.com/JackDanger]
+ * Output informative message if RDiscount is not available
+ [github.com/JackDanger]
* Bug Fixes
- * Prevent Jekyll from picking up the output directory as a source [github.com/JackDanger]
+ * Prevent Jekyll from picking up the output directory as a source
+ [github.com/JackDanger]
* Skip related_posts when there is only one post [github.com/JackDanger]
== 0.1.4 / 2008-12-08
View
21 LICENSE
@@ -0,0 +1,21 @@
+(The MIT License)
+
+Copyright (c) 2008 Tom Preston-Werner
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the 'Software'), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
View
@@ -20,23 +20,22 @@ h2. Diving In
* Customize the "Permalinks":http://wiki.github.com/mojombo/jekyll/permalinks your posts are generated with
* Use the built-in "Liquid Extensions":http://wiki.github.com/mojombo/jekyll/liquid-extensions to make your life easier
-h2. Dependencies
+h2. Runtime Dependencies
-* RedCloth: Textile support
-* Liquid: Templating system
-* Classifier: Generating related posts
-* Maruku: Default markdown engine
-* Directory Watcher: Auto-regeneration of sites
-* Open4: Talking to pygments for syntax highlighting
+* RedCloth: Textile support (Ruby)
+* Liquid: Templating system (Ruby)
+* Classifier: Generating related posts (Ruby)
+* Maruku: Default markdown engine (Ruby)
+* Directory Watcher: Auto-regeneration of sites (Ruby)
+* Open4: Talking to pygments for syntax highlighting (Ruby)
+* Pygments: Syntax highlighting (Python)
-h2. License
-
-(The MIT License)
+h2. Developer Dependencies
-Copyright (c) 2008 Tom Preston-Werner
+* Shoulda: Test framework (Ruby)
+* RR: Mocking (Ruby)
+* RedGreen: Nicer test output (Ruby)
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+h2. License
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+See LICENSE.
Oops, something went wrong.

0 comments on commit 46a95bc

Please sign in to comment.