rubyXL 3.4.5 → 3.4.18

data/lib/rubyXL/objects/workbook.rb

@@ -98,7 +98,7 @@ module RubyXL
     define_attribute(:name,            :string, :required => true)
     define_attribute(:sheetId,         :int,    :required => true)
     define_attribute(:state,           RubyXL::ST_Visibility, :default => 'visible')
-    define_attribute(:'r:id',          :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'sheet'
   end
 
@@ -110,7 +110,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_externalReference-1.html
   class ExternalReference < OOXMLObject
-    define_attribute(:'r:id', :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'externalReference'
   end
 
@@ -153,7 +153,7 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_pivotCache-1.html
   class PivotCache < OOXMLObject
     define_attribute(:cacheId, :int,    :required => true)
-    define_attribute(:'r:id',  :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'pivotCache'
   end
 
@@ -299,6 +299,8 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_workbook.html
   class Workbook < OOXMLTopLevelObject
     CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml'
+    CONTENT_TYPE_TEMPLATE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml'
+    CONTENT_TYPE_TEMPLATE_WITH_MACROS = 'application/vnd.ms-excel.template.macroEnabled.main+xml'
     CONTENT_TYPE_WITH_MACROS = 'application/vnd.ms-excel.sheet.macroEnabled.main+xml'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument'
 
@@ -309,7 +311,10 @@ module RubyXL
     include RubyXL::RelationshipSupport
 
     def content_type
-      if macros then CONTENT_TYPE_WITH_MACROS else CONTENT_TYPE end
+      content_type_name = 'CONTENT_TYPE'
+      content_type_name << '_TEMPLATE' if is_template
+      content_type_name << '_WITH_MACROS' if macros
+      self.class.const_get(content_type_name)
     end
 
     def related_objects
@@ -359,6 +364,7 @@ module RubyXL
                    'http://schemas.microsoft.com/office/spreadsheetml/2010/11/main' => 'x15')
 
     attr_accessor :worksheets
+    attr_accessor :is_template
 
     def before_write_xml
       max_sheet_id = worksheets.collect(&:sheet_id).compact.max || 0
@@ -393,8 +399,8 @@ module RubyXL
       dst_file_path ||= root.source_file_path
 
       extension = File.extname(dst_file_path)
-      unless %w{.xlsx .xlsm}.include?(extension.downcase)
-        raise "Unsupported extension: #{extension} (only .xlsx and .xlsm files are supported)."
+      unless %w{.xlsx .xlsm .xltx .xltm}.include?(extension.downcase)
+        raise "Unsupported extension: #{extension} (only .xlsx, .xlsm, .xltx and .xltm files are supported)."
       end
 
       File.open(dst_file_path, "wb") { |output_file| FileUtils.copy_stream(root.stream, output_file) }
@@ -414,16 +420,22 @@ module RubyXL
     private :base_date
 
     def date_to_num(date)
-      date && (date.ajd - base_date().ajd).to_f
+      case date
+      when Date, DateTime then (date.ajd - base_date().ajd).to_f
+      when Time then ((date.to_r - base_date().to_time.to_r) / 86400).to_f
+      end
     end
 
     def num_to_date(num)
+      return nil if num.nil?
+
       # Bug-for-bug Excel compatibility (https://support.microsoft.com/kb/214058/)
-      if num && num < MARCH_1_1900 then
+      if num < MARCH_1_1900 then
         num += 1 unless workbook_properties && workbook_properties.date1904
       end
 
-      num && (base_date + num)
+      dateparts = num.divmod(1)
+      base_date + (dateparts[0] + (dateparts[1] * 86400).round(6) / 86400)
     end
 
     include Enumerable
@@ -432,7 +444,8 @@ module RubyXL
     APPVERSION  = '12.0000'
 
     def initialize(worksheets = [], src_file_path = nil, creator = nil, modifier = nil, created_at = nil,
-                   company = '', application = APPLICATION, appversion = APPVERSION, date1904 = 0)
+                   company = '', application = APPLICATION, appversion = APPVERSION, date1904 = 0,
+                   is_template = false)
       super()
 
       # Order of sheets in the +worksheets+ array corresponds to the order of pages in Excel UI.
@@ -457,6 +470,7 @@ module RubyXL
       self.creator     = creator
       self.modifier    = modifier
       self.date1904    = date1904 > 0
+      self.is_template = is_template
     end
 
     SHEET_NAME_TEMPLATE = 'Sheet%d'

data/lib/rubyXL/objects/worksheet.rb

@@ -88,7 +88,7 @@ module RubyXL
     define_attribute(:horizontalDpi,      :int,    :default => 600)
     define_attribute(:verticalDpi,        :int,    :default => 600)
     define_attribute(:copies,             :int,    :default => 1)
-    define_attribute(:'r:id',             :string)
+    define_relationship
     define_element_name 'pageSetup'
   end
 
@@ -302,7 +302,7 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_hyperlink-1.html
   class Hyperlink < OOXMLObject
     define_attribute(:ref,      :ref,    :required => true)
-    define_attribute(:'r:id',   :string)
+    define_relationship
     define_attribute(:location, :string)
     define_attribute(:tooltip,  :string)
     define_attribute(:display,  :string)
@@ -323,7 +323,7 @@ module RubyXL
     define_attribute(:oleUpdate, RubyXL::ST_OleUpdate)
     define_attribute(:autoLoad,  :bool, :default => false)
     define_attribute(:shapeId,   :int,  :required => true)
-    define_attribute(:'r:id',    :string)
+    define_relationship
     define_element_name 'oleObject'
   end
 
@@ -339,7 +339,7 @@ module RubyXL
     define_attribute(:ref,    :ref)
     define_attribute(:name,   :string)
     define_attribute(:sheet,  :string)
-    define_attribute(:'r:id', :string)
+    define_relationship
     define_element_name 'dataRef'
   end
 
@@ -434,7 +434,7 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_control-1.html
   class EmbeddedControl < OOXMLObject
     define_attribute(:shapeId, :int,    :required => true)
-    define_attribute(:'r:id',  :string, :required => true)
+    define_relationship(:required => true)
     define_attribute(:name,    :string)
     define_element_name 'control'
   end
@@ -490,7 +490,7 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_customPr-1.html
   class CustomProperty < OOXMLObject
     define_attribute(:name,   :string, :required => true)
-    define_attribute(:'r:id', :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'customPr'
   end
 
@@ -572,7 +572,7 @@ module RubyXL
     define_attribute(:previousRow, :uint, :default => 0)
     define_attribute(:previousCol, :uint, :default => 0)
     define_attribute(:click,       :uint, :default => 0)
-    define_attribute(:'r:id',      :string)
+    define_relationship
     define_child_node(RubyXL::PivotArea)
     define_element_name 'pivotSelection'
   end

data/lib/rubyXL/worksheet.rb

@@ -55,6 +55,8 @@ module LegacyWorksheet
         when RubyXL::RichText then
           c.is = data
           c.datatype = RubyXL::DataType::INLINE_STRING
+        when Time, Date, DateTime then
+          c.raw_value = workbook.date_to_num(data)
         when NilClass         then nil
         end
       end

data/rdoc/README_rdoc.html

@@ -4,21 +4,23 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.4.5</title>
+<title>README - rubyXL 3.4.18</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";
   var index_rel_prefix = "./";
 </script>
 
-<script src="./js/jquery.js"></script>
-<script src="./js/darkfish.js"></script>
+<script src="./js/navigation.js" defer></script>
+<script src="./js/search.js" defer></script>
+<script src="./js/search_index.js" defer></script>
+<script src="./js/searcher.js" defer></script>
+<script src="./js/darkfish.js" defer></script>
 
 <link href="./css/fonts.css" rel="stylesheet">
 <link href="./css/rdoc.css" rel="stylesheet">
 
 
-
 <body id="top" role="document" class="file">
 <nav role="navigation">
   <div id="project-navigation">
@@ -94,6 +96,7 @@
     <li><a href="#label-I-2FO">I/O</a>
     <li><a href="#label-Miscellaneous">Miscellaneous</a>
     <li><a href="#label-Suppress+warnings+about+malformed+input+files">Suppress warnings about malformed input files</a>
+    <li><a href="#label-Data+validation+-28colloquially+referred+to+as+-22dropdown+list-22-29">Data validation (colloquially referred to as “dropdown list”)</a>
     <li><a href="#label-For+more+information">For more information</a>
     <li><a href="#label-Contributing+to+rubyXL">Contributing to rubyXL</a>
     <li><a href="#label-Copyright">Copyright</a>
@@ -102,13 +105,12 @@
 
 
   <div id="project-metadata">
-    <div id="fileindex-section" class="nav-section">
+    
+<div id="fileindex-section" class="nav-section">
   <h3>Pages</h3>
 
   <ul class="link-list">
-  
     <li><a href="./README_rdoc.html">README</a>
-  
   </ul>
 </div>
 
@@ -167,7 +169,7 @@
 
 <pre class="ruby"><span class="ruby-identifier">workbook</span>.<span class="ruby-identifier">worksheets</span>[<span class="ruby-value">0</span>] <span class="ruby-comment"># Returns first worksheet</span>
 <span class="ruby-identifier">workbook</span>[<span class="ruby-value">0</span>]            <span class="ruby-comment"># Returns first worksheet</span>
-<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>
+<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;. Note that sheet names in Excel are limited to 31 character.</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>
@@ -186,6 +188,10 @@
 <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">sheet_data</span>[<span class="ruby-value">0</span>][<span class="ruby-value">0</span>] <span class="ruby-comment"># Returns cell A1 in the worksheet</span>
 <span class="ruby-identifier">worksheet</span>[<span class="ruby-value">0</span>][<span class="ruby-value">0</span>]            <span class="ruby-comment"># Returns cell A1 in the worksheet</span>
+
+<span class="ruby-identifier">cell</span> = <span class="ruby-identifier">worksheet</span>[<span class="ruby-value">0</span>][<span class="ruby-value">0</span>]
+<span class="ruby-identifier">cell</span>.<span class="ruby-identifier">value</span>                 <span class="ruby-comment"># Returns a properly converted value in the cell (if the file claims that the cell</span>
+                           <span class="ruby-comment"># is holding a number, returns a respective Integer or Float, and so on).</span>
 </pre>
 
 <h4 id="label-Wrappers+for+accessing+Cell+properties">Wrappers for accessing Cell properties<span><a href="#label-Wrappers+for+accessing+Cell+properties">&para;</a> <a href="#top">&uarr;</a></span></h4>
@@ -429,6 +435,11 @@
 <pre class="ruby"><span class="ruby-constant">RubyXL</span>.<span class="ruby-identifier">class_variable_set</span>(<span class="ruby-value">:@@suppress_warnings</span>, <span class="ruby-keyword">true</span>)
 </pre>
 
+<h2 id="label-Data+validation+-28colloquially+referred+to+as+-22dropdown+list-22-29">Data validation (colloquially referred to as “dropdown list”)<span><a href="#label-Data+validation+-28colloquially+referred+to+as+-22dropdown+list-22-29">&para;</a> <a href="#top">&uarr;</a></span></h2>
+
+<pre class="ruby"><span class="ruby-identifier">worksheet</span>.<span class="ruby-identifier">add_validation_list</span>(<span class="ruby-string">&quot;A1&quot;</span>, [ <span class="ruby-string">&quot;value1&quot;</span>, <span class="ruby-string">&quot;value2&quot;</span> ])
+</pre>
+
 <h2 id="label-For+more+information">For more information<span><a href="#label-For+more+information">&para;</a> <a href="#top">&uarr;</a></span></h2>
 
 <p>Take a look at the files in spec/lib/ for rspecs on most methods</p>
@@ -452,14 +463,15 @@
 
 <h2 id="label-Copyright">Copyright<span><a href="#label-Copyright">&para;</a> <a href="#top">&uarr;</a></span></h2>
 
-<p>Copyright © 2011 Vivek Bhagwat, 2013-2016 Wesha. See LICENSE.txt for further details.</p>
+<p>Copyright © 2011 Vivek Bhagwat, 2013-2021 Wesha. See LICENSE.txt for further details.</p>
+
 </main>
 
 
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="https://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.1.1.
+  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.3.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/rdoc/RubyXL/AExtension.html

@@ -4,21 +4,23 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 3.4.5</title>
+<title>class RubyXL::AExtension - rubyXL 3.4.18</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";
   var index_rel_prefix = "../";
 </script>
 
-<script src="../js/jquery.js"></script>
-<script src="../js/darkfish.js"></script>
+<script src="../js/navigation.js" defer></script>
+<script src="../js/search.js" defer></script>
+<script src="../js/search_index.js" defer></script>
+<script src="../js/searcher.js" defer></script>
+<script src="../js/darkfish.js" defer></script>
 
 <link href="../css/fonts.css" rel="stylesheet">
 <link href="../css/rdoc.css" rel="stylesheet">
 
 
-
 <body id="top" role="document" class="class">
 <nav role="navigation">
   <div id="project-navigation">
@@ -55,26 +57,23 @@
 
   <div id="class-metadata">
     
-    <div id="parent-class-section" class="nav-section">
+    
+<div id="parent-class-section" class="nav-section">
   <h3>Parent</h3>
 
-  
   <p class="link"><a href="OOXMLObject.html">RubyXL::OOXMLObject</a>
-  
 </div>
 
     
     
-    <!-- Method Quickref -->
+    
+<!-- Method Quickref -->
 <div id="method-list-section" class="nav-section">
   <h3>Methods</h3>
 
   <ul class="link-list" role="directory">
-    
     <li ><a href="#method-c-parse">::parse</a>
-    
     <li ><a href="#method-i-write_xml">#write_xml</a>
-    
   </ul>
 </div>
 
@@ -92,21 +91,15 @@
 
   </section>
 
-  
   <section id="5Buntitled-5D" class="documentation-section">
-    
 
-    
 
-    
 
-    
     <section class="attribute-method-details" class="method-section">
       <header>
         <h3>Attributes</h3>
       </header>
 
-      
       <div id="attribute-i-raw_xml" class="method-detail">
         <div class="method-heading attribute-method-heading">
           <span class="method-name">raw_xml</span><span
@@ -115,39 +108,26 @@
 
         <div class="method-description">
         
-        
-        
         </div>
       </div>
-      
     </section>
-    
 
-    
+
      <section id="public-class-5Buntitled-5D-method-details" class="method-section">
        <header>
          <h3>Public Class Methods</h3>
        </header>
 
-    
       <div id="method-c-parse" class="method-detail ">
-        
         <div class="method-heading">
           <span class="method-name">parse</span><span
             class="method-args">(node, ignore)</span>
-          
           <span class="method-click-advice">click to toggle source</span>
-          
         </div>
-        
 
         <div class="method-description">
           
-          
-          
-          
 
-          
           <div class="method-source-code" id="parse-source">
             <pre><span class="ruby-comment"># File lib/rubyXL/objects/theme.rb, line 13</span>
 <span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier ruby-title">parse</span>(<span class="ruby-identifier">node</span>, <span class="ruby-identifier">ignore</span>)
@@ -156,65 +136,48 @@
   <span class="ruby-identifier">obj</span>
 <span class="ruby-keyword">end</span></pre>
           </div>
-          
         </div>
 
-        
 
-        
       </div>
 
-    
     </section>
-  
+
      <section id="public-instance-5Buntitled-5D-method-details" class="method-section">
        <header>
          <h3>Public Instance Methods</h3>
        </header>
 
-    
       <div id="method-i-write_xml" class="method-detail ">
-        
         <div class="method-heading">
           <span class="method-name">write_xml</span><span
             class="method-args">(xml, node_name_override = nil)</span>
-          
           <span class="method-click-advice">click to toggle source</span>
-          
         </div>
-        
 
         <div class="method-description">
           
-          
-          
-          
 
-          
           <div class="method-source-code" id="write_xml-source">
             <pre><span class="ruby-comment"># File lib/rubyXL/objects/theme.rb, line 19</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">write_xml</span>(<span class="ruby-identifier">xml</span>, <span class="ruby-identifier">node_name_override</span> = <span class="ruby-keyword">nil</span>)
   <span class="ruby-keyword">self</span>.<span class="ruby-identifier">raw_xml</span>
 <span class="ruby-keyword">end</span></pre>
           </div>
-          
         </div>
 
-        
 
-        
       </div>
 
-    
     </section>
-  
+
   </section>
 </main>
 
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="https://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.1.1.
+  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.3.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/rdoc/RubyXL/AExtensionStorageArea.html

@@ -4,21 +4,23 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtensionStorageArea - rubyXL 3.4.5</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 3.4.18</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";
   var index_rel_prefix = "../";
 </script>
 
-<script src="../js/jquery.js"></script>
-<script src="../js/darkfish.js"></script>
+<script src="../js/navigation.js" defer></script>
+<script src="../js/search.js" defer></script>
+<script src="../js/search_index.js" defer></script>
+<script src="../js/searcher.js" defer></script>
+<script src="../js/darkfish.js" defer></script>
 
 <link href="../css/fonts.css" rel="stylesheet">
 <link href="../css/rdoc.css" rel="stylesheet">
 
 
-
 <body id="top" role="document" class="class">
 <nav role="navigation">
   <div id="project-navigation">
@@ -55,12 +57,11 @@
 
   <div id="class-metadata">
     
-    <div id="parent-class-section" class="nav-section">
+    
+<div id="parent-class-section" class="nav-section">
   <h3>Parent</h3>
 
-  
   <p class="link"><a href="OOXMLObject.html">RubyXL::OOXMLObject</a>
-  
 </div>
 
     
@@ -78,24 +79,19 @@
     
   </section>
 
-  
   <section id="5Buntitled-5D" class="documentation-section">
-    
 
-    
 
-    
 
-    
 
-    
+
   </section>
 </main>
 
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="https://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.1.1.
+  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.3.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>