axlsx 2.0.1 → 2.1.0.pre

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,17 @@ module Axlsx
     # @return [Boolean]
     attr_reader :show_marker
 
+    # 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
+      @smooth = false
       @labels, @data = nil, nil
       super(chart, options)
       @labels = AxDataSource.new(:data => options[:labels]) unless options[:labels].nil?
@@ -46,6 +51,12 @@ module Axlsx
       @show_marker = v
     end
 
+    # @see smooth
+    def smooth=(v)
+      Axlsx::validate_boolean(v)
+      @smooth = v
+    end
+
     # Serializes the object
     # @param [String] str
     # @return [String]
@@ -53,11 +64,11 @@ 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/>'
@@ -66,6 +77,7 @@ module Axlsx
         str << '<c:marker><c:symbol val="none"/></c:marker>' unless @show_marker
         @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,7 @@ 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>'
+      str << ('<c:pt idx="' << idx.to_s << '" formatCode="' << format_code << '"><c:v>' << v.to_s << '</c:v></c:pt>')
     end
   end
 end

data/lib/axlsx/drawing/one_cell_anchor.rb

@@ -77,7 +77,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

@@ -165,17 +165,16 @@ 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 << '">'
+      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 << '"/>')
       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

data/lib/axlsx/drawing/scaling.rb

@@ -49,10 +49,10 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       str << '<c:scaling>'
-      str << '<c:logBase val="' << @logBase.to_s << '"/>' unless @logBase.nil?
-      str << '<c:orientation val="' << @orientation.to_s << '"/>' unless @orientation.nil?
-      str << '<c:min val="' << @min.to_s << '"/>' unless @min.nil?
-      str << '<c:max val="' << @max.to_s << '"/>' unless @max.nil?
+      str << ('<c:logBase val="' << @logBase.to_s << '"/>') unless @logBase.nil?
+      str << ('<c:orientation val="' << @orientation.to_s << '"/>') unless @orientation.nil?
+      str << ('<c:min val="' << @min.to_s << '"/>') unless @min.nil?
+      str << ('<c:max val="' << @max.to_s << '"/>') unless @max.nil?
       str << '</c:scaling>'
     end
 

data/lib/axlsx/drawing/scatter_chart.rb

@@ -25,7 +25,7 @@ module Axlsx
     # the y value axis
     # @return [ValAxis]
     def y_val_axis
-      axes[:x_val_axis]
+      axes[:y_val_axis]
     end
     alias :yValAxis :y_val_axis
 
@@ -51,15 +51,15 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      super(str) do |str_inner|
-        str_inner << '<c:scatterChart>'
-        str_inner << '<c:scatterStyle val="' << scatter_style.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
-        axes.to_xml_string(str_inner, :ids => true)
-        str_inner << '</c:scatterChart>'
-        axes.to_xml_string(str_inner)
+      super(str) do
+        str << '<c:scatterChart>'
+        str << ('<c:scatterStyle val="' << scatter_style.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
+        axes.to_xml_string(str, :ids => true)
+        str << '</c:scatterChart>'
+        axes.to_xml_string(str)
       end
       str
     end

data/lib/axlsx/drawing/scatter_series.rb

@@ -21,9 +21,21 @@ module Axlsx
     # @return [String]
     attr_reader :color
 
+    # Line smoothing between data points
+    # @return [Boolean]
+    attr_reader :smooth
+    
     # Creates a new ScatterSeries
     def initialize(chart, options={})
       @xData, @yData = nil
+      if options[:smooth].nil?
+        # If caller hasn't specified smoothing or not, turn smoothing on or off based on scatter style
+        @smooth = [:smooth, :smoothMarker].include?(chart.scatter_style)
+      else
+        # Set smoothing according to the option provided
+        Axlsx::validate_boolean(options[:smooth])
+        @smooth = options[:smooth]
+      end
       super(chart, options)
       @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?
@@ -34,30 +46,37 @@ module Axlsx
       @color = v
     end
 
+    # @see smooth
+    def smooth=(v)
+      Axlsx::validate_boolean(v)
+      @smooth = v
+    end
+    
     # Serializes the object
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      super(str) do |inner_str|
+      super(str) do
         # needs to override the super color here to push in ln/and something else!
         if color
           str << '<c:spPr><a:solidFill>'
-          str << '<a:srgbClr val="' << color << '"/>'
+          str << ('<a:srgbClr val="' << color << '"/>')
           str << '</a:solidFill>'
           str << '<a:ln><a:solidFill>'
-          str << '<a:srgbClr val="' << color << '"/></a:solidFill></a:ln>'
+          str << ('<a:srgbClr val="' << color << '"/></a:solidFill></a:ln>')
           str << '</c:spPr>'
           str << '<c:marker>'
           str << '<c:spPr><a:solidFill>'
-          str << '<a:srgbClr val="' << color << '"/>'
+          str << ('<a:srgbClr val="' << color << '"/>')
           str << '</a:solidFill>'
           str << '<a:ln><a:solidFill>'
-          str << '<a:srgbClr val="' << color << '"/></a:solidFill></a:ln>'
+          str << ('<a:srgbClr val="' << color << '"/></a:solidFill></a:ln>')
           str << '</c:spPr>'
           str << '</c:marker>'
         end
-        @xData.to_xml_string(inner_str) unless @xData.nil?
-        @yData.to_xml_string(inner_str) unless @yData.nil?
+        @xData.to_xml_string(str) unless @xData.nil?
+        @yData.to_xml_string(str) unless @yData.nil?
+        str << ('<c:smooth val="' << ((smooth) ? '1' : '0') << '"/>')
       end
       str
     end

data/lib/axlsx/drawing/ser_axis.rb

@@ -35,8 +35,8 @@ module Axlsx
     def to_xml_string(str = '')
       str << '<c:serAx>'
       super(str)
-      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: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>'
     end
   end

data/lib/axlsx/drawing/series.rb

@@ -59,10 +59,10 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       str << '<c:ser>'
-      str << '<c:idx val="' << index.to_s << '"/>'
-      str << '<c:order val="' << (order || index).to_s << '"/>'
+      str << ('<c:idx val="' << index.to_s << '"/>')
+      str << ('<c:order val="' << (order || index).to_s << '"/>')
       title.to_xml_string(str) unless title.nil?
-      yield str if block_given?
+      yield if block_given?
       str << '</c:ser>'
     end
   end

data/lib/axlsx/drawing/series_title.rb

@@ -9,11 +9,11 @@ module Axlsx
     def to_xml_string(str = '')
       str << '<c:tx>'
       str << '<c:strRef>'
-      str << '<c:f>' << Axlsx::cell_range([@cell]) << '</c:f>'
+      str << ('<c:f>' << Axlsx::cell_range([@cell]) << '</c:f>')
       str << '<c:strCache>'
       str << '<c:ptCount val="1"/>'
       str << '<c:pt idx="0">'
-      str << '<c:v>' << @text << '</c:v>'
+      str << ('<c:v>' << @text << '</c:v>')
       str << '</c:pt>'
       str << '</c:strCache>'
       str << '</c:strRef>'

data/lib/axlsx/drawing/str_data.rb

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