rubyXL 3.4.6 → 3.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 593bcc2ff2ac0467bf22dbaa6007ad90034e9c195b183983b501c73b0806c384
-  data.tar.gz: 4d5125b5d747c57db950d5e71f018c254c9ce84e20140d37db1f3e4c8bd1d699
+  metadata.gz: 7dc1d501626c62c30bb4f09f1295ae4714e2b4e1afbf5faf7dec93f0569b240b
+  data.tar.gz: bfa3da262ea1846b18bcdae11af54fe8099871caa04be4b511bd08400c7240e0
 SHA512:
-  metadata.gz: b5e5a655ef583cc41f2b9883325d5e3839f646339a8599c6e63602c2721bc9d542e2e928d3393aa6fd8d14dc61bd7565442b48e2d9f0b37cc21686666371be19
-  data.tar.gz: 81e869a33f749afb9dbe044f2973b1d1d763615676bf87b25d61055d81585523131c887ea06299b956b445ff13a18d5a29f1b0ae8f81db3eda2f271221347317
+  metadata.gz: d6103d971a316fbda86d5d1d5aa6f7bcfbbe1e427eaf0bf0d676eb824a37137710ea51190b7a04d802596c36b74b1392d15f99d4a1f9a4229647336dd2567ffd
+  data.tar.gz: ab779fc0c3a90145c40c5017b96c2b29460eb74b16d6c29b5cc6775ac7633d91e9ea4e149aaf27b8cb12d2d78964ef43b9f14fe7836ca17c8a1d1dd5fd8e46ee

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 # Dependencies required to run this gem.
 gem "nokogiri", ">= 1.4.4"
-gem "rubyzip", ">= 1.1.6" , :require => 'zip'
+gem "rubyzip", ">= 1.3.0" , :require => 'zip'
 
 # Development dependencies.
 group :development, :test do

data/Gemfile.lock

@@ -65,7 +65,7 @@ GEM
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby-prof (1.0.0)
-    rubyzip (1.2.3)
+    rubyzip (2.0.0)
     semver2 (3.4.2)
     simplecov (0.17.0)
       docile (~> 1.1)
@@ -85,7 +85,7 @@ DEPENDENCIES
   rspec
   rspec_junit_formatter
   ruby-prof
-  rubyzip (>= 1.1.6)
+  rubyzip (>= 1.3.0)
   simplecov
 
 BUNDLED WITH

data/README.rdoc

@@ -39,7 +39,7 @@ If you do not care about your RAM usage, just include them all at once by adding
 ==== Accessing a Worksheet
   workbook.worksheets[0] # Returns first worksheet
   workbook[0]            # Returns first worksheet
-  workbook['Sheet1']     # Finds and returns worksheet titled "Sheet1"
+  workbook['Sheet1']     # Finds and returns worksheet titled "Sheet1". Note that sheet names in Excel are limited to 31 character.
 
 ==== Accessing a Row (Array of Cells)
 Please note that worksheet is a _sparse_ array of rows. Your code *must* expect that any row it plucks from the array may be <tt>nil</tt>.

data/VERSION

@@ -1 +1 @@
-3.4.6
+3.4.8

data/lib/rubyXL/convenience_methods/cell.rb

@@ -19,6 +19,16 @@ module RubyXL
       self.raw_value = data
     end
 
+    def remove_formula
+      self.formula = nil
+
+      calculation_chain = workbook && workbook.calculation_chain
+      calculation_cells = calculation_chain && calculation_chain.cells
+      calculation_cells && calculation_cells.reject! { |c|
+        c.ref.col_range.c == self.column && c.ref.row_range.begin == self.row
+      }
+    end
+
     def get_border(direction)
       validate_worksheet
       get_cell_border.get_edge_style(direction)

data/lib/rubyXL/objects/sheet_data.rb

@@ -92,7 +92,13 @@ module RubyXL
     end
 
     def is_date?
-      return false unless raw_value =~ NUMBER_REGEXP # Only fully numeric values can be dates
+      return false unless # Only fully numeric values can be dates
+        case raw_value
+        when Numeric then true
+        when String  then raw_value =~ NUMBER_REGEXP
+        else false
+        end
+
       num_fmt = self.number_format
       num_fmt && num_fmt.is_date_format?
     end

data/lib/rubyXL/objects/workbook.rb

@@ -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) }
@@ -432,7 +438,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 +464,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/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.4.6</title>
+<title>README - rubyXL 3.4.8</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";
@@ -167,7 +167,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>

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 3.4.6</title>
+<title>module RubyXL - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::AExtension - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 3.4.8</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/ActiveX.html

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

data/rdoc/RubyXL/ActiveXBinary.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::ActiveXBinary - rubyXL 3.4.6</title>
+<title>class RubyXL::ActiveXBinary - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::AdjustHandleList - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::Alignment - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::AlternateContent - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::Authors - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::AutoFilter - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::AutoFilterColumn - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::BinaryImageFile - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::BodyProperties - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::BooleanNode - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::BooleanValue - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::Border - rubyXL 3.4.8</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.4.6</title>
+<title>class RubyXL::BorderEdge - rubyXL 3.4.8</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/Borders.html

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

data/rdoc/RubyXL/Break.html

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

data/rdoc/RubyXL/BreakList.html

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

data/rdoc/RubyXL/CT_AdjPoint2D.html

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

data/rdoc/RubyXL/CT_AlphaBiLevelEffect.html

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

data/rdoc/RubyXL/CT_AlphaModulateEffect.html

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

data/rdoc/RubyXL/CT_AlphaModulateFixedEffect.html

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

data/rdoc/RubyXL/CT_AlphaOutsetEffect.html

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

data/rdoc/RubyXL/CT_AlphaReplaceEffect.html

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

data/rdoc/RubyXL/CT_Backdrop.html

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

data/rdoc/RubyXL/CT_Bevel.html

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

data/rdoc/RubyXL/CT_BiLevelEffect.html

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