rubyXL 3.3.10 → 3.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94159159548b151ffb1113f14f2fea84e3e9546a
-  data.tar.gz: 4229e304ccd9cb397c5032d589296c159c1bd850
+  metadata.gz: 1f0204a1f12f767f68d274090700221023e5f04c
+  data.tar.gz: 0043ffb504367b35b4f5b6f9f4c2f12f7fe2ab0d
 SHA512:
-  metadata.gz: 6958a0783b28afda96c5b52d22d5212b17a88ec86fc883ab209bea42cdcfe6b571de1798f65e4e26878bca6e8d2a3198d77444c69e8c00906bf20987726f0144
-  data.tar.gz: c68dade5a9cd9f357ce0b4b6183ceb51ce594ebafaf495fe2f5094b2564c9f39955684174f8e4c001debdfc49b7887891440fa0c93be2f7337f2ebc310d14a19
+  metadata.gz: 14ee274b6fd27f0a7dc5f3b2980cbb4d4082796786e09c4540485bede4f7dab4f44ef65aab8a1ed2f7c6b2915c62c603cd749d2b38c31edafbb00f6313e31e80
+  data.tar.gz: 6afbe933dcb4d9197d57857628fc8afeb42d6fe642ab30ca4c98e53ac23e48c20d9bf50ed6f4a572d20849ba6cbab9e390b7041704470b89d9ffe8a4571f39f2

data/VERSION

@@ -1 +1 @@
-3.3.10
+3.3.11

data/lib/rubyXL/convenience_methods.rb

@@ -569,6 +569,67 @@ module RubyXL
       }
     end
 
+    # Returns 2D array of just the cell values (without style or formula information)
+    def extract_data(args = {})
+      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please access data directly by iterating through .sheet_data.rows"
+      sheet_data.rows.map { |row|
+        row.cells.map { |c| c && c.value(args) } unless row.nil?
+      }
+    end
+
+    def get_table(headers = [], opts = {})
+      warn "[DEPRECATION] `#{__method__}` is deprecated.  Please access data directly by iterating through .sheet_data.rows"
+      validate_workbook
+
+      headers = [headers] unless headers.is_a?(Array)
+      row_num = find_first_row_with_content(headers)
+      return nil if row_num.nil?
+
+      table_hash = {}
+      table_hash[:table] = []
+
+      header_row = sheet_data[row_num]
+      header_row.cells.each_with_index { |header_cell, index|
+        break if index>0 && !opts[:last_header].nil? && !header_row[index-1].nil? && !header_row[index-1].value.nil? && header_row[index-1].value.to_s==opts[:last_header]
+        next if header_cell.nil? || header_cell.value.nil?
+        header = header_cell.value.to_s
+        table_hash[:sorted_headers]||=[]
+        table_hash[:sorted_headers] << header
+        table_hash[header] = []
+
+        original_row = row_num + 1
+        current_row = original_row
+
+        row = sheet_data.rows[current_row]
+        cell = row && row.cells[index]
+
+        # makes array of hashes in table_hash[:table]
+        # as well as hash of arrays in table_hash[header]
+        table_index = current_row - original_row
+        cell_test = (!cell.nil? && !cell.value.nil?)
+
+        while cell_test || (table_hash[:table][table_index] && !table_hash[:table][table_index].empty?)
+          table_hash[header] << cell.value if cell_test
+          table_index = current_row - original_row
+
+          if cell_test then
+            table_hash[:table][table_index] ||= {}
+            table_hash[:table][table_index][header] = cell.value
+          end
+
+          current_row += 1
+          if sheet_data.rows[current_row].nil? then
+            cell = nil
+          else
+            cell = sheet_data.rows[current_row].cells[index]
+          end
+          cell_test = (!cell.nil? && !cell.value.nil?)
+        end
+      }
+
+      return table_hash
+    end
+
   end
 
 

data/lib/rubyXL/objects/text.rb

@@ -24,7 +24,7 @@ module RubyXL
     end
 
     def to_s
-      value.to_s.gsub(ESCAPED_UNICODE) { |m| $1.hex.chr }
+      value.to_s.gsub(ESCAPED_UNICODE) { |m| $1.hex.chr(Encoding::UTF_8) }
     end
   end
 

data/lib/rubyXL/worksheet.rb

@@ -23,65 +23,6 @@ module LegacyWorksheet
     sheet_data.rows.each { |row| yield(row) }
   end
 
-  #returns 2d array of just the cell values (without style or formula information)
-  def extract_data(args = {})
-    sheet_data.rows.map { |row|
-      row.cells.map { |c| c && c.value(args) } unless row.nil?
-    }
-  end
-
-  def get_table(headers = [], opts = {})
-    validate_workbook
-
-    headers = [headers] unless headers.is_a?(Array)
-    row_num = find_first_row_with_content(headers)
-    return nil if row_num.nil?
-
-    table_hash = {}
-    table_hash[:table] = []
-
-    header_row = sheet_data[row_num]
-    header_row.cells.each_with_index { |header_cell, index|
-      break if index>0 && !opts[:last_header].nil? && !header_row[index-1].nil? && !header_row[index-1].value.nil? && header_row[index-1].value.to_s==opts[:last_header]
-      next if header_cell.nil? || header_cell.value.nil?
-      header = header_cell.value.to_s
-      table_hash[:sorted_headers]||=[]
-      table_hash[:sorted_headers] << header
-      table_hash[header] = []
-
-      original_row = row_num + 1
-      current_row = original_row
-
-      row = sheet_data.rows[current_row]
-      cell = row && row.cells[index]
-
-      # makes array of hashes in table_hash[:table]
-      # as well as hash of arrays in table_hash[header]
-      table_index = current_row - original_row
-      cell_test = (!cell.nil? && !cell.value.nil?)
-
-      while cell_test || (table_hash[:table][table_index] && !table_hash[:table][table_index].empty?)
-        table_hash[header] << cell.value if cell_test
-        table_index = current_row - original_row
-
-        if cell_test then
-          table_hash[:table][table_index] ||= {}
-          table_hash[:table][table_index][header] = cell.value
-        end
-
-        current_row += 1
-        if sheet_data.rows[current_row].nil? then
-          cell = nil
-        else
-          cell = sheet_data.rows[current_row].cells[index]
-        end
-        cell_test = (!cell.nil? && !cell.value.nil?)
-      end
-    }
-
-    return table_hash
-  end
-
   # finds first row which contains at least all strings in cells_content
   def find_first_row_with_content(cells_content)
     validate_workbook

data/rdoc/README_rdoc.html

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