Skip to content

Commit c53481e

Browse files
authored
Merge pull request #38 from brphelps/dont-pollute-truncate-method
drop string extension to not pollute methods
2 parents 86deba8 + f4c2e8a commit c53481e

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

lib/cvss_suite.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
require 'cvss_suite/version'
1111
require 'cvss_suite/errors'
1212
require 'cvss_suite/invalid_cvss'
13-
require 'cvss_suite/extensions/string'
1413

1514
##
1615
# Module of this gem.

lib/cvss_suite/cvss40/cvss40_calc_helper.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,13 +377,21 @@ def extract_value_metric(metric, str)
377377
# remove what follow
378378
if extracted.index('/').positive?
379379
index_to_drop_after = extracted.index('/') - 1
380-
metric_val = extracted.truncate(index_to_drop_after)
380+
metric_val = truncate(extracted, index_to_drop_after)
381381
elsif extracted
382382
metric_val = extracted
383383
# case where it is the last metric so no ending /
384384
end
385385

386386
metric_val
387387
end
388+
389+
# rails defines this method on String, so we need to avoid polluting the
390+
# String class to preserve Rails behavior.
391+
def truncate(string_to_truncate, truncate_to)
392+
return string_to_truncate.dup unless string_to_truncate.length > truncate_to
393+
394+
(string_to_truncate[0, truncate_to + 1]).to_s
395+
end
388396
end
389397
end

lib/cvss_suite/extensions/string.rb

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)