axlsx 1.0.15 → 1.1.0

data/lib/axlsx/util/cbf.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Axlsx
 
   # The Cfb class is a MS-OFF-CRYPTOGRAPHY specific OLE (MS-CBF) writer implementation. No attempt is made to re-invent the wheel for read/write of compound binary files.
@@ -10,13 +11,13 @@ module Axlsx
     VERSION_PACKING = 'l s30 l3'
 
     # The serialization for the MS-OFF-CRYPTO dataspace map stream
-    DATA_SPACE_MAP_PACKING = 'l6 s16 l s25'
+    DATA_SPACE_MAP_PACKING = 'l6 s16 l s25 x2'
 
     # The serialization for the MS-OFF-CRYPTO strong encrytion data space stream
-    STRONG_ENCRYPTION_DATA_SPACE_PACKING = 'l3 s25'
+    STRONG_ENCRYPTION_DATA_SPACE_PACKING = 'l3 s26'
 
     # The serialization for the MS-OFF-CRYPTO primary stream
-    PRIMARY_PACKING = 'l3 s38 l s39 l3 x12 l x2'
+    PRIMARY_PACKING = 'l3 s38 l s40 l3 x12 l'
 
     # The cutoff size that determines if a stream should be in the mini-fat or the fat
     MINI_CUTOFF = 4096
@@ -28,6 +29,7 @@ module Axlsx
     # @param [MsOffCrypto] ms_off_crypto
     def initialize(ms_off_crypto)
       @file_name = ms_off_crypto.file_name  
+      @ms_off_crypto = ms_off_crypto
       create_storages
       mini_fat_stream
       mini_fat
@@ -95,6 +97,17 @@ module Axlsx
       @header ||= create_header
     end
 
+    # returns the encryption info from the ms_off_crypt object provided during intialization
+    # @return [String] encryption info
+    def encryption_info
+      @ms_off_crypto.encryption_info
+    end
+
+    # returns the encrypted package from the ms_off_crypt object provided during initalization
+    # @return [String] encrypted package
+    def encrypted_package
+      @ms_off_crypto.encrypted_package
+    end
 
     # writes the compound binary file to disk
     def save
@@ -114,12 +127,11 @@ module Axlsx
     # Generates the storages required for ms-office-cryptography cfb
     def create_storages
       @storages = []
-      @encryption_info = ms_off_crypto.encryption_info
-      @encrypted_package = ms_off_crypto.encrypted_package
-      @storages << Storage.new('R', :type=>Storage::TYPES[:root], :color=>Storage::COLORS[:red], :child=>1, :modified=>129685612742510730)
-      @storages.last.name_size = 2
-      @storages << Storage.new('EncryptionInfo', :data=>@encryption_info, :left=>3, :size => @encryption_info.size) # example shows right child. do we need the summary info????
-      @storages << Storage.new('EncryptedPackage', :data=>@encrypted_package, :color=>Storage::COLORS[:red], :size=>@encrypted_package.size)
+      @encryption_info = @ms_off_crypto.encryption_info
+      @encrypted_package = @ms_off_crypto.encrypted_package
+
+      @storages << Storage.new('EncryptionInfo', :data=>encryption_info, :left=>3, :right=>11) # example shows right child. do we need the summary info????
+      @storages << Storage.new('EncryptedPackage', :data=>encrypted_package, :color=>Storage::COLORS[:red])
       @storages << Storage.new([6].pack("c")+"DataSpaces", :child=>5, :modified =>129685612740945580, :created=>129685612740819979)
       @storages << version
       @storages << data_space_map
@@ -128,6 +140,12 @@ module Axlsx
       @storages << Storage.new('TransformInfo', :color => Storage::COLORS[:red],  :child=>9, :created=>129685612740834130, :modified=>129685612740943959)
       @storages << Storage.new('StrongEncryptionTransform', :child=>10, :created=>129685612740834169, :modified=>129685612740942280)
       @storages << primary      
+      # @storages << summary_information
+      # @storages << document_summary_information
+
+      # we do this at the end as we need to build the minifat stream to determine the size. #HOWEVER - it looks like the size should not include the padding?
+      @storages.unshift Storage.new('Root Entry', :type=>Storage::TYPES[:root], :color=>Storage::COLORS[:red], :child=>1, :data => mini_fat_stream)
+
     end
 
     # generates the mini fat stream
@@ -135,10 +153,11 @@ module Axlsx
     def create_mini_fat_stream
       mfs = []
       @storages.select{ |s| s.type == Storage::TYPES[:stream] && s.size < MINI_CUTOFF}.each_with_index do |stream, index|
+        puts "#{stream.name.pack('c*')}: #{stream.data.size}"        
         mfs.concat stream.data
-        mfs.concat Array.new(64 - (mfs.size % 64), 0) if mfs.size % 64        
+        mfs.concat Array.new(64 - (mfs.size % 64), 0) if mfs.size % 64 > 0        
+        puts "mini fat stream size: #{mfs.size}"
       end
-      @storages[0].size = mfs.size
       mfs.concat(Array.new(512 - (mfs.size % 512), 0))
       mfs.pack 'c*'
     end
@@ -149,7 +168,7 @@ module Axlsx
       mfs = []
       @storages.select{ |s| s.type == Storage::TYPES[:stream] && s.size >= MINI_CUTOFF}.each_with_index do |stream, index|
         mfs.concat stream.data
-        mfs.concat Array.new(512 - (mfs.size % 512), 0) if mfs.size % 512        
+        mfs.concat Array.new(512 - (mfs.size % 512), 0) if mfs.size % 512 > 0     
       end
       mfs.pack 'c*'
     end
@@ -214,7 +233,7 @@ module Axlsx
     # creates the stron encryption data space storage
     # @return [Storgae]
     def create_strong_encryption_data_space
-      v_stream = [8,1,50,"StrongEncryptionTransform".bytes.to_a].flatten.pack STRONG_ENCRYPTION_DATA_SPACE_PACKING
+      v_stream = [8,1,50,"StrongEncryptionTransform".bytes.to_a,0].flatten.pack STRONG_ENCRYPTION_DATA_SPACE_PACKING
       Storage.new("StrongEncryptionDataSpace", :data=>v_stream, :size => v_stream.size)
     end
     
@@ -222,41 +241,58 @@ module Axlsx
     # @return [Storgae]
     def create_primary
       v_stream = [88,1,76,"{FF9A3F03-56EF-4613-BDD5-5A41C1D07246}".bytes.to_a].flatten
-      v_stream.concat [78, "Microsoft.Container.EncryptionTransform".bytes.to_a,1,1,1,4].flatten
+      v_stream.concat [78, "Microsoft.Container.EncryptionTransform".bytes.to_a,0,1,1,1,4].flatten
       v_stream = v_stream.pack PRIMARY_PACKING
       Storage.new([6].pack("c")+"Primary", :data=>v_stream)
     end
 
 
-    SUMMARY_INFORMATION_PACKING = ""
     # creates the summary information storage
     # @return [Storage]
     def create_summary_information
-      # FEFF 0000 030A 0100 0000 0000 0000 0000
-      # 0000 0000 0000 0000 0100 0000 E085 9FF2 
-      # F94F 6810 AB91 0800 2B27 B3D9 3000 0000
-      # AC00 0000 0700 0000 0100 0000 4000 0000
-      # 0400 0000 4800 0000 0800 0000 5800 0000
-      # 1200 0000 6800 0000 0C00 0000 8C00 0000
-      # 0D00 0000 9800 0000 1300 0000 A400 0000 
-      # 0200 0000 E9FD 0000 1E00 0000 0800 0000 
-      # 7261 6E64 796D 0000 1E00 0000 0800 0000 
-      # 7261 6E64 796D 0000 1E00 0000 1C00 0000 
-      # 4D69 6372 6F73 6F66 7420 4D61 6369 6E74 
-      # 6F73 6820 4578 6365 6C00 0000 4000 0000 
-      # 10AC 5396 60BC CC01 4000 0000 40F4 FDAF
-      # 60BC CC01 0300 0000 0100 0000
       v_stream = []
-      v_stream = v_stream.pack SUMMARY_INFORMATION_PACKING
-      Storage.new([5].pack('c')+"SummaryInformation", :data=>v_stream)
+      v_stream.concat [0xFEFF, 0x0000, 0x030A, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000]
+      v_stream.concat [0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0xE085, 0x9FF2]
+      v_stream.concat [0xF94F, 0x6810, 0xAB91, 0x0800, 0x2B27, 0xB3D9, 0x3000, 0x0000]
+      v_stream.concat [0xAC00, 0x0000, 0x0700, 0x0000, 0x0100, 0x0000, 0x4000, 0x0000]
+      v_stream.concat [0x0400, 0x0000, 0x4800, 0x0000, 0x0800, 0x0000, 0x5800, 0x0000]
+      v_stream.concat [0x1200, 0x0000, 0x6800, 0x0000, 0x0C00, 0x0000, 0x8C00, 0x0000]
+      v_stream.concat [0x0D00, 0x0000, 0x9800, 0x0000, 0x1300, 0x0000, 0xA400, 0x0000]
+      v_stream.concat [0x0200, 0x0000, 0xE9FD, 0x0000, 0x1E00, 0x0000, 0x0800, 0x0000]
+      v_stream.concat [0x7261, 0x6E64, 0x796D, 0x0000, 0x1E00, 0x0000, 0x0800, 0x0000]
+      v_stream.concat [0x7261, 0x6E64, 0x796D, 0x0000, 0x1E00, 0x0000, 0x1C00, 0x0000]
+      v_stream.concat [0x4D69, 0x6372, 0x6F73, 0x6F66, 0x7420, 0x4D61, 0x6369, 0x6E74]
+      v_stream.concat [0x6F73, 0x6820, 0x4578, 0x6365, 0x6C00, 0x0000, 0x4000, 0x0000]
+      v_stream.concat [0x10AC, 0x5396, 0x60BC, 0xCC01, 0x4000, 0x0000, 0x40F4, 0xFDAF]
+      v_stream.concat [0x60BC, 0xCC01, 0x0300, 0x0000, 0x0100, 0x0000]
+
+      v_stream = v_stream.pack "s*"
+
+      Storage.new([5].pack('c')+"SummaryInformation", :data=>v_stream, :left => 2)
     end
 
-    DOCUMENT_SUMMARY_INFORMATION_PACKING = ""
+
     # creates the document summary information storage
     # @return [Storage]
     def create_document_summary_information
       v_stream = []
-      v_stream = v_stream.pack DOCUMENT_SUMMARY_INFORMATION_PACKING
+      v_stream.concat [0xFEFF, 0x0000, 0x030A, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000]
+      v_stream.concat [0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x02D5, 0xCDD5]
+      v_stream.concat [0x9C2E, 0x1B10, 0x9397, 0x0800, 0x2B2C, 0xF9AE, 0x3000, 0x0000]
+      v_stream.concat [0xCC00, 0x0000, 0x0900, 0x0000, 0x0100, 0x0000, 0x5000, 0x0000]
+      v_stream.concat [0x0F00, 0x0000, 0x5800, 0x0000, 0x1700, 0x0000, 0x6400, 0x0000]
+      v_stream.concat [0x0B00, 0x0000, 0x6C00, 0x0000, 0x1000, 0x0000, 0x7400, 0x0000]
+      v_stream.concat [0x1300, 0x0000, 0x7C00, 0x0000, 0x1600, 0x0000, 0x8400, 0x0000]
+      v_stream.concat [0x0D00, 0x0000, 0x8C00, 0x0000, 0x0C00, 0x0000, 0x9F00, 0x0000]
+      v_stream.concat [0x0200, 0x0000, 0xE9FD, 0x0000, 0x1E00, 0x0000, 0x0400, 0x0000]
+      v_stream.concat [0x0000, 0x0000, 0x0300, 0x0000, 0x0000, 0x0C00, 0x0B00, 0x0000]
+      v_stream.concat [0x0000, 0x0000, 0x0B00, 0x0000, 0x0000, 0x0000, 0x0B00, 0x0000]
+      v_stream.concat [0x0000, 0x0000, 0x0B00, 0x0000, 0x0000, 0x0000, 0x1E10, 0x0000]
+      v_stream.concat [0x0100, 0x0000, 0x0700, 0x0000, 0x5368, 0x6565, 0x7431, 0x000C]
+      v_stream.concat [0x1000, 0x0002, 0x0000, 0x001E, 0x0000, 0x0013, 0x0000, 0x00E3]
+      v_stream.concat [0x83AF, 0xE383, 0xBCE3, 0x82AF, 0xE382, 0xB7E3, 0x83BC, 0xE383]
+      v_stream.concat [0x8800, 0x0300, 0x0000, 0x0100, 0x0000, 0x0000]
+      v_stream = v_stream.pack 'c*'
       Storage.new([5].pack('c')+"DocumentSummaryInformation", :data=>v_stream)
     end
 

data/lib/axlsx/util/constants.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Axlsx
 
   # XML Encoding
@@ -20,7 +21,7 @@ module Axlsx
 
   # dc elements (core) namespace
   CORE_NS_DC = "http://purl.org/dc/elements/1.1/"
-  
+
   # dcmit (core) namespcace
   CORE_NS_DCMIT = "http://purl.org/dc/dcmitype/"
 
@@ -29,10 +30,10 @@ module Axlsx
 
   # xml schema namespace
   CORE_NS_XSI = "http://www.w3.org/2001/XMLSchema-instance"
-  
+
   # spreadsheet drawing namespace
   XML_NS_XDR = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"
-  
+
   # drawing namespace
   XML_NS_A  = "http://schemas.openxmlformats.org/drawingml/2006/main"
 
@@ -42,13 +43,12 @@ module Axlsx
   # relationships namespace
   XML_NS_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
 
-
   # relationships name space
   RELS_R = "http://schemas.openxmlformats.org/package/2006/relationships"
 
   # table rels namespace
   TABLE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table"
-  
+
   # workbook rels namespace
   WORKBOOK_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"
 
@@ -64,6 +64,9 @@ module Axlsx
   # styles rels namespace
   STYLES_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"
 
+  # shared strings namespace
+  SHARED_STRINGS_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings"
+
   # drawing rels namespace
   DRAWING_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing"
 
@@ -73,7 +76,10 @@ module Axlsx
   # image rels namespace
   IMAGE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
 
-  # table content type 
+  # image rels namespace
+  HYPERLINK_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
+
+  # table content type
   TABLE_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml"
 
   # workbook content type
@@ -83,14 +89,14 @@ module Axlsx
   APP_CT = "application/vnd.openxmlformats-officedocument.extended-properties+xml"
 
   # rels content type
-  RELS_CT = "application/vnd.openxmlformats-package.relationships+xml"  
+  RELS_CT = "application/vnd.openxmlformats-package.relationships+xml"
 
   # styles content type
   STYLES_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"
 
   # xml content type
   XML_CT = "application/xml"
-  
+
   # worksheet content type
   WORKSHEET_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"
 
@@ -120,7 +126,7 @@ module Axlsx
 
   # jpeg extension
   JPEG_EX = "jpeg"
-  
+
   # gif extension
   GIF_EX = "gif"
 
@@ -135,10 +141,13 @@ module Axlsx
 
   # styles part
   STYLES_PN = "styles.xml"
-  
+
+  # shared_strings  part
+  SHARED_STRINGS_PN = "sharedStrings.xml"
+
   # app part
   APP_PN = "docProps/app.xml"
-  
+
   # core part
   CORE_PN = "docProps/core.xml"
 
@@ -163,32 +172,38 @@ module Axlsx
   # drawing rels part
   DRAWING_RELS_PN = "drawings/_rels/drawing%d.xml.rels"
 
+  # drawing part
+  TABLE_PN = "tables/table%d.xml"
+
   # chart part
   CHART_PN = "charts/chart%d.xml"
 
   # chart part
   IMAGE_PN = "media/image%d.%s"
 
+  # location of schema files for validation
+  SCHEMA_BASE = File.dirname(__FILE__)+'/../../schema/'
+
   # App validation schema
-  APP_XSD = "lib/schema/shared-documentPropertiesExtended.xsd"
+  APP_XSD = SCHEMA_BASE + "shared-documentPropertiesExtended.xsd"
 
   # core validation schema
-  CORE_XSD = "lib/schema/opc-coreProperties.xsd"
+  CORE_XSD = SCHEMA_BASE + "opc-coreProperties.xsd"
 
   # content types validation schema
-  CONTENT_TYPES_XSD = "lib/schema/opc-contentTypes.xsd"
+  CONTENT_TYPES_XSD = SCHEMA_BASE + "opc-contentTypes.xsd"
 
   # rels validation schema
-  RELS_XSD = "lib/schema/opc-relationships.xsd"
+  RELS_XSD = SCHEMA_BASE + "opc-relationships.xsd"
 
   # spreadsheetML validation schema
-  SML_XSD = "lib/schema/sml.xsd"
-  
+  SML_XSD = SCHEMA_BASE + "sml.xsd"
+
   # drawing validation schema
-  DRAWING_XSD = "lib/schema/dml-spreadsheetDrawing.xsd"
+  DRAWING_XSD = SCHEMA_BASE + "dml-spreadsheetDrawing.xsd"
 
   # number format id for pecentage formatting using the default formatting id.
-  NUM_FMT_PERCENT = 9 
+  NUM_FMT_PERCENT = 9
 
   # number format id for date format like 2011/11/13
   NUM_FMT_YYYYMMDD = 100
@@ -203,7 +218,7 @@ module Axlsx
   STYLE_DATE = 2
 
   # error messages RestrictionValidor
-  ERR_RESTRICTION = "Invalid Data: %s. %s must be one of %s." 
+  ERR_RESTRICTION = "Invalid Data: %s. %s must be one of %s."
 
   # error message DataTypeValidator
   ERR_TYPE = "Invalid Data %s for %s. must be %s."
@@ -211,6 +226,10 @@ module Axlsx
   # error message for RegexValidator
   ERR_REGEX = "Invalid Data. %s does not match %s."
 
+  # error message for sheets that use a name which is longer than 31 bytes
+  ERR_SHEET_NAME_TOO_LONG = "Your worksheet name '%s' is too long. Worksheet names must be 31 characters (bytes) or less"
+
   # error message for duplicate sheet names
   ERR_DUPLICATE_SHEET_NAME = "There is already a worksheet in this workbook named '%s'. Please use a unique name"
+
 end

data/lib/axlsx/util/ms_off_crypto.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# encoding: UTF-8
 require 'digest'
 require 'base64'
 require 'openssl'
@@ -48,7 +48,7 @@ module Axlsx
     # encrypts and returns the package specified by the file name 
     # @return [String]
     def encrypted_package
-      @encrypted_package ||= encrypt_package(file_name, password)
+      @encrypted_package ||= encrypt_package(file_name)
     end
 
     # returns the encryption info for this instance of ms-off-crypto
@@ -94,10 +94,10 @@ module Axlsx
     end
     
     # size of unencrypted package? concated with encrypted package
-    def encrypt_package(file_name, password)      
+    def encrypt_package(file_name)      
       package = File.open(file_name, 'r')
-      package_text = package.read
-      [package_text.bytes.to_a.size].pack('q') + encrypt(package_text)
+      crypt_pack = encrypt(package.read)      
+      [crypt_pack.size].pack('q') + crypt_pack
     end
 
     # Generates an encryption info structure
@@ -106,18 +106,18 @@ module Axlsx
       header = [3, 0, 2, 0] # version
       # Header flags copy
       header.concat [0x24, 0, 0, 0] #flags -- VERY UNSURE ABOUT THIS STILL
-      header.concat [0, 0, 0, 0] #unused
+      # header.concat [0, 0, 0, 0] #unused
       header.concat [0xA4, 0, 0, 0] #length
       # Header
       header.concat  [0x24, 0, 0, 0] #flags again
-      header.concat [0, 0, 0, 0] #unused again,
+      # header.concat [0, 0, 0, 0] #unused again,
       header.concat [0x0E, 0x66, 0, 0] #alg id
       header.concat [0x04, 0x80, 0, 0] #alg hash id
       header.concat [key.size, 0, 0, 0] #key size
       header.concat [0x18, 0, 0, 0] #provider type
-      header.concat [0, 0, 0, 0] #reserved 1
-      header.concat [0, 0, 0, 0] #reserved 2
-      #header.concat [0xA0, 0xC7, 0xDC, 0x2, 0, 0, 0, 0]
+      # header.concat [0, 0, 0, 0] #reserved 1
+      # header.concat [0, 0, 0, 0] #reserved 2
+      header.concat [0xA0, 0xC7, 0xDC, 0x2, 0, 0, 0, 0]
       header.concat "Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)".bytes.to_a.pack('s*').bytes.to_a
       header.concat [0, 0] #null terminator
 

data/lib/axlsx/util/parser.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Axlsx
   # The Parser module mixes in a number of methods to help in generating a model from xml
   # This module is not included in the axlsx library at this time. It is for future development only,

data/lib/axlsx/util/simple_typed_list.rb

@@ -1,5 +1,6 @@
+# encoding: UTF-8
 module Axlsx
-  # A SimpleTypedList is a type restrictive collection that allows some of the methods from Array and supports basic xml serialization.  
+  # A SimpleTypedList is a type restrictive collection that allows some of the methods from Array and supports basic xml serialization.
   # @private
   class SimpleTypedList
     # The class constants of allowed types
@@ -11,14 +12,14 @@ module Axlsx
     attr_reader :locked_at
 
     # The tag name to use when serializing this object
-    # by default the parent node for all items in the list is the classname of the first allowed type with the first letter in lowercase. 
+    # by default the parent node for all items in the list is the classname of the first allowed type with the first letter in lowercase.
     # @return [String]
     attr_reader :serialize_as
 
     # Creats a new typed list
     # @param [Array, Class] type An array of Class objects or a single Class object
     # @param [String] serialize The tag name to use in serialization
-    # @raise [ArgumentError] if all members of type are not Class objects    
+    # @raise [ArgumentError] if all members of type are not Class objects
     def initialize type, serialize_as=nil
       if type.is_a? Array
         type.each { |item| raise ArgumentError, "All members of type must be Class objects" unless item.is_a? Class }
@@ -38,7 +39,7 @@ module Axlsx
       @locked_at = @list.size
       self
     end
-    
+
     def to_ary
       @list
     end
@@ -57,7 +58,7 @@ module Axlsx
     def <<(v)
       DataTypeValidator.validate "SimpleTypedList.<<", @allowed_types, v
       @list << v
-      @list.size - 1      
+      @list.size - 1
     end
 
     # alternate of << method
@@ -103,14 +104,14 @@ module Axlsx
       return false unless @locked_at.is_a? Fixnum
       index < @locked_at
     end
-    
+
     # override the equality method so that this object can be compared to a simple array.
     # if this object's list is equal to the specifiec array, we return true.
     def ==(v)
       v == @list
     end
     # method_mission override to pass allowed methods to the list.
-    # @note 
+    # @note
     #  the following methods are not allowed
     #   :replace
     #   :insert
@@ -139,25 +140,34 @@ module Axlsx
     DELEGATES = Array.instance_methods - self.instance_methods - DESTRUCTIVE
 
     DELEGATES.each do |method|
-      class_eval %{ 
+      class_eval %{
         def #{method}(*args, &block)
           @list.send(:#{method}, *args, &block)
         end
       }
     end
 
+    def to_xml_string(str = '')
+      classname = @allowed_types[0].name.split('::').last
+      el_name = serialize_as || (classname[0,1].downcase + classname[1..-1])
+      str << '<' << el_name << ' count="' << @list.size.to_s << '">'
+      @list.each { |item| item.to_xml_string(str) }
+      str << '</' << el_name << '>'
+    end
+
     # Serializes the list
-    # If the serialize_as property is set, it is used as the parent node name. 
+    # If the serialize_as property is set, it is used as the parent node name.
     # If the serialize_as property is nil, the first item in the list of allowed_types will be used, having the first letter of the class changed to lower case.
     # @param [Nokogiri::XML::Builder] xml The document builder instance this objects xml will be added to.
     # @return [String]
     def to_xml(xml)
       classname = @allowed_types[0].name.split('::').last
-      el_name = serialize_as || (classname[0,1].downcase + classname[1..-1]).pluralize
+      el_name = serialize_as || (classname[0,1].downcase + classname[1..-1])
       xml.send(el_name, :count=>@list.size) {
         @list.each { |item| item.to_xml(xml) }
       }
     end
+
   end
 
 

data/lib/axlsx/util/storage.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Axlsx
 
   # The Storage class represents a storage object or stream in a compound file.
@@ -28,7 +29,6 @@ module Axlsx
              @modified, 
              @sector, 
              @size].flatten
-      puts data.inspect
       data.pack(PACKING)
     end
 

data/lib/axlsx/util/validators.rb

@@ -1,14 +1,15 @@
+# encoding: UTF-8
 module Axlsx
   # Validate a value against a specific list of allowed values.
   class RestrictionValidator
     # Perform validation
     # @param [String] name The name of what is being validatied. This is included in the error message
     # @param [Array] choices The list of choices to validate against
-    # @param [Any] v The value to be validated  
+    # @param [Any] v The value to be validated
     # @raise [ArgumentError] Raised if the value provided is not in the list of choices.
     # @return [Boolean] true if validation succeeds.
     def self.validate(name, choices, v)
-      raise ArgumentError, (ERR_RESTRICTION % [v.to_s, name, choices.inspect]) unless choices.include?(v)      
+      raise ArgumentError, (ERR_RESTRICTION % [v.to_s, name, choices.inspect]) unless choices.include?(v)
       true
     end
   end
@@ -52,6 +53,14 @@ module Axlsx
     DataTypeValidator.validate(:unsigned_int, [Fixnum, Integer], v, lambda { |arg| arg.respond_to?(:>=) && arg >= 0 })
   end
 
+  # Requires that the value is a Fixnum Integer or Float and is greater or equal to 0
+  # @param [Any] v The value validated
+  # @raise [ArgumentError] raised if the value is not a Fixnun, Integer, Float value greater or equal to 0
+  # @return [Boolean] true if the data is valid
+  def self.validate_unsigned_numeric(v)
+    DataTypeValidator.validate("Invalid column width", [Fixnum, Integer, Float], v, lambda { |arg| arg.respond_to?(:>=) && arg >= 0 })
+  end
+
   # Requires that the value is a Fixnum or Integer
   # @param [Any] v The value validated
   def self.validate_int(v)
@@ -59,7 +68,7 @@ module Axlsx
   end
 
   # Requires that the value is a form that can be evaluated as a boolean in an xml document.
-  # The value must be an instance of Fixnum, String, Integer, Symbol, TrueClass or FalseClass and 
+  # The value must be an instance of Fixnum, String, Integer, Symbol, TrueClass or FalseClass and
   # it must be one of 0, 1, "true", "false", :true, :false, true, false, "0", or "1"
   # @param [Any] v The value validated
   def self.validate_boolean(v)
@@ -70,13 +79,13 @@ module Axlsx
   # @param [Any] v The value validated
   def self.validate_string(v)
     DataTypeValidator.validate :string, String, v
-  end   
+  end
 
   # Requires that the value is a Float
   # @param [Any] v The value validated
   def self.validate_float(v)
     DataTypeValidator.validate :float, Float, v
-  end   
+  end
 
   # Requires that the value is valid pattern type.
   # valid pattern types must be one of :none, :solid, :mediumGray, :darkGray, :lightGray, :darkHorizontal, :darkVertical, :darkDown,
@@ -94,6 +103,13 @@ module Axlsx
     RestrictionValidator.validate :gradient_type, [:linear, :path], v
   end
 
+  # Requires that the value is a valid scatterStyle
+  # must be one of :none | :line | :lineMarker | :marker | :smooth | :smoothMarker
+  # must be one of "none" | "line" | "lineMarker" | "marker" | "smooth" | "smoothMarker"
+  # @param [Symbol|String] the value to validate
+  def self.validate_scatter_style(v)
+    Axlsx::RestrictionValidator.validate "ScatterChart.scatterStyle", [:none, :line, :lineMarker, :marker, :smooth, :smoothMarker], v.to_sym
+  end
   # Requires that the value is a valid horizontal_alignment
   # :general, :left, :center, :right, :fill, :justify, :centerContinuous, :distributed are allowed
   # @param [Any] v The value validated
@@ -116,10 +132,10 @@ module Axlsx
   end
 
   # Requires that the value is a valid relationship_type
-  # XML_NS_R, TABLE_R, WORKBOOK_R, WORKSHEET_R, APP_R, RELS_R, CORE_R, STYLES_R, CHART_R, DRAWING_R are allowed
+  # XML_NS_R, TABLE_R, WORKBOOK_R, WORKSHEET_R, APP_R, RELS_R, CORE_R, STYLES_R, CHART_R, DRAWING_R, IMAGE_R, HYPERLINK_R, SHARED_STRINGS_R are allowed
   # @param [Any] v The value validated
   def self.validate_relationship_type(v)
-    RestrictionValidator.validate :relationship_type, [XML_NS_R, TABLE_R, WORKBOOK_R, WORKSHEET_R, APP_R, RELS_R, CORE_R, STYLES_R, CHART_R, DRAWING_R, IMAGE_R], v
+    RestrictionValidator.validate :relationship_type, [XML_NS_R, TABLE_R, WORKBOOK_R, WORKSHEET_R, APP_R, RELS_R, CORE_R, STYLES_R, CHART_R, DRAWING_R, IMAGE_R, HYPERLINK_R, SHARED_STRINGS_R], v
   end
 
   # Requires that the value is a valid table element type

data/lib/axlsx/version.rb

@@ -1,7 +1,10 @@
+# encoding: UTF-8
 module Axlsx
-  # version
+
+  # The version of the gem
   # When using bunle exec rake and referencing the gem on github or locally
   # it will use the gemspec, which preloads this constant for the gem's version.
   # We check to make sure that it has not already been loaded
-  VERSION="1.0.15" unless Axlsx.const_defined? :VERSION
+  VERSION="1.1.0" unless defined? Axlsx::VERSION
+
 end