rubyXL 3.3.21 → 3.4.17

data/lib/rubyXL/objects/container_nodes.rb

@@ -49,7 +49,7 @@ module RubyXL
 
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-docPropsVTypes_variant.html
+  # http://www.datypic.com/sc/ooxml/e-docPropsVTypes_variant.html
   class Variant < OOXMLObject
     define_child_node(RubyXL::Variant,      :node_name => 'vt:variant')
 
@@ -91,7 +91,7 @@ module RubyXL
     define_element_name 'vt:vector'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-docPropsVTypes_vector.html
+  # http://www.datypic.com/sc/ooxml/e-docPropsVTypes_vector.html
   class Vector < OOXMLObject
     define_attribute(:baseType, RubyXL::ST_VectorBaseType, :required => true)
     define_attribute(:size,     :int, :required => true)

data/lib/rubyXL/objects/content_types.rb

@@ -38,7 +38,7 @@ module RubyXL
           ext = obj.xlsx_path.extname[1..-1]
           next if ext.nil?
           content_types_by_ext[ext] ||= []
-          content_types_by_ext[ext] << klass::CONTENT_TYPE 
+          content_types_by_ext[ext] << klass::CONTENT_TYPE
         }
       }
 
@@ -46,7 +46,7 @@ module RubyXL
 
       # Determine which content types are used most often, and add them to the list of defaults
       content_types_by_ext.each_pair { |ext, content_types_arr|
-        next if ext.nil? || defaults.any? { |d| d.extension == ext } 
+        next if ext.nil? || defaults.any? { |d| d.extension == ext }
         most_frequent_ct = content_types_arr.group_by { |ct| ct }.values.max_by(&:size).first
         defaults << RubyXL::ContentTypeDefault.new(:extension => ext, :content_type => most_frequent_ct )
       }

data/lib/rubyXL/objects/data_validation.rb

@@ -4,13 +4,15 @@ require 'rubyXL/objects/formula'
 
 module RubyXL
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_dataValidation-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_dataValidation-1.html
   class DataValidation < OOXMLObject
     define_attribute(:type,             RubyXL::ST_DataValidationType,       :default => 'none')
     define_attribute(:errorStyle,       RubyXL::ST_DataValidationErrorStyle, :default => 'stop')
     define_attribute(:imeMode,          RubyXL::ST_DataValidationImeMode,    :default => 'noControl')
     define_attribute(:operator,         RubyXL::ST_DataValidationOperator,   :default => 'between')
     define_attribute(:allowBlank,       :bool, :default => false)
+    # Documentation lies. This property should have been called "HIDE dropdown",
+    #   since that's what happens when it is set to true.
     define_attribute(:showDropDown,     :bool, :default => false)
     define_attribute(:showInputMessage, :bool, :default => false)
     define_attribute(:showErrorMessage, :bool, :default => false)
@@ -25,7 +27,7 @@ module RubyXL
     define_element_name 'dataValidation'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_dataValidations-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_dataValidations-1.html
   class DataValidations < OOXMLContainerObject
     define_attribute(:disablePrompts, :bool, :default => false)
     define_attribute(:xWindow,        :int)

data/lib/rubyXL/objects/document_properties.rb

@@ -4,7 +4,7 @@ require 'time'
 
 module RubyXL
 
-  # http://www.schemacentral.com/sc/ooxml/e-extended-properties_Properties.html
+  # http://www.datypic.com/sc/ooxml/e-extended-properties_Properties.html
   class DocumentPropertiesFile < OOXMLTopLevelObject
     CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.extended-properties+xml'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties'
@@ -127,7 +127,7 @@ module RubyXL
     end
 
     def creator=(v)
-      self.dc_creator = v && RubyXL::StringNodeW3C.new(:value => v)
+      self.dc_creator = v && RubyXL::StringNode.new(:value => v)
     end
 
     def modifier
@@ -135,7 +135,7 @@ module RubyXL
     end
 
     def modifier=(v)
-      self.cp_last_modified_by = v && RubyXL::StringNodeW3C.new(:value => v)
+      self.cp_last_modified_by = v && RubyXL::StringNode.new(:value => v)
     end
 
     def created_at

data/lib/rubyXL/objects/extensions.rb

@@ -2,7 +2,7 @@ require 'rubyXL/objects/ooxml_object'
 
 module RubyXL
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_ext-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_ext-1.html
   class RawOOXML < OOXMLObject
     attr_accessor :raw_xml
 
@@ -17,13 +17,13 @@ module RubyXL
     end
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_ext-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_ext-1.html
   class Extension < RawOOXML
     define_attribute(:uri, :string)
     define_element_name 'ext'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_extLst-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_extLst-1.html
   class ExtensionStorageArea < OOXMLObject
     define_child_node(RubyXL::Extension, :collection => true)
     define_element_name 'extLst'
@@ -33,4 +33,21 @@ module RubyXL
     define_element_name 'mc:AlternateContent'
   end
 
+  class OOXMLIgnored < OOXMLObject
+    def self.parse(node, ignore)
+      nil
+    end
+
+    def write_xml(xml, node_name_override = nil)
+      ''
+    end
+  end
+
+  # https://msdn.microsoft.com/en-us/library/mt793297(v=office.12).aspx
+  # "A CT_RevisionPtr element that specifies metadata supporting runtime scenarios for Microsoft Excel.
+  # It SHOULD be ignored and SHOULD NOT be saved by all others."
+  class RevisionPointer < OOXMLIgnored
+    define_element_name 'xr:revisionPtr'
+  end
+
 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
 
@@ -61,16 +61,40 @@ module RubyXL
     define_child_node(RubyXL::SheetNames)
     define_child_node(RubyXL::DefinedNamesExt)
     define_child_node(RubyXL::SheetDataSet)
-    define_attribute(:'r:id', :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'externalBook'
   end
 
+  # http://www.datypic.com/sc/ooxml/e-ssml_oleItem-1.html
+  class OleItem < OOXMLObject
+    define_attribute(:name,      :string, :required => true)
+    define_attribute(:icon,      :bool)
+    define_attribute(:advise,    :bool)
+    define_attribute(:preferPic, :bool)
+    define_element_name 'oleItem'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_oleItems-1.html
+  class OleItems < OOXMLContainerObject
+    define_child_node(RubyXL::OleItem)
+    define_element_name 'oleItems'
+  end
+
+  # http://www.datypic.com/sc/ooxml/t-ssml_CT_OleLink.html
+  class OleLink < OOXMLObject
+    define_child_node(RubyXL::OleItems, :collection => true)
+    define_relationship(:required => true)
+    define_attribute(:progId, :string, :required => true)
+    define_element_name 'oleLink'
+  end
+
   class ExternalLinksFile < OOXMLTopLevelObject
     CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink'
 
     include RubyXL::RelationshipSupport
     define_child_node(RubyXL::ExternalBook)
+    define_child_node(RubyXL::OleLink)
 
     define_element_name 'externalLink'
     set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,

data/lib/rubyXL/objects/fill.rb

@@ -10,7 +10,7 @@ module RubyXL
     define_element_name 'stop'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_patternFill-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_patternFill-1.html
   class PatternFill < OOXMLObject
     define_attribute(:patternType, RubyXL::ST_PatternType)
     define_child_node(RubyXL::Color, :node_name => :fgColor )
@@ -18,7 +18,7 @@ module RubyXL
     define_element_name 'patternFill'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_gradientFill-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_gradientFill-1.html
   class GradientFill < OOXMLObject
     define_attribute(:type,   RubyXL::ST_GradientType, :default => 'linear')
     define_attribute(:degree, :double, :default => 0)
@@ -30,7 +30,7 @@ module RubyXL
     define_element_name 'gradientFill'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_fill-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_fill-1.html
   class Fill < OOXMLObject
     define_child_node(RubyXL::PatternFill)
     define_child_node(RubyXL::GradientFill)
@@ -42,7 +42,7 @@ module RubyXL
 
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_fills-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_fills-1.html
   class Fills < OOXMLContainerObject
     define_child_node(RubyXL::Fill, :collection => :with_count)
     define_element_name 'fills'

data/lib/rubyXL/objects/filters.rb

@@ -4,7 +4,7 @@ require 'rubyXL/objects/extensions'
 
 module RubyXL
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_dateGroupItem-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_dateGroupItem-1.html
   class DateGroupItem < OOXMLObject
     define_attribute(:year,   :int, :required => true)
     define_attribute(:month,  :int)
@@ -16,7 +16,7 @@ module RubyXL
     define_element_name 'dateGroupItem'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_filters-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_filters-1.html
   class FilterContainer < OOXMLObject
     define_attribute(:blank,        :bool,  :default  => false)
     define_attribute(:calendarType, RubyXL::ST_CalendarType, :default => 'none')
@@ -25,7 +25,7 @@ module RubyXL
     define_element_name 'filters'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_top10-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_top10-1.html
   class Top10 < OOXMLObject
     define_attribute(:top,       :bool,  :default  => true)
     define_attribute(:percent,   :bool,  :default  => false)
@@ -34,21 +34,21 @@ module RubyXL
     define_element_name 'top10'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_customFilter-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_customFilter-1.html
   class CustomFilter < OOXMLObject
     define_attribute(:operator, RubyXL::ST_FilterOperator, :default => 'equal')
     define_attribute(:val, :string)
     define_element_name 'customFilter'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_customFilters-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_customFilters-1.html
   class CustomFilters < OOXMLContainerObject
     define_attribute(:and, :bool,  :default => false)
     define_child_node(RubyXL::CustomFilter, :collection => true)
     define_element_name 'customFilters'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_dynamicFilter-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_dynamicFilter-1.html
   class DynamicFilter < OOXMLObject
     define_attribute(:type,   RubyXL::ST_DynamicFilterType, :required => true)
     define_attribute(:val,    :double)
@@ -56,21 +56,21 @@ module RubyXL
     define_element_name 'dynamicFilter'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_colorFilter-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_colorFilter-1.html
   class ColorFilter < OOXMLObject
     define_attribute(:dxfId,     :string)
     define_attribute(:cellColor, :bool)
     define_element_name 'colorFilter'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_iconFilter-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_iconFilter-1.html
   class IconFilter < OOXMLObject
     define_attribute(:iconSet, RubyXL::ST_IconSetType)
     define_attribute(:iconId,  :int)
     define_element_name 'iconFilter'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_filterColumn-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_filterColumn-1.html
   class AutoFilterColumn < OOXMLObject
     define_attribute(:colId,        :int,  :required => true)
     define_attribute(:hiddenButton, :bool, :default  => false)
@@ -85,7 +85,7 @@ module RubyXL
     define_element_name 'filterColumn'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sortCondition-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_sortCondition-1.html
   class SortCondition < OOXMLObject
     define_attribute(:descending, :bool,   :default  => false)
     define_attribute(:sortBy,     RubyXL::ST_SortBy, :default => 'value')
@@ -97,7 +97,7 @@ module RubyXL
     define_element_name 'sortCondition'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sortState-2.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_sortState-2.html
   class SortState < OOXMLObject
     define_attribute(:columnSort,    :bool,   :default  => false)
     define_attribute(:caseSensitive, :bool,   :default  => false)
@@ -108,7 +108,7 @@ module RubyXL
     define_element_name 'sortState'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_autoFilter-2.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_autoFilter-2.html
   class AutoFilter < OOXMLObject
     define_attribute(:ref, :ref)
     define_child_node(RubyXL::AutoFilterColumn)

data/lib/rubyXL/objects/font.rb

@@ -4,7 +4,7 @@ require 'rubyXL/objects/color'
 
 module RubyXL
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_font-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_font-1.html
   class Font < OOXMLObject
     # Since we have no capability to load the actual fonts, we'll have to live with the default.
     MAX_DIGIT_WIDTH = 7 # Calibri 11 pt @ 96 dpi
@@ -26,71 +26,13 @@ module RubyXL
     define_child_node(RubyXL::StringValue,  :node_name => :scheme)
     define_element_name 'font'
 
-    def is_italic
-      i && (i.val || true)
-    end
-
-    def set_italic(val)
-      self.i = RubyXL::BooleanValue.new(:val => val)
-    end
-
-    def is_bold
-      b && (b.val || true)
-    end
-
-    def set_bold(val)
-      self.b = RubyXL::BooleanValue.new(:val => val)
-    end
-
-    def is_underlined
-      u && (u.val || true)
-    end
-
-    def set_underline(val)
-      self.u = RubyXL::BooleanValue.new(:val => val)
-    end
-
-    def is_strikethrough
-      strike && (strike.val || true)
-    end
-
-    def set_strikethrough(val)
-      self.strike = RubyXL::BooleanValue.new(:val => val)
-    end
-
-    def get_name
-      name && name.val
-    end
-
-    def set_name(val)
-      self.name = RubyXL::StringValue.new(:val => val)
-    end
-
-    def get_size
-      sz && sz.val
-    end
-
-    def set_size(val)
-      self.sz = RubyXL::FloatValue.new(:val => val)
-    end
-
-    def get_rgb_color
-      color && color.rgb
-    end
-
-    # Helper method to modify the font color
-    def set_rgb_color(font_color)
-      self.color = RubyXL::Color.new(:rgb => font_color.to_s)
-    end
-
     def self.default(size = 10)
       self.new(:name => RubyXL::StringValue.new(:val => 'Verdana'),
                :sz   => RubyXL::FloatValue.new(:val => size) )
     end
-
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_fonts-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_fonts-1.html
   class Fonts < OOXMLContainerObject
     define_child_node(RubyXL::Font, :collection => :with_count)
     define_element_name 'fonts'

data/lib/rubyXL/objects/formula.rb

@@ -3,7 +3,7 @@ require 'rubyXL/objects/simple_types'
 
 module RubyXL
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_f-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_f-1.html
   class Formula < OOXMLObject
     define_attribute(:_,    :string, :accessor => :expression)
     define_attribute(:t,    RubyXL::ST_CellFormulaType, :default => 'normal')

data/lib/rubyXL/objects/ooxml_object.rb

@@ -53,6 +53,11 @@ module RubyXL
       self.send(:attr_accessor, attr_hash[:accessor]) unless attr_hash[:computed]
     end
 
+    # Defines a `r:id` attribute
+    def define_relationship(extra_params = {})
+      define_attribute(:'r:id', :string, extra_params)
+    end
+
     # Defines a child node of OOXML object.
     # === Parameters
     # * +klass+ - Class (descendant of RubyXL::OOXMLObject) of the child nodes. Child node objects will be produced by calling +parse+ method of that class.
@@ -144,7 +149,9 @@ module RubyXL
         node.element_children.each { |child_node|
 
           ns = child_node.namespace
-          prefix = known_namespaces[ns.href] || ns.prefix
+          prefix = if known_namespaces.has_key?(ns.href) then known_namespaces[ns.href]
+                   else ns.prefix
+                   end
 
           child_node_name = case prefix
                             when '', nil then child_node.name
@@ -187,12 +194,12 @@ module RubyXL
     def process_attribute(obj, raw_value, params)
       val = raw_value &&
               case params[:attr_type]
-              when :double then Float(raw_value) # http://www.datypic.com/sc/xsd/t-xsd_double.html
+              when :double then Float(raw_value)  # http://www.datypic.com/sc/xsd/t-xsd_double.html
               when :string then raw_value
               when Array   then raw_value # Case of Simple Types
               when :sqref  then RubyXL::Sqref.new(raw_value)
               when :ref    then RubyXL::Reference.new(raw_value)
-              when :bool   then ['1', 'true'].include?(raw_value)
+              when :bool   then ['1', 'true'].include?(raw_value)  # http://www.datypic.com/sc/xsd/t-xsd_boolean.html
               when :int    then Integer(raw_value)
               when :uint   then
                 v = Integer(raw_value)
@@ -270,6 +277,11 @@ module RubyXL
       if xml.nil? then
         seed_xml = Nokogiri::XML('<?xml version = "1.0" standalone ="yes"?>')
         seed_xml.encoding = 'UTF-8'
+
+        if Nokogiri.jruby? then # Issue 188 workaround for JRuby
+          seed_xml.to_java.strict_error_checking = false
+        end
+
         result = self.write_xml(seed_xml)
         return result if result == ''
         seed_xml << result