rubyXL 3.3.33 → 3.4.0

data/lib/rubyXL/objects/color.rb

@@ -21,9 +21,6 @@ module RubyXL
         raise 'invalid color'
       end
     end
-
-    include ColorConvenienceMethods
   end
 
-  include ColorConvenienceClasses
 end

data/lib/rubyXL/objects/external_links.rb

@@ -16,7 +16,7 @@ module RubyXL
   class DefinedNameExt < OOXMLObject
     define_attribute(:name,     :string, :required => true)
     define_attribute(:refersTo, :string)
-    define_attribute(:sheetId,      :uint)
+    define_attribute(:sheetId,  :uint)
     define_element_name 'definedName'
   end
 

data/lib/rubyXL/objects/font.rb

@@ -1,7 +1,6 @@
 require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/container_nodes'
 require 'rubyXL/objects/color'
-require 'rubyXL/convenience_methods'
 
 module RubyXL
 
@@ -31,8 +30,6 @@ module RubyXL
       self.new(:name => RubyXL::StringValue.new(:val => 'Verdana'),
                :sz   => RubyXL::FloatValue.new(:val => size) )
     end
-
-    include FontConvenienceMethods
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_fonts-1.html

data/lib/rubyXL/objects/sheet_data.rb

@@ -3,7 +3,6 @@ require 'rubyXL/objects/simple_types'
 require 'rubyXL/objects/text'
 require 'rubyXL/objects/formula'
 require 'rubyXL/cell'
-require 'rubyXL/convenience_methods'
 
 module RubyXL
 
@@ -101,7 +100,6 @@ module RubyXL
     end
 
     include LegacyCell
-    include CellConvenienceMethods
   end
 
 #TODO#<row r="1" spans="1:1" x14ac:dyDescent="0.25">

data/lib/rubyXL/objects/workbook.rb

@@ -1,6 +1,5 @@
 #require 'tmpdir'
 require 'date'
-require 'rubyXL/convenience_methods'
 require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/shared_strings'
 require 'rubyXL/objects/stylesheet'
@@ -458,7 +457,101 @@ module RubyXL
       self.date1904    = date1904 > 0
     end
 
-    include WorkbookConvenienceMethods
+    SHEET_NAME_TEMPLATE = 'Sheet%d'
+
+    # Finds worksheet by its name or numerical index
+    def [](ind)
+      case ind
+      when Integer then worksheets[ind]
+      when String  then worksheets.find { |ws| ws.sheet_name == ind }
+      end
+    end
+
+    # Create new simple worksheet and add it to the workbook worksheets
+    #
+    # @param [String] The name for the new worksheet
+    def add_worksheet(name = nil)
+      if name.nil? then
+        n = 0
+
+        begin
+          name = SHEET_NAME_TEMPLATE % (n += 1)
+        end until self[name].nil?
+      end
+
+      new_worksheet = Worksheet.new(:workbook => self, :sheet_name => name)
+      worksheets << new_worksheet
+      new_worksheet
+    end
+
+    def created_at
+      root.core_properties.created_at
+    end
+
+    def created_at=(v)
+      root.core_properties.created_at = v
+    end
+
+    def modified_at
+      root.core_properties.modified_at
+    end
+
+    def modified_at=(v)
+      root.core_properties.modified_at = v
+    end
+
+    def company
+      root.document_properties.company && root.document_properties.company.value
+    end
+
+    def company=(v)
+      root.document_properties.company ||= StringNode.new
+      root.document_properties.company.value = v
+    end
+
+    def application
+      root.document_properties.application && root.document_properties.application.value
+    end
+
+    def application=(v)
+      root.document_properties.application ||= StringNode.new
+      root.document_properties.application.value = v
+    end
+
+    def appversion
+      root.document_properties.app_version && root.document_properties.app_version.value
+    end
+
+    def appversion=(v)
+      root.document_properties.app_version ||= StringNode.new
+      root.document_properties.app_version.value = v
+    end
+
+    def creator
+      root.core_properties.creator
+    end
+
+    def creator=(v)
+      root.core_properties.creator = v
+    end
+
+    def modifier
+      root.core_properties.modifier
+    end
+
+    def modifier=(v)
+      root.core_properties.modifier = v
+    end
+
+    def date1904
+      workbook_properties && workbook_properties.date1904
+    end
+
+    def date1904=(v)
+      self.workbook_properties ||= RubyXL::WorkbookProperties.new
+      workbook_properties.date1904 = v
+    end
+
   end
 
 end

data/lib/rubyXL/objects/worksheet.rb

@@ -11,7 +11,6 @@ require 'rubyXL/objects/filters'
 require 'rubyXL/objects/data_validation'
 require 'rubyXL/objects/comments'
 require 'rubyXL/worksheet'
-require 'rubyXL/convenience_methods'
 
 module RubyXL
 
@@ -743,7 +742,6 @@ module RubyXL
     end
 
     include LegacyWorksheet
-    include WorksheetConvenienceMethods
   end
 
 end

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.3.33</title>
+<title>README - rubyXL 3.4.0</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";
@@ -59,6 +59,7 @@
     <li><a href="#label-rubyXL">rubyXL</a>
     <li><a href="#label-To+Install-3A">To Install:</a>
     <li><a href="#label-To+Use-3A">To Use:</a>
+    <li><a href="#label-Convenience+methods">Convenience methods</a>
     <li><a href="#label-Parsing+an+existing+workbook">Parsing an existing workbook</a>
     <li><a href="#label-Creating+a+new+Workbook">Creating a new Workbook</a>
     <li><a href="#label-Accessing">Accessing</a>
@@ -143,6 +144,28 @@ preserving as much of the structure as possible.</p>
 <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-Convenience+methods">Convenience methods<span><a href="#label-Convenience+methods">&para;</a> <a href="#top">&uarr;</a></span></h3>
+
+<p>Starting with version 3.4.0, the main data structure has been separated
+from the convenience methods that provide access to individual features of
+the <code>xlsx</code> format, in order to decrease the memory footprint. If
+you intend to use these features, you will need to additionally include the
+respective files:</p>
+
+<pre class="ruby"><span class="ruby-identifier">require</span> <span class="ruby-string">&#39;rubyXL/convenience_methods/cell&#39;</span>
+<span class="ruby-identifier">require</span> <span class="ruby-string">&#39;rubyXL/convenience_methods/color&#39;</span>
+<span class="ruby-identifier">require</span> <span class="ruby-string">&#39;rubyXL/convenience_methods/font&#39;</span>
+<span class="ruby-identifier">require</span> <span class="ruby-string">&#39;rubyXL/convenience_methods/workbook&#39;</span>
+<span class="ruby-identifier">require</span> <span class="ruby-string">&#39;rubyXL/convenience_methods/worksheet&#39;</span>
+</pre>
+
+<p>If you do not care about your RAM usage, just include them all at once by
+adding the following line to your code so it can continue operating just as
+before:</p>
+
+<pre class="ruby"><span class="ruby-identifier">require</span> <span class="ruby-string">&#39;rubyXL/convenience_methods&#39;</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="#top">&uarr;</a></span></h3>
 
 <pre class="ruby"><span class="ruby-identifier">workbook</span> = <span class="ruby-constant">RubyXL</span><span class="ruby-operator">::</span><span class="ruby-constant">Parser</span>.<span class="ruby-identifier">parse</span>(<span class="ruby-string">&quot;path/to/Excel/file.xlsx&quot;</span>)

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 3.3.33</title>
+<title>module RubyXL - rubyXL 3.4.0</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";
@@ -62,9 +62,29 @@
   <ul class="link-list">
   
   
+    <li><a class="include" href="RubyXL/CellConvenienceMethods.html">RubyXL::CellConvenienceMethods</a>
+  
+  
+  
+    <li><a class="include" href="RubyXL/ColorConvenienceMethods.html">RubyXL::ColorConvenienceMethods</a>
+  
+  
+  
     <li><a class="include" href="RubyXL/ColorConvenienceClasses.html">RubyXL::ColorConvenienceClasses</a>
   
   
+  
+    <li><a class="include" href="RubyXL/FontConvenienceMethods.html">RubyXL::FontConvenienceMethods</a>
+  
+  
+  
+    <li><a class="include" href="RubyXL/WorkbookConvenienceMethods.html">RubyXL::WorkbookConvenienceMethods</a>
+  
+  
+  
+    <li><a class="include" href="RubyXL/WorksheetConvenienceMethods.html">RubyXL::WorksheetConvenienceMethods</a>
+  
+  
   </ul>
 </div>
 

data/rdoc/RubyXL/AExtension.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 3.3.33</title>
+<title>class RubyXL::AExtension - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 3.4.0</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/ActiveX.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::ActiveX - rubyXL 3.3.33</title>
+<title>class RubyXL::ActiveX - rubyXL 3.4.0</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/ActiveXBinary.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::ActiveXBinary - rubyXL 3.3.33</title>
+<title>class RubyXL::ActiveXBinary - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::AdjustHandleList - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::Alignment - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::AlternateContent - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::Authors - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::AutoFilter - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::AutoFilterColumn - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::BinaryImageFile - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::BodyProperties - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::BooleanNode - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::BooleanValue - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::Border - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::BorderEdge - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::Borders - rubyXL 3.4.0</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.33</title>
+<title>class RubyXL::Break - rubyXL 3.4.0</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";