Commit Graph

2651 Commits

Author SHA1 Message Date
Martin Jorn Rogalla
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
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
Martin Jorn Rogalla
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
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
Parker Moore
e229e3285f Merge pull request #3537 from kleinfreund/patch-2
Removing unused code from post layout
2015-03-04 18:32:57 -08: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
Martin Jorn Rogalla
9e1cb96a7e Added site reference for encoding configuration.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 22:23:47 +01:00
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
Martin Jorn Rogalla
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
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