Skip to content
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

Ensure layouts are truely textual #468

Merged
merged 1 commit into from Aug 17, 2014

Conversation

Projects
None yet
3 participants
@gpakosz
Copy link
Member

commented Aug 12, 2014

Raise a RuntimeError when binary files are found in the layouts/ directory. Addresses #457.

@gpakosz

This comment has been minimized.

Copy link
Member Author

commented Aug 12, 2014

I had to change file extension for layouts files created in tests.

@gpakosz gpakosz added the to review label Aug 12, 2014

@bobthecow

This comment has been minimized.

Copy link
Member

commented Aug 12, 2014

👍

@@ -93,6 +93,8 @@ def load_objects(dir_name, kind, klass)
if is_binary && klass == Nanoc::Item
meta = (meta_filename && YAML.load_file(meta_filename)) || {}
content_or_filename = content_filename
elsif is_binary && klass == Nanoc::Layout
raise "The file '#{content_filename}' is a binary file. The 'layouts/' directory should contain only true textual layouts."

This comment has been minimized.

Copy link
@ddfreyne

ddfreyne Aug 16, 2014

Member

Not entirely sure about the wording here. What about:

The layout file '#{content_filename}' is a binary file, but layouts can only be textual.

@ddfreyne

This comment has been minimized.

Copy link
Member

commented Aug 16, 2014

Looks good apart from my remark.

@ddfreyne ddfreyne added waiting and removed to review labels Aug 16, 2014

@gpakosz

This comment has been minimized.

Copy link
Member Author

commented Aug 17, 2014

Changed the wording.

@ddfreyne ddfreyne removed the waiting label Aug 17, 2014

@ddfreyne ddfreyne added this to the 3.7.2 milestone Aug 17, 2014

ddfreyne added a commit that referenced this pull request Aug 17, 2014

Merge pull request #468 from gpakosz/textual-layouts-only
Ensure layouts are truely textual

@ddfreyne ddfreyne merged commit ad5a86a into nanoc:release-3.7.x Aug 17, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details

@gpakosz gpakosz deleted the gpakosz:textual-layouts-only branch Sep 6, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.