caxlsx 4.0.0 → 4.1.0

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)
@@ -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'

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

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(frame, options)
+      @series_type = PieSeries
+      @d_lbls = nil
+    end
+
+    # Serializes the object
+    # @param [String] str
+    # @return [String]
+    def to_xml_string(str = +'')
+      super(str) 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

@@ -36,10 +36,16 @@ module Axlsx
     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
@@ -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/ser_axis.rb

@@ -22,11 +22,17 @@ 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

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/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/package.rb

@@ -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.
     #

data/lib/axlsx/rels/relationship.rb

@@ -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

data/lib/axlsx/rels/relationships.rb

@@ -8,7 +8,7 @@ module Axlsx
   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.

data/lib/axlsx/stylesheet/border.rb

@@ -43,15 +43,24 @@ 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

data/lib/axlsx/stylesheet/border_pr.rb

@@ -53,11 +53,22 @@ module Axlsx
     end
 
     # @see name
-    def name=(v) RestrictionValidator.validate "BorderPr.name", [:start, :end, :left, :right, :top, :bottom, :diagonal, :vertical, :horizontal], v; @name = v end
+    def name=(v)
+      RestrictionValidator.validate "BorderPr.name", [:start, :end, :left, :right, :top, :bottom, :diagonal, :vertical, :horizontal], v
+      @name = v
+    end
+
     # @see color
-    def color=(v) DataTypeValidator.validate(:color, Color, v); @color = v end
+    def color=(v)
+      DataTypeValidator.validate(:color, Color, v)
+      @color = v
+    end
+
     # @see style
-    def style=(v) RestrictionValidator.validate "BorderPr.style", [:none, :thin, :medium, :dashed, :dotted, :thick, :double, :hair, :mediumDashed, :dashDot, :mediumDashDot, :dashDotDot, :mediumDashDotDot, :slantDashDot], v; @style = v end
+    def style=(v)
+      RestrictionValidator.validate "BorderPr.style", [:none, :thin, :medium, :dashed, :dotted, :thick, :double, :hair, :mediumDashed, :dashDot, :mediumDashDot, :dashDotDot, :mediumDashDotDot, :slantDashDot], v
+      @style = v
+    end
 
     # Serializes the object
     # @param [String] str

data/lib/axlsx/stylesheet/cell_alignment.rb

@@ -86,34 +86,63 @@ 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

data/lib/axlsx/stylesheet/cell_protection.rb

@@ -26,9 +26,16 @@ 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

data/lib/axlsx/stylesheet/cell_style.rb

@@ -48,17 +48,40 @@ 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

data/lib/axlsx/stylesheet/color.rb

@@ -47,7 +47,10 @@ 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)
@@ -61,7 +64,10 @@ 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

data/lib/axlsx/stylesheet/dxf.rb

@@ -49,17 +49,40 @@ module Axlsx
     end
 
     # @see Dxf#alignment
-    def alignment=(v) DataTypeValidator.validate "Dxf.alignment", CellAlignment, v; @alignment = v end
+    def alignment=(v)
+      DataTypeValidator.validate "Dxf.alignment", CellAlignment, v
+      @alignment = v
+    end
+
     # @see protection
-    def protection=(v) DataTypeValidator.validate "Dxf.protection", CellProtection, v; @protection = v end
+    def protection=(v)
+      DataTypeValidator.validate "Dxf.protection", CellProtection, v
+      @protection = v
+    end
+
     # @see numFmt
-    def numFmt=(v) DataTypeValidator.validate "Dxf.numFmt", NumFmt, v; @numFmt = v end
+    def numFmt=(v)
+      DataTypeValidator.validate "Dxf.numFmt", NumFmt, v
+      @numFmt = v
+    end
+
     # @see font
-    def font=(v) DataTypeValidator.validate "Dxf.font", Font, v; @font = v end
+    def font=(v)
+      DataTypeValidator.validate "Dxf.font", Font, v
+      @font = v
+    end
+
     # @see border
-    def border=(v) DataTypeValidator.validate "Dxf.border", Border, v; @border = v end
+    def border=(v)
+      DataTypeValidator.validate "Dxf.border", Border, v
+      @border = v
+    end
+
     # @see fill
-    def fill=(v) DataTypeValidator.validate "Dxf.fill", Fill, v; @fill = v end
+    def fill=(v)
+      DataTypeValidator.validate "Dxf.fill", Fill, v
+      @fill = v
+    end
 
     # Serializes the object
     # @param [String] str

data/lib/axlsx/stylesheet/fill.rb

@@ -28,6 +28,9 @@ module Axlsx
     end
 
     # @see fill_type
-    def fill_type=(v) DataTypeValidator.validate "Fill.fill_type", [PatternFill, GradientFill], v; @fill_type = v; end
+    def fill_type=(v)
+      DataTypeValidator.validate "Fill.fill_type", [PatternFill, GradientFill], v
+      @fill_type = v
+    end
   end
 end

data/lib/axlsx/stylesheet/font.rb

@@ -112,15 +112,34 @@ 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)
@@ -131,19 +150,46 @@ module Axlsx
     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
+    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

data/lib/axlsx/stylesheet/gradient_fill.rb

@@ -55,10 +55,16 @@ 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)

data/lib/axlsx/stylesheet/gradient_stop.rb

@@ -22,9 +22,16 @@ module Axlsx
     end
 
     # @see color
-    def color=(v) DataTypeValidator.validate "GradientStop.color", Color, v; @color = v end
+    def color=(v)
+      DataTypeValidator.validate "GradientStop.color", Color, v
+      @color = v
+    end
+
     # @see position
-    def position=(v) DataTypeValidator.validate "GradientStop.position", Float, v, ->(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