rubyXL 2.2.0 → 2.3.0

data/lib/rubyXL/parser.rb

@@ -82,18 +82,28 @@ module RubyXL
         wb.borders[id].count += 1 #unless id.nil?
       }
 
-      wb.worksheet_container.sheets.each_with_index { |sheet, i|
-        sheet_file_path = wb.relationship_container.find_by_rid(sheet.r_id).target
-        worksheet = RubyXL::Worksheet.parse(File.open(File.join(dir_path, 'xl', sheet_file_path)))
-        worksheet.sheet_data.rows.each { |r|
-          next if r.nil?
-          r.worksheet = worksheet
-          r.cells.each { |c| c.worksheet = worksheet unless c.nil? }
-        }
-        worksheet.workbook = wb
-        worksheet.sheet_name = sheet.name
-        worksheet.sheet_id = sheet.sheet_id
-        wb.worksheets[i] = worksheet
+      wb.sheets.each_with_index { |sheet, i|
+        sheet_rel = wb.relationship_container.find_by_rid(sheet.r_id)
+
+        sheet_file_path = sheet_rel.target
+
+        case File::basename(sheet_rel.type)
+        when 'worksheet' then
+          sheet_obj = RubyXL::Worksheet.parse(File.open(File.join(dir_path, 'xl', sheet_file_path)))
+          sheet_obj.sheet_data.rows.each { |r|
+            next if r.nil?
+            r.worksheet = sheet
+            r.cells.each { |c| c.worksheet = sheet_obj unless c.nil? }
+          }
+        when 'chartsheet' then
+          sheet_obj = RubyXL::Chartsheet.parse(File.open(File.join(dir_path, 'xl', sheet_file_path)))
+        end
+
+        sheet_obj.workbook = wb
+        sheet_obj.sheet_name = sheet.name
+        sheet_obj.sheet_id = sheet.sheet_id
+
+        wb.worksheets[i] = sheet_obj
       }
 
       FileUtils.remove_entry_secure(dir_path)

data/lib/rubyXL/workbook.rb

@@ -5,7 +5,6 @@ require 'rubyXL/writer/core_writer'
 require 'rubyXL/writer/theme_writer'
 require 'rubyXL/writer/workbook_writer'
 require 'rubyXL/writer/styles_writer'
-require 'rubyXL/writer/worksheet_writer'
 require 'tmpdir'
 require 'zip'
 
@@ -124,7 +123,7 @@ module RubyXL
           @drawings, @drawings_rels, @charts, @chart_rels,
           @printer_settings, @worksheet_rels, @chartsheet_rels, @macros ].each { |s| s.add_to_zip(zipfile) }
 
-        @worksheets.each_index { |i| Writer::WorksheetWriter.new(self, i).add_to_zip(zipfile) }
+        @worksheets.each { |sheet| sheet.add_to_zip(zipfile) }
       }
 
       FileUtils.mv(zippath, filepath)
@@ -246,19 +245,19 @@ module RubyXL
     end
 
     def cell_xfs # Stylesheet should be pre-filled with defaults on initialize()
-      stylesheet.cell_xf_container.xfs
+      stylesheet.cell_xfs
     end
 
     def fonts # Stylesheet should be pre-filled with defaults on initialize()
-      stylesheet.font_container.fonts
+      stylesheet.fonts
     end
 
     def fills # Stylesheet should be pre-filled with defaults on initialize()
-      stylesheet.fill_container.fills
+      stylesheet.fills
     end
 
     def borders # Stylesheet should be pre-filled with defaults on initialize()
-      stylesheet.border_container.borders
+      stylesheet.borders
     end
 
     private

data/lib/rubyXL/worksheet.rb

@@ -2,7 +2,7 @@ module RubyXL
 module LegacyWorksheet
   include Enumerable
 
-  attr_accessor :sheet_name, :sheet_id, :validations, :extLst, :workbook
+  attr_accessor :workbook, :sheet_name, :sheet_id
 
   def initialize(params = {})
     super
@@ -316,8 +316,8 @@ module LegacyWorksheet
   def merge_cells(row1 = 0, col1 = 0, row2 = 0, col2 = 0)
     validate_workbook
 
-    self.merged_cells_list ||= RubyXL::MergedCells.new
-    merged_cells_list.merge_cell << RubyXL::MergedCell.new(:ref => RubyXL::Reference.new(row1, row2, col1, col2))
+    self.merged_cells ||= RubyXL::MergedCells.new
+    merged_cells << RubyXL::MergedCell.new(:ref => RubyXL::Reference.new(row1, row2, col1, col2))
   end
 
   def add_row(row = 0, params = {})

data/lib/rubyXL/writer/workbook_writer.rb

@@ -46,9 +46,9 @@ module RubyXL
               })
             end
 
-            if @workbook.defined_name_container && !@workbook.defined_name_container.defined_names.empty? then
+            if @workbook.defined_names && !@workbook.defined_names.empty? then
               root << xml.create_element('definedNames') { |names|
-                @workbook.defined_name_container.defined_names.each { |name| names << name.write_xml(xml) }
+                @workbook.defined_names.each { |name| names << name.write_xml(xml) }
               }
             end
                  

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 2.1.3</title>
+<title>README - rubyXL 2.3.0</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 2.1.3</title>
+<title>module RubyXL - rubyXL 2.3.0</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.1.3</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 2.3.0</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.1.3</title>
+<title>class RubyXL::Alignment - rubyXL 2.3.0</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.1.3</title>
+<title>class RubyXL::AlternateContent - rubyXL 2.3.0</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.1.3</title>
+<title>class RubyXL::AutoFilter - rubyXL 2.3.0</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.1.3</title>
+<title>class RubyXL::AutoFilterColumn - rubyXL 2.3.0</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.1.3</title>
+<title>class RubyXL::BooleanNode - rubyXL 2.3.0</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.1.3</title>
+<title>class RubyXL::BooleanValue - rubyXL 2.3.0</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.1.3</title>
+<title>class RubyXL::Border - rubyXL 2.3.0</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.1.3</title>
+<title>class RubyXL::BorderEdge - rubyXL 2.3.0</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/{FillContainer.html → Borders.html}

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::FillContainer - rubyXL 2.1.3</title>
+<title>class RubyXL::Borders - rubyXL 2.3.0</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">
@@ -61,7 +61,7 @@
   <h3>Parent</h3>
 
   
-  <p class="link">OOXMLObject
+  <p class="link">OOXMLContainerObject
   
 </div>
 
@@ -71,9 +71,9 @@
   </div>
 </nav>
 
-<main role="main" aria-labelledby="class-RubyXL::FillContainer">
-  <h1 id="class-RubyXL::FillContainer" class="class">
-    class RubyXL::FillContainer
+<main role="main" aria-labelledby="class-RubyXL::Borders">
+  <h1 id="class-RubyXL::Borders" class="class">
+    class RubyXL::Borders
   </h1>
 
   <section class="description">

data/rdoc/RubyXL/Break.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Break - rubyXL 2.1.3</title>
+<title>class RubyXL::Break - rubyXL 2.3.0</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.1.3</title>
+<title>class RubyXL::BreakList - rubyXL 2.3.0</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">
@@ -61,7 +61,7 @@
   <h3>Parent</h3>
 
   
-  <p class="link"><a href="OOXMLObject.html">RubyXL::OOXMLObject</a>
+  <p class="link"><a href="OOXMLContainerObject.html">RubyXL::OOXMLContainerObject</a>
   
 </div>
 

data/rdoc/RubyXL/CalculationChain.html

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

data/rdoc/RubyXL/CalculationChainCell.html

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

data/rdoc/RubyXL/CalculationProperties.html

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

data/rdoc/RubyXL/Cell.html

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

data/rdoc/RubyXL/CellSmartTag.html

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

data/rdoc/RubyXL/CellSmartTagProperty.html

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

data/rdoc/RubyXL/CellSmartTags.html

@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+<meta charset="UTF-8">
+
+<title>class RubyXL::CellSmartTags - rubyXL 2.3.0</title>
+
+<link href="../fonts.css" rel="stylesheet">
+<link href="../rdoc.css" rel="stylesheet">
+
+<script type="text/javascript">
+  var rdoc_rel_prefix = "../";
+</script>
+
+<script src="../js/jquery.js"></script>
+<script src="../js/navigation.js"></script>
+<script src="../js/search_index.js"></script>
+<script src="../js/search.js"></script>
+<script src="../js/searcher.js"></script>
+<script src="../js/darkfish.js"></script>
+
+
+<body id="top" role="document" class="class">
+<nav role="navigation">
+  <div id="project-navigation">
+    <div id="home-section" role="region" title="Quick navigation" class="nav-section">
+  <h2>
+    <a href="../index.html" rel="home">Home</a>
+  </h2>
+
+  <div id="table-of-contents-navigation">
+    <a href="../table_of_contents.html#pages">Pages</a>
+    <a href="../table_of_contents.html#classes">Classes</a>
+    <a href="../table_of_contents.html#methods">Methods</a>
+  </div>
+</div>
+
+    <div id="search-section" role="search" class="project-section initially-hidden">
+  <form action="#" method="get" accept-charset="utf-8">
+    <div id="search-field-wrapper">
+      <input id="search-field" role="combobox" aria-label="Search"
+             aria-autocomplete="list" aria-controls="search-results"
+             type="text" name="search" placeholder="Search" spellcheck="false"
+             title="Type to search, Up and Down to navigate, Enter to load">
+    </div>
+
+    <ul id="search-results" aria-label="Search Results"
+        aria-busy="false" aria-expanded="false"
+        aria-atomic="false" class="initially-hidden"></ul>
+  </form>
+</div>
+
+  </div>
+
+  
+
+  <div id="class-metadata">
+    
+    <div id="parent-class-section" class="nav-section">
+  <h3>Parent</h3>
+
+  
+  <p class="link"><a href="OOXMLContainerObject.html">RubyXL::OOXMLContainerObject</a>
+  
+</div>
+
+    
+    
+    
+  </div>
+</nav>
+
+<main role="main" aria-labelledby="class-RubyXL::CellSmartTags">
+  <h1 id="class-RubyXL::CellSmartTags" class="class">
+    class RubyXL::CellSmartTags
+  </h1>
+
+  <section class="description">
+    
+  </section>
+
+  
+  
+  
+  <section id="5Buntitled-5D" class="documentation-section">
+    
+
+    
+
+    
+
+    
+
+    
+  </section>
+</main>
+
+
+<footer id="validator-badges" role="contentinfo">
+  <p><a href="http://validator.w3.org/check/referer">Validate</a>
+  <p>Generated by <a href="http://rdoc.rubyforge.org">RDoc</a> 4.1.1.
+  <p>Based on <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
+</footer>
+