Commit Graph

1580 Commits

Author SHA1 Message Date
Jordon Bedwell
e268ee0f33 Whoops, forgot the pre in the beta tag. 2015-03-18 05:25:36 -05:00
Parker Moore
eb2fc89776 Correct the semantics of checking for jekyll-paginate 2015-03-16 15:48:50 -07:00
Parker Moore
bb57c80478 Perform jekyll-paginate deprecation warning correctly.
Fixes #3393
2015-03-16 14:54:31 -07:00
Parker Moore
6d9258bcdc Release 💎 v3.0.0.beta2 2015-03-05 13:40:10 -08:00
Matt Rogers
02e98f238e Merge pull request #3520 from delftswa2014/sort-null 2015-03-05 14:35:40 -06:00
ChaYoung You
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
ChaYoung You
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
Will Norris
f6f2626828 Merge pull request #3538 from willnorris/permalink
Improved permalinks for pages and collections
2015-03-04 15:18:43 -08:00
Parker Moore
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
Martin Jorn Rogalla
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
Will Norris
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
Martin Jorn Rogalla
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
Jordon Bedwell
d40b6d6ee0 Merge pull request #3418 from tarebyte/destination-and-source
Added build --destination and --source flags
2015-03-04 05:21:36 -06:00
Will Norris
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
Joop Aué
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Parker Moore
3f3b203992 Use end_with? instead of regexp for adding index.html 2015-02-25 11:59:27 -08:00
ChaYoung You
7db9397a9d Remove trailing whitespace 2015-02-22 20:27:15 +09:00
Parker Moore
52c4ce2a5a Finish of moving the unit tests over to Minitest 2015-02-21 00:31:07 -08:00
Will Norris
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
Will Norris
58dc1f77e9 add draft? method to identify if Post is a draft 2015-02-14 00:01:27 -08:00
Parker Moore
c6d5a913f1 Site#read_data_file: read CSV's with proper file encoding
Fixes #3451.
2015-02-13 19:39:15 -08:00
Ryan Tomayko
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
Ryan Tomayko
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
Mark Tareshawty
f933164a2a use SCREAMING_SNAKE_CASE and remove --destination from --source options 2015-02-10 15:02:49 -05:00
Mark Tareshawty
c96abf7e82 added -s and -d 2015-02-10 11:08:22 -05:00
Parker Moore
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
Parker Moore
c625b94bc0 Merge pull request #3401 from jekyll/fix-code-cleanup 2015-02-09 16:26:19 -08:00
Parker Moore
571800c8ad Use 3 places to the right of the decimal place instead of 2. 2015-02-07 23:57:07 -08:00
eksperimental
d795113e94 Update build.rb
parenthesis added to round
2015-02-07 23:57:07 -08:00
eksperimental
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
Mark Tareshawty
120d3e07ca added flags from docs 2015-02-06 13:27:23 -05:00
eksperimental
5e541b5eb0 fix quote 2015-02-05 16:48:59 +07:00
Parker Moore
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
Jordon Bedwell
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
Parker Moore
3318c38eec Merge pull request #3391 from jekyll/enspeeden-include 2015-01-31 15:41:34 -08:00
Parker Moore
a87cda4b12 Add configuration fallback for paginate, and fix tests. 2015-01-31 13:53:17 -08:00
Parker Moore
65d43ef398 Move previous runtime dependencies to development dependencies. 2015-01-31 13:53:17 -08:00
Parker Moore
057b8cae7f Use rouge as the default syntax highlighter. 2015-01-31 13:52:50 -08:00
Parker Moore
336bb44750 Use #require_with_graceful_fail in Highlight tag. 2015-01-31 13:52:26 -08:00
Parker Moore
18e0d2fe75 Make the {% include %} tag a teensy bit faster. 2015-01-31 12:59:25 -08:00
Parker Moore
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
Parker Moore
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
Garen Torikian
e1e60499b1 Factor out a read_data_file call to keep things clean 2015-01-29 12:41:19 -08:00
kaatt
ff646738fc Shows time after initial generation 2015-01-30 01:32:00 +05:30
Alfred Xing
31b03e9b86 Merge pull request #3325 from imathis/generate-url 2015-01-24 11:21:51 -08:00
Parker Moore
317e2f460e Release 💎 v3.0.0.beta1 2015-01-24 09:55:46 -08:00