axlsx 1.0.17 → 1.1.0

data/lib/axlsx/stylesheet/border_pr.rb

@@ -1,22 +1,22 @@
 # encoding: UTF-8
 module Axlsx
-  # A border part. 
+  # A border part.
   class BorderPr
-    
+
     # @return [Color] The color of this border part.
     attr_reader :color
 
-    # @return [Symbol] The syle of this border part. 
-    # @note 
+    # @return [Symbol] The syle of this border part.
+    # @note
     #  The following are allowed
-    #   :none 
+    #   :none
     #   :thin
     #   :medium
     #   :dashed
     #   :dotted
     #   :thick
     #   :double
-    #   :hair 
+    #   :hair
     #   :mediumDashed
     #   :dashDot
     #   :mediumDashDot
@@ -26,7 +26,7 @@ module Axlsx
     attr_reader :style
 
     # @return [Symbol] The name of this border part
-    # @note 
+    # @note
     #  The following are allowed
     #   :start
     #   :end
@@ -38,7 +38,7 @@ module Axlsx
     #   :vertical
     #   :horizontal
     attr_reader :name
-    
+
     # Creates a new Border Part Object
     # @option options [Color] color
     # @option options [Symbol] name
@@ -53,17 +53,18 @@ module Axlsx
     # @see name
     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
 
-    # Serializes the border part
-    # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
+    # Serializes the object
+    # @param [String] str
     # @return [String]
-    def to_xml(xml)
-      xml.send(@name, :style => @style) {
-        @color.to_xml(xml) if @color.is_a? Color
-      } 
+    def to_xml_string(str = '')
+      str << '<' << @name.to_s << ' style="' << @style.to_s << '">'
+      @color.to_xml_string(str) if @color.is_a?(Color)
+      str << '</' << @name.to_s << '>'
     end
+
   end
 end

data/lib/axlsx/stylesheet/cell_alignment.rb

@@ -1,11 +1,11 @@
 # encoding: UTF-8
 module Axlsx
   # CellAlignment stores information about the cell alignment of a style Xf Object.
-  # @note Using Styles#add_style is the recommended way to manage cell alignment. 
+  # @note Using Styles#add_style is the recommended way to manage cell alignment.
   # @see Styles#add_style
   class CellAlignment
     # The horizontal alignment of the cell.
-    # @note 
+    # @note
     #  The horizontal cell alignement style must be one of
     #   :general
     #   :left
@@ -36,7 +36,7 @@ module Axlsx
     # Indicate if the text of the cell should wrap
     # @return [Boolean]
     attr_reader :wrapText
-    
+
     # The amount of indent
     # @return [Integer]
     attr_reader :indent
@@ -54,12 +54,12 @@ module Axlsx
     attr_reader :shrinkToFit
 
     # The reading order of the text
-    # 0 Context Dependent 
+    # 0 Context Dependent
     # 1 Left-to-Right
     # 2 Right-to-Left
     # @return [Integer]
     attr_reader :readingOrder
-    
+
     # Create a new cell_alignment object
     # @option options [Symbol] horizontal
     # @option options [Symbol] vertical
@@ -74,33 +74,35 @@ module Axlsx
       options.each do |o|
         self.send("#{o[0]}=", o[1]) if self.respond_to? "#{o[0]}="
       end
-    end        
-    
+    end
+
     # @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 textRotation=(v) Axlsx::validate_unsigned_int v; @textRotation = v end    
+    def textRotation=(v) Axlsx::validate_unsigned_int v; @textRotation = v end
     # @see wrapText
-    def wrapText=(v) Axlsx::validate_boolean v; @wrapText = v end    
+    def wrapText=(v) Axlsx::validate_boolean v; @wrapText = v end
     # @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 relativeIndent=(v) Axlsx::validate_int v; @relativeIndent = v end    
+    def relativeIndent=(v) Axlsx::validate_int v; @relativeIndent = v end
     # @see justifyLastLine
-    def justifyLastLine=(v) Axlsx::validate_boolean v; @justifyLastLine = v end    
+    def justifyLastLine=(v) Axlsx::validate_boolean v; @justifyLastLine = v end
     # @see shrinkToFit
-    def shrinkToFit=(v) Axlsx::validate_boolean v; @shrinkToFit = v end    
+    def shrinkToFit=(v) Axlsx::validate_boolean v; @shrinkToFit = v end
     # @see readingOrder
-    def readingOrder=(v) Axlsx::validate_unsigned_int v; @readingOrder = v end  
+    def readingOrder=(v) Axlsx::validate_unsigned_int v; @readingOrder = v end
 
-    # Serializes the cell alignment
-    # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
+    # Serializes the object
+    # @param [String] str
     # @return [String]
-    def to_xml(xml)
-      xml.alignment(self.instance_values)      
+    def to_xml_string(str = '')
+      str << '<alignment '
+      str << instance_values.map { |key, value| '' << key.to_s << '="' << value.to_s << '"' }.join(' ')
+      str << '/>'
     end
-    
+
   end
 end

data/lib/axlsx/stylesheet/cell_protection.rb

@@ -4,7 +4,7 @@ module Axlsx
   # @note Using Styles#add_style is the recommended way to manage cell protection.
   # @see Styles#add_style
   class CellProtection
-    
+
     # specifies locking for cells that have the style containing this protection
     # @return [Boolean]
     attr_reader :hidden
@@ -23,15 +23,18 @@ 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 cell protection
-    # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
+    # Serializes the object
+    # @param [String] str
     # @return [String]
-    def to_xml(xml)
-      xml.protection(self.instance_values)
+    def to_xml_string(str = '')
+      str << '<protection '
+      str << instance_values.map { |key, value| '' << key.to_s << '="' << value.to_s << '"' }.join(' ')
+      str << '/>'
     end
+
   end
 end

data/lib/axlsx/stylesheet/cell_style.rb

@@ -7,7 +7,7 @@ module Axlsx
     # The name of this cell style
     # @return [String]
     attr_reader :name
-    
+
     # The formatting record id this named style utilizes
     # @return [Integer]
     # @see Axlsx::Xf
@@ -55,12 +55,15 @@ module Axlsx
     # @see customBuiltin
     def customBuiltin=(v) Axlsx::validate_boolean v; @customBuiltin = v end
 
-    # Serializes the cell style
-    # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
+    # Serializes the object
+    # @param [String] str
     # @return [String]
-    def to_xml(xml)
-      xml.cellStyle(self.instance_values)
+    def to_xml_string(str = '')
+      str << '<cellStyle '
+      str << instance_values.map { |key, value| '' << key.to_s << '="' << value.to_s << '"' }.join(' ')
+      str << '/>'
     end
+
   end
 
 end

data/lib/axlsx/stylesheet/color.rb

@@ -5,9 +5,9 @@ module Axlsx
     # Determines if the color is system color dependant
     # @return [Boolean]
     attr_reader :auto
-    
-    # The color as defined in rgb terms. 
-    # @note 
+
+    # The color as defined in rgb terms.
+    # @note
     #  rgb colors need to conform to ST_UnsignedIntHex. That basically means put 'FF' before you color
     # When assigning the rgb value the behavior is much like CSS selectors and can use shorthand versions as follows:
     # If you provide a two character value it will be repeated for each r, g, b assignment
@@ -25,16 +25,16 @@ module Axlsx
     # no support for theme just yet
     # @return [Integer]
     #attr_reader :theme
-    
+
     # The tint value.
     # @note valid values are between -1.0 and 1.0
     # @return [Float]
     attr_reader :tint
-    
+
     # Creates a new Color object
     # @option options [Boolean] auto
     # @option options [String] rgb
-    # @option options [Float] tint    
+    # @option options [Float] tint
     def initialize(options={})
       @rgb = "FF000000"
       options.each do |o|
@@ -42,7 +42,7 @@ module Axlsx
       end
     end
     # @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)
       Axlsx::validate_string(v)
@@ -56,15 +56,21 @@ module Axlsx
     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    
-    
-    # Indexed colors are for backward compatability which I am choosing not to support
-    # def indexed=(v) Axlsx::validate_unsigned_integer v; @indexed = v end     
+    # def theme=(v) Axlsx::validate_unsigned_integer v; @theme = v end
 
+    # Indexed colors are for backward compatability which I am choosing not to support
+    # def indexed=(v) Axlsx::validate_unsigned_integer v; @indexed = v end
 
-    # Serializes the color
-    # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
+    # Serializes the object
+    # @param [String] str
     # @return [String]
-    def to_xml(xml) xml.color(self.instance_values) end
+    def to_xml_string(str = '')
+      str << "<color "
+      self.instance_values.each do |key, value|
+        str << key.to_s << '="' << value.to_s << '" '
+      end
+      str << "/>"
+    end
+
   end
 end

data/lib/axlsx/stylesheet/fill.rb

@@ -12,17 +12,19 @@ module Axlsx
     attr_reader :fill_type
 
     # Creates a new Fill object
-    # @param [PatternFill, GradientFill] fill_type 
+    # @param [PatternFill, GradientFill] fill_type
     # @raise [ArgumentError] if the fill_type parameter is not a PatternFill or a GradientFill instance
     def initialize(fill_type)
       self.fill_type = fill_type
     end
 
-    # Serializes the fill
-    # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
+    # Serializes the object
+    # @param [String] str
     # @return [String]
-    def to_xml(xml)
-      xml.fill { @fill_type.to_xml(xml) }
+    def to_xml_string(str = '')
+      str << '<fill>'
+      @fill_type.to_xml_string(str)
+      str << '</fill>'
     end
 
     # @see fill_type

data/lib/axlsx/stylesheet/font.rb

@@ -7,7 +7,7 @@ module Axlsx
     # The name of the font
     # @return [String]
     attr_reader :name
-    
+
     # The charset of the font
     # @return [Integer]
     # @note
@@ -32,9 +32,9 @@ module Axlsx
     #   238 EASTEUROPE_CHARSET
     #   255 OEM_CHARSET
     attr_reader :charset
-    
+
     # The font's family
-    # @note 
+    # @note
     #  The following are defined OOXML specification
     #   0 Not applicable.
     #   1 Roman
@@ -54,6 +54,10 @@ module Axlsx
     # @return [Boolean]
     attr_reader :i
 
+    # Indicates if the font should be rendered underlined
+    # @return [Boolean]
+    attr_reader :u
+
     # Indicates if the font should be rendered with a strikthrough
     # @return [Boolean]
     attr_reader :strike
@@ -89,6 +93,7 @@ module Axlsx
     # @option options [Integer] family
     # @option options [Boolean] b
     # @option options [Boolean] i
+    # @option options [Boolean] u
     # @option options [Boolean] strike
     # @option options [Boolean] outline
     # @option options [Boolean] shadow
@@ -102,21 +107,23 @@ module Axlsx
       end
     end
     # @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
     # @see family
     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
+    # @see u
+    def u=(v) Axlsx::validate_boolean v; @u = v end
     # @see strike
     def strike=(v) Axlsx::validate_boolean v; @strike = v end
     # @see outline
     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
     # @see extend
@@ -126,15 +133,15 @@ module Axlsx
     # @see sz
     def sz=(v) Axlsx::validate_unsigned_int v; @sz=v end
 
-    # Serializes the fill
-    # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
+    # Serializes the object
+    # @param [String] str
     # @return [String]
-    def to_xml(xml)
-      xml.font {
-        self.instance_values.each do |k, v|
-          v.is_a?(Color) ? v.to_xml(xml) : xml.send(k, {:val => v})            
-        end
-      }
+    def to_xml_string(str = '')
+      str << '<font>'
+      instance_values.each do |k, v|
+        v.is_a?(Color) ? v.to_xml_string(str) : (str << '<' << k.to_s << ' val="' << v.to_s << '"/>')
+      end
+      str << '</font>'
     end
   end
 end

data/lib/axlsx/stylesheet/gradient_fill.rb

@@ -1,11 +1,11 @@
 # encoding: UTF-8
 module Axlsx
   # A GradientFill defines the color and positioning for gradiant cell fill.
-  # @see Open Office XML Part 1 §18.8.24  
+  # @see Open Office XML Part 1 §18.8.24
   class GradientFill
 
     # The type of gradient.
-    # @note 
+    # @note
     #  valid options are
     #   :linear
     #   :path
@@ -26,7 +26,7 @@ module Axlsx
 
     # Percentage format top
     # @return [Float]
-    attr_reader :top 
+    attr_reader :top
 
     # Percentage format bottom
     # @return [Float]
@@ -35,7 +35,7 @@ module Axlsx
     # Collection of stop objects
     # @return [SimpleTypedList]
     attr_reader :stop
-    
+
     # Creates a new GradientFill object
     # @option options [Symbol] type
     # @option options [Float] degree
@@ -52,25 +52,28 @@ module Axlsx
     end
 
     # @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) DataTypeValidator.validate "GradientFill.left", Float, v, lambda { |arg| arg >= 0.0 && arg <= 1.0}; @left = v end    
+    def left=(v) DataTypeValidator.validate "GradientFill.left", Float, v, lambda { |arg| arg >= 0.0 && arg <= 1.0}; @left = v end
     # @see right
-    def right=(v) DataTypeValidator.validate "GradientFill.right", Float, v, lambda { |arg| arg >= 0.0 && arg <= 1.0}; @right = v end    
+    def right=(v) DataTypeValidator.validate "GradientFill.right", Float, v, lambda { |arg| arg >= 0.0 && arg <= 1.0}; @right = v end
     # @see top
-    def top=(v) DataTypeValidator.validate "GradientFill.top", Float, v, lambda { |arg| arg >= 0.0 && arg <= 1.0}; @top = v end    
+    def top=(v) DataTypeValidator.validate "GradientFill.top", Float, v, lambda { |arg| arg >= 0.0 && arg <= 1.0}; @top = v end
     # @see bottom
-    def bottom=(v) DataTypeValidator.validate "GradientFill.bottom", Float, v, lambda { |arg| arg >= 0.0 && arg <= 1.0}; @bottom= v end    
+    def bottom=(v) DataTypeValidator.validate "GradientFill.bottom", Float, v, lambda { |arg| arg >= 0.0 && arg <= 1.0}; @bottom= v end
 
-    # Serializes the gradientFill
-    # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
+    # Serializes the object
+    # @param [String] str
     # @return [String]
-    def to_xml(xml)
-      xml.gradientFill(self.instance_values.reject { |k,v| k.to_sym == :stop }) {
-        @stop.each { |s| s.to_xml(xml) }
-      }
+    def to_xml_string(str = '')
+      str << '<gradientFill'
+      h = self.instance_values.reject { |k,v| k.to_sym == :stop }
+      str << h.map { |key, value| '' << key.to_s << '="' << value.to_s << '"' }.join(' ')
+      str << '>'
+      @stop.each { |s| s.to_xml_string(str) }
+      str << '</gradientFill>'
     end
   end
 end

data/lib/axlsx/stylesheet/gradient_stop.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 module Axlsx
   # The GradientStop object represents a color point in a gradient.
-  # @see Open Office XML Part 1 §18.8.24  
+  # @see Open Office XML Part 1 §18.8.24
   class GradientStop
     # The color for this gradient stop
     # @return [Color]
@@ -23,11 +23,15 @@ module Axlsx
     # @see color
     def color=(v) DataTypeValidator.validate "GradientStop.color", Color, v; @color=v end
     # @see position
-    def position=(v) DataTypeValidator.validate "GradientStop.position", Float, v, lambda { |arg| arg >= 0 && arg <= 1}; @position = v end    
+    def position=(v) DataTypeValidator.validate "GradientStop.position", Float, v, lambda { |arg| arg >= 0 && arg <= 1}; @position = v end
 
-    # Serializes the gradientStop
-    # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
+    # Serializes the object
+    # @param [String] str
     # @return [String]
-    def to_xml(xml) xml.stop(:position => self.position) {self.color.to_xml(xml)} end
+    def to_xml_string(str = '')
+      str << '<stop position="' << position.to_s << '">'
+      self.color.to_xml_string(str)
+      str << '</stop>'
+    end
   end
 end

data/lib/axlsx/stylesheet/num_fmt.rb

@@ -1,11 +1,11 @@
 # encoding: UTF-8
 module Axlsx
-  # A NumFmt object defines an identifier and formatting code for data in cells. 
+  # A NumFmt object defines an identifier and formatting code for data in cells.
   # @note The recommended way to manage styles is Styles#add_style
   class NumFmt
     # @return [Integer] An unsinged integer referencing a standard or custom number format.
     # @note
-    #  These are the known formats I can dig up. The constant NUM_FMT_PERCENT is 9, and uses the default % formatting. Axlsx also defines a few formats for date and time that are commonly used in asia as NUM_FMT_YYYYMMDD and NUM_FRM_YYYYMMDDHHMMSS. 
+    #  These are the known formats I can dig up. The constant NUM_FMT_PERCENT is 9, and uses the default % formatting. Axlsx also defines a few formats for date and time that are commonly used in asia as NUM_FMT_YYYYMMDD and NUM_FRM_YYYYMMDDHHMMSS.
     #   1 0
     #   2 0.00
     #   3 #,##0
@@ -40,7 +40,7 @@ module Axlsx
     # @see Axlsx
     attr_reader :numFmtId
 
-    # @return [String] The formatting to use for this number format. 
+    # @return [String] The formatting to use for this number format.
     # @see http://support.microsoft.com/kb/264372
     attr_reader :formatCode
     def initialize(options={})
@@ -56,9 +56,15 @@ module Axlsx
     # @see formatCode
     def formatCode=(v) Axlsx::validate_string v; @formatCode = v end
 
-    # Creates a numFmt element applying the instance values of this object as attributes.
-    # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
-    def to_xml(xml) xml.numFmt(self.instance_values) end    
+
+    # Serializes the object
+    # @param [String] str
+    # @return [String]
+    def to_xml_string(str = '')
+      str << '<numFmt '
+      str << instance_values.map { |key, value| '' << key.to_s << '="' << value.to_s << '"' }.join(' ')
+      str << '/>'
+    end
 
   end
 end

data/lib/axlsx/stylesheet/pattern_fill.rb

@@ -7,15 +7,15 @@ module Axlsx
 
     # The color to use for the the background in solid fills.
     # @return [Color]
-    attr_reader :fgColor 
+    attr_reader :fgColor
 
     # The color to use for the background of the fill when the type is not solid.
     # @return [Color]
     attr_reader :bgColor
 
     # The pattern type to use
-    # @note 
-    #  patternType must be one of 
+    # @note
+    #  patternType must be one of
     #   :none
     #   :solid
     #   :mediumGray
@@ -53,15 +53,30 @@ module Axlsx
     # @see bgColor
     def bgColor=(v) DataTypeValidator.validate "PatternFill.bgColor", Color, v; @bgColor=v end
     # @see patternType
-    def patternType=(v) Axlsx::validate_pattern_type v; @patternType = v end    
+    def patternType=(v) Axlsx::validate_pattern_type v; @patternType = v end
 
-    # Serializes the pattern fill
-    # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
+    # Serializes the object
+    # @param [String] str
     # @return [String]
-    def to_xml(xml) 
-      xml.patternFill(:patternType => self.patternType) { 
-        self.instance_values.reject { |k,v| k.to_sym == :patternType }.each { |k,v| xml.send(k, v.instance_values) }    
-      }
+    def to_xml_string(str = '')
+      str << '<patternFill patternType="' << patternType.to_s << '">'
+      if fgColor.is_a?(Color)
+        str << "<fgColor "
+        fgColor.instance_values.each do |key, value|
+          str << key.to_s << '="' << value.to_s << '" '
+        end
+        str << "/>"
+      end
+
+      if bgColor.is_a?(Color)
+        str << "<bgColor "
+        bgColor.instance_values.each do |key, value|
+          str << key.to_s << '="' << value.to_s << '" '
+        end
+        str << "/>"
+      end
+      str << '</patternFill>'
     end
+
   end
 end