Commit Graph

1922 Commits

Author SHA1 Message Date
Martin Jorn Rogalla 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
Martin Jorn Rogalla 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
Martin Jorn Rogalla 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
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
Philipp Rudloff 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
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
Parker Moore 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
Parker Moore 5c388309b2 Spacing. [ci skip] 2015-02-23 01:25:58 -08:00
Parker Moore 0903515c39 Merge pull request #3502 from delftswa2014/update-doc-link
Changed doc link in template
2015-02-23 01:25:05 -08:00
Parker Moore 7a93ca6f6c Merge pull request #3496 from yous/site-template-gitignore
Ignore .jekyll-metadata in site template
2015-02-22 21:21:08 -08:00
Joop Aué 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
ChaYoung You 7db9397a9d
Remove trailing whitespace 2015-02-22 20:27:15 +09:00
ChaYoung You ae244c4425
Ignore .jekyll-metadata 2015-02-22 18:31:46 +09:00
Parker Moore 52c4ce2a5a Finish of moving the unit tests over to Minitest 2015-02-21 00:31:07 -08:00
Tony Eichelberger 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
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
Alfred Xing a907addbe2 Optimize text rendering for legibility 2015-02-11 15:45:47 -08:00
Alfred Xing a64b7e7a62 Merge pull request #3440 from tkrotoff/class-text 2015-02-11 13:58:44 -08:00
Mark Tareshawty f933164a2a use SCREAMING_SNAKE_CASE and remove --destination from --source options 2015-02-10 15:02:49 -05:00
Tanguy Krotoff 0914948099 Remove class="text"
There is no class text defined in the CSS
2015-02-10 17:09:06 +01: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
ChaYoung You 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
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
Seth Warburton 2745be736e A lighter font declaration
Removes unnecessary Sass

Thanks @kleinfreund :)
2015-02-02 11:43:53 +00: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 a2b19c1d2b Merge pull request #3383 from jekyll/respect-the-title 2015-01-31 00:07:10 -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
Parker Moore e2e6e7dc22 Merge pull request #3376 from tkrotoff/helvetica 2015-01-29 18:52:07 -08:00
Matt Rogers fe08405ae1 Merge pull request #3378 from kaatt/initial-build-time 2015-01-29 16:10:05 -06:00
Alfred Xing 63bca94bde Merge pull request #3375 from tkrotoff/fix-nav-items-gaps 2015-01-29 14:07:49 -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
Tanguy Krotoff 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
Tanguy Krotoff 368b862ebb Refactoring: replace !important with cleaner CSS 2015-01-29 16:18:22 +01:00
Parker Moore 3e609b1cd9 Merge pull request #3329 from tkrotoff/fix-nav-items-gaps 2015-01-24 11:56:52 -08:00
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
Tanguy Krotoff 53a59544e8 Fix site-nav alignment 2015-01-21 01:44:31 +01:00
Alfred Xing 58e231ce40 Rename Regenerator#write to Regenerator#write_metadata 2015-01-19 16:29:50 -08:00
Tanguy Krotoff 90eecc5da6 Fix nav items alignment when in "burger" mode 2015-01-19 20:55:32 +01:00
Alfred Xing fe5f0d124c Move all regenerate? checking to Regenerator 2015-01-18 11:05:06 -08:00
Brandon Mathis 589919d58a Strip slashes on nil url tokens 2015-01-18 08:31:14 -06:00
Parker Moore c378f741a8 Merge pull request #3319 from jekyll/split-off-textile 2015-01-17 17:08:15 -08:00
Parker Moore cbe5f8e4dd Merge pull request #3321 from jekyll/performance-upgrades 2015-01-17 16:55:51 -08:00
Parker Moore c1da91cf5c Start removing mentions of Textile. 2015-01-17 16:51:28 -08:00
Parker Moore 877cba9811 Remove direct baked-in support for Textile. 2015-01-17 16:51:28 -08:00
Pascal Borreli d28fb07bb9 Fixed typo [ci skip] 2015-01-18 00:45:28 +00:00
Parker Moore aaf0ba15cc Use frozen regular expressions for Utils#slugify 2015-01-17 16:25:33 -08:00
Parker Moore ef2d558874 Markdown#matches should avoid regexp 2015-01-17 16:25:10 -08:00
Parker Moore 10659e1eef Merge branch 'nitoyon-slugify-new-param'
* nitoyon-slugify-new-param:
  Remove superfluous Sass declarations.
  Move the slugify options out to their own section so as to fix the formatting.
  Document the mode parameter of slugify Liquid filter
  Add tests for mode parameters of slugify Liquid filter
  Add mode parameter to slugify Liquid filter

Conflicts:
	lib/jekyll/utils.rb

        ---> Hadn't added UTF-8 support in nitoyon's PR.
2015-01-17 16:06:10 -08:00
Parker Moore b2099ac763 Merge branch 'davidized-collection_yaml_dots'
* davidized-collection_yaml_dots:
  Move YAML Front Matter regexp into a constant.
  Add support for collections documents to have YAML front matter ending in dots.

Conflicts:
	test/test_collections.rb
2015-01-17 15:24:33 -08:00
Parker Moore c7d92c4e6d Move YAML Front Matter regexp into a constant. 2015-01-17 15:23:33 -08:00
Parker Moore 6d9b4c2aba Merge pull request #2774 from dziemian007/formatter_variables_by_relative_path 2015-01-17 15:16:50 -08:00
Parker Moore a312115a5a Merge pull request #3014 from jekyll/revert-3013-revert-2921-post-dest 2015-01-17 15:13:17 -08:00
Parker Moore 84cfc1ceff Merge branch 'majioa-devel'
* majioa-devel:
  Ensure Post#excerpt_separator always returns a string.
  get procedure for default excerpt separator for both cases site and page was moved to the post's specific method :excerpt_separator.
  Added per post excerpt_separator functionality, so you are able to specify :excerpt_separator (as well as just :excerpt) key direct inside the post YAML, to make an excerpt based on the value in the post. Tests were also added.
2015-01-17 15:01:20 -08:00
Parker Moore 18f3d76603 Ensure Post#excerpt_separator always returns a string. 2015-01-17 14:59:44 -08:00
Parker Moore ba2e1390ad Merge pull request #2571 from yous/patch-mixed-case-category 2015-01-17 14:55:30 -08:00
Mads Ohm Larsen 60da4ef010 Fix weird spacing 2015-01-15 22:04:00 +01:00
Matt Rogers ce78ea7818 Merge pull request #3220 from inukshuk/patch-1 2015-01-13 19:02:41 -06:00
Ryan Burnette 80465efff7 Require date in filters.rb 2015-01-13 13:51:47 -05:00
Ryan Burnette 936c737a32 Address #3298 2015-01-13 02:21:28 -05:00
Sylvester Keil 60921132c6 Preserve original mtime when copying static files 2015-01-12 13:00:35 +01:00
Parker Moore 4cbd814546 Add support for Windows line feeds too. 2015-01-09 23:55:47 -08:00
Malo Skrylevo a0f2b5f944 get procedure for default excerpt separator for both cases site and page was
moved to the post's specific method :excerpt_separator.
2015-01-10 04:05:16 +03:00
Kevin Ushey b92274b101 only strip newlines when rendering highlight blocks (#3265) 2015-01-09 00:07:11 -08:00
Malo Skrylevo 54d0bf47e8 Added per post excerpt_separator functionality, so you are able to
specify :excerpt_separator (as well as just :excerpt) key direct inside
the post YAML, to make an excerpt based on the value in the post. Tests
were also added.
2015-01-08 15:18:06 +03:00
Tanguy Krotoff c4d617e6aa Fix nav items alignment when on multiple lines 2015-01-07 12:30:48 +01:00
Parker Moore 502fd94f2c Merge pull request #3172 from alfredxing/docs-output-overrides 2015-01-05 23:19:12 -08:00
Alfred Xing c58ac78a5e Expose Publisher in Site 2015-01-05 16:13:04 -08:00
Alfred Xing 7655b533c9 Allow documents to set `published` in front matter 2015-01-05 16:11:02 -08:00
Seth Warburton 21bd3e6c5a [imp] Semantic structure improvements 2015-01-02 12:14:58 +00:00
Parker Moore a098dc80cd Merge pull request #3234 from jekyll/ruby-2-2 2014-12-29 20:49:04 -05:00
Parker Moore 7cd5847826 Merge pull request #3244 from jekyll/store-messages 2014-12-29 20:48:23 -05:00
Parker Moore 7bcf8d689e Always call Time#localtime to translate to TZ'd time. 2014-12-29 20:12:35 -05:00