caxlsx 2.0.2 → 3.0.0

data/lib/axlsx/drawing/d_lbls.rb

@@ -49,7 +49,7 @@ module Axlsx
     # @see d_lbl_pos= for a list of allowed values
     # @return [Symbol]
     def d_lbl_pos
-      return unless @chart_type == Pie3DChart
+      return unless [Pie3DChart, LineChart].include? @chart_type
       @d_lbl_pos ||= :bestFit
     end
 
@@ -60,7 +60,7 @@ module Axlsx
     # The default is :bestFit
     # @param [Symbol] label_position the postion you want to use.
     def d_lbl_pos=(label_position)
-      return unless @chart_type == Pie3DChart
+      return unless [Pie3DChart, LineChart].include? @chart_type
       Axlsx::RestrictionValidator.validate 'DLbls#d_lbl_pos',  [:bestFit, :b, :ctr, :inBase, :inEnd, :l, :outEnd, :r, :t], label_position
       @d_lbl_pos = label_position
     end
@@ -80,7 +80,7 @@ module Axlsx
 
     # nills out d_lbl_pos and show_leader_lines as these attributes, while valid in the spec actually chrash excel for any chart type other than pie charts.
     def validate_attributes_for_chart_type
-      return if @chart_type == Pie3DChart
+      return if [Pie3DChart, LineChart].include? @chart_type
       @d_lbl_pos = nil
       @show_leader_lines = nil
     end

data/lib/axlsx/drawing/drawing.rb

@@ -8,6 +8,8 @@ module Axlsx
   require 'axlsx/drawing/bar_series.rb'
   require 'axlsx/drawing/line_series.rb'
   require 'axlsx/drawing/scatter_series.rb'
+  require 'axlsx/drawing/bubble_series.rb'
+  require 'axlsx/drawing/area_series.rb'
 
   require 'axlsx/drawing/scaling.rb'
   require 'axlsx/drawing/axis.rb'
@@ -34,9 +36,12 @@ module Axlsx
   require 'axlsx/drawing/chart.rb'
   require 'axlsx/drawing/pie_3D_chart.rb'
   require 'axlsx/drawing/bar_3D_chart.rb'
+  require 'axlsx/drawing/bar_chart.rb'
   require 'axlsx/drawing/line_chart.rb'
   require 'axlsx/drawing/line_3D_chart.rb'
   require 'axlsx/drawing/scatter_chart.rb'
+  require 'axlsx/drawing/bubble_chart.rb'
+  require 'axlsx/drawing/area_chart.rb'
 
   require 'axlsx/drawing/picture_locking.rb'
   require 'axlsx/drawing/pic.rb'
@@ -153,7 +158,7 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       str << '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'
-      str << '<xdr:wsDr xmlns:xdr="' << XML_NS_XDR << '" xmlns:a="' << XML_NS_A << '">'
+      str << ('<xdr:wsDr xmlns:xdr="' << XML_NS_XDR << '" xmlns:a="' << XML_NS_A << '">')
       anchors.each { |anchor| anchor.to_xml_string(str) }
       str << '</xdr:wsDr>'
     end

data/lib/axlsx/drawing/graphic_frame.rb

@@ -35,7 +35,7 @@ module Axlsx
       # macro attribute should be optional!
       str << '<xdr:graphicFrame>'
       str << '<xdr:nvGraphicFramePr>'
-      str << '<xdr:cNvPr id="' << @anchor.drawing.index.to_s << '" name="' << 'item_' << @anchor.drawing.index.to_s << '"/>'
+      str << ('<xdr:cNvPr id="' << @anchor.drawing.index.to_s << '" name="' << 'item_' << @anchor.drawing.index.to_s << '"/>')
       str << '<xdr:cNvGraphicFramePr/>'
       str << '</xdr:nvGraphicFramePr>'
       str << '<xdr:xfrm>'
@@ -43,8 +43,8 @@ module Axlsx
       str << '<a:ext cx="0" cy="0"/>'
       str << '</xdr:xfrm>'
       str << '<a:graphic>'
-      str << '<a:graphicData uri="' << XML_NS_C << '">'
-      str << '<c:chart xmlns:c="' << XML_NS_C << '" xmlns:r="' << XML_NS_R << '" r:id="' << rId << '"/>'
+      str << ('<a:graphicData uri="' << XML_NS_C << '">')
+      str << ('<c:chart xmlns:c="' << XML_NS_C << '" xmlns:r="' << XML_NS_R << '" r:id="' << rId << '"/>')
       str << '</a:graphicData>'
       str << '</a:graphic>'
       str << '</xdr:graphicFrame>'

data/lib/axlsx/drawing/hyperlink.rb

@@ -93,9 +93,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<a:hlinkClick '
-      serialized_attributes str, {:'r:id' => relationship.Id, :'xmlns:r' => XML_NS_R }
-      str << '/>'
+      serialized_tag 'a:hlinkClick', str, {:'r:id' => relationship.Id, :'xmlns:r' => XML_NS_R }
     end
 
   end

data/lib/axlsx/drawing/line_3D_chart.rb

@@ -60,8 +60,8 @@ module Axlsx
       # @param [String] str
       # @return [String]
       def to_xml_string(str = '')
-        super(str) do |str_inner|
-          str_inner << '<c:gapDepth val="' << @gap_depth.to_s << '"/>' unless @gap_depth.nil?
+        super(str) do
+          str << ('<c:gapDepth val="' << @gap_depth.to_s << '"/>') unless @gap_depth.nil?
         end
       end
   end

data/lib/axlsx/drawing/line_chart.rb

@@ -76,16 +76,16 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      super(str) do |str_inner|
-        str_inner << "<c:" << node_name << ">"
-        str_inner << '<c:grouping val="' << grouping.to_s << '"/>'
-        str_inner << '<c:varyColors val="' << vary_colors.to_s << '"/>'
-        @series.each { |ser| ser.to_xml_string(str_inner) }
-        @d_lbls.to_xml_string(str_inner) if @d_lbls
-        yield str_inner if block_given?
-        axes.to_xml_string(str_inner, :ids => true)
-        str_inner << "</c:" << node_name << ">"
-        axes.to_xml_string(str_inner)
+      super(str) do
+        str << ("<c:" << node_name << ">")
+        str << ('<c:grouping val="' << grouping.to_s << '"/>')
+        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
+        yield if block_given?
+        axes.to_xml_string(str, :ids => true)
+        str << ("</c:" << node_name << ">")
+        axes.to_xml_string(str)
       end
     end
 

data/lib/axlsx/drawing/line_series.rb

@@ -23,12 +23,22 @@ module Axlsx
     # @return [Boolean]
     attr_reader :show_marker
 
+    # custom marker symbol
+    # @return [String]
+    attr_reader :marker_symbol
+
+    # line smoothing on values
+    # @return [Boolean]
+    attr_reader :smooth
+
     # Creates a new series
     # @option options [Array, SimpleTypedList] data
     # @option options [Array, SimpleTypedList] labels
     # @param [Chart] chart
     def initialize(chart, options={})
       @show_marker = false
+      @marker_symbol = options[:marker_symbol] ? options[:marker_symbol] : :default
+      @smooth = false
       @labels, @data = nil, nil
       super(chart, options)
       @labels = AxDataSource.new(:data => options[:labels]) unless options[:labels].nil?
@@ -46,6 +56,18 @@ module Axlsx
       @show_marker = v
     end
 
+    # @see marker_symbol
+    def marker_symbol=(v)
+      Axlsx::validate_marker_symbol(v)
+      @marker_symbol = v
+    end
+
+    # @see smooth
+    def smooth=(v)
+      Axlsx::validate_boolean(v)
+      @smooth = v
+    end
+
     # Serializes the object
     # @param [String] str
     # @return [String]
@@ -53,19 +75,26 @@ module Axlsx
       super(str) do
         if color
           str << '<c:spPr><a:solidFill>'
-          str << '<a:srgbClr val="' << color << '"/>'
+          str << ('<a:srgbClr val="' << color << '"/>')
           str << '</a:solidFill>'
           str << '<a:ln w="28800">'
           str << '<a:solidFill>'
-          str << '<a:srgbClr val="' << color << '"/>'
+          str << ('<a:srgbClr val="' << color << '"/>')
           str << '</a:solidFill>'
           str << '</a:ln>'
           str << '<a:round/>'
           str << '</c:spPr>'
         end
-        str << '<c:marker><c:symbol val="none"/></c:marker>' unless @show_marker
+
+        if !@show_marker
+          str << '<c:marker><c:symbol val="none"/></c:marker>'
+        elsif @marker_symbol != :default
+          str << '<c:marker><c:symbol val="' + @marker_symbol.to_s + '"/></c:marker>'
+        end
+
         @labels.to_xml_string(str) unless @labels.nil?
         @data.to_xml_string(str) unless @data.nil?
+        str << ('<c:smooth val="' << ((smooth) ? '1' : '0') << '"/>')
       end
     end
 

data/lib/axlsx/drawing/marker.rb

@@ -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 << '>' << self.send(k).to_s << '</xdr:' << k.to_s << '>')
       end
     end
     private

data/lib/axlsx/drawing/num_data.rb

@@ -38,13 +38,13 @@ module Axlsx
 
     # serialize the object
     def to_xml_string(str = "")
-      str << '<c:' << @tag_name.to_s << '>'
-      str << '<c:formatCode>' << format_code.to_s << '</c:formatCode>'
-      str << '<c:ptCount val="' << @pt.size.to_s << '"/>'
+      str << ('<c:' << @tag_name.to_s << '>')
+      str << ('<c:formatCode>' << format_code.to_s << '</c:formatCode>')
+      str << ('<c:ptCount val="' << @pt.size.to_s << '"/>')
       @pt.each_with_index do |num_val, index|
         num_val.to_xml_string index, str
       end
-      str << '</c:' << @tag_name.to_s << '>'
+      str << ('</c:' << @tag_name.to_s << '>')
     end
 
   end

data/lib/axlsx/drawing/num_data_source.rb

@@ -33,7 +33,7 @@ module Axlsx
     # allowed element tag names
     # @return [Array]
     def self.allowed_tag_names
-      [:yVal, :val]
+      [:yVal, :val, :bubbleSize]
     end
 
      # sets the tag name for this data source
@@ -46,16 +46,16 @@ module Axlsx
     # serialize the object
     # @param [String] str
     def to_xml_string(str="")
-      str << '<c:' << tag_name.to_s << '>'
+      str << ('<c:' << tag_name.to_s << '>')
       if @f
-        str << '<c:' << @ref_tag_name.to_s << '>'
-        str << '<c:f>' << @f.to_s << '</c:f>'
+        str << ('<c:' << @ref_tag_name.to_s << '>')
+        str << ('<c:f>' << @f.to_s << '</c:f>')
       end
       @data.to_xml_string str
       if @f
-        str << '</c:' << @ref_tag_name.to_s << '>'
+        str << ('</c:' << @ref_tag_name.to_s << '>')
       end
-      str << '</c:' << tag_name.to_s << '>'
+      str << ('</c:' << tag_name.to_s << '>')
     end
   end
 end

data/lib/axlsx/drawing/num_val.rb

@@ -26,7 +26,9 @@ module Axlsx
     # serialize the object
     def to_xml_string(idx, str = "")
       Axlsx::validate_unsigned_int(idx)
-      str << '<c:pt idx="' << idx.to_s << '" formatCode="' << format_code << '"><c:v>' << v.to_s << '</c:v></c:pt>'
+      if !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
   end
 end

data/lib/axlsx/drawing/one_cell_anchor.rb

@@ -7,7 +7,7 @@ module Axlsx
   class OneCellAnchor
 
     include Axlsx::OptionsParser
- 
+
     # Creates a new OneCellAnchor object and an Pic associated with it.
     # @param [Drawing] drawing
     # @option options [Array] start_at the col, row to start at
@@ -23,6 +23,7 @@ module Axlsx
       drawing.anchors << self
       @from = Marker.new
       parse_options options
+      start_at(*options[:start_at]) if options[:start_at]
       @object = Pic.new(self, options)
     end
 
@@ -77,7 +78,7 @@ module Axlsx
       str << '<xdr:from>'
       from.to_xml_string(str)
       str << '</xdr:from>'
-      str << '<xdr:ext cx="' << ext[:cx].to_s << '" cy="' << ext[:cy].to_s << '"/>'
+      str << ('<xdr:ext cx="' << ext[:cx].to_s << '" cy="' << ext[:cy].to_s << '"/>')
       @object.to_xml_string(str)
       str << '<xdr:clientData/>'
       str << '</xdr:oneCellAnchor>'

data/lib/axlsx/drawing/pic.rb

@@ -9,12 +9,13 @@ module Axlsx
 
     # Creates a new Pic(ture) object
     # @param [Anchor] anchor the anchor that holds this image
-    # @option options [String] name
-    # @option options [String] descr
-    # @option options [String] image_src
-    # @option options [Array] start_at
-    # @option options [Intger] width
-    # @option options [Intger] height
+    # @option options [String] :name
+    # @option options [String] :descr
+    # @option options [String] :image_src
+    # @option options [Array] :start_at
+    # @option options [Integer] :width
+    # @option options [Integer] :height
+    # @option options [Float] :opacity - set the picture opacity, accepts a value between 0.0 and 1.0
     def initialize(anchor, options={})
       @anchor = anchor
       @hyperlink = nil
@@ -23,10 +24,11 @@ module Axlsx
       start_at(*options[:start_at]) if options[:start_at]
       yield self if block_given?
       @picture_locking = PictureLocking.new(options)
+      @opacity = (options[:opacity] * 100000).round if options[:opacity]
     end
 
-    # allowed file extenstions
-    ALLOWED_EXTENSIONS = ['gif', 'jpeg', 'png', 'jpg']
+    # allowed mime types
+    ALLOWED_MIME_TYPES = %w(image/jpeg image/png image/gif)
 
     # The name to use for this picture
     # @return [String]
@@ -50,24 +52,28 @@ module Axlsx
 
     attr_reader :hyperlink
 
+    # Picture opacity
+    # @return [Integer]
+    attr_reader :opacity
+
     # sets or updates a hyperlink for this image.
     # @param [String] v The href value for the hyper link
     # @option options @see Hyperlink#initialize All options available to the Hyperlink class apply - however href will be overridden with the v parameter value.
     def hyperlink=(v, options={})
       options[:href] = v
-      if @hyperlink.is_a?(Hyperlink)
+      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)
       end
-      @hyperlink
+      hyperlink
     end
 
     def image_src=(v)
       Axlsx::validate_string(v)
-      RestrictionValidator.validate 'Pic.image_src', ALLOWED_EXTENSIONS, File.extname(v.downcase).delete('.')
+      RestrictionValidator.validate 'Pic.image_src', ALLOWED_MIME_TYPES, MimeTypeUtils.get_mime_type(v)
       raise ArgumentError, "File does not exist" unless File.exist?(v)
       @image_src = v
     end
@@ -78,7 +84,6 @@ module Axlsx
     # @see descr
     def descr=(v) Axlsx::validate_string(v); @descr = v; end
 
-
     # The file name of image_src without any path information
     # @return [String]
     def file_name
@@ -110,7 +115,6 @@ module Axlsx
     end
 
     # providing access to the anchor's width attribute
-    # @param [Integer] v
     # @see OneCellAnchor.width
     def width
       return unless @anchor.is_a?(OneCellAnchor)
@@ -124,7 +128,6 @@ module Axlsx
     end
 
     # providing access to update the anchor's height attribute
-    # @param [Integer] v
     # @see OneCellAnchor.width
     # @note this is a noop if you are using a TwoCellAnchor
     def height
@@ -165,17 +168,20 @@ module Axlsx
     def to_xml_string(str = '')
       str << '<xdr:pic>'
       str << '<xdr:nvPicPr>'
-      str << '<xdr:cNvPr id="2" name="' << name.to_s << '" descr="' << descr.to_s << '">'
-      @hyperlink.to_xml_string(str) if @hyperlink.is_a?(Hyperlink)
+      str << ('<xdr:cNvPr id="2" name="' << name.to_s << '" descr="' << descr.to_s << '">')
+      hyperlink.to_xml_string(str) if hyperlink.is_a?(Hyperlink)
       str << '</xdr:cNvPr><xdr:cNvPicPr>'
       picture_locking.to_xml_string(str)
       str << '</xdr:cNvPicPr></xdr:nvPicPr>'
       str << '<xdr:blipFill>'
-      str << '<a:blip xmlns:r ="' << XML_NS_R << '" r:embed="' << relationship.Id <<  '"/>'
+      str << ('<a:blip xmlns:r ="' << XML_NS_R << '" r:embed="' << relationship.Id << '">')
+      if opacity
+        str << "<a:alphaModFix amt=\"#{opacity}\"/>"
+      end
+      str << '</a:blip>'
       str << '<a:stretch><a:fillRect/></a:stretch></xdr:blipFill><xdr:spPr>'
       str << '<a:xfrm><a:off x="0" y="0"/><a:ext cx="2336800" cy="2161540"/></a:xfrm>'
       str << '<a:prstGeom prst="rect"><a:avLst/></a:prstGeom></xdr:spPr></xdr:pic>'
-
     end
 
     private

data/lib/axlsx/drawing/picture_locking.rb

@@ -35,9 +35,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<a:picLocks '
-      serialized_attributes str
-      str << '/>'
+      serialized_tag('a:picLocks', str)
     end
 
   end

data/lib/axlsx/drawing/pie_3D_chart.rb

@@ -34,13 +34,12 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      super(str) do |str_inner|
-
-        str_inner << '<c:pie3DChart>'
-        str_inner << '<c:varyColors val="' << vary_colors.to_s << '"/>'
-        @series.each { |ser| ser.to_xml_string(str_inner) }
+      super(str) do
+        str << '<c:pie3DChart>'
+        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_inner << '</c:pie3DChart>'
+        str << '</c:pie3DChart>'
       end
     end
 

data/lib/axlsx/drawing/pie_series.rb

@@ -46,17 +46,17 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      super(str) do |str_inner|
-        str_inner << '<c:explosion val="' << @explosion << '"/>' unless @explosion.nil?
+      super(str) do
+        str << '<c:explosion val="' + @explosion + '"/>' unless @explosion.nil?
         colors.each_with_index do |c, index|
           str << '<c:dPt>'
-          str << '<c:idx val="' << index.to_s << '"/>'
+          str << ('<c:idx val="' << index.to_s << '"/>')
           str << '<c:spPr><a:solidFill>'
-          str << '<a:srgbClr val="' << c << '"/>'
+          str << ('<a:srgbClr val="' << c << '"/>')
           str << '</a:solidFill></c:spPr></c:dPt>'
         end
-        @labels.to_xml_string str_inner unless @labels.nil?
-        @data.to_xml_string str_inner unless @data.nil?
+        @labels.to_xml_string str unless @labels.nil?
+        @data.to_xml_string str unless @data.nil?
       end
       str
     end