rubyXL 3.3.12 → 3.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e1c2446da3e82b6cb501d89c16c00779775dad4
-  data.tar.gz: 3be7993c63cab52678c22d6e9b8fadcd84d5429b
+  metadata.gz: 090928eabee7e0948755c1efe843a2b80d78219f
+  data.tar.gz: 612259c320192bece1efca0ffb58f43d0e245c41
 SHA512:
-  metadata.gz: 497e6a697688a07626a3a8677d39277f5fc77823d57c67fdd34561d81228898c88cfe0f0e94b22d0c498a8f79fe87263f442d9de4c5b75c9a7cf0aea9b623285
-  data.tar.gz: 2c679571955146a204105913426632c1e27ad79938eb3122111eb0cbdadf71b5569b0627996b88db5b75fc19fede41bbf01d310117dfb5af9dd486c2872eaa86
+  metadata.gz: 9d6baa0c33423ad57c45fe2f5c2031a5e22e6cfeb4f1b85bac67a7b1ca7e480ae1d015ee412ab617bf59ed8c0787001416ee7ae171dd6dce6fad98048ad11352
+  data.tar.gz: 03a23312f1bf72d2296fbfe3be4ff4c19ccb07b901cc4dcc854ffeb0c0938b242f5d2b457ebba8c33795a6ef2faac4750113ff1e194b5e30fcdbe0830df76245

data/README.rdoc

@@ -28,10 +28,6 @@ Please note that proprietary binary +xls+ format is *not* supported.
   workbook[0]            # Returns first worksheet
   workbook['Sheet1']     # Finds and returns worksheet titled "Sheet1"
 
-==== Accessing just the values
-  worksheet = workbook[0]
-  worksheet.extract_data  # Produces a simple rectangular array that consists only of cell values (rather than the Cell objects)
-
 ==== Accessing a Row (Array of Cells)
   worksheet = workbook[0]
   worksheet.sheet_data[0] # Returns first row of the worksheet
@@ -79,19 +75,14 @@ Please note: these methods are being phased out in favor of the OOXML object mod
   worksheet.get_column_vertical_alignment(0)
   worksheet.get_column_border_right(0)
 
-==== Table identification
-  worksheet = workbook[0]
-  worksheet.get_table(["NAME", "AGE", "HEIGHT"]) # Returns hash of a table in the first worksheet, with the specified strings as headers, accessible by row and column
-  #it returns the following structure
-  {
-   :Name=>["John", "Jane", "Joe"], 
-   :Height=>[70, 65, 68], 
-   :Age=>[30, 25, 35]
-   :table=>[
-    {:Name=>"John", :Height=>70, :Age=>30},
-    {:Name=>"Jane", :Height=>65, :Age=>25}, 
-    {:Name=>"Joe", :Height=>68, :Age=>35}
-   ]
+==== Table reading
+In order to discourage unnecessary reshuffling of data in memory, methods +extract_data+ and +get_table+ are being deprecated. You should access and iterate through rows and cells directly:
+
+  worksheet.each { |row|
+     row && row.cells.each { |cell|
+       val = cell && cell.value
+       do_whatever_you_want(val)
+     }
   }
 
 === Modifying

data/VERSION

@@ -1 +1 @@
-3.3.12
+3.3.13

data/lib/rubyXL/objects/calculation_chain.rb

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

data/lib/rubyXL/objects/chartsheet.rb

@@ -80,7 +80,7 @@ module RubyXL
     define_child_node(RubyXL::WebPublishingItems)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'chartsheet'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
 
     def xlsx_path

data/lib/rubyXL/objects/comments.rb

@@ -34,7 +34,7 @@ module RubyXL
     define_child_node(RubyXL::CommentList)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'comments'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '')
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil)
 
     attr_accessor :workbook
 

data/lib/rubyXL/objects/content_types.rb

@@ -21,7 +21,7 @@ module RubyXL
     define_child_node(RubyXL::ContentTypeDefault,  :collection => true, :accessor => :defaults)
     define_child_node(RubyXL::ContentTypeOverride, :collection => true, :accessor => :overrides)
 
-    set_namespaces('http://schemas.openxmlformats.org/package/2006/content-types' => '')
+    set_namespaces('http://schemas.openxmlformats.org/package/2006/content-types' => nil)
     define_element_name 'Types'
 
     def xlsx_path

data/lib/rubyXL/objects/document_properties.rb

@@ -38,7 +38,7 @@ 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('http://schemas.openxmlformats.org/officeDocument/2006/extended-properties' => '',
+    set_namespaces('http://schemas.openxmlformats.org/officeDocument/2006/extended-properties' => nil,
                    'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes' => 'vt')
     define_element_name 'Properties'
 

data/lib/rubyXL/objects/external_links.rb

@@ -73,7 +73,7 @@ module RubyXL
     define_child_node(RubyXL::ExternalBook)
 
     define_element_name 'externalLink'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
                    'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
 

data/lib/rubyXL/objects/ooxml_object.rb

@@ -111,13 +111,13 @@ module RubyXL
       end
 
       if node.is_a?(Nokogiri::XML::Document) then
-        @namespaces = node.namespaces
         node = node.root
 #        ignorable_attr = node.attributes['Ignorable']
 #        @ignorables << ignorable_attr.value if ignorable_attr
       end
 
       obj = self.new
+      obj.local_namespaces = node.namespace_definitions
 
       known_attributes = obtain_class_variable(:@@ooxml_attributes)
 
@@ -206,6 +206,8 @@ module RubyXL
 
 
   module OOXMLObjectInstanceMethods
+    attr_accessor :local_namespaces
+
     def self.included(klass)
       klass.extend RubyXL::OOXMLObjectClassMethods
     end
@@ -274,9 +276,7 @@ module RubyXL
 
       return '' unless before_write_xml
 
-      # 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])
@@ -299,6 +299,13 @@ module RubyXL
       element_text = attrs.delete('_')
       elem = xml.create_element(node_name_override || obtain_class_variable(:@@ooxml_tag_name), attrs, element_text)
 
+      if @local_namespaces.nil? || @local_namespaces.empty? then # If no local namespaces provided in the original document,
+        # use the defualts
+        obtain_class_variable(:@@ooxml_namespaces).each_pair { |k, v| elem.add_namespace_definition(v, k) }
+      else # otherwise preserve the original ones
+        @local_namespaces.each { |ns| elem.add_namespace_definition(ns.prefix, ns.href) }
+      end
+
       child_nodes = obtain_class_variable(:@@ooxml_child_nodes)
       child_nodes.each_pair { |child_node_name, child_node_params|
         node_obj = get_node_object(child_node_params)
@@ -415,7 +422,7 @@ module RubyXL
     # === Parameters
     # * +namespace_hash+ - Hash of namespaces in the form of <tt>"url" => "prefix"</tt>
     # ==== Examples
-    #   set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
+    #   set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
     #                  'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
     def self.set_namespaces(namespace_hash)
       self.class_variable_set(:@@ooxml_namespaces, namespace_hash)

data/lib/rubyXL/objects/relationships.rb

@@ -21,7 +21,7 @@ module RubyXL
 
     define_child_node(RubyXL::Relationship, :collection => true, :accessor => :relationships)
     define_element_name 'Relationships'
-    set_namespaces('http://schemas.openxmlformats.org/package/2006/relationships' => '')
+    set_namespaces('http://schemas.openxmlformats.org/package/2006/relationships' => nil)
 
     attr_accessor :related_files, :owner
 

data/lib/rubyXL/objects/shared_strings.rb

@@ -15,7 +15,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('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '')
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil)
 
     def initialize(*params)
       super

data/lib/rubyXL/objects/stylesheet.rb

@@ -176,7 +176,7 @@ module RubyXL
     define_child_node(RubyXL::Colors)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'styleSheet'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
                    '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',

data/lib/rubyXL/objects/workbook.rb

@@ -348,7 +348,7 @@ module RubyXL
     define_child_node(RubyXL::ExtensionStorageArea)
 
     define_element_name 'workbook'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
                    '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')
@@ -356,8 +356,7 @@ module RubyXL
     attr_accessor :worksheets
 
     def before_write_xml
-      max_sheet = worksheets.max_by(&:sheet_id)
-      max_sheet_id = max_sheet && max_sheet.sheet_id || 0
+      max_sheet_id = worksheets.collect(&:sheet_id).compact.max || 0
 
       self.sheets = RubyXL::Sheets.new
 

data/lib/rubyXL/objects/worksheet.rb

@@ -673,7 +673,7 @@ module RubyXL
     define_child_node(RubyXL::ExtensionStorageArea)
     define_child_node(RubyXL::AlternateContent)
     define_element_name 'worksheet'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
                    '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',

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.3.12</title>
+<title>README - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";
@@ -62,13 +62,12 @@
     <li><a href="#label-Creating+a+new+Workbook">Creating a new Workbook</a>
     <li><a href="#label-Accessing">Accessing</a>
     <li><a href="#label-Accessing+a+Worksheet">Accessing a Worksheet</a>
-    <li><a href="#label-Accessing+just+the+values">Accessing just the values</a>
     <li><a href="#label-Accessing+a+Row+-28Array+of+Cells-29">Accessing a Row (Array of Cells)</a>
     <li><a href="#label-Accessing+a+Cell+object">Accessing a Cell object</a>
     <li><a href="#label-Wrappers+for+accessing+Cell+properties">Wrappers for accessing Cell properties</a>
     <li><a href="#label-Wrappers+for+accessing+Row+properties+">Wrappers for accessing Row properties </a>
     <li><a href="#label-Accessing+column+properties">Accessing column properties</a>
-    <li><a href="#label-Table+identification">Table identification</a>
+    <li><a href="#label-Table+reading">Table reading</a>
     <li><a href="#label-Modifying">Modifying</a>
     <li><a href="#label-Adding+Worksheets">Adding Worksheets</a>
     <li><a href="#label-Renaming+Worksheets">Renaming Worksheets</a>
@@ -161,12 +160,6 @@ preserving as much of the structure as possible.</p>
 <span class="ruby-identifier">workbook</span>[<span class="ruby-string">&#39;Sheet1&#39;</span>]     <span class="ruby-comment"># Finds and returns worksheet titled &quot;Sheet1&quot;</span>
 </pre>
 
-<h4 id="label-Accessing+just+the+values">Accessing just the values<span><a href="#label-Accessing+just+the+values">&para;</a> <a href="#top">&uarr;</a></span></h4>
-
-<pre class="ruby"><span class="ruby-identifier">worksheet</span> = <span class="ruby-identifier">workbook</span>[<span class="ruby-value">0</span>]
-<span class="ruby-identifier">worksheet</span>.<span class="ruby-identifier">extract_data</span>  <span class="ruby-comment"># Produces a simple rectangular array that consists only of cell values (rather than the Cell objects)</span>
-</pre>
-
 <h4 id="label-Accessing+a+Row+-28Array+of+Cells-29">Accessing a Row (Array of Cells)<span><a href="#label-Accessing+a+Row+-28Array+of+Cells-29">&para;</a> <a href="#top">&uarr;</a></span></h4>
 
 <pre class="ruby"><span class="ruby-identifier">worksheet</span> = <span class="ruby-identifier">workbook</span>[<span class="ruby-value">0</span>]
@@ -228,21 +221,19 @@ object model.</p>
 <span class="ruby-identifier">worksheet</span>.<span class="ruby-identifier">get_column_border_right</span>(<span class="ruby-value">0</span>)
 </pre>
 
-<h4 id="label-Table+identification">Table identification<span><a href="#label-Table+identification">&para;</a> <a href="#top">&uarr;</a></span></h4>
-
-<pre>worksheet = workbook[0]
-worksheet.get_table([&quot;NAME&quot;, &quot;AGE&quot;, &quot;HEIGHT&quot;]) # Returns hash of a table in the first worksheet, with the specified strings as headers, accessible by row and column
-#it returns the following structure
-{
- :Name=&gt;[&quot;John&quot;, &quot;Jane&quot;, &quot;Joe&quot;], 
- :Height=&gt;[70, 65, 68], 
- :Age=&gt;[30, 25, 35]
- :table=&gt;[
-  {:Name=&gt;&quot;John&quot;, :Height=&gt;70, :Age=&gt;30},
-  {:Name=&gt;&quot;Jane&quot;, :Height=&gt;65, :Age=&gt;25}, 
-  {:Name=&gt;&quot;Joe&quot;, :Height=&gt;68, :Age=&gt;35}
- ]
-}</pre>
+<h4 id="label-Table+reading">Table reading<span><a href="#label-Table+reading">&para;</a> <a href="#top">&uarr;</a></span></h4>
+
+<p>In order to discourage unnecessary reshuffling of data in memory, methods
+<code>extract_data</code> and <code>get_table</code> are being deprecated.
+You should access and iterate through rows and cells directly:</p>
+
+<pre class="ruby"><span class="ruby-identifier">worksheet</span>.<span class="ruby-identifier">each</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">row</span><span class="ruby-operator">|</span>
+   <span class="ruby-identifier">row</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">row</span>.<span class="ruby-identifier">cells</span>.<span class="ruby-identifier">each</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">cell</span><span class="ruby-operator">|</span>
+     <span class="ruby-identifier">val</span> = <span class="ruby-identifier">cell</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">cell</span>.<span class="ruby-identifier">value</span>
+     <span class="ruby-identifier">do_whatever_you_want</span>(<span class="ruby-identifier">val</span>)
+   }
+}
+</pre>
 
 <h3 id="label-Modifying">Modifying<span><a href="#label-Modifying">&para;</a> <a href="#top">&uarr;</a></span></h3>
 

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 3.3.12</title>
+<title>module RubyXL - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";

data/rdoc/RubyXL/AExtension.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 3.3.12</title>
+<title>class RubyXL::AExtension - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AExtensionStorageArea.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtensionStorageArea - rubyXL 3.3.12</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AdjustHandleList.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AdjustHandleList - rubyXL 3.3.12</title>
+<title>class RubyXL::AdjustHandleList - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/Alignment.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Alignment - rubyXL 3.3.12</title>
+<title>class RubyXL::Alignment - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AlternateContent.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AlternateContent - rubyXL 3.3.12</title>
+<title>class RubyXL::AlternateContent - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/Authors.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Authors - rubyXL 3.3.12</title>
+<title>class RubyXL::Authors - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AutoFilter.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AutoFilter - rubyXL 3.3.12</title>
+<title>class RubyXL::AutoFilter - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AutoFilterColumn.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AutoFilterColumn - rubyXL 3.3.12</title>
+<title>class RubyXL::AutoFilterColumn - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/BinaryImageFile.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BinaryImageFile - rubyXL 3.3.12</title>
+<title>class RubyXL::BinaryImageFile - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/BodyProperties.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BodyProperties - rubyXL 3.3.12</title>
+<title>class RubyXL::BodyProperties - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/BooleanNode.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BooleanNode - rubyXL 3.3.12</title>
+<title>class RubyXL::BooleanNode - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/BooleanValue.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BooleanValue - rubyXL 3.3.12</title>
+<title>class RubyXL::BooleanValue - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/Border.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Border - rubyXL 3.3.12</title>
+<title>class RubyXL::Border - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/BorderEdge.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BorderEdge - rubyXL 3.3.12</title>
+<title>class RubyXL::BorderEdge - rubyXL 3.3.13</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";