|
2 | 2 |
|
3 | 3 | require 'differ' |
4 | 4 |
|
5 | | -# the same module as all the others? come on rubocop |
6 | 5 | module PmdTester |
7 | 6 | # Turn a project report into a hash that can be rendered somewhere else |
8 | 7 | module ProjectHasher |
@@ -46,68 +45,68 @@ def violations_to_hash(project) |
46 | 45 | 'violations' => all_vs |
47 | 46 | } |
48 | 47 | end |
49 | | - end |
50 | 48 |
|
51 | | - def link_template(project) |
52 | | - l_str = project.type == 'git' ? 'L' : 'l' |
53 | | - "#{project.webview_url}/{file}##{l_str}{line}" |
54 | | - end |
| 49 | + def link_template(project) |
| 50 | + l_str = project.type == 'git' ? 'L' : 'l' |
| 51 | + "#{project.webview_url}/{file}##{l_str}{line}" |
| 52 | + end |
55 | 53 |
|
56 | | - def violation_type(violation) |
57 | | - if violation.changed? |
58 | | - '~' |
59 | | - elsif violation.branch == 'patch' |
60 | | - '+' |
61 | | - else |
62 | | - '-' |
| 54 | + def violation_type(violation) |
| 55 | + if violation.changed? |
| 56 | + '~' |
| 57 | + elsif violation.branch == 'patch' |
| 58 | + '+' |
| 59 | + else |
| 60 | + '-' |
| 61 | + end |
63 | 62 | end |
64 | | - end |
65 | 63 |
|
66 | | - def make_violation_hash(file_ref, violation) |
67 | | - h = { |
68 | | - 't' => violation_type(violation), |
69 | | - 'l' => violation.line, |
70 | | - 'f' => file_ref, |
71 | | - 'r' => violation.rule_name, |
72 | | - 'm' => violation.changed? ? diff_fragments(violation) : violation.message |
73 | | - } |
74 | | - h['ol'] = violation.old_line if violation.changed? && violation.line != violation.old_line |
75 | | - h |
76 | | - end |
| 64 | + def make_violation_hash(file_ref, violation) |
| 65 | + h = { |
| 66 | + 't' => violation_type(violation), |
| 67 | + 'l' => violation.line, |
| 68 | + 'f' => file_ref, |
| 69 | + 'r' => violation.rule_name, |
| 70 | + 'm' => violation.changed? ? diff_fragments(violation) : violation.message |
| 71 | + } |
| 72 | + h['ol'] = violation.old_line if violation.changed? && violation.line != violation.old_line |
| 73 | + h |
| 74 | + end |
77 | 75 |
|
78 | | - def diff_fragments(violation) |
79 | | - diff = Differ.diff_by_word(violation.message, violation.old_message) |
80 | | - diff.format_as(:html) |
81 | | - end |
| 76 | + def diff_fragments(violation) |
| 77 | + diff = Differ.diff_by_word(violation.message, violation.old_message) |
| 78 | + diff.format_as(:html) |
| 79 | + end |
82 | 80 |
|
83 | | - def error_to_hash(error, project) |
84 | | - escaped_stacktrace = sanitize_stacktrace(error) |
85 | | - old_stacktrace = error.old_error.nil? ? nil : sanitize_stacktrace(error.old_error) |
86 | | - |
87 | | - { |
88 | | - 'file_url' => project.get_webview_url(error.filename), |
89 | | - 'stack_trace_html' => escaped_stacktrace, |
90 | | - 'old_stack_trace_html' => old_stacktrace, |
91 | | - 'short_message' => error.short_message, |
92 | | - 'short_filename' => error.short_filename, |
93 | | - 'filename' => error.filename, |
94 | | - 'change_type' => change_type(error) |
95 | | - } |
96 | | - end |
| 81 | + def error_to_hash(error, project) |
| 82 | + escaped_stacktrace = sanitize_stacktrace(error) |
| 83 | + old_stacktrace = error.old_error.nil? ? nil : sanitize_stacktrace(error.old_error) |
97 | 84 |
|
98 | | - def sanitize_stacktrace(error) |
99 | | - CGI.escapeHTML(error.stack_trace) |
100 | | - .gsub(error.filename, '<span class="meta-var">$FILE</span>') |
101 | | - .gsub(/\w++(?=\(\w++\.java:\d++\))/, '<span class="stack-trace-method">\\0</span>') |
102 | | - end |
| 85 | + { |
| 86 | + 'file_url' => project.get_webview_url(error.filename), |
| 87 | + 'stack_trace_html' => escaped_stacktrace, |
| 88 | + 'old_stack_trace_html' => old_stacktrace, |
| 89 | + 'short_message' => error.short_message, |
| 90 | + 'short_filename' => error.short_filename, |
| 91 | + 'filename' => error.filename, |
| 92 | + 'change_type' => change_type(error) |
| 93 | + } |
| 94 | + end |
| 95 | + |
| 96 | + def sanitize_stacktrace(error) |
| 97 | + CGI.escapeHTML(error.stack_trace) |
| 98 | + .gsub(error.filename, '<span class="meta-var">$FILE</span>') |
| 99 | + .gsub(/\w++(?=\(\w++\.java:\d++\))/, '<span class="stack-trace-method">\\0</span>') |
| 100 | + end |
103 | 101 |
|
104 | | - def change_type(item) |
105 | | - if item.branch == BASE |
106 | | - 'removed' |
107 | | - elsif item.changed? |
108 | | - 'changed' |
109 | | - else |
110 | | - 'added' |
| 102 | + def change_type(item) |
| 103 | + if item.branch == BASE |
| 104 | + 'removed' |
| 105 | + elsif item.changed? |
| 106 | + 'changed' |
| 107 | + else |
| 108 | + 'added' |
| 109 | + end |
111 | 110 | end |
112 | 111 | end |
113 | 112 | end |
0 commit comments