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

Maintain html_safe? on sliced HTML safe strings #33808

Merged
merged 3 commits into from Sep 6, 2018

Conversation

Projects
None yet
5 participants
@itsbagpack
Contributor

itsbagpack commented Sep 6, 2018

Summary

This change allows for an HTML safe string to remain HTML safe even when accessed via a range.

Before

string = "<div>test</div>".html_safe
substring = string[-1..1]
substring.html_safe? # => false

After

string = "<div>test</div>".html_safe
substring = string[-1..1]
substring.html_safe? # => true

cc @tenderlove @no-itsbackpack

itsbagpack and others added some commits Aug 31, 2018

SafeBuffer should maintain safety upon getting a slice via a range if…
… original buffer was safe.

Co-Authored-By: no-itsbackpack <no-itsbackpack@github.com>
Use assert_predicate instead
Co-authored-by: no-itsbackpack <no-itsbackpack@github.com>
@rails-bot

This comment has been minimized.

Show comment
Hide comment
@rails-bot

rails-bot Sep 6, 2018

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @pixeltrix (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

rails-bot commented Sep 6, 2018

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @pixeltrix (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

@rafaelfranca

This comment has been minimized.

Show comment
Hide comment
@rafaelfranca

rafaelfranca Sep 6, 2018

Member

Thanks! Can you add a CHANGELOG entry?

Member

rafaelfranca commented Sep 6, 2018

Thanks! Can you add a CHANGELOG entry?

Update CHANGELOG for SafetyBuffer slice access
Co-authored-by: no-itsbackpack <no-itsbackpack@github.com>
@tenderlove

This comment has been minimized.

Show comment
Hide comment
@tenderlove

tenderlove Sep 6, 2018

Member

The railties failures seem unrelated, so I'll merge this.

Member

tenderlove commented Sep 6, 2018

The railties failures seem unrelated, so I'll merge this.

@tenderlove tenderlove merged commit b31ae31 into rails:master Sep 6, 2018

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
codeclimate All good!
Details

@itsbagpack itsbagpack deleted the itsbagpack:fix-access-safety-buffer-slice branch Sep 6, 2018

@rafaelfranca

This comment has been minimized.

Show comment
Hide comment
@rafaelfranca

rafaelfranca Sep 7, 2018

Member

I thought that I already did 🤦‍♂️. Thanks

Member

rafaelfranca commented Sep 7, 2018

I thought that I already did 🤦‍♂️. Thanks

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