-
Notifications
You must be signed in to change notification settings - Fork 0
Stop the generator reading commented-out code #28
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
Open
VSN2015
wants to merge
1
commit into
master
Choose a base branch
from
fix/generator-ignores-comments
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| require "ripper" | ||
|
|
||
| module Permittable | ||
| # Drafts a permit_params contract from what the app already knows: the | ||
| # model's columns (types, NOT NULL, database defaults) and, when the | ||
|
|
@@ -54,14 +56,38 @@ def found? | |
| ARRAY_ARG = /\A(\w+):\s*\[\s*\]\z/m | ||
| NESTED_ARG = /\A(\w+):\s*\[([^\[\]]*)\]\z/m | ||
|
|
||
| # Comment tokens. Ripper (stdlib) is used rather than a regexp because `#` | ||
| # is only a comment sometimes — it also appears inside string literals and | ||
| # `#{}` interpolation, and a permit call inside interpolation IS live code. | ||
| # String CONTENT is deliberately kept: `permit("name")` is a supported | ||
| # spelling, and its keys live in string tokens. | ||
| COMMENT_TOKENS = %i[on_comment on_embdoc on_embdoc_beg on_embdoc_end].freeze | ||
|
|
||
| module_function | ||
|
|
||
| # `source` with its comments removed. A controller keeping a commented-out | ||
| # `params.require(:admin).permit(:superuser)` for reference had :admin | ||
| # drafted as its root and :superuser as a permitted field — a wrong | ||
| # suggestion, and a security-flavoured one, from a line that does not run. | ||
| # | ||
| # Anything Ripper cannot lex falls back to the source unchanged, so a | ||
| # syntactically odd file scans exactly as it did before rather than not at | ||
| # all. | ||
| def executable_source(source) | ||
| tokens = Ripper.lex(source) | ||
| return source if tokens.nil? || tokens.empty? | ||
|
|
||
| tokens.reject { |token| COMMENT_TOKENS.include?(token[1]) }.map { |token| token[2] }.join | ||
|
Owner
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Rescuing |
||
| rescue StandardError | ||
| source | ||
| end | ||
|
|
||
| # Merge every permit call found in `source` into one Scan. The first | ||
| # `.require(:root)` seen wins, matching how a controller normally sticks | ||
| # to one envelope across actions. | ||
| def scan(source) | ||
| result = Scan.new(root: nil, scalars: [], arrays: [], nested: {}, unparsed: [], calls: 0) | ||
| (source || "").scan(PERMIT_CALL) do |root, args| | ||
| executable_source(source.to_s).scan(PERMIT_CALL) do |root, args| | ||
| result.calls += 1 | ||
| result.root ||= root&.to_sym | ||
| split_args(args).each { |arg| classify_arg(result, arg) } | ||
|
|
||
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Targeting
on_comment,on_embdoc,on_embdoc_beg, andon_embdoc_endhandles both standard#comments and=begin/=enddocumentation blocks.