diff options
Diffstat (limited to 'lib/axlsx/drawing')
30 files changed, 76 insertions, 76 deletions
diff --git a/lib/axlsx/drawing/area_chart.rb b/lib/axlsx/drawing/area_chart.rb index 8a01f9f5..1d26a8fc 100644 --- a/lib/axlsx/drawing/area_chart.rb +++ b/lib/axlsx/drawing/area_chart.rb @@ -63,7 +63,7 @@ module Axlsx # chart based on the actual class type and not a fixed node name. # @return [String] def node_name - path = self.class.to_s + path = self.class.name if i = path.rindex('::') path = path[(i + 2)..-1] end diff --git a/lib/axlsx/drawing/area_series.rb b/lib/axlsx/drawing/area_series.rb index c43fe929..0e3d8928 100644 --- a/lib/axlsx/drawing/area_series.rb +++ b/lib/axlsx/drawing/area_series.rb @@ -52,19 +52,19 @@ module Axlsx # @see show_marker def show_marker=(v) - Axlsx::validate_boolean(v) + Axlsx.validate_boolean(v) @show_marker = v end # @see marker_symbol def marker_symbol=(v) - Axlsx::validate_marker_symbol(v) + Axlsx.validate_marker_symbol(v) @marker_symbol = v end # @see smooth def smooth=(v) - Axlsx::validate_boolean(v) + Axlsx.validate_boolean(v) @smooth = v end @@ -94,7 +94,7 @@ module Axlsx @labels.to_xml_string(str) unless @labels.nil? @data.to_xml_string(str) unless @data.nil? - str << '<c:smooth val="' << ((smooth) ? '1' : '0') << '"/>' + str << '<c:smooth val="' << (smooth ? '1' : '0') << '"/>' end end diff --git a/lib/axlsx/drawing/axis.rb b/lib/axlsx/drawing/axis.rb index dfef7890..ed3df5f1 100644 --- a/lib/axlsx/drawing/axis.rb +++ b/lib/axlsx/drawing/axis.rb @@ -109,15 +109,15 @@ module Axlsx # The number format format code for this axis # default :General - def format_code=(v) Axlsx::validate_string(v); @format_code = v; end + def format_code=(v) Axlsx.validate_string(v); @format_code = v; end # Specify if gridlines should be shown for this axis # default true - def gridlines=(v) Axlsx::validate_boolean(v); @gridlines = v; end + def gridlines=(v) Axlsx.validate_boolean(v); @gridlines = v; end # Specify if axis should be removed from the chart # default false - def delete=(v) Axlsx::validate_boolean(v); @delete = v; end + def delete=(v) Axlsx.validate_boolean(v); @delete = v; end # specifies how the perpendicular axis is crossed # must be one of [:autoZero, :min, :max] @@ -126,9 +126,9 @@ module Axlsx # Specify the degree of label rotation to apply to labels # default true def label_rotation=(v) - Axlsx::validate_int(v) + Axlsx.validate_int(v) adjusted = v.to_i * 60000 - Axlsx::validate_angle(adjusted) + Axlsx.validate_angle(adjusted) @label_rotation = adjusted end diff --git a/lib/axlsx/drawing/bar_3D_chart.rb b/lib/axlsx/drawing/bar_3D_chart.rb index 604a9d17..4b688668 100644 --- a/lib/axlsx/drawing/bar_3D_chart.rb +++ b/lib/axlsx/drawing/bar_3D_chart.rb @@ -99,14 +99,14 @@ module Axlsx # space between bar or column clusters, as a percentage of the bar or column width. def gap_width=(v) RangeValidator.validate "Bar3DChart.gap_width", 0, 500, v - @gap_width = (v) + @gap_width = v end alias :gapWidth= :gap_width= # space between bar or column clusters, as a percentage of the bar or column width. def gap_depth=(v) RangeValidator.validate "Bar3DChart.gap_depth", 0, 500, v - @gap_depth = (v) + @gap_depth = v end alias :gapDepth= :gap_depth= diff --git a/lib/axlsx/drawing/bar_chart.rb b/lib/axlsx/drawing/bar_chart.rb index 87fd66c0..0dcf2c11 100644 --- a/lib/axlsx/drawing/bar_chart.rb +++ b/lib/axlsx/drawing/bar_chart.rb @@ -91,13 +91,13 @@ module Axlsx # space between bar or column clusters, as a percentage of the bar or column width. def gap_width=(v) RangeValidator.validate "BarChart.gap_width", 0, 500, v - @gap_width = (v) + @gap_width = v end alias :gapWidth= :gap_width= def overlap=(v) RangeValidator.validate "BarChart.overlap", -100, 100, v - @overlap = (v) + @overlap = v end # The shape of the bars or columns diff --git a/lib/axlsx/drawing/cat_axis.rb b/lib/axlsx/drawing/cat_axis.rb index d26e3dc9..d078eb6f 100644 --- a/lib/axlsx/drawing/cat_axis.rb +++ b/lib/axlsx/drawing/cat_axis.rb @@ -45,15 +45,15 @@ module Axlsx LBL_OFFSET_REGEX = /0*(([0-9])|([1-9][0-9])|([1-9][0-9][0-9])|1000)/.freeze # @see tick_lbl_skip - def tick_lbl_skip=(v) Axlsx::validate_unsigned_int(v); @tick_lbl_skip = v; end + def tick_lbl_skip=(v) Axlsx.validate_unsigned_int(v); @tick_lbl_skip = v; end alias :tickLblSkip= :tick_lbl_skip= # @see tick_mark_skip - def tick_mark_skip=(v) Axlsx::validate_unsigned_int(v); @tick_mark_skip = v; end + def tick_mark_skip=(v) Axlsx.validate_unsigned_int(v); @tick_mark_skip = v; end alias :tickMarkSkip= :tick_mark_skip= # From the docs: This element specifies that this axis is a date or text axis based on the data that is used for the axis labels, not a specific choice. - def auto=(v) Axlsx::validate_boolean(v); @auto = v; end + def auto=(v) Axlsx.validate_boolean(v); @auto = v; end # specifies how the perpendicular axis is crossed # must be one of [:ctr, :l, :r] diff --git a/lib/axlsx/drawing/chart.rb b/lib/axlsx/drawing/chart.rb index 9f59dc6a..c84e5cba 100644 --- a/lib/axlsx/drawing/chart.rb +++ b/lib/axlsx/drawing/chart.rb @@ -62,7 +62,7 @@ module Axlsx # Configures the vary_colors options for this chart # @param [Boolean] v The value to set - def vary_colors=(v) Axlsx::validate_boolean(v); @vary_colors = v; end + def vary_colors=(v) Axlsx.validate_boolean(v); @vary_colors = v; end # The title object for the chart. # @return [Title] @@ -124,7 +124,7 @@ module Axlsx # The part name for this chart # @return [String] def pn - "#{CHART_PN % (index + 1)}" + format(CHART_PN, index + 1) end # The title object for the chart. @@ -149,18 +149,18 @@ module Axlsx # Show the legend in the chart # @param [Boolean] v # @return [Boolean] - def show_legend=(v) Axlsx::validate_boolean(v); @show_legend = v; end + def show_legend=(v) Axlsx.validate_boolean(v); @show_legend = v; end # How to display blank values # @see display_blanks_as # @param [Symbol] v # @return [Symbol] - def display_blanks_as=(v) Axlsx::validate_display_blanks_as(v); @display_blanks_as = v; end + def display_blanks_as=(v) Axlsx.validate_display_blanks_as(v); @display_blanks_as = v; end # The style for the chart. # see ECMA Part 1 ยง21.2.2.196 # @param [Integer] v must be between 1 and 48 - def style=(v) DataTypeValidator.validate "Chart.style", Integer, v, lambda { |arg| arg >= 1 && arg <= 48 }; @style = v; end + def style=(v) DataTypeValidator.validate "Chart.style", Integer, v, ->(arg) { arg >= 1 && arg <= 48 }; @style = v; end # @see legend_position def legend_position=(v) RestrictionValidator.validate "Chart.legend_position", [:b, :l, :r, :t, :tr], v; @legend_position = v; end @@ -194,12 +194,12 @@ module Axlsx # Whether only data from visible cells should be plotted. # @param [Boolean] v # @return [Boolean] - def plot_visible_only=(v) Axlsx::validate_boolean(v); @plot_visible_only = v; end + def plot_visible_only=(v) Axlsx.validate_boolean(v); @plot_visible_only = v; end # Whether the chart area shall have rounded corners. # @param [Boolean] v # @return [Boolean] - def rounded_corners=(v) Axlsx::validate_boolean(v); @rounded_corners = v; end + def rounded_corners=(v) Axlsx.validate_boolean(v); @rounded_corners = v; end # Serializes the object # @param [String] str diff --git a/lib/axlsx/drawing/d_lbls.rb b/lib/axlsx/drawing/d_lbls.rb index 7e3936cc..0602a8df 100644 --- a/lib/axlsx/drawing/d_lbls.rb +++ b/lib/axlsx/drawing/d_lbls.rb @@ -38,7 +38,7 @@ module Axlsx [:show_legend_key, :show_val, :show_cat_name, :show_ser_name, :show_percent, :show_bubble_size, :show_leader_lines].each do |attr| - self.send("#{attr}=", false) + send("#{attr}=", false) end end @@ -78,7 +78,7 @@ module Axlsx %w(d_lbl_pos show_legend_key show_val show_cat_name show_ser_name show_percent show_bubble_size show_leader_lines).each do |key| next unless instance_vals.key?(key) && !instance_vals[key].nil? - str << "<c:#{Axlsx::camel(key, false)} val='#{instance_vals[key]}' />" + str << "<c:#{Axlsx.camel(key, false)} val='#{instance_vals[key]}' />" end str << '</c:dLbls>' end diff --git a/lib/axlsx/drawing/drawing.rb b/lib/axlsx/drawing/drawing.rb index fa7a608c..997a7af0 100644 --- a/lib/axlsx/drawing/drawing.rb +++ b/lib/axlsx/drawing/drawing.rb @@ -108,7 +108,7 @@ module Axlsx # An array of hyperlink objects associated with this drawings images # @return [Array] def hyperlinks - links = self.images.select { |a| a.hyperlink.is_a?(Hyperlink) } + links = images.select { |a| a.hyperlink.is_a?(Hyperlink) } links.map(&:hyperlink) end @@ -128,14 +128,14 @@ module Axlsx # The part name for this drawing # @return [String] def pn - "#{DRAWING_PN % (index + 1)}" + format(DRAWING_PN, index + 1) end # The relational part name for this drawing # #NOTE This should be rewritten to return an Axlsx::Relationship object. # @return [String] def rels_pn - "#{DRAWING_RELS_PN % (index + 1)}" + format(DRAWING_RELS_PN, index + 1) end # A list of objects this drawing holds. diff --git a/lib/axlsx/drawing/hyperlink.rb b/lib/axlsx/drawing/hyperlink.rb index acf3b8d2..682aae29 100644 --- a/lib/axlsx/drawing/hyperlink.rb +++ b/lib/axlsx/drawing/hyperlink.rb @@ -52,7 +52,7 @@ module Axlsx # @see endSnd # @param [Boolean] v The boolean value indicating the termination of playing sounds on click # @return [Boolean] - def end_snd=(v) Axlsx::validate_boolean(v); @end_snd = v end + def end_snd=(v) Axlsx.validate_boolean(v); @end_snd = v end alias :endSnd= :end_snd= # indicates that the link has already been clicked. @@ -62,7 +62,7 @@ module Axlsx # @see highlightClick # @param [Boolean] v The value to assign - def highlight_click=(v) Axlsx::validate_boolean(v); @highlight_click = v end + def highlight_click=(v) Axlsx.validate_boolean(v); @highlight_click = v end alias :highlightClick= :highlight_click= # From the specs: Specifies whether to add this URI to the history when navigating to it. This allows for the viewing of this presentation without the storing of history information on the viewing machine. If this attribute is omitted, then a value of 1 or true is assumed. @@ -71,7 +71,7 @@ module Axlsx # @see history # param [Boolean] v The value to assing - def history=(v) Axlsx::validate_boolean(v); @history = v end + def history=(v) Axlsx.validate_boolean(v); @history = v end # From the specs: Specifies the target frame that is to be used when opening this hyperlink. When the hyperlink is activated this attribute is used to determine if a new window is launched for viewing or if an existing one can be used. If this attribute is omitted, than a new window is opened. # @return [String] diff --git a/lib/axlsx/drawing/line_3D_chart.rb b/lib/axlsx/drawing/line_3D_chart.rb index 024ece0a..54f0170f 100644 --- a/lib/axlsx/drawing/line_3D_chart.rb +++ b/lib/axlsx/drawing/line_3D_chart.rb @@ -50,7 +50,7 @@ module Axlsx # @see gapDepth def gap_depth=(v) RegexValidator.validate "Line3DChart.gapWidth", GAP_AMOUNT_PERCENT, v - @gap_depth = (v) + @gap_depth = v end alias :gapDepth= :gap_depth= diff --git a/lib/axlsx/drawing/line_chart.rb b/lib/axlsx/drawing/line_chart.rb index 14577900..c922de78 100644 --- a/lib/axlsx/drawing/line_chart.rb +++ b/lib/axlsx/drawing/line_chart.rb @@ -63,7 +63,7 @@ module Axlsx # chart based on the actual class type and not a fixed node name. # @return [String] def node_name - path = self.class.to_s + path = self.class.name if i = path.rindex('::') path = path[(i + 2)..-1] end diff --git a/lib/axlsx/drawing/line_series.rb b/lib/axlsx/drawing/line_series.rb index d6a412e4..13492419 100644 --- a/lib/axlsx/drawing/line_series.rb +++ b/lib/axlsx/drawing/line_series.rb @@ -52,19 +52,19 @@ module Axlsx # @see show_marker def show_marker=(v) - Axlsx::validate_boolean(v) + Axlsx.validate_boolean(v) @show_marker = v end # @see marker_symbol def marker_symbol=(v) - Axlsx::validate_marker_symbol(v) + Axlsx.validate_marker_symbol(v) @marker_symbol = v end # @see smooth def smooth=(v) - Axlsx::validate_boolean(v) + Axlsx.validate_boolean(v) @smooth = v end @@ -94,7 +94,7 @@ module Axlsx @labels.to_xml_string(str) unless @labels.nil? @data.to_xml_string(str) unless @data.nil? - str << '<c:smooth val="' << ((smooth) ? '1' : '0') << '"/>' + str << '<c:smooth val="' << (smooth ? '1' : '0') << '"/>' end end diff --git a/lib/axlsx/drawing/marker.rb b/lib/axlsx/drawing/marker.rb index a1801eb9..0d6e0077 100644 --- a/lib/axlsx/drawing/marker.rb +++ b/lib/axlsx/drawing/marker.rb @@ -34,13 +34,13 @@ module Axlsx attr_reader :rowOff # @see col - def col=(v) Axlsx::validate_unsigned_int v; @col = v end + def col=(v) Axlsx.validate_unsigned_int v; @col = v end # @see colOff - def colOff=(v) Axlsx::validate_int v; @colOff = v end + def colOff=(v) Axlsx.validate_int v; @colOff = v end # @see row - def row=(v) Axlsx::validate_unsigned_int v; @row = v end + def row=(v) Axlsx.validate_unsigned_int v; @row = v end # @see rowOff - def rowOff=(v) Axlsx::validate_int v; @rowOff = v end + def rowOff=(v) Axlsx.validate_int v; @rowOff = v end # shortcut to set the column, row position for this marker # @param col the column for the marker, a Cell object or a string reference like "B7" @@ -58,7 +58,7 @@ module Axlsx # @return [String] def to_xml_string(str = +'') [:col, :colOff, :row, :rowOff].each do |k| - str << '<xdr:' << k.to_s << '>' << self.send(k).to_s << '</xdr:' << k.to_s << '>' + str << '<xdr:' << k.to_s << '>' << send(k).to_s << '</xdr:' << k.to_s << '>' end end @@ -68,7 +68,7 @@ module Axlsx # @see Chart#start_at def parse_coord_args(x, y = 0) if x.is_a?(String) - x, y = *Axlsx::name_to_indices(x) + x, y = *Axlsx.name_to_indices(x) end if x.is_a?(Cell) x, y = *x.pos diff --git a/lib/axlsx/drawing/num_data.rb b/lib/axlsx/drawing/num_data.rb index 356926b2..3ad23cb4 100644 --- a/lib/axlsx/drawing/num_data.rb +++ b/lib/axlsx/drawing/num_data.rb @@ -31,7 +31,7 @@ module Axlsx # @see format_code def format_code=(v = 'General') - Axlsx::validate_string(v) + Axlsx.validate_string(v) @format_code = v end diff --git a/lib/axlsx/drawing/num_data_source.rb b/lib/axlsx/drawing/num_data_source.rb index 0845ad31..b4081aae 100644 --- a/lib/axlsx/drawing/num_data_source.rb +++ b/lib/axlsx/drawing/num_data_source.rb @@ -17,7 +17,7 @@ module Axlsx @f = nil @data = @data_type.new(options) if options[:data] && options[:data].first.is_a?(Cell) - @f = Axlsx::cell_range(options[:data]) + @f = Axlsx.cell_range(options[:data]) end parse_options options end diff --git a/lib/axlsx/drawing/num_val.rb b/lib/axlsx/drawing/num_val.rb index 19829a30..a945fb65 100644 --- a/lib/axlsx/drawing/num_val.rb +++ b/lib/axlsx/drawing/num_val.rb @@ -18,14 +18,14 @@ module Axlsx # @see format_code def format_code=(v) - Axlsx::validate_string(v) + Axlsx.validate_string(v) @format_code = v end # serialize the object def to_xml_string(idx, str = +'') - Axlsx::validate_unsigned_int(idx) - if !v.to_s.empty? + Axlsx.validate_unsigned_int(idx) + unless v.to_s.empty? str << '<c:pt idx="' << idx.to_s << '" formatCode="' << format_code << '"><c:v>' << v.to_s << '</c:v></c:pt>' end end diff --git a/lib/axlsx/drawing/one_cell_anchor.rb b/lib/axlsx/drawing/one_cell_anchor.rb index 402b51ab..22b09944 100644 --- a/lib/axlsx/drawing/one_cell_anchor.rb +++ b/lib/axlsx/drawing/one_cell_anchor.rb @@ -60,10 +60,10 @@ module Axlsx # # @see height - def height=(v) Axlsx::validate_unsigned_int(v); @height = v; end + def height=(v) Axlsx.validate_unsigned_int(v); @height = v; end # @see width - def width=(v) Axlsx::validate_unsigned_int(v); @width = v; end + def width=(v) Axlsx.validate_unsigned_int(v); @width = v; end # The index of this anchor in the drawing # @return [Integer] diff --git a/lib/axlsx/drawing/pic.rb b/lib/axlsx/drawing/pic.rb index 150d6dc5..630d8d96 100644 --- a/lib/axlsx/drawing/pic.rb +++ b/lib/axlsx/drawing/pic.rb @@ -78,7 +78,7 @@ module Axlsx end def image_src=(v) - Axlsx::validate_string(v) + Axlsx.validate_string(v) if remote? RegexValidator.validate('Pic.image_src', /\A#{URI::DEFAULT_PARSER.make_regexp}\z/, v) RestrictionValidator.validate 'Pic.image_src', ALLOWED_MIME_TYPES, MimeTypeUtils.get_mime_type_from_uri(v) @@ -91,13 +91,13 @@ module Axlsx end # @see name - def name=(v) Axlsx::validate_string(v); @name = v; end + def name=(v) Axlsx.validate_string(v); @name = v; end # @see descr - def descr=(v) Axlsx::validate_string(v); @descr = v; end + def descr=(v) Axlsx.validate_string(v); @descr = v; end # @see remote - def remote=(v) Axlsx::validate_boolean(v); @remote = v; end + def remote=(v) Axlsx.validate_boolean(v); @remote = v; end def remote? remote == 1 || remote.to_s == 'true' @@ -124,14 +124,14 @@ module Axlsx # The part name for this image used in serialization and relationship building # @return [String] def pn - "#{IMAGE_PN % [(index + 1), extname]}" + format(IMAGE_PN, index + 1, extname) end # The relationship object for this pic. # @return [Relationship] def relationship if remote? - Relationship.new(self, IMAGE_R, "#{image_src}", target_mode: :External) + Relationship.new(self, IMAGE_R, image_src.to_s, target_mode: :External) else Relationship.new(self, IMAGE_R, "../#{pn}") end diff --git a/lib/axlsx/drawing/pie_series.rb b/lib/axlsx/drawing/pie_series.rb index 091267f4..416cd93c 100644 --- a/lib/axlsx/drawing/pie_series.rb +++ b/lib/axlsx/drawing/pie_series.rb @@ -39,7 +39,7 @@ module Axlsx def colors=(v) DataTypeValidator.validate "BarSeries.colors", [Array], v; @colors = v end # @see explosion - def explosion=(v) Axlsx::validate_unsigned_int(v); @explosion = v; end + def explosion=(v) Axlsx.validate_unsigned_int(v); @explosion = v; end # Serializes the object # @param [String] str diff --git a/lib/axlsx/drawing/scaling.rb b/lib/axlsx/drawing/scaling.rb index 4d5a9d2a..c9101ead 100644 --- a/lib/axlsx/drawing/scaling.rb +++ b/lib/axlsx/drawing/scaling.rb @@ -35,7 +35,7 @@ module Axlsx attr_reader :min # @see logBase - def logBase=(v) DataTypeValidator.validate "Scaling.logBase", [Integer], v, lambda { |arg| arg >= 2 && arg <= 1000 }; @logBase = v; end + def logBase=(v) DataTypeValidator.validate "Scaling.logBase", [Integer], v, ->(arg) { arg >= 2 && arg <= 1000 }; @logBase = v; end # @see orientation def orientation=(v) RestrictionValidator.validate "Scaling.orientation", [:minMax, :maxMin], v; @orientation = v; end # @see max diff --git a/lib/axlsx/drawing/scatter_series.rb b/lib/axlsx/drawing/scatter_series.rb index 2838c3de..865c6f85 100644 --- a/lib/axlsx/drawing/scatter_series.rb +++ b/lib/axlsx/drawing/scatter_series.rb @@ -43,7 +43,7 @@ module Axlsx @smooth = [:smooth, :smoothMarker].include?(chart.scatter_style) else # Set smoothing according to the option provided - Axlsx::validate_boolean(options[:smooth]) + Axlsx.validate_boolean(options[:smooth]) @smooth = options[:smooth] end @ln_width = options[:ln_width] unless options[:ln_width].nil? @@ -62,7 +62,7 @@ module Axlsx # @see smooth def smooth=(v) - Axlsx::validate_boolean(v) + Axlsx.validate_boolean(v) @smooth = v end @@ -73,7 +73,7 @@ module Axlsx # @see marker_symbol def marker_symbol=(v) - Axlsx::validate_marker_symbol(v) + Axlsx.validate_marker_symbol(v) @marker_symbol = v end @@ -110,7 +110,7 @@ module Axlsx end @xData.to_xml_string(str) unless @xData.nil? @yData.to_xml_string(str) unless @yData.nil? - str << '<c:smooth val="' << ((smooth) ? '1' : '0') << '"/>' + str << '<c:smooth val="' << (smooth ? '1' : '0') << '"/>' end str end diff --git a/lib/axlsx/drawing/ser_axis.rb b/lib/axlsx/drawing/ser_axis.rb index 4fea58e5..24eb0926 100644 --- a/lib/axlsx/drawing/ser_axis.rb +++ b/lib/axlsx/drawing/ser_axis.rb @@ -22,11 +22,11 @@ module Axlsx end # @see tickLblSkip - def tick_lbl_skip=(v) Axlsx::validate_unsigned_int(v); @tick_lbl_skip = v; end + def tick_lbl_skip=(v) Axlsx.validate_unsigned_int(v); @tick_lbl_skip = v; end alias :tickLblSkip= :tick_lbl_skip= # @see tickMarkSkip - def tick_mark_skip=(v) Axlsx::validate_unsigned_int(v); @tick_mark_skip = v; end + def tick_mark_skip=(v) Axlsx.validate_unsigned_int(v); @tick_mark_skip = v; end alias :tickMarkSkip= :tick_mark_skip= # Serializes the object diff --git a/lib/axlsx/drawing/series.rb b/lib/axlsx/drawing/series.rb index 5a91dd44..134cd7d0 100644 --- a/lib/axlsx/drawing/series.rb +++ b/lib/axlsx/drawing/series.rb @@ -40,7 +40,7 @@ module Axlsx end # @see order - def order=(v) Axlsx::validate_unsigned_int(v); @order = v; end + def order=(v) Axlsx.validate_unsigned_int(v); @order = v; end # @see title def title=(v) diff --git a/lib/axlsx/drawing/series_title.rb b/lib/axlsx/drawing/series_title.rb index 08e5e909..366fc175 100644 --- a/lib/axlsx/drawing/series_title.rb +++ b/lib/axlsx/drawing/series_title.rb @@ -7,11 +7,11 @@ module Axlsx # @param [String] str # @return [String] def to_xml_string(str = +'') - clean_value = Axlsx::trust_input ? @text.to_s : ::CGI.escapeHTML(Axlsx::sanitize(@text.to_s)) + clean_value = Axlsx.trust_input ? @text.to_s : ::CGI.escapeHTML(Axlsx.sanitize(@text.to_s)) str << '<c:tx>' str << '<c:strRef>' - str << '<c:f>' << Axlsx::cell_range([@cell]) << '</c:f>' + str << '<c:f>' << Axlsx.cell_range([@cell]) << '</c:f>' str << '<c:strCache>' str << '<c:ptCount val="1"/>' str << '<c:pt idx="0">' diff --git a/lib/axlsx/drawing/str_val.rb b/lib/axlsx/drawing/str_val.rb index d09e6ce8..8bae630d 100644 --- a/lib/axlsx/drawing/str_val.rb +++ b/lib/axlsx/drawing/str_val.rb @@ -24,8 +24,8 @@ module Axlsx # serialize the object def to_xml_string(idx, str = +'') - Axlsx::validate_unsigned_int(idx) - if !v.to_s.empty? + Axlsx.validate_unsigned_int(idx) + unless v.to_s.empty? str << '<c:pt idx="' << idx.to_s << '"><c:v>' << ::CGI.escapeHTML(v.to_s) << '</c:v></c:pt>' end end diff --git a/lib/axlsx/drawing/title.rb b/lib/axlsx/drawing/title.rb index 84687a32..8fa79e52 100644 --- a/lib/axlsx/drawing/title.rb +++ b/lib/axlsx/drawing/title.rb @@ -69,11 +69,11 @@ module Axlsx def to_xml_string(str = +'') str << '<c:title>' unless empty? - clean_value = Axlsx::trust_input ? @text.to_s : ::CGI.escapeHTML(Axlsx::sanitize(@text.to_s)) + clean_value = Axlsx.trust_input ? @text.to_s : ::CGI.escapeHTML(Axlsx.sanitize(@text.to_s)) str << '<c:tx>' if @cell.is_a?(Cell) str << '<c:strRef>' - str << '<c:f>' << Axlsx::cell_range([@cell]) << '</c:f>' + str << '<c:f>' << Axlsx.cell_range([@cell]) << '</c:f>' str << '<c:strCache>' str << '<c:ptCount val="1"/>' str << '<c:pt idx="0">' diff --git a/lib/axlsx/drawing/view_3D.rb b/lib/axlsx/drawing/view_3D.rb index 9b3489a3..c3f5838d 100644 --- a/lib/axlsx/drawing/view_3D.rb +++ b/lib/axlsx/drawing/view_3D.rb @@ -82,7 +82,7 @@ module Axlsx alias :depthPercent= :depth_percent= # @see r_ang_ax - def r_ang_ax=(v) Axlsx::validate_boolean(v); @r_ang_ax = v; end + def r_ang_ax=(v) Axlsx.validate_boolean(v); @r_ang_ax = v; end alias :rAngAx= :r_ang_ax= # @see perspective @@ -111,7 +111,7 @@ module Axlsx val = Axlsx.instance_values_for(self)[name] return "" if val.nil? - "<%s:%s val='%s'/>" % [namespace, Axlsx::camel(name, false), val] + format("<%s:%s val='%s'/>", namespace, Axlsx.camel(name, false), val) end end end diff --git a/lib/axlsx/drawing/vml_drawing.rb b/lib/axlsx/drawing/vml_drawing.rb index 364ce19a..9132b00c 100644 --- a/lib/axlsx/drawing/vml_drawing.rb +++ b/lib/axlsx/drawing/vml_drawing.rb @@ -14,7 +14,7 @@ module Axlsx # The part name for this vml drawing # @return [String] def pn - "#{VML_DRAWING_PN}" % (@comments.worksheet.index + 1) + format(VML_DRAWING_PN, @comments.worksheet.index + 1) end # serialize the vml_drawing to xml. diff --git a/lib/axlsx/drawing/vml_shape.rb b/lib/axlsx/drawing/vml_shape.rb index f1cd8951..4b21528f 100644 --- a/lib/axlsx/drawing/vml_shape.rb +++ b/lib/axlsx/drawing/vml_shape.rb @@ -24,7 +24,7 @@ module Axlsx @right_offset = 50 @bottom_offset = 5 @visible = true - @id = (0...8).map { 65.+(rand(25)).chr }.join + @id = Array.new(8) { rand(65..89).chr }.join parse_options options yield self if block_given? end |