rubyXL 2.5.1 → 2.5.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1868f2f48d4cb5ee9e4e7b8fc85adce5ddc1f758
+  data.tar.gz: 3f2c7d3bbd2c6b44e8cc0964800a5eb73d197f43
+SHA512:
+  metadata.gz: 12fff8d8a13e2e69c6a949737758e1387d4ffe7ba1874e91b91fe01bc8b9d4a0e36a26c14d8cdc5e63dffcf1095d52ea19a4432ba14d737db8c486f03864e0e7
+  data.tar.gz: 7f5d6f2352eb067afd6d88aae53fdeca1b39c5d913d136af4cb113e1abda4ded8455d10cf0d7908d70946dacdd40e2bfbdc5668add753a79628fb3d4a4786ed3

data/VERSION

@@ -1 +1 @@
-2.5.1
+2.5.2

data/lib/rubyXL/cell.rb

@@ -1,9 +1,17 @@
 module RubyXL
-  module LegacyCell
+
+  # http://msdn.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.cellvalues(v=office.14).aspx
+  module DataType
     SHARED_STRING = 's'
-    RAW_STRING = 'str'
-    ERROR = 'e'
+    RAW_STRING    = 'str'
+    INLINE_STRING = 'inlineStr'
+    ERROR         = 'e'
+    BOOLEAN       = 'b'
+    NUMBER        = 'n'
+    DATE          = 'd'  # Only available in Office2010.
+  end
 
+  module LegacyCell
     attr_accessor :formula, :worksheet
 
     def workbook
@@ -134,7 +142,7 @@ module RubyXL
     # changes contents of cell, with formula option
     def change_contents(data, formula=nil)
       validate_worksheet
-      self.datatype = RAW_STRING
+      self.datatype = RubyXL::DataType::RAW_STRING
 
       case data
       when Date           then data = workbook.date_to_num(data)

data/lib/rubyXL/objects/content_types.rb

@@ -73,8 +73,15 @@ module RubyXL
       }
 
       workbook.drawings.each_pair { |k, v|
-        overrides << RubyXL::ContentTypeOverride.new(:part_name => "/#{@workbook.drawings.local_dir_path}/#{k}",
-                       :content_type => 'application/vnd.openxmlformats-officedocument.drawing+xml')
+        case k
+        when /.xml$/ then
+          overrides << RubyXL::ContentTypeOverride.new(:part_name => "/#{@workbook.drawings.local_dir_path}/#{k}",
+                         :content_type => 'application/vnd.openxmlformats-officedocument.drawing+xml')
+        when /.vml$/ then
+          # more proper fix: <Default Extension="vml" ContentType="application/vnd.openxmlformats-officedocument.vmlDrawing"/>
+          overrides << RubyXL::ContentTypeOverride.new(:part_name => "/#{@workbook.drawings.local_dir_path}/#{k}",
+                         :content_type => 'application/vnd.openxmlformats-officedocument.vmlDrawing')
+        end
       }
 
       unless workbook.external_links.nil?

data/lib/rubyXL/objects/sheet_data.rb

@@ -68,7 +68,7 @@ module RubyXL
     def value(args = {})
       return raw_value if args[:raw]
       case datatype
-      when RubyXL::Cell::SHARED_STRING then
+      when RubyXL::DataType::SHARED_STRING then
         workbook.shared_strings_container[raw_value.to_i].to_s
       else 
         if is_date? then workbook.num_to_date(raw_value.to_f)

data/lib/rubyXL/workbook.rb

@@ -268,7 +268,7 @@ module RubyXL
       @worksheets.compact.each { |sheet|
         sheet.sheet_data.rows.each { |row|
           row.cells.each { |cell|
-            if cell && cell.value && cell.datatype == RubyXL::Cell::SHARED_STRING then
+            if cell && cell.value && cell.datatype == RubyXL::DataType::SHARED_STRING then
               get_index(cell.value.to_s, :add_if_missing)
             end
           }

data/lib/rubyXL/worksheet.rb

@@ -336,7 +336,7 @@ module LegacyWorksheet
       c.row = row
       c.column = column
       c.raw_value = data
-      c.datatype = (formula || data.is_a?(Numeric)) ? '' : RubyXL::Cell::RAW_STRING
+      c.datatype = RubyXL::DataType::RAW_STRING unless formula || data.is_a?(Numeric)
       c.formula = RubyXL::Formula.new(:expression => formula) if formula
       
       range = cols && cols.find(column)
@@ -432,7 +432,7 @@ module LegacyWorksheet
 
         c = RubyXL::Cell.new(:style_index => old_cell.style_index, :worksheet => self,
                              :row => row_index, :column => column_index,
-                             :datatype => RubyXL::Cell::SHARED_STRING)
+                             :datatype => RubyXL::DataType::SHARED_STRING)
       end
 
       row.insert_cell_shift_right(c, column_index)

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 2.5.1</title>
+<title>README - rubyXL 2.5.2</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">
@@ -124,7 +124,7 @@
 
 <h2 id="label-To+Use%3A">To Use:<span><a href="#label-To+Use%3A">&para;</a> <a href="#documentation">&uarr;</a></span></h2>
 
-<pre class="ruby"><span class="ruby-identifier">require</span> <span class="ruby-string">'rubyXL'</span> <span class="ruby-comment"># Assuming rubygems is already required</span>
+<pre class="ruby"><span class="ruby-identifier">require</span> <span class="ruby-string">&#39;rubyXL&#39;</span> <span class="ruby-comment"># Assuming rubygems is already required</span>
 </pre>
 
 <h3 id="label-Parsing+an+existing+workbook">Parsing an existing workbook<span><a href="#label-Parsing+an+existing+workbook">&para;</a> <a href="#documentation">&uarr;</a></span></h3>
@@ -141,7 +141,7 @@
 
 <pre>workbook.worksheets[0] # Returns first worksheet
 workbook[0]            # Returns first worksheet
-workbook['Sheet1']     # Finds and returns worksheet titled &quot;Sheet1&quot;</pre>
+workbook[&#39;Sheet1&#39;]     # Finds and returns worksheet titled &quot;Sheet1&quot;</pre>
 
 <h4 id="label-Accessing+just+the+values">Accessing just the values<span><a href="#label-Accessing+just+the+values">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
@@ -225,12 +225,12 @@ worksheet.get_column_border_right(0)</pre>
 
 <h4 id="label-Adding+Worksheets">Adding Worksheets<span><a href="#label-Adding+Worksheets">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
-<pre>worksheet = workbook.add_worksheet('Sheet2')</pre>
+<pre>worksheet = workbook.add_worksheet(&#39;Sheet2&#39;)</pre>
 
 <h4 id="label-Adding+Cells">Adding Cells<span><a href="#label-Adding+Cells">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
-<pre>worksheet.add_cell(0, 0, 'A1')      # Sets cell A1 to string &quot;A1&quot;
-worksheet.add_cell(0, 1, '', 'A1')  # Sets formula in the cell B1 to '=A1'</pre>
+<pre>worksheet.add_cell(0, 0, &#39;A1&#39;)      # Sets cell A1 to string &quot;A1&quot;
+worksheet.add_cell(0, 1, &#39;&#39;, &#39;A1&#39;)  # Sets formula in the cell B1 to &#39;=A1&#39;</pre>
 
 <h4 id="label-Changing+Cells">Changing Cells<span><a href="#label-Changing+Cells">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
@@ -240,21 +240,21 @@ worksheet.add_cell(0, 1, '', 'A1')  # Sets formula in the cell B1 to '=A1'</pre>
 
 <pre>worksheet.sheet_data[0][0].change_font_bold(true) # Makes A1 bold
 worksheet.change_row_italics(0,true)              # Makes first row italicized
-worksheet.change_column_font_name(0, 'Courier')   # Makes first column have font Courier</pre>
+worksheet.change_column_font_name(0, &#39;Courier&#39;)   # Makes first column have font Courier</pre>
 
 <h4 id="label-Changing+Fills+++++">Changing Fills     <span><a href="#label-Changing+Fills+++++">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
-<pre>worksheet.sheet_data[0][0].change_fill('0ba53d')  # Sets A1 to have fill #0ba53d
-worksheet.change_row_fill(0, '0ba53d')            # Sets first row to have fill #0ba53d
-worksheet.change_column_fill(0, '0ba53d')         # Sets first column to have fill #0ba53d</pre>
+<pre>worksheet.sheet_data[0][0].change_fill(&#39;0ba53d&#39;)  # Sets A1 to have fill #0ba53d
+worksheet.change_row_fill(0, &#39;0ba53d&#39;)            # Sets first row to have fill #0ba53d
+worksheet.change_column_fill(0, &#39;0ba53d&#39;)         # Sets first column to have fill #0ba53d</pre>
 
 <h4 id="label-Changing+Borders">Changing Borders<span><a href="#label-Changing+Borders">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
 <pre># Possible weights: hairline, thin, medium, thick
 # Possible &quot;directions&quot;: top, bottom, left, right, diagonal
-worksheet.sheet_data[0][0].change_border_top('thin') # Sets A1 to have a top, thin border
-worksheet.change_row_border_left(0, 'hairline')      # Sets first row to have a left, hairline border
-worksheet.change_column_border_diagonal(0, 'medium') # Sets first column to have diagonal, medium border</pre>
+worksheet.sheet_data[0][0].change_border_top(&#39;thin&#39;) # Sets A1 to have a top, thin border
+worksheet.change_row_border_left(0, &#39;hairline&#39;)      # Sets first row to have a left, hairline border
+worksheet.change_column_border_diagonal(0, &#39;medium&#39;) # Sets first column to have diagonal, medium border</pre>
 
 <h4 id="label-Changing+Alignment">Changing Alignment<span><a href="#label-Changing+Alignment">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
@@ -262,17 +262,17 @@ worksheet.change_column_border_diagonal(0, 'medium') # Sets first column to have
 
 <p>center, distributed, justify, left, right</p>
 
-<pre>worksheet.sheet_data[0][0].change_horizontal_alignment('center') # Sets A1 to be centered
-worksheet.change_row_horizontal_alignment(0, 'justify')          # Sets first row to be justified
-worksheet.change_column_horizontal_alignment(0, 'right')         # Sets first column to be right-aligned</pre>
+<pre>worksheet.sheet_data[0][0].change_horizontal_alignment(&#39;center&#39;) # Sets A1 to be centered
+worksheet.change_row_horizontal_alignment(0, &#39;justify&#39;)          # Sets first row to be justified
+worksheet.change_column_horizontal_alignment(0, &#39;right&#39;)         # Sets first column to be right-aligned</pre>
 
 <h5 id="label-Vertical">Vertical<span><a href="#label-Vertical">&para;</a> <a href="#documentation">&uarr;</a></span></h5>
 
 <p>bottom, center, distributed, top</p>
 
-<pre>worksheet.sheet_data[0][0].change_vertical_alignment('bottom')  # Sets A1 to be bottom aligned
-worksheet.change_row_vertical_alignment(0, 'distributed')       # Sets first row to be distributed vertically
-worksheet.change_column_vertical_alignment(0, 'top')            # Sets first column to be top aligned</pre>
+<pre>worksheet.sheet_data[0][0].change_vertical_alignment(&#39;bottom&#39;)  # Sets A1 to be bottom aligned
+worksheet.change_row_vertical_alignment(0, &#39;distributed&#39;)       # Sets first row to be distributed vertically
+worksheet.change_column_vertical_alignment(0, &#39;top&#39;)            # Sets first column to be top aligned</pre>
 
 <h4 id="label-Changing+Row+Height">Changing Row Height<span><a href="#label-Changing+Row+Height">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
@@ -359,8 +359,8 @@ worksheet.delete_cell(0, 0)         # Deletes A1, does not shift cells</pre>
 
 <h3 id="label-Miscellaneous">Miscellaneous<span><a href="#label-Miscellaneous">&para;</a> <a href="#documentation">&uarr;</a></span></h3>
 
-<pre>Reference.ind2ref(0,0) == 'A1'    # Converts row and column index to Excel-style cell reference
-Reference.ref2ind('A1') == [0, 0] # Converts Excel-style cell reference to row and column index</pre>
+<pre>Reference.ind2ref(0,0) == &#39;A1&#39;    # Converts row and column index to Excel-style cell reference
+Reference.ref2ind(&#39;A1&#39;) == [0, 0] # Converts Excel-style cell reference to row and column index</pre>
 
 <h2 id="label-For+more+information">For more information<span><a href="#label-For+more+information">&para;</a> <a href="#documentation">&uarr;</a></span></h2>
 
@@ -368,11 +368,11 @@ Reference.ref2ind('A1') == [0, 0] # Converts Excel-style cell reference to row a
 
 <h2 id="label-Contributing+to+rubyXL">Contributing to rubyXL<span><a href="#label-Contributing+to+rubyXL">&para;</a> <a href="#documentation">&uarr;</a></span></h2>
 <ul><li>
-<p>Check out the latest master to make sure the feature hasn’t been
-implemented or the bug hasn’t been fixed yet</p>
+<p>Check out the latest master to make sure the feature hasn&#39;t been
+implemented or the bug hasn&#39;t been fixed yet</p>
 </li><li>
-<p>Check out the issue tracker to make sure someone already hasn’t requested
-it and/or contributed it</p>
+<p>Check out the issue tracker to make sure someone already hasn&#39;t
+requested it and/or contributed it</p>
 </li><li>
 <p>Fork the project</p>
 </li><li>
@@ -380,8 +380,8 @@ it and/or contributed it</p>
 </li><li>
 <p>Commit and push until you are happy with your contribution</p>
 </li><li>
-<p>Make sure to add tests for it. This is important so I don’t break it in a
-future version unintentionally.</p>
+<p>Make sure to add tests for it. This is important so I don&#39;t break it in
+a future version unintentionally.</p>
 </li><li>
 <p>Please try not to mess with the Rakefile, version, or history. If you want
 to have your own version, or is otherwise necessary, that is fine, but

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 2.5.1</title>
+<title>module RubyXL - rubyXL 2.5.2</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AExtension.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 2.5.1</title>
+<title>class RubyXL::AExtension - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AExtensionStorageArea.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtensionStorageArea - rubyXL 2.5.1</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AdjustHandleList.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AdjustHandleList - rubyXL 2.5.1</title>
+<title>class RubyXL::AdjustHandleList - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/Alignment.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Alignment - rubyXL 2.5.1</title>
+<title>class RubyXL::Alignment - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AlternateContent.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AlternateContent - rubyXL 2.5.1</title>
+<title>class RubyXL::AlternateContent - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AutoFilter.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AutoFilter - rubyXL 2.5.1</title>
+<title>class RubyXL::AutoFilter - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AutoFilterColumn.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AutoFilterColumn - rubyXL 2.5.1</title>
+<title>class RubyXL::AutoFilterColumn - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/BodyProperties.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BodyProperties - rubyXL 2.5.1</title>
+<title>class RubyXL::BodyProperties - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/BooleanNode.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BooleanNode - rubyXL 2.5.1</title>
+<title>class RubyXL::BooleanNode - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/BooleanValue.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BooleanValue - rubyXL 2.5.1</title>
+<title>class RubyXL::BooleanValue - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/Border.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Border - rubyXL 2.5.1</title>
+<title>class RubyXL::Border - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/BorderEdge.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BorderEdge - rubyXL 2.5.1</title>
+<title>class RubyXL::BorderEdge - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/Borders.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Borders - rubyXL 2.5.1</title>
+<title>class RubyXL::Borders - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/Break.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Break - rubyXL 2.5.1</title>
+<title>class RubyXL::Break - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/BreakList.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BreakList - rubyXL 2.5.1</title>
+<title>class RubyXL::BreakList - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/CT_AdjPoint2D.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_AdjPoint2D - rubyXL 2.5.1</title>
+<title>class RubyXL::CT_AdjPoint2D - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/CT_AlphaBiLevelEffect.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_AlphaBiLevelEffect - rubyXL 2.5.1</title>
+<title>class RubyXL::CT_AlphaBiLevelEffect - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/CT_AlphaModulateEffect.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_AlphaModulateEffect - rubyXL 2.5.1</title>
+<title>class RubyXL::CT_AlphaModulateEffect - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/CT_AlphaModulateFixedEffect.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_AlphaModulateFixedEffect - rubyXL 2.5.1</title>
+<title>class RubyXL::CT_AlphaModulateFixedEffect - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/CT_AlphaOutsetEffect.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_AlphaOutsetEffect - rubyXL 2.5.1</title>
+<title>class RubyXL::CT_AlphaOutsetEffect - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/CT_AlphaReplaceEffect.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_AlphaReplaceEffect - rubyXL 2.5.1</title>
+<title>class RubyXL::CT_AlphaReplaceEffect - rubyXL 2.5.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">