eb2fc89776
Correct the semantics of checking for jekyll-paginate
2015-03-16 15:48:50 -07:00
bb57c80478
Perform jekyll-paginate deprecation warning correctly.
...
Fixes #3393
2015-03-16 14:54:31 -07:00
b178358cf9
Merge branch 'master' into site_extract_readers
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 17:28:45 +01:00
00cdcbc184
Separated some more readers from the main reader.rb file.
...
- Draft Reader
- Collection Reader
- Page Reader
- Post Reader
- Static File Reader
Fixed references and ran tests.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 17:20:25 +01:00
bebd80342e
Extracted draft, post reader into external classes.
...
Organized the draft, post and layout reader into the *readers* classes.
Fixed all references and ran tests.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 12:39:50 +01:00
6d9258bcdc
Release 💎 v3.0.0.beta2
2015-03-05 13:40:10 -08:00
02e98f238e
Merge pull request #3520 from delftswa2014/sort-null
2015-03-05 14:35:40 -06:00
4b8e3cfdbd
Moved the in_(source/dest)_dir back to site.rb.
...
After carefully looking at these two methods, as of right now they do not
belong in the reader, as they should also be used by the writer. Thus the
decision was made to move them back into the class containing the source
and dest fields, site.rb.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-05 13:34:46 +01:00
7806f9ed52
Replace `File.exists?` with `File.exist?`
...
`File.exists?` is deprecated method. See
http://ruby-doc.org//core-2.2.0/File.html#exists-3F-method .
2015-03-05 18:21:52 +09:00
489da6784a
Remove duplicated range from regex
...
`/\w/` is equivalent to `[a-zA-Z0-9_]`. See
http://ruby-doc.org/core-2.2.0/doc/regexp_rdoc.html#label-Character+Classes .
2015-03-05 18:19:32 +09:00
e229e3285f
Merge pull request #3537 from kleinfreund/patch-2
...
Removing unused code from post layout
2015-03-04 18:32:57 -08:00
f6f2626828
Merge pull request #3538 from willnorris/permalink
...
Improved permalinks for pages and collections
2015-03-04 15:18:43 -08:00
ced9146c11
Merge pull request #3544 from delftswa2014/micro_refactor_url
...
Refactored url.rb to be compliant with Ruby Style Guide.
2015-03-04 15:13:35 -08:00
ca7375a51b
Corrected quote-usage. Replaced [-1].eql with end_with.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 22:31:19 +01:00
9e1cb96a7e
Added site reference for encoding configuration.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 22:23:47 +01:00
7114380da7
Added and improved documentation, fixed long method name.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 21:37:25 +01:00
1b796354fb
Added documentation, made method private and fixed quotes.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 21:10:26 +01:00
f252a82afc
Made the Reader responsible for the actual Reading.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 21:00:45 +01:00
2f88a0c0a1
Extracted `read_collections` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:55:53 +01:00
2857350df1
Extracted `read_directories` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com
2015-03-04 20:51:26 +01:00
9bcad08e3a
Extracted `limit_posts` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com
2015-03-04 20:35:02 +01:00
a4adeb446b
Extracted `read_posts` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:22:37 +01:00
504c9a34ad
Extracted `read_drafts` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:19:39 +01:00
29169aa858
Extracted `aggregate_post_info` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:16:31 +01:00
67a2369854
Extracted `read_content` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:11:27 +01:00
537235c38b
Extracted `read_data` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:07:53 +01:00
5b0e2a294d
Extracted `read_data_to` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:05:10 +01:00
e586105b46
Extracted `sanitize_filename` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:01:27 +01:00
ddfecb0f53
Extracted `read_data_file` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:55:54 +01:00
6e06fd8734
Extracted `get_entries` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:51:44 +01:00
05bbcddb29
Extracted `filter_entries` from site.rb into reader.rb
...
- Extracted
- Updated References
- Ran Tests
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:46:10 +01:00
c836ec613d
Extracted `in_dest_dir` from site.rb into reader.rb
...
- Extracted in_dest_dir from site.rb.
- Updated References.
- Ran Tests.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:21:24 +01:00
bb9d43dff5
Extracted `in_source_dir` from site.rb and into reader.rb.
...
Extracted `in_source_dir` from site.rb into reader.rb.
Updated all the references and tests.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 19:16:03 +01:00
0d1586a5c4
Improved permalinks for pages and collections
...
This updates the default permalink style for pages and collections to
match the site-wide 'permalink' setting. If the permalink setting
contains a trailing slash, either explicitly or by being set to
':pretty', then pages and collections permalinks will contain trailing
slashes by default as well. Similarly, if the permalink setting
contains a trailing ':output_ext', so will pages and collections. If
the permalink setting contains neither a trailing slash or extension,
neither will pages or collections.
This impacts only the default permalink structure for pages and
collections. Permalinks set in the frontmatter of an individual page
take precedence, as does the permalink setting for a specific
collection.
Fixes #2691
2015-03-04 09:38:23 -08:00
2ef9bae75a
Refactored url.rb to compliant with Ruby Style Guide.
...
- Single Quotes
- Fixed Typo's in variable names.
- Removed Redundant Escaping in Regular Expressions.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 14:16:55 +01:00
d40b6d6ee0
Merge pull request #3418 from tarebyte/destination-and-source
...
Added build --destination and --source flags
2015-03-04 05:21:36 -06:00
d56df7592c
Removing unused code from post layout
...
The post from the site template does not have `meta` in its front matter.
Related to #3536 .
2015-03-03 09:52:23 +01:00
669c803912
always include file extension on destination files
...
This ensures that destination files for HTML posts, pages and
collections always include the proper file extension (as defined by
output_ext) regardless of permalink structure. This allows for URLs
that contain no extension or trailing slash to still result in proper
destination files with .html extensions.
Because this change relies so heavily on output_ext accurately
identifying the extension of the destination file, this change also
removes the feature test that tested support for permalinks with a .htm
extension. In order to support alternate file extensions, a future
patch or plugin will need to modify the output_ext value, at which point
everything else should work as expected.
2015-03-02 21:20:54 -08:00
7a31029c79
Removed deprecation inconsistency
...
Replaced occasions where the logger was used to report deprecations.
Deprecator is now used instead.
Signed-off-by: Joop Aué <joopaue@gmail.com>
2015-03-02 21:54:05 +01:00
92a9582733
Corrected error message as suggested by @parkr.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 11:16:08 +01:00
78af3c5018
Improved clarity of sort nil input error message.
...
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 09:51:59 +01:00
0565308ce6
Added test to check on nil input for sort filter.
...
- Added a test to check if the sort filter will raise the correct
exception on given nil input.
- Improved error message and used "nil" consistently.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 09:40:32 +01:00
531d0fb261
Sort will now raise error on nil object array input.
...
Sort will now throw an error when a nil object array is given as input.
See issue #3491 for more information.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-02-26 22:12:06 +01:00
3f3b203992
Use end_with? instead of regexp for adding index.html
2015-02-25 11:59:27 -08:00
b75db477e0
Merge pull request #3485 from watkyn/extra_slash_in_example_base_url
...
Removed the trailing slash from the example "/blog/" basurl comment.
2015-02-24 23:01:03 -08:00
5c388309b2
Spacing. [ci skip]
2015-02-23 01:25:58 -08:00
0903515c39
Merge pull request #3502 from delftswa2014/update-doc-link
...
Changed doc link in template
2015-02-23 01:25:05 -08:00
7a93ca6f6c
Merge pull request #3496 from yous/site-template-gitignore
...
Ignore .jekyll-metadata in site template
2015-02-22 21:21:08 -08:00
6bc3dee98d
Changed doc link in template
...
Changed the doc link in the template to link to /docs/home instead of /
Signed-off-by: Joop Aué <joopaue@gmail.com>
2015-02-22 18:42:12 +01:00
7db9397a9d
Remove trailing whitespace
2015-02-22 20:27:15 +09:00
ae244c4425
Ignore .jekyll-metadata
2015-02-22 18:31:46 +09:00
52c4ce2a5a
Finish of moving the unit tests over to Minitest
2015-02-21 00:31:07 -08:00
47ee5db5fc
Removed the trailing slash from the example "/blog/" basurl comment. Following the example would add two slashes into the url, i.e. http://yourdomain.com/blog//
2015-02-20 07:06:12 -06:00
6e89c1c02b
write .jekyll-metadata even on full_rebuild
...
For a full rebuild, we certainly don't want to *read* from
.jeykll-metadata, but we should still write it. Otherwise, a subsequent
incremental build would have to do a full rebuild again since there is
no metadata file to start from.
2015-02-14 22:43:43 -08:00
58dc1f77e9
add draft? method to identify if Post is a draft
2015-02-14 00:01:27 -08:00
c6d5a913f1
Site#read_data_file: read CSV's with proper file encoding
...
Fixes #3451 .
2015-02-13 19:39:15 -08:00
491cce7a99
Avoid requiring webrick at boot time
...
This is a bit uglier but allows deferring loading webrick until the
serve command is invoked as opposed to when it's required.
2015-02-12 22:16:12 -05:00
e99a9e5821
Custom WEBrick FileHandler for stripping .html extension
...
This first performs the normal static file check at the exact
location. If no file is found, attempt the check again with an
".html" suffix.
See the following for base class search_file implementation:
https://github.com/ruby/ruby/blob/4607f95/lib/webrick/httpservlet/filehandler.rb#L363-L383
2015-02-12 21:58:35 -05:00
a907addbe2
Optimize text rendering for legibility
2015-02-11 15:45:47 -08:00
a64b7e7a62
Merge pull request #3440 from tkrotoff/class-text
2015-02-11 13:58:44 -08:00
f933164a2a
use SCREAMING_SNAKE_CASE and remove --destination from --source options
2015-02-10 15:02:49 -05:00
0914948099
Remove class="text"
...
There is no class text defined in the CSS
2015-02-10 17:09:06 +01:00
c96abf7e82
added -s and -d
2015-02-10 11:08:22 -05:00
bf149a0b97
highlight: fix problem with linenos and rouge.
...
Found by @EdMcBane in https://github.com/jekyll/jekyll/pull/3435
The strange regexp we were doing to replace the <pre><code></pre></code>
bits in the Pygments output were wreaking havoc on Rouge output
because Rouge uses <pre>'s to wrap line numbers.
To be consistent, the output from render_* should *not* include
the wrapping <div> and <pre> tags. It should just be what was
inside. We can then wrap it in our own custom tags without using
any regular expressions, as God intended. Death to regular
expressions and HTML manipulation!
2015-02-09 21:42:52 -08:00
c625b94bc0
Merge pull request #3401 from jekyll/fix-code-cleanup
2015-02-09 16:26:19 -08:00
571800c8ad
Use 3 places to the right of the decimal place instead of 2.
2015-02-07 23:57:07 -08:00
d795113e94
Update build.rb
...
parenthesis added to round
2015-02-07 23:57:07 -08:00
dbc8530068
Show only two decimals in time to generate pages
...
no need to display 10 decimals.
it feels up my screen with useless numbers! ;-p
2015-02-07 23:57:07 -08:00
6521b84aac
Change `overflow-x` value to `auto`
...
`overflow-x: scroll;` makes scrollbar visible always whether the content
does overflow or not.
2015-02-07 06:21:21 +09:00
120d3e07ca
added flags from docs
2015-02-06 13:27:23 -05:00
5e541b5eb0
fix quote
2015-02-05 16:48:59 +07:00
2745be736e
A lighter font declaration
...
Removes unnecessary Sass
Thanks @kleinfreund :)
2015-02-02 11:43:53 +00:00
d24ea66933
The highlight tip should only clip the newlines before and after the *entire* block, not in between.
...
Ref: https://github.com/jneen/rouge/issues/230
2015-02-01 22:37:10 -08:00
9ba9c47cd6
Fixes #3339 Add `pkill -f jekyll` to ways to kill.
...
This shows people how to kill Jekyll without knowing the PID using `pkill` (you could also do `kill -9 $(pgrep -f jekyll)` but that is just the long way around doing `pkill -f` so it shouldn't be shown in the Jekyll logger but can be documented here for people.
2015-02-01 06:45:52 -06:00
3318c38eec
Merge pull request #3391 from jekyll/enspeeden-include
2015-01-31 15:41:34 -08:00
a87cda4b12
Add configuration fallback for paginate, and fix tests.
2015-01-31 13:53:17 -08:00
65d43ef398
Move previous runtime dependencies to development dependencies.
2015-01-31 13:53:17 -08:00
057b8cae7f
Use `rouge` as the default syntax highlighter.
2015-01-31 13:52:50 -08:00
336bb44750
Use #require_with_graceful_fail in Highlight tag.
2015-01-31 13:52:26 -08:00
18e0d2fe75
Make the {% include %} tag a teensy bit faster.
2015-01-31 12:59:25 -08:00
aceb5b5d53
Merge branch 'jekyll-gjtorikian-patch-1'
...
* jekyll-gjtorikian-patch-1:
Use the source_dir() helper
Add test for new extracted method
Factor out a `read_data_file` call to keep things clean
2015-01-31 00:12:33 -08:00
a2b19c1d2b
Merge pull request #3383 from jekyll/respect-the-title
2015-01-31 00:07:10 -08:00
0c624eb11b
The :title URL placeholder for collections should be the filename slug.
...
This mimicks posts most closely. It can be overridden by the
YAML front matter.
Undoes some of #2864 .
2015-01-30 01:53:11 -08:00
e2e6e7dc22
Merge pull request #3376 from tkrotoff/helvetica
2015-01-29 18:52:07 -08:00
fe08405ae1
Merge pull request #3378 from kaatt/initial-build-time
2015-01-29 16:10:05 -06:00
63bca94bde
Merge pull request #3375 from tkrotoff/fix-nav-items-gaps
2015-01-29 14:07:49 -08:00
e1e60499b1
Factor out a `read_data_file` call to keep things clean
2015-01-29 12:41:19 -08:00
ff646738fc
Shows time after initial generation
2015-01-30 01:32:00 +05:30
aa44c7f53d
Switch default font to Helvetica Neue
...
Helvetica Neue (1983) features multiple improvements over the original Helvetica font (1957), 'neue' means 'new' in German
2015-01-29 16:38:12 +01:00
368b862ebb
Refactoring: replace !important with cleaner CSS
2015-01-29 16:18:22 +01:00
3e609b1cd9
Merge pull request #3329 from tkrotoff/fix-nav-items-gaps
2015-01-24 11:56:52 -08:00
31b03e9b86
Merge pull request #3325 from imathis/generate-url
2015-01-24 11:21:51 -08:00
317e2f460e
Release 💎 v3.0.0.beta1
2015-01-24 09:55:46 -08:00
53a59544e8
Fix site-nav alignment
2015-01-21 01:44:31 +01:00
58e231ce40
Rename Regenerator#write to Regenerator#write_metadata
2015-01-19 16:29:50 -08:00
90eecc5da6
Fix nav items alignment when in "burger" mode
2015-01-19 20:55:32 +01:00
fe5f0d124c
Move all regenerate? checking to Regenerator
2015-01-18 11:05:06 -08:00
589919d58a
Strip slashes on nil url tokens
2015-01-18 08:31:14 -06:00
c378f741a8
Merge pull request #3319 from jekyll/split-off-textile
2015-01-17 17:08:15 -08:00
cbe5f8e4dd
Merge pull request #3321 from jekyll/performance-upgrades
2015-01-17 16:55:51 -08:00
Parker Moore
Martin Jorn Rogalla
Matt Rogers
ChaYoung You
Will Norris
Jordon Bedwell
Philipp Rudloff
Joop Aué
Tony Eichelberger
Ryan Tomayko
Alfred Xing
Mark Tareshawty
Tanguy Krotoff
eksperimental
Seth Warburton
Garen Torikian
kaatt
Brandon Mathis