4bdf4197db
Rocket style hash and switching integers for Logger severity constants
2014-05-25 23:19:29 +01:00
e6345f39a9
Renaming LogWriter to LogAdapter and adding tests for class
...
String coloring moved to Stevenson as not responsibility of LogAdapter
2014-05-24 21:22:10 +01:00
4a73e099b7
Allow Jekyll's logger to be set to any Logger compatible instance
...
* Stevenson now inherits from Logger and extends some methods to use $stderr
for log messages greater than info level.
* LogWriter provides an interface between Jekyll and Logger to maintain API.
2014-05-24 15:00:14 +01:00
bd836d88af
Spice up site_template feed
2014-05-23 09:42:12 -05:00
43074632b3
Take advantage of date_to_rfc822
...
Jekyll has a filter built just for this purpose
2014-05-23 09:34:49 -05:00
b9c3d8ba03
Merge pull request #2373 from tschmidt/handle-categories-in-site-config-defaults
2014-05-21 01:10:37 -04:00
3c6377d665
Merge pull request #2395 from rdumont/data-subdirectories
2014-05-21 01:09:15 -04:00
65275e5841
Merge pull request #2431 from jekyll/remove-collections-from-layouts
2014-05-21 01:07:01 -04:00
e37b3ca8e1
Any assets read in as Pages shall not be rendered or layout'd
2014-05-21 00:52:21 -04:00
5aefaa1c48
Merge pull request #2418 from mathbruyen/collections_permalink
2014-05-20 22:52:29 -04:00
7e05b6e0b3
Merge pull request #2420 from albertogg/fix-encoding-issue
2014-05-20 22:35:50 -04:00
cbe7e3e80e
Don't place asset files or yaml files in layouts
...
Ref: #2402
2014-05-20 17:11:34 -04:00
c76e41d157
Update `Utils#pluralized_array_from_hash` and `Utils#value_from_singular_key` per suggestion from @parkr
...
Switched to using the `#tap` method for more concise code. Also returning the value from
`value_from_singular_key` instead of returning an array wrapped presentation of the value.
This allows for a one-liner in `pluralized_array_from_hash`.
2014-05-20 12:32:59 -05:00
395d65454c
Merge pull request #2429 from jshawl/code-overflow-fix
2014-05-20 12:12:36 -04:00
e7c4fa0e5f
Prevent code overflowing container
2014-05-20 09:51:57 -04:00
7ce849a2b6
Revert changes and add encoding to the test file
...
* Add encoding to the test file as Ruby 1.9.3 doesn’t defaults to utf-8.
* Remove the forced encoding as encode seems too aggressive.
2014-05-20 00:03:40 -04:30
54fba9af4b
Merge pull request #2406 from yihangho/config-yaml
2014-05-20 00:15:58 -04:00
77cef764d6
Force encoding before escaping or unescaping
...
This will reassure not having any errors when escaping or
unescaping.
2014-05-19 18:50:25 -04:30
658a4d0b47
Try to load _config.yaml if _config.yml is nonexistent.
2014-05-19 09:06:55 +08:00
9932eb667b
Encode URLs in utf-8 when escaping and unescaping
...
There is a problem while returning a path that has some special and possible Non-ASCII characters that may lead jekyll to break while doing the unescaping process. This is can be addressed by “forcing” ASCII to UTF-8.
2014-05-17 17:53:40 -04:30
921dbe0547
Override collection url template
2014-05-17 10:40:52 +02:00
4147e92561
Merge pull request #2417 from jekyll/jekyll-env
2014-05-17 00:53:55 -04:00
780cff46b3
Add jekyll.environment to site_payload.
2014-05-17 00:38:21 -04:00
04b0fe0160
Merge pull request #2377 from jekyll/numeric
2014-05-16 03:50:50 -04:00
1c11afd78d
Fix #2413 and setup a Jekyll.env.
2014-05-15 16:28:37 -05:00
ba905a2c18
Merge pull request #2408 from quinn/patch-1
2014-05-15 12:37:56 -04:00
a38ea51994
Header links to pages which have a title
...
Header used to add link to all pages of the site, even those which do not have any title, creating empty anchors on the page like `<a class="page-link" href="/feed.xml"></a>`. Those were non click-able and used space on the page due to margins.
Now only displays pages with a title.
2014-05-15 08:59:29 +02:00
5ea62443f4
override EXCERPT_ATTRIBUTES_FOR_LIQUID
...
Allow EXCERPT_ATTRIBUTES_FOR_LIQUID to be overridden by inheriting class. Right now will always reference Jekyll::Post::EXCERPT_ATTRIBUTES_FOR_LIQUID. This is already being used in the codebase for ATTRIBUTES_FOR_LIQUID.
2014-05-14 13:39:16 -04:00
604fb3286c
Allow subdirectories in _data
2014-05-11 20:28:49 -03:00
6465cd6446
Setting log_level earlier to silence info level configuration output.
2014-05-11 21:14:10 +01:00
7756adc75c
Fixing spacing issue for `code` inside `pre`
...
Regular (one-line) code inside a `code` tag has some padding around it. This leads to some weird spacing when dealing with code blocks (e.g. inside `pre`).
Removing the horizontal paddings for these. (Also replacing `border: none;` with `border: 0;` because it's shorter)
2014-05-10 22:05:21 +02:00
01c09fd7fa
Merge pull request #2345 from penibelst/sort-collection
2014-05-10 15:42:53 -04:00
af9f1e6f48
Accept Numeric values for dates.
2014-05-09 23:11:05 -04:00
0371b69952
Set categor[y|ies] on post if they appear in site frontmatter defaults
2014-05-09 13:34:13 -05:00
bf3a20b2d7
allow json files in _data dir
2014-05-09 10:13:12 -04:00
fb523722b5
Fruity variables
2014-05-09 09:21:24 +02:00
df3c163eeb
Use item_property
2014-05-09 08:53:16 +02:00
d96f39360b
Revert "Make it fail"
...
This reverts commit c89e7539b86a483a2f8b14dd766ad90da1eb9773.
2014-05-09 08:53:16 +02:00
fd1778203d
Make it fail
2014-05-09 08:53:16 +02:00
9ba89b9ab1
Try item_property
2014-05-09 08:53:15 +02:00
ae7e485474
Add hash_property
2014-05-09 08:44:40 +02:00
036823cd06
Bump to 💎 v2.0.3
2014-05-08 22:43:04 -04:00
2d040c1aaa
Use Jekyll.logger for --watch error message.
2014-05-08 22:27:55 -04:00
81ff5ed7aa
Save --watch from errors.
...
Fixes #2355 .
2014-05-08 22:22:11 -04:00
a5c1a01965
Added item_property to where filter
2014-05-08 11:35:51 -07:00
348bcae763
If the input is a string but Time.parse can't parse it, maybe it's a UNIX timestamp.
...
Fixes #2339
2014-05-07 15:48:13 -04:00
77c0249d72
Use site.title instead of site.name in site template
...
Fixes #2324 .
2014-05-07 15:11:50 -04:00
f2f2ebfa4f
Register subclasses of subclasses of Jekyll::Plugin
...
The Sass and SCSS converters are practically the same – only different in
the input syntax and file extension. As such, we've created
`Jekyll::Converters::Scss` which is a subclass of `Jekyll::Converter`, and
`Jekyll::Converters::Sass` which is a subclass of
`Jekyll::Converters::Scss`. When `Site#instantiate_classes` is called on
`Jekyll::Converter`, it only instantiates the `Scss` converter, not the
`Sass` converter. This change fixes that.
Fixes #2334 .
2014-05-07 14:59:08 -04:00
8ad4dd332a
Don't fail if any of the path objects are nil.
...
Fixes #2325
2014-05-07 14:01:36 -04:00
da9b28d35c
Fix site template permalink typo
2014-05-07 11:36:14 -04:30
21f84e1548
Update gist.rb comments only
...
Strictly updated the reference to Examples and Valid Syntax to be inline with jekyll/jekyll-help#32
2014-05-07 07:34:00 -04:00
216f1150cd
The last of the site template prepending.
2014-05-07 00:31:53 -04:00
c71a4717dd
Prepend url, too, in feed.xml.
2014-05-07 00:09:12 -04:00
ac666490d2
Release 2.0.2
2014-05-06 23:59:49 -04:00
97e9fb29b0
Default baseurl to "" rather than to "/"
...
Also a fix for #2317
2014-05-06 23:54:56 -04:00
2dec333910
Set baseurl to nothing in new template site.
...
Previously, it caused all sorts of errors.
Fixes #2317 .
2014-05-06 23:50:58 -04:00
0a0d7858c6
Release 2.0.1
2014-05-06 21:57:33 -04:00
64cce065e6
Require kramdown instead of maruku.
...
CRAP CRAP CRAP whoops.
2014-05-06 21:55:11 -04:00
344906deb9
Release 2.0.0.
2014-05-06 20:11:44 -04:00
5c109ee8dc
Merge pull request #2299 from penibelst/sort-nils
2014-05-06 16:49:40 -05:00
1e0d9f899b
Follow Ruby Styleguide
2014-05-06 22:49:49 +02:00
b6cfb8aa4f
Merge pull request #2309 from jekyll/remove-unreleased-notes
2014-05-06 16:30:15 -04:00
c2d3f9d5b5
Close the file descriptor in has_yaml_header?
...
Previous method caused a problem where the calling Dir.chdir to get the next
directory's entries would cause the infamous 'Too many open files - getcwd'
error. Fixes #2279 .
2014-05-06 15:58:25 -04:00
7c1709fab4
Change nils argument to string
2014-05-06 21:36:13 +02:00
00f21ee93c
Add `output` to Document#to_liquid
2014-05-06 14:51:56 -04:00
6c1bb76316
Merge pull request #2303 from jekyll/jbranchaud-adding_exclude_tests
2014-05-06 14:40:18 -04:00
a7776f8279
Set relative_permalinks to false to deprecate!
2014-05-06 13:04:12 -04:00
2aa8908948
Stevenson now uses symbols instead of integers to set log level
2014-05-06 13:03:56 -04:00
63e959e4e1
Use Jekyll.logger, never puts
2014-05-06 13:02:35 -04:00
fda3461c5a
We deprecated relative permalinks in 2.0
2014-05-06 13:02:17 -04:00
413de3a0ee
Also exclude an entry if it starts with one of the items given in the exclude key.
2014-05-06 12:46:41 -04:00
a854a6a709
Merge pull request #2127 from XhmikosR/css
2014-05-06 12:32:52 -04:00
c8a715d09b
Merge pull request #2295 from jekyll/add-documents-listing
2014-05-06 12:28:58 -04:00
0087143b88
Merge pull request #2301 from TheTomThorogood/short_year_permalink
2014-05-06 12:14:25 -04:00
3755437d08
Write test for site.documents.
2014-05-06 00:11:35 -04:00
19e704f408
Override the sort filter
2014-05-05 10:26:46 +02:00
fc98f06ed7
Refactor docs_to_write
2014-05-04 21:22:57 -04:00
54b74fafba
Add documents to site payload
2014-05-04 21:22:51 -04:00
a2169bf0c4
Have separate methods for all docs and just the docs that are being written.
2014-05-04 21:19:09 -04:00
a0bbf7703b
make template site easier to customize
2014-05-04 21:07:23 -04:00
f2849ac269
Add :short_year to url_placeholders
2014-05-05 00:12:07 +09:30
3af22f12bf
Set content-type to text/html with utf-8 charset.
...
Fixes #2289
2014-05-03 18:51:55 -04:00
4ae8fefb95
Remove literal lang name from class, fix #2284
...
If code language is C classes for comment and language are the same
2014-05-03 20:23:28 +04:00
10f85eb856
Add missing vendor prefixed properties.
2014-05-02 09:15:03 +03:00
0463399389
Remove duplicate properties.
2014-05-02 09:15:02 +03:00
3e6a6ffb52
Update util functions
...
Cribbed from http://api.rubyonrails.org/classes/Hash.html#method-i-symbolize_keys
2014-04-28 02:06:41 -04:00
cf81331b39
Revert back to an intialize more similar to the original
2014-04-27 23:21:00 -04:00
446ca8f73d
Context is not used within any of the renders so no need to pass it
2014-04-27 23:21:00 -04:00
d6bd735aff
Refactor highlighting
...
Extract some of the common logic from the renderers.
2014-04-27 23:20:00 -04:00
513e77635b
Refactor 'jekyll serve' command.
2014-04-27 19:02:33 -04:00
3a610882f6
Avoid duplicated output using highlight tags
...
While using Rouge and an `highlight` tag, the output was duplicated
since the `output` variable in the Liquid tag definition was equal to
the highlighter's prefix value and the `<<` method changes its receiver.
Therefore, we should simply define an empty string and append the prefix
if it is present.
2014-04-27 12:22:40 +02:00
4e6d268ef3
Bump 💎 version.
2014-04-25 23:16:00 -04:00
068d921ef6
Fix up docs for collections.
...
#2238 .
2014-04-25 23:15:18 -04:00
6225073095
Use the 'output' key instead of 'write' for writing out collections' document files.
2014-04-25 19:47:35 -04:00
c906dfdf71
TEST THE COLLECTIONS
2014-04-24 14:01:23 -04:00
dd4fe87f69
Use Hash.new instead of hash literal
2014-04-24 13:59:25 -04:00
fb39b41ffb
NO MORE DATA COLLECTION I CAN'T HANDLE IT
2014-04-24 13:59:25 -04:00
b74c90dc20
Extract Collections metadata from site config
2014-04-24 13:59:24 -04:00
0dc680df0b
Always render collections, just don't always write them
2014-04-24 13:59:24 -04:00
7be78de93a
Don't read the collection if it's the data collection
2014-04-24 13:59:24 -04:00
f1a422dfff
Don't pretend there is a collections setter
2014-04-24 13:59:24 -04:00
a27e5825b9
Nil-out `@collections` so `#collections` will re-compile
2014-04-24 13:59:24 -04:00
fd98d5b1e6
Fetch collection names agnostically regarding the data structure of config['collections']
2014-04-24 13:59:24 -04:00
330005d932
Reset the collections hash on #reset.
...
Fixes #2234 .
2014-04-24 13:59:24 -04:00
4de2be8c5f
Add Jekyll::LiquidExtensions.lookup_variable
...
To use, just include `Jekyll::LiquidExtensions` as you please:
```ruby
class SayHi < Liquid::Tag
include Jekyll::LiquidExtensions
def initialize(tag_name, markup, tokens)
@markup = markup.strip
end
def render(context)
"hi #{lookup_variable(context, @markup)}"
end
end
```
Fixes #2071 .
2014-04-22 14:27:47 -04:00
9db5a1a6ce
Merge pull request #2205 from jekyll/maul-esel-frontmatter-defaults
2014-04-21 23:01:05 -04:00
6f0bebdfda
convert input to string before xml escaping
2014-04-18 16:54:48 -04:00
571fb95cc1
Only read in 5 bytes when checking for YAML header.
...
#2211 #2210
2014-04-15 09:48:44 -04:00
29fdc0946a
Use +rb switches when reading in file for checking existence of YAML header.
...
Fixes #2228 .
2014-04-15 09:46:53 -04:00
b0cf022983
Release 2.0.0.alpha.3
2014-04-14 23:17:32 -04:00
5a6f1d42a9
Fix #filtered_entries so it returns a new Array if the directory doesn't exist
2014-04-14 23:03:19 -04:00
696aea211a
Don't gather any entries if the collection directory doesn't exist
2014-04-14 22:56:23 -04:00
a1af95c34e
Clean up some code per @baweaver's suggestions.
2014-04-14 22:46:22 -04:00
ad7efb23e6
Code/docs cleanup, props @baweaver
2014-04-14 22:46:22 -04:00
af61451f87
Use #error instead of #warn when telling the user not to use a custom data source
2014-04-14 22:46:22 -04:00
62551b5ff9
Include data in the array of collections
2014-04-14 22:46:22 -04:00
aa502348e5
Filter entries in the collection per EntryFilter#filter
2014-04-14 22:46:21 -04:00
323ea0ef73
EntryFilter#special? should also check the base name of the entry
2014-04-14 22:46:21 -04:00
f0e68d7d86
Expose collections as site.<collection_name> in Liquid as array of docs.
2014-04-14 22:46:21 -04:00
00ca09a2ea
Add comments for Document
2014-04-14 22:46:21 -04:00
a307aff858
Do not render any asset files with Liquid.
2014-04-14 22:46:21 -04:00
5ae1c34857
Add comments for Collection
2014-04-14 22:46:21 -04:00
be769dcf00
SANITIZE THE collection name plz.
2014-04-14 22:46:21 -04:00
37a7236e20
Homagah it all renders I think.
2014-04-14 22:46:21 -04:00
a15a584136
Don't let that render get you down.
2014-04-14 22:46:21 -04:00
75f49a751e
OMG COLLECTIONS ARE RENDERING CALL THE POLICE
2014-04-14 22:46:21 -04:00
f082eca791
GUYS failing test for rendering
2014-04-14 22:45:20 -04:00
cefe99bed2
Sort the docs based on path
2014-04-14 22:44:29 -04:00
90807ac6e7
DEM TESTS
2014-04-14 22:44:29 -04:00
08162dbb50
Hey girl, i heard you like YAML.
2014-04-14 22:44:29 -04:00
50b46d7bee
OMG it's happening ~*Collections*~
2014-04-14 22:44:29 -04:00
a77c92aebe
Replace load-in of YAML data with Jekyll::Document logic.
...
COLLECTIONS IS COMING
2014-04-14 22:43:09 -04:00
6be33cf6ef
Merge pull request #1492 from maul-esel/publishing
2014-04-14 20:17:01 -05:00
4f66db6c38
Merge pull request #2211 from jekyll/pgp-key-header-frontmatter
2014-04-14 12:59:59 -04:00
b666ac787b
Stricter start of line check via \A
2014-04-11 15:15:37 -04:00
387cf2181a
use regex to verify yaml existence
2014-04-11 08:00:40 -04:00
46a5ab99f9
Support "published: false" for pages
...
Fixes 1034.
2014-04-07 16:22:04 +02:00
3a330dc7fc
Use Publisher instead of Post#published?
2014-04-07 16:20:13 +02:00
26663a6cf9
add the Publisher class to handle publishing logic
2014-04-07 16:17:51 +02:00
91e9ecfa63
Add an --unpublished option to render unpublished posts
...
Fixes #1337 , #469 .
2014-04-07 16:17:12 +02:00
fec6b59950
Use File.exist? instead of deprecated File.exists?
2014-04-06 13:31:34 +02:00
823c863a53
require newline after start of yaml header
2014-04-05 17:34:08 -04:00
955dc38400
Deep merge data overrides into defaults.
2014-04-05 15:42:53 -04:00
09c6ff4f9c
Post#published is no longer a thing.
2014-04-04 15:34:42 -04:00
6bd07501e8
Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults
...
* 'frontmatter-defaults' of git://github.com/maul-esel/jekyll:
move self.type to convertible
oops, fix minor indentation quirk
document frontmatter defaults precedence
adjust frontmatter defaults precedence handling
change cucumber feature to test for precedence too
fix frontmatter defaults for custom paths
more robust cucumber features
fix slash handling for paths
move cucumber features to own file
fix minor docs quirk
improve path checking, now using Pathname instead of regex
Add site documentation for the new feature
add inline code docs
improve validation code
fix for Ruby 1.8
Add basic cucumber features for frontmatter defaults
Retrieve frontmatter defaults when retrieved internally
make frontmatter defaults available to liquid
add a class `FrontmatterDefaults` for handling of frontmatter defaults
Add a method to retrieve type to post, page and draft
Conflicts:
lib/jekyll.rb
lib/jekyll/convertible.rb
lib/jekyll/core_ext.rb
lib/jekyll/page.rb
lib/jekyll/post.rb
2014-04-04 15:32:27 -04:00
f3c54fcf50
Merge pull request #2189 from benhanzl/move_rouge_loading
2014-04-02 22:38:05 -04:00
9ace48c835
Merge pull request #2197 from jekyll/plugin-manager
2014-04-02 22:15:40 -04:00
1863057b7e
Ok handle the plugins_path stuff in the PluginManager.
2014-04-02 22:06:38 -04:00
4a4c8846f4
Fetching/determining the plugin path is beyond this it's kind of sad.
2014-04-02 21:59:15 -04:00
8ccdee4035
STRIP ALL THE NEWLINES FROM HIGHLIGHTED CODE ok just the ones at the beginning and end
2014-04-02 14:37:22 -04:00
2a3f0c0ec3
Strip content of the {% highlight %} block
...
A fix for #1801
2014-04-02 14:11:19 -04:00
806f43cdbc
Merge pull request #1568 from nitoyon/url-escape
2014-04-02 14:09:09 -04:00
52ac2b3850
Permit YAML blocks to end with three dots
...
The YAML spec permits blocks to end with three dots (...) in addition to
three dashes (---): http://www.yaml.org/spec/1.2/spec.html#id2760395 . Some
programs that work with Jekyll (e.g., Pandoc) prefer the dots to dashes. This
commit permits the YAML metadata block to end with either dots or dashes. It
includes tests.
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-04-02 14:06:22 -04:00
14d9902586
Merge pull request #2200 from fabianrbz/remove_unnecessary_post
2014-04-01 23:10:37 -04:00
04666cd0cf
remove default post with invalid date
2014-04-01 22:32:12 -03:00
5d761a1c2b
Require 'plugin_manager' in lib/jekyll.rb
2014-04-01 18:44:37 -04:00
f418ea5fc3
Extract plugin management into its own class.
2014-04-01 18:10:51 -04:00
f2ed30dff5
Move rouge loading
2014-03-31 19:48:18 -04:00
a6ab3abbf9
Update site_template/_includes/head.html.
...
* remove `chrome` from `X-UA-Compatible`; it's been discontinued
* remove unneeded end tags
* remove unneeded slash in `canonical` link
2014-03-31 20:38:18 +03:00
8c0e5d8d98
remove duplicate code for tags and categories
...
Previously the `Site#tags` and `Site#categories` actually had the
same structure as a hash returned by `Site#post_attr_hash()`, but
maintained separately. Remove this duplicated infrastructure. For
backwards-compatibility for plugins, provide aliases for them.
2014-03-31 01:02:08 +02:00
e277855eee
Merge pull request #2165 from Zequez/master
2014-03-30 00:19:03 -04:00
840ef35be9
Merge pull request #2175 from jekyll/security-yo
2014-03-29 23:18:07 -04:00
302bc46914
rename variable inside block
2014-03-27 19:53:28 -03:00
adcfde14ed
align 'end' with 'def'
2014-03-27 19:52:52 -03:00
4c5dfa1391
remove unused variables
2014-03-27 19:49:41 -03:00
009e2c200d
Only strip the drive name if it begins the string.
2014-03-27 18:19:35 -04:00
859a615e93
Bump 💎 version to 2.0.0.alpha.2 and release.
2014-03-26 14:04:59 -04:00
5745eb9be8
Added option to force watch to use polling
2014-03-23 01:09:00 -07:00
81e4e1d8f4
add support for unpublished drafts
...
I keep all my ideas for blog posts as drafts in my draft folder. However I'm
only really working on a couple at once. This let's me mark drafts that I'm
not working on right now as unpublished so they don't clutter the site while
I'm checking on the other drafts.
2014-03-22 19:52:10 -04:00
c56ce248c9
Move URL escape to Jekyll::URL
2014-03-21 16:59:25 +00:00
e3e1c11509
Fix Page#url escape
...
Post#url wasn't escaped at all.
For example, when we have a page named 'a#b.html',
we expect its url to be 'a%23b.html',
but it was actually 'a#b.html'.
We now use Jekyll::URL.escape_path and Jekyll::URL.unescape_path.
2014-03-21 16:57:41 +00:00
eebb6414bf
Fix Post#url escape
...
Post#url was escaped using CGI.escape.
When file name contains a space character, its url points to
non-existing URL.
For example, when we have a post named '2014-01-02-foo bar.md',
we expect its url to be '/2014/01/02/foo%20bar.html',
but it was actually '/2014/01/02/foo+bar.html'.
We now define Jekyll::URL.escape_path and Jekyll::URL.unescape_path,
and use them to escape and unescape Post#url
2014-03-21 16:57:40 +00:00
1b8205245e
Went with @stomar's suggestion
2014-03-19 00:49:50 -04:00
63e977721a
Add a message and error out when Pygments returns nil.
2014-03-19 00:48:35 -04:00
d80471c0a3
Merge pull request #994 from stephenmcd/master
2014-03-17 17:45:49 -04:00
de9ce3437d
Protect against nil @lang before fixing for css class names.
2014-03-18 08:41:49 +11:00
e746b3bd5f
Initialize each command in its own class so we can be *magical*.
2014-03-13 14:07:05 -04:00
ac37b8acee
Merge pull request #2122 from XhmikosR/whitespace
2014-03-11 11:10:04 -04:00
553338636b
Trim trailing spaces and convert tabs to spaces.
2014-03-11 07:44:01 +02:00
19dc855551
Properly strip drive name from clean path when sanitizing path.
2014-03-10 14:35:19 -04:00
37c2da5062
Properly clean path for Windows machines which is *nix-compliant.
2014-03-09 21:12:34 -04:00
7787d64bce
Rename those Utils functions.
2014-03-04 15:52:05 -05:00
5e8643d855
Add Utils.stringify_hash_keys
2014-03-04 15:44:53 -05:00
e2af1b547b
Extract core extensions into a Utils module
...
Fixes #2111
2014-03-03 22:13:03 -05:00
0633cbf8fa
Bring in jekyll-sass-converter
2014-02-28 21:20:20 -05:00
9ffb984f37
Sass support should be shipped outside core.
2014-02-28 21:12:00 -05:00
d7598ee9d2
Ensure inputted code is a string.
2014-02-24 17:42:46 -05:00
77f26d5681
Upgrade to guard/listen 2.x
2014-02-24 17:10:43 -05:00
8a0d036b87
Greatly simplify Jekyll's gemspec.
2014-02-24 16:15:51 -05:00
b6f006c152
Merge pull request #2050 from jglovier/master
...
* jglovier-master: (35 commits)
Fix for menu at mobile again
Fix site footer styles on mobile
Fix for menu not working on mobile
dat breathing room tho (expand site width slightly more)
Replace footer github and twitter link text with inline SVG icons
Post content styles for mobile
Replace unicode menu icon with inline SVG
Adds mobile styling for menu at sub 600px viewport widths
🔥 permalink option so default date permalink method is left in tact
For the love of perf, add syntax.css rules to main.css and call only one stylesheet
Adds another placeholder post to illustrate post content styles
Dem new styles tho
Copy tweaks - brevity FTW
Use class instead of id for CSS specificity ❤️
Add link for RSS subscription
Slightly friendlier and personal date formatting; classes for dem styles, yo
Remove to avoid confusion with site.title
demonstrate use of permalink settings
Add site.url for use in head canonical meta and feed.xml template
Add site.description for use in site head document meta, and feed.xml template
...
2014-02-24 16:07:20 -05:00
e2c67e0239
Fix for menu at mobile again
2014-02-24 16:03:39 -05:00
2c100a8e87
Fix site footer styles on mobile
2014-02-24 15:56:49 -05:00
7fbc636824
Fix for menu not working on mobile
2014-02-24 15:42:03 -05:00
57d07469d3
Sanitize paths uniformly, in a Windows-friendly way.
...
Fixes kinda a #1948 thing.
Related to #1946 .
2014-02-23 20:05:23 -05:00
f1c4e247a5
Remove unnecessary references to `self`
2014-02-21 16:27:21 -06:00
bdd35789db
dat breathing room tho (expand site width slightly more)
2014-02-20 20:34:09 -05:00
e0166682da
Sort the static files by relative path before sending to liquid
2014-02-19 14:02:03 -05:00
e3dd908d55
Add StaticFile#to_liquid['extname'] :)
2014-02-19 13:55:58 -05:00
b5a398bdff
Add StaticFile#to_liquid and StaticFile#relative_path
2014-02-19 13:35:13 -05:00
949aa3fc32
Test fetching of static files
2014-02-19 13:16:21 -05:00
6e40338f9e
Expose site.static_files to Liquid
2014-02-19 13:04:33 -05:00
6a6e66bf9e
Merge pull request #2058 from jekyll/layouts-relative-to-config
2014-02-18 01:53:15 -05:00
b68229aa2c
Make LayoutReader#layout_directory public.
...
Since it's being used in a test, let's go ahead and expose it instead of
dealing with using Object#send to send the message along.
2014-02-17 22:13:29 -06:00
6bc4776199
Replace footer github and twitter link text with inline SVG icons
2014-02-17 22:23:30 -05:00
aa4280904a
Post content styles for mobile
2014-02-17 16:58:12 -05:00
1c5ed75e72
Replace unicode menu icon with inline SVG
...
- unicode menu icon doesn’t render pixel crisp (has some
anti-aliasing), whereas SVG renders pixel optimized
- using inline SVG (instead of a referenced, attached file, will save
an http request
2014-02-17 16:52:48 -05:00
893b664f34
Adds mobile styling for menu at sub 600px viewport widths
2014-02-17 16:36:21 -05:00
e5bcddfbe0
Merge pull request #2041 from anthonyjsmith/webrick_index_xml
2014-02-17 16:23:25 -05:00
3e6f2d8cef
🔥 permalink option so default date permalink method is left in tact
2014-02-17 12:42:15 -05:00
1a879a04ab
Add tests for determining source dir
2014-02-16 23:19:03 -05:00
47babef79a
Make the layouts: config key relative to CWD or to Source
...
Fixes #1576 .
2014-02-16 22:42:38 -05:00
ab0ebadee3
Merge master into security-vuln-patches
2014-02-16 22:02:03 -05:00
264dfc164d
When an include cannot be found, only print file path relative to source.
2014-02-16 22:00:33 -05:00
fb8e562123
Merge pull request #2042 from anthonyjsmith/draft-path
2014-02-16 21:36:00 -05:00
c47751148c
Remove executable bits of non executable files.
2014-02-17 01:41:12 +01:00
28554fd307
For the love of perf, add syntax.css rules to main.css and call only one stylesheet
2014-02-15 23:27:34 -05:00
bd80ce4c61
Adds another placeholder post to illustrate post content styles
2014-02-15 23:24:30 -05:00
cac15574e7
Dem new styles tho
...
- Uses new typography, including Helvetica light, larger font-sizes,
and px values
- Wider site width, larger margins, and overall more whitespace
- Responsive down to mobile
2014-02-15 23:21:15 -05:00
1e28eee0c7
Copy tweaks - brevity FTW
2014-02-15 23:17:05 -05:00
6773307237
Use class instead of id for CSS specificity ❤️
2014-02-15 23:16:47 -05:00
a11f01784a
Add link for RSS subscription
2014-02-15 23:16:23 -05:00
e5cf3cbbc1
Slightly friendlier and personal date formatting; classes for dem styles, yo
2014-02-15 23:16:11 -05:00
3d464688fc
Remove to avoid confusion with site.title
2014-02-15 23:15:37 -05:00
8d05a54590
demonstrate use of permalink settings
2014-02-15 23:14:20 -05:00
e398c3b16c
Add site.url for use in head canonical meta and feed.xml template
2014-02-15 23:14:01 -05:00
287851ebb4
Add site.description for use in site head document meta, and feed.xml template
2014-02-15 23:13:43 -05:00
b3a2ea4e3e
Software with Personality™
2014-02-15 23:12:42 -05:00
240bbf4abb
Adds feed.xml file for generating an RSS feed
2014-02-15 23:10:25 -05:00
53ae5a7b0f
Add placeholder About page
2014-02-15 23:09:28 -05:00
1687f0855d
Add placeholder Projects page
2014-02-15 23:09:19 -05:00
16d8d05172
Adds a basic page template
...
Many users moving to Jekyll from other popular blogging options (like
Wordpress) will be used to thinking in terms of pages/posts. Having a
page template like this will be convenient for those users.
2014-02-15 23:07:10 -05:00
fcd2383de3
Refactor post template
...
- add article tags around post content
- creates post header
- add conditionals for extra options in meta
2014-02-15 23:04:44 -05:00
1b54afe67a
remove extra line
2014-02-15 23:03:13 -05:00
d5ea6e47dd
Restructure default template to include page content wrap
2014-02-15 23:02:41 -05:00
8fa48b492e
Footer markup restructuring
...
- rework footer to use columns
- add additional area for generic text
2014-02-15 23:02:04 -05:00
6d4e3f8c72
Refactor header markup
...
- use anchor instead of h1 for site title, for semantic accuracy, and
because post h1’s should be the post title
- implement nav wrapper for nav links
- use div.wrap for design structure
2014-02-15 23:00:37 -05:00
d52b9b7e5b
Remove redundant home link
2014-02-15 22:57:10 -05:00
a1b60430d6
Add canonical meta set with config params for more google ❤️
2014-02-15 22:56:30 -05:00
b9875b7bc8
Add description meta set in config, for teh google ❤️
2014-02-15 22:56:04 -05:00
7b0bf0d85c
Add conditional to default to site.name if no page.title is set
2014-02-15 22:55:14 -05:00
3b97799837
Separate global components into includes for convenience, and to familiarize users with includes structure
2014-02-15 22:53:48 -05:00
699066ef85
Add `.mkdown` as valid Markdown extension
...
GitHub Linguist recognizes `.mkdown` as Markdown, so Jekyll should support it as Jekyll is used on GitHub pages.
2014-02-15 22:01:37 +01:00
86208d8c33
Add index.xml to WEBrick DirectoryIndex
...
Resolves #2040
2014-02-13 23:12:36 +00:00
88e35f0852
Release 2.0.0.alpha.1
2014-02-13 18:02:49 -05:00
ac7bed335a
Merge pull request #1976 from jekyll/fix-pagination-issue
...
Relative posts should never fail to build, even if @dir or @name is nil
2014-02-13 12:39:23 -06:00
83f5b4d93b
Merge pull request #2031 from jekyll/utf8-heart
2014-02-13 12:53:58 -05:00
69dc96dc9f
Removed accidental linebreak
2014-02-13 13:28:11 +00:00
933590b6ba
Added a breakpoint for .site to make it responsive
2014-02-13 13:27:34 +00:00
c58c5b8782
Default to using the UTF-8 encoding when reading files.
...
Fixes #2029 .
2014-02-11 17:48:52 -05:00
18279558da
Update #relative_path for _drafts and add tests.
...
Resolves #2019 . Add new tests for drafts. Also check path variable in
test for posts.
2014-02-11 12:48:34 +00:00
56a633ae95
Update Jekyll version to latest released.
...
Latest release can be found on the v1-stable branch.
2014-02-09 18:44:30 -05:00
dd3018ce02
Merge pull request #1988 from jekyll/maruku-to-kramdown
2014-02-08 17:07:54 -05:00
22f2001ff5
Set default markdown converter to Kramdown
...
- Update default markdown converter in docs for configuration
- Update tests so they are in line with Kramdown output
- Add deprecation message to when config is built
2014-02-08 13:17:46 -05:00
1176fc6f57
Give File.join the strings from the array
2014-02-08 00:38:59 -05:00
c36a6d3e0d
Wrap the LayoutReader in the Jekyll module
2014-02-06 23:07:38 -06:00
833b40095f
Rename `with` to `within`
...
Thanks @parkr
2014-02-06 23:07:11 -06:00
fd92820b03
Remove Site#read_layouts
2014-02-06 22:46:09 -06:00
70ecef0094
Sort methods from most important to least important
...
This idea is based on the concept of a newspaper. The most important
things such as the headlines and the major details of the story at the
top. This translates to code in that the public API and the more
important private methods are at the top of the file. The more detailed
information (or methods, in the code) are further down, so that if
you've gotten all you need out of the code up to a certain point, you
don't need to keep reading anymore.
2014-02-06 22:22:06 -06:00
c5b81d580b
Refactor the LayoutReader class
2014-02-06 22:22:06 -06:00
f581940c71
Create a LayoutReader class to read layouts
2014-02-06 22:22:06 -06:00
f638fb1784
Merge master into security-vuln-patches
2014-02-06 17:21:54 -05:00
5edb4c6bfd
Merge pull request #1982 from dtao/safe-yaml-no-clobber
2014-01-31 06:48:16 -08:00
baabe7eb7e
DRY up code, props @tamouse
2014-01-30 22:03:10 -05:00
2b973468bf
Merge pull request #1991 from jekyll/coffeescript
2014-01-30 18:39:40 -08:00
509e2181de
sync mime types to GitHub
2014-01-26 12:15:15 -06:00
fdbfd719ca
Add CoffeeScript converter.
2014-01-25 20:38:51 -05:00
4a769dbf5f
Optimize Post#{next,previous}
...
Use object equality for comparisons rather than Comparable#==,
which in turn uses Post#<=>, which is slow.
This yielded a 3x performance improvement for `jekyll build`
on a large site (1m6.467s -> 0m19.532s).
2014-01-24 17:17:41 -08:00
5b7a53b543
Merge pull request #1932 from jekyll/sass
2014-01-24 15:18:06 -08:00
c9a3c40f83
fixes based on @mattr-'s notes
2014-01-24 12:19:19 -05:00
774bf96c61
Merge master into sass
2014-01-24 12:17:35 -05:00
4f0b1bdf6d
switched from YAML.safe_load* to SafeYAML.load*
2014-01-23 17:25:17 -08:00
98857832cd
Merge pull request #1931 from liufengyun/published
2014-01-22 05:38:04 -08:00
606c525099
Relative posts should never fail to build, even if @dir or @name is nil
...
Fixes https://github.com/jekyll/jekyll/issues/1963
2014-01-21 23:50:20 -05:00
22e1e5f28c
make sure pages with published being false are not generated
2014-01-19 09:52:19 +08:00
4c140efba8
fix full path leak to source directory when using include tag
2014-01-15 21:36:35 +01:00
e3be74e376
sanity check for pages permalink traversal
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
a8dd34420b
Prevents disclosure of file existence
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
c84cb5c007
escape relative post permalinks, cleanup
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
a799e41b70
patch symlink vuln and properly test
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
323d14845f
rebreak tests, move sanitization closer to write
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
9b3068c15d
url escape before sanitizing
...
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
2014-01-13 22:21:30 -08:00
4afe39e461
Allow caching in unsafe mode, but disable in safe mode.
2014-01-12 21:36:08 -08:00
4784d1de18
Build Sass configuration options.
2014-01-12 21:30:30 -08:00
22d4e2aa90
Consolidate into one master 'Sass' converter.
2014-01-12 21:30:29 -08:00
daa0b76484
Allow users to specify options for Sass.
2014-01-12 21:30:29 -08:00
4da7223831
Fixes for Sass/SCSS converters.
2014-01-12 21:30:29 -08:00
824a84ef2a
Add support for Sass and SCSS.
2014-01-12 21:30:29 -08:00
6f394e82b5
Rename read_things to read_content.
2014-01-11 15:29:22 -06:00
d96165e3c4
Merge pull request #1916 from jekyll/gitignore-excludes
2014-01-11 10:37:31 -08:00
5a52986db0
Use 'Forwardable' module to pass along some attribute calls to @post
2014-01-10 22:54:06 -08:00
331c7adc08
Move #glob_include? from core_ext to entry_filter
2014-01-08 20:24:21 -08:00
3d67cdc150
Cast to string before duplicating.
2014-01-05 11:02:03 -08:00
35868807c1
Ensure leading slashes in path matching.
2014-01-05 10:54:52 -08:00
42fc5e9ee7
Excludes should be relative to the site source
2014-01-05 10:45:42 -08:00
883e16acde
Merge pull request #1910 from pborreli/typos
2014-01-04 08:12:20 -08:00
a33e86630d
Merge pull request #1899 from soimort/preview-404
2014-01-04 08:04:20 -08:00
bdda3a8ef6
Fixed typos
2014-01-04 14:17:38 +00:00
6ca731c13b
Use idiomatic #is_a? method instead of #class ==
2014-01-03 21:23:02 -08:00
39e4d6b3ba
add where filter to filter arrays of objects
2014-01-03 21:23:02 -08:00
99b36c7c30
Routing 404 errors to custom 404 page for development server
2014-01-03 03:23:46 +01:00
fdcf1f4526
Add --quiet flag
2014-01-01 18:50:27 +02:00
012387396a
Merge pull request #1859 from robin850/rouge
2013-12-30 22:45:07 -06:00
a2fd8ba7c3
Merge pull request #1849 from afeld/sort-attributes
2013-12-30 20:31:45 -08:00
791c6d815d
Merge pull request #1825 from arika/smallfix_post_url_tag_behavior_for_invalid_names
2013-12-25 22:32:50 -08:00
1a3a607fcf
Merge pull request #1831 from jekyll/default-maruku-fenced-code-blocks
2013-12-25 22:14:23 -08:00
6e8f31f406
Merge pull request #1841 from jens-na/include-variable-liquid-filters
2013-12-25 22:11:33 -08:00
ebaa484294
Merge pull request #1866 from colindean/patch-2
2013-12-25 22:06:34 -08:00
ab95cca434
Add TomDoc for Jekyll::Converters::Markdown#allowed_custom_class?
2013-12-26 00:33:34 -05:00
7b9984699c
Fix error in exception message in Markdown Converter [ci skip]
2013-12-26 00:14:24 -05:00
60b43104ee
Extract checks for acceptable custom markdown processors to method.
...
We should probably write more about what it does and how it works in a TomDoc block above.
@envygeeks, want to give that a shot?
2013-12-26 00:02:56 -05:00
a206dc1a8f
Use downcase.
2013-12-25 23:55:20 -05:00
c70350e275
Merge branch 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll into gjtorikian-steal-envygeeks-custom-markdown-processors
...
* 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll:
Depend on Jekyll.logger.error, not $stderr
Allow custom Markdown processors.
New is implied by `raise`, 2nd is the message.
Use $stderr, not STDERR, $stderr points to STDERR.
2013-12-25 23:52:50 -05:00
31bebf0f9e
Depend on Jekyll.logger.error, not $stderr
2013-12-25 19:36:49 -06:00
c759a7a75f
Allow custom Markdown processors.
2013-12-25 19:36:25 -06:00
626d54a812
New is implied by `raise`, 2nd is the message.
2013-12-25 19:36:25 -06:00
4d017b4fed
Use $stderr, not STDERR, $stderr points to STDERR.
2013-12-25 19:36:25 -06:00
036cbda2f6
Require at least 1.3.0 for Rouge
...
Rouge 1.3.0 introduced a `rouge_formatter` helper which is handy to
overwrite the formatter default when using the Redcarpet plugin so let's
require this version at the very least.
An abort statement will be thrown when the installed version is not
correct.
2013-12-25 18:06:29 +01:00
9d5785cead
Merge pull request #1847 from schneems/schneems/better-bat-time-error
2013-12-24 11:05:34 -08:00
88686e759e
Add `path` to required methods
...
The error messages in this module call `#path`, but the module does not require the `path` method to be implemented. This change documents that classes which include `Convertible` must define `path`.
See #1846 for discussion.
2013-12-23 12:56:02 -05:00
3ca2cb0119
Fix various typos and improve the doc
2013-12-23 13:03:29 +01:00
cab9047de1
Set the wrap option to false when using Rouge
...
Since Rouge yields the pre tag with a class attribute but we don't want
it, we should set the wrap parameter to false when instantiating a new
formatter object.
Also use Rouge::Formatter#format instead of #render which is deprecated
and will be removed in the near future.
2013-12-23 13:03:24 +01:00
fa8618879d
Merge remote-tracking branch 'upstream/master' into sort-attributes
2013-12-22 19:31:56 -05:00
bd442680ea
Rely on the Redcarpet plugin instead of hard-coding
...
To avoid code duplication and have to keep tracking of the API change of
Rouge, let's rely on the Redcarpet plugin and customize the output on
our needs.
2013-12-22 18:45:46 +01:00
4bf716c2ad
Set highlighter to pygments when upgrading
...
In case you are upgrading from 1.4.2 to 2.0 and the pygments option is
set to true, then the highlighter option will be set to pygments
automatically.
2013-12-22 18:45:46 +01:00
0831d2b0f8
Add support for the Rouge syntax highlighter
...
By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.
The documentation has been updated accordingly.
2013-12-22 18:45:40 +01:00
92064134d6
Rename the pygments option to highlighter
...
Rename the pygments configuration option to highlighter to allow
different highlighters in the future. For now, the allowed values are
`pygments` and `null`.
It's now more straightforward to plug another syntax highlighter.
2013-12-22 12:45:15 +01:00
2bfafb3b33
make non-data properties/methods accessible to Liquid
...
per https://github.com/jekyll/jekyll/pull/1849/files#r8490593
2013-12-22 03:38:32 -05:00
c2b750448e
allow data attribute access by Liquid on Convertible items
2013-12-19 17:14:51 -05:00
10ee83d680
edited raise message when validating included file
2013-12-19 18:23:21 +01:00
3c1d45f45f
Sort pages by name by default
...
The order that files are returned differs across operating systems, so
ensure that they're being sorted after the fact.
2013-12-19 01:02:25 -05:00
22017d085b
Better error message when time is not parseable
...
Give the full path of the file that cannot be parsed so the user can locate it easier. Follow up the error message with helpful instructions: they can resolve the error by fixing the date or excluding the file or directory from being processed.
2013-12-18 16:14:21 -06:00
43ef9a2e4f
variables in include tag with filters
2013-12-17 23:51:52 +01:00
ecab2eb473
made error description more helpful
2013-12-17 10:57:12 +09:00
1ebce26881
Default Maruku fenced_code_blocks to ON.
...
Extends https://github.com/jekyll/jekyll/pull/1799
2013-12-15 16:08:21 -05:00
9d259fe315
added error description for invalid post name
2013-12-15 17:18:11 +09:00
a5545d5bad
post_url tag raises ArgumentError for invalid name
...
Using post_url tag with invalid name raises TypeError.
It should raise ArgumentError and should display detail of the error to
fix the error.
2013-12-14 22:30:22 +09:00
6195192bcf
mojombo/jekyll ~> jekyll/jekyll
2013-12-11 17:44:33 -05:00
39b6fe732f
Merge pull request #1780 from mojombo/kill-1-8
2013-12-11 06:08:10 -08:00
6efb726e2b
Merge pull request #1805 from ivantsepp/scaffold_vertical_scrollbar
2013-12-10 20:58:45 -08:00
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
f7fde70f5f
'The Best of Both Worlds,' à la @chad's comment
2013-04-28 15:21:17 +02:00
ad2c706a34
Fix `jekyll serve --limit_posts n` failed
2013-04-28 02:03:08 +09:00
5f13e00791
Comments for Convertible.render_all_layouts and Convertible.render_liquid
2013-04-26 21:09:02 +02:00
fcbab9a3ca
Post#is_published ~> Post#published?
2013-04-26 21:00:47 +02:00
f7841d1713
Remove unnecessary self.tags.flatten! in favour of a one-line sol'n.
2013-04-26 20:59:54 +02:00
422a4bd5cd
Renamed tag- and category-instantiation methods
2013-04-26 20:25:07 +02:00
6d9845a58b
Refactor Post category instantiation
2013-04-26 20:23:58 +02:00
482986e346
Refactored setting of Post.published flag
2013-04-26 20:21:17 +02:00
266a52b161
The call to Post#read_yaml was in an unnecessary begin...rescue block.
2013-04-26 20:09:18 +02:00
09c1c01d07
Refactor Post#related_posts to build the index in a different method
2013-04-26 20:05:52 +02:00
ffa93c22f1
Refactor Post#to_liquid
2013-04-26 20:03:57 +02:00
29a1c18300
Refactoring Jekyll::Convertible
2013-04-26 19:36:52 +02:00
fc09ac4862
Use post's directory path when matching for the post_url tag
2013-04-25 13:58:05 -04:00
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
a38902b5a7
Use valid css class names when pygments language contains invalid chars, eg html+jango
2013-04-23 06:48:31 +10:00
24aabbe05f
Moving comparison for PostUrl tag to the PostComparer class
2013-04-22 12:57:52 +02:00
d73841c961
always ADD a leading slash to page.url or post.url
2013-04-20 13:15:40 +02:00
c6df2e150a
remove leading slash from page.url and post.url
2013-04-19 16:37:48 +02:00
ba64a9fe30
Fail if destination directory for jekyll new exists and is not empty. Fixes #981 .
2013-04-16 18:24:10 +02:00
11419868dc
CSS reorganization
...
1. Fix regression on s/.footer/footer/
2. Fix whitespace and tabbing
3. Reorganize properties more logically
2013-04-16 09:48:18 -04:00
6ed41e373c
Remove code duplication: #write in Page and Post is the same.
2013-04-16 02:55:31 +02:00
c0c0150bb5
Release 1.0.0.rc1
2013-04-16 00:47:31 +02:00
82f32d5c02
Merge configuration properly. Closes #978 .
2013-04-16 00:41:10 +02:00
55b890b407
Move site title to H1 tag, wrap header in header tag.
2013-04-15 16:50:01 -04:00
223dbdc155
86'd conditional IE classes
2013-04-15 13:37:05 -04:00
e7546a98f6
Remove unnecessary override of #read_yaml in Page.
2013-04-15 19:24:23 +02:00
14ca57893f
86'd Chrome Frame in template site
2013-04-15 12:04:27 -04:00
b7064a4bc3
remove 'post' and 'page' default layouts
2013-04-15 17:24:09 +02:00
b4f68baafb
Jekyll.set_timezone accepts just the timezone, not the config
2013-04-15 15:39:36 +02:00
c0a2d0f888
Fixed syntax error
2013-04-15 00:42:13 +02:00
b249289b9d
Set the timezone for the process
2013-04-15 00:42:13 +02:00
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
f7310f554e
Whitespace in post.rb
2013-04-15 00:32:04 +02:00
55a964a7da
Print deprecation warnings for 'server', 'watch' and 'auto' when loaded from files. Fixes #972
2013-04-14 23:18:47 +02:00
e531925cae
Fixes multiple config loading. Closes #973 . Rel: #945 .
2013-04-14 23:04:20 +02:00
e0335e2167
.formatted_topic has moved back to Jekyll::Logger. Update Build.watch to use it
2013-04-14 20:21:39 +02:00
398cd633b6
Merge pull request #959 from mojombo/deprecator
...
Refactor Logging and Deprecation Messaging
2013-04-14 11:05:07 -07:00
4ef107f3e8
Remove Logger methods from main Jekyll module.
2013-04-14 19:27:19 +02:00
ba2281c4a3
Strip CSS, JS, and IMG from template site
...
Per #964 , just upgrade the template site from XHTML to HTML5,
leaving the existing CSS. No need to get fancy.
The HTML is essentially HTML5 Boilerplate. No need for a holy war.
Look and feel should remain the same.
2013-04-14 12:52:27 -04:00
81e44bf5f4
Merge pull request #955 from mojombo/refactor-markdown
...
Refactor Markdown Parser Logic
2013-04-13 20:25:37 -07:00
7a7990fb9a
Moved markdown converters into lib/jekyll/converters/markdown
2013-04-14 05:23:42 +02:00
c708d1d71b
Merge pull request #907 from advatar/pkpass_mime_type_support
...
Added pkpass to the list
2013-04-13 19:17:35 -07:00
ef51b0f9e4
Error message is red
2013-04-13 20:27:44 +02:00
ef9d8ddb7d
Matching tests to new colorized output
2013-04-13 20:24:45 +02:00
b99baeae27
Colorize warns as yellow
2013-04-13 19:58:41 +02:00
9b5ebb874f
Merge pull request #961 from benbalter/default-markdown-engine
...
Move template site to default markdown renderer
2013-04-13 10:26:34 -07:00
1163fa905e
Make template site HTML5
...
It would really pain me if the default Jekyll site were XHTML. That'd be bad for the internet.
Instead, use Twitter Bootstrap as a base (while still keeping @mojombo's origin design), to give users a great initial baseline to build beautiful, simple sites.
Defaults are more than just the starting point. It's what 80% of users are going to use. Look at WordPress and the default theme. May as well lead by example and start the user off right.
* Add Bootstrap base CSS as a better reset and base layer
* Update default layout to HTML5 with boilerplate best practices
* Add title and post date to post.html (rather than including in the post itself)
* Make site title a variable and add to _config.yml
* Add page title to header
* Add default .gitignore to ignore `_site`
* Remove unused `rss.png` and `.gitkeep`
* Add Modernizr for legacy IE support
2013-04-13 13:15:31 -04:00
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
485b37e3d1
move template site to default markdown renderer
2013-04-13 12:41:03 -04:00
028e580bb8
Remove short-circuits from Site
2013-04-13 12:39:49 -04:00
e7815d873c
Add implicit defaults to DEFAULTS
2013-04-13 12:37:38 -04:00
17f97cdbab
Move manual printing to Jekyll.info and Jekyll.warn
2013-04-13 18:22:34 +02:00
c5f6e527b5
Bring Logger and Deprecator into the fold
2013-04-13 18:05:03 +02:00
bc6748f139
Add Jekyll::Deprecator
2013-04-13 18:03:38 +02:00
61465053eb
Add Jekyll::Logger
2013-04-13 18:02:16 +02:00
891ccbd656
Merge pull request #953 from mojombo/refactor-configuration
...
Refactor Jekyll Configuration
2013-04-13 07:19:03 -07:00
a971fec801
rescue block for the method and added redcarpet as option for parser
2013-04-13 02:13:50 +02:00
3bc497c1c9
Moved out conversion logic
2013-04-13 01:55:03 +02:00
63cdd21353
Move initialization of parsers to separate classes
2013-04-13 01:47:40 +02:00
968f3b0911
allow overriding page.path in YAML frontmatter
2013-04-13 00:05:49 +02:00
6881d3bfbf
Refactored Configuration#config_files
2013-04-12 23:59:37 +02:00
92db4ed89f
Merge pull request #951 from maul-esel/liquid-file-path
...
Expose file path to Liquid
2013-04-12 14:33:19 -07:00
bd8d271ce3
Moving the backwards-compatibilizing to Configuration#read_config_files. @mattr-
2013-04-12 23:11:38 +02:00
879b08a0b0
In Configuration#config_files, cascade to the Configuration's value of 'source' before the default
2013-04-12 22:29:52 +02:00
f2f20d18f0
TomDoc Jekyll::Configuration
2013-04-12 21:38:30 +02:00
810a29c719
Rescue the entire method instead of just a `begin` block
2013-04-12 22:25:58 +03:00
e2967c96cd
Jekyll.configuration should use the new Jekyll::Configuration class
2013-04-12 21:20:30 +02:00
64f224933b
Add Jekyll::Configuration
2013-04-12 21:20:14 +02:00
04fd68a232
Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS
2013-04-12 21:19:20 +02:00
0884a52fea
Add TomDoc for Jekyll::Command.process_site
2013-04-12 20:01:25 +02:00
5f54507204
Remove code duplication
2013-04-12 19:35:46 +02:00
dc4d7c0bf4
fix path for posts: must include "_posts"
2013-04-12 18:17:57 +02:00
d64fd1e8fe
expose file path relative to source dir to liquid
...
Fixes #633 .
2013-04-12 17:37:16 +02:00
bee8cd9d77
Merge pull request #946 from maul-esel/preserve_excerpt
...
Preserve 'excerpt` in YAML Front-Matter
2013-04-12 06:24:51 -07:00
2b238786a2
one more indentation fix
2013-04-12 12:05:07 +02:00
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
14a669530e
Fixing tests, and making it more ruby friendly
2013-04-11 10:17:59 -07:00
951ee09a75
remove useless attr_reader for excerpt (is a method now)
2013-04-11 19:05:28 +02:00
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
069e70d1b3
do not override custom excerpt set in YAML frontmatter
...
Fixes #933 .
2013-04-11 14:25:47 +02:00
1e209c9bf3
Upgrade --config to accept an array of files
2013-04-10 11:38:49 -07:00
df1efeff25
Accept multiple config files from command line
...
Parse config as if it can contain multiple references to config files.
This allows you to pass in multiple config files from the command line
Helps with issues #514 and #703
2013-04-10 10:19:48 -07:00
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
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
1319b823f8
Release 1.0.0.beta4
2013-04-09 21:31:23 +02:00
88f92729bc
Use paginate_path and don't help too much
2013-04-09 21:00:27 +02:00
9c296f04a9
Join the path with baseurl in Pager.paginate_url
2013-04-09 20:26:08 +02:00
b9e7a31ab8
Return nil if num_page is nil
2013-04-09 20:25:43 +02:00
e5bf5aa09e
Documentation for Pager.paginate_url
2013-04-09 20:25:33 +02:00
b10939912f
Add paginator.previous_page_path and paginator.next_page_path
2013-04-09 19:48:41 +02:00
b667a6a1a8
Merge pull request #935 from mojombo/baseurl-normalization
...
Fix cascade problem with site.baseurl.
2013-04-07 15:19:23 -07:00
dbb3dd3a1a
Move port and host configuration options to Jekyll::DEFAULTS so Commander doesn't override in serving awkwardly.
2013-04-07 23:55:04 +02:00
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
1526aa3b1d
Fix cascade problem with site.baseurl. Fixes #931 .
2013-04-07 22:47:55 +02:00
ae462afb76
Backwards-compatibility for 'auto'. Fixes #821 .
2013-04-07 22:29:30 +02:00
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
7b36d26240
Merge pull request #892 from rafaelrosafu/master
...
Added date_to_rfc822 used on RSS feeds
2013-04-07 12:43:50 -07:00
ea753130e6
add ordinal date permalink style (/YYYY/DDD/slug.html)
2013-04-06 08:17:02 -04:00
483a0b68b6
Merge pull request #890 from zachgersh/abbreviated_month
...
Added abbreviated month + test.
2013-04-05 09:44:50 -07:00
28097a9ebb
Updated version to 1.0.0.beta3.
2013-04-04 16:14:54 +02:00
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
8810dc6479
Preloads directory_watcher glob
2013-04-02 17:46:07 +02:00
2c7325223f
Fix symlinked assets not being included, even in unsafe mode
2013-03-31 20:49:43 +02:00
8d1b6720c3
Added pkpass to the list
2013-03-31 18:22:41 +03:00
e931414b77
Changed to short_month and re-ran tests.
2013-03-27 08:40:58 -07:00
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
6657f2add9
Added abbreviated month + test.
2013-03-26 23:06:34 -07:00
fa39a97bc6
Remove unused code
2013-03-25 21:22:42 -05:00
196e26b580
Flatten tags and categories lists. Fixes #741 .
2013-03-19 23:16:53 +01:00
a72cdc9293
Auto-regeneration fails loudly. Fixes #470 .
2013-03-19 22:31:37 +01:00
6f6ad001d2
Ignore entries if they are directories.
2013-03-19 21:59:06 +01:00
de8f0c986c
Update version for 1.0.0.beta2.
2013-03-19 00:08:56 +01:00
73ca35ee81
Ensure all categories are downcase. Fix for #842 .
2013-03-17 23:43:37 +01:00
9d814a4eb7
Add method String#force_encoding to 1.8.7
2013-03-17 23:35:46 +01:00
f7f64576e5
Force encoding of the rdiscount TOC to UTF8 to avoid conversion errors
2013-03-17 22:28:52 +01:00
a054ce2788
Merge pull request #861 from danielgrieve/gist-tag
...
display single files from gist
2013-03-17 13:33:10 -07:00
7ba5a27a74
Merge pull request #871 from mojombo/gh-pages-mime-types
...
Use GH Pages MIME types.
2013-03-17 13:22:51 -07:00
4400e89898
Expect a 'baseurl' to be passed in to Site
2013-03-17 21:18:45 +01:00
8c6c33a6c8
Use GH Pages MIME types.
2013-03-17 13:14:35 -07:00
ee697a6308
Add Jekyll::DEFAULTS['baseurl'] and set the default pygments option to _true_
2013-03-17 21:09:58 +01:00
ebcf3eb385
Merge pull request #869 from mojombo/baseurl-in-liquid
...
Expose site.baseurl to Liquid templates.
2013-03-17 12:53:27 -07:00
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
d5ed4fc5d0
Add baseurl to Site attr_accessor list.
2013-03-17 20:42:11 +01:00
eef13d7d43
Expose site.baseurl to Liquid templates.
2013-03-17 17:26:33 +01:00
b9cbce5e5f
fix regex
2013-03-17 15:04:03 +00:00
936ed1f849
Merge pull request #837 from ixti/feature-excerpt
...
Adds excerpt to posts
2013-03-17 07:53:41 -07:00
aa7a234c18
Merge master into jekyll-new
2013-03-17 15:45:37 +01:00
66c5ef2556
Fix typos and remove some obtrusive code
2013-03-17 13:42:46 +01:00
22d1fdab54
tie down the regex match on gist filenames
2013-03-17 11:29:42 +00:00
23a01e7766
Patch for multibyte URI problem. Closes #723 .
2013-03-16 21:20:11 +01:00
6c5d001986
replace \s with space
2013-03-16 19:20:54 +00:00
5d34a4c533
Merge pull request #864 from mojombo/prioritize_plugins
...
Prioritize plugins & DRY subclass instantiation
2013-03-16 12:09:43 -07:00
caa6a4ebfd
Sort instantiated subclasses in Site.
2013-03-16 15:24:34 +01:00
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
7e1100962c
Load in config from --config switch
2013-03-16 14:44:49 +01:00
8acb1b29bd
Using 1.8.7-compliant File.expand_path instead of >1.9 File.realpath
2013-03-16 14:24:34 +01:00
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
92d9c4301b
display single files from gist
2013-03-15 22:37:14 +00:00
5c35a84662
Updated version and gemspec to reflect 1.0.0.beta1 release
2013-03-14 21:26:06 +01:00
dbc356f9f4
Bump version to 1.0.0.pre.
2013-03-14 21:23:34 +01:00
4be5dfdb9a
fix copying of site template files
2013-03-13 21:27:41 +00:00
099fcc27d6
raise ArgumentError if no args. rename sample post
2013-03-13 19:21:11 +00:00
df9964c3b5
Merge pull request #838 from mattr-/dedupe-entry-generation
...
Remove code duplication during site generation
2013-03-12 11:27:56 -07:00
2473bdbd7c
Merge pull request #847 from mojombo/mime_file
...
Load in Apache MIME Types
2013-03-12 11:06:26 -07:00
7a86d901f1
Refactor Commands::New a bit and remove scaffold post once copied.
2013-03-12 00:48:22 -04:00
b71ec624f8
Add commands/new and scaffold post to gemspec so they get copied over.
2013-03-12 00:47:42 -04:00
725b127f9b
Merge pull request #536 from fotos/fix_page_dir
...
Added path in url.
2013-03-09 17:07:16 -08:00
f79662719b
Fix indentation.
2013-03-09 15:07:27 +02:00
524aa1f36a
Jekyll::Commands::Serve reads in mime.types file.
2013-03-08 20:12:52 +01:00
5e6c2f6e4b
Added mime.types file from Apache SVN repo.
2013-03-08 20:12:21 +01:00
6399ec9b2b
Remove duplication when aggregating post information
2013-03-05 19:11:07 -06:00
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
22dcc4e20f
Adds excerpt to posts
2013-03-04 17:13:25 +01:00
035bbdf99f
Fix typo.
2013-03-04 14:59:34 +08:00
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
b46000f6af
Kill unnecessary return keyword.
2013-03-03 18:43:54 -08:00
0d3ea5b710
Forgot to escape newlines.
2013-03-04 03:41:18 +01:00
2b9b613687
Normalize CLI options to match configuration expectations.
2013-03-03 18:23:02 -08:00
5af8e1f40c
Applying a more 'Ruby' style to post_url.rb
2013-03-04 03:20:59 +01:00
4caf613be8
Merge branch 'drafts' of https://github.com/scribu/jekyll into scribu-drafts
2013-03-03 12:57:55 -08:00
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
ce8e1afba6
Add support for Ruby < 1.9
2013-03-03 15:12:21 +01:00
cc83501489
Fix broken post_url with posts with a time in their YAML front matter.
2013-03-03 14:56:18 +01:00
1a351284ca
rename get_base() to containing_dir()
2013-03-03 12:56:12 +02:00
7258b10f88
We don't need YAML in the new command.
2013-02-28 22:19:38 +01:00
149b95d767
Typos in sample post.
2013-02-28 22:17:24 +01:00
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
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
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
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
5a9c20983d
Rename setup_plugins to plugins_path
2013-02-25 13:20:32 -06:00
d2c79a8841
Merge branch 'master' into issue-653
2013-02-25 13:08:23 -06:00
f8a90d711f
Using https protocol instead of http.
2013-02-24 01:54:13 +01:00
cdd3c0ef0c
Remove 'type' attribute from script tag in gist liquid tag.
2013-02-24 01:30:41 +01:00
7e7cee6e56
Strip space from the gist number, add test for gist tag
2013-02-24 00:58:13 +01:00
425f466842
'gist' liquid tag by @stereobooster. Fixes #463 .
2013-02-24 00:38:19 +01:00
7457cbae25
Fix issue with watching (auto-regeneration) continuously running if destination is not '_site'. #457 .
2013-02-22 00:59:44 +01:00
5d8e012899
Fixed merge with new log output in lib/jekyll.rb
2013-02-20 23:10:42 +01:00
9eb79ff135
Improved output for auto-regeneration.
2013-02-20 23:09:54 +01:00
bf79b0ac37
Fixed merge with new log output in lib/jekyll.rb
2013-02-20 23:09:34 +01:00
11eb1ecae1
Safe loading of files and YAML.
2013-02-10 19:07:38 +01:00
538c2086a5
whitespace fixes
2013-02-10 04:49:27 +02:00
3e164d6daf
don't check if draft is published or if its date is in the future
2013-02-09 23:48:38 +02:00
2588d681c9
fix draft filename processing
2013-02-09 23:38:13 +02:00
78831d94cd
don't mess with dir parameter
2013-02-09 23:19:35 +02:00
642349f797
implement and use Draft.valid?
2013-02-09 22:41:47 +02:00
1ac46b17c4
Don't require date in draft filenames.
2013-02-09 21:35:41 +02:00
4cd7c22ee7
Now uses the more semantically correct AND operator
2013-02-04 22:17:03 +01:00
7512e6bb66
Allow symlinked folders in unsafe mode
2013-02-04 17:16:01 +01:00
28a074ff7a
Remove Jekyll::Commands::Migrate
2013-01-31 00:18:22 +01:00
b70c59667c
Requiring jekyll-import gem. Printing error and exiting if it does not exist.
2013-01-30 23:43:26 +01:00
cff4ec72ea
Using .erb file for the new post
2013-01-30 21:05:52 +01:00
a7f0d04bda
Improve error message for malformed highlight tags
2013-01-29 12:16:33 +01:00
704307d7fe
Added very basic code snippet example to sample post
2013-01-27 23:30:32 +01:00
bf78fe9b75
Move post scaffold content to a separate method.
2013-01-27 23:23:53 +01:00
a68b67c65e
Added newline to New command for stylistic congruence.
2013-01-27 23:21:31 +01:00
ac691a1465
removed related posts segment of scaffold site.
2013-01-27 23:21:02 +01:00
a8671ed52b
Using modularized commands (Jekyll::Commands) as per @tombell's latest PR merge
2013-01-27 23:17:45 +01:00
272dd5ef35
Added the NewCommand class
2013-01-27 23:16:34 +01:00
ce7e307cba
Scaffold site, based on @mojombo's site (with permission).
2013-01-27 23:16:34 +01:00
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
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
409eedafd8
Merge pull request #767 from mojombo/string-categories
...
Force Categories to be Strings
2013-01-26 13:32:26 -08:00
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
4041579b70
Merge pull request #777 from mastahyeti/safe_yaml
...
Safe YAML
2013-01-25 08:22:10 -08:00
4f7881ba40
Add SVG support to Jekyll/Webrick. Fixes #406 .
2013-01-25 06:20:07 +01:00
1528cfe1cd
adding safe_yaml to protect against object instantiation from yaml
2013-01-23 11:30:24 -06:00
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
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
0ad623fb85
first pass at --drafts flag
2013-01-20 05:23:56 +02:00
517e6f81d3
Remove new lines between module and class
2013-01-20 00:00:49 +00:00
Peter Rhoades
Pat Hawks
Parker Moore
Terry Schmidt
Jesse shawl
Alberto Grespan
Yihang Ho
Mathieu Bruyen
Jordon Bedwell
Mathieu Bruyen
Quinn Shanahan
Rodrigo Dumont
Philipp Rudloff
Ben Balter
Anatol Broder
Aaron Broder
Gabe Ortiz
Matt Rogers
TheTomThorogood
Valery Tolstov
XhmikosR
John Piasetzki
John Piasetzki
Robin Dupret
maul.esel
Marcus Stollsteimer
Lincoln Mullen
Fabian Rodriguez
Ben Hanzl
Zequez
Daniel Schauenberg
nitoyon
Stephen McDonald
Joel Glovier
Corey Ward
Markus Roth
Zlatan Vasović
Anthony Smith
Josh Brown
Aziz Shamim
John Firebaugh
Dan Tao
liufengyun
Jens Nazarenus
Andy Lindeman
Pascal Borreli
Mort Yao
Ahmed Hazem
Garen Torikian
Colin Dean
Aidan Feldman
schneems
akira yamada
Ivan Tse
Eric Mill
Christoph Schiessl
Persa Zula
Matthew Iversen
David Sawyer
Greg Karékinian
Dmitry Chestnykh
Juan Ignacio Donoso
Brice
Edward Ball
Shigeya Suzuki
MURAOKA Taro
Ishibashi Hideto
ddavison
ddavison
Frederic ROS
Nick Fagerlund
Wlodek Bzyl
Thomas Torsney-Weir
Lucas Jenss
zachgersh
Anand Narayan
imathis
Brian Kim
Mikael Konutgan
Casey Lang
Sebastian Morr
Roland Warmerdam
Christopher Giroir
Uwe Dauernheim
Michael Klishin
uu59
Dave Cole
Alex Kessinger
Daniel Driver
Alexander Ekdahl
Johan Sellström
Rafael Rosa Fu
Aleksey V. Zapparov
Dave Wasmer
Tom Preston-Werner
Daniel Grieve
paco
Tommy Sullivan
Jonathan Roes
Fotos Georgiadis
larrylv
Daniel Hilgarth
scribu
sterebooster
Leonard Ehrenfried
Matt Ginzton
Jordon Bedwell
Ben Toews
Tom Bell