[Fix #630] do not re-annotate when wrapper matches column_pattern #668
Conversation
sashabelozerov
force-pushed
the
fix-wrapper-close-matches-column-pattern
branch
from
342b5ad to
cd21a73
Compare
|
thanks! |
|
Could you resolve the conflicts? Thanks. |
sashabelozerov
force-pushed
the
fix-wrapper-close-matches-column-pattern
branch
from
cd21a73 to
f42e912
Compare
![hound[bot]](https://avatars.githubusercontent.com/in/3598?s=60&v=4){kind=small}
| expect(res).to eq(true) | ||
|
|
||
| expect(File.read(@model_file_name)) | ||
| .to eq("# #{wrapper}\n#{@schema_info}# #{wrapper}\n\n#{@file_content}") |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [81/80]
| describe 'wrapper value matches column pattern' do | ||
| let(:wrapper) { 'Schema generated with `annotate`' } | ||
|
|
||
| it 'does not consider this as a new column and does not try to re-annotate' do |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [84/80]
| @@ -1685,13 +1685,14 @@ def write_model(file_name, file_content) | |||
| def annotate_one_file(options = {}) | |||
| Annotate.set_defaults(options) | |||
| options = Annotate.setup_options(options) | |||
| AnnotateModels.annotate_one_file(@model_file_name, @schema_info, :position_in_class, options) | |||
| result = AnnotateModels.annotate_one_file(@model_file_name, @schema_info, :position_in_class, options) | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [108/80]
| if new_header | ||
| new_columns = new_header.scan(column_pattern).sort | ||
| new_columns.delete(wrapper_line(options[:wrapper_open])) if options[:wrapper_open] | ||
| new_columns.delete(wrapper_line(options[:wrapper_close])) if options[:wrapper_close] |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [92/80]
| end | ||
| if new_header | ||
| new_columns = new_header.scan(column_pattern).sort | ||
| new_columns.delete(wrapper_line(options[:wrapper_open])) if options[:wrapper_open] |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [90/80]
|
|
||
| if old_header | ||
| old_columns = old_header.scan(column_pattern).sort | ||
| old_columns.delete(wrapper_line(options[:wrapper_open])) if options[:wrapper_open] |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [90/80]
| "# #{wrapper}" | ||
| end | ||
|
|
||
| def columns_unchanged?(old_content, info_block, options) |
There was a problem hiding this comment.
Metrics/AbcSize: Assignment Branch Condition size for columns_unchanged? is too high. [26.93/15]
Metrics/CyclomaticComplexity: Cyclomatic complexity for columns_unchanged? is too high. [7/6]
Metrics/MethodLength: Method has too many lines. [17/10]
| wrapper_open = options[:wrapper_open] ? "# #{options[:wrapper_open]}\n" : "" | ||
| wrapper_close = options[:wrapper_close] ? "# #{options[:wrapper_close]}\n" : "" | ||
| wrapper_open = options[:wrapper_open] ? "#{wrapper_line(options[:wrapper_open])}\n" : "" | ||
| wrapper_close = options[:wrapper_close] ? "#{wrapper_line(options[:wrapper_close])}\n" : "" |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [97/80]
Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
|
|
||
| abort "annotate error. #{file_name} needs to be updated, but annotate was run with `--frozen`." if options[:frozen] | ||
|
|
||
| # Replace inline the old schema info with the new schema info | ||
| wrapper_open = options[:wrapper_open] ? "# #{options[:wrapper_open]}\n" : "" | ||
| wrapper_close = options[:wrapper_close] ? "# #{options[:wrapper_close]}\n" : "" | ||
| wrapper_open = options[:wrapper_open] ? "#{wrapper_line(options[:wrapper_open])}\n" : "" |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [94/80]
Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
| new_columns = new_header && new_header.scan(column_pattern).sort | ||
|
|
||
| return false if old_columns == new_columns && !options[:force] | ||
| return false if columns_unchanged?(old_content, info_block, options) && !options[:force] |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [94/80]
sashabelozerov
force-pushed
the
fix-wrapper-close-matches-column-pattern
branch
2 times, most recently
from
54c3f23 to
7bccaf5
Compare
|
1- CI / test (2.3.x) fails on "Setup Ruby" step. I cannot do anything with it from my end, please check. |
|
@sashabelozerov I fixed CI, if you rebase it should pass in Travis and Github. The Hound bot is new. @ctran should it be a hard blocker? We already have Rubocop. |
sashabelozerov
force-pushed
the
fix-wrapper-close-matches-column-pattern
branch
from
7bccaf5 to
48f5b2b
Compare
|
@drwl Thanks, I've rebased the branch. |
Fixes #630