rubyXL 2.5.6 → 2.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5d4de6685adea206ea016f0836086e35756a016
-  data.tar.gz: 808c2f74761873580278873b28644650244aa003
+  metadata.gz: 794a18bdbb32248109cbf8db6c6980baa9554b94
+  data.tar.gz: 4d719ab25167db598f866854da7828b61e849b3b
 SHA512:
-  metadata.gz: c48ceac803b8088420747e52fff0700aab2ebfce5355bd128c0334f6da73327a509b2c7300560297463ad0663405df237941b69cfc4a78e874155e8a3a141540
-  data.tar.gz: e6cd7b075274dc1cd319ca32e56b4602acdbda72ae39a67a2d46bc2baae3c6881df57966decc8febaef3606fc010bc7e2ee23c0c827be8f778deabcc0f256577
+  metadata.gz: e78a5c5c76d25bbc1a0a8fa59ca07fe949a0b4584e22bf253894399d691f0fbc50518a9ec06740050fd9d01859c7474ac9594387dac7c18c7f1de022cfb7a644
+  data.tar.gz: 3096460f2cdd9f40f6385eaedcf59bcd6902ed24f46c1de7a16d8fac104228296b7cec75869639f0252b4dde959b63ceacb5bb0da7125abe04511346d80f27b9

data/VERSION

@@ -1 +1 @@
-2.5.6
+2.5.7

data/lib/rubyXL/objects/calculation_chain.rb

@@ -19,7 +19,7 @@ module RubyXL
     define_child_node(RubyXL::ExtensionStorageArea)
 
     define_element_name 'calcChain'
-    set_namespaces('xmlns' => 'http://schemas.openxmlformats.org/spreadsheetml/2006/main')
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '')
 
     def self.xlsx_path
       File.join('xl', 'calcChain.xml')

data/lib/rubyXL/objects/chartsheet.rb

@@ -71,8 +71,8 @@ module RubyXL
     define_child_node(RubyXL::WebPublishingItems)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'chartsheet'
-    set_namespaces('xmlns'       => 'http://schemas.openxmlformats.org/spreadsheetml/2006/main',
-                   'xmlns:r'     => 'http://schemas.openxmlformats.org/officeDocument/2006/relationships')
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
+                   'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
 
     attr_accessor :state
 

data/lib/rubyXL/objects/content_types.rb

@@ -20,7 +20,7 @@ module RubyXL
     define_child_node(RubyXL::ContentTypeDefault,  :collection => true, :accessor => :defaults)
     define_child_node(RubyXL::ContentTypeOverride, :collection => true, :accessor => :overrides)
 
-    set_namespaces(:xmlns => 'http://schemas.openxmlformats.org/package/2006/content-types')
+    set_namespaces('http://schemas.openxmlformats.org/package/2006/content-types' => '')
     define_element_name 'Types'
 
     def self.xlsx_path
@@ -28,7 +28,7 @@ module RubyXL
     end
 
     def generate_override(obj)
-      RubyXL::ContentTypeOverride.new(:part_name => "/#{obj.xlsx_path}", :content_type => obj.class.content_type)
+      obj && RubyXL::ContentTypeOverride.new(:part_name => "/#{obj.xlsx_path}", :content_type => obj.class.content_type)
     end
 
     def before_write_xml
@@ -54,8 +54,8 @@ module RubyXL
       overrides << generate_override(workbook.stylesheet)
       overrides << generate_override(workbook.document_properties)
       overrides << generate_override(workbook.core_properties)
-      overrides << generate_override(workbook.shared_strings_container) unless workbook.shared_strings_container.empty?
-      overrides << generate_override(workbook.calculation_chain) unless workbook.calculation_chain.nil?
+      overrides << generate_override(workbook.shared_strings_container) if workbook.shared_strings_container && !workbook.shared_strings_container.empty?
+      overrides << generate_override(workbook.calculation_chain)
       overrides << generate_override(workbook.theme)
 
       workbook.charts.each_pair { |k, v|
@@ -96,6 +96,7 @@ module RubyXL
                        :content_type => 'application/vnd.ms-office.vbaProject')
       end
 
+      overrides.compact!
       true
     end
 

data/lib/rubyXL/objects/document_properties.rb

@@ -34,8 +34,8 @@ module RubyXL
     define_child_node(RubyXL::StringNode,  :node_name => :Application)
     define_child_node(RubyXL::StringNode,  :node_name => :AppVersion)
     define_child_node(RubyXL::IntegerNode, :node_name => :DocSecurity)
-    set_namespaces('xmlns'    => 'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties',
-                   'xmlns:vt' => 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes')
+    set_namespaces('http://schemas.openxmlformats.org/officeDocument/2006/extended-properties' => '',
+                   'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes' => 'vt')
     define_element_name 'Properties'
 
     def add_parts_count(name, count)
@@ -98,11 +98,11 @@ module RubyXL
     define_child_node(RubyXL::StringNode,    :node_name => 'cp:revision')
     define_child_node(RubyXL::StringNode,    :node_name => 'cp:version')
 
-    set_namespaces('xmlns:cp'       => 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties',
-                   'xmlns:dc'       => 'http://purl.org/dc/elements/1.1/',
-                   'xmlns:dcterms'  => 'http://purl.org/dc/terms/',
-                   'xmlns:dcmitype' => 'http://purl.org/dc/dcmitype/',
-                   'xmlns:xsi'      => 'http://www.w3.org/2001/XMLSchema-instance')
+    set_namespaces('http://schemas.openxmlformats.org/package/2006/metadata/core-properties' => 'cp',
+                   'http://purl.org/dc/elements/1.1/' => 'dc',
+                   'http://purl.org/dc/terms/' => 'dcterms',
+                   'http://purl.org/dc/dcmitype/' => 'dcmitype',
+                   'http://www.w3.org/2001/XMLSchema-instance' => 'xsi')
     define_element_name 'cp:coreProperties'
 
     def self.xlsx_path

data/lib/rubyXL/objects/extensions.rb

@@ -6,7 +6,7 @@ module RubyXL
   class RawOOXML < OOXMLObject
     attr_accessor :raw_xml
 
-    def self.parse(node)
+    def self.parse(node, ignore)
       obj = new
       obj.raw_xml = node.to_xml
       obj

data/lib/rubyXL/objects/ooxml_object.rb

@@ -108,7 +108,7 @@ module RubyXL
       self.send(:attr_accessor, :count)
     end
 
-    def parse(node)
+    def parse(node, known_namespaces = nil)
       node = Nokogiri::XML.parse(node) if node.is_a?(IO) || node.is_a?(String)
 
       if node.is_a?(Nokogiri::XML::Document) then
@@ -140,16 +140,21 @@ module RubyXL
       known_child_nodes = obtain_class_variable(:@@ooxml_child_nodes)
 
       unless known_child_nodes.empty?
+        known_namespaces ||= obtain_class_variable(:@@ooxml_namespaces)
+
         node.element_children.each { |child_node|
 
-          child_node_name = if child_node.namespace.prefix then
-                              "#{child_node.namespace.prefix}:#{child_node.name}"
-                            else child_node.name 
+          ns = child_node.namespace
+          prefix = known_namespaces[ns.href] || ns.prefix
+
+          child_node_name = case prefix
+                            when '', nil then child_node.name 
+                            else "#{prefix}:#{child_node.name}"
                             end
 
           child_node_params = known_child_nodes[child_node_name]
           raise "Unknown child node [#{child_node_name}] for element [#{node.name}]" if child_node_params.nil?
-          parsed_object = child_node_params[:class].parse(child_node)
+          parsed_object = child_node_params[:class].parse(child_node, known_namespaces)
           if child_node_params[:is_array] then
             index = parsed_object.index_in_collection
 
@@ -254,7 +259,9 @@ module RubyXL
 
       return '' unless before_write_xml
 
-      attrs = obtain_class_variable(:@@ooxml_namespaces).dup
+      # Populate namespaces, if any
+      attrs = {}
+      obtain_class_variable(:@@ooxml_namespaces).each_pair { |k, v| attrs[v.empty? ? 'xmlns' : "xmlns:#{v}"] = k }
 
       obtain_class_variable(:@@ooxml_attributes).each_pair { |k, v|
         val = self.send(v[:accessor])
@@ -400,8 +407,8 @@ module RubyXL
     # === Parameters
     # * +namespace_hash+ - Hash of namespaces in the form of <tt>"prefix" => "url"</tt>
     # ==== Examples
-    #   set_namespaces('xmlns'   => 'http://schemas.openxmlformats.org/spreadsheetml/2006/main',
-    #                  'xmlns:r' => 'http://schemas.openxmlformats.org/officeDocument/2006/relationships')
+    #   set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
+    #                  'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
     def self.set_namespaces(namespace_hash)
       self.class_variable_set(:@@ooxml_namespaces, namespace_hash)
     end

data/lib/rubyXL/objects/relationships.rb

@@ -16,7 +16,7 @@ module RubyXL
   class OOXMLRelationshipsFile < OOXMLTopLevelObject
     define_child_node(RubyXL::Relationship, :collection => true, :accessor => :relationships)
     define_element_name 'Relationships'
-    set_namespaces('xmlns' => 'http://schemas.openxmlformats.org/package/2006/relationships')
+    set_namespaces('http://schemas.openxmlformats.org/package/2006/relationships' => '')
 
     def document_relationship(target, type)
       RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}", 
@@ -57,8 +57,8 @@ module RubyXL
         relationships << document_relationship("externalLinks/#{k}", 'externalLink')
       }
 
-      relationships << document_relationship('theme/theme1.xml', 'theme')
-      relationships << document_relationship('styles.xml', 'styles')
+      relationships << document_relationship('theme/theme1.xml', 'theme') if @workbook.theme
+      relationships << document_relationship('styles.xml', 'styles') if @workbook.stylesheet
 
       if @workbook.shared_strings_container && !@workbook.shared_strings_container.strings.empty? then
         relationships << document_relationship('sharedStrings.xml', 'sharedStrings') 
@@ -86,8 +86,8 @@ module RubyXL
 
       relationships << document_relationship('xl/workbook.xml',   'officeDocument')
       relationships << metadata_relationship('docProps/thumbnail.jpeg', 'thumbnail') unless @workbook.thumbnail.empty?
-      relationships << metadata_relationship('docProps/core.xml', 'core-properties')
-      relationships << document_relationship('docProps/app.xml',  'extended-properties')
+      relationships << metadata_relationship('docProps/core.xml', 'core-properties') if @workbook.core_properties 
+      relationships << document_relationship('docProps/app.xml',  'extended-properties') if @workbook.document_properties
 
       true
     end

data/lib/rubyXL/objects/shared_strings.rb

@@ -12,7 +12,7 @@ module RubyXL
     define_child_node(RubyXL::RichText, :collection => :with_count, :node_name => 'si', :accessor => :strings)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'sst'
-    set_namespaces('xmlns' => 'http://schemas.openxmlformats.org/spreadsheetml/2006/main')
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '')
 
     def initialize(*params)
       super

data/lib/rubyXL/objects/stylesheet.rb

@@ -172,11 +172,11 @@ module RubyXL
     define_child_node(RubyXL::Colors)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'styleSheet'
-    set_namespaces('xmlns'       => 'http://schemas.openxmlformats.org/spreadsheetml/2006/main',
-                   'xmlns:r'     => 'http://schemas.openxmlformats.org/officeDocument/2006/relationships',
-                   'xmlns:mc'    => 'http://schemas.openxmlformats.org/markup-compatibility/2006',
-                   'xmlns:x14ac' => 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac',
-                   'xmlns:mv'    => 'urn:schemas-microsoft-com:mac:vml')
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
+                   'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r',
+                   'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
+                   'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac' => 'x14ac',
+                   'urn:schemas-microsoft-com:mac:vml' => 'mv')
 
     def initialize(*args)
       super

data/lib/rubyXL/objects/theme.rb

@@ -10,7 +10,7 @@ module RubyXL
     define_element_name 'a:ext'
     attr_accessor :raw_xml
 
-    def self.parse(node)
+    def self.parse(node, ignore)
       obj = new
       obj.raw_xml = node.to_xml
       obj
@@ -1386,7 +1386,7 @@ module RubyXL
 
     define_element_name 'a:theme'
 
-    set_namespaces('xmlns:a' => 'http://schemas.openxmlformats.org/drawingml/2006/main')
+    set_namespaces('http://schemas.openxmlformats.org/drawingml/2006/main' => 'a')
 
     def self.xlsx_path
       File.join('xl', 'theme', 'theme1.xml')

data/lib/rubyXL/objects/workbook.rb

@@ -309,10 +309,10 @@ module RubyXL
     define_child_node(RubyXL::ExtensionStorageArea)
 
     define_element_name 'workbook'
-    set_namespaces('xmlns'     => 'http://schemas.openxmlformats.org/spreadsheetml/2006/main',
-                   'xmlns:r'   => 'http://schemas.openxmlformats.org/officeDocument/2006/relationships',
-                   'xmlns:mc'  => 'http://schemas.openxmlformats.org/markup-compatibility/2006',
-                   'xmlns:x15' => 'http://schemas.microsoft.com/office/spreadsheetml/2010/11/main')
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
+                   'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r',
+                   'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
+                   'http://schemas.microsoft.com/office/spreadsheetml/2010/11/main' => 'x15')
 
     def before_write_xml
       self.sheets = RubyXL::Sheets.new

data/lib/rubyXL/objects/worksheet.rb

@@ -646,11 +646,11 @@ module RubyXL
     define_child_node(RubyXL::ExtensionStorageArea)
     define_child_node(RubyXL::AlternateContent)
     define_element_name 'worksheet'
-    set_namespaces('xmlns'       => 'http://schemas.openxmlformats.org/spreadsheetml/2006/main',
-                   'xmlns:r'     => 'http://schemas.openxmlformats.org/officeDocument/2006/relationships',
-                   'xmlns:mc'    => 'http://schemas.openxmlformats.org/markup-compatibility/2006',
-                   'xmlns:x14ac' => 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac',
-                   'xmlns:mv'    => 'urn:schemas-microsoft-com:mac:vml')
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
+                   'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r',
+                   'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
+                   'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac' => 'x14ac',
+                   'urn:schemas-microsoft-com:mac:vml' => 'mv')
 
     attr_accessor :workbook, :state, :sheet_name, :sheet_id
 

data/lib/rubyXL/parser.rb

@@ -71,23 +71,29 @@ module RubyXL
           wb.calculation_chain = RubyXL::CalculationChain.parse_file(dir_path)
         end
 
-        #fills out count information for each font, fill, and border
-        wb.cell_xfs.each { |style|
-          id = style.font_id
-          wb.fonts[id].count += 1 #unless id.nil?
+        if wb.stylesheet then
+          #fills out count information for each font, fill, and border
+          wb.cell_xfs.each { |style|
 
-          id = style.fill_id
-          wb.fills[id].count += 1 #unless id.nil?
+            id = style.font_id
+            wb.fonts[id].count += 1 #unless id.nil?
 
-          id = style.border_id
-          wb.borders[id].count += 1 #unless id.nil?
-        }
+            id = style.fill_id
+            wb.fills[id].count += 1 #unless id.nil?
+
+            id = style.border_id
+            wb.borders[id].count += 1 #unless id.nil?
+          }
+        end
 
         wb.sheets.each_with_index { |sheet, i|
           sheet_rel = wb.relationship_container.find_by_rid(sheet.r_id)
 
+          sheet_path = sheet_rel.target
+          sheet_path = File.join('xl', sheet_path) if sheet_path[0] != '/'
+
           # Making sure that the file will be automatically closed immediately after it has been read
-          File.open(File.join(dir_path, 'xl', sheet_rel.target)) { |sheet_file|
+          File.open(File.join(dir_path, sheet_path)) { |sheet_file|
             case File::basename(sheet_rel.type)
             when 'worksheet' then
               sheet_obj = RubyXL::Worksheet.parse(sheet_file)

data/lib/rubyXL/workbook.rb

@@ -110,13 +110,13 @@ module RubyXL
         theme && theme.add_to_zip(zipfile)
         calculation_chain && calculation_chain.add_to_zip(zipfile)
         shared_strings_container && shared_strings_container.add_to_zip(zipfile)
-        document_properties.add_to_zip(zipfile)
-        core_properties.add_to_zip(zipfile)
+        document_properties.add_to_zip(zipfile) if document_properties
+        core_properties.add_to_zip(zipfile) if core_properties
         content_types.workbook = self
         content_types.add_to_zip(zipfile)
         relationship_container.workbook = root_relationship_container.workbook = self
         relationship_container.add_to_zip(zipfile)
-        stylesheet.add_to_zip(zipfile)
+        stylesheet.add_to_zip(zipfile) if stylesheet
         root_relationship_container.add_to_zip(zipfile)
         self.add_to_zip(zipfile)
 

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 2.5.6</title>
+<title>README - rubyXL 2.5.7</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 2.5.6</title>
+<title>module RubyXL - rubyXL 2.5.7</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AExtension.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 2.5.6</title>
+<title>class RubyXL::AExtension - rubyXL 2.5.7</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">
@@ -139,7 +139,7 @@ href="http://www.schemacentral.com/sc/ooxml/e-a_ext-1.html">www.schemacentral.co
         
         <div class="method-heading">
           <span class="method-name">parse</span><span
-            class="method-args">(node)</span>
+            class="method-args">(node, ignore)</span>
           
           <span class="method-click-advice">click to toggle source</span>
           
@@ -155,7 +155,7 @@ href="http://www.schemacentral.com/sc/ooxml/e-a_ext-1.html">www.schemacentral.co
           
           <div class="method-source-code" id="parse-source">
             <pre><span class="ruby-comment"># File lib/rubyXL/objects/theme.rb, line 12</span>
-<span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-identifier">node</span>)
+<span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-identifier">node</span>, <span class="ruby-identifier">ignore</span>)
   <span class="ruby-identifier">obj</span> = <span class="ruby-identifier">new</span>
   <span class="ruby-identifier">obj</span>.<span class="ruby-identifier">raw_xml</span> = <span class="ruby-identifier">node</span>.<span class="ruby-identifier">to_xml</span>
   <span class="ruby-identifier">obj</span>

data/rdoc/RubyXL/AExtensionStorageArea.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtensionStorageArea - rubyXL 2.5.6</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 2.5.7</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AdjustHandleList.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AdjustHandleList - rubyXL 2.5.6</title>
+<title>class RubyXL::AdjustHandleList - rubyXL 2.5.7</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/Alignment.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Alignment - rubyXL 2.5.6</title>
+<title>class RubyXL::Alignment - rubyXL 2.5.7</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AlternateContent.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AlternateContent - rubyXL 2.5.6</title>
+<title>class RubyXL::AlternateContent - rubyXL 2.5.7</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AutoFilter.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AutoFilter - rubyXL 2.5.6</title>
+<title>class RubyXL::AutoFilter - rubyXL 2.5.7</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AutoFilterColumn.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AutoFilterColumn - rubyXL 2.5.6</title>
+<title>class RubyXL::AutoFilterColumn - rubyXL 2.5.7</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">