2744b66fac
Expose Jekyll version to templates
...
Make available `site.version` to liquid
2013-08-16 20:30:26 -07:00
5f4efd34bd
When a Liquid Exception is caught, show the full path (rel to site source)
2013-08-12 21:19:54 +02:00
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
affffb4ed4
Update dummy email address to example.com domain
2013-08-10 15:29:33 +02:00
381a8148e3
Correct the social dummie URLs
...
Twitter and Github seem to always force HTTPS. They don’t use backslashes after the username.
2013-08-09 17:09:24 +02:00
7d26be5102
Call ruby's 'abort' if the site is unhealthy
2013-08-08 18:33:55 +02:00
318a379747
Nuke comment.
2013-08-08 18:32:13 +02:00
bc3dccf0e5
Merge pull request #1386 from mojombo/disable-excerpts
...
Disable automatically-generated excerpts with option
2013-08-08 02:39:06 -07:00
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
95534733ed
should_generate_excerpt? ~> generate_excerpt?
2013-08-08 00:35:42 +02:00
cb52535c03
Merge pull request #1390 from mojombo/better-errors
...
Catch and fix (somehow) common configuration errors
2013-08-07 15:28:16 -07:00
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
ccedcd0eb9
Use .empty? instead of == ''
2013-08-07 17:12:13 +02:00
d19c6983f2
paginate option cannot be 0.
2013-08-06 21:04:15 +02:00
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
8f7e229e8c
Cleaned up the deprecator a little
2013-08-06 20:56:20 +02:00
1d14692e5d
Implement URL conflict checking in `jekyll-doctor`.
2013-08-06 20:41:00 +02:00
aee7a41bc3
Align {{ content }} call with its siblings in site template.
2013-08-06 20:12:26 +02:00
ece35e5e36
Remove div.container from the default html template
2013-08-06 20:12:26 +02:00
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
cb8bc5accc
Just clarifying the Post#should_generate_excerpt?
2013-08-06 18:15:06 +02:00
9dc90333c1
Only generate excerpts if the excerpt_separator isn't blank
2013-08-06 18:05:15 +02:00
627916bc54
force markdown match to match the full extension
2013-08-06 10:56:24 +02:00
362fcf28f0
Use do ... end for multiline block
2013-07-31 23:17:56 +02:00
a23e94ad48
Improve comment for url_placeholders method
2013-07-31 23:17:06 +02:00
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
8a155e0a50
use binary mode when writing file.
2013-07-30 21:35:02 +09:00
d8bf10d761
disable reverse lookup
2013-07-30 21:28:27 +09:00
b5d25427e5
Merge branch 'master' into minor-refactors
2013-07-28 21:21:50 +02:00
01922a10ac
Convertible#to_liquid: allow an alternate attribute set to be passed
2013-07-28 21:18:54 +02:00
e973e59306
Remove redundant argument in Jekyll::Commands::New#scaffold_post_content
2013-07-26 16:25:39 +02:00
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
41b2f0824e
Merge branch 'master' of https://github.com/mojombo/jekyll into permalink-special-characters
2013-07-25 21:33:55 +02:00
0db5dcf832
Release 1.1.2
2013-07-25 09:15:34 +02:00
fe10f21d8d
Release 1.1.1
2013-07-24 22:42:03 +02:00
6c6dd173c7
Post + Page: extract real path retrieval into separate method (@parkr)
2013-07-24 16:30:24 +02:00
d815e2b2a2
coding style preferences (@parkr)
2013-07-24 16:28:03 +02:00
d68d29c06f
Merge pull request #1339 from mojombo/no-layouts-for-excerpt
...
No layouts for excerpt
2013-07-23 18:43:08 -07:00
0bb2af8dee
Remove superfluous conditional, props @mattr-
2013-07-23 20:04:39 +02:00
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
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
75d6587d27
Move #to_liquid to Convertible
2013-07-22 16:34:01 +02:00
21de43090a
Posts: move slug to title in a separate method
2013-07-22 16:23:40 +02:00
5efadd6674
Support missing kramdown coderay option
2013-07-22 16:02:50 +02:00
955f913f04
simplify Site#initialize
2013-07-22 16:02:50 +02:00
fd907fa631
simplify coderay option handling
2013-07-22 16:02:50 +02:00
5d777eb9e9
With the move of path handling, Page#to_liquid can be simplified
2013-07-22 16:02:50 +02:00
08567b1091
move path handling in pages to the `path` method, as in posts
2013-07-22 16:02:50 +02:00
f0e2468249
simplify some code with Hash#fetch
2013-07-22 16:02:42 +02:00
f883acc664
Remove debug statements
2013-07-22 11:33:19 +02:00
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
e359472870
May as well add Stevenson#debug
2013-07-22 11:30:19 +02:00
c6a37a424b
Debug statements - take them out later
2013-07-22 10:11:32 +02:00
f99c726085
Override Excerpt#render_all_layouts to just assign content to output
2013-07-22 10:11:32 +02:00
0e0e25b9ba
start with Excerpt#output, otherwise call #to_s
2013-07-22 10:11:32 +02:00
04e0b318c8
Remove duplicate comment
2013-07-22 10:11:32 +02:00
374e6fcdf4
Add Jekyll::Stevenson#abort_with
2013-07-22 10:07:15 +02:00
a880b7f99f
Remove superfluous 'table' selector from main.css in 'jekyll new' site template.
...
Closes #1323
2013-07-19 16:01:32 +02:00
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
d572e588e8
Release 1.1.0
2013-07-14 19:52:44 +02:00
5d91b8f346
merge bang to modify in place. Woops. #1201
2013-07-14 17:48:34 +02:00
e95086b211
Fix for kramdown coderay options. #1201 .
2013-07-14 17:47:13 +02:00
4ce89ac96d
Merge pull request #1201 from zachgersh/all_kramdown
...
Supporting more kramdown options.
2013-07-14 08:45:05 -07:00
90500f37ac
Deleted unused code.
2013-07-14 00:24:57 -05:00
774bf07380
Supporting more kramdown options.
2013-07-14 00:24:56 -05:00
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
015ace6773
Shuffle around rendering of extracted excerpt so it can be liquified.
2013-07-13 16:18:20 +02:00
253fc8c506
Raise LoadError if the file doesn't exist but do not catch it. :)
2013-07-12 12:22:06 +02:00
a7efb86d5c
Throw ArgumentError when there's an invalid config file, and catch only that.
2013-07-12 11:56:22 +02:00
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
e1ecae250c
Site#site_files_each ~> Site#each_site_file
2013-07-12 10:52:00 +02:00
979d5c13c4
Merge pull request #1144 from jpiasetz/cleanup
...
Refactor Jekyll::Site
2013-07-12 01:48:34 -07:00
13fd798ec0
Extracted each method
2013-07-09 20:50:22 -04:00
08f6f3c2ed
Merge pull request #1204 from maul-esel/include-params2
...
Support parameters for liquid include tags.
2013-07-09 14:14:40 -07:00
9d2849c562
set value outside if/else block
2013-07-08 20:43:03 +02:00
e8d82fd88c
Merge pull request #1271 from sanandnarayan/related_posts
...
Latest post first in related posts
2013-07-08 10:55:39 -07:00
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
9d3d095bca
Simplify check for String include/exclude option.
2013-07-08 18:35:16 +02:00
bbd466497f
Remove duplication for include/exclude options in backwards_compatibilize.
2013-07-08 18:34:26 +02:00
dfca2c6edc
Latest post is chosen first in related posts
2013-07-06 15:11:52 +05:30
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
ef22ebd7f1
code improvements according to @parkr's suggestions
2013-07-05 14:13:40 +02:00
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
cb1a2d1818
Catch conversion errors. Constituent of #1105 .
2013-06-30 16:38:35 +02:00
36fc16b4a4
Default Markdown template parser for new sites to RedCarpet via _config.yml. Related: #1236 .
2013-06-27 18:57:17 +02:00
c1850a38f7
Merge pull request #1215 from sanandnarayan/folder_plus
...
removed cgi unescape in page destination
2013-06-25 06:19:41 -07:00
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
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
f8f6784305
move parameter parsing to render time
2013-06-22 15:30:10 +02:00
00ed567f99
move regex to the top
2013-06-22 15:07:10 +02:00
042c960df0
Moved md post into else block. Added _drafts blank dir.
2013-06-18 07:57:59 -07:00
a3d53a74be
Refactored per @parkr suggestions. Much cleaner.
2013-06-18 07:57:59 -07:00
16314ee4a2
New leaving empty layouts / posts dirs and empty index.html.
2013-06-18 07:57:58 -07:00
a21031eae9
Added a --blank command which scaffolds empty files.
2013-06-18 07:57:58 -07:00
bdd84f275e
Ruby 1.8.7 only supports 1 param to Regexp.match()
2013-06-15 18:28:26 +02:00
99721ee8aa
To satisfy Ruby 1.8.7, use look-ahead instead of look-behind
2013-06-15 18:19:52 +02:00
5c47014c90
removed cgi unescape in page destination
2013-06-15 18:38:14 +05:30
0fa03d2651
stupid Ruby 1.8.7 doesn't support named groups
2013-06-13 18:48:40 +02:00
639acea0a7
do parameter parsing with @imathis' incredible regex
...
This also introduces single-quote support.
2013-06-13 18:38:14 +02:00
f612330565
add support for parameters to {% include %} tags
2013-06-11 16:04:42 +02:00
7dc6767bc9
Fix Pager.in_hierarchy to actually do the right thing
2013-06-09 21:08:45 +02:00
05218711b2
Add warning when pagination is enabled but no template page has been found
2013-06-09 21:08:29 +02:00
6e80ba868e
Fix tests for Pager.
2013-06-09 18:52:24 +02:00
81a2d03e58
WIP – fixing tests.
2013-06-09 18:31:09 +02:00
bd0e45c1b9
Fixed bugs with pagination in a subdirectory.
2013-06-09 18:31:09 +02:00
700d840a06
Release 1.0.3
2013-06-07 21:02:13 +02:00
86e5a1f7a9
Merge pull request #1189 from mojombo/private-gist-support
...
Support new private gist syntax.
2013-06-07 11:55:09 -07:00
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
066912556e
Support new private gist syntax.
2013-06-07 00:34:23 +02:00
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
2d27deaec7
For template site, convert #post to .post.
2013-06-02 18:48:45 +02:00
1083bfd533
Fix typo in Stevenson
2013-05-31 17:23:57 -04:00
14a4e32bbe
Use singleton instance variable instead of class variable
2013-05-29 12:04:50 +02:00
1f59e9c757
Use Jekyll.logger instead of Jekyll::Stevenson to log things.
2013-05-29 11:58:35 +02:00
9adfd6ddeb
Document uri_escape
2013-05-23 20:18:08 +02:00
1eab13c068
Merge pull request #1063 from Kelsin/fixing-paginate_path-for-windows
...
Fixing pagination on windows
2013-05-22 12:26:54 -07:00
7c012a9e0c
Merge pull request #1115 from clang1234/master
...
Add --force flag to new command
2013-05-17 21:15:17 -07:00
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
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
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
a95fa70d72
raise things when there's a yaml exception (non-zero exit code
2013-05-17 22:44:46 +02:00
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
fafacc43ca
Add ? to preserve_source_location
2013-05-16 16:15:21 -05:00
00dd37d2e4
Extract check for force to improve readability
2013-05-16 16:13:13 -05:00
151ffab6fe
Removed space characters in empty lines
2013-05-16 20:27:27 +02:00
2ce39bc20a
Add '--force' to 'new' command. Implements #1104
2013-05-15 17:29:27 -05:00
8e3ab9ea36
Backwards-compatibilize 'exclude' and 'include' config tags. Fixes #1109
2013-05-16 00:25:16 +02:00
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
5258e3afa3
Logger ~> Stevenson and don't inherit from Ruby Logger. #1106 .
2013-05-15 15:15:00 +02:00
98aff03595
Use Jekyll::Stevenson#formatted_topic for printing messages
...
Beats trying to line them up yourself. :-)
2013-05-14 22:04:34 -05:00
ff600bfcd9
Merge branch 'master' into refactor-related-posts
2013-05-14 21:54:12 -05:00
35f4f09c3e
Rename Jekyll::Logger ~> Jekyll::Stevenson to fix inheritance problem
...
Problem described here: ca888cad76
2013-05-14 21:07:23 +02:00
8051df0f4c
Release 1.0.2
2013-05-12 15:26:45 +02:00
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
28b9e351c4
Merge pull request #1081 from mojombo/relative-permalinks
...
Backwards-compatibilize relative permalinks
2013-05-12 02:55:49 -07:00
f9502dc9f5
Merge pull request #1078 from maul-esel/fix-num-category
...
Fix number category
2013-05-12 02:52:39 -07:00
c59cfcfd2e
Not automatically deprecated.
2013-05-12 01:19:04 +02:00
d9f0dce67d
make sure relative_permalinks is set to TRUE
2013-05-12 01:16:52 +02:00
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
6167747440
Say happy things when everything is cool
2013-05-12 01:07:58 +02:00
1b80fc8cc8
always be polite to the user :)
2013-05-11 20:03:55 +02:00
a8788f4a0a
copy over deprecated config option to new one
2013-05-11 19:57:11 +02:00
c44d4248ac
warn on use of deprecated "server_port" option
2013-05-11 19:54:06 +02:00
0e82b4eb2f
Use site config to determine whether permalinks should be relative.
2013-05-11 18:26:20 +02:00
161244fd78
Add better language and link to Upgrading page in docs for relative permalinks deprecation msg
2013-05-11 18:06:33 +02:00
1f23bc4dc0
Add support for relative permalinks
2013-05-11 18:03:03 +02:00
19bc54bb07
Add doctor command
2013-05-11 18:02:53 +02:00
6294c4a204
Better-formatted output with relation to 'Generating... done.'
2013-05-11 17:56:42 +02:00
b355ef6469
Add jekyll doctor command
2013-05-11 17:49:20 +02:00
e22b1bb74a
Add deprecation support for pages in subfolders with relative permalinks.
2013-05-11 17:40:00 +02:00
Pat Hawks
Parker Moore
Anatol Broder
Nick Fagerlund
Wlodek Bzyl
Thomas Torsney-Weir
Lucas Jenss
MURAOKA Taro
maul.esel
Matt Rogers
zachgersh
John Piasetzki
Anand Narayan
imathis
Brian Kim
Mikael Konutgan
Casey Lang
Sebastian Morr