axlsx 2.1.0.pre → 3.0.0.pre

data/lib/axlsx/drawing/chart.rb

@@ -56,7 +56,7 @@ module Axlsx
     # Indicates that colors should be varied by datum
     # @return [Boolean]
     attr_reader :vary_colors
- 
+
     # Configures the vary_colors options for this chart
     # @param [Boolean] v The value to set
     def vary_colors=(v) Axlsx::validate_boolean(v); @vary_colors = v; end
@@ -128,6 +128,13 @@ module Axlsx
       end
     end
 
+    # The size of the Title object of the chart.
+    # @param [String] v The size for the title object
+    # @see Title
+    def title_size=(v)
+      @title.text_size = v unless v.to_s.empty?
+    end
+
     # Show the legend in the chart
     # @param [Boolean] v
     # @return [Boolean]

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

@@ -9,6 +9,7 @@ module Axlsx
   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'
@@ -35,10 +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'

data/lib/axlsx/drawing/line_series.rb

@@ -23,6 +23,10 @@ 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
@@ -33,6 +37,7 @@ module Axlsx
     # @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)
@@ -51,6 +56,12 @@ 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)
@@ -74,7 +85,13 @@ module Axlsx
           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') << '"/>')

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
 

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
@@ -166,12 +169,16 @@ module Axlsx
       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)
+      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>'

data/lib/axlsx/drawing/scaling.rb

@@ -6,7 +6,7 @@ module Axlsx
     include Axlsx::OptionsParser
 
     # creates a new Scaling object
-    # @option options [Integer, Fixnum] logBase
+    # @option options [Integer] logBase
     # @option options [Symbol] orientation
     # @option options [Float] max
     # @option options [Float] min
@@ -35,7 +35,7 @@ module Axlsx
     attr_reader :min
 
     # @see logBase
-    def logBase=(v) DataTypeValidator.validate "Scaling.logBase", [Integer, Fixnum], v, lambda { |arg| arg >= 2 && arg <= 1000}; @logBase = v; end
+    def logBase=(v) DataTypeValidator.validate "Scaling.logBase", [Integer], v, lambda { |arg| arg >= 2 && arg <= 1000}; @logBase = v; end
     # @see orientation
     def orientation=(v) RestrictionValidator.validate "Scaling.orientation", [:minMax, :maxMin], v; @orientation = v; end
     # @see max

data/lib/axlsx/drawing/scatter_series.rb

@@ -21,10 +21,13 @@ module Axlsx
     # @return [String]
     attr_reader :color
 
+    # @return [String]
+    attr_reader :ln_width
+
     # Line smoothing between data points
     # @return [Boolean]
     attr_reader :smooth
-    
+
     # Creates a new ScatterSeries
     def initialize(chart, options={})
       @xData, @yData = nil
@@ -36,6 +39,7 @@ module Axlsx
         Axlsx::validate_boolean(options[:smooth])
         @smooth = options[:smooth]
       end
+      @ln_width = options[:ln_width] unless options[:ln_width].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?
@@ -51,7 +55,12 @@ module Axlsx
       Axlsx::validate_boolean(v)
       @smooth = v
     end
-    
+
+    # @see ln_width
+    def ln_width=(v)
+      @ln_width = v
+    end
+
     # Serializes the object
     # @param [String] str
     # @return [String]
@@ -74,6 +83,11 @@ module Axlsx
           str << '</c:spPr>'
           str << '</c:marker>'
         end
+        if ln_width
+          str << '<c:spPr>'
+          str << '<a:ln w="' << ln_width.to_s << '"/>'
+          str << '</c:spPr>'
+        end
         @xData.to_xml_string(str) unless @xData.nil?
         @yData.to_xml_string(str) unless @yData.nil?
         str << ('<c:smooth val="' << ((smooth) ? '1' : '0') << '"/>')

data/lib/axlsx/drawing/str_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 << '"><c:v>' << v.to_s << '</c:v></c:pt>')
+      if !v.to_s.empty?
+        str << ('<c:pt idx="' << idx.to_s << '"><c:v>' << ::CGI.escapeHTML(v.to_s) << '</c:v></c:pt>')
+      end
     end
   end
 end

data/lib/axlsx/drawing/title.rb

@@ -7,15 +7,24 @@ module Axlsx
     # @return [String]
     attr_reader :text
 
+    # Text size property
+    # @return [String]
+    attr_reader :text_size
+
     # The cell that holds the text for the title. Setting this property will automatically update the text attribute.
     # @return [Cell]
     attr_reader :cell
 
     # Creates a new Title object
     # @param [String, Cell] title The cell or string to be used for the chart's title
-    def initialize(title="")
+    def initialize(title="", title_size="")
       self.cell = title if title.is_a?(Cell)
       self.text = title.to_s unless title.is_a?(Cell)
+      if title_size.to_s.empty?
+        self.text_size = "1600"
+      else
+        self.text_size = title_size.to_s
+      end
     end
 
     # @see text
@@ -26,6 +35,14 @@ module Axlsx
       v
     end
 
+    # @see text_size
+    def text_size=(v)
+      DataTypeValidator.validate 'Title.text_size', String, v
+      @text_size = v
+      @cell = nil
+      v
+    end
+
     # @see cell
     def cell=(v)
       DataTypeValidator.validate 'Title.text', Cell, v
@@ -62,6 +79,7 @@ module Axlsx
             str << '<a:lstStyle/>'
             str << '<a:p>'
               str << '<a:r>'
+                str << ('<a:rPr sz="' << @text_size.to_s << '"/>')
                 str << ('<a:t>' << @text.to_s << '</a:t>')
               str << '</a:r>'
             str << '</a:p>'

data/lib/axlsx/drawing/two_cell_anchor.rb

@@ -37,11 +37,16 @@ module Axlsx
       drawing.anchors << self
       @from, @to =  Marker.new, Marker.new(:col => 5, :row=>10)
       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
+      start_at(*options[:start_at]) if options[:start_at]
+      end_at(*options[:end_at]) if options[:end_at]
     end
 
     # sets the col, row attributes for the from marker.
     # @note The recommended way to set the start position for graphical
-    # objects is directly thru the object. 
+    # objects is directly thru the object.
     # @see Chart#start_at
     def start_at(x, y=nil)
       from.coord x, y

data/lib/axlsx/drawing/view_3D.rb

@@ -86,12 +86,12 @@ module Axlsx
     alias :rAngAx= :r_ang_ax=
 
       # @see perspective
-      def perspective=(v) 
+      def perspective=(v)
         RangeValidator.validate "View3D.perspective", 0, 240, v
         @perspective = v
       end
 
-    # DataTypeValidator.validate "#{self.class}.perspective", [Integer, Fixnum], v, lambda {|arg| arg >= 0 && arg <= 240 }; @perspective = v; end
+    # DataTypeValidator.validate "#{self.class}.perspective", [Integer], v, lambda {|arg| arg >= 0 && arg <= 240 }; @perspective = v; end
 
     # Serializes the object
     # @param [String] str

data/lib/axlsx/package.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 module Axlsx
   # Package is responsible for managing all the bits and peices that Open Office XML requires to make a valid
   # xlsx document including valdation and serialization.
@@ -147,11 +147,7 @@ module Axlsx
       errors = []
       parts.each do |part|
         unless part[:schema].nil?
-          if part[:doc].is_a? String
-            errors.concat validate_single_doc(part[:schema], part[:doc])
-          else
-            errors.concat validate_single_doc(part[:schema], part[:doc].to_xml_string)
-          end
+          errors.concat validate_single_doc(part[:schema], part[:doc].to_xml_string)
         end
       end
       errors
@@ -165,20 +161,13 @@ module Axlsx
     def write_parts(zip)
       p = parts
       p.each do |part|
-        #next unless part[:entry] == CORE_PN
         unless part[:doc].nil?
           zip.put_next_entry(zip_entry_for_part(part))
-          if part[:doc].is_a? String
-            entry = ['1.9.2', '1.9.3'].include?(RUBY_VERSION) ? part[:doc].force_encoding('BINARY') : part[:doc]
-            zip.puts(entry)
-          else
-            part[:doc].to_xml_string(zip)
-          end
+          part[:doc].to_xml_string(zip)
         end
         unless part[:path].nil?
           zip.put_next_entry(zip_entry_for_part(part))
-          # binread for 1.9.3
-          zip.write IO.respond_to?(:binread) ? IO.binread(part[:path]) : IO.read(part[:path])
+          zip.write IO.read(part[:path])
         end
       end
       zip
@@ -253,7 +242,9 @@ module Axlsx
         parts << {:entry => "xl/#{sheet.rels_pn}", :doc => sheet.relationships, :schema => RELS_XSD}
         parts << {:entry => "xl/#{sheet.pn}", :doc => sheet, :schema => SML_XSD}
       end
-      parts
+
+      # Sort parts for correct MIME detection
+      parts.sort_by { |part| part[:entry] }
     end
 
     # Performs xsd validation for a signle document