a7d4ee8bfb
Merge pull request #1799 from konklone/maruku_fenced_code_blocks
2013-12-10 20:30:44 -08:00
b18f6505dd
Remove margin-top of `.site` to prevent collapsing margins.
2013-12-10 18:39:16 -05:00
a70726e554
Merge pull request #1788 from mojombo/group-by-filter-2
2013-12-10 08:48:44 -08:00
afe9387578
condensing code slightly
2013-12-10 11:04:04 -05:00
ed82098162
Merge pull request #1796 from mojombo/fix-fetching-things
...
Reject nil entries in Site#read_things
2013-12-09 18:23:19 -08:00
695e5bbc40
move EntryFilter class from global namespace into Jekyll module
2013-12-09 23:06:27 +01:00
063111737c
Refactor data/[] fetching of item property.
2013-12-09 12:59:43 -05:00
bf9cf5340d
Reject nil entries in Site#read_things
2013-12-09 12:46:57 -05:00
14418f74ae
in-progress patch for maruku and fenced code blocks
2013-12-08 22:37:46 -05:00
381ab4e71b
Implement group_by Liquid filter & tests.
2013-12-08 01:16:48 -05:00
601f89d4d1
Remove File.read_with_options patch to allow 1.9 and 1.8 to behave the same
2013-12-08 00:50:12 -05:00
d130fd13dc
Remove Ruby <1.9 core extensions
2013-12-08 00:47:44 -05:00
b58cd5c132
Merge pull request #1657 from mojombo/safe-whitelist
...
A gem-based plugin whitelist for `safe` mode
2013-12-07 21:41:55 -08:00
350c9b3ab5
bump the version number in the code
2013-12-07 17:59:16 -06:00
362d28f11d
Merge pull request #1779 from mojombo/no-duplication
...
Refactor post and draft object creation
2013-12-06 20:58:24 -08:00
9f1593299a
Merge pull request #1775 from Ivoz/maruku
...
Update to maruku 0.7
2013-12-06 20:56:52 -08:00
6a13f7dd57
Modifying enumerator for 1.8.7
2013-12-06 01:28:21 -05:00
e69d77b4df
Refactor post and draft object creation
...
De-duplicate object creation between posts and drafts. Inject the name
dependency through a parameter
2013-12-06 01:28:21 -05:00
e91db82d26
I mean the argument and the local variable should be the same thing
2013-12-06 01:07:34 -05:00
f0fbc8f356
Refactor conditions for allowing plugins into a new method: Site#plguin_allowed?
2013-12-06 00:26:44 -05:00
249b13a98a
Hm, shouldn't need that call to 'rescue' in Site#whitelist
2013-12-06 00:24:59 -05:00
5c9f9a4de8
The whitelist should be an array (not a file)
...
Default to `[]` if the key’s value is falsey
2013-12-06 00:23:22 -05:00
f1869cda98
Merge branch 'master' into frontmatter-defaults
2013-12-05 19:29:57 +01:00
960e01cba8
move self.type to convertible
2013-12-05 09:14:31 +01:00
4a2e5af52e
Merge pull request #1682 from envygeeks/patch-1
...
Sort plugins so people can have "load orders".
2013-12-04 18:40:04 -08:00
052a577938
Merge pull request #1765 from mojombo/tomlify
...
Add support for TOML config files
2013-12-04 18:28:20 -08:00
5ed9d21ec7
Remove extraneous newlines from XHTML output
2013-12-05 12:04:55 +11:00
b637420373
Merge pull request #1755 from gregkare/more_trailing_whitespace
...
Remove trailing whitespace
2013-12-02 12:35:06 -08:00
63122fdafc
add a space between "find" and "an"
2013-12-01 19:11:16 -05:00
b8bbc6e08b
require the TOML gem, idiot.
2013-11-29 23:33:38 -05:00
22b95aee38
Give that LoadError a good message.
2013-11-29 23:33:25 -05:00
1e32af47a6
Better config file parser error if it's not there.
2013-11-29 23:22:13 -05:00
51706e8da7
Parse TOML or YAML in Jekyll::Configuration.
2013-11-28 22:11:56 -05:00
91a4c5611e
Prep for the 1.3.1 release
2013-11-26 20:27:27 -06:00
eceebb23a6
Pagination generator should have :lowest priority
2013-11-26 12:45:00 -05:00
ce8e271b5d
Remove trailing whitespace
2013-11-25 13:31:53 +01:00
c5533e9016
restrict rescue-clause in IncludeTag#render
...
As it previously enclosed the whole method, it also
wrapped file validation errors, which is not meant to be.
Fixes #1745 .
2013-11-22 06:58:52 +01:00
3888a24068
output including file for include tag error
2013-11-21 22:03:39 +01:00
dfffc2e72a
Use Pathname#to_s instead of Pathname#to_path
...
Fixes #1723 .
2013-11-16 13:12:59 -05:00
5e0af84993
fix include tag: don't store variable value
...
This fixes the bug reported in #1495 (comments).
2013-11-14 20:53:59 +01:00
615d49ed66
Remove Site.whitelist attribute.
2013-11-04 23:24:21 -05:00
a4b9bab1dc
Add --whitelist flag and internal logic
2013-11-04 23:24:21 -05:00
480e35037b
A start at a gem-based plugin whitelist for Pages.
2013-11-04 23:24:21 -05:00
6791f9fc12
Use the new `EntryFilter` class in `Site`
2013-11-04 21:35:53 -06:00
63713799cd
Extract Site#filter_entries into its own class
2013-11-04 21:35:13 -06:00
65653fed84
Bump version to 1.3.0
2013-11-03 21:48:34 -06:00
50fabc7b37
Update implementation of listen for v1.3.x
2013-11-01 23:16:04 -04:00
7a1f63d994
Sort plugins so people can have "load orders".
...
This allows for people to do something like "_plugins/1-autoload-global.rb" and have it load first and so on making it much easier to organize code and have a "header file" that does all the requiring up front if it's needed for all plugins.
2013-10-31 07:12:54 -05:00
9f63ddb4db
Prepare for a 1.3.0.rc release
2013-10-28 20:26:36 -05:00
3ab9841272
Fix 1.8.7 syntax errors.
2013-10-28 14:03:34 -04:00
f697d12027
Merge pull request #1651 from liufengyun/jsonify
...
support jsonify filter
2013-10-23 20:50:14 -07:00
2287eed0c6
Merge pull request #1589 from dchest/better-watch
...
Replace directory_watcher with listen.
2013-10-23 22:38:56 -05:00
23ad7fa4bd
Merge pull request #1557 from mojombo/require-gems-plugins
...
Add `gems` for better plugin management
2013-10-23 07:39:43 -07:00
f971aebfb1
support jsonify filter
2013-10-22 23:52:22 +08:00
12ba0a541c
Update listen to ~> 2.0.
2013-10-18 11:04:54 +02:00
0e784596a5
Merge pull request #1543 from maul-esel/fix-coderay
...
Add tests for special handling of kramdown's coderay options
2013-10-17 06:35:43 -07:00
c2aa26280c
extract pages.any?... in own method
2013-10-17 15:17:58 +02:00
f0aac30491
remove duplicated render code for posts and pages
2013-10-17 12:07:30 +02:00
7232948b62
simplify relative permalink deprecation
2013-10-17 12:06:21 +02:00
2b275ef192
oops, fix minor indentation quirk
2013-10-15 14:38:45 +02:00
dd851943c0
adjust frontmatter defaults precedence handling
...
Before, the bottom-most default set had highest precedence. Instead,
now the set with a longer i.e. more specific path has precedence and
sets with a type setting have precedence over those without one. In
case of equal precedence the bottom-most still wins.
2013-10-15 14:18:44 +02:00
20ea0c8d56
Merge branch 'master' into frontmatter-defaults
2013-10-14 19:44:06 +02:00
699eeba9f0
fix frontmatter defaults for custom paths
...
The Page#path or Post#path can be overriden by by a frontmatter
setting. This causes path-based frontmatter default detection to
fail. Add test to demonstrate this and fix it.
2013-10-14 19:16:53 +02:00
67a451ea84
fix slash handling for paths
2013-10-14 18:43:12 +02:00
0761769dda
Merge pull request #1615 from benbalter/downcase-lexers
...
Downcase lexers before passing to Pygments
2013-10-10 18:48:00 -07:00
87ef39aeb0
Add support for use of folders inside _layout path, closes #1622
2013-10-08 14:19:12 -03:00
844cc615e4
actually downcase lexer
2013-10-06 15:55:16 -04:00
9ff245dbdb
clean up comments to be more concise/uniform
2013-10-05 13:20:30 -04:00
d5f137bc86
downcase lexers before passing to Pygments
2013-10-05 11:26:26 -04:00
310688297b
I guess we'll wait until v2.0 to switch to absolute permalinks.
2013-10-04 15:03:05 -04:00
bf1d9a79c4
Add support for gem-based plugins.
2013-10-04 14:45:28 -04:00
b00849544b
fix error with variable as file name
2013-10-04 19:12:29 +02:00
fef96d95e1
Merge pull request #1495 from maul-esel/variable-include
...
Variable {% include %}
2013-10-04 05:42:27 -07:00
76ada8c672
output correct path in case of liquid error in layout
...
As with includes, an error in a layout was reported on the
page that used the layout. Fix this by passing on the path
of the layout that is rendered.
2013-10-04 00:07:50 +02:00
809ab5e355
Move catching of liquid errors in include tags
...
The previous code only caught render-time errors. This change
makes it catch parse-time errors as well, such as unknown tags.
2013-10-03 23:56:58 +02:00
92750c3cfd
Add parenthesis to the call for super
2013-10-02 21:51:32 -05:00
7a4ea086a1
Output path in case of render error in included file
...
Fixes #1591 .
2013-10-01 23:02:50 +02:00
623fa14b3c
Include tag: provide path in case of render error
2013-10-01 22:54:39 +02:00
2138dfc0ac
Fix code to allow dots in variables
2013-10-01 22:31:11 +02:00
a93795bcc0
implement variable retrieval in include tag
...
Fixes #1464 .
2013-10-01 22:28:45 +02:00
9d4f9169e9
Merge pull request #1514 from maul-esel/tag-errors
...
Consistent error handling in Liquid tags
2013-09-30 20:54:42 -07:00
cb4d15561c
Merge pull request #1003 from liufengyun/data-sources
...
support data sources
2013-09-30 20:47:57 -07:00
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
58cab6b050
Handle destinations outside of source.
2013-09-30 05:55:38 +02:00
dfaf1f45cc
Remove require 'pathname': already included.
2013-09-30 05:11:15 +02:00
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
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
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
c78c4159c0
Merge pull request #1571 from mojombo/non-destructive-array-concat
...
Use + instead of Array#concat
2013-09-23 07:16:41 -07:00
943acc4395
Remove overly specific css from site template
2013-09-23 13:23:54 +01:00
a88a63da2d
Don't use destructive Array#concat for Liquid Attribute arrays
2013-09-22 18:26:34 -04:00
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
9409a3d034
raise exceptions in include tag
2013-09-19 14:32:15 +02:00
72c3bba56a
Change error handling in 'post_url' tag: raise exception
2013-09-19 14:24:22 +02:00
06fb31544f
Change error handling for gist tag: raise exception
2013-09-19 14:24:22 +02:00
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
97e052df63
Pass encoding parameter as string, not an object
2013-09-19 12:21:26 +09:00
8b892ed735
read_yaml to accept optional parameter to override defaults
2013-09-19 12:21:25 +09:00
4cb24f4b87
consider a case of "site" is unavailable in Convertible
2013-09-19 12:21:25 +09:00
f4c2383d3c
write document for config.encoding
2013-09-19 12:21:25 +09:00
8a28d80690
add encoding for configuration
2013-09-19 12:21:25 +09:00
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
ec85c49de3
Change exception type
2013-09-17 22:11:56 +02:00
7cec996f90
Validate the entire markup as soon as possible
2013-09-17 21:41:11 +02:00
25519b38f6
Validate file name as soon as possible
2013-09-17 20:57:01 +02:00
8017548bd0
Rename variable
2013-09-17 20:46:01 +02:00
7f62e69837
Remove obvious comment
2013-09-17 20:36:33 +02:00
e5f99e2798
Remove return
2013-09-17 20:35:18 +02:00
3e2ab58d56
Fix unruby paradigm
2013-09-17 20:34:04 +02:00
a42e57f274
Rename constants
2013-09-17 20:14:41 +02:00
de49342324
Merge pull request #1556 from maul-esel/dest-match
...
Fix up matching against source and destination when the two locations are similar.
2013-09-16 18:34:22 -07:00
454e038fad
Require 'pathname'
2013-09-16 20:29:57 -05:00
3dadc94ce4
Don’t repeat yourself
2013-09-16 23:16:41 +02:00
299cb93147
improve path checking, now using Pathname instead of regex
2013-09-16 15:42:59 +02:00
bec4a07c12
Fix handling of source-dest matching being too aggressive
...
Fixes #1130 .
2013-09-16 14:41:20 +02:00
891ea8f604
People can symlink it if they want in unsafe mode
2013-09-16 08:37:07 +02:00
081b974114
Resolve conflict
2013-09-16 08:19:56 +02:00
79f50b0568
Resolve conflict
2013-09-16 08:15:10 +02:00
6f053fbc8c
Update gemspec & version to v1.2.1
2013-09-14 20:59:06 -04:00
29d0841e97
#to_sym is called by #symbolize_keys
2013-09-13 14:06:16 +02:00
4b8bb68e56
Cleanup newlines in Commands::Serve
2013-09-12 14:05:16 -04:00
c926596be7
Print better messages for detached server. Mute output on detach.
2013-09-12 14:02:52 -04:00
5775603f49
add inline code docs
2013-09-11 17:49:34 +02:00
0874c14b2c
improve validation code
2013-09-11 17:37:15 +02:00
accea6648c
fix for Ruby 1.8
2013-09-11 17:27:34 +02:00
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
9d44d3290b
make frontmatter defaults available to liquid
2013-09-11 00:55:57 +02:00
b3fdaa9792
add a class `FrontmatterDefaults` for handling of frontmatter defaults
2013-09-11 00:55:28 +02:00
3ccd8dad31
Add a method to retrieve type to post, page and draft
2013-09-11 00:48:05 +02:00
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
d8e0f009d2
Merge pull request #1363 from koron/stop-reverse-lookup
...
disable reverse lookup
2013-09-06 20:37:31 -07:00
afe1291f0c
Update Jekyll::VERSION
2013-09-06 22:23:31 -04:00
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
09ed340835
Fix include tag to avoid NameError
2013-09-02 14:25:13 +02:00
b7e34175d0
Put version under 'jekyll' namespace.
2013-08-30 18:54:03 -04:00
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
a9e2a74ea6
Merge pull request #1341 from maul-esel/minor-refactors
...
Minor refactors
2013-08-29 20:21:08 -07:00
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
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
4fa4ad2232
Merge pull request #1443 from ddavison/detachment
...
Detachment
2013-08-24 20:16:42 -07:00
b163bf637e
final mods
2013-08-24 21:31:05 -04:00
4c015fc5ff
move Jekyll::Cleaner to Jekyll::Site::Cleaner
2013-08-23 20:42:27 +02:00
dbd368f6ee
remove no longer necessary condition
2013-08-23 20:41:13 +02:00
9681f3a776
adding default configuration to false
2013-08-21 21:00:18 +00:00
4e52869f0f
adding detachment functionality
2013-08-21 20:53:01 +00:00
bca28056ef
Fix a misleading typo
2013-08-21 14:53:10 +02:00
d28858a9e9
put the Cleaner instance in a `Site#site_cleaner` method
2013-08-19 20:15:54 +02:00
0b3005b3b4
make obsolete_files a method (@mattr-)
2013-08-19 20:01:36 +02:00
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
506cdc5179
include: more helpful error message for symlinks
2013-08-18 17:08:42 +02:00
5d7dba476c
change site_cleaner to use attr_accessor
2013-08-17 22:33:01 +02:00
8b8fa4da4e
Use Doctor#healthy? and ensure _all_ items are checked before process quits.
2013-08-17 15:16:14 -04:00
5da13d2b66
Refactor `Site#cleanup`
...
Move the cleanup logic out into a separate class,
`Jekyll::Cleaner`.
2013-08-17 17:14:08 +02:00
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
32e55e7717
Use proper Ruby syntax for constant
2013-08-16 21:01:09 -07:00
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
eae3ae8479
fix handling of number categories
2013-05-10 14:07:23 +02:00
2a6c722e78
Add a `data-lang` attribute to code blocks
2013-05-10 19:18:13 +12:00
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
64f8a7b228
Move the require for related_posts to jekyll.rb
2013-05-08 07:39:00 -05:00
0c04e5d55b
Catching that the Redcarpet gem has been installed. Fixes #1059
2013-05-08 11:55:19 +02:00
09fafd6418
Fixing paginate_path on windows
2013-05-07 23:24:10 -07:00
f67f7f3db4
Move the building of related posts into their own class
2013-05-07 22:27:38 -05:00
c758f8d24f
Release 1.0.1
2013-05-08 01:03:14 +02:00
739f752580
Properly wrap and encode non-pygmentized code.
2013-05-08 00:45:55 +02:00
62b4fd77ac
Using modules instead of classes for Redcarpet with/without Pygments.
2013-05-08 00:28:51 +02:00
2114bb3c2e
Respect pygments config option in Redcarpet renderer.
2013-05-08 00:10:18 +02:00
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
f9e3cf21f9
Provide backwards-compatibility for change in #1037 .
2013-05-07 16:45:06 +02:00
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
39d33b48b0
Fix the index build with LSI
2013-05-07 06:58:54 -05:00
d0a9948eed
Let Commander handle bad args after printing of deprecation warning. Fixes #1040 .
2013-05-07 13:15:03 +02:00
a0ad8a4031
Don't print deprecation warning if no arg is specified. Fixes #1041 .
2013-05-07 13:10:29 +02:00
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
29b3dc97f0
Fixed typos
2013-05-06 20:27:00 +01:00
410e5912a2
Fixed html
2013-05-06 20:26:39 +01:00
c7b707cdfd
Ignore --help and --version in Deprecator. Fixes #1030
2013-05-06 20:17:28 +02:00
4d9d6b689b
Cleaning up the site template CSS.
2013-05-06 01:00:00 +02:00
06beb4b72b
Bump version for 1.0.0.
2013-05-05 23:02:45 +02:00
0b1d22dd61
Merge pull request #1016 from mojombo/fix-pagination
...
Paginate in subdirectories properly
2013-05-05 14:01:29 -07:00
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
50d66831ff
Merge pull request #964 from benbalter/html-template-site
...
Make Template site HTML5
2013-05-05 12:05:47 -07:00
8ec08fceb6
Downgrade default site template for Internet exploder
...
Swap `<header>` and `<footer>` tags to `<div>`s, so we can support IE without the need for an html5 shim.
2013-05-05 14:28:58 -04:00
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
ea71036e8c
Paginate in subdirectories properly. Fixes #878 .
2013-05-05 15:40:13 +02:00
9179f56ed7
Quick clean-up from #998 .
2013-05-05 14:59:50 +02:00
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
1b994a9682
Merge pull request #1015 from mojombo/loose-pygments-dep
...
Loosen Pygments Dependency
2013-05-05 04:48:37 -07:00
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
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
3feb18bb56
Redcarpet Parser requires pygments
2013-05-04 15:29:43 +02:00
3c218d2dcd
Only require pygments where it's needed.
2013-05-04 15:04:57 +02:00
67aaada839
Clean up some copy in the limit_posts error handling.
2013-05-04 14:57:27 +02:00
7554c4ce61
Parse strings into Time objects for date-related parsing. Fixes #997 .
2013-05-04 14:01:44 +02:00
c32b570114
Checking the arguments to ensure we have a subcommand before proceeding. ( #1008 )
2013-04-30 22:17:22 +02:00
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
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
0f52f15cc2
Clean up code #1104
2013-04-29 21:07:46 +09:00
94756340cd
Remove to_i. Let commander gem do it #1004
2013-04-29 15:56:02 +09:00
b4b66d5713
Merge pull request #1001 from mojombo/refactoring-convertible
...
Refactoring Jekyll::Convertible
2013-04-28 16:43:38 -07:00
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
Matt Rogers
Ivan Tse
Parker Moore
Eric Mill
Christoph Schiessl
Persa Zula
maul.esel
Matthew Iversen
David Sawyer
Greg Karékinian
Jordon Bedwell
liufengyun
Dmitry Chestnykh
Juan Ignacio Donoso
Ben Balter
Brice
Edward Ball
Shigeya Suzuki
MURAOKA Taro
Anatol Broder
Ishibashi Hideto
ddavison
ddavison
Frederic ROS
Pat Hawks
Nick Fagerlund
Wlodek Bzyl
Thomas Torsney-Weir
Lucas Jenss
zachgersh
John Piasetzki
Anand Narayan
imathis
Brian Kim
Mikael Konutgan
Casey Lang
Sebastian Morr
Roland Warmerdam
Christopher Giroir
Uwe Dauernheim
Pascal Borreli
Michael Klishin
uu59