324748a5a6
Added corrections as suggested by @parkr.
...
- Replaced occurrences of #array += with concat
operations.(performance)
- Corrected alignment.
- Removed rebase artifact.
Signed-off-by: Martin Rogalla <martin@martinrogalla.com>
2015-03-19 14:56:46 +01:00
c6d62828ba
Remove loader.rb and utilize "modernize" script/test. Fixes : #3573
2015-03-15 10:08:27 -05:00
67ba8ad0cb
Use rspec-mock instead of rr
2015-03-06 20:13:07 -05: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
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
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
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
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
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
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
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
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
9b962dc565
Merge branch 'fabianrbz-remove_adapters_deprecation_warning'
...
* fabianrbz-remove_adapters_deprecation_warning:
Add minitest/profile to profile 10 slowest tests
Move simplecov_custom_profile to test/ & gate with TRAVIS env
Remove unused groups from simplecov's profile
Removes the following deprecation warning: 'method adapters is deprecated. use profiles instead'
2015-03-01 00:36:48 -08:00
f1edf9e692
Add minitest/profile to profile 10 slowest tests
2015-03-01 00:36:40 -08:00
fbe52bca85
Move simplecov_custom_profile to test/ & gate with TRAVIS env
2015-03-01 00:36:20 -08:00
dae77e9a63
switch remaining textile test files to markdown
...
Textile support was removed from jekyll core in #3319 , and most of the
tests switched to markdown at that time. This changes the remaining
tests to use markdown as well. The vast majority of the test cases were
testing things in the file name or front matter, so it doesn't really
matter what markup format they use. The one test that was claiming to
test that textile was transformed had actually been moved to markdown as
well, just not renamed.
Fixes #3507
2015-02-27 18:29:52 -08:00
cd7b3f54f1
Removes the following deprecation warning:
...
'method adapters is deprecated. use profiles instead'
This warning was showing up because the project was using
the gem 'simplecov-gem-adapter' which uses the old syntax.
* Remove the gem dependency
* Add a profile with the same setup that the gem has
2015-02-27 23:01:48 -02:00
422fd7d304
Use `fixture_site` for Document tests
...
Should fix #3500
2015-02-24 20:31:16 -08:00
7db9397a9d
Remove trailing whitespace
2015-02-22 20:27:15 +09:00
7ad0597bff
Make our own Minitest::Test subclass for further subclassing
2015-02-21 00:33:47 -08:00
52c4ce2a5a
Finish of moving the unit tests over to Minitest
2015-02-21 00:31:07 -08:00
4b59eb4175
Fix the test inheritance for the tests.
2015-02-20 13:35:02 -08:00
d2b19963c1
Move from Test::Unit to Minitest.
2015-02-20 13:34:51 -08:00
1f503b24b3
highlight: duplicate tests for pygments for rouge
...
Ensure that the output we get for pygments will match
that we get for rouge in all cases except line numbers.
2015-02-09 21:57:43 -08:00
32c48bb78d
Highlight tag: add test for not removing interstitial newlines.
2015-02-01 23:03:10 -08:00
65d43ef398
Move previous runtime dependencies to development dependencies.
2015-01-31 13:53:17 -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
32a2e8b4ef
Use the source_dir() helper
2015-01-31 00:12:24 -08:00
3bac8a2034
Add test for new extracted method
2015-01-30 15:21:45 -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
31b03e9b86
Merge pull request #3325 from imathis/generate-url
2015-01-24 11:21:51 -08:00
58e231ce40
Rename Regenerator#write to Regenerator#write_metadata
2015-01-19 16:29:50 -08:00
29aabd84bd
Fix up tests
2015-01-19 16:23:51 -08:00
3d60299ea9
Test updates: Removed permalink config, updated template
2015-01-18 23:03:27 -06:00
382049d558
Added a unit test for nil value in permalink template keys
2015-01-18 15:51:21 -06:00
fe5f0d124c
Move all regenerate? checking to Regenerator
2015-01-18 11:05:06 -08:00
9d547f74cc
Make all the tests happy.
2015-01-17 16:52:12 -08:00
c1da91cf5c
Start removing mentions of Textile.
2015-01-17 16:51:28 -08:00
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
3fe80929ad
We have 47 posts now in the tests.
2015-01-17 15:28:03 -08:00
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
a312115a5a
Merge pull request #3014 from jekyll/revert-3013-revert-2921-post-dest
2015-01-17 15:13:17 -08:00
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
ba2e1390ad
Merge pull request #2571 from yous/patch-mixed-case-category
2015-01-17 14:55:30 -08:00
ce78ea7818
Merge pull request #3220 from inukshuk/patch-1
2015-01-13 19:02:41 -06:00
588bba39ad
Add test for Date object in filters.rb
2015-01-13 13:51:36 -05:00
60921132c6
Preserve original mtime when copying static files
2015-01-12 13:00:35 +01:00
7c8e4d46eb
Fix up new output for RDiscount 2.
2015-01-10 00:21:18 -08:00
0bf82e9cf7
Merge pull request #3258 from omegahm/symlink-local-tmp
2015-01-10 00:12:06 -08:00
b9542c5426
Merge pull request #3279 from jekyll/fix-cross-platform-testing
2015-01-10 00:08:29 -08:00
730aedd0a3
Add Rake's test loader because it is inconsistently installed.
2015-01-09 23:57:52 -08:00
4cbd814546
Add support for Windows line feeds too.
2015-01-09 23:55:47 -08:00
cae9d96cc4
Add test for stripping just newlines from code blocks.
...
Ref #3275 .
2015-01-09 23:51:34 -08:00
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
502fd94f2c
Merge pull request #3172 from alfredxing/docs-output-overrides
2015-01-05 23:19:12 -08:00
7655b533c9
Allow documents to set `published` in front matter
2015-01-05 16:11:02 -08:00
1062fdf89f
Use local tmp folder for symlink tests
2015-01-05 09:28:54 +01:00
a2b6aa263e
Add local tmp folder
2015-01-05 09:28:54 +01:00
a098dc80cd
Merge pull request #3234 from jekyll/ruby-2-2
2014-12-29 20:49:04 -05:00
7cd5847826
Merge pull request #3244 from jekyll/store-messages
2014-12-29 20:48:23 -05:00
9109da32f9
Update test for the date() Liquid filter.
2014-12-29 20:44:10 -05:00
5e10958faa
Unescape Document output path
...
Document#destination wasn't unescaped properly.
For example, when we have a document named '_langs/c#.md',
we expect its url to be '/langs/c#.html',
but it was actually '/langs/c%23.html'.
We now unecape URL at Document#destination like Post#destination and
Page#destination.
2014-12-29 22:38:50 +09:00
1fc99bdd97
Test LogAdapter#messages
2014-12-29 01:21:01 -05:00
a6781bda30
Always, always rebuild (by default) in tests.
2014-12-29 00:37:16 -05:00
612eb737a5
Merge pull request #3047 from karouf/slugify-non-latin
2014-12-29 00:31:34 -05:00
004f923644
Revert "Revert "Make permalink parsing consistent with pages""
2014-12-29 00:30:42 -05:00
e39dfa3f0b
Merge pull request #2908 from alfredxing/document-path
2014-12-29 00:26:35 -05:00
232a58d5b4
Fix test use of Site#getConverterImpl.
2014-12-28 14:14:24 -05:00
c24c6b7f3d
Use 'enable_coderay' in the tests.
2014-12-26 22:17:33 -05:00
5bf1596414
Refactor Highlight tag tests to use a helper method to create the tag.
2014-12-26 21:53:56 -05:00
7227ad4ebb
Merge pull request #3116 from alfredxing/incremental
2014-12-22 08:57:50 -05:00
34ff0bbb36
Added tests for new jekyll doctor warning
2014-12-15 21:26:47 +01:00
49115dbdab
Merge pull request #3158 from afeld/as-liquid-refactor
2014-12-09 10:50:42 -08:00
032139bd2f
Ensure only one converter is found for .Rmd in the tests. Ref: #3147 .
2014-12-07 16:08:16 -08:00
f8af94431d
Fix coverage reporting for built-in bundles
2014-12-02 20:50:39 -06:00
a701e59c07
Add lots more unit tests
2014-11-27 10:40:31 -08:00
229303bbc8
compare resulting data in jsonify test
2014-11-27 04:01:31 -06:00
02f281eef3
Add unit and cucumber tests
2014-11-26 21:15:53 -08:00
0662d31bf6
fix jsonify filter when used with boolean values
2014-11-26 02:40:41 -06:00
d250efccb9
add test for broken markdown regexp
2014-11-24 19:56:26 -06:00
dc30114605
Use site.in_source_dir
2014-11-23 16:16:19 -08:00
ef53e677a4
Better tests for plugin manager.
2014-11-23 13:14:51 -08:00
03d9396b85
Capture the output of Jekyll::Commands::New when looking for an error.
2014-11-23 12:53:36 -08:00
ac03af3229
Implement @mattr-'s suggestions
2014-11-21 22:12:21 -08:00
fe6bfc6f1b
Fix failing tests
2014-11-21 22:12:21 -08:00
d7e3d4df8f
Add support for collections documents to have YAML front matter ending in dots.
2014-11-20 14:38:17 -06:00
5a350788e7
Test JEKYLL_NO_BUNDLER_REQUIRE.
2014-11-05 21:04:34 -08:00
8ee1b2a1fd
Finish up the plugin manager
...
And so it shall be.
2014-11-05 19:29:54 -08:00
18930b01f6
Fix up the assertions.
2014-11-05 11:39:15 -08:00
b29fd6d380
Add tests.
...
Need to fix up the assertions to match the output.
2014-11-05 11:37:51 -08:00
0c6137b2d3
Fix site tests.
2014-11-03 22:16:48 -08:00
8d02c5cd94
Allow override of `destination` in site_configuration in tests
2014-11-03 22:16:48 -08:00
2690c045ec
Fix the tests so they are *PERFECT*.
2014-11-03 22:16:48 -08:00
817f6cb658
Fix problem where entries weren't stripped of their trailing slashes.
2014-11-03 22:16:47 -08:00
3762878381
Correctly access the StaticFile's site variable.
2014-11-03 22:16:47 -08:00
4078bde3ba
More passing tests.
2014-11-03 22:15:41 -08:00
3b634134a0
Another test passing. 😄
2014-11-03 22:15:41 -08:00
461e16f8bc
More tests are passing. Hooray.
2014-11-03 22:15:40 -08:00
f9e249ae20
Generalize Utils#slugify for any scripts
...
It replaces any non alphanumeric glyphs by an hyphen.
2014-10-31 15:56:03 +01:00
8dcf7a6680
Merge pull request #3031 from alfredxing/frontmatter-permalinks
2014-10-29 15:13:12 -07:00
3fb1356593
The jsonify filter should deep-convert to Liquid when given an Array.
...
Fixes https://github.com/github/choosealicense.com/issues/225
2014-10-27 15:58:42 -07:00
0fe1d0686a
Allow placeholders in permalinks
2014-10-26 18:23:58 -07:00
ae01b1d5df
😦
2014-10-22 02:16:50 -07:00
5ed4638400
Merge pull request #2986 from tamagokun/where_filters_enumerable
2014-10-20 20:09:21 -07:00
078b2785e4
Revert "Make permalink parsing consistent with pages"
2014-10-18 12:07:44 -07:00
73ca205a5c
Add test for Document#basename_without_ext
2014-10-12 14:33:13 -07:00
3c5e9f5334
Add tests for mode parameters of slugify Liquid filter
2014-10-12 02:50:08 +09:00
56ac50c568
where filter - test return value when filtering a Hash
2014-10-08 17:02:36 -04:00
f6ea8b4d50
Allow Enumerables to be used with "where" filter.
2014-10-08 16:19:55 -04:00
3a96d01e4a
Make permalink parsing consistent with pages
...
Require permalink to end in a slash to write an index file.
Addresses #2920 .
2014-09-24 22:08:25 -07:00
121a06a9eb
unit test for jekyll new --force
2014-09-16 16:42:33 +04:00
d9e5fdde5b
test for jekyll new --blank
2014-09-12 18:30:06 +04:00
6c0e791236
Use relative path for `path` Liquid variable in Documents
2014-09-10 21:04:40 -07:00
196a56e3ec
Add push, pop, shift, and unshift Liquid filters.
...
Fixes #2892 .
2014-09-09 21:29:23 -07:00
0675f2a423
Update include_relative tests
...
This verifies you can’t go “up” in the include
2014-09-07 21:23:45 -07:00
6644c77d23
Merge pull request #2870 from gjtorikian/support-relative-include
2014-09-07 13:05:38 -07:00
4da07bb2c3
Add tests around nasty include attempts
2014-09-07 12:00:37 -07:00
e7c8bbf5df
Test that includes relative to self are included
2014-09-07 11:24:44 -07:00
934c37b578
Separate include_relative test out into its own context
2014-09-07 11:21:50 -07:00
77297744ce
Add a test for the slugify Liquid filter
2014-09-07 16:49:14 +09:00
9f558d1cec
Rename tag to `include_relative`
2014-09-06 21:48:15 -07:00
58a76911bb
Merge pull request #2864 from kansaichris/add-title-to-collection-urls
2014-09-05 10:04:38 -07:00
aa97f1025d
Support a new `relative_include` tag
2014-09-03 15:43:51 -07:00
62a3961739
Add tests for Utils#slugify
2014-09-02 14:33:03 +09:00
cfd17b2e7d
Add inspect filter
2014-09-01 14:51:09 -07:00
be2b16507e
Test documents without a title
2014-09-01 13:32:31 +09:00
a5e51cfdbe
Properly handle titles with trailing punctuation
2014-09-01 13:25:38 +09:00
4dec3c8c6b
Test titles in document permalinks
2014-09-01 13:04:54 +09:00
55de135467
Test Liquid syntax in CoffeeScript files
2014-08-26 17:24:27 +09:00
cc4a0d1704
Change :title to :name
2014-08-26 11:26:19 +09:00
e8b00fb6f2
Add the 'title' variable to collection permalinks
2014-08-23 14:50:55 +09:00
4d8e335da1
The mighty classifier --- reborn!!!!!
...
Use classifier-reborn v2.0 in place of classifier 1.3.
Code at https://github.com/jekyll/classifier-reborn
2014-08-13 00:29:40 -04:00
566d3718b0
added sassify and scssify filters fot converting sass and scss strings to css
2014-08-12 21:24:04 -06:00
530e049d2d
Read in static files info `collection.files` as `StaticFile`s.
2014-08-12 15:59:45 -04:00
90ec93373b
Ensure the new type works.
2014-08-12 12:24:28 -04:00
6f8b8816f5
Merge pull request #2704 from jekyll/mult-converters
2014-08-10 20:29:37 -04:00
533ed6eb38
Remove tests for the Command.ignored_paths method which now lives in jekyll-watch.
2014-08-10 14:46:06 -04:00
c8d1c3d264
Remove duplicated mixed case categories
2014-08-07 11:27:42 +09:00
3768d90278
Use category in downcase only for URL ( Resolves #1739 )
2014-08-07 11:27:41 +09:00
311f3be63b
Fixed ignore subir test.
2014-08-06 16:45:34 -07:00
f29884593b
Reverted deleted test and modified ensure subdirs are ignored.
2014-08-06 16:05:53 -07:00
d0ac4915cb
Reverts 18c033dc5c
...
The merge that is reverted assigned categories to posts
based on the subfolders in the _posts directory and
was merged under the understanding that it was fixing a bug.
Subfolders in the _posts directory should not assign
metadata information to posts at this point in time and
was not a bug.
2014-08-06 14:20:03 -07:00
d004bc4ea5
Allow Convertibles to be converted by >= 1 converters.
2014-08-06 16:20:24 -04:00
cb671acd0c
Merge pull request #2682 from alfredxing/date-parser-util
2014-08-06 15:30:02 -04:00
Martin Rogalla
Jordon Bedwell
Arthur Neves
Matt Rogers
ChaYoung You
Will Norris
Parker Moore
Fabian Rodriguez
Alfred Xing
Garen Torikian
Brandon Mathis
Ryan Burnette
Sylvester Keil
Malo Skrylevo
Mads Ohm Larsen
nitoyon
Alexander Köplinger
Matt Rogers
Aidan Feldman
Brandon Bradley
David Williamson
Renaud Martinet
Mike Kruk
Ruslan Korolev
Parker Moore
Chris Frederick
Shu Uesugi
Kevin
Bret Comnes