rubyXL 3.3.8 → 3.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5daa2e0394f1a8106bafd34398d86788c0322ad8
-  data.tar.gz: 2a0d2c9fec0ff590b314524e647fd474ecdeab14
+  metadata.gz: ed8ad53622e5c272c9b92f010215eb55b5fecc5d
+  data.tar.gz: 32489bee10dcd001fdc4e2ab90db1499211ddb52
 SHA512:
-  metadata.gz: e68fd0e98a128bf5714301021ac90fa5b66e2e79cc1a11824577c169b6dd06aa4300b3ef2c340cbb15d170015fde8105ec799277fc3a3c485b16d1038000bdec
-  data.tar.gz: fba1622a295891df45ce12ccb1d60d7229a3b4a78051b17c3f920ed9bed56def868dc6104f331632b41454bbac63025835dc6b2dadbdc32edf051589db48f113
+  metadata.gz: 225ab3cda1f9c73d70392050dfc47c85921d22bd13a6e30bc4c0d5c8cf64cd50941548425389e2926e17c348eff7ad7d04cb98b8612001f10a09029cf74198dc
+  data.tar.gz: 916a42cdc1e7261c26239b971e16db3a9ad2e2542cdeae0eba5ed06a04c196dd6c365b6be5574c8825d111776eab77a1a0b1ae902991452282ca11921624c54f

data/VERSION

@@ -1 +1 @@
-3.3.8
+3.3.9

data/lib/rubyXL/cell.rb

@@ -96,31 +96,6 @@ module RubyXL
     end
     private :update_font_references
 
-    def change_contents(data, formula_expression = nil)
-      validate_worksheet
-
-      if formula_expression then
-        self.datatype = nil
-        self.formula = RubyXL::Formula.new(:expression => formula_expression)
-      else
-        self.datatype = case data
-                        when Date, Numeric then nil
-                        else RubyXL::DataType::RAW_STRING
-                        end
-      end
-
-      data = workbook.date_to_num(data) if data.is_a?(Date)
-
-      self.raw_value = data
-    end
-
-    def inspect
-      str = "#<#{self.class}(#{row},#{column}): #{raw_value.inspect}"
-      str += " =#{self.formula.expression}" if self.formula
-      str += ", datatype = #{self.datatype}, style_index = #{self.style_index}>"
-      return str
-    end
-
     # Performs correct modification based on what type of change_type is specified
     def font_switch(change_type, arg)
       case change_type

data/lib/rubyXL/convenience_methods.rb

@@ -574,6 +574,24 @@ module RubyXL
 
   module CellConvenienceMethods
 
+    def change_contents(data, formula_expression = nil)
+      validate_worksheet
+
+      if formula_expression then
+        self.datatype = nil
+        self.formula = RubyXL::Formula.new(:expression => formula_expression)
+      else
+        self.datatype = case data
+                        when Date, Numeric then nil
+                        else RubyXL::DataType::RAW_STRING
+                        end
+      end
+
+      data = workbook.date_to_num(data) if data.is_a?(Date)
+
+      self.raw_value = data
+    end
+
     def get_border(direction)
       validate_worksheet
       get_cell_border.get_edge_style(direction)

data/lib/rubyXL/objects/comments.rb

@@ -15,13 +15,13 @@ module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_authors-1.html
   class CommentList < OOXMLContainerObject
-    define_child_node(RubyXL::Comment, :collection => :true)
+    define_child_node(RubyXL::Comment, :collection => true)
     define_element_name 'commentList'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_authors-1.html
   class Authors < OOXMLContainerObject
-    define_child_node(RubyXL::StringNode, :node_name => :author, :collection => :true)
+    define_child_node(RubyXL::StringNode, :node_name => :author, :collection => true)
     define_element_name 'authors'
   end
 

data/lib/rubyXL/objects/sheet_common.rb

@@ -5,12 +5,12 @@ module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_webPublishItem-1.html
   class WebPublishingItem < OOXMLObject
-    define_attribute(:id,              :int,    :required => :true)
-    define_attribute(:divId,           :int,    :required => :true)
-    define_attribute(:sourceType,      RubyXL::ST_WebSourceType, :required => :true)
+    define_attribute(:id,              :int,    :required => true)
+    define_attribute(:divId,           :int,    :required => true)
+    define_attribute(:sourceType,      RubyXL::ST_WebSourceType, :required => true)
     define_attribute(:sourceRef,       :ref)
     define_attribute(:sourceObject,    :string)
-    define_attribute(:destinationFile, :string, :required => :true)
+    define_attribute(:destinationFile, :string, :required => true)
     define_attribute(:title,           :string)
     define_attribute(:autoRepublish,   :bool,   :default => false)
     define_element_name 'webPublishItem'

data/lib/rubyXL/objects/sheet_data.rb

@@ -74,21 +74,29 @@ module RubyXL
     # Gets massaged value of the cell, converting datatypes to those known to Ruby (that includes
     # stripping any special formatting from RichText).
     def value(args = {})
-      return raw_value if args[:raw]
-      case datatype
-      when RubyXL::DataType::SHARED_STRING then
+      if args[:raw] then
+        warn "[DEPRECATION] option :raw to `#{__method__}` is deprecated. Please use `raw_value` instead."
+        raw_value
+      elsif datatype == 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)
-        elsif raw_value.is_a?(String) && (raw_value =~ /\A-?\d+(\.\d+(?:e[+-]\d+)?)?\Z/i) # Numeric
-          if $1 then raw_value.to_f
-          else raw_value.to_i
-          end
-        else raw_value
+      elsif is_date? then
+        workbook.num_to_date(raw_value.to_f)
+      elsif raw_value.is_a?(String) && (raw_value =~ /\A-?\d+(\.\d+(?:e[+-]\d+)?)?\Z/i) # Numeric
+        if $1 then raw_value.to_f
+        else raw_value.to_i
         end
+      else
+        raw_value
       end
     end
 
+    def inspect
+      str = "#<#{self.class}(#{row},#{column}): #{raw_value.inspect}"
+      str += " =#{self.formula.expression}" if self.formula
+      str += ", datatype=#{self.datatype.inspect}, style_index=#{self.style_index.inspect}>"
+      return str
+    end
+
     include LegacyCell
     include CellConvenienceMethods
   end

data/lib/rubyXL/objects/stylesheet.rb

@@ -136,18 +136,18 @@ module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_colors-1.html
   class ColorSet < OOXMLObject
-    define_child_node(RubyXL::Color, :collection => :true)
+    define_child_node(RubyXL::Color, :collection => true)
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_colors-1.html
   class IndexedColors < OOXMLContainerObject
-    define_child_node(RubyXL::Color, :collection => :true, :node_name => :rgbColor)
+    define_child_node(RubyXL::Color, :collection => true, :node_name => :rgbColor)
     define_element_name 'indexedColors'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_mruColors-1.html
   class MRUColors < OOXMLContainerObject
-    define_child_node(RubyXL::Color, :collection => :true)
+    define_child_node(RubyXL::Color, :collection => true)
     define_element_name 'mruColors'
   end
 

data/lib/rubyXL/objects/workbook.rb

@@ -242,7 +242,7 @@ module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_smartTagTypes-1.html
   class SmartTagTypes < OOXMLContainerObject
-    define_child_node(RubyXL::SmartTagType, :collection => :true)
+    define_child_node(RubyXL::SmartTagType, :collection => true)
     define_element_name 'smartTagTypes'
   end
 
@@ -255,7 +255,7 @@ module RubyXL
   # http://www.schemacentral.com/sc/ooxml/e-ssml_functionGroups-1.html
   class FunctionGroups < OOXMLContainerObject
     define_attribute(:builtInGroupCountpi, :int, :default => 16)
-    define_child_node(RubyXL::FunctionGroup, :collection => :true)
+    define_child_node(RubyXL::FunctionGroup, :collection => true)
     define_element_name 'functionGroups'
   end
 

data/lib/rubyXL/objects/worksheet.rb

@@ -127,7 +127,7 @@ module RubyXL
   # http://www.schemacentral.com/sc/ooxml/e-ssml_protectedRange-1.html
   class ProtectedRange < OOXMLObject
     define_attribute(:password,           :string)
-    define_attribute(:sqref,              :sqref, :required => true)
+    define_attribute(:sqref,              :sqref,  :required => true)
     define_attribute(:name,               :string, :required => true)
     define_attribute(:securityDescriptor, :string)
     define_element_name 'protectedRange'
@@ -201,7 +201,7 @@ module RubyXL
   class ConditionalFormattingRule < OOXMLObject
     define_attribute(:type,         RubyXL::ST_CfType)
     define_attribute(:dxfId,        :int)
-    define_attribute(:priority,     :int,    :required => 1)
+    define_attribute(:priority,     :int,    :required => true)
     define_attribute(:stopIfTrue,   :bool,   :default  => false)
     define_attribute(:aboveAverage, :bool,   :default  => true)
     define_attribute(:percent,      :bool,   :default  => false)
@@ -237,7 +237,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_conditionalFormatting-1.html
-  class ConditionalFormatting < OOXMLContainerObject
+  class ConditionalFormatting < OOXMLObject
     define_attribute(:pivot, :bool, :default => false)
     define_attribute(:sqref, :sqref)
     define_child_node(RubyXL::ConditionalFormattingRule, :collection => true)
@@ -321,7 +321,7 @@ module RubyXL
     define_attribute(:link, :string)
     define_attribute(:oleUpdate, RubyXL::ST_OleUpdate)
     define_attribute(:autoLoad,  :bool, :default => false)
-    define_attribute(:shapeId,   :int, :required => true)
+    define_attribute(:shapeId,   :int,  :required => true)
     define_attribute(:'r:id',    :string)
     define_element_name 'oleObject'
   end
@@ -432,8 +432,8 @@ module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_control-1.html
   class EmbeddedControl < OOXMLObject
-    define_attribute(:shapeId, :int,    :required => :true)
-    define_attribute(:'r:id',  :string, :required => :true)
+    define_attribute(:shapeId, :int,    :required => true)
+    define_attribute(:'r:id',  :string, :required => true)
     define_attribute(:name,    :string)
     define_element_name 'control'
   end
@@ -459,43 +459,43 @@ module RubyXL
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_cellSmartTagPr-1.html
   class CellSmartTagProperty < OOXMLObject
-    define_attribute(:key, :string, :required => :true)
-    define_attribute(:val, :string, :required => :true)
+    define_attribute(:key, :string, :required => true)
+    define_attribute(:val, :string, :required => true)
     define_element_name 'cellSmartTagPr'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_cellSmartTag-1.html
   class CellSmartTag < OOXMLObject
-    define_attribute(:type,     :int,  :required => :true)
+    define_attribute(:type,     :int,  :required => true)
     define_attribute(:deleted,  :bool, :default => false)
     define_attribute(:xmlBased, :bool, :default => false)
-    define_child_node(RubyXL::CellSmartTagProperty, :collection => :true, :accessor => :smart_tag_props)
+    define_child_node(RubyXL::CellSmartTagProperty, :collection => true, :accessor => :smart_tag_props)
     define_element_name 'cellSmartTag'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_cellSmartTags-1.html
   class CellSmartTags < OOXMLContainerObject
     define_attribute(:r, :ref, :accessor => :ref)
-    define_child_node(RubyXL::CellSmartTag, :collection => :true)
+    define_child_node(RubyXL::CellSmartTag, :collection => true)
     define_element_name 'cellSmartTags'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_smartTags-1.html
   class SmartTags < OOXMLContainerObject
-    define_child_node(RubyXL::CellSmartTags, :collection => :true)
+    define_child_node(RubyXL::CellSmartTags, :collection => true)
     define_element_name 'smartTags'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_customPr-1.html
   class CustomProperty < OOXMLObject
-    define_attribute(:name,   :string, :required => :true)
-    define_attribute(:'r:id', :string, :required => :true)
+    define_attribute(:name,   :string, :required => true)
+    define_attribute(:'r:id', :string, :required => true)
     define_element_name 'customPr'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_customProperties-1.html
   class CustomProperties < OOXMLContainerObject
-    define_child_node(RubyXL::CustomProperty, :collection => :true)
+    define_child_node(RubyXL::CustomProperty, :collection => true)
     define_element_name 'customProperties'
   end
 
@@ -647,17 +647,17 @@ module RubyXL
     define_child_node(RubyXL::SortState)
     define_child_node(RubyXL::DataConsolidate)
     define_child_node(RubyXL::CustomSheetViews)
-    define_child_node(RubyXL::MergedCells, :accessor => :merged_cells)
+    define_child_node(RubyXL::MergedCells,           :accessor => :merged_cells)
     define_child_node(RubyXL::PhoneticProperties)
-    define_child_node(RubyXL::ConditionalFormatting)
+    define_child_node(RubyXL::ConditionalFormatting, :collection => [0..-1])
     define_child_node(RubyXL::DataValidations)
     define_child_node(RubyXL::Hyperlinks)
     define_child_node(RubyXL::PrintOptions)
     define_child_node(RubyXL::PageMargins)
     define_child_node(RubyXL::PageSetup)
     define_child_node(RubyXL::HeaderFooterSettings)
-    define_child_node(RubyXL::BreakList,                :node_name => :rowBreaks)
-    define_child_node(RubyXL::BreakList,                :node_name => :colBreaks)
+    define_child_node(RubyXL::BreakList,             :node_name => :rowBreaks)
+    define_child_node(RubyXL::BreakList,             :node_name => :colBreaks)
     define_child_node(RubyXL::CustomProperties)
     define_child_node(RubyXL::CellWatches)
     define_child_node(RubyXL::IgnoredErrors)

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.3.8</title>
+<title>README - rubyXL 3.3.9</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 3.3.8</title>
+<title>module RubyXL - rubyXL 3.3.9</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";

data/rdoc/RubyXL/AExtension.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 3.3.8</title>
+<title>class RubyXL::AExtension - rubyXL 3.3.9</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.8</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 3.3.9</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.8</title>
+<title>class RubyXL::AdjustHandleList - rubyXL 3.3.9</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.8</title>
+<title>class RubyXL::Alignment - rubyXL 3.3.9</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.8</title>
+<title>class RubyXL::AlternateContent - rubyXL 3.3.9</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.8</title>
+<title>class RubyXL::Authors - rubyXL 3.3.9</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.8</title>
+<title>class RubyXL::AutoFilter - rubyXL 3.3.9</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.8</title>
+<title>class RubyXL::AutoFilterColumn - rubyXL 3.3.9</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.8</title>
+<title>class RubyXL::BinaryImageFile - rubyXL 3.3.9</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.8</title>
+<title>class RubyXL::BodyProperties - rubyXL 3.3.9</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.8</title>
+<title>class RubyXL::BooleanNode - rubyXL 3.3.9</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.8</title>
+<title>class RubyXL::BooleanValue - rubyXL 3.3.9</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";