rubyXL 3.3.16 → 3.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbf354d127afcb15c81218739d5a092b8bb41de7
-  data.tar.gz: 504efe47d0b6bd8ec35965fda0db5fdab339c3e5
+  metadata.gz: c12b2b6ae96ad47f96cdad604bb0d44c2c0ef56e
+  data.tar.gz: 2d91e6a5a46351b43e3c5097a390a38d335bc122
 SHA512:
-  metadata.gz: 1ce62590ad386c957c8e68db937b5702fc8aab86a0536414b6134f3c73d2b7db03c8426bb0fd43b77b6da9f6eb46405f798f1f8906bdcb609c7fa823a89b99df
-  data.tar.gz: 5f7c1c4ccca984714f663c79e9485db4e1d98aa49ee637168aa79fe0e2dc74351ae491bfd7ba777a16f78861f8eda6fac398f5de44f9e206d5a644c9f8d3d1d7
+  metadata.gz: 586bb6aafd94543d9de51f2c2ad7ea221b5ee4031511ee24accde0c132d353552c66cbae7070ba6c9505bc9e6dc233c34ae00b950667b81e23e47ed08d28ff33
+  data.tar.gz: 1db751c0394ec398c832e375e6aa4d0843274b97bb73f48e0471d26b725a0728c307e64a0ed5b5502ad84b23878dc931427ec6c86db4405b036344396d0ae880

data/README.rdoc

@@ -29,14 +29,14 @@ Please note that proprietary binary +xls+ format is *not* supported.
   workbook['Sheet1']     # Finds and returns worksheet titled "Sheet1"
 
 ==== Accessing a Row (Array of Cells)
-Please note that worksheets are sparse collections. Your code *must* expect that any row it encounters may be `nil`.
+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>.
 
   worksheet = workbook[0]
   worksheet.sheet_data[0] # Returns first row of the worksheet
   worksheet[0]            # Returns first row of the worksheet
 
 ==== Accessing a Cell object
-Please note that rows are sparse collections. Your code *must* expect that any cell it encounters may be `nil`.
+Please note that row is a _sparse_ array of cells. Your code *must* expect that any cell it plucks from the array may be <tt>nil</tt>.
 
   worksheet = workbook[0]
   worksheet.sheet_data[0][0] # Returns cell A1 in the worksheet
@@ -218,5 +218,5 @@ Take a look at the files in spec/lib/ for rspecs on most methods
 
 == Copyright
 
-Copyright (c) 2011 Vivek Bhagwat, 2013-2015 Wesha.
+Copyright (c) 2011 Vivek Bhagwat, 2013-2016 Wesha.
 See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-3.3.16
+3.3.17

data/lib/rubyXL/convenience_methods.rb

@@ -126,7 +126,7 @@ module RubyXL
     def register_new_fill(new_fill, old_xf)
       new_xf = old_xf.dup
       new_xf.apply_fill = true
-      new_xf.fill_id = fills.find_index { |x| x == new_fill } # Use existing fill, if it exists
+      new_xf.fill_id = fills.find_index { |x| x == new_fill } # Reuse existing fill, if it exists
       new_xf.fill_id ||= fills.size # If this fill has never existed before, add it to collection.
       fills[new_xf.fill_id] = new_fill
       new_xf
@@ -134,50 +134,48 @@ module RubyXL
 
     def register_new_font(new_font, old_xf)
       new_xf = old_xf.dup
-      new_xf.apply_font = true
-      new_xf.font_id = fonts.find_index { |x| x == new_font } # Use existing font, if it exists
+      new_xf.font_id = fonts.find_index { |x| x == new_font } # Reuse existing font, if it exists
       new_xf.font_id ||= fonts.size # If this font has never existed before, add it to collection.
       fonts[new_xf.font_id] = new_font
+      new_xf.apply_font = true
       new_xf
     end
 
     def register_new_xf(new_xf)
-      new_xf_id = cell_xfs.find_index { |xf| xf == new_xf } # Use existing XF, if it exists
+      new_xf_id = cell_xfs.find_index { |xf| xf == new_xf } # Reuse existing XF, if it exists
       new_xf_id ||= cell_xfs.size # If this XF has never existed before, add it to collection.
       cell_xfs[new_xf_id] = new_xf
       new_xf_id
     end
 
     def modify_alignment(style_index, &block)
-      xf = cell_xfs[style_index].dup
+      xf = cell_xfs[style_index || 0].dup
       xf.alignment ||= RubyXL::Alignment.new
-      xf.apply_alignment = true
       yield(xf.alignment)
+      xf.apply_alignment = true
+
       register_new_xf(xf)
     end
 
     def modify_fill(style_index, rgb)
-      xf = cell_xfs[style_index].dup
+      xf = cell_xfs[style_index || 0].dup
       new_fill = RubyXL::Fill.new(:pattern_fill =>
                    RubyXL::PatternFill.new(:pattern_type => 'solid',
                                            :fg_color => RubyXL::Color.new(:rgb => rgb)))
-      new_xf = register_new_fill(new_fill, xf)
-      register_new_xf(new_xf)
+      register_new_xf(register_new_fill(new_fill, xf))
     end
 
     def modify_border(style_index, direction, weight)
-      old_xf = cell_xfs[style_index].dup
-      new_border = borders[old_xf.border_id].dup
+      xf = cell_xfs[style_index || 0].dup
+      new_border = borders[xf.border_id || 0].dup
       new_border.set_edge_style(direction, weight)
 
-      new_xf = old_xf.dup
-      new_xf.apply_border = true
-
-      new_xf.border_id = borders.find_index { |x| x == new_border } # Use existing border, if it exists
-      new_xf.border_id ||= borders.size # If this border has never existed before, add it to collection.
-      borders[new_xf.border_id] = new_border
+      xf.border_id = borders.find_index { |x| x == new_border } # Reuse existing border, if it exists
+      xf.border_id ||= borders.size # If this border has never existed before, add it to collection.
+      borders[xf.border_id] = new_border
+      xf.apply_border = true
 
-      register_new_xf(new_xf)
+      register_new_xf(xf)
     end
 
   end
@@ -268,10 +266,13 @@ module RubyXL
       new_row = add_row(row_index, :cells => new_cells, :style_index => old_row && old_row.style_index)
 
       # Update row values for all rows below
-      row_index.upto(sheet_data.rows.size - 1) { |i|
-        row = sheet_data.rows[i]
+      row_index.upto(sheet_data.rows.size - 1) { |r|
+        row = sheet_data.rows[r]
         next if row.nil?
-        row.cells.each { |c| c.row = i unless c.nil? }
+        row.cells.each_with_index { |cell, c|
+          next if cell.nil?
+          cell.r = RubyXL::Reference.new(r, c)
+        }
       }
 
       return new_row
@@ -406,16 +407,6 @@ module RubyXL
       end
     end
 
-    def get_row_horizontal_alignment(row = 0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_row_alignment` instead."
-      return get_row_alignment(row, true)
-    end
-
-    def get_row_vertical_alignment(row = 0)
-      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please use `get_row_alignment` instead."
-      return get_row_alignment(row, false)
-    end
-
     def get_cols_style_index(column_index)
       validate_nonnegative(column_index)
       range = cols.locate_range(column_index)

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.3.16</title>
+<title>README - rubyXL 3.3.17</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";
@@ -162,8 +162,9 @@ preserving as much of the structure as possible.</p>
 
 <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>
 
-<p>Please note that worksheets are sparse collections. Your code
-<strong>must</strong> expect that any row it encounters may be `nil`.</p>
+<p>Please note that worksheet is a <em>sparse</em> array of rows. Your code
+<strong>must</strong> expect that any row it plucks from the array may be
+<code>nil</code>.</p>
 
 <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-comment"># Returns first row of the worksheet</span>
@@ -172,8 +173,9 @@ preserving as much of the structure as possible.</p>
 
 <h4 id="label-Accessing+a+Cell+object">Accessing a Cell object<span><a href="#label-Accessing+a+Cell+object">&para;</a> <a href="#top">&uarr;</a></span></h4>
 
-<p>Please note that rows are sparse collections. Your code
-<strong>must</strong> expect that any cell it encounters may be `nil`.</p>
+<p>Please note that row is a <em>sparse</em> array of cells. Your code
+<strong>must</strong> expect that any cell it plucks from the array may be
+<code>nil</code>.</p>
 
 <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>
@@ -451,7 +453,7 @@ please isolate to its own commit so I can cherry-pick around it.</p>
 
 <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-2015 Wesha. See LICENSE.txt for
+<p>Copyright © 2011 Vivek Bhagwat, 2013-2016 Wesha. See LICENSE.txt for
 further details.</p>
 </main>
 

data/rdoc/RubyXL.html

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