rubyXL 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c62e07b347225544af7f7a79ccf03f0ca48947af
-  data.tar.gz: 048bf6cc5c67f5f8f3c46b2a10e07f8c78938065
+  metadata.gz: 984adf8d503f9958c9b90ee180db6011b87dc204
+  data.tar.gz: 93fb594f80bd02bdd3f943e7b3ea910c96e3b056
 SHA512:
-  metadata.gz: 4c07d50da874a34e6ebcba3cdc31810bf5412aaf8220bc46baefbeeb0e2de134b01867eadd4c70697ef8eb161c4b122b76f03042644be55669c98dd5a3bfd6c2
-  data.tar.gz: 1b2717f74996d5b0bdc2a166024f07e64913942bdb5e82fbf1f412e98db4408f7e86aae411836d37e2fc54f899b715664852646a693b7e0807f9cdc8569a54fd
+  metadata.gz: 2bd4bd5694eb73a1a1991163deed41fce2241b3fa2bdf2c7c1bdf47d684c3210fefab6a33c4166c6bb81f5e4fb6ea234f48870a865c5e630e86826d40f009096
+  data.tar.gz: 213cd9f3e86a5d8e00db8071fa25a4c6a3832abd2c79e83054f6de20d06d5574ec05fda471af868e26e5101bd803b5d1367defe457a0d65a438f69d64ebbea78

data/README.rdoc

@@ -88,7 +88,7 @@ Please note: these methods are being phased out in favor of the OOXML object mod
 === Modifying
 
 ==== Adding Worksheets
-  worlsheet = workbook.add_worksheet('Sheet2')
+  worksheet = workbook.add_worksheet('Sheet2')
 
 ==== Adding Cells
   worksheet.add_cell(0, 0, 'A1')      # Sets cell A1 to string "A1"

data/VERSION

@@ -1 +1 @@
-2.4.1
+2.4.2

data/lib/rubyXL/objects/content_types.rb

@@ -44,7 +44,9 @@ module RubyXL
       defaults << RubyXL::ContentTypeDefault.new(:extension => 'xml',
                       :content_type => 'application/xml' )
 
+      # TODO: Need to only write these types when respective content is actually present.
       defaults << RubyXL::ContentTypeDefault.new(:extension => 'jpeg', :content_type => 'image/jpeg' )
+      defaults << RubyXL::ContentTypeDefault.new(:extension => 'png', :content_type => 'image/png' )
 
       self.overrides = []
       overrides << generate_override(workbook)

data/lib/rubyXL/objects/relationships.rb

@@ -85,6 +85,7 @@ module RubyXL
       self.relationships = []
 
       relationships << document_relationship('xl/workbook.xml',   'officeDocument')
+      relationships << metadata_relationship('docProps/thumbnail.jpeg', 'thumbnail') unless @workbook.thumbnail.empty?
       relationships << metadata_relationship('docProps/core.xml', 'core-properties')
       relationships << document_relationship('docProps/app.xml',  'extended-properties')
 

data/lib/rubyXL/objects/simple_types.rb

@@ -134,4 +134,6 @@ module RubyXL
                           red rosyBrown royalBlue saddleBrown salmon sandyBrown seaGreen seaShell sienna
                           silver skyBlue slateBlue slateGray snow springGreen steelBlue tan teal thistle
                           tomato turquoise violet wheat white whiteSmoke yellow yellowGreen }
+
+  ST_PathFillMode = %w{ none norm lighten lightenLess darken darkenLess }
 end

data/lib/rubyXL/objects/theme.rb

@@ -23,7 +23,6 @@ module RubyXL
   end
 
   class AExtensionStorageArea < OOXMLObject
-#FIXME#
     define_child_node(RubyXL::AExtension, :collection => true)
     define_element_name 'a:extLst'
   end
@@ -265,13 +264,45 @@ module RubyXL
     define_element_name 'a:clrScheme'
   end
 
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_SupplementalFont.html
+  class CT_SupplementalFont < OOXMLObject
+    define_attribute(:script,   :string, :required => true)
+    define_attribute(:typeface, :string, :required => true)
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_TextFont.html
+  class CT_TextFont < OOXMLObject
+    define_attribute(:typeface,    :string)
+    define_attribute(:panose,      :string)
+    define_attribute(:pitchFamily, :int, :default => 0)
+    define_attribute(:charset,     :int, :default => 1)
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_FontCollection.html
+  class CT_FontCollection < OOXMLObject
+    define_child_node(RubyXL::CT_TextFont,         :node_name => 'a:latin')
+    define_child_node(RubyXL::CT_TextFont,         :node_name => 'a:ea')
+    define_child_node(RubyXL::CT_TextFont,         :node_name => 'a:cs')
+    define_child_node(RubyXL::CT_SupplementalFont, :node_name => 'a:font', :collection => true)
+    define_child_node(RubyXL::AExtensionStorageArea)
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_fontScheme-1.html
   class FontScheme < OOXMLObject
-#FIXME#
+    define_child_node(RubyXL::CT_FontCollection, :node_name => 'a:majorFont')
+    define_child_node(RubyXL::CT_FontCollection, :node_name => 'a:minorFont')
+    define_child_node(RubyXL::AExtensionStorageArea)
+    define_attribute(:name, :string, :required => true)
     define_element_name 'a:fontScheme'
   end
 
+  # http://www.schemacentral.com/sc/ooxml/e-a_fmtScheme-1.html
   class FormatScheme < OOXMLObject
-#FIXME#
+#    a:fillStyleLst [1..1]    Fill Style List
+#    a:lnStyleLst [1..1]    Line Style List
+#    a:effectStyleLst [1..1]    Effect Style List
+#    a:bgFillStyleLst [1..1]    Background Fill Style List    define_element_name 'a:fontScheme'
+    define_attribute(:name, :string)
     define_element_name 'a:fmtScheme'
   end
 
@@ -316,9 +347,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_avLst-1.html
-  class AdjustValueList < OOXMLContainerObject
+  class CT_GeomGuideList < OOXMLContainerObject
     define_child_node(RubyXL::ShapeGuide, :collection => true)
-    define_element_name 'a:avLst'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_rect-1.html
@@ -330,20 +360,119 @@ module RubyXL
     define_element_name 'a:rect'
   end
 
+  # http://www.schemacentral.com/sc/ooxml/e-a_pos-2.html
+  class CT_AdjPoint2D < OOXMLObject
+    define_attribute(:x, :int, :required => true)
+    define_attribute(:y, :int, :required => true)
+    define_element_name 'a:pos'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_PolarAdjustHandle.html
+  class CT_XYAdjustHandle < OOXMLObject
+    define_child_node(RubyXL::CT_AdjPoint2D)
+    define_attribute(:gdRefX,   :string)
+    define_attribute(:minX,     :int)
+    define_attribute(:maxX,     :int)
+    define_attribute(:gdRefY, :string)
+    define_attribute(:minY,   :int)
+    define_attribute(:maxY,   :int)
+    define_element_name 'a:ahXY'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_PolarAdjustHandle.html
+  class CT_PolarAdjustHandle < OOXMLObject
+    define_child_node(RubyXL::CT_AdjPoint2D)
+    define_attribute(:gdRefR,   :string)
+    define_attribute(:minR,     :int)
+    define_attribute(:maxR,     :int)
+    define_attribute(:gdRefAng, :string)
+    define_attribute(:minAng,   :int)
+    define_attribute(:maxAng,   :int)
+    define_element_name 'a:ahPolar'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_AdjustHandleList.html
+  class AdjustHandleList < OOXMLObject
+    define_child_node(RubyXL::CT_XYAdjustHandle)
+    define_child_node(RubyXL::CT_PolarAdjustHandle)
+    define_element_name 'a:ahLst'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_cxn-1.html
+  class CT_ConnectionSite < OOXMLObject
+    define_child_node(RubyXL::CT_AdjPoint2D)
+    define_attribute(:ang, :int)
+    define_element_name 'a:cxn'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_cxnLst-1.html
+  class CT_ConnectionSiteList < OOXMLContainerObject
+    define_child_node(RubyXL::CT_ConnectionSite, :collection => true)
+    define_element_name 'a:cxnLst'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/t-a_CT_Path2DLineTo.html
+  class CT_Path2DTo < OOXMLContainerObject
+    define_child_node(RubyXL::CT_AdjPoint2D)
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_arcTo-1.html
+  class CT_Path2DArcTo < OOXMLObject
+    define_attribute(:wR,    :int, :required => true)
+    define_attribute(:hR,    :int, :required => true)
+    define_attribute(:stAng, :int, :required => true)
+    define_attribute(:swAng, :int, :required => true)
+    define_element_name 'a:arcTo'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_quadBezTo-1.html
+  class CT_Path2DQuadBezierTo < OOXMLContainerObject
+    define_child_node(RubyXL::CT_AdjPoint2D, :collection => true, :node_name => 'a:pt')
+    define_element_name 'a:quadBezTo'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_quadBezTo-1.html
+  class CT_Path2DCubicBezierTo < OOXMLContainerObject
+    define_child_node(RubyXL::CT_AdjPoint2D, :collection => true, :node_name => 'a:pt')
+    define_element_name 'a:cubicBezTo'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_path-2.html
+  class CT_Path2D < OOXMLObject
+    define_child_node(RubyXL::BooleanValue,           :node_name => 'a:close')
+    define_child_node(RubyXL::CT_Path2DTo,            :node_name => 'a:moveTo')
+    define_child_node(RubyXL::CT_Path2DTo,            :node_name => 'a:lnTo')
+    define_child_node(RubyXL::CT_Path2DArcTo,         :node_name => 'a:arcTo')
+    define_child_node(RubyXL::CT_Path2DQuadBezierTo)
+    define_child_node(RubyXL::CT_Path2DCubicBezierTo)
+    define_attribute(:w,           :int,  :default => 0)
+    define_attribute(:h,           :int,  :default => 0)
+    define_attribute(:fill,        RubyXL::ST_PathFillMode, :default => 'norm')
+    define_attribute(:stroke,      :bool, :default => true)
+    define_attribute(:extrusionOk, :bool, :default => true)
+    define_element_name 'a:cxn'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-a_pathLst-1.html
+  class CT_Path2DList < OOXMLContainerObject
+    define_child_node(RubyXL::CT_Path2D, :collection => true)
+    define_element_name 'a:pathLst'
+  end
+
   # http://www.schemacentral.com/sc/ooxml/e-a_custGeom-1.html
   class CustomGeometry < OOXMLObject
-    define_child_node(RubyXL::AdjustValueList)
-    define_child_node(RubyXL::AdjustValueList, :node_name => 'a:gdLst')
-#        a:ahLst [0..1]    List of Shape Adjust Handles
-#        a:cxnLst [0..1]    List of Shape Connection Sites
+    define_child_node(RubyXL::CT_GeomGuideList, :node_name => 'a:avLst')
+    define_child_node(RubyXL::CT_GeomGuideList, :node_name => 'a:gdLst')
+    define_child_node(RubyXL::AdjustHandleList)
+    define_child_node(RubyXL::CT_ConnectionSiteList)
     define_child_node(RubyXL::ShapeTextRectangle)
-#        a:pathLst [1..1]    List of Shape Paths
+    define_child_node(RubyXL::CT_Path2DList)
     define_element_name 'a:custGeom'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-a_prstGeom-1.html
   class PresetGeometry < OOXMLObject
-    define_child_node(RubyXL::AdjustValueList)
+    define_child_node(RubyXL::CT_GeomGuideList, :node_name => 'a:avLst')
     define_attribute(:prst, RubyXL::ST_ShapeType, :required => true)
     define_element_name 'a:prstGeom'
   end
@@ -406,12 +535,12 @@ module RubyXL
   
   # http://www.schemacentral.com/sc/ooxml/e-a_custClr-1.html
   class CustomColor < OOXMLObject
-#    a:scrgbClr    RGB Color Model - Percentage Variant
-#    a:srgbClr    RGB Color Model - Hex Variant
-#    a:hslClr    Hue, Saturation, Luminance Color Model
-#    a:sysClr    System Color
-#    a:schemeClr    Scheme Color
-#    a:prstClr    Preset Color
+    define_child_node(RubyXL::RGBColorModelPercentage)
+    define_child_node(RubyXL::RGBColorModelHex)
+    define_child_node(RubyXL::HSLColor)
+    define_child_node(RubyXL::SystemColor)
+    define_child_node(RubyXL::SchemeColor)
+    define_child_node(RubyXL::PresetColor)
     define_attribute(:name, :string, :default => '')
     define_element_name 'a:custClr'
   end

data/lib/rubyXL/objects/worksheet.rb

@@ -684,7 +684,7 @@ module RubyXL
           end
 
           row.r = row_index + 1
-          row.spans = "#{first_nonempty_cell + 1}:#{last_nonempty_cell + 1}"
+          row.spans = "#{first_nonempty_cell + 1}:#{last_nonempty_cell + 1}" unless first_nonempty_cell.nil?
           row.custom_format = (row.style_index.to_i != 0)
         }
 

data/lib/rubyXL/parser.rb

@@ -59,6 +59,7 @@ 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.thumbnail.load_file(dir_path, 'thumbnail.jpeg')
 
         wb.theme = RubyXL::Theme.parse_file(dir_path)
         wb.core_properties = RubyXL::CoreProperties.parse_file(dir_path)

data/lib/rubyXL/workbook.rb

@@ -6,7 +6,7 @@ module RubyXL
     include Enumerable
     attr_accessor :worksheets, :filepath, :theme,
       :media, :external_links, :external_links_rels, :drawings, :drawings_rels, :charts, :chart_rels,
-      :worksheet_rels, :chartsheet_rels, :printer_settings, :macros
+      :worksheet_rels, :chartsheet_rels, :printer_settings, :macros, :thumbnail
 
     attr_accessor :stylesheet, :shared_strings_container, :document_properties, :calculation_chain,
                   :relationship_container, :root_relationship_container, :core_properties, :content_types
@@ -40,6 +40,7 @@ module RubyXL
       @chartsheet_rels     = RubyXL::GenericStorage.new(File.join('xl', 'chartsheets', '_rels'))
       @printer_settings    = RubyXL::GenericStorage.new(File.join('xl', 'printerSettings')).binary
       @macros              = RubyXL::GenericStorage.new('xl').binary
+      @thumbnail           = RubyXL::GenericStorage.new('docProps').binary
 
       @theme                    = RubyXL::Theme.new
       @shared_strings_container = RubyXL::SharedStringsTable.new
@@ -112,7 +113,7 @@ module RubyXL
         core_properties.add_to_zip(zipfile)
         content_types.workbook = self
         content_types.add_to_zip(zipfile)
-        relationship_container.workbook = self
+        relationship_container.workbook = root_relationship_container.workbook = self
         relationship_container.add_to_zip(zipfile)
         stylesheet.add_to_zip(zipfile)
         root_relationship_container.add_to_zip(zipfile)
@@ -120,7 +121,7 @@ module RubyXL
 
         [ @media, @external_links, @external_links_rels,
           @drawings, @drawings_rels, @charts, @chart_rels,
-          @printer_settings, @worksheet_rels, @chartsheet_rels, @macros ].each { |s| s.add_to_zip(zipfile) }
+          @printer_settings, @worksheet_rels, @chartsheet_rels, @macros, @thumbnail ].each { |s| s.add_to_zip(zipfile) }
 
         @worksheets.each { |sheet| sheet.add_to_zip(zipfile) }
       }

data/lib/rubyXL/worksheet.rb

@@ -337,8 +337,8 @@ module LegacyWorksheet
       c.column = column
       c.raw_value = data
       c.datatype = (formula || data.is_a?(Numeric)) ? '' : RubyXL::Cell::RAW_STRING
-      c.formula = formula
-
+      c.formula = RubyXL::Formula.new(:expression => formula) if formula
+      
       range = cols && cols.find(column)
       c.style_index = sheet_data.rows[row].style_index || (range && range.style_index) || 0
 

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 2.4.1</title>
+<title>README - rubyXL 2.4.2</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">
@@ -225,7 +225,7 @@ 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>worlsheet = workbook.add_worksheet(&#39;Sheet2&#39;)</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>
 

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 2.4.1</title>
+<title>module RubyXL - rubyXL 2.4.2</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">
@@ -238,6 +238,11 @@
         <dd>
         
       
+        <dt id="ST_PathFillMode">ST_PathFillMode
+        
+        <dd>
+        
+      
         <dt id="ST_PatternType">ST_PatternType
         
         <dd>

data/rdoc/RubyXL/AExtension.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 2.4.1</title>
+<title>class RubyXL::AExtension - rubyXL 2.4.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.4.1</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 2.4.2</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AdjustHandleList.html

@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+<meta charset="UTF-8">
+
+<title>class RubyXL::AdjustHandleList - rubyXL 2.4.2</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>
+
+    
+    
+    
+  </div>
+</nav>
+
+<main role="main" aria-labelledby="class-RubyXL::AdjustHandleList">
+  <h1 id="class-RubyXL::AdjustHandleList" class="class">
+    class RubyXL::AdjustHandleList
+  </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>
+