summaryrefslogtreecommitdiffhomepage
path: root/lib/axlsx/stylesheet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/axlsx/stylesheet')
-rw-r--r--lib/axlsx/stylesheet/border.rb6
-rw-r--r--lib/axlsx/stylesheet/cell_alignment.rb18
-rw-r--r--lib/axlsx/stylesheet/cell_protection.rb4
-rw-r--r--lib/axlsx/stylesheet/cell_style.rb12
-rw-r--r--lib/axlsx/stylesheet/color.rb6
-rw-r--r--lib/axlsx/stylesheet/dxf.rb2
-rw-r--r--lib/axlsx/stylesheet/font.rb28
-rw-r--r--lib/axlsx/stylesheet/gradient_fill.rb6
-rw-r--r--lib/axlsx/stylesheet/gradient_stop.rb4
-rw-r--r--lib/axlsx/stylesheet/num_fmt.rb4
-rw-r--r--lib/axlsx/stylesheet/pattern_fill.rb2
-rw-r--r--lib/axlsx/stylesheet/styles.rb10
-rw-r--r--lib/axlsx/stylesheet/table_style.rb8
-rw-r--r--lib/axlsx/stylesheet/table_style_element.rb6
-rw-r--r--lib/axlsx/stylesheet/table_styles.rb6
-rw-r--r--lib/axlsx/stylesheet/xf.rb30
16 files changed, 76 insertions, 76 deletions
diff --git a/lib/axlsx/stylesheet/border.rb b/lib/axlsx/stylesheet/border.rb
index 163479b1..41f8c64d 100644
--- a/lib/axlsx/stylesheet/border.rb
+++ b/lib/axlsx/stylesheet/border.rb
@@ -43,15 +43,15 @@ module Axlsx
attr_reader :prs
# @see diagonalUp
- def diagonal_up=(v) Axlsx::validate_boolean v; @diagonal_up = v end
+ def diagonal_up=(v) Axlsx.validate_boolean v; @diagonal_up = v end
alias :diagonalUp= :diagonal_up=
# @see diagonalDown
- def diagonal_down=(v) Axlsx::validate_boolean v; @diagonal_down = v end
+ def diagonal_down=(v) Axlsx.validate_boolean v; @diagonal_down = v end
alias :diagonalDown= :diagonal_down=
# @see outline
- def outline=(v) Axlsx::validate_boolean v; @outline = v end
+ def outline=(v) Axlsx.validate_boolean v; @outline = v end
# Serializes the object
# @param [String] str
diff --git a/lib/axlsx/stylesheet/cell_alignment.rb b/lib/axlsx/stylesheet/cell_alignment.rb
index 4a0c0686..964eec33 100644
--- a/lib/axlsx/stylesheet/cell_alignment.rb
+++ b/lib/axlsx/stylesheet/cell_alignment.rb
@@ -86,34 +86,34 @@ module Axlsx
alias :readingOrder :reading_order
# @see horizontal
- def horizontal=(v) Axlsx::validate_horizontal_alignment v; @horizontal = v end
+ def horizontal=(v) Axlsx.validate_horizontal_alignment v; @horizontal = v end
# @see vertical
- def vertical=(v) Axlsx::validate_vertical_alignment v; @vertical = v end
+ def vertical=(v) Axlsx.validate_vertical_alignment v; @vertical = v end
# @see textRotation
- def text_rotation=(v) Axlsx::validate_unsigned_int v; @text_rotation = v end
+ def text_rotation=(v) Axlsx.validate_unsigned_int v; @text_rotation = v end
alias :textRotation= :text_rotation=
# @see wrapText
- def wrap_text=(v) Axlsx::validate_boolean v; @wrap_text = v end
+ def wrap_text=(v) Axlsx.validate_boolean v; @wrap_text = v end
alias :wrapText= :wrap_text=
# @see indent
- def indent=(v) Axlsx::validate_unsigned_int v; @indent = v end
+ def indent=(v) Axlsx.validate_unsigned_int v; @indent = v end
# @see relativeIndent
- def relative_indent=(v) Axlsx::validate_int v; @relative_indent = v end
+ def relative_indent=(v) Axlsx.validate_int v; @relative_indent = v end
alias :relativeIndent= :relative_indent=
# @see justifyLastLine
- def justify_last_line=(v) Axlsx::validate_boolean v; @justify_last_line = v end
+ def justify_last_line=(v) Axlsx.validate_boolean v; @justify_last_line = v end
alias :justifyLastLine= :justify_last_line=
# @see shrinkToFit
- def shrink_to_fit=(v) Axlsx::validate_boolean v; @shrink_to_fit = v end
+ def shrink_to_fit=(v) Axlsx.validate_boolean v; @shrink_to_fit = v end
alias :shrinkToFit= :shrink_to_fit=
# @see readingOrder
- def reading_order=(v) Axlsx::validate_unsigned_int v; @reading_order = v end
+ def reading_order=(v) Axlsx.validate_unsigned_int v; @reading_order = v end
alias :readingOrder= :reading_order=
# Serializes the object
diff --git a/lib/axlsx/stylesheet/cell_protection.rb b/lib/axlsx/stylesheet/cell_protection.rb
index caa01ced..f2915f25 100644
--- a/lib/axlsx/stylesheet/cell_protection.rb
+++ b/lib/axlsx/stylesheet/cell_protection.rb
@@ -26,9 +26,9 @@ module Axlsx
end
# @see hidden
- def hidden=(v) Axlsx::validate_boolean v; @hidden = v end
+ def hidden=(v) Axlsx.validate_boolean v; @hidden = v end
# @see locked
- def locked=(v) Axlsx::validate_boolean v; @locked = v end
+ def locked=(v) Axlsx.validate_boolean v; @locked = v end
# Serializes the object
# @param [String] str
diff --git a/lib/axlsx/stylesheet/cell_style.rb b/lib/axlsx/stylesheet/cell_style.rb
index 5cdb4842..3bc9faec 100644
--- a/lib/axlsx/stylesheet/cell_style.rb
+++ b/lib/axlsx/stylesheet/cell_style.rb
@@ -48,17 +48,17 @@ module Axlsx
attr_reader :customBuiltin
# @see name
- def name=(v) Axlsx::validate_string v; @name = v end
+ def name=(v) Axlsx.validate_string v; @name = v end
# @see xfId
- def xfId=(v) Axlsx::validate_unsigned_int v; @xfId = v end
+ def xfId=(v) Axlsx.validate_unsigned_int v; @xfId = v end
# @see builtinId
- def builtinId=(v) Axlsx::validate_unsigned_int v; @builtinId = v end
+ def builtinId=(v) Axlsx.validate_unsigned_int v; @builtinId = v end
# @see iLivel
- def iLevel=(v) Axlsx::validate_unsigned_int v; @iLevel = v end
+ def iLevel=(v) Axlsx.validate_unsigned_int v; @iLevel = v end
# @see hidden
- def hidden=(v) Axlsx::validate_boolean v; @hidden = v end
+ def hidden=(v) Axlsx.validate_boolean v; @hidden = v end
# @see customBuiltin
- def customBuiltin=(v) Axlsx::validate_boolean v; @customBuiltin = v end
+ def customBuiltin=(v) Axlsx.validate_boolean v; @customBuiltin = v end
# Serializes the object
# @param [String] str
diff --git a/lib/axlsx/stylesheet/color.rb b/lib/axlsx/stylesheet/color.rb
index 0c40a073..cfe5de9a 100644
--- a/lib/axlsx/stylesheet/color.rb
+++ b/lib/axlsx/stylesheet/color.rb
@@ -47,11 +47,11 @@ module Axlsx
attr_reader :tint
# @see auto
- def auto=(v) Axlsx::validate_boolean v; @auto = v end
+ def auto=(v) Axlsx.validate_boolean v; @auto = v end
# @see color
def rgb=(v)
- Axlsx::validate_string(v)
+ Axlsx.validate_string(v)
v = v.upcase
v *= 3 if v.size == 2
v = v.rjust(8, 'FF')
@@ -61,7 +61,7 @@ module Axlsx
end
# @see tint
- def tint=(v) Axlsx::validate_float v; @tint = v end
+ def tint=(v) Axlsx.validate_float v; @tint = v end
# This version does not support themes
# def theme=(v) Axlsx::validate_unsigned_integer v; @theme = v end
diff --git a/lib/axlsx/stylesheet/dxf.rb b/lib/axlsx/stylesheet/dxf.rb
index 2c10443a..dc9c2e1c 100644
--- a/lib/axlsx/stylesheet/dxf.rb
+++ b/lib/axlsx/stylesheet/dxf.rb
@@ -69,7 +69,7 @@ module Axlsx
# Dxf elements have no attributes. All of the instance variables
# are child elements.
CHILD_ELEMENTS.each do |element|
- self.send(element).to_xml_string(str) if self.send(element)
+ send(element).to_xml_string(str) if send(element)
end
str << '</dxf>'
end
diff --git a/lib/axlsx/stylesheet/font.rb b/lib/axlsx/stylesheet/font.rb
index 8b183b6e..bb80fbc2 100644
--- a/lib/axlsx/stylesheet/font.rb
+++ b/lib/axlsx/stylesheet/font.rb
@@ -112,38 +112,38 @@ module Axlsx
attr_reader :sz
# @see name
- def name=(v) Axlsx::validate_string v; @name = v end
+ def name=(v) Axlsx.validate_string v; @name = v end
# @see charset
- def charset=(v) Axlsx::validate_unsigned_int v; @charset = v end
+ def charset=(v) Axlsx.validate_unsigned_int v; @charset = v end
# @see family
- def family=(v) Axlsx::validate_unsigned_int v; @family = v end
+ def family=(v) Axlsx.validate_unsigned_int v; @family = v end
# @see b
- def b=(v) Axlsx::validate_boolean v; @b = v end
+ def b=(v) Axlsx.validate_boolean v; @b = v end
# @see i
- def i=(v) Axlsx::validate_boolean v; @i = v end
+ def i=(v) Axlsx.validate_boolean v; @i = v end
# @see u
def u=(v)
- v = :single if (v == true || v == 1 || v == :true || v == 'true')
- v = :none if (v == false || v == 0 || v == :false || v == 'false')
- Axlsx::validate_cell_u v
+ v = :single if v == true || v == 1 || v == :true || v == 'true'
+ v = :none if v == false || v == 0 || v == :false || v == 'false'
+ Axlsx.validate_cell_u v
@u = v
end
# @see strike
- def strike=(v) Axlsx::validate_boolean v; @strike = v end
+ def strike=(v) Axlsx.validate_boolean v; @strike = v end
# @see outline
- def outline=(v) Axlsx::validate_boolean v; @outline = v end
+ def outline=(v) Axlsx.validate_boolean v; @outline = v end
# @see shadow
- def shadow=(v) Axlsx::validate_boolean v; @shadow = v end
+ def shadow=(v) Axlsx.validate_boolean v; @shadow = v end
# @see condense
- def condense=(v) Axlsx::validate_boolean v; @condense = v end
+ def condense=(v) Axlsx.validate_boolean v; @condense = v end
# @see extend
- def extend=(v) Axlsx::validate_boolean v; @extend = v end
+ def extend=(v) Axlsx.validate_boolean v; @extend = v end
# @see color
def color=(v) DataTypeValidator.validate "Font.color", Color, v; @color = v end
# @see sz
- def sz=(v) Axlsx::validate_unsigned_int v; @sz = v end
+ def sz=(v) Axlsx.validate_unsigned_int v; @sz = v end
# Serializes the object
# @param [String] str
diff --git a/lib/axlsx/stylesheet/gradient_fill.rb b/lib/axlsx/stylesheet/gradient_fill.rb
index 6cd0a052..508c91a2 100644
--- a/lib/axlsx/stylesheet/gradient_fill.rb
+++ b/lib/axlsx/stylesheet/gradient_fill.rb
@@ -55,10 +55,10 @@ module Axlsx
attr_reader :stop
# @see type
- def type=(v) Axlsx::validate_gradient_type v; @type = v end
+ def type=(v) Axlsx.validate_gradient_type v; @type = v end
# @see degree
- def degree=(v) Axlsx::validate_float v; @degree = v end
+ def degree=(v) Axlsx.validate_float v; @degree = v end
# @see left
def left=(v)
@@ -86,7 +86,7 @@ module Axlsx
# validates that the value provided is between 0.0 and 1.0
def validate_format_percentage(name, value)
- DataTypeValidator.validate name, Float, value, lambda { |arg| arg >= 0.0 && arg <= 1.0 }
+ DataTypeValidator.validate name, Float, value, ->(arg) { arg >= 0.0 && arg <= 1.0 }
end
# Serializes the object
diff --git a/lib/axlsx/stylesheet/gradient_stop.rb b/lib/axlsx/stylesheet/gradient_stop.rb
index dd0ea00f..d4df9b3b 100644
--- a/lib/axlsx/stylesheet/gradient_stop.rb
+++ b/lib/axlsx/stylesheet/gradient_stop.rb
@@ -24,14 +24,14 @@ module Axlsx
# @see color
def color=(v) DataTypeValidator.validate "GradientStop.color", Color, v; @color = v end
# @see position
- def position=(v) DataTypeValidator.validate "GradientStop.position", Float, v, lambda { |arg| arg >= 0 && arg <= 1 }; @position = v end
+ def position=(v) DataTypeValidator.validate "GradientStop.position", Float, v, ->(arg) { arg >= 0 && arg <= 1 }; @position = v end
# Serializes the object
# @param [String] str
# @return [String]
def to_xml_string(str = +'')
str << '<stop position="' << position.to_s << '">'
- self.color.to_xml_string(str)
+ color.to_xml_string(str)
str << '</stop>'
end
end
diff --git a/lib/axlsx/stylesheet/num_fmt.rb b/lib/axlsx/stylesheet/num_fmt.rb
index 4604d7bd..e49ec574 100644
--- a/lib/axlsx/stylesheet/num_fmt.rb
+++ b/lib/axlsx/stylesheet/num_fmt.rb
@@ -61,10 +61,10 @@ module Axlsx
attr_reader :numFmtId
# @see numFmtId
- def numFmtId=(v) Axlsx::validate_unsigned_int v; @numFmtId = v end
+ def numFmtId=(v) Axlsx.validate_unsigned_int v; @numFmtId = v end
# @see formatCode
- def formatCode=(v) Axlsx::validate_string v; @formatCode = v end
+ def formatCode=(v) Axlsx.validate_string v; @formatCode = v end
# Serializes the object
# @param [String] str
diff --git a/lib/axlsx/stylesheet/pattern_fill.rb b/lib/axlsx/stylesheet/pattern_fill.rb
index 9f92dc00..ec920ab3 100644
--- a/lib/axlsx/stylesheet/pattern_fill.rb
+++ b/lib/axlsx/stylesheet/pattern_fill.rb
@@ -53,7 +53,7 @@ module Axlsx
# @see bgColor
def bgColor=(v) DataTypeValidator.validate "PatternFill.bgColor", Color, v; @bgColor = v end
# @see patternType
- def patternType=(v) Axlsx::validate_pattern_type v; @patternType = v end
+ def patternType=(v) Axlsx.validate_pattern_type v; @patternType = v end
# Serializes the object
# @param [String] str
diff --git a/lib/axlsx/stylesheet/styles.rb b/lib/axlsx/stylesheet/styles.rb
index e518d21e..d9c5683a 100644
--- a/lib/axlsx/stylesheet/styles.rb
+++ b/lib/axlsx/stylesheet/styles.rb
@@ -370,7 +370,7 @@ module Axlsx
if options[:border].is_a?(Integer)
if options[:border] >= borders.size
- raise ArgumentError, (ERR_INVALID_BORDER_ID % options[:border])
+ raise ArgumentError, format(ERR_INVALID_BORDER_ID, options[:border])
end
if options[:type] == :dxf
@@ -380,9 +380,9 @@ module Axlsx
end
end
- validate_border_hash = ->(val) {
- if !(val.key?(:style) && val.key?(:color))
- raise ArgumentError, (ERR_INVALID_BORDER_OPTIONS % options[:border])
+ validate_border_hash = lambda { |val|
+ unless val.key?(:style) && val.key?(:color)
+ raise ArgumentError, format(ERR_INVALID_BORDER_OPTIONS, options[:border])
end
}
@@ -439,7 +439,7 @@ module Axlsx
next
end
- if !edge_b_opts.empty?
+ unless edge_b_opts.empty?
if base_border_opts.empty?
validate_border_hash.call(edge_b_opts)
end
diff --git a/lib/axlsx/stylesheet/table_style.rb b/lib/axlsx/stylesheet/table_style.rb
index 3c3837ea..95d10ce0 100644
--- a/lib/axlsx/stylesheet/table_style.rb
+++ b/lib/axlsx/stylesheet/table_style.rb
@@ -33,18 +33,18 @@ module Axlsx
attr_reader :table
# @see name
- def name=(v) Axlsx::validate_string v; @name = v end
+ def name=(v) Axlsx.validate_string v; @name = v end
# @see pivot
- def pivot=(v) Axlsx::validate_boolean v; @pivot = v end
+ def pivot=(v) Axlsx.validate_boolean v; @pivot = v end
# @see table
- def table=(v) Axlsx::validate_boolean v; @table = v end
+ def table=(v) Axlsx.validate_boolean v; @table = v end
# Serializes the object
# @param [String] str
# @return [String]
def to_xml_string(str = +'')
str << '<tableStyle '
- serialized_attributes str, { count: self.size }
+ serialized_attributes str, { count: size }
str << '>'
each { |table_style_el| table_style_el.to_xml_string(str) }
str << '</tableStyle>'
diff --git a/lib/axlsx/stylesheet/table_style_element.rb b/lib/axlsx/stylesheet/table_style_element.rb
index 2e64d9a3..281a819e 100644
--- a/lib/axlsx/stylesheet/table_style_element.rb
+++ b/lib/axlsx/stylesheet/table_style_element.rb
@@ -58,13 +58,13 @@ module Axlsx
attr_reader :dxfId
# @see type
- def type=(v) Axlsx::validate_table_element_type v; @type = v end
+ def type=(v) Axlsx.validate_table_element_type v; @type = v end
# @see size
- def size=(v) Axlsx::validate_unsigned_int v; @size = v end
+ def size=(v) Axlsx.validate_unsigned_int v; @size = v end
# @see dxfId
- def dxfId=(v) Axlsx::validate_unsigned_int v; @dxfId = v end
+ def dxfId=(v) Axlsx.validate_unsigned_int v; @dxfId = v end
# Serializes the object
# @param [String] str
diff --git a/lib/axlsx/stylesheet/table_styles.rb b/lib/axlsx/stylesheet/table_styles.rb
index 38a6eb45..fec2a0f6 100644
--- a/lib/axlsx/stylesheet/table_styles.rb
+++ b/lib/axlsx/stylesheet/table_styles.rb
@@ -26,16 +26,16 @@ module Axlsx
attr_reader :defaultPivotStyle
# @see defaultTableStyle
- def defaultTableStyle=(v) Axlsx::validate_string(v); @defaultTableStyle = v; end
+ def defaultTableStyle=(v) Axlsx.validate_string(v); @defaultTableStyle = v; end
# @see defaultPivotStyle
- def defaultPivotStyle=(v) Axlsx::validate_string(v); @defaultPivotStyle = v; end
+ def defaultPivotStyle=(v) Axlsx.validate_string(v); @defaultPivotStyle = v; end
# Serializes the object
# @param [String] str
# @return [String]
def to_xml_string(str = +'')
str << '<tableStyles '
- serialized_attributes str, { count: self.size }
+ serialized_attributes str, { count: size }
str << '>'
each { |table_style| table_style.to_xml_string(str) }
str << '</tableStyles>'
diff --git a/lib/axlsx/stylesheet/xf.rb b/lib/axlsx/stylesheet/xf.rb
index 45d362ca..0ea97f20 100644
--- a/lib/axlsx/stylesheet/xf.rb
+++ b/lib/axlsx/stylesheet/xf.rb
@@ -101,35 +101,35 @@ module Axlsx
def protection=(v) DataTypeValidator.validate "Xf.protection", CellProtection, v; @protection = v end
# @see numFmtId
- def numFmtId=(v) Axlsx::validate_unsigned_int v; @numFmtId = v end
+ def numFmtId=(v) Axlsx.validate_unsigned_int v; @numFmtId = v end
# @see fontId
- def fontId=(v) Axlsx::validate_unsigned_int v; @fontId = v end
+ def fontId=(v) Axlsx.validate_unsigned_int v; @fontId = v end
# @see fillId
- def fillId=(v) Axlsx::validate_unsigned_int v; @fillId = v end
+ def fillId=(v) Axlsx.validate_unsigned_int v; @fillId = v end
# @see borderId
- def borderId=(v) Axlsx::validate_unsigned_int v; @borderId = v end
+ def borderId=(v) Axlsx.validate_unsigned_int v; @borderId = v end
# @see xfId
- def xfId=(v) Axlsx::validate_unsigned_int v; @xfId = v end
+ def xfId=(v) Axlsx.validate_unsigned_int v; @xfId = v end
# @see quotePrefix
- def quotePrefix=(v) Axlsx::validate_boolean v; @quotePrefix = v end
+ def quotePrefix=(v) Axlsx.validate_boolean v; @quotePrefix = v end
# @see pivotButton
- def pivotButton=(v) Axlsx::validate_boolean v; @pivotButton = v end
+ def pivotButton=(v) Axlsx.validate_boolean v; @pivotButton = v end
# @see applyNumberFormat
- def applyNumberFormat=(v) Axlsx::validate_boolean v; @applyNumberFormat = v end
+ def applyNumberFormat=(v) Axlsx.validate_boolean v; @applyNumberFormat = v end
# @see applyFont
- def applyFont=(v) Axlsx::validate_boolean v; @applyFont = v end
+ def applyFont=(v) Axlsx.validate_boolean v; @applyFont = v end
# @see applyFill
- def applyFill=(v) Axlsx::validate_boolean v; @applyFill = v end
+ def applyFill=(v) Axlsx.validate_boolean v; @applyFill = v end
# @see applyBorder
- def applyBorder=(v) Axlsx::validate_boolean v; @applyBorder = v end
+ def applyBorder=(v) Axlsx.validate_boolean v; @applyBorder = v end
# @see applyAlignment
- def applyAlignment=(v) Axlsx::validate_boolean v; @applyAlignment = v end
+ def applyAlignment=(v) Axlsx.validate_boolean v; @applyAlignment = v end
# @see applyProtection
- def applyProtection=(v) Axlsx::validate_boolean v; @applyProtection = v end
+ def applyProtection=(v) Axlsx.validate_boolean v; @applyProtection = v end
# Serializes the object
# @param [String] str
@@ -138,8 +138,8 @@ module Axlsx
str << '<xf '
serialized_attributes str
str << '>'
- alignment.to_xml_string(str) if self.alignment
- protection.to_xml_string(str) if self.protection
+ alignment.to_xml_string(str) if alignment
+ protection.to_xml_string(str) if protection
str << '</xf>'
end
end
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-19 05:59:05 +0000