New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix loading data from subdir with a period in name #5433

Merged
merged 2 commits into from Oct 6, 2016

Conversation

Projects
None yet
3 participants
@ayastreb
Contributor

ayastreb commented Oct 1, 2016

Fix #5429
If we're processing a directory - use it's name as a key.

@ayastreb ayastreb changed the title from Fix loading data from subdir with a period in name #5429 to Fix loading data from subdir with a period in name Oct 1, 2016

Show outdated Hide outdated lib/jekyll/readers/data_reader.rb
if File.directory?(path)
read_data_to(path, data[key] = {})
read_data_to(path, data[entry] = {})

This comment has been minimized.

@parkr

parkr Oct 3, 2016

Member

I think we might still need to do sanitize_filename here to make this accessible in Liquid.

@parkr

parkr Oct 3, 2016

Member

I think we might still need to do sanitize_filename here to make this accessible in Liquid.

This comment has been minimized.

@ayastreb

ayastreb Oct 3, 2016

Contributor

ok, so "categories.01" will become "categories01", right?

@ayastreb

ayastreb Oct 3, 2016

Contributor

ok, so "categories.01" will become "categories01", right?

This comment has been minimized.

@parkr

parkr Oct 3, 2016

Member

Yes! I believe having .'s in the key is not acceptable.

@parkr

parkr Oct 3, 2016

Member

Yes! I believe having .'s in the key is not acceptable.

@parkr parkr added the fix label Oct 3, 2016

@parkr

parkr approved these changes Oct 6, 2016

Nicely done! 🎉

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Oct 6, 2016

Member

@jekyllbot: merge +bug

Member

parkr commented Oct 6, 2016

@jekyllbot: merge +bug

@jekyllbot jekyllbot merged commit 6f05ebb into jekyll:master Oct 6, 2016

1 of 2 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jekyllbot jekyllbot added bug fix labels Oct 6, 2016

jekyllbot added a commit that referenced this pull request Oct 6, 2016

@parkr parkr added this to the 3.3 milestone Oct 6, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment