Add support for inclusions of files as text #8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jcazevedo
requested changes
Apr 11, 2018
lib/frise/loader.rb
Outdated
| content_include_confs.each do |include_conf| | ||
| extra_vars = (include_conf['vars'] || {}).map { |k, v| [k, root_config.dig(*v.split('.'))] }.to_h | ||
| extra_consts = include_conf['constants'] || {} | ||
| symbol_table = merge_at(root_config, at_path, config).merge(global_vars).merge(extra_vars).merge(extra_consts) |
There was a problem hiding this comment.
The logic for building the symbol table for $include and $content_include is very similar. Can we extract this to a method?
There was a problem hiding this comment.
Sure, changed in 07a1447.
lib/frise/loader.rb
Outdated
| extra_vars = (include_conf['vars'] || {}).map { |k, v| [k, root_config.dig(*v.split('.'))] }.to_h | ||
| extra_consts = include_conf['constants'] || {} | ||
| symbol_table = merge_at(root_config, at_path, config).merge(global_vars).merge(extra_vars).merge(extra_consts) | ||
| content += Parser.parse_as_text(include_conf['file'], symbol_table) |
There was a problem hiding this comment.
If the file doesn't exist we have a no implicit conversion of nil into String error here. Perhaps we can have a more specific error message.
There was a problem hiding this comment.
The behavior most consistent with the renaming parts of Frise is to treat non-existing files as empty content (in this case, an empty string). Fixed in 07a1447.
ruippeixotog
force-pushed
the
content_includes
branch
from
9200e51
to
07a1447
Compare
jcazevedo
approved these changes
Apr 12, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.