From efe986dc759484cc6f82c4e926ff5128784e0fe8 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sat, 10 Jun 2023 11:20:12 +0200 Subject: Remove redundant `to_s` calls `clean_value`'s return value is a `String`. That method will return `@value.to_s`, or it will call `Axlsx.sanitize`, which will return a `String` in both conditions ( --- lib/axlsx/workbook/worksheet/cell.rb | 5 +++-- lib/axlsx/workbook/worksheet/cell_serializer.rb | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/axlsx/workbook/worksheet/cell.rb b/lib/axlsx/workbook/worksheet/cell.rb index b9f78fdb..3bb619c7 100644 --- a/lib/axlsx/workbook/worksheet/cell.rb +++ b/lib/axlsx/workbook/worksheet/cell.rb @@ -442,9 +442,10 @@ module Axlsx end end - # Returns the sanatized value - # TODO find a better way to do this as it accounts for 30% of + # Returns the sanitized value + # TODO: find a better way to do this as it accounts for 30% of # processing time in benchmarking... + # @return [String] The sanitized value def clean_value if (type == :string || type == :text) && !Axlsx::trust_input Axlsx::sanitize(::CGI.escapeHTML(@value.to_s)) diff --git a/lib/axlsx/workbook/worksheet/cell_serializer.rb b/lib/axlsx/workbook/worksheet/cell_serializer.rb index 9075c9c3..079abf41 100644 --- a/lib/axlsx/workbook/worksheet/cell_serializer.rb +++ b/lib/axlsx/workbook/worksheet/cell_serializer.rb @@ -90,7 +90,7 @@ module Axlsx # @param [String] str The string the serialized content will be appended to. # @return [String] def formula_serialization(cell, str = +'') - str << 't="str">' << cell.clean_value.to_s.delete_prefix(FORMULA_PREFIX) << '' + str << 't="str">' << cell.clean_value.delete_prefix(FORMULA_PREFIX) << '' str << '' << cell.formula_value.to_s << '' unless cell.formula_value.nil? end @@ -99,7 +99,7 @@ module Axlsx # @param [String] str The string the serialized content will be appended to. # @return [String] def array_formula_serialization(cell, str = +'') - str << 't="str">' << '' << cell.clean_value.to_s.delete_prefix(ARRAY_FORMULA_PREFIX).delete_suffix(ARRAY_FORMULA_SUFFIX) << '' + str << 't="str">' << '' << cell.clean_value.delete_prefix(ARRAY_FORMULA_PREFIX).delete_suffix(ARRAY_FORMULA_SUFFIX) << '' str << '' << cell.formula_value.to_s << '' unless cell.formula_value.nil? end -- cgit v1.2.3