maul.esel
2138dfc0ac
Fix code to allow dots in variables
2013-10-01 22:31:11 +02:00
maul.esel
a93795bcc0
implement variable retrieval in include tag
...
Fixes #1464 .
2013-10-01 22:28:45 +02:00
Matt Rogers
9d4f9169e9
Merge pull request #1514 from maul-esel/tag-errors
...
Consistent error handling in Liquid tags
2013-09-30 20:54:42 -07:00
Matt Rogers
cb4d15561c
Merge pull request #1003 from liufengyun/data-sources
...
support data sources
2013-09-30 20:47:57 -07:00
liufengyun
760cbc7f91
Autoload yaml files under _data directory
...
The jekyll engine will autoload all yaml files(ends with .yml or .yaml)
under _data. If there's a file members.yml under the directory, then user
can access contents of the file through site.members.
2013-10-01 11:23:33 +08:00
Dmitry Chestnykh
58cab6b050
Handle destinations outside of source.
2013-09-30 05:55:38 +02:00
Dmitry Chestnykh
dfaf1f45cc
Remove require 'pathname': already included.
2013-09-30 05:11:15 +02:00
Dmitry Chestnykh
8fe25a6958
Replace directory_watcher with listen.
...
Directory_watcher consumed ~25% CPU on big Jekyll projects (depending on
the number of watched files), since it polled for changes every second.
Listen is easier on CPU, as it uses directory change notifications
provided by OS (currently OS X and Linux), falling back to polling when
they are not available.
2013-09-30 04:33:04 +02:00
Parker Moore
924285695c
Print server address when launching a server.
...
Related to: https://github.com/mojombo/jekyll/issues/1583
2013-09-28 19:18:36 -04:00
Parker Moore
27347596ad
Merge pull request #1449 from shigeya/config-encoding-and-yaml-opts
...
Adding "encoding" configuration (4th version)
2013-09-23 19:30:44 -07:00
Parker Moore
a88a63da2d
Don't use destructive Array#concat for Liquid Attribute arrays
2013-09-22 18:26:34 -04:00
maul.esel
1829c2734a
'gist' tag: switch to ArgumentError exception class
...
SyntaxError is reserved for Ruby's internal use.
Adjust the tests, including the call to liquid to
make it rethrow ArgumentErrors.
2013-09-19 23:23:04 +02:00
maul.esel
9409a3d034
raise exceptions in include tag
2013-09-19 14:32:15 +02:00
maul.esel
72c3bba56a
Change error handling in 'post_url' tag: raise exception
2013-09-19 14:24:22 +02:00
maul.esel
06fb31544f
Change error handling for gist tag: raise exception
2013-09-19 14:24:22 +02:00
Shigeya Suzuki
c625ddf6cd
Invoke File.read with or without options depends on Ruby version
...
- Extract option fetch method as a separate method
- Added File.read_with_options method to use
- With performance fix
2013-09-19 12:22:50 +09:00
Shigeya Suzuki
97e052df63
Pass encoding parameter as string, not an object
2013-09-19 12:21:26 +09:00
Shigeya Suzuki
8b892ed735
read_yaml to accept optional parameter to override defaults
2013-09-19 12:21:25 +09:00
MURAOKA Taro
4cb24f4b87
consider a case of "site" is unavailable in Convertible
2013-09-19 12:21:25 +09:00
MURAOKA Taro
f4c2383d3c
write document for config.encoding
2013-09-19 12:21:25 +09:00
MURAOKA Taro
8a28d80690
add encoding for configuration
2013-09-19 12:21:25 +09:00
Matt Rogers
793eb96a77
Merge pull request #1490 from penibelst/allow-include-read-override
...
Extract include tag read file in a method
2013-09-18 19:34:45 -07:00
Anatol Broder
ec85c49de3
Change exception type
2013-09-17 22:11:56 +02:00
Anatol Broder
7cec996f90
Validate the entire markup as soon as possible
2013-09-17 21:41:11 +02:00
Anatol Broder
25519b38f6
Validate file name as soon as possible
2013-09-17 20:57:01 +02:00
Anatol Broder
8017548bd0
Rename variable
2013-09-17 20:46:01 +02:00
Anatol Broder
7f62e69837
Remove obvious comment
2013-09-17 20:36:33 +02:00
Anatol Broder
e5f99e2798
Remove return
2013-09-17 20:35:18 +02:00
Anatol Broder
3e2ab58d56
Fix unruby paradigm
2013-09-17 20:34:04 +02:00
Anatol Broder
a42e57f274
Rename constants
2013-09-17 20:14:41 +02:00
Anatol Broder
3dadc94ce4
Don’t repeat yourself
2013-09-16 23:16:41 +02:00
maul.esel
299cb93147
improve path checking, now using Pathname instead of regex
2013-09-16 15:42:59 +02:00
maul.esel
bec4a07c12
Fix handling of source-dest matching being too aggressive
...
Fixes #1130 .
2013-09-16 14:41:20 +02:00
Anatol Broder
891ea8f604
People can symlink it if they want in unsafe mode
2013-09-16 08:37:07 +02:00
Anatol Broder
081b974114
Resolve conflict
2013-09-16 08:19:56 +02:00
Anatol Broder
79f50b0568
Resolve conflict
2013-09-16 08:15:10 +02:00
maul.esel
29d0841e97
#to_sym is called by #symbolize_keys
2013-09-13 14:06:16 +02:00
Parker Moore
4b8bb68e56
Cleanup newlines in Commands::Serve
2013-09-12 14:05:16 -04:00
Parker Moore
c926596be7
Print better messages for detached server. Mute output on detach.
2013-09-12 14:02:52 -04:00
maul.esel
5775603f49
add inline code docs
2013-09-11 17:49:34 +02:00
maul.esel
0874c14b2c
improve validation code
2013-09-11 17:37:15 +02:00
maul.esel
accea6648c
fix for Ruby 1.8
2013-09-11 17:27:34 +02:00
maul.esel
fb911af2cd
Retrieve frontmatter defaults when retrieved internally
...
This is for example possible for layout defaults to take effect.
2013-09-11 00:57:18 +02:00
maul.esel
9d44d3290b
make frontmatter defaults available to liquid
2013-09-11 00:55:57 +02:00
maul.esel
b3fdaa9792
add a class `FrontmatterDefaults` for handling of frontmatter defaults
2013-09-11 00:55:28 +02:00
maul.esel
3ccd8dad31
Add a method to retrieve type to post, page and draft
2013-09-11 00:48:05 +02:00
Ishibashi Hideto
421e58ad59
a patch for the issue: [Liquid doesn't render my partial · Issue #1519 · mojombo/jekyll]( https://github.com/mojombo/jekyll/issues/1519 )
2013-09-10 23:12:15 +09:00
Matt Rogers
d8e0f009d2
Merge pull request #1363 from koron/stop-reverse-lookup
...
disable reverse lookup
2013-09-06 20:37:31 -07:00
Matt Rogers
3212aac4bc
Merge pull request #1481 from mojombo/pathawks-patch-1
...
Expose Jekyll version to templates: `jekyll.version`
2013-09-05 13:24:37 -07:00
maul.esel
09ed340835
Fix include tag to avoid NameError
2013-09-02 14:25:13 +02:00
Parker Moore
b7e34175d0
Put version under 'jekyll' namespace.
2013-08-30 18:54:03 -04:00
Parker Moore
20f44be87f
Merge branch 'patch-1' of git://github.com/pathawks/jekyll into pathawks-patch-1
...
* 'patch-1' of git://github.com/pathawks/jekyll:
Use proper Ruby syntax for constant
Expose Jekyll version to templates
2013-08-30 18:50:58 -04:00
Matt Rogers
a9e2a74ea6
Merge pull request #1341 from maul-esel/minor-refactors
...
Minor refactors
2013-08-29 20:21:08 -07:00
Parker Moore
0d890e4b70
Merge pull request #944 from x3ro/permalink-special-characters
...
WIP - Improve permalink generation for URLs with special characters
2013-08-28 15:02:20 -07:00
Parker Moore
8ea336945c
Merge pull request #1429 from maul-esel/refactor-cleanup
...
Refactor `Site#cleanup` into Jekyll::Site::Cleaner class
2013-08-26 14:01:53 -07:00
Matt Rogers
4fa4ad2232
Merge pull request #1443 from ddavison/detachment
...
Detachment
2013-08-24 20:16:42 -07:00
ddavison
b163bf637e
final mods
2013-08-24 21:31:05 -04:00
maul.esel
4c015fc5ff
move Jekyll::Cleaner to Jekyll::Site::Cleaner
2013-08-23 20:42:27 +02:00
maul.esel
dbd368f6ee
remove no longer necessary condition
2013-08-23 20:41:13 +02:00
ddavison
9681f3a776
adding default configuration to false
2013-08-21 21:00:18 +00:00
ddavison
4e52869f0f
adding detachment functionality
2013-08-21 20:53:01 +00:00
Frederic ROS
bca28056ef
Fix a misleading typo
2013-08-21 14:53:10 +02:00
maul.esel
d28858a9e9
put the Cleaner instance in a `Site#site_cleaner` method
2013-08-19 20:15:54 +02:00
maul.esel
0b3005b3b4
make obsolete_files a method (@mattr-)
2013-08-19 20:01:36 +02:00
Matt Rogers
820f526569
Merge pull request #1389 from mojombo/doctor-conflicting-permalinks
...
Implement URL conflict checking in `jekyll-doctor`.
2013-08-18 08:57:49 -07:00
maul.esel
506cdc5179
include: more helpful error message for symlinks
2013-08-18 17:08:42 +02:00
maul.esel
5d7dba476c
change site_cleaner to use attr_accessor
2013-08-17 22:33:01 +02:00
Parker Moore
8b8fa4da4e
Use Doctor#healthy? and ensure _all_ items are checked before process quits.
2013-08-17 15:16:14 -04:00
maul.esel
5da13d2b66
Refactor `Site#cleanup`
...
Move the cleanup logic out into a separate class,
`Jekyll::Cleaner`.
2013-08-17 17:14:08 +02:00
maul.esel
95719fa4ce
improve error handling in include tag
...
* Reduce condition to one-liner
* Remove `self`
* Implicit return value
* Explicit error message for symlinks
2013-08-17 16:24:06 +02:00
Pat Hawks
32e55e7717
Use proper Ruby syntax for constant
2013-08-16 21:01:09 -07:00
Pat Hawks
2744b66fac
Expose Jekyll version to templates
...
Make available `site.version` to liquid
2013-08-16 20:30:26 -07:00
Parker Moore
5f4efd34bd
When a Liquid Exception is caught, show the full path (rel to site source)
2013-08-12 21:19:54 +02:00
Parker Moore
d4300be758
Merge branch 'permalink-no-dir' of git://github.com/maul-esel/jekyll into maul-esel-permalink-no-dir
...
* 'permalink-no-dir' of git://github.com/maul-esel/jekyll:
test per-post permalinks
do not force the permalink to be a dir if it ends on .html
Conflicts:
features/step_definitions/jekyll_steps.rb
2013-08-11 12:08:56 +02:00
Parker Moore
7d26be5102
Call ruby's 'abort' if the site is unhealthy
2013-08-08 18:33:55 +02:00
Parker Moore
318a379747
Nuke comment.
2013-08-08 18:32:13 +02:00
Parker Moore
bc3dccf0e5
Merge pull request #1386 from mojombo/disable-excerpts
...
Disable automatically-generated excerpts with option
2013-08-08 02:39:06 -07:00
Nick Fagerlund
9ca7f70d70
Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and Kramdown > 0.14.0
...
When using Ruby 1.8.7 and Kramdown 0.14.0 and newer, the following build error
would occur if any page in your site contained a `<name@example.com>` email
address link:
Generating... Conversion error: There was an error converting 'contribute.markdown'.
/Users/nick/Documents/puppet-docs/vendor/bundle/ruby/1.8/gems/kramdown-1.0.2/lib/kramdown/converter/html.rb:404:in `obfuscate': undefined method `encoding' for "mailto":String (NoMethodError)
See also:
http://rubyforge.org/tracker/index.php?func=detail&aid=29750&group_id=7403&atid=28673
This problem traced back to the following line in the Kramdown source:
result.force_encoding(text.encoding) if result.respond_to?(:force_encoding)
Strings aren't supposed to respond to the :force_encoding method in Ruby < 1.9,
but lib/jekyll/core_ext.rb was modifying the string class like so:
def force_encoding(enc)
self
end
Strings still won't respond to :encoding, though, so we get an error when
Kramdown tries to read the incoming encoding and everything will blow up.
An ack of the codebase suggests that this was only added so we could force an
encoding for rdiscount on 1.9 without having to check whether we were running
under 1.8. Since testing for said method to learn whether one is running under a
1.9-like encoding regime seems to be a thing in libraries we rely on, we
shouldn't insert this dummy method without also dummying every other part of the
Ruby 1.9+ encoding system.
This commit removes the dummy :force_encoding method to stop poisoning core
classes for libraries we use, and moves the adjustment for 1.9-like encoding
regimes to the one place where it's needed.
2013-08-07 20:07:54 -07:00
Parker Moore
95534733ed
should_generate_excerpt? ~> generate_excerpt?
2013-08-08 00:35:42 +02:00
Parker Moore
cb52535c03
Merge pull request #1390 from mojombo/better-errors
...
Catch and fix (somehow) common configuration errors
2013-08-07 15:28:16 -07:00
Parker Moore
826293ebe3
Merge pull request #1364 from koron/write-in-binary-mode
...
use binary mode when writing file.
2013-08-07 08:12:27 -07:00
Parker Moore
ccedcd0eb9
Use .empty? instead of == ''
2013-08-07 17:12:13 +02:00
Parker Moore
d19c6983f2
paginate option cannot be 0.
2013-08-06 21:04:15 +02:00
Parker Moore
6eec3a7942
Print warning when `paginate` is set to `true`.
...
Related to #1105 .
Sample output:
~/code/jekyll/tsite$ ../bin/jekyll build --trace
Configuration file: /Users/parker/code/jekyll/tsite/_config.yml
Config Warning: The `paginate` key must be a positive integer or nil. It's currently set to 'true'.
Source: /Users/parker/code/jekyll/tsite
Destination: /Users/parker/code/jekyll/tsite/_site
Generating... done.
2013-08-06 20:56:29 +02:00
Parker Moore
8f7e229e8c
Cleaned up the deprecator a little
2013-08-06 20:56:20 +02:00
Parker Moore
1d14692e5d
Implement URL conflict checking in `jekyll-doctor`.
2013-08-06 20:41:00 +02:00
Parker Moore
e3abda9897
Fix 'undefined method `gsub' for nil:NilClass' when undefined method is called.
...
Closes #1388 .
http://stackoverflow.com/questions/18037596/error-undefined-method-gsub-for-nilnilclass/18038912
2013-08-06 20:06:33 +02:00
Parker Moore
cb8bc5accc
Just clarifying the Post#should_generate_excerpt?
2013-08-06 18:15:06 +02:00
Parker Moore
9dc90333c1
Only generate excerpts if the excerpt_separator isn't blank
2013-08-06 18:05:15 +02:00
Thomas Torsney-Weir
627916bc54
force markdown match to match the full extension
2013-08-06 10:56:24 +02:00
Lucas Jenss
362fcf28f0
Use do ... end for multiline block
2013-07-31 23:17:56 +02:00
Lucas Jenss
a23e94ad48
Improve comment for url_placeholders method
2013-07-31 23:17:06 +02:00
Lucas Jenss
cce58159ce
Use symbols for all placeholders
...
See https://github.com/mojombo/jekyll/pull/944#discussion_r5443105
for a discussion.
2013-07-31 23:11:51 +02:00
MURAOKA Taro
8a155e0a50
use binary mode when writing file.
2013-07-30 21:35:02 +09:00
MURAOKA Taro
d8bf10d761
disable reverse lookup
2013-07-30 21:28:27 +09:00
maul.esel
b5d25427e5
Merge branch 'master' into minor-refactors
2013-07-28 21:21:50 +02:00
maul.esel
01922a10ac
Convertible#to_liquid: allow an alternate attribute set to be passed
2013-07-28 21:18:54 +02:00
Parker Moore
e973e59306
Remove redundant argument in Jekyll::Commands::New#scaffold_post_content
2013-07-26 16:25:39 +02:00
Lucas Jenss
f5d0be9660
Move URL generation to own class instead of a module
...
As suggested by @parkr in #944
2013-07-25 22:44:27 +02:00
Lucas Jenss
41b2f0824e
Merge branch 'master' of https://github.com/mojombo/jekyll into permalink-special-characters
2013-07-25 21:33:55 +02:00
maul.esel
6c6dd173c7
Post + Page: extract real path retrieval into separate method (@parkr)
2013-07-24 16:30:24 +02:00
maul.esel
d815e2b2a2
coding style preferences (@parkr)
2013-07-24 16:28:03 +02:00
Matt Rogers
d68d29c06f
Merge pull request #1339 from mojombo/no-layouts-for-excerpt
...
No layouts for excerpt
2013-07-23 18:43:08 -07:00
Parker Moore
0bb2af8dee
Remove superfluous conditional, props @mattr-
2013-07-23 20:04:39 +02:00
maul.esel
ba5db5ad5b
refactor Include tag file validation
...
Split validation into a separate method, and give a more
descriptive error on symlinks.
2013-07-23 14:23:33 +02:00
maul.esel
86e007f970
remove no-longer needed LSI accessor
...
LSI has been moved to another class (Jekyll::RelatedPosts),
but this was left in Post.
2013-07-23 11:24:23 +02:00
maul.esel
75d6587d27
Move #to_liquid to Convertible
2013-07-22 16:34:01 +02:00
maul.esel
21de43090a
Posts: move slug to title in a separate method
2013-07-22 16:23:40 +02:00
maul.esel
5efadd6674
Support missing kramdown coderay option
2013-07-22 16:02:50 +02:00
maul.esel
955f913f04
simplify Site#initialize
2013-07-22 16:02:50 +02:00
maul.esel
fd907fa631
simplify coderay option handling
2013-07-22 16:02:50 +02:00
maul.esel
5d777eb9e9
With the move of path handling, Page#to_liquid can be simplified
2013-07-22 16:02:50 +02:00
maul.esel
08567b1091
move path handling in pages to the `path` method, as in posts
2013-07-22 16:02:50 +02:00
maul.esel
f0e2468249
simplify some code with Hash#fetch
2013-07-22 16:02:42 +02:00
Parker Moore
f883acc664
Remove debug statements
2013-07-22 11:33:19 +02:00
Parker Moore
26dc14881c
Moving data around to make sure excerpts have no layouts but that they are still converted with liquid and the proper converter
2013-07-22 11:31:15 +02:00
Parker Moore
e359472870
May as well add Stevenson#debug
2013-07-22 11:30:19 +02:00
Parker Moore
c6a37a424b
Debug statements - take them out later
2013-07-22 10:11:32 +02:00
Parker Moore
f99c726085
Override Excerpt#render_all_layouts to just assign content to output
2013-07-22 10:11:32 +02:00
Parker Moore
0e0e25b9ba
start with Excerpt#output, otherwise call #to_s
2013-07-22 10:11:32 +02:00
Parker Moore
04e0b318c8
Remove duplicate comment
2013-07-22 10:11:32 +02:00
Parker Moore
374e6fcdf4
Add Jekyll::Stevenson#abort_with
2013-07-22 10:07:15 +02:00
Lucas Jenss
2ac98a7358
Merge branch 'master' into permalink-special-characters
...
Conflicts:
lib/jekyll/page.rb
lib/jekyll/post.rb
2013-07-14 23:58:22 +02:00
Parker Moore
5d91b8f346
merge bang to modify in place. Woops. #1201
2013-07-14 17:48:34 +02:00
Parker Moore
e95086b211
Fix for kramdown coderay options. #1201 .
2013-07-14 17:47:13 +02:00
Parker Moore
4ce89ac96d
Merge pull request #1201 from zachgersh/all_kramdown
...
Supporting more kramdown options.
2013-07-14 08:45:05 -07:00
zachgersh
90500f37ac
Deleted unused code.
2013-07-14 00:24:57 -05:00
zachgersh
774bf07380
Supporting more kramdown options.
2013-07-14 00:24:56 -05:00
Parker Moore
d815c12571
Don't try to be smarter than the computer. Pass Excerpt#to_liquid to its parent post.
2013-07-14 04:22:34 +02:00
Parker Moore
015ace6773
Shuffle around rendering of extracted excerpt so it can be liquified.
2013-07-13 16:18:20 +02:00
Parker Moore
253fc8c506
Raise LoadError if the file doesn't exist but do not catch it. :)
2013-07-12 12:22:06 +02:00
Parker Moore
a7efb86d5c
Throw ArgumentError when there's an invalid config file, and catch only that.
2013-07-12 11:56:22 +02:00
Parker Moore
456ac01890
Crash if a config file isn't there.
...
If a configuration file is specified via the command line but does not exist,
fail loudly and crash to preserve the current state. Do not fail if the requested
file is the default configuration file, _config.yml. In that case, fall back on
the defaults.
2013-07-12 11:18:46 +02:00
Parker Moore
e1ecae250c
Site#site_files_each ~> Site#each_site_file
2013-07-12 10:52:00 +02:00
Parker Moore
979d5c13c4
Merge pull request #1144 from jpiasetz/cleanup
...
Refactor Jekyll::Site
2013-07-12 01:48:34 -07:00
John Piasetzki
13fd798ec0
Extracted each method
2013-07-09 20:50:22 -04:00
Parker Moore
08f6f3c2ed
Merge pull request #1204 from maul-esel/include-params2
...
Support parameters for liquid include tags.
2013-07-09 14:14:40 -07:00
maul.esel
9d2849c562
set value outside if/else block
2013-07-08 20:43:03 +02:00
Parker Moore
e8d82fd88c
Merge pull request #1271 from sanandnarayan/related_posts
...
Latest post first in related posts
2013-07-08 10:55:39 -07:00
maul.esel
f72365da4f
more code improvements
...
Remove unused variable, extract validation to method (@mattr-).
Do not require markup to be passed to parse_params as argument.
2013-07-08 18:48:47 +02:00
Parker Moore
9d3d095bca
Simplify check for String include/exclude option.
2013-07-08 18:35:16 +02:00
Parker Moore
bbd466497f
Remove duplication for include/exclude options in backwards_compatibilize.
2013-07-08 18:34:26 +02:00
Anand Narayan
dfca2c6edc
Latest post is chosen first in related posts
2013-07-06 15:11:52 +05:30
John Piasetzki
b5d4a96149
Refactored site.rb, I tried to clean a bunch of the methods code climate was complaining about
2013-07-05 16:12:10 -04:00
maul.esel
ef22ebd7f1
code improvements according to @parkr's suggestions
2013-07-05 14:13:40 +02:00
Matt Rogers
2484833bc8
Merge pull request #1118 from maul-esel/dir-bug-take2
...
[bugfix #417 ] delete old files that have been replaced by a directory
2013-07-01 07:52:29 -07:00
Parker Moore
cb1a2d1818
Catch conversion errors. Constituent of #1105 .
2013-06-30 16:38:35 +02:00
Matt Rogers
c1850a38f7
Merge pull request #1215 from sanandnarayan/folder_plus
...
removed cgi unescape in page destination
2013-06-25 06:19:41 -07:00
Matt Rogers
fdebe492cc
Merge pull request #1171 from zachgersh/new_empty
...
Added a --blank command which scaffolds empty files.
2013-06-24 22:25:25 -07:00
imathis
2b01b06ec8
Support passing Liquid variables to includes
...
Change the regex matching to allow Liquid variables and object fields
to be passed to the include. Use the render context to retrieve the
variable value. Also, relax syntax checks by allowing surrounding spaces
and dashes in parameter names.
2013-06-22 15:47:16 +02:00
maul.esel
f8f6784305
move parameter parsing to render time
2013-06-22 15:30:10 +02:00
maul.esel
00ed567f99
move regex to the top
2013-06-22 15:07:10 +02:00
zachgersh
042c960df0
Moved md post into else block. Added _drafts blank dir.
2013-06-18 07:57:59 -07:00
zachgersh
a3d53a74be
Refactored per @parkr suggestions. Much cleaner.
2013-06-18 07:57:59 -07:00
zachgersh
16314ee4a2
New leaving empty layouts / posts dirs and empty index.html.
2013-06-18 07:57:58 -07:00
zachgersh
a21031eae9
Added a --blank command which scaffolds empty files.
2013-06-18 07:57:58 -07:00
maul.esel
bdd84f275e
Ruby 1.8.7 only supports 1 param to Regexp.match()
2013-06-15 18:28:26 +02:00
maul.esel
99721ee8aa
To satisfy Ruby 1.8.7, use look-ahead instead of look-behind
2013-06-15 18:19:52 +02:00
Anand Narayan
5c47014c90
removed cgi unescape in page destination
2013-06-15 18:38:14 +05:30
maul.esel
0fa03d2651
stupid Ruby 1.8.7 doesn't support named groups
2013-06-13 18:48:40 +02:00
maul.esel
639acea0a7
do parameter parsing with @imathis' incredible regex
...
This also introduces single-quote support.
2013-06-13 18:38:14 +02:00
maul.esel
f612330565
add support for parameters to {% include %} tags
2013-06-11 16:04:42 +02:00
Parker Moore
7dc6767bc9
Fix Pager.in_hierarchy to actually do the right thing
2013-06-09 21:08:45 +02:00
Parker Moore
05218711b2
Add warning when pagination is enabled but no template page has been found
2013-06-09 21:08:29 +02:00
Parker Moore
6e80ba868e
Fix tests for Pager.
2013-06-09 18:52:24 +02:00
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
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
Brian Kim
1083bfd533
Fix typo in Stevenson
2013-05-31 17:23:57 -04: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
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
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
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
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
Parker Moore
c7b707cdfd
Ignore --help and --version in Deprecator. Fixes #1030
2013-05-06 20:17:28 +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
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
Parker Moore
6ed41e373c
Remove code duplication: #write in Page and Post is the same.
2013-04-16 02:55:31 +02:00
Parker Moore
82f32d5c02
Merge configuration properly. Closes #978 .
2013-04-16 00:41:10 +02:00
Parker Moore
e7546a98f6
Remove unnecessary override of #read_yaml in Page.
2013-04-15 19:24:23 +02:00
maul.esel
b7064a4bc3
remove 'post' and 'page' default layouts
2013-04-15 17:24:09 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 Bell
b9da30bc8f
Remove migrators
2012-12-22 17:49:33 +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
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
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
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