rubyXL 3.3.20 → 3.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa670b931e4ed69387c1a10ef05d09b0719e0382
-  data.tar.gz: 3068a13d6761d61a15627e496a326b686dc93f20
+  metadata.gz: f94fc6b7b6d611cb2eecd1874bd470d5bade0f3c
+  data.tar.gz: 98008cf42d8e16856682e9dfcd60c740c1205c2c
 SHA512:
-  metadata.gz: a07c73ae54910c19d05621e13b8dd43e4533c8b44807b8c0f3a7a870ef8f44239161796e8918a6c45ad2b79e4f83377d7883225f6fb90900f13788ecf74b7aba
-  data.tar.gz: 1b72f593f27118b3d4af6263439560c9a96eb845220d90cf397f7f28da0d670ada5dcf95bd478ab23311383cc34e3c8c0b720b9165bd78371b90375a7ac947a8
+  metadata.gz: 6daeb64ab265ad3f575b2da82fc110f2a5eff40b4f0e85b45135ecdbb220d9524242c1df14da1062b9463fe53cd7129efd342f5c1d5aec69f6cb4f14dd2283d3
+  data.tar.gz: 50bc7566f9399a1d2b4c74128a56dc36fd4b9f7c941346e3bbb731d96a64bf4634e76b606c17ea81f4c13fa77bf163589dd1dabedfe1cb5610877ad1f07c24cc

data/VERSION

@@ -1 +1 @@
-3.3.20
+3.3.21

data/lib/rubyXL/objects/relationships.rb

@@ -25,7 +25,7 @@ module RubyXL
 
     attr_accessor :related_files, :owner
 
-    @@debug = nil # Change to 0 to enable debug output
+    @@debug_indent = ($DEBUG ? 0 : nil)
 
     def new_relationship(target, type)
       RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}",
@@ -35,7 +35,8 @@ module RubyXL
     protected :new_relationship
 
     def add_relationship(obj)
-      return if obj.nil? || !defined?(obj.class::REL_TYPE)
+      return if obj.nil? || !defined?(obj.class::REL_TYPE) || (obj.respond_to?(:empty?) && obj.empty?)
+
       relationships << RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}",
                                                 :type => obj.class::REL_TYPE,
                                                 :target => obj.xlsx_path.relative_path_from(owner.xlsx_path.dirname))
@@ -70,7 +71,7 @@ module RubyXL
     def load_related_files(zipdir_path, base_file_name)
       self.related_files = {}
 
-      @@debug += 2 if @@debug
+      @@debug_indent += 2 if @@debug_indent
 
       self.relationships.each { |rel|
         next if rel.target_mode == 'External'
@@ -85,14 +86,14 @@ module RubyXL
           klass = GenericStorageObject
         end
 
-        puts "--> DEBUG:#{'  ' * @@debug}Loading #{klass} (#{rel.id}): #{file_path}" if @@debug
+        puts "--> DEBUG:#{'  ' * @@debug_indent}Loading #{klass} (#{rel.id}): #{file_path}" if @@debug_indent
 
         obj = klass.parse_file(zipdir_path, file_path)
         obj.load_relationships(zipdir_path, file_path) if obj.respond_to?(:load_relationships)
         self.related_files[rel.id] = obj
       }
 
-      @@debug -=2 if @@debug
+      @@debug_indent -=2 if @@debug_indent
 
       related_files
     end
@@ -100,7 +101,7 @@ module RubyXL
     def self.load_relationship_file(zipdir_path, base_file_path)
       rel_file_path = rel_file_path(base_file_path)
 
-      puts "--> DEBUG:  #{'  ' * @@debug}Loading .rel file: #{rel_file_path}" if @@debug
+      puts "--> DEBUG:  #{'  ' * @@debug_indent}Loading .rel file: #{rel_file_path}" if @@debug_indent
 
       parse_file(zipdir_path, rel_file_path)
     end
@@ -162,10 +163,10 @@ module RubyXL
 
       related = []
 
-      res.each { |o|
-        next if o.respond_to?(:empty?) && o.empty?
-        related << o
-        related.concat(o.collect_related_objects) if o.respond_to?(:collect_related_objects)
+      res.each { |obj|
+        next if obj.respond_to?(:empty?) && obj.empty?
+        related << obj
+        related.concat(obj.collect_related_objects) if obj.respond_to?(:collect_related_objects)
       }
 
       related

data/lib/rubyXL/objects/root.rb

@@ -7,7 +7,7 @@ require 'rubyXL/objects/workbook'
 module RubyXL
 
   class WorkbookRoot
-    @@debug = nil
+    @@debug = $DEBUG
 
     attr_accessor :source_file_path, :content_types, :rels_hash
 

data/lib/rubyXL/objects/sheet_data.rb

@@ -74,16 +74,18 @@ module RubyXL
     # Gets massaged value of the cell, converting datatypes to those known to Ruby (that includes
     # stripping any special formatting from RichText).
     def value(args = {})
+      r = self.raw_value
+
       case datatype
-      when RubyXL::DataType::SHARED_STRING then workbook.shared_strings_container[raw_value.to_i].to_s
+      when RubyXL::DataType::SHARED_STRING then workbook.shared_strings_container[r.to_i].to_s
       when RubyXL::DataType::RAW_STRING    then raw_value
       else
-        if is_date? then workbook.num_to_date(raw_value.to_f)
-        elsif raw_value.is_a?(String) && (raw_value =~ /\A-?\d+(\.\d+(?:e[+-]\d+)?)?\Z/i) then # Numeric
-          if $1 then raw_value.to_f
-          else raw_value.to_i
+        if is_date? then workbook.num_to_date(r.to_f)
+        elsif r.is_a?(String) && (r =~ /\A-?\d+((?:\.\d+)?(?:e[+-]?\d+)?)?\Z/i) then # Numeric
+          if $1 != '' then r.to_f
+          else r.to_i
           end
-        else raw_value
+        else r
         end
       end
     end

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.3.20</title>
+<title>README - rubyXL 3.3.21</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 3.3.20</title>
+<title>module RubyXL - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::AExtension - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::AdjustHandleList - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::Alignment - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::AlternateContent - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::Authors - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::AutoFilter - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::AutoFilterColumn - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::BinaryImageFile - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::BodyProperties - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::BooleanNode - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::BooleanValue - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::Border - rubyXL 3.3.21</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.20</title>
+<title>class RubyXL::BorderEdge - rubyXL 3.3.21</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.3.20</title>
+<title>class RubyXL::Borders - rubyXL 3.3.21</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.3.20</title>
+<title>class RubyXL::Break - rubyXL 3.3.21</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.3.20</title>
+<title>class RubyXL::BreakList - rubyXL 3.3.21</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.3.20</title>
+<title>class RubyXL::CT_AdjPoint2D - rubyXL 3.3.21</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.3.20</title>
+<title>class RubyXL::CT_AlphaBiLevelEffect - rubyXL 3.3.21</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.3.20</title>
+<title>class RubyXL::CT_AlphaModulateEffect - rubyXL 3.3.21</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.3.20</title>
+<title>class RubyXL::CT_AlphaModulateFixedEffect - rubyXL 3.3.21</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.3.20</title>
+<title>class RubyXL::CT_AlphaOutsetEffect - rubyXL 3.3.21</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.3.20</title>
+<title>class RubyXL::CT_AlphaReplaceEffect - rubyXL 3.3.21</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.3.20</title>
+<title>class RubyXL::CT_Backdrop - rubyXL 3.3.21</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.3.20</title>
+<title>class RubyXL::CT_Bevel - rubyXL 3.3.21</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.3.20</title>
+<title>class RubyXL::CT_BiLevelEffect - rubyXL 3.3.21</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/CT_BlendEffect.html

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

data/rdoc/RubyXL/CT_Blip.html

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

data/rdoc/RubyXL/CT_BlipFillProperties.html

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

data/rdoc/RubyXL/CT_BlurEffect.html

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

data/rdoc/RubyXL/CT_Camera.html

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

data/rdoc/RubyXL/CT_Color.html

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