rubyXL 2.3.4 → 2.4.0

data/lib/rubyXL/objects/workbook.rb

@@ -290,6 +290,7 @@ module RubyXL
     define_child_node(RubyXL::FileVersion)
     define_child_node(RubyXL::FileSharing)
     define_child_node(RubyXL::WorkbookProperties, :accessor => :workbook_properties)
+    define_child_node(RubyXL::AlternateContent) # Somehow, order matters here
     define_child_node(RubyXL::WorkbookProtection)
     define_child_node(RubyXL::WorkbookViews)
     define_child_node(RubyXL::Sheets)
@@ -306,7 +307,6 @@ module RubyXL
     define_child_node(RubyXL::FileRecoveryProperties)
     define_child_node(RubyXL::WebPublishObjects)
     define_child_node(RubyXL::ExtensionStorageArea)
-    define_child_node(RubyXL::AlternateContent)
 
     define_element_name 'workbook'
     set_namespaces('xmlns'     => 'http://schemas.openxmlformats.org/spreadsheetml/2006/main',
@@ -314,6 +314,17 @@ module RubyXL
                    'xmlns:mc'  => 'http://schemas.openxmlformats.org/markup-compatibility/2006',
                    'xmlns:x15' => 'http://schemas.microsoft.com/office/spreadsheetml/2010/11/main')
 
+    def before_write_xml
+      self.sheets = RubyXL::Sheets.new
+
+      worksheets.each_with_index { |sheet, i|
+        rel = relationship_container.find_by_target(sheet.xlsx_path.gsub(/^xl\//, ''))
+        sheets << RubyXL::Sheet.new(:name => sheet.sheet_name, :sheet_id => sheet.sheet_id || (i + 1),
+                                    :state => sheet.state, :r_id => rel.id)
+      }
+      true
+    end
+
     include LegacyWorkbook
 
     def date1904
@@ -352,6 +363,46 @@ module RubyXL
       self.document_properties.app_version.value = v
     end
 
+    def creator
+      self.core_properties.creator
+    end
+
+    def creator=(v)
+      self.core_properties.creator = v
+    end
+
+    def modifier
+      self.core_properties.modifier
+    end
+
+    def modifier=(v)
+      self.core_properties.modifier = v
+    end
+
+    def created_at
+      self.core_properties.created_at
+    end
+
+    def created_at=(v)
+      self.core_properties.created_at = v
+    end
+
+    def modified_at
+      self.core_properties.modified_at
+    end
+
+    def modified_at=(v)
+      self.core_properties.modified_at = v
+    end
+
+    def self.xlsx_path
+      File.join('xl', 'workbook.xml')
+    end
+
+    def self.content_type
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml'
+    end
+
   end
 
 end

data/lib/rubyXL/objects/worksheet.rb

@@ -652,6 +652,8 @@ module RubyXL
                    'xmlns:x14ac' => 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac',
                    'xmlns:mv'    => 'urn:schemas-microsoft-com:mac:vml')
 
+    attr_accessor :state
+
     def before_write_xml # This method may need to be moved higher in the hierarchy
       first_nonempty_row = nil
       last_nonempty_row = 0
@@ -701,10 +703,14 @@ module RubyXL
       @workbook.worksheets.select{ |sheet| sheet.is_a?(self.class) }.index{ |sheet| sheet.equal?(self) }
     end
 
-    def filepath
+    def xlsx_path
       File.join('xl', 'worksheets', "sheet#{sheet_index + 1}.xml")
     end
 
+    def self.content_type
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml'
+    end
+
     def rel_type
       'worksheet'
     end

data/lib/rubyXL/parser.rb

@@ -1,6 +1,6 @@
-require 'rubygems'
 require 'nokogiri'
 require 'tmpdir'
+require 'zip'
 require 'rubyXL/generic_storage'
 
 module RubyXL
@@ -36,11 +36,10 @@ module RubyXL
         }
       }
 
-      workbook_file = Nokogiri::XML.parse(File.open(File.join(dir_path, 'xl', 'workbook.xml'), 'r'))
-
-      wb = RubyXL::Workbook.parse(workbook_file)
+      wb = RubyXL::Workbook.parse_file(dir_path)
       wb.filepath = xl_file_path
 
+      wb.content_types = RubyXL::ContentTypes.parse_file(dir_path)
       wb.relationship_container = RubyXL::WorkbookRelationships.parse_file(dir_path)
       wb.root_relationship_container = RubyXL::RootRelationships.parse_file(dir_path)
 
@@ -56,14 +55,9 @@ module RubyXL
         wb.worksheet_rels.load_dir(dir_path)
         wb.chartsheet_rels.load_dir(dir_path)
         wb.macros.load_file(dir_path, 'vbaProject.bin')
-        wb.theme.load_file(dir_path, 'theme1.xml')
-
-        core_file = Nokogiri::XML.parse(File.open(File.join(dir_path, 'docProps', 'core.xml'), 'r'))
-        wb.creator = core_file.css('dc|creator').children.to_s
-        wb.modifier = core_file.css('cp|last_modified_by').children.to_s
-        wb.created_at = core_file.css('dcterms|created').children.to_s
-        wb.modified_at = core_file.css('dcterms|modified').children.to_s
 
+        wb.theme = RubyXL::Theme.parse_file(dir_path)
+        wb.core_properties = RubyXL::CoreProperties.parse_file(dir_path)
         wb.document_properties = RubyXL::DocumentProperties.parse_file(dir_path)
         wb.calculation_chain = RubyXL::CalculationChain.parse_file(dir_path)
       end
@@ -86,23 +80,24 @@ module RubyXL
       wb.sheets.each_with_index { |sheet, i|
         sheet_rel = wb.relationship_container.find_by_rid(sheet.r_id)
 
-        sheet_file_path = sheet_rel.target
+        sheet_file = File.open(File.join(dir_path, 'xl', 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 = RubyXL::Worksheet.parse(sheet_file)
           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)))
+          sheet_obj = RubyXL::Chartsheet.parse(sheet_file)
         end
 
         sheet_obj.workbook = wb
         sheet_obj.sheet_name = sheet.name
         sheet_obj.sheet_id = sheet.sheet_id
+        sheet_obj.state = sheet.state
 
         wb.worksheets[i] = sheet_obj
       }

data/lib/rubyXL/workbook.rb

@@ -1,21 +1,15 @@
-require 'rubyXL/writer/generic_writer'
-require 'rubyXL/writer/content_types_writer'
-require 'rubyXL/writer/core_writer'
-require 'rubyXL/writer/theme_writer'
-require 'rubyXL/writer/workbook_writer'
-require 'rubyXL/writer/styles_writer'
 require 'tmpdir'
 require 'zip'
 
 module RubyXL
   module LegacyWorkbook
     include Enumerable
-    attr_accessor :worksheets, :filepath, :creator, :modifier, :created_at, :modified_at, :theme,
+    attr_accessor :worksheets, :filepath, :theme,
       :media, :external_links, :external_links_rels, :drawings, :drawings_rels, :charts, :chart_rels,
       :worksheet_rels, :chartsheet_rels, :printer_settings, :macros
 
     attr_accessor :stylesheet, :shared_strings_container, :document_properties, :calculation_chain,
-                  :relationship_container, :root_relationship_container
+                  :relationship_container, :root_relationship_container, :core_properties, :content_types
 
     SHEET_NAME_TEMPLATE = 'Sheet%d'
     APPLICATION = 'Microsoft Macintosh Excel'
@@ -44,13 +38,15 @@ module RubyXL
       @chart_rels          = RubyXL::GenericStorage.new(File.join('xl', 'charts', '_rels'))
       @worksheet_rels      = RubyXL::GenericStorage.new(File.join('xl', 'worksheets', '_rels'))
       @chartsheet_rels     = RubyXL::GenericStorage.new(File.join('xl', 'chartsheets', '_rels'))
-      @theme               = RubyXL::GenericStorage.new(File.join('xl', 'theme'))
       @printer_settings    = RubyXL::GenericStorage.new(File.join('xl', 'printerSettings')).binary
       @macros              = RubyXL::GenericStorage.new('xl').binary
 
+      @theme                    = RubyXL::Theme.new
       @shared_strings_container = RubyXL::SharedStringsTable.new
       @stylesheet               = RubyXL::Stylesheet.default
       @document_properties      = RubyXL::DocumentProperties.new
+      @core_properties          = RubyXL::CoreProperties.new
+      @content_types            = RubyXL::ContentTypes.new
       @relationship_container   = RubyXL::WorkbookRelationships.new
       @root_relationship_container  = RubyXL::RootRelationships.new
       @calculation_chain        = nil
@@ -109,16 +105,18 @@ module RubyXL
       zippath  = File.join(temppath, 'file.zip')
 
       ::Zip::File.open(zippath, ::Zip::File::CREATE) { |zipfile|
-        [ Writer::ContentTypesWriter, Writer::CoreWriter,
-          Writer::ThemeWriter, Writer::WorkbookWriter, Writer::StylesWriter
-        ].each { |writer_class| writer_class.new(self).add_to_zip(zipfile) }
-
+        theme && theme.add_to_zip(zipfile)
         calculation_chain && calculation_chain.add_to_zip(zipfile)
         shared_strings_container && shared_strings_container.add_to_zip(zipfile)
         document_properties.add_to_zip(zipfile)
+        core_properties.add_to_zip(zipfile)
+        content_types.workbook = self
+        content_types.add_to_zip(zipfile)
         relationship_container.workbook = self
         relationship_container.add_to_zip(zipfile)
+        stylesheet.add_to_zip(zipfile)
         root_relationship_container.add_to_zip(zipfile)
+        self.add_to_zip(zipfile)
 
         [ @media, @external_links, @external_links_rels,
           @drawings, @drawings_rels, @charts, @chart_rels,

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 2.3.4</title>
+<title>README - rubyXL 2.4.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.3.4</title>
+<title>module RubyXL - rubyXL 2.4.0</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">
@@ -93,6 +93,11 @@
         <dd>
         
       
+        <dt id="ST_BlackWhiteMode">ST_BlackWhiteMode
+        
+        <dd>
+        
+      
         <dt id="ST_BorderStyle">ST_BorderStyle
         
         <dd>
@@ -263,6 +268,11 @@
         <dd>
         
       
+        <dt id="ST_ShapeType">ST_ShapeType
+        
+        <dd>
+        
+      
         <dt id="ST_SheetViewType">ST_SheetViewType
         
         <dd>

data/rdoc/RubyXL/AExtension.html

@@ -0,0 +1,225 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+<meta charset="UTF-8">
+
+<title>class RubyXL::AExtension - rubyXL 2.4.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="OOXMLObject.html">RubyXL::OOXMLObject</a>
+  
+</div>
+
+    
+    
+    <!-- Method Quickref -->
+<div id="method-list-section" class="nav-section">
+  <h3>Methods</h3>
+
+  <ul class="link-list" role="directory">
+    
+    <li ><a href="#method-c-parse">::parse</a>
+    
+    <li ><a href="#method-i-write_xml">#write_xml</a>
+    
+  </ul>
+</div>
+
+  </div>
+</nav>
+
+<main role="main" aria-labelledby="class-RubyXL::AExtension">
+  <h1 id="class-RubyXL::AExtension" class="class">
+    class RubyXL::AExtension
+  </h1>
+
+  <section class="description">
+    
+<p><a
+href="http://www.schemacentral.com/sc/ooxml/e-a_ext-1.html">www.schemacentral.com/sc/ooxml/e-a_ext-1.html</a></p>
+
+  </section>
+
+  
+  
+  
+  <section id="5Buntitled-5D" class="documentation-section">
+    
+
+    
+
+    
+
+    
+    <section class="attribute-method-details" class="method-section">
+      <header>
+        <h3>Attributes</h3>
+      </header>
+
+      
+      <div id="attribute-i-raw_xml" class="method-detail">
+        <div class="method-heading attribute-method-heading">
+          <span class="method-name">raw_xml</span><span
+            class="attribute-access-type">[RW]</span>
+        </div>
+
+        <div class="method-description">
+        
+        
+        
+        </div>
+      </div>
+      
+    </section>
+    
+
+    
+     <section id="public-class-5Buntitled-5D-method-details" class="method-section">
+       <header>
+         <h3>Public Class Methods</h3>
+       </header>
+
+    
+      <div id="method-c-parse" class="method-detail ">
+        
+        <div class="method-heading">
+          <span class="method-name">parse</span><span
+            class="method-args">(node)</span>
+          
+          <span class="method-click-advice">click to toggle source</span>
+          
+        </div>
+        
+
+        <div class="method-description">
+          
+          
+          
+          
+
+          
+          <div class="method-source-code" id="parse-source">
+            <pre><span class="ruby-comment"># File lib/rubyXL/objects/theme.rb, line 12</span>
+<span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-identifier">node</span>)
+  <span class="ruby-identifier">obj</span> = <span class="ruby-identifier">new</span>
+  <span class="ruby-identifier">obj</span>.<span class="ruby-identifier">raw_xml</span> = <span class="ruby-identifier">node</span>.<span class="ruby-identifier">to_xml</span>
+  <span class="ruby-identifier">obj</span>
+<span class="ruby-keyword">end</span></pre>
+          </div>
+          
+        </div>
+
+        
+
+        
+      </div>
+
+    
+    </section>
+  
+     <section id="public-instance-5Buntitled-5D-method-details" class="method-section">
+       <header>
+         <h3>Public Instance Methods</h3>
+       </header>
+
+    
+      <div id="method-i-write_xml" class="method-detail ">
+        
+        <div class="method-heading">
+          <span class="method-name">write_xml</span><span
+            class="method-args">(xml, node_name_override = nil)</span>
+          
+          <span class="method-click-advice">click to toggle source</span>
+          
+        </div>
+        
+
+        <div class="method-description">
+          
+          
+          
+          
+
+          
+          <div class="method-source-code" id="write_xml-source">
+            <pre><span class="ruby-comment"># File lib/rubyXL/objects/theme.rb, line 18</span>
+<span class="ruby-keyword">def</span> <span class="ruby-identifier">write_xml</span>(<span class="ruby-identifier">xml</span>, <span class="ruby-identifier">node_name_override</span> = <span class="ruby-keyword">nil</span>)
+  <span class="ruby-keyword">self</span>.<span class="ruby-identifier">raw_xml</span>
+<span class="ruby-keyword">end</span></pre>
+          </div>
+          
+        </div>
+
+        
+
+        
+      </div>
+
+    
+    </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>
+