caxlsx 4.0.0 → 4.4.1

data/lib/axlsx/drawing/num_val.rb

@@ -13,7 +13,7 @@ module Axlsx
     # @option options [Integer] v
     def initialize(options = {})
       @format_code = "General"
-      super(options)
+      super
     end
 
     # @see format_code

data/lib/axlsx/drawing/one_cell_anchor.rb

@@ -60,10 +60,16 @@ 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]

data/lib/axlsx/drawing/pic.rb

@@ -69,7 +69,7 @@ module Axlsx
       options[:href] = v
       if hyperlink.is_a?(Hyperlink)
         options.each do |o|
-          hyperlink.send("#{o[0]}=", o[1]) if hyperlink.respond_to? "#{o[0]}="
+          hyperlink.send(:"#{o[0]}=", o[1]) if hyperlink.respond_to? :"#{o[0]}="
         end
       else
         @hyperlink = Hyperlink.new(self, options)
@@ -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)
@@ -91,13 +91,22 @@ 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'
@@ -109,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?
@@ -213,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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Axlsx
-  # The Pie3DChart is a three dimentional piechart (who would have guessed?) that you can add to your worksheet.
+  # The Pie3DChart is a three dimensional pie chart (who would have guessed?) that you can add to your worksheet.
   # @see Worksheet#add_chart
   # @see Chart#add_series
   # @see README for an example
@@ -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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Axlsx
+  # The PieChart is a pie chart that you can add to your worksheet.
+  # @see Worksheet#add_chart
+  # @see Chart#add_series
+  # @see README for an example
+  class PieChart < Chart
+    # Creates a new pie chart object
+    # @param [GraphicFrame] frame The workbook that owns this chart.
+    # @option options [Cell, String] title
+    # @option options [Boolean] show_legend
+    # @option options [Symbol] grouping
+    # @option options [String] gap_depth
+    # @see Chart
+    def initialize(frame, options = {})
+      @vary_colors = true
+      super
+      @series_type = PieSeries
+      @d_lbls = nil
+    end
+
+    # Serializes the object
+    # @param [String] str
+    # @return [String]
+    def to_xml_string(str = +'')
+      super do
+        str << '<c:pieChart>'
+        str << '<c:varyColors val="' << vary_colors.to_s << '"/>'
+        @series.each { |ser| ser.to_xml_string(str) }
+        d_lbls.to_xml_string(str) if @d_lbls
+        str << '</c:pieChart>'
+      end
+    end
+  end
+end

data/lib/axlsx/drawing/pie_series.rb

@@ -30,22 +30,28 @@ 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
 
     # @see colors
-    def colors=(v) DataTypeValidator.validate "BarSeries.colors", [Array], v; @colors = v end
+    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
     # @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>'
@@ -63,9 +69,15 @@ module Axlsx
     private
 
     # assigns the data for this series
-    def data=(v) DataTypeValidator.validate "Series.data", [NumDataSource], v; @data = v; end
+    def data=(v)
+      DataTypeValidator.validate "Series.data", [NumDataSource], v
+      @data = v
+    end
 
     # assigns the labels for this series
-    def labels=(v) DataTypeValidator.validate "Series.labels", [AxDataSource], v; @labels = v; end
+    def labels=(v)
+      DataTypeValidator.validate "Series.labels", [AxDataSource], v
+      @labels = v
+    end
   end
 end

data/lib/axlsx/drawing/scaling.rb

@@ -35,14 +35,28 @@ module Axlsx
     attr_reader :min
 
     # @see logBase
-    def logBase=(v) DataTypeValidator.validate "Scaling.logBase", [Integer], v, ->(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
+    def orientation=(v)
+      RestrictionValidator.validate "Scaling.orientation", [:minMax, :maxMin], v
+      @orientation = v
+    end
+
     # @see max
-    def max=(v) DataTypeValidator.validate "Scaling.max", Float, v; @max = v; end
+    def max=(v)
+      DataTypeValidator.validate "Scaling.max", Float, v
+      @max = v
+    end
 
     # @see min
-    def min=(v) DataTypeValidator.validate "Scaling.min", Float, v; @min = v; end
+    def min=(v)
+      DataTypeValidator.validate "Scaling.min", Float, v
+      @min = v
+    end
 
     # Serializes the object
     # @param [String] str

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,15 +18,21 @@ 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
-    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
@@ -34,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/series.rb

@@ -40,7 +40,10 @@ 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)
@@ -52,7 +55,10 @@ module Axlsx
     private
 
     # assigns the chart for this series
-    def chart=(v) DataTypeValidator.validate "Series.chart", Chart, v; @chart = v; end
+    def chart=(v)
+      DataTypeValidator.validate "Series.chart", Chart, v
+      @chart = v
+    end
 
     # Serializes the object
     # @param [String] str

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/drawing/view_3D.rb

@@ -78,11 +78,17 @@ module Axlsx
     alias :rotY= :rot_y=
 
     # @see depth_percent
-    def depth_percent=(v) RegexValidator.validate "#{self.class}.depth_percent", DEPTH_PERCENT_REGEX, v; @depth_percent = v; end
+    def depth_percent=(v)
+      RegexValidator.validate "#{self.class}.depth_percent", DEPTH_PERCENT_REGEX, v
+      @depth_percent = v
+    end
     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

data/lib/axlsx/drawing/vml_shape.rb

@@ -56,7 +56,7 @@ module Axlsx
            <x:AutoFill>False</x:AutoFill>
            <x:Row>#{row}</x:Row>
            <x:Column>#{column}</x:Column>
-           #{@visible ? '<x:Visible/>' : ''}
+           #{'<x:Visible/>' if @visible}
           </x:ClientData>
          </v:shape>
       XML

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
@@ -69,7 +69,10 @@ module Axlsx
     end
 
     # @see workbook
-    def workbook=(workbook) DataTypeValidator.validate :Package_workbook, Workbook, workbook; @workbook = workbook; end
+    def workbook=(workbook)
+      DataTypeValidator.validate :Package_workbook, Workbook, workbook
+      @workbook = workbook
+    end
 
     # Serialize your workbook to disk as an xlsx document.
     #
@@ -79,6 +82,8 @@ module Axlsx
     # @option options [String] :zip_command When `nil`, `#serialize` with RubyZip to
     #   zip the XLSX file contents. When a String, the provided zip command (e.g.,
     #   "zip") is used to zip the file contents (may be faster for large files)
+    # @option options [String] :password When specified, the serialized packaged will be
+    #   encrypted with the password. Requires ooxml_crypt gem.
     # @return [Boolean] False if confirm_valid and validation errors exist. True if the package was serialized
     # @note A tremendous amount of effort has gone into ensuring that you cannot create invalid xlsx documents.
     #   options[:confirm_valid] should be used in the rare case that you cannot open the serialized file.
@@ -105,7 +110,7 @@ module Axlsx
         workbook.apply_styles
       end
 
-      confirm_valid, zip_command = parse_serialize_options(options, secondary_options)
+      confirm_valid, zip_command, password = parse_serialize_options(options, secondary_options)
       return false unless !confirm_valid || validate.empty?
 
       zip_provider = if zip_command
@@ -117,15 +122,31 @@ module Axlsx
       zip_provider.open(output) do |zip|
         write_parts(zip)
       end
+
+      if password && !password.empty?
+        require_ooxml_crypt!
+        OoxmlCrypt.encrypt_file(output, password, output)
+      end
+
       true
     ensure
       Relationship.clear_ids_cache
     end
 
     # Serialize your workbook to a StringIO instance
-    # @param [Boolean] confirm_valid Validate the package prior to serialization.
-    # @return [StringIO|Boolean] False if confirm_valid and validation errors exist. rewound string IO if not.
-    def to_stream(confirm_valid = false)
+    # @param [Boolean] old_confirm_valid (Deprecated) Validate the package prior to serialization.
+    #   Use :confirm_valid keyword arg instead.
+    # @option kwargs [Boolean] :confirm_valid Validate the package prior to serialization.
+    # @option kwargs [String] :password When specified, the serialized packaged will be
+    #   encrypted with the password. Requires ooxml_crypt gem.
+    # @return [StringIO|Boolean] False if confirm_valid and validation errors exist. Rewound string IO if not.
+    def to_stream(old_confirm_valid = nil, confirm_valid: false, password: nil)
+      unless old_confirm_valid.nil?
+        warn "[DEPRECATION] Axlsx::Package#to_stream with confirm_valid as a non-keyword arg is deprecated. " \
+             "Use keyword arg instead e.g., package.to_stream(confirm_valid: false)"
+        confirm_valid ||= old_confirm_valid
+      end
+
       unless workbook.styles_applied
         workbook.apply_styles
       end
@@ -137,6 +158,12 @@ module Axlsx
         write_parts(zip)
       end
       stream.rewind
+
+      if password && !password.empty?
+        require_ooxml_crypt!
+        stream = StringIO.new(OoxmlCrypt.encrypt(stream.read, password))
+      end
+
       stream
     ensure
       Relationship.clear_ids_cache
@@ -144,7 +171,7 @@ module Axlsx
 
     # Encrypt the package into a CFB using the password provided
     # This is not ready yet
-    def encrypt(file_name, password)
+    def encrypt(file_name, password) # rubocop:disable Naming/PredicateMethod
       false
       # moc = MsOffCrypto.new(file_name, password)
       # moc.save
@@ -204,11 +231,12 @@ 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)
-      Zip::Entry.new("", part[:entry], "", "", 0, 0, Zip::Entry::DEFLATED, 0, timestamp)
+
+      Zip::Entry.new("", part[:entry], time: timestamp)
     end
 
     # The parts of a package
@@ -217,6 +245,7 @@ module Axlsx
     def parts
       parts = [
         { entry: "xl/#{STYLES_PN}", doc: workbook.styles, schema: SML_XSD },
+        { entry: "xl/#{THEME_PN}", doc: workbook.theme, schema: THEME_XSD },
         { entry: CORE_PN, doc: @core, schema: CORE_XSD },
         { entry: APP_PN, doc: @app, schema: APP_XSD },
         { entry: WORKBOOK_RELS_PN, doc: workbook.relationships, schema: RELS_XSD },
@@ -270,7 +299,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
@@ -279,11 +308,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.
@@ -356,6 +382,7 @@ module Axlsx
       c_types << Override.new(PartName: "/#{APP_PN}", ContentType: APP_CT)
       c_types << Override.new(PartName: "/#{CORE_PN}", ContentType: CORE_CT)
       c_types << Override.new(PartName: "/xl/#{STYLES_PN}", ContentType: STYLES_CT)
+      c_types << Override.new(PartName: "/xl/#{THEME_PN}", ContentType: THEME_CT)
       c_types << Axlsx::Override.new(PartName: "/#{WORKBOOK_PN}", ContentType: WORKBOOK_CT)
       c_types.lock
       c_types
@@ -374,8 +401,8 @@ module Axlsx
     end
 
     # Parse the arguments of `#serialize`
-    # @return [Boolean, (String or nil)] Returns an array where the first value is
-    #   `confirm_valid` and the second is the `zip_command`.
+    # @return [Boolean, (String or nil), (String or nil)] Returns a 3-tuple where values are
+    #   `confirm_valid`, `zip_command`, and `password`.
     # @private
     def parse_serialize_options(options, secondary_options)
       if secondary_options
@@ -384,17 +411,23 @@ module Axlsx
       end
       if options.is_a?(Hash)
         options.merge!(secondary_options || {})
-        invalid_keys = options.keys - [:confirm_valid, :zip_command]
+        invalid_keys = options.keys - [:confirm_valid, :zip_command, :password]
         if invalid_keys.any?
           raise ArgumentError, "Invalid keyword arguments: #{invalid_keys}"
         end
 
-        [options.fetch(:confirm_valid, false), options.fetch(:zip_command, nil)]
+        [options.fetch(:confirm_valid, false), options.fetch(:zip_command, nil), options.fetch(:password, nil)]
       else
         warn "[DEPRECATION] Axlsx::Package#serialize with confirm_valid as a boolean is deprecated. " \
              "Use keyword args instead e.g., package.serialize(output, confirm_valid: false)"
         parse_serialize_options((secondary_options || {}).merge(confirm_valid: options), nil)
       end
     end
+
+    def require_ooxml_crypt!
+      return if defined?(OoxmlCrypt)
+
+      raise 'Axlsx encryption requires ooxml_crypt gem'
+    end
   end
 end

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] = {}
@@ -92,12 +92,22 @@ module Axlsx
     end
 
     # @see Target
-    def Target=(v) Axlsx.validate_string v; @Target = v end
+    def Target=(v)
+      Axlsx.validate_string v
+      @Target = v
+    end
+
     # @see Type
-    def Type=(v) Axlsx.validate_relationship_type v; @Type = v end
+    def Type=(v)
+      Axlsx.validate_relationship_type v
+      @Type = v
+    end
 
     # @see TargetMode
-    def TargetMode=(v) RestrictionValidator.validate 'Relationship.TargetMode', [:External, :Internal], v; @TargetMode = v; end
+    def TargetMode=(v)
+      RestrictionValidator.validate 'Relationship.TargetMode', [:External, :Internal], v
+      @TargetMode = v
+    end
 
     # serialize relationship
     # @param [String] str
@@ -106,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,14 +1,14 @@
 # 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
-      super Relationship
+      super(Relationship)
     end
 
     # The relationship instance for the given source object, or nil if none exists.