caxlsx 4.1.0 → 4.2.0

data/lib/axlsx/drawing/pic.rb

@@ -80,7 +80,7 @@ module Axlsx
     def image_src=(v)
       Axlsx.validate_string(v)
       if remote?
-        RegexValidator.validate('Pic.image_src', /\A#{URI::DEFAULT_PARSER.make_regexp}\z/, v)
+        RegexValidator.validate('Pic.image_src', /\A#{Axlsx.uri_parser.make_regexp}\z/, v)
         RestrictionValidator.validate 'Pic.image_src', ALLOWED_MIME_TYPES, MimeTypeUtils.get_mime_type_from_uri(v)
       else
         RestrictionValidator.validate 'Pic.image_src', ALLOWED_MIME_TYPES, MimeTypeUtils.get_mime_type(v)
@@ -118,7 +118,7 @@ module Axlsx
       File.basename(image_src) unless remote? || image_src.nil?
     end
 
-    # returns the extension of image_src without the preceeding '.'
+    # returns the extension of image_src without the preceding '.'
     # @return [String]
     def extname
       File.extname(image_src).delete('.') unless image_src.nil?
@@ -222,9 +222,9 @@ module Axlsx
     # Return correct xml relationship string portion
     def relationship_xml_portion
       if remote?
-        (+'<a:blip xmlns:r ="' << XML_NS_R << '" r:link="' << relationship.Id << '">')
+        (+'<a:blip xmlns:r="' << XML_NS_R << '" r:link="' << relationship.Id << '">')
       else
-        (+'<a:blip xmlns:r ="' << XML_NS_R << '" r:embed="' << relationship.Id << '">')
+        (+'<a:blip xmlns:r="' << XML_NS_R << '" r:embed="' << relationship.Id << '">')
       end
     end
 

data/lib/axlsx/drawing/pie_3D_chart.rb

@@ -22,7 +22,7 @@ module Axlsx
     # @see View3D
     def initialize(frame, options = {})
       @vary_colors = true
-      super(frame, options)
+      super
       @series_type = PieSeries
       @view_3D = View3D.new({ rot_x: 30, perspective: 30 }.merge(options))
       @d_lbls = nil
@@ -32,7 +32,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = +'')
-      super(str) do
+      super do
         str << '<c:pie3DChart>'
         str << '<c:varyColors val="' << vary_colors.to_s << '"/>'
         @series.each { |ser| ser.to_xml_string(str) }

data/lib/axlsx/drawing/pie_chart.rb

@@ -15,7 +15,7 @@ module Axlsx
     # @see Chart
     def initialize(frame, options = {})
       @vary_colors = true
-      super(frame, options)
+      super
       @series_type = PieSeries
       @d_lbls = nil
     end
@@ -24,7 +24,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = +'')
-      super(str) do
+      super do
         str << '<c:pieChart>'
         str << '<c:varyColors val="' << vary_colors.to_s << '"/>'
         @series.each { |ser| ser.to_xml_string(str) }

data/lib/axlsx/drawing/pie_series.rb

@@ -30,7 +30,7 @@ module Axlsx
     def initialize(chart, options = {})
       @explosion = nil
       @colors = []
-      super(chart, options)
+      super
       self.labels = AxDataSource.new(data: options[:labels]) unless options[:labels].nil?
       self.data = NumDataSource.new(options) unless options[:data].nil?
     end
@@ -51,7 +51,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = +'')
-      super(str) do
+      super do
         str << '<c:explosion val="' << @explosion.to_s << '"/>' unless @explosion.nil?
         colors.each_with_index do |c, index|
           str << '<c:dPt>'

data/lib/axlsx/drawing/scatter_chart.rb

@@ -33,7 +33,7 @@ module Axlsx
       @vary_colors = 0
       @scatter_style = :lineMarker
 
-      super(frame, options)
+      super
       @series_type = ScatterSeries
       @d_lbls = nil
       parse_options options
@@ -50,7 +50,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = +'')
-      super(str) do
+      super do
         str << '<c:scatterChart>'
         str << '<c:scatterStyle val="' << scatter_style.to_s << '"/>'
         str << '<c:varyColors val="' << vary_colors.to_s << '"/>'

data/lib/axlsx/drawing/scatter_series.rb

@@ -50,7 +50,7 @@ module Axlsx
       @show_marker = [:lineMarker, :marker, :smoothMarker].include?(chart.scatter_style)
       @marker_symbol = :default
 
-      super(chart, options)
+      super
       @xData = AxDataSource.new(tag_name: :xVal, data: options[:xData]) unless options[:xData].nil?
       @yData = NumDataSource.new({ tag_name: :yVal, data: options[:yData] }) unless options[:yData].nil?
     end
@@ -81,7 +81,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = +'')
-      super(str) do
+      super do
         # needs to override the super color here to push in ln/and something else!
         if color
           str << '<c:spPr><a:solidFill>'

data/lib/axlsx/drawing/ser_axis.rb

@@ -3,7 +3,7 @@
 module Axlsx
   # A SerAxis object defines a series axis
   class SerAxis < Axis
-    # The number of tick lables to skip between labels
+    # The number of tick labels to skip between labels
     # @return [Integer]
     attr_reader :tick_lbl_skip
     alias :tickLblSkip :tick_lbl_skip
@@ -18,7 +18,7 @@ module Axlsx
     # @option options [Integer] tick_mark_skip
     def initialize(options = {})
       @tick_lbl_skip, @tick_mark_skip = 1, 1
-      super(options)
+      super
     end
 
     # @see tickLblSkip
@@ -40,7 +40,7 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = +'')
       str << '<c:serAx>'
-      super(str)
+      super
       str << '<c:tickLblSkip val="' << @tick_lbl_skip.to_s << '"/>' unless @tick_lbl_skip.nil?
       str << '<c:tickMarkSkip val="' << @tick_mark_skip.to_s << '"/>' unless @tick_mark_skip.nil?
       str << '</c:serAx>'

data/lib/axlsx/drawing/two_cell_anchor.rb

@@ -39,7 +39,7 @@ module Axlsx
       parse_options options
 
       # bit of a hack to work around the fact that the coords for start at and end at
-      # are passed in as an array when specified in intialization options - however
+      # are passed in as an array when specified in initialization options - however
       start_at(*options[:start_at]) if options[:start_at]
       end_at(*options[:end_at]) if options[:end_at]
     end

data/lib/axlsx/drawing/val_axis.rb

@@ -13,7 +13,7 @@ module Axlsx
     # @option options [Symbol] crosses_between
     def initialize(options = {})
       self.cross_between = :between
-      super(options)
+      super
     end
 
     # @see cross_between
@@ -28,7 +28,7 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = +'')
       str << '<c:valAx>'
-      super(str)
+      super
       str << '<c:crossBetween val="' << @cross_between.to_s << '"/>'
       str << '</c:valAx>'
     end

data/lib/axlsx/package.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Axlsx
-  # Package is responsible for managing all the bits and peices that Open Office XML requires to make a valid
+  # Package is responsible for managing all the bits and pieces that Open Office XML requires to make a valid
   # xlsx document including validation and serialization.
   class Package
     include Axlsx::OptionsParser
@@ -55,11 +55,11 @@ module Axlsx
     # @raise ArgumentError if workbook parameter is not a Workbook instance.
     # @note As there are multiple ways to instantiate a workbook for the package,
     #   here are a few examples:
-    #     # assign directly during package instanciation
+    #     # assign directly during package instantiation
     #     wb = Package.new(:workbook => Workbook.new).workbook
     #
     #     # get a fresh workbook automatically from the package
-    #     wb = Pacakge.new().workbook
+    #     wb = Package.new().workbook
     #     #     # set the workbook after creating the package
     #     wb = Package.new().workbook = Workbook.new
     def workbook
@@ -207,7 +207,7 @@ module Axlsx
     # Note: {Core#created} also defaults to the current time – so to generate identical axlsx packages you have
     # to set this explicitly, too (eg. with `Package.new(created_at: Time.local(2013, 1, 1))`).
     #
-    # @param part A hash describing a part of this pacakge (see {#parts})
+    # @param part A hash describing a part of this package (see {#parts})
     # @return [Zip::Entry]
     def zip_entry_for_part(part)
       timestamp = Zip::DOSTime.at(@core.created.to_i)
@@ -273,7 +273,7 @@ module Axlsx
       ]
     end
 
-    # Performs xsd validation for a signle document
+    # Performs xsd validation for a single document
     #
     # @param [String] schema path to the xsd schema to be used in validation.
     # @param [String] doc The xml text to be validated
@@ -282,11 +282,8 @@ module Axlsx
     def validate_single_doc(schema, doc)
       schema = Nokogiri::XML::Schema(File.open(schema))
       doc = Nokogiri::XML(doc)
-      errors = []
-      schema.validate(doc).each do |error|
-        errors << error
-      end
-      errors
+
+      schema.validate(doc)
     end
 
     # Appends override objects for drawings, charts, and sheets as they exist in your workbook to the default content types.

data/lib/axlsx/rels/relationship.rb

@@ -15,7 +15,7 @@ module Axlsx
       #
       # This should be called before serializing a package (see {Package#serialize} and
       # {Package#to_stream}) to make sure that serialization is idempotent (i.e.
-      # Relationship instances are generated with the same IDs everytime the package
+      # Relationship instances are generated with the same IDs every time the package
       # is serialized).
       def initialize_ids_cache
         Thread.current[:axlsx_relationship_ids_cache] = {}
@@ -116,7 +116,7 @@ module Axlsx
       h = Axlsx.instance_values_for(self).reject { |k, _| k == "source_obj" }
       str << '<Relationship '
       h.each_with_index do |key_value, index|
-        str << ' ' unless index.zero?
+        str << ' ' unless index == 0
         str << key_value.first.to_s << '="' << Axlsx.coder.encode(key_value.last.to_s) << '"'
       end
       str << '/>'

data/lib/axlsx/rels/relationships.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module Axlsx
-  require 'axlsx/rels/relationship'
+  require_relative 'relationship'
 
   # Relationships are a collection of Relations that define how package parts are related.
-  # @note The package automatically manages releationships.
+  # @note The package automatically manages relationships.
   class Relationships < SimpleTypedList
     # Creates a new Relationships collection based on SimpleTypedList
     def initialize

data/lib/axlsx/stylesheet/border_pr.rb

@@ -7,7 +7,7 @@ module Axlsx
     # @return [Color] The color of this border part.
     attr_reader :color
 
-    # @return [Symbol] The syle of this border part.
+    # @return [Symbol] The style of this border part.
     # @note
     #  The following are allowed
     #   :none

data/lib/axlsx/stylesheet/cell_alignment.rb

@@ -25,7 +25,7 @@ module Axlsx
 
     # The horizontal alignment of the cell.
     # @note
-    #  The horizontal cell alignement style must be one of
+    #  The horizontal cell alignment style must be one of
     #   :general
     #   :left
     #   :center

data/lib/axlsx/stylesheet/cell_style.rb

@@ -8,7 +8,7 @@ module Axlsx
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
 
-    # Creats a new CellStyle object
+    # Creates a new CellStyle object
     # @option options [String] name
     # @option options [Integer] xfId
     # @option options [Integer] buildinId

data/lib/axlsx/stylesheet/color.rb

@@ -17,7 +17,7 @@ module Axlsx
 
     serializable_attributes :auto, :rgb, :tint
 
-    # Determines if the color is system color dependant
+    # Determines if the color is system color dependent
     # @return [Boolean]
     attr_reader :auto
 
@@ -72,7 +72,7 @@ module Axlsx
     # This version does not support themes
     # def theme=(v) Axlsx::validate_unsigned_integer v; @theme = v end
 
-    # Indexed colors are for backward compatability which I am choosing not to support
+    # Indexed colors are for backward compatibility which I am choosing not to support
     # def indexed=(v) Axlsx::validate_unsigned_integer v; @indexed = v end
 
     # Serializes the object

data/lib/axlsx/stylesheet/font.rb

@@ -33,7 +33,7 @@ module Axlsx
     # The charset of the font
     # @return [Integer]
     # @note
-    #  The following values are defined in the OOXML specification and are OS dependant values
+    #  The following values are defined in the OOXML specification and are OS dependent values
     #   0   ANSI_CHARSET
     #   1   DEFAULT_CHARSET
     #   2   SYMBOL_CHARSET

data/lib/axlsx/stylesheet/gradient_fill.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Axlsx
-  # A GradientFill defines the color and positioning for gradiant cell fill.
+  # A GradientFill defines the color and positioning for gradient cell fill.
   # @see Open Office XML Part 1 §18.8.24
   class GradientFill
     include Axlsx::OptionsParser

data/lib/axlsx/stylesheet/styles.rb

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
 module Axlsx
-  require 'axlsx/stylesheet/border'
-  require 'axlsx/stylesheet/border_pr'
-  require 'axlsx/stylesheet/cell_alignment'
-  require 'axlsx/stylesheet/cell_style'
-  require 'axlsx/stylesheet/color'
-  require 'axlsx/stylesheet/fill'
-  require 'axlsx/stylesheet/font'
-  require 'axlsx/stylesheet/gradient_fill'
-  require 'axlsx/stylesheet/gradient_stop'
-  require 'axlsx/stylesheet/num_fmt'
-  require 'axlsx/stylesheet/pattern_fill'
-  require 'axlsx/stylesheet/table_style'
-  require 'axlsx/stylesheet/table_styles'
-  require 'axlsx/stylesheet/table_style_element'
-  require 'axlsx/stylesheet/dxf'
-  require 'axlsx/stylesheet/xf'
-  require 'axlsx/stylesheet/cell_protection'
+  require_relative 'border'
+  require_relative 'border_pr'
+  require_relative 'cell_alignment'
+  require_relative 'cell_style'
+  require_relative 'color'
+  require_relative 'fill'
+  require_relative 'font'
+  require_relative 'gradient_fill'
+  require_relative 'gradient_stop'
+  require_relative 'num_fmt'
+  require_relative 'pattern_fill'
+  require_relative 'table_style'
+  require_relative 'table_styles'
+  require_relative 'table_style_element'
+  require_relative 'dxf'
+  require_relative 'xf'
+  require_relative 'cell_protection'
 
   # The Styles class manages worksheet styles
   # In addition to creating the require style objects for a valid xlsx package, this class provides the key mechanism for adding styles to your workbook, and safely applying them to the cells of your worksheet.
-  # All portions of the stylesheet are implemented here exception colors, which specify legacy and modified pallete colors, and exLst, whic is used as a future feature data storage area.
+  # All portions of the stylesheet are implemented here exception colors, which specify legacy and modified palette colors, and exLst, which is used as a future feature data storage area.
   # @see  Office Open XML Part 1 18.8.11 for gory details on how this stuff gets put together
   # @see  Styles#add_style
   # @note The recommended way to manage styles is with add_style
@@ -156,7 +156,7 @@ module Axlsx
     #   ws = p.workbook.add_worksheet
     #
     #   # black text on a white background at 14pt with thin borders!
-    #   title = ws.styles.add_style(:bg_color => "FFFF0000", :fg_color=>"#FF000000", :sz=>14,  :border=> {:style => :thin, :color => "FFFF0000"}
+    #   title = ws.styles.add_style(:bg_color => "FFFF0000", :fg_color=>"FF000000", :sz=>14,  :border=> {:style => :thin, :color => "FFFF0000"}
     #
     #   ws.add_row ["Least Popular Pets"]
     #   ws.add_row ["", "Dry Skinned Reptiles", "Bald Cats", "Violent Parrots"], :style=>title
@@ -174,7 +174,7 @@ module Axlsx
     #
     #   # define your styles
     #   title = ws.styles.add_style(:bg_color => "FFFF0000",
-    #                              :fg_color=>"#FF000000",
+    #                              :fg_color=>"FF000000",
     #                              :border=>Axlsx::STYLE_THIN_BORDER,
     #                              :alignment=>{:horizontal => :center})
     #
@@ -209,10 +209,10 @@ module Axlsx
     #
     #   # define your styles
     #   profitable = wb.styles.add_style(:bg_color => "FFFF0000",
-    #                              :fg_color=>"#FF000000",
+    #                              :fg_color=>"FF000000",
     #                              :type => :dxf)
     #
-    #   ws.add_row ["Genreated At:", Time.now], :styles=>[nil, date_time]
+    #   ws.add_row ["Generated At:", Time.now], :styles=>[nil, date_time]
     #   ws.add_row ["Previous Year Quarterly Profits (JPY)"], :style=>title
     #   ws.add_row ["Quarter", "Profit", "% of Total"], :style=>title
     #   ws.add_row ["Q1", 4000, 40], :style=>[title, currency, percent]
@@ -245,7 +245,7 @@ module Axlsx
 
         font_defaults = { name: @fonts.first.name, sz: @fonts.first.sz, family: @fonts.first.family }
 
-        raw_style = { type: :xf }.merge(font_defaults).merge(options)
+        raw_style = { type: :xf }.merge(font_defaults, options)
 
         if raw_style[:format_code]
           raw_style.delete(:num_fmt)
@@ -275,7 +275,7 @@ module Axlsx
       if options[:type] == :xf
         xf_index = (cellXfs << style)
 
-        # Add styles to style_index cache for re-use
+        # Add styles to style_index cache for reuse
         style_index[xf_index] = raw_style
 
         xf_index
@@ -298,7 +298,7 @@ module Axlsx
 
     # parses add_style options for alignment
     # noop if options hash does not include :alignment key
-    # @option options [Hash] alignment A hash of options to prive the CellAlignment intializer
+    # @option options [Hash] alignment A hash of options to prive the CellAlignment initializer
     # @return [CellAlignment]
     # @see CellAlignment
     def parse_alignment_options(options = {})
@@ -325,11 +325,7 @@ module Axlsx
     def parse_font_options(options = {})
       return if (options.keys & [:fg_color, :sz, :b, :i, :u, :strike, :outline, :shadow, :charset, :family, :font_name]).empty?
 
-      Axlsx.instance_values_for(fonts.first).each do |key, value|
-        # Thanks for that 1.8.7 - cant do a simple merge...
-        options[key.to_sym] = value unless options.key?(key.to_sym)
-      end
-      font = Font.new(options)
+      font = Font.new(Axlsx.instance_values_for(fonts.first).merge(options))
       font.color = Color.new(rgb: options[:fg_color]) if options[:fg_color]
       font.name = options[:font_name] if options[:font_name]
       options[:type] == :dxf ? font : fonts << font
@@ -361,7 +357,7 @@ module Axlsx
 
       # Both bgColor and fgColor happens to configure the background of the cell.
       # One of them sets the "background" of the cell, while the other one is
-      # responsibe for the "pattern" of the cell. When you pick "solid" pattern for
+      # responsible for the "pattern" of the cell. When you pick "solid" pattern for
       # a normal xf style, then it's a rectangle covering all bgColor with fgColor,
       # which means we need to to set the given background color to fgColor as well.
       # For some reason I wasn't able find, it works the opposite for dxf styles

data/lib/axlsx/stylesheet/xf.rb

@@ -62,7 +62,7 @@ module Axlsx
     # @return [Integer]
     attr_reader :xfId
 
-    # indecates if text should be prefixed by a single quote in the cell
+    # indicates if text should be prefixed by a single quote in the cell
     # @return [Boolean]
     attr_reader :quotePrefix
 

data/lib/axlsx/util/accessors.rb

@@ -23,7 +23,7 @@ module Axlsx
         validated_attr_accessor(symbols, :validate_string)
       end
 
-      # Creates one or more usigned integer attr_accessors
+      # Creates one or more unsigned integer attr_accessors
       # @param [Array] symbols An array of symbols representing the
       # names of the attributes you will add to your class
       def unsigned_int_attr_accessor(*symbols)

data/lib/axlsx/util/constants.rb

@@ -259,7 +259,7 @@ module Axlsx
   # drawing validation schema
   DRAWING_XSD = "#{SCHEMA_BASE}dml-spreadsheetDrawing.xsd"
 
-  # number format id for pecentage formatting using the default formatting id.
+  # number format id for percentage formatting using the default formatting id.
   NUM_FMT_PERCENT = 9
 
   # number format id for date format like 2011/11/13
@@ -404,7 +404,7 @@ module Axlsx
   CONTROL_CHARS = pattern.freeze
 
   # ISO 8601 date recognition
-  ISO_8601_REGEX = /\A(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|0[1-9]|[1-2][0-9])T(2[0-3]|[0-1][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-](?:2[0-3]|[0-1][0-9]):[0-5][0-9])?\Z/.freeze
+  ISO_8601_REGEX = /\A(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|0[1-9]|[1-2][0-9])T(2[0-3]|[0-1][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?\Z/.freeze
 
   # FLOAT recognition
   SAFE_FLOAT_REGEX = /\A[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]{1,2})?\Z/.freeze

data/lib/axlsx/util/serialized_attributes.rb

@@ -91,8 +91,8 @@ module Axlsx
 
     # serialized instance values at text nodes on a camelized element of the
     # attribute name. You may pass in a block for evaluation against non nil
-    # values. We use an array for element attributes becuase misordering will
-    # break the xml and 1.8.7 does not support ordered hashes.
+    # values. We use an array for element attributes because misordering will
+    # break the xml.
     # @param [String] str The string instance to which serialized data is appended
     # @param [Array] additional_attributes An array of additional attribute names.
     # @return [String] The serialized output.

data/lib/axlsx/util/simple_typed_list.rb

@@ -21,7 +21,7 @@ module Axlsx
     alias :== :equal?
     alias :eql? :equal?
 
-    # Creats a new typed list
+    # Creates a new typed list
     # @param [Array, Class] type An array of Class objects or a single Class object
     # @param [String] serialize_as The tag name to use in serialization
     # @raise [ArgumentError] if all members of type are not Class objects
@@ -57,7 +57,7 @@ module Axlsx
     # Transposes the list (without blowing up like ruby does)
     # any non populated cell in the matrix will be a nil value
     def transpose
-      return clone if size.zero?
+      return clone if size == 0
 
       row_count = size
       max_column_count = map { |row| row.cells.size }.max
@@ -90,21 +90,24 @@ module Axlsx
       self
     end
 
-    # join operator
-    # @param [Array] other the array to join
+    # Appends the elements of +others+ to self.
+    # @param [Array<Array>] others one or more arrays to join
     # @raise [ArgumentError] if any of the values being joined are not
     # one of the allowed types
     # @return [SimpleTypedList]
-    def +(other)
-      other.each do |item|
-        self << item
+    def concat(*others)
+      others.each do |other|
+        other.each do |item|
+          self << item
+        end
       end
-      super
+      self
     end
 
-    # Concat operator
+    # Pushes the given object on to the end of this array and returns the index
+    # of the item added.
     # @param [Any] v the data to be added
-    # @raise [ArgumentError] if the value being added is not one fo the allowed types
+    # @raise [ArgumentError] if the value being added is not one of the allowed types
     # @return [Integer] returns the index of the item added.
     def <<(v)
       DataTypeValidator.validate :SimpleTypedList_push, @allowed_types, v
@@ -112,7 +115,17 @@ module Axlsx
       size - 1
     end
 
-    alias :push :<<
+    # Pushes the given object(s) on to the end of this array. This expression
+    # returns the array itself, so several appends may be chained together.
+    # @param [Any] values the data to be added
+    # @raise [ArgumentError] if any of the values being joined are not
+    # @return [SimpleTypedList]
+    def push(*values)
+      values.each do |value|
+        self << value
+      end
+      self
+    end
 
     # delete the item from the list
     # @param [Any] v The item to be deleted.
@@ -147,7 +160,7 @@ module Axlsx
       super
     end
 
-    # inserts an item at the index specfied
+    # inserts an item at the index specified
     # @param [Integer] index
     # @param [Any] v
     # @raise [ArgumentError] if the index is protected by locking

data/lib/axlsx/util/storage.rb

@@ -85,16 +85,16 @@ module Axlsx
     # @return [Integer] sector
     attr_accessor :sector
 
-    # The 0 based index in the directoies chain for this the left sibling of this storage.
+    # The 0 based index in the directories chain for this the left sibling of this storage.
 
     # @return [Integer] left
     attr_accessor :left
 
-    # The 0 based index in the directoies chain for this the right sibling of this storage.
+    # The 0 based index in the directories chain for this the right sibling of this storage.
     # @return [Integer] right
     attr_accessor :right
 
-    # The 0 based index in the directoies chain for the child of this storage.
+    # The 0 based index in the directories chain for the child of this storage.
     # @return [Integer] child
     attr_accessor :child
 

data/lib/axlsx/util/validators.rb

@@ -81,7 +81,7 @@ module Axlsx
     raise ArgumentError, format(ERR_ANGLE, v.inspect) unless v.to_i >= -5400000 && v.to_i <= 5400000
   end
 
-  # Validates an unsigned intger
+  # Validates an unsigned integer
   UINT_VALIDATOR = ->(arg) { arg.respond_to?(:>=) && arg >= 0 }
 
   # Requires that the value is a Integer and is greater or equal to 0

data/lib/axlsx/version.rb

@@ -2,5 +2,5 @@
 
 module Axlsx
   # The current version
-  VERSION = "4.1.0"
+  VERSION = "4.2.0"
 end

data/lib/axlsx/workbook/defined_name.rb

@@ -22,7 +22,7 @@
 # <xsd:attribute name="shortcutKey" type="s:ST_Xstring" use="optional"/>
 # <xsd:attribute name="publishToServer" type="xsd:boolean" use="optional" default="false"/>
 # <xsd:attribute name="workbookParameter" type="xsd:boolean" use="optional" default="false"/>
-# </xsd:extenstion>
+# </xsd:extension>
 # </xsd:simpleContent>
 
 module Axlsx