rubyXL 3.4.16 → 3.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a9327bd67cd3fe0e2cdd599929207e83fbeee4b2125e7f45d5b1c8c8145e8a9
-  data.tar.gz: 12b4e09b2a6502679c81b95909e3fd59d287880cc9d4cf0fd0705968e68d858d
+  metadata.gz: 51db2d850a23f726d765f58fdaad378dd910becb0e468216095a1473a5770b9c
+  data.tar.gz: 56fbd84fb09a54fe29dcdb6f734c6ade11737d11dbe2130633dccc35999e85cd
 SHA512:
-  metadata.gz: 5e74cdd0607641eb9b17a5cc60410de79da04a6cef796f1e31a96673176e740c2fc76bd26fd229a2d06e150b1adf8105a13516fb192787892ae895c3251b6500
-  data.tar.gz: 06036705f47f89cee9b769d5eb642d44741f714db4c53caedc0fbac7822d3e24968291a2dea2dba908955c798ca6d729d9101157b854266640202bf3e6504499
+  metadata.gz: e8a733f1ba635667d621ae7f02990c0ac4aeac8554b554ed9474c0b28b0e265c2a5e1071be43d6cc968911da58887a78dcedbe6fbae18d79be0fddc9093e1c4c
+  data.tar.gz: 4ac723e0a0508a9f6235e57c702c453dfa01a7941a1a27fe072f4a411bd186cfc76de15150f8a4a4cf80779885e7623012f2d9c3ba6fa30e48bedff262f94bbf

data/Gemfile.lock

@@ -6,10 +6,10 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.4.4)
-    docile (1.3.2)
+    docile (1.3.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.7.0)
+    git (1.8.1)
       rchardet (~> 1.8)
     github_api (0.16.0)
       addressable (~> 2.4.0)
@@ -31,47 +31,51 @@ GEM
       rake
       rdoc
       semver2
-    jwt (2.2.1)
+    jwt (2.2.2)
     mime-types (2.99.3)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (3.2.0)
+    psych (3.3.0)
+    racc (1.5.2)
     rack (2.2.3)
-    rake (13.0.1)
+    rake (13.0.3)
     rchardet (1.8.0)
-    rdoc (6.2.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rdoc (6.3.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby-prof (1.4.1)
+    ruby-prof (1.4.2)
     rubyzip (2.3.0)
     semver2 (3.4.2)
-    simplecov (0.18.5)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     thread_safe (0.3.6)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-3.4.16
+3.4.17

data/lib/rubyXL/convenience_methods/worksheet.rb

@@ -106,6 +106,20 @@ module RubyXL
         }
       }
 
+      # Update merged cells for all rows below
+      self.merged_cells ||= RubyXL::MergedCells.new
+      merged_cells.each { |mc|
+        next if mc.ref.row_range.last < row_index
+
+        in_merged_cell = mc.ref.row_range.first < row_index
+        mc.ref = RubyXL::Reference.new(
+          mc.ref.row_range.first + (in_merged_cell ? 0 : 1),
+          mc.ref.row_range.last + 1,
+          mc.ref.col_range.first,
+          mc.ref.col_range.last,
+        )
+      }
+
       return new_row
     end
 
@@ -121,6 +135,22 @@ module RubyXL
         row && row.cells.each{ |c| c.row -= 1 unless c.nil? }
       }
 
+      # Update row number of merged cells
+      self.merged_cells ||= RubyXL::MergedCells.new
+      merged_cells.delete_if { |mc| mc.ref.row_range == (row_index..row_index) }
+      merged_cells.each { |mc|
+        next if mc.ref.row_range.last < row_index
+
+        in_merged_cell = mc.ref.row_range.first <= row_index
+        mc.ref = RubyXL::Reference.new(
+          mc.ref.row_range.first - (in_merged_cell ? 0 : 1),
+          mc.ref.row_range.last - 1,
+          mc.ref.col_range.first,
+          mc.ref.col_range.last,
+        )
+      }
+      merged_cells.delete_if { |mc| mc.ref.single_cell? }
+
       return deleted
     end
 
@@ -152,6 +182,20 @@ module RubyXL
 
       cols.insert_column(column_index)
 
+      # Update merged cells for all rows below
+      self.merged_cells ||= RubyXL::MergedCells.new
+      merged_cells.each { |mc|
+        next if mc.ref.col_range.last < column_index
+
+        in_merged_cell = mc.ref.row_range.first < column_index
+        mc.ref = RubyXL::Reference.new(
+          mc.ref.row_range.first,
+          mc.ref.row_range.last,
+          mc.ref.col_range.first + (in_merged_cell ? 0 : 1),
+          mc.ref.col_range.last + 1,
+        )
+      }
+
       # TODO: update column numbers
     end
 
@@ -171,6 +215,22 @@ module RubyXL
       }
 
       cols.each { |range| range.delete_column(column_index) }
+
+      # Update row number of merged cells
+      self.merged_cells ||= RubyXL::MergedCells.new
+      merged_cells.delete_if { |mc| mc.ref.col_range == (column_index..column_index) }
+      merged_cells.each { |mc|
+        next if mc.ref.col_range.last < column_index
+
+        in_merged_cell = mc.ref.col_range.first <= column_index
+        mc.ref = RubyXL::Reference.new(
+          mc.ref.row_range.first,
+          mc.ref.row_range.last,
+          mc.ref.col_range.first - (in_merged_cell ? 0 : 1),
+          mc.ref.col_range.last - 1,
+        )
+      }
+      merged_cells.delete_if { |mc| mc.ref.single_cell? }
     end
 
     def get_row_style(row_index)

data/lib/rubyXL/objects/sheet_data.rb

@@ -113,7 +113,8 @@ module RubyXL
       when RubyXL::DataType::INLINE_STRING then is.to_s
       when RubyXL::DataType::RAW_STRING    then raw_value
       else
-        if is_date? then workbook.num_to_date(r.to_f)
+        if is then is.to_s
+        elsif is_date? then workbook.num_to_date(r.to_f)
         elsif r.is_a?(String) && (r =~ NUMBER_REGEXP) then # Numeric
           if $1 != '' then r.to_f
           else r.to_i

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.4.16</title>
+<title>README - rubyXL 3.4.17</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";
@@ -21,8 +21,6 @@
 <link href="./css/rdoc.css" rel="stylesheet">
 
 
-
-
 <body id="top" role="document" class="file">
 <nav role="navigation">
   <div id="project-navigation">
@@ -107,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>
 
@@ -470,7 +467,7 @@
 
 <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.2.1.
+  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.3.0.
   <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.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 3.4.16</title>
+<title>module RubyXL - rubyXL 3.4.17</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";
@@ -21,8 +21,6 @@
 <link href="./css/rdoc.css" rel="stylesheet">
 
 
-
-
 <body id="top" role="document" class="module">
 <nav role="navigation">
   <div id="project-navigation">
@@ -62,14 +60,13 @@
     
     
     
-    <!-- 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-from_root">::from_root</a>
-    
   </ul>
 </div>
 
@@ -89,535 +86,228 @@
 
   </section>
 
-  
   <section id="5Buntitled-5D" class="documentation-section">
-    
 
-    
 
-    
     <section class="constants-list">
       <header>
         <h3>Constants</h3>
       </header>
       <dl>
-      
         <dt id="ST_Axis">ST_Axis
-        
         <dd>
-        
-      
         <dt id="ST_BevelPresetType">ST_BevelPresetType
-        
         <dd>
-        
-      
         <dt id="ST_BlackWhiteMode">ST_BlackWhiteMode
-        
         <dd>
-        
-      
         <dt id="ST_BlendMode">ST_BlendMode
-        
         <dd>
-        
-      
         <dt id="ST_BlipCompression">ST_BlipCompression
-        
         <dd>
-        
-      
         <dt id="ST_BorderStyle">ST_BorderStyle
-        
         <dd>
-        
-      
         <dt id="ST_CalcMode">ST_CalcMode
-        
         <dd>
-        
-      
         <dt id="ST_CalendarType">ST_CalendarType
-        
         <dd>
-        
-      
         <dt id="ST_CellComments">ST_CellComments
-        
         <dd>
-        
-      
         <dt id="ST_CellFormulaType">ST_CellFormulaType
-        
         <dd>
-        
-      
         <dt id="ST_CellType">ST_CellType
-        
         <dd>
-        
-      
         <dt id="ST_CfType">ST_CfType
-        
         <dd>
-        
-      
         <dt id="ST_CfvoType">ST_CfvoType
-        
         <dd>
-        
-      
         <dt id="ST_ColorSchemeIndex">ST_ColorSchemeIndex
-        
         <dd>
-        
-      
         <dt id="ST_Comments">ST_Comments
-        
         <dd>
-        
-      
         <dt id="ST_CompoundLine">ST_CompoundLine
-        
         <dd>
-        
-      
         <dt id="ST_ConditionalFormattingOperator">ST_ConditionalFormattingOperator
-        
         <dd>
-        
-      
         <dt id="ST_CredMethod">ST_CredMethod
-        
         <dd><p><a href="RubyXL/Connections.html"><code>Connections</code></a></p>
-        
-      
         <dt id="ST_DataConsolidateFunction">ST_DataConsolidateFunction
-        
         <dd>
-        
-      
         <dt id="ST_DataValidationErrorStyle">ST_DataValidationErrorStyle
-        
         <dd>
-        
-      
         <dt id="ST_DataValidationImeMode">ST_DataValidationImeMode
-        
         <dd>
-        
-      
         <dt id="ST_DataValidationOperator">ST_DataValidationOperator
-        
         <dd>
-        
-      
         <dt id="ST_DataValidationType">ST_DataValidationType
-        
         <dd>
-        
-      
         <dt id="ST_DateTimeGrouping">ST_DateTimeGrouping
-        
         <dd>
-        
-      
         <dt id="ST_DvAspect">ST_DvAspect
-        
         <dd>
-        
-      
         <dt id="ST_DynamicFilterType">ST_DynamicFilterType
-        
         <dd>
-        
-      
         <dt id="ST_EffectContainerType">ST_EffectContainerType
-        
         <dd>
-        
-      
         <dt id="ST_ExternalConnectionType">ST_ExternalConnectionType
-        
         <dd>
-        
-      
         <dt id="ST_FileType">ST_FileType
-        
         <dd>
-        
-      
         <dt id="ST_FilterOperator">ST_FilterOperator
-        
         <dd>
-        
-      
         <dt id="ST_FontCollectionIndex">ST_FontCollectionIndex
-        
         <dd>
-        
-      
         <dt id="ST_GradientType">ST_GradientType
-        
         <dd>
-        
-      
         <dt id="ST_GrowShrinkType">ST_GrowShrinkType
-        
         <dd><p>Query Tables</p>
-        
-      
         <dt id="ST_HorizontalAlignment">ST_HorizontalAlignment
-        
         <dd>
-        
-      
         <dt id="ST_HtmlFmt">ST_HtmlFmt
-        
         <dd>
-        
-      
         <dt id="ST_IconSetType">ST_IconSetType
-        
         <dd>
-        
-      
         <dt id="ST_LightRigDirection">ST_LightRigDirection
-        
         <dd>
-        
-      
         <dt id="ST_LightRigType">ST_LightRigType
-        
         <dd>
-        
-      
         <dt id="ST_LineCap">ST_LineCap
-        
         <dd>
-        
-      
         <dt id="ST_LineEndLength">ST_LineEndLength
-        
         <dd>
-        
-      
         <dt id="ST_LineEndType">ST_LineEndType
-        
         <dd>
-        
-      
         <dt id="ST_LineEndWidth">ST_LineEndWidth
-        
         <dd>
-        
-      
         <dt id="ST_Objects">ST_Objects
-        
         <dd>
-        
-      
         <dt id="ST_OleUpdate">ST_OleUpdate
-        
         <dd>
-        
-      
         <dt id="ST_Orientation">ST_Orientation
-        
         <dd>
-        
-      
         <dt id="ST_PageOrder">ST_PageOrder
-        
         <dd>
-        
-      
         <dt id="ST_Pane">ST_Pane
-        
         <dd>
-        
-      
         <dt id="ST_PaneState">ST_PaneState
-        
         <dd>
-        
-      
         <dt id="ST_ParameterType">ST_ParameterType
-        
         <dd>
-        
-      
         <dt id="ST_PathFillMode">ST_PathFillMode
-        
         <dd>
-        
-      
         <dt id="ST_PathShadeType">ST_PathShadeType
-        
         <dd>
-        
-      
         <dt id="ST_PatternType">ST_PatternType
-        
         <dd>
-        
-      
         <dt id="ST_PenAlignment">ST_PenAlignment
-        
         <dd>
-        
-      
         <dt id="ST_PhoneticAlignment">ST_PhoneticAlignment
-        
         <dd>
-        
-      
         <dt id="ST_PhoneticType">ST_PhoneticType
-        
         <dd>
-        
-      
         <dt id="ST_PivotAreaType">ST_PivotAreaType
-        
         <dd>
-        
-      
         <dt id="ST_PresetCameraType">ST_PresetCameraType
-        
         <dd>
-        
-      
         <dt id="ST_PresetColorVal">ST_PresetColorVal
-        
         <dd>
-        
-      
         <dt id="ST_PresetLineDashVal">ST_PresetLineDashVal
-        
         <dd>
-        
-      
         <dt id="ST_PresetMaterialType">ST_PresetMaterialType
-        
         <dd>
-        
-      
         <dt id="ST_PresetPatternVal">ST_PresetPatternVal
-        
         <dd>
-        
-      
         <dt id="ST_PresetShadowVal">ST_PresetShadowVal
-        
         <dd>
-        
-      
         <dt id="ST_PrintError">ST_PrintError
-        
         <dd>
-        
-      
         <dt id="ST_Qualifier">ST_Qualifier
-        
         <dd>
-        
-      
         <dt id="ST_RectAlignment">ST_RectAlignment
-        
         <dd>
-        
-      
         <dt id="ST_RefMode">ST_RefMode
-        
         <dd>
-        
-      
         <dt id="ST_SchemeColorVal">ST_SchemeColorVal
-        
         <dd>
-        
-      
         <dt id="ST_ShapeType">ST_ShapeType
-        
         <dd>
-        
-      
         <dt id="ST_SheetViewType">ST_SheetViewType
-        
         <dd>
-        
-      
         <dt id="ST_SmartTagShow">ST_SmartTagShow
-        
         <dd>
-        
-      
         <dt id="ST_SortBy">ST_SortBy
-        
         <dd>
-        
-      
         <dt id="ST_SortMethod">ST_SortMethod
-        
         <dd>
-        
-      
         <dt id="ST_SystemColorVal">ST_SystemColorVal
-        
         <dd>
-        
-      
         <dt id="ST_TargetScreenSize">ST_TargetScreenSize
-        
         <dd>
-        
-      
         <dt id="ST_TextAlignType">ST_TextAlignType
-        
         <dd>
-        
-      
         <dt id="ST_TextAnchoringType">ST_TextAnchoringType
-        
         <dd>
-        
-      
         <dt id="ST_TextAutonumberScheme">ST_TextAutonumberScheme
-        
         <dd>
-        
-      
         <dt id="ST_TextCapsType">ST_TextCapsType
-        
         <dd>
-        
-      
         <dt id="ST_TextFontAlignType">ST_TextFontAlignType
-        
         <dd>
-        
-      
         <dt id="ST_TextHorzOverflowType">ST_TextHorzOverflowType
-        
         <dd>
-        
-      
         <dt id="ST_TextShapeType">ST_TextShapeType
-        
         <dd>
-        
-      
         <dt id="ST_TextStrikeType">ST_TextStrikeType
-        
         <dd>
-        
-      
         <dt id="ST_TextTabAlignType">ST_TextTabAlignType
-        
         <dd>
-        
-      
         <dt id="ST_TextUnderlineType">ST_TextUnderlineType
-        
         <dd>
-        
-      
         <dt id="ST_TextVertOverflowType">ST_TextVertOverflowType
-        
         <dd>
-        
-      
         <dt id="ST_TextVerticalType">ST_TextVerticalType
-        
         <dd>
-        
-      
         <dt id="ST_TextWrappingType">ST_TextWrappingType
-        
         <dd>
-        
-      
         <dt id="ST_TileFlipMode">ST_TileFlipMode
-        
         <dd>
-        
-      
         <dt id="ST_TimePeriod">ST_TimePeriod
-        
         <dd>
-        
-      
         <dt id="ST_UnsignedIntHex">ST_UnsignedIntHex
-        
         <dd><p>TODO: <a href="http://www.datypic.com/sc/ooxml/t-ssml_ST_UnsignedIntHex.html">www.datypic.com/sc/ooxml/t-ssml_ST_UnsignedIntHex.html</a></p>
-        
-      
         <dt id="ST_UnsignedShortHex">ST_UnsignedShortHex
-        
         <dd>
-        
-      
         <dt id="ST_UpdateLinks">ST_UpdateLinks
-        
         <dd>
-        
-      
         <dt id="ST_VectorBaseType">ST_VectorBaseType
-        
         <dd>
-        
-      
         <dt id="ST_VerticalAlignment">ST_VerticalAlignment
-        
         <dd>
-        
-      
         <dt id="ST_Visibility">ST_Visibility
-        
         <dd>
-        
-      
         <dt id="ST_WebSourceType">ST_WebSourceType
-        
         <dd>
-        
-      
         <dt id="ST_Xstring">ST_Xstring
-        
         <dd>
-        
-      
       </dl>
     </section>
-    
 
-    
 
-    
+
      <section id="public-class-5Buntitled-5D-method-details" class="method-section">
        <header>
          <h3>Public Class Methods</h3>
        </header>
 
-    
       <div id="method-c-from_root" class="method-detail ">
-        
         <div class="method-heading">
           <span class="method-name">from_root</span><span
             class="method-args">(path)</span>
-          
           <span class="method-click-advice">click to toggle source</span>
-          
         </div>
-        
 
         <div class="method-description">
-          
           <p>Convert any path passed to absolute path (within the XLSX file).</p>
-          
-          
 
-          
           <div class="method-source-code" id="from_root-source">
             <pre><span class="ruby-comment"># File lib/rubyXL.rb, line 8</span>
 <span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier ruby-title">from_root</span>(<span class="ruby-identifier">path</span>)
@@ -625,25 +315,20 @@
   <span class="ruby-identifier">path</span>.<span class="ruby-identifier">relative_path_from</span>(<span class="ruby-constant">OOXMLTopLevelObject</span><span class="ruby-operator">::</span><span class="ruby-constant">ROOT</span>)
 <span class="ruby-keyword">end</span></pre>
           </div>
-          
         </div>
 
-        
 
-        
       </div>
 
-    
     </section>
-  
-  </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.2.1.
+  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.3.0.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>