diff options
Diffstat (limited to 'lib/axlsx/workbook')
25 files changed, 98 insertions, 98 deletions
diff --git a/lib/axlsx/workbook/defined_name.rb b/lib/axlsx/workbook/defined_name.rb index 38669076..3f6a4cae 100644 --- a/lib/axlsx/workbook/defined_name.rb +++ b/lib/axlsx/workbook/defined_name.rb @@ -109,7 +109,7 @@ module Axlsx # The local sheet index (0-based) # @param [Integer] value the unsigned integer index of the sheet this defined_name applies to. def local_sheet_id=(value) - Axlsx::validate_unsigned_int(value) + Axlsx.validate_unsigned_int(value) @local_sheet_id = value end diff --git a/lib/axlsx/workbook/shared_strings_table.rb b/lib/axlsx/workbook/shared_strings_table.rb index a8086f3e..ad4084ff 100644 --- a/lib/axlsx/workbook/shared_strings_table.rb +++ b/lib/axlsx/workbook/shared_strings_table.rb @@ -46,7 +46,7 @@ module Axlsx # @param [String] str # @return [String] def to_xml_string(str = +'') - Axlsx::sanitize(@shared_xml_string) + Axlsx.sanitize(@shared_xml_string) str << '<?xml version="1.0" encoding="UTF-8"?><sst xmlns="' << XML_NS << '"' str << ' count="' << @count.to_s << '" uniqueCount="' << unique_count.to_s << '"' str << ' xml:space="' << xml_space.to_s << '">' << @shared_xml_string << '</sst>' diff --git a/lib/axlsx/workbook/workbook.rb b/lib/axlsx/workbook/workbook.rb index 0f4db9ce..c3597700 100644 --- a/lib/axlsx/workbook/workbook.rb +++ b/lib/axlsx/workbook/workbook.rb @@ -95,7 +95,7 @@ module Axlsx # @see use_shared_strings def use_shared_strings=(v) - Axlsx::validate_boolean(v) + Axlsx.validate_boolean(v) @use_shared_strings = v end @@ -104,7 +104,7 @@ module Axlsx attr_reader :is_reversed def is_reversed=(v) - Axlsx::validate_boolean(v) + Axlsx.validate_boolean(v) @is_reversed = v end @@ -252,11 +252,11 @@ module Axlsx def date1904() @@date1904; end # see @date1904 - def date1904=(v) Axlsx::validate_boolean v; @@date1904 = v; end + def date1904=(v) Axlsx.validate_boolean v; @@date1904 = v; end # Sets the date1904 attribute to the provided boolean # @return [Boolean] - def self.date1904=(v) Axlsx::validate_boolean v; @@date1904 = v; end + def self.date1904=(v) Axlsx.validate_boolean v; @@date1904 = v; end # retrieves the date1904 attribute # @return [Boolean] @@ -283,7 +283,7 @@ module Axlsx def use_autowidth() @use_autowidth; end # see @use_autowidth - def use_autowidth=(v = true) Axlsx::validate_boolean v; @use_autowidth = v; end + def use_autowidth=(v = true) Axlsx.validate_boolean v; @use_autowidth = v; end # Font size of bold fonts is multiplied with this # Used for automatic calculation of cell widths with bold text @@ -291,7 +291,7 @@ module Axlsx attr_reader :bold_font_multiplier def bold_font_multiplier=(v) - Axlsx::validate_float v + Axlsx.validate_float v @bold_font_multiplier = v end @@ -301,7 +301,7 @@ module Axlsx attr_reader :font_scale_divisor def font_scale_divisor=(v) - Axlsx::validate_float v + Axlsx.validate_float v @font_scale_divisor = v end diff --git a/lib/axlsx/workbook/worksheet/auto_filter/auto_filter.rb b/lib/axlsx/workbook/worksheet/auto_filter/auto_filter.rb index f25966de..b8acfc51 100644 --- a/lib/axlsx/workbook/worksheet/auto_filter/auto_filter.rb +++ b/lib/axlsx/workbook/worksheet/auto_filter/auto_filter.rb @@ -52,8 +52,8 @@ module Axlsx # match the filter. def apply first_cell, last_cell = range.split(':') - start_point = Axlsx::name_to_indices(first_cell) - end_point = Axlsx::name_to_indices(last_cell) + start_point = Axlsx.name_to_indices(first_cell) + end_point = Axlsx.name_to_indices(last_cell) # The +1 is so we skip the header row with the filter drop downs rows = worksheet.rows[(start_point.last + 1)..end_point.last] || [] diff --git a/lib/axlsx/workbook/worksheet/cell.rb b/lib/axlsx/workbook/worksheet/cell.rb index b9f78fdb..4e667e06 100644 --- a/lib/axlsx/workbook/worksheet/cell.rb +++ b/lib/axlsx/workbook/worksheet/cell.rb @@ -345,7 +345,7 @@ module Axlsx # @example Relative Cell Reference # ws.rows.first.cells.first.r #=> "A1" def r - Axlsx::cell_r index, @row.row_index + Axlsx.cell_r index, @row.row_index end # @return [String] The absolute alpha(column)numeric(row) reference for this cell. @@ -358,7 +358,7 @@ module Axlsx # @return [Integer] The cellXfs item index applied to this cell. # @raise [ArgumentError] Invalid cellXfs id if the value provided is not within cellXfs items range. def style=(v) - Axlsx::validate_unsigned_int(v) + Axlsx.validate_unsigned_int(v) count = styles.cellXfs.size raise ArgumentError, "Invalid cellXfs id" unless v < count @@ -446,8 +446,8 @@ module Axlsx # TODO find a better way to do this as it accounts for 30% of # processing time in benchmarking... def clean_value - if (type == :string || type == :text) && !Axlsx::trust_input - Axlsx::sanitize(::CGI.escapeHTML(@value.to_s)) + if (type == :string || type == :text) && !Axlsx.trust_input + Axlsx.sanitize(::CGI.escapeHTML(@value.to_s)) else @value.to_s end @@ -488,7 +488,7 @@ module Axlsx # @see ssti def ssti=(v) - Axlsx::validate_unsigned_int(v) + Axlsx.validate_unsigned_int(v) @ssti = v end diff --git a/lib/axlsx/workbook/worksheet/cell_serializer.rb b/lib/axlsx/workbook/worksheet/cell_serializer.rb index 9075c9c3..0f7b0dc9 100644 --- a/lib/axlsx/workbook/worksheet/cell_serializer.rb +++ b/lib/axlsx/workbook/worksheet/cell_serializer.rb @@ -11,7 +11,7 @@ module Axlsx # @return [String] def to_xml_string(row_index, column_index, cell, str = +'') str << '<c r="' - str << Axlsx::col_ref(column_index) << Axlsx::row_ref(row_index) + str << Axlsx.col_ref(column_index) << Axlsx.row_ref(row_index) str << '" s="' << cell.style_str << '" ' return str << '/>' if cell.value.nil? @@ -50,7 +50,7 @@ module Axlsx # @param [String] str The string the serialized content will be appended to. # @return [String] def date(cell, str = +'') - value_serialization false, DateTimeConverter::date_to_serial(cell.value).to_s, str + value_serialization false, DateTimeConverter.date_to_serial(cell.value).to_s, str end # Serializes cells that are type time @@ -58,7 +58,7 @@ module Axlsx # @param [String] str The string the serialized content will be appended to. # @return [String] def time(cell, str = +'') - value_serialization false, DateTimeConverter::time_to_serial(cell.value).to_s, str + value_serialization false, DateTimeConverter.time_to_serial(cell.value).to_s, str end # Serializes cells that are type boolean diff --git a/lib/axlsx/workbook/worksheet/cfvo.rb b/lib/axlsx/workbook/worksheet/cfvo.rb index 9aeb55ed..71985896 100644 --- a/lib/axlsx/workbook/worksheet/cfvo.rb +++ b/lib/axlsx/workbook/worksheet/cfvo.rb @@ -40,10 +40,10 @@ module Axlsx attr_reader :val # @see type - def type=(v); Axlsx::validate_conditional_formatting_value_object_type(v); @type = v end + def type=(v); Axlsx.validate_conditional_formatting_value_object_type(v); @type = v end # @see gte - def gte=(v); Axlsx::validate_boolean(v); @gte = v end + def gte=(v); Axlsx.validate_boolean(v); @gte = v end # @see val def val=(v) diff --git a/lib/axlsx/workbook/worksheet/comment.rb b/lib/axlsx/workbook/worksheet/comment.rb index 879e6960..4275cf8e 100644 --- a/lib/axlsx/workbook/worksheet/comment.rb +++ b/lib/axlsx/workbook/worksheet/comment.rb @@ -80,7 +80,7 @@ module Axlsx # initialize the vml shape based on this comment's ref/position in the worksheet. # by default, all columns are 5 columns wide and 5 rows high def initialize_vml_shape - pos = Axlsx::name_to_indices(ref) + pos = Axlsx.name_to_indices(ref) @vml_shape = VmlShape.new(row: pos[1], column: pos[0], visible: @visible) do |vml| vml.left_column = vml.column vml.right_column = vml.column + 2 diff --git a/lib/axlsx/workbook/worksheet/conditional_formatting.rb b/lib/axlsx/workbook/worksheet/conditional_formatting.rb index 5f8f2474..a8ae3c36 100644 --- a/lib/axlsx/workbook/worksheet/conditional_formatting.rb +++ b/lib/axlsx/workbook/worksheet/conditional_formatting.rb @@ -63,7 +63,7 @@ module Axlsx # @see rules def rules=(v); @rules = v end # @see sqref - def sqref=(v); Axlsx::validate_string(v); @sqref = v end + def sqref=(v); Axlsx.validate_string(v); @sqref = v end # Serializes the conditional formatting element # @example Conditional Formatting XML looks like: diff --git a/lib/axlsx/workbook/worksheet/conditional_formatting_rule.rb b/lib/axlsx/workbook/worksheet/conditional_formatting_rule.rb index 5d626e46..f848d1be 100644 --- a/lib/axlsx/workbook/worksheet/conditional_formatting_rule.rb +++ b/lib/axlsx/workbook/worksheet/conditional_formatting_rule.rb @@ -155,33 +155,33 @@ module Axlsx end # @see type - def type=(v); Axlsx::validate_conditional_formatting_type(v); @type = v end + def type=(v); Axlsx.validate_conditional_formatting_type(v); @type = v end # @see aboveAverage - def aboveAverage=(v); Axlsx::validate_boolean(v); @aboveAverage = v end + def aboveAverage=(v); Axlsx.validate_boolean(v); @aboveAverage = v end # @see bottom - def bottom=(v); Axlsx::validate_boolean(v); @bottom = v end + def bottom=(v); Axlsx.validate_boolean(v); @bottom = v end # @see dxfId - def dxfId=(v); Axlsx::validate_unsigned_numeric(v); @dxfId = v end + def dxfId=(v); Axlsx.validate_unsigned_numeric(v); @dxfId = v end # @see equalAverage - def equalAverage=(v); Axlsx::validate_boolean(v); @equalAverage = v end + def equalAverage=(v); Axlsx.validate_boolean(v); @equalAverage = v end # @see priority - def priority=(v); Axlsx::validate_unsigned_numeric(v); @priority = v end + def priority=(v); Axlsx.validate_unsigned_numeric(v); @priority = v end # @see operator - def operator=(v); Axlsx::validate_conditional_formatting_operator(v); @operator = v end + def operator=(v); Axlsx.validate_conditional_formatting_operator(v); @operator = v end # @see text - def text=(v); Axlsx::validate_string(v); @text = v end + def text=(v); Axlsx.validate_string(v); @text = v end # @see percent - def percent=(v); Axlsx::validate_boolean(v); @percent = v end + def percent=(v); Axlsx.validate_boolean(v); @percent = v end # @see rank - def rank=(v); Axlsx::validate_unsigned_numeric(v); @rank = v end + def rank=(v); Axlsx.validate_unsigned_numeric(v); @rank = v end # @see stdDev - def stdDev=(v); Axlsx::validate_unsigned_numeric(v); @stdDev = v end + def stdDev=(v); Axlsx.validate_unsigned_numeric(v); @stdDev = v end # @see stopIfTrue - def stopIfTrue=(v); Axlsx::validate_boolean(v); @stopIfTrue = v end + def stopIfTrue=(v); Axlsx.validate_boolean(v); @stopIfTrue = v end # @see timePeriod - def timePeriod=(v); Axlsx::validate_time_period_type(v); @timePeriod = v end + def timePeriod=(v); Axlsx.validate_time_period_type(v); @timePeriod = v end # @see formula - def formula=(v); [*v].each { |x| Axlsx::validate_string(x) }; @formula = [*v].map { |form| ::CGI.escapeHTML(form) } end + def formula=(v); [*v].each { |x| Axlsx.validate_string(x) }; @formula = [*v].map { |form| ::CGI.escapeHTML(form) } end # @see color_scale def color_scale=(v) diff --git a/lib/axlsx/workbook/worksheet/data_validation.rb b/lib/axlsx/workbook/worksheet/data_validation.rb index bc9bc527..a84ab84d 100644 --- a/lib/axlsx/workbook/worksheet/data_validation.rb +++ b/lib/axlsx/workbook/worksheet/data_validation.rb @@ -178,57 +178,57 @@ module Axlsx attr_reader :type # @see formula1 - def formula1=(v); Axlsx::validate_string(v); @formula1 = v end + def formula1=(v); Axlsx.validate_string(v); @formula1 = v end # @see formula2 - def formula2=(v); Axlsx::validate_string(v); @formula2 = v end + def formula2=(v); Axlsx.validate_string(v); @formula2 = v end # @see allowBlank - def allowBlank=(v); Axlsx::validate_boolean(v); @allowBlank = v end + def allowBlank=(v); Axlsx.validate_boolean(v); @allowBlank = v end # @see error - def error=(v); Axlsx::validate_string(v); @error = v end + def error=(v); Axlsx.validate_string(v); @error = v end # @see errorStyle - def errorStyle=(v); Axlsx::validate_data_validation_error_style(v); @errorStyle = v end + def errorStyle=(v); Axlsx.validate_data_validation_error_style(v); @errorStyle = v end # @see errorTitle - def errorTitle=(v); Axlsx::validate_string(v); @errorTitle = v end + def errorTitle=(v); Axlsx.validate_string(v); @errorTitle = v end # @see operator - def operator=(v); Axlsx::validate_data_validation_operator(v); @operator = v end + def operator=(v); Axlsx.validate_data_validation_operator(v); @operator = v end # @see prompt - def prompt=(v); Axlsx::validate_string(v); @prompt = v end + def prompt=(v); Axlsx.validate_string(v); @prompt = v end # @see promptTitle - def promptTitle=(v); Axlsx::validate_string(v); @promptTitle = v end + def promptTitle=(v); Axlsx.validate_string(v); @promptTitle = v end # @see showDropDown def showDropDown=(v) warn 'The `showDropDown` has an inverted logic, false shows the dropdown list! You should use `hideDropDown` instead.' - Axlsx::validate_boolean(v) + Axlsx.validate_boolean(v) @showDropDown = v end # @see hideDropDown def hideDropDown=(v) - Axlsx::validate_boolean(v) + Axlsx.validate_boolean(v) # It's just an alias for the showDropDown attribute, hideDropDown should set the value of the original showDropDown. @showDropDown = v end # @see showErrorMessage - def showErrorMessage=(v); Axlsx::validate_boolean(v); @showErrorMessage = v end + def showErrorMessage=(v); Axlsx.validate_boolean(v); @showErrorMessage = v end # @see showInputMessage - def showInputMessage=(v); Axlsx::validate_boolean(v); @showInputMessage = v end + def showInputMessage=(v); Axlsx.validate_boolean(v); @showInputMessage = v end # @see sqref - def sqref=(v); Axlsx::validate_string(v); @sqref = v end + def sqref=(v); Axlsx.validate_string(v); @sqref = v end # @see type - def type=(v); Axlsx::validate_data_validation_type(v); @type = v end + def type=(v); Axlsx.validate_data_validation_type(v); @type = v end # Serializes the data validation # @param [String] str diff --git a/lib/axlsx/workbook/worksheet/date_time_converter.rb b/lib/axlsx/workbook/worksheet/date_time_converter.rb index e34ef055..01a7c21e 100644 --- a/lib/axlsx/workbook/worksheet/date_time_converter.rb +++ b/lib/axlsx/workbook/worksheet/date_time_converter.rb @@ -9,7 +9,7 @@ module Axlsx # @param [Date] date the date to be serialized # @return [Numeric] def self.date_to_serial(date) - epoch = Axlsx::Workbook::date1904 ? Date.new(1904) : Date.new(1899, 12, 30) + epoch = Axlsx::Workbook.date1904 ? Date.new(1904) : Date.new(1899, 12, 30) offset_date = date.respond_to?(:utc_offset) ? date + date.utc_offset.seconds : date (offset_date - epoch).to_f end @@ -23,7 +23,7 @@ module Axlsx epoch1900 = -2209161600.0 # Time.utc(1899, 12, 30).to_i epoch1904 = -2082844800.0 # Time.utc(1904, 1, 1).to_i seconds_per_day = 86400.0 # 60*60*24 - epoch = Axlsx::Workbook::date1904 ? epoch1904 : epoch1900 + epoch = Axlsx::Workbook.date1904 ? epoch1904 : epoch1900 (time.utc_offset + time.to_f - epoch) / seconds_per_day end end diff --git a/lib/axlsx/workbook/worksheet/icon_set.rb b/lib/axlsx/workbook/worksheet/icon_set.rb index 59d67e28..64b0c21a 100644 --- a/lib/axlsx/workbook/worksheet/icon_set.rb +++ b/lib/axlsx/workbook/worksheet/icon_set.rb @@ -49,7 +49,7 @@ module Axlsx attr_reader :showValue # @see iconSet - def iconSet=(v); Axlsx::validate_icon_set(v); @iconSet = v end + def iconSet=(v); Axlsx.validate_icon_set(v); @iconSet = v end # @see showValue def showValue=(v); Axlsx.validate_boolean(v); @showValue = v end diff --git a/lib/axlsx/workbook/worksheet/merged_cells.rb b/lib/axlsx/workbook/worksheet/merged_cells.rb index c3fb6dde..90e1bfcb 100644 --- a/lib/axlsx/workbook/worksheet/merged_cells.rb +++ b/lib/axlsx/workbook/worksheet/merged_cells.rb @@ -19,7 +19,7 @@ module Axlsx self << if cells.is_a?(String) cells elsif cells.is_a?(Array) - Axlsx::cell_range(cells, false) + Axlsx.cell_range(cells, false) end end diff --git a/lib/axlsx/workbook/worksheet/page_margins.rb b/lib/axlsx/workbook/worksheet/page_margins.rb index 9c2ddd8e..d0a6f797 100644 --- a/lib/axlsx/workbook/worksheet/page_margins.rb +++ b/lib/axlsx/workbook/worksheet/page_margins.rb @@ -78,17 +78,17 @@ module Axlsx end # @see left - def left=(v); Axlsx::validate_unsigned_numeric(v); @left = v end + def left=(v); Axlsx.validate_unsigned_numeric(v); @left = v end # @see right - def right=(v); Axlsx::validate_unsigned_numeric(v); @right = v end + def right=(v); Axlsx.validate_unsigned_numeric(v); @right = v end # @see top - def top=(v); Axlsx::validate_unsigned_numeric(v); @top = v end + def top=(v); Axlsx.validate_unsigned_numeric(v); @top = v end # @see bottom - def bottom=(v); Axlsx::validate_unsigned_numeric(v); @bottom = v end + def bottom=(v); Axlsx.validate_unsigned_numeric(v); @bottom = v end # @see header - def header=(v); Axlsx::validate_unsigned_numeric(v); @header = v end + def header=(v); Axlsx.validate_unsigned_numeric(v); @header = v end # @see footer - def footer=(v); Axlsx::validate_unsigned_numeric(v); @footer = v end + def footer=(v); Axlsx.validate_unsigned_numeric(v); @footer = v end # Serializes the page margins element # @param [String] str diff --git a/lib/axlsx/workbook/worksheet/page_setup.rb b/lib/axlsx/workbook/worksheet/page_setup.rb index 6fc8ccba..ddfd698a 100644 --- a/lib/axlsx/workbook/worksheet/page_setup.rb +++ b/lib/axlsx/workbook/worksheet/page_setup.rb @@ -198,17 +198,17 @@ module Axlsx end # @see fit_to_height - def fit_to_height=(v); Axlsx::validate_unsigned_int(v); @fit_to_height = v; end + def fit_to_height=(v); Axlsx.validate_unsigned_int(v); @fit_to_height = v; end # @see fit_to_width - def fit_to_width=(v); Axlsx::validate_unsigned_int(v); @fit_to_width = v; end + def fit_to_width=(v); Axlsx.validate_unsigned_int(v); @fit_to_width = v; end # @see orientation - def orientation=(v); Axlsx::validate_page_orientation(v); @orientation = v; end + def orientation=(v); Axlsx.validate_page_orientation(v); @orientation = v; end # @see paper_height - def paper_height=(v); Axlsx::validate_number_with_unit(v); @paper_height = v; end + def paper_height=(v); Axlsx.validate_number_with_unit(v); @paper_height = v; end # @see paper_width - def paper_width=(v); Axlsx::validate_number_with_unit(v); @paper_width = v; end + def paper_width=(v); Axlsx.validate_number_with_unit(v); @paper_width = v; end # @see scale - def scale=(v); Axlsx::validate_scale_10_400(v); @scale = v; end + def scale=(v); Axlsx.validate_scale_10_400(v); @scale = v; end # convenience method to achieve sanity when setting fit_to_width and fit_to_height # as they both default to 1 if only their counterpart is specified. diff --git a/lib/axlsx/workbook/worksheet/pane.rb b/lib/axlsx/workbook/worksheet/pane.rb index 6cab87b9..91741e17 100644 --- a/lib/axlsx/workbook/worksheet/pane.rb +++ b/lib/axlsx/workbook/worksheet/pane.rb @@ -96,28 +96,28 @@ module Axlsx # @see active_pane def active_pane=(v) - Axlsx::validate_pane_type(v) - @active_pane = Axlsx::camel(v.to_s, false) + Axlsx.validate_pane_type(v) + @active_pane = Axlsx.camel(v.to_s, false) end # @see state def state=(v) - Axlsx::validate_split_state_type(v) - @state = Axlsx::camel(v.to_s, false) + Axlsx.validate_split_state_type(v) + @state = Axlsx.camel(v.to_s, false) end # @see top_left_cell def top_left_cell=(v) cell = (v.instance_of?(Axlsx::Cell) ? v.r_abs : v) - Axlsx::validate_string(cell) + Axlsx.validate_string(cell) @top_left_cell = cell end # @see x_split - def x_split=(v); Axlsx::validate_unsigned_int(v); @x_split = v end + def x_split=(v); Axlsx.validate_unsigned_int(v); @x_split = v end # @see y_split - def y_split=(v); Axlsx::validate_unsigned_int(v); @y_split = v end + def y_split=(v); Axlsx.validate_unsigned_int(v); @y_split = v end # Serializes the data validation # @param [String] str diff --git a/lib/axlsx/workbook/worksheet/pivot_table.rb b/lib/axlsx/workbook/worksheet/pivot_table.rb index f7607f57..afad9483 100644 --- a/lib/axlsx/workbook/worksheet/pivot_table.rb +++ b/lib/axlsx/workbook/worksheet/pivot_table.rb @@ -266,7 +266,7 @@ module Axlsx # References for header cells # @return [Array] def header_cell_refs - Axlsx::range_to_a(header_range).first + Axlsx.range_to_a(header_range).first end # The header cells for the pivot table diff --git a/lib/axlsx/workbook/worksheet/protected_ranges.rb b/lib/axlsx/workbook/worksheet/protected_ranges.rb index b425d053..3e712cb5 100644 --- a/lib/axlsx/workbook/worksheet/protected_ranges.rb +++ b/lib/axlsx/workbook/worksheet/protected_ranges.rb @@ -19,7 +19,7 @@ module Axlsx sqref = if cells.is_a?(String) cells elsif cells.is_a?(SimpleTypedList) || cells.is_a?(Array) - Axlsx::cell_range(cells, false) + Axlsx.cell_range(cells, false) end self << ProtectedRange.new(sqref: sqref, name: "Range#{size}") last diff --git a/lib/axlsx/workbook/worksheet/rich_text_run.rb b/lib/axlsx/workbook/worksheet/rich_text_run.rb index 02c350a7..4934523d 100644 --- a/lib/axlsx/workbook/worksheet/rich_text_run.rb +++ b/lib/axlsx/workbook/worksheet/rich_text_run.rb @@ -221,7 +221,7 @@ module Axlsx str << '<' << key.to_s << ' val="' << xml_value(val) << '"/>' end end - clean_value = Axlsx::trust_input ? @value.to_s : ::CGI.escapeHTML(Axlsx::sanitize(@value.to_s)) + clean_value = Axlsx.trust_input ? @value.to_s : ::CGI.escapeHTML(Axlsx.sanitize(@value.to_s)) str << '</rPr><t>' << clean_value << '</t></r>' end diff --git a/lib/axlsx/workbook/worksheet/row.rb b/lib/axlsx/workbook/worksheet/row.rb index 0b25fc59..86d38616 100644 --- a/lib/axlsx/workbook/worksheet/row.rb +++ b/lib/axlsx/workbook/worksheet/row.rb @@ -129,7 +129,7 @@ module Axlsx # @see height def height=(v) unless v.nil? - Axlsx::validate_unsigned_numeric(v) + Axlsx.validate_unsigned_numeric(v) @custom_height = true @ht = v end diff --git a/lib/axlsx/workbook/worksheet/selection.rb b/lib/axlsx/workbook/worksheet/selection.rb index 1a2633b4..3eaefeec 100644 --- a/lib/axlsx/workbook/worksheet/selection.rb +++ b/lib/axlsx/workbook/worksheet/selection.rb @@ -75,21 +75,21 @@ module Axlsx # @see active_cell def active_cell=(v) cell = (v.instance_of?(Axlsx::Cell) ? v.r_abs : v) - Axlsx::validate_string(cell) + Axlsx.validate_string(cell) @active_cell = cell end # @see active_cell_id - def active_cell_id=(v); Axlsx::validate_unsigned_int(v); @active_cell_id = v end + def active_cell_id=(v); Axlsx.validate_unsigned_int(v); @active_cell_id = v end # @see pane def pane=(v) - Axlsx::validate_pane_type(v) - @pane = Axlsx::camel(v, false) + Axlsx.validate_pane_type(v) + @pane = Axlsx.camel(v, false) end # @see sqref - def sqref=(v); Axlsx::validate_string(v); @sqref = v end + def sqref=(v); Axlsx.validate_string(v); @sqref = v end # Serializes the data validation # @param [String] str diff --git a/lib/axlsx/workbook/worksheet/sheet_view.rb b/lib/axlsx/workbook/worksheet/sheet_view.rb index 6138cbf7..02e20b33 100644 --- a/lib/axlsx/workbook/worksheet/sheet_view.rb +++ b/lib/axlsx/workbook/worksheet/sheet_view.rb @@ -162,32 +162,32 @@ module Axlsx end # @see color_id - def color_id=(v); Axlsx::validate_unsigned_int(v); @color_id = v end + def color_id=(v); Axlsx.validate_unsigned_int(v); @color_id = v end # @see top_left_cell def top_left_cell=(v) cell = (v.instance_of?(Axlsx::Cell) ? v.r_abs : v) - Axlsx::validate_string(cell) + Axlsx.validate_string(cell) @top_left_cell = cell end # @see view - def view=(v); Axlsx::validate_sheet_view_type(v); @view = v end + def view=(v); Axlsx.validate_sheet_view_type(v); @view = v end # @see workbook_view_id - def workbook_view_id=(v); Axlsx::validate_unsigned_int(v); @workbook_view_id = v end + def workbook_view_id=(v); Axlsx.validate_unsigned_int(v); @workbook_view_id = v end # @see zoom_scale - def zoom_scale=(v); Axlsx::validate_scale_0_10_400(v); @zoom_scale = v end + def zoom_scale=(v); Axlsx.validate_scale_0_10_400(v); @zoom_scale = v end # @see zoom_scale_normal - def zoom_scale_normal=(v); Axlsx::validate_scale_0_10_400(v); @zoom_scale_normal = v end + def zoom_scale_normal=(v); Axlsx.validate_scale_0_10_400(v); @zoom_scale_normal = v end # @see zoom_scale_page_layout_view - def zoom_scale_page_layout_view=(v); Axlsx::validate_scale_0_10_400(v); @zoom_scale_page_layout_view = v end + def zoom_scale_page_layout_view=(v); Axlsx.validate_scale_0_10_400(v); @zoom_scale_page_layout_view = v end # @see zoom_scale_sheet_layout_view - def zoom_scale_sheet_layout_view=(v); Axlsx::validate_scale_0_10_400(v); @zoom_scale_sheet_layout_view = v end + def zoom_scale_sheet_layout_view=(v); Axlsx.validate_scale_0_10_400(v); @zoom_scale_sheet_layout_view = v end # Serializes the data validation # @param [String] str diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb index e3e409af..47373d75 100644 --- a/lib/axlsx/workbook/worksheet/worksheet.rb +++ b/lib/axlsx/workbook/worksheet/worksheet.rb @@ -327,7 +327,7 @@ module Axlsx # @param [String] name def name=(name) validate_sheet_name name - @name = Axlsx::coder.encode(name) + @name = Axlsx.coder.encode(name) end # The auto filter range for the worksheet @@ -547,7 +547,7 @@ module Axlsx widths.each_with_index do |value, index| next if value.nil? - Axlsx::validate_unsigned_numeric(value) unless value.nil? + Axlsx.validate_unsigned_numeric(value) unless value.nil? find_or_create_column_info(index).width = value end end @@ -688,7 +688,7 @@ module Axlsx # @param [String] name The cell or cell range to return. "A1" will return the first cell of the first row. # @return [Cell] def name_to_cell(name) - col_index, row_index = *Axlsx::name_to_indices(name) + col_index, row_index = *Axlsx.name_to_indices(name) r = rows[row_index] @@ -759,7 +759,7 @@ module Axlsx raise ArgumentError, format(ERR_SHEET_NAME_TOO_LONG, name) if character_length > WORKSHEET_MAX_NAME_LENGTH raise ArgumentError, format(ERR_SHEET_NAME_CHARACTER_FORBIDDEN, name) if WORKSHEET_NAME_FORBIDDEN_CHARS.any? { |char| name.include? char } - name = Axlsx::coder.encode(name) + name = Axlsx.coder.encode(name) sheet_names = @workbook.worksheets.reject { |s| s == self }.map(&:name) raise ArgumentError, format(ERR_DUPLICATE_SHEET_NAME, name) if sheet_names.include?(name) end diff --git a/lib/axlsx/workbook/worksheet/worksheet_hyperlink.rb b/lib/axlsx/workbook/worksheet/worksheet_hyperlink.rb index 80f7ba09..2195fc6b 100644 --- a/lib/axlsx/workbook/worksheet/worksheet_hyperlink.rb +++ b/lib/axlsx/workbook/worksheet/worksheet_hyperlink.rb @@ -41,7 +41,7 @@ module Axlsx # @param [String|Cell] cell_reference The string reference or cell that defines where this hyperlink shows in the worksheet. def ref=(cell_reference) cell_reference = cell_reference.r if cell_reference.is_a?(Cell) - Axlsx::validate_string cell_reference + Axlsx.validate_string cell_reference @ref = cell_reference end @@ -69,7 +69,7 @@ module Axlsx # r:id should only be specified for external targets. # @return [Hash] def location_or_id - @target == :external ? { "r:id": relationship.Id } : { location: Axlsx::coder.encode(location) } + @target == :external ? { "r:id": relationship.Id } : { location: Axlsx.coder.encode(location) } end end end |