axlsx 2.0.1 → 2.1.0.pre

data/lib/axlsx/content_type/abstract_content_type.rb

@@ -24,7 +24,7 @@ module Axlsx
     # Serialize the contenty type to xml
     def to_xml_string(node_name = '', str = '')
       str << "<#{node_name} "
-      str << instance_values.map { |key, value| '' << Axlsx::camel(key) << '="' << value.to_s << '"' }.join(' ')
+      str << instance_values.map { |key, value| Axlsx::camel(key) << '="' << value.to_s << '"' }.join(' ')
       str << '/>'
     end
 

data/lib/axlsx/content_type/content_type.rb

@@ -16,7 +16,7 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
-      str << '<Types xmlns="' << XML_NS_T << '">'
+      str << ('<Types xmlns="' << XML_NS_T << '">')
       each { |type| type.to_xml_string(str) }
       str << '</Types>'
     end

data/lib/axlsx/doc_props/app.rb

@@ -222,7 +222,7 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
-      str << '<Properties xmlns="' << APP_NS << '" xmlns:vt="' << APP_NS_VT << '">'
+      str << ('<Properties xmlns="' << APP_NS << '" xmlns:vt="' << APP_NS_VT << '">')
       instance_values.each do |key, value|
         node_name = Axlsx.camel(key)
         str << "<#{node_name}>#{value}</#{node_name}>"

data/lib/axlsx/doc_props/core.rb

@@ -25,11 +25,11 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
-      str << '<cp:coreProperties xmlns:cp="' << CORE_NS << '" xmlns:dc="' << CORE_NS_DC << '" '
-      str << 'xmlns:dcmitype="' << CORE_NS_DCMIT << '" xmlns:dcterms="' << CORE_NS_DCT << '" '
-      str << 'xmlns:xsi="' << CORE_NS_XSI << '">'
-      str << '<dc:creator>' << self.creator << '</dc:creator>'
-      str << '<dcterms:created xsi:type="dcterms:W3CDTF">' << (created || Time.now).strftime('%Y-%m-%dT%H:%M:%S') << 'Z</dcterms:created>'
+      str << ('<cp:coreProperties xmlns:cp="' << CORE_NS << '" xmlns:dc="' << CORE_NS_DC << '" ')
+      str << ('xmlns:dcmitype="' << CORE_NS_DCMIT << '" xmlns:dcterms="' << CORE_NS_DCT << '" ')
+      str << ('xmlns:xsi="' << CORE_NS_XSI << '">')
+      str << ('<dc:creator>' << self.creator << '</dc:creator>')
+      str << ('<dcterms:created xsi:type="dcterms:W3CDTF">' << (created || Time.now).strftime('%Y-%m-%dT%H:%M:%S') << 'Z</dcterms:created>')
       str << '<cp:revision>0</cp:revision>'
       str << '</cp:coreProperties>'
     end

data/lib/axlsx/drawing/axes.rb

@@ -32,7 +32,7 @@ module Axlsx
       if options[:ids]
         # CatAxis must come first in the XML (for Microsoft Excel at least)
         sorted = axes.sort_by { |name, axis| axis.kind_of?(CatAxis) ? 0 : 1 }
-        sorted.inject(str) { |string, axis| string << '<c:axId val="' << axis[1].id.to_s << '"/>' }        
+        sorted.each { |axis| str << ('<c:axId val="' << axis[1].id.to_s << '"/>') }        
       else
         axes.each { |axis| axis[1].to_xml_string(str) }
       end

data/lib/axlsx/drawing/axis.rb

@@ -150,10 +150,10 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<c:axId val="' << @id.to_s << '"/>'
+      str << ('<c:axId val="' << @id.to_s << '"/>')
       @scaling.to_xml_string str
-      str << '<c:delete val="'<< @delete.to_s << '"/>'
-      str << '<c:axPos val="' << @ax_pos.to_s << '"/>'
+      str << ('<c:delete val="' << @delete.to_s << '"/>')
+      str << ('<c:axPos val="' << @ax_pos.to_s << '"/>')
       str << '<c:majorGridlines>'
       # TODO shape properties need to be extracted into a class
       if gridlines == false
@@ -165,21 +165,24 @@ module Axlsx
       end
       str << '</c:majorGridlines>'
       @title.to_xml_string(str) unless @title == nil
-      str << '<c:numFmt formatCode="' << @format_code << '" sourceLinked="1"/>'
+      # Need to set sourceLinked to 0 if we're setting a format code on this row
+      # otherwise it will never take, as it will always prefer the 'General' formatting
+      # of the cells themselves
+      str << ('<c:numFmt formatCode="' << @format_code << '" sourceLinked="' << (@format_code.eql?('General') ? '1' : '0') << '"/>')
       str << '<c:majorTickMark val="none"/>'
       str << '<c:minorTickMark val="none"/>'
-      str << '<c:tickLblPos val="' << @tick_lbl_pos.to_s << '"/>'
+      str << ('<c:tickLblPos val="' << @tick_lbl_pos.to_s << '"/>')
       # TODO - this is also being used for series colors
       # time to extract this into a class spPr - Shape Properties
       if @color
         str << '<c:spPr><a:ln><a:solidFill>'
-        str << '<a:srgbClr val="' << @color << '"/>'
+        str << ('<a:srgbClr val="' << @color << '"/>')
         str << '</a:solidFill></a:ln></c:spPr>'
       end
       # some potential value in implementing this in full. Very detailed!
-      str << '<c:txPr><a:bodyPr rot="' << @label_rotation.to_s << '"/><a:lstStyle/><a:p><a:pPr><a:defRPr/></a:pPr><a:endParaRPr/></a:p></c:txPr>'
-      str << '<c:crossAx val="' << @cross_axis.id.to_s << '"/>'
-      str << '<c:crosses val="' << @crosses.to_s << '"/>'
+      str << ('<c:txPr><a:bodyPr rot="' << @label_rotation.to_s << '"/><a:lstStyle/><a:p><a:pPr><a:defRPr/></a:pPr><a:endParaRPr/></a:p></c:txPr>')
+      str << ('<c:crossAx val="' << @cross_axis.id.to_s << '"/>')
+      str << ('<c:crosses val="' << @crosses.to_s << '"/>')
     end
 
   end

data/lib/axlsx/drawing/bar_3D_chart.rb

@@ -125,19 +125,19 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      super(str) do |str_inner|
-        str_inner << '<c:bar3DChart>'
-        str_inner << '<c:barDir val="' << bar_dir.to_s << '"/>'
-        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
-        str_inner << '<c:gapWidth val="' << @gap_width.to_s << '"/>' unless @gap_width.nil?
-        str_inner << '<c:gapDepth val="' << @gap_depth.to_s << '"/>' unless @gap_depth.nil?
-        str_inner << '<c:shape val="' << @shape.to_s << '"/>' unless @shape.nil?
-        axes.to_xml_string(str_inner, :ids => true)
-        str_inner << '</c:bar3DChart>'
-        axes.to_xml_string(str_inner)
+      super(str) do
+        str << '<c:bar3DChart>'
+        str << ('<c:barDir val="' << bar_dir.to_s << '"/>')
+        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
+        str << ('<c:gapWidth val="' << @gap_width.to_s << '"/>') unless @gap_width.nil?
+        str << ('<c:gapDepth val="' << @gap_depth.to_s << '"/>') unless @gap_depth.nil?
+        str << ('<c:shape val="' << @shape.to_s << '"/>') unless @shape.nil?
+        axes.to_xml_string(str, :ids => true)
+        str << '</c:bar3DChart>'
+        axes.to_xml_string(str)
       end
     end
 

data/lib/axlsx/drawing/bar_series.rb

@@ -52,20 +52,20 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      super(str) do |str_inner|
+      super(str) do
 
         colors.each_with_index do |c, index|
-          str_inner << '<c:dPt>'
-          str_inner << '<c:idx val="' << index.to_s << '"/>'
-          str_inner << '<c:spPr><a:solidFill>'
-          str_inner << '<a:srgbClr val="' << c << '"/>'
-          str_inner << '</a:solidFill></c:spPr></c:dPt>'
+          str << '<c:dPt>'
+          str << ('<c:idx val="' << index.to_s << '"/>')
+          str << '<c:spPr><a:solidFill>'
+          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?
         # this is actually only required for shapes other than box 
-        str_inner << '<c:shape val="' << shape.to_s << '"></c:shape>'
+        str << ('<c:shape val="' << shape.to_s << '"></c:shape>')
       end
     end
 

data/lib/axlsx/drawing/bubble_chart.rb

@@ -0,0 +1,59 @@
+# encoding: UTF-8
+module Axlsx
+
+  # The BubbleChart allows you to insert a bubble chart into your worksheet
+  # @see Worksheet#add_chart
+  # @see Chart#add_series
+  # @see README for an example
+  class BubbleChart < Chart
+
+    include Axlsx::OptionsParser
+
+    # the x value axis
+    # @return [ValAxis]
+    def x_val_axis
+      axes[:x_val_axis]
+    end
+    alias :xValAxis :x_val_axis
+
+    # the y value axis
+    # @return [ValAxis]
+    def y_val_axis
+      axes[:y_val_axis]
+    end
+    alias :yValAxis :y_val_axis
+
+    # Creates a new bubble chart
+    def initialize(frame, options={})
+      @vary_colors = 0
+
+           super(frame, options)
+      @series_type = BubbleSeries
+      @d_lbls = nil
+      parse_options options
+    end
+
+    # Serializes the object
+    # @param [String] str
+    # @return [String]
+    def to_xml_string(str = '')
+      super(str) do
+        str << '<c:bubbleChart>'
+        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:bubbleChart>'
+        axes.to_xml_string(str)
+      end
+      str
+    end
+
+    # The axes for the bubble chart. BubbleChart has an x_val_axis and
+    # a y_val_axis
+    # @return [Axes]
+    def axes
+      @axes ||= Axes.new(:x_val_axis => ValAxis, :y_val_axis => ValAxis)
+    end
+  end
+end

data/lib/axlsx/drawing/bubble_series.rb

@@ -0,0 +1,63 @@
+# encoding: UTF-8
+module Axlsx
+
+  # A BubbleSeries defines the x/y position and bubble size of data in the chart
+  # @note The recommended way to manage series is to use Chart#add_series
+  # @see Worksheet#add_chart
+  # @see Chart#add_series
+  # @see examples/example.rb
+  class BubbleSeries < Series
+
+    # The x data for this series.
+    # @return [AxDataSource]
+    attr_reader :xData
+
+    # The y data for this series.
+    # @return [NumDataSource]
+    attr_reader :yData
+
+    # The bubble size for this series.
+    # @return [NumDataSource]
+    attr_reader :bubbleSize
+
+    # The fill color for this series.
+    # Red, green, and blue is expressed as sequence of hex digits, RRGGBB. A perceptual gamma of 2.2 is used.
+    # @return [String]
+    attr_reader :color
+
+    # Creates a new BubbleSeries
+    def initialize(chart, options={})
+      @xData, @yData, @bubbleSize = nil
+      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?
+      @bubbleSize = NumDataSource.new({:tag_name => :bubbleSize, :data => options[:bubbleSize]}) unless options[:bubbleSize].nil?
+    end
+
+    # @see color
+    def color=(v)
+      @color = v
+    end
+
+    # Serializes the object
+    # @param [String] str
+    # @return [String]
+    def to_xml_string(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:solidFill>'
+          str << '<a:ln><a:solidFill>'
+          str << ('<a:srgbClr val="' << color << '"/></a:solidFill></a:ln>')
+          str << '</c:spPr>'
+        end
+        @xData.to_xml_string(str) unless @xData.nil?
+        @yData.to_xml_string(str) unless @yData.nil?
+        @bubbleSize.to_xml_string(str) unless @bubbleSize.nil?
+      end
+      str
+    end
+  end
+end

data/lib/axlsx/drawing/cat_axis.rb

@@ -71,11 +71,11 @@ module Axlsx
     def to_xml_string(str = '')
       str << '<c:catAx>'
       super(str)
-      str << '<c:auto val="' << @auto.to_s << '"/>'
-      str << '<c:lblAlgn val="' << @lbl_algn.to_s << '"/>'
-      str << '<c:lblOffset val="' << @lbl_offset.to_i.to_s << '"/>'
-      str << '<c:tickLblSkip val="' << @tick_lbl_skip.to_s << '"/>'
-      str << '<c:tickMarkSkip val="' << @tick_mark_skip.to_s << '"/>'
+      str << ('<c:auto val="' << @auto.to_s << '"/>')
+      str << ('<c:lblAlgn val="' << @lbl_algn.to_s << '"/>')
+      str << ('<c:lblOffset val="' << @lbl_offset.to_i.to_s << '"/>')
+      str << ('<c:tickLblSkip val="' << @tick_lbl_skip.to_s << '"/>')
+      str << ('<c:tickMarkSkip val="' << @tick_mark_skip.to_s << '"/>')
       str << '</c:catAx>'
     end
 

data/lib/axlsx/drawing/chart.rb

@@ -11,6 +11,7 @@ module Axlsx
     # @param [GraphicalFrame] frame The frame that holds this chart.
     # @option options [Cell, String] title
     # @option options [Boolean] show_legend
+    # @option options [Symbol] legend_position
     # @option options [Array|String|Cell] start_at The X, Y coordinates defining the top left corner of the chart.
     # @option options [Array|String|Cell] end_at The X, Y coordinates defining the bottom right corner of the chart.
     def initialize(frame, options={})
@@ -20,9 +21,11 @@ module Axlsx
       @graphic_frame.anchor.drawing.worksheet.workbook.charts << self
       @series = SimpleTypedList.new Series
       @show_legend = true
+      @legend_position = :r
       @display_blanks_as = :gap
       @series_type = Series
       @title = Title.new
+      @bg_color = nil
       parse_options options
       start_at(*options[:start_at]) if options[:start_at]
       end_at(*options[:end_at]) if options[:end_at]
@@ -71,6 +74,17 @@ module Axlsx
     # @return [Boolean]
     attr_reader :show_legend
 
+    # Set the location of the chart's legend
+    # @return [Symbol] The position of this legend
+    # @note
+    #  The following are allowed
+    #    :b
+    #    :l
+    #    :r
+    #    :t
+    #    :tr
+    attr_reader :legend_position
+
     # How to display blank values
     # Options are
     # * gap:  Display nothing
@@ -80,6 +94,10 @@ module Axlsx
     # Default :gap (although this really should vary by chart type and grouping)
     attr_reader :display_blanks_as
 
+    # Background color for the chart
+    # @return [String]
+    attr_reader :bg_color
+
     # The relationship object for this chart.
     # @return [Relationship]
     def relationship
@@ -126,6 +144,9 @@ module Axlsx
     # @param [Integer] v must be between 1 and 48
     def style=(v) DataTypeValidator.validate "Chart.style", Integer, v, lambda { |arg| arg >= 1 && arg <= 48 }; @style = v; end
 
+    # @see legend_position
+    def legend_position=(v) RestrictionValidator.validate "Chart.legend_position", [:b, :l, :r, :t, :tr], v; @legend_position = v; end
+
     # backwards compatibility to allow chart.to and chart.from access to anchor markers
     # @note This will be disconinued in version 2.0.0. Please use the end_at method
     def to
@@ -146,36 +167,52 @@ module Axlsx
       @series.last
     end
 
+    # Assigns a background color to chart area
+    def bg_color=(v)
+      DataTypeValidator.validate(:color, Color, Color.new(:rgb => v))
+      @bg_color = v
+    end
+
     # Serializes the object
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
-      str << '<c:chartSpace xmlns:c="' << XML_NS_C << '" xmlns:a="' << XML_NS_A << '" xmlns:r="' << XML_NS_R << '">'
-      str << '<c:date1904 val="' << Axlsx::Workbook.date1904.to_s << '"/>'
-      str << '<c:style val="' << style.to_s << '"/>'
+      str << ('<c:chartSpace xmlns:c="' << XML_NS_C << '" xmlns:a="' << XML_NS_A << '" xmlns:r="' << XML_NS_R << '">')
+      str << ('<c:date1904 val="' << Axlsx::Workbook.date1904.to_s << '"/>')
+      str << ('<c:style val="' << style.to_s << '"/>')
       str << '<c:chart>'
       @title.to_xml_string str
-      str << '<c:autoTitleDeleted val="' << (@title == nil).to_s << '"/>'
+      str << ('<c:autoTitleDeleted val="' << (@title == nil).to_s << '"/>')
       @view_3D.to_xml_string(str) if @view_3D
       str << '<c:floor><c:thickness val="0"/></c:floor>'
       str << '<c:sideWall><c:thickness val="0"/></c:sideWall>'
       str << '<c:backWall><c:thickness val="0"/></c:backWall>'
       str << '<c:plotArea>'
       str << '<c:layout/>'
-      yield str if block_given?
+      yield if block_given?
       str << '</c:plotArea>'
       if @show_legend
         str << '<c:legend>'
-        str << '<c:legendPos val="r"/>'
+        str << ('<c:legendPos val="' << @legend_position.to_s << '"/>')
         str << '<c:layout/>'
         str << '<c:overlay val="0"/>'
         str << '</c:legend>'
       end
       str << '<c:plotVisOnly val="1"/>'
-      str << '<c:dispBlanksAs val="' << display_blanks_as.to_s << '"/>'
+      str << ('<c:dispBlanksAs val="' << display_blanks_as.to_s << '"/>')
       str << '<c:showDLblsOverMax val="1"/>'
       str << '</c:chart>'
+      if bg_color
+        str << '<c:spPr>'
+        str << '<a:solidFill>'
+        str << '<a:srgbClr val="' << bg_color << '"/>'
+        str << '</a:solidFill>'
+        str << '<a:ln>'
+        str << '<a:noFill/>'
+        str << '</a:ln>'
+        str << '</c:spPr>'
+      end
       str << '<c:printSettings>'
       str << '<c:headerFooter/>'
       str << '<c:pageMargins b="1.0" l="0.75" r="0.75" t="1.0" header="0.5" footer="0.5"/>'

data/lib/axlsx/drawing/drawing.rb

@@ -8,6 +8,7 @@ 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/scaling.rb'
   require 'axlsx/drawing/axis.rb'
@@ -37,6 +38,7 @@ module Axlsx
   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/picture_locking.rb'
   require 'axlsx/drawing/pic.rb'
@@ -153,7 +155,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