rubyXL 3.3.29 → 3.4.33

data/lib/rubyXL/objects/external_links.rb

@@ -1,5 +1,4 @@
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_sheetName-1.html
   class SheetName < OOXMLObject
     define_attribute(:val, :string)
@@ -16,7 +15,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
 
@@ -56,30 +55,61 @@ module RubyXL
     define_element_name 'sheetDataSet'
   end
 
+  # https://learn.microsoft.com/en-us/openspecs/office_standards/ms-xlsx/452524b4-b22f-45a9-aac1-81fdd1f1db6c
+  class AlternateUrls < OOXMLObject
+    define_attribute(:absoluteUrl, :string, :required => false)
+    define_attribute(:relativeUrl, :string, :required => false)
+    define_element_name 'xxl21:alternateUrls'
+  end
+
   # http://www.datypic.com/sc/ooxml/e-ssml_externalBook-1.html
   class ExternalBook < OOXMLObject
     define_child_node(RubyXL::SheetNames)
     define_child_node(RubyXL::DefinedNamesExt)
     define_child_node(RubyXL::SheetDataSet)
-    define_attribute(:'r:id', :string, :required => true)
+    define_child_node(RubyXL::AlternateUrls)
+    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'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink'.freeze
 
     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,
-                   'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main'           => nil,
+                   'http://schemas.openxmlformats.org/markup-compatibility/2006'         => 'mc',
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
 
     def xlsx_path
       ROOT.join('xl', 'externalLinks', "externalLink#{file_index}.xml")
     end
   end
-
 end

data/lib/rubyXL/objects/fill.rb

@@ -2,7 +2,6 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/simple_types'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_stop-1.html
   class Stop < OOXMLObject
     define_attribute(:position, :double, :required => true)
@@ -13,8 +12,8 @@ module RubyXL
   # 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 )
-    define_child_node(RubyXL::Color, :node_name => :bgColor )
+    define_child_node(RubyXL::Color, :node_name => :fgColor)
+    define_child_node(RubyXL::Color, :node_name => :bgColor)
     define_element_name 'patternFill'
   end
 
@@ -39,7 +38,6 @@ module RubyXL
     def self.default(pattern_type)
       self.new(:pattern_fill => RubyXL::PatternFill.new(:pattern_type => pattern_type))
     end
-
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_fills-1.html
@@ -51,5 +49,4 @@ module RubyXL
       self.new(:_ => [ RubyXL::Fill.default('none'), RubyXL::Fill.default('gray125') ])
     end
   end
-
 end

data/lib/rubyXL/objects/filters.rb

@@ -3,7 +3,6 @@ require 'rubyXL/objects/simple_types'
 require 'rubyXL/objects/extensions'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_dateGroupItem-1.html
   class DateGroupItem < OOXMLObject
     define_attribute(:year,   :int, :required => true)
@@ -18,7 +17,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_filters-1.html
   class FilterContainer < OOXMLObject
-    define_attribute(:blank,        :bool,  :default  => false)
+    define_attribute(:blank,        :bool, :default => false)
     define_attribute(:calendarType, RubyXL::ST_CalendarType, :default => 'none')
     define_child_node(RubyXL::StringValue,   :collection => true, :accessor => :filters, :node_name => :filter)
     define_child_node(RubyXL::DateGroupItem, :collection => true, :accessor => :date_group_items)
@@ -43,7 +42,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_customFilters-1.html
   class CustomFilters < OOXMLContainerObject
-    define_attribute(:and, :bool,  :default => false)
+    define_attribute(:and, :bool, :default => false)
     define_child_node(RubyXL::CustomFilter, :collection => true)
     define_element_name 'customFilters'
   end
@@ -87,9 +86,9 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_sortCondition-1.html
   class SortCondition < OOXMLObject
-    define_attribute(:descending, :bool,   :default  => false)
+    define_attribute(:descending, :bool, :default => false)
     define_attribute(:sortBy,     RubyXL::ST_SortBy, :default => 'value')
-    define_attribute(:ref,        :ref,    :required => true)
+    define_attribute(:ref,        :ref, :required => true)
     define_attribute(:customList, :string)
     define_attribute(:dxfId,      :int)
     define_attribute(:iconSet,    RubyXL::ST_IconSetType, :required => true, :default => '3Arrows')
@@ -116,5 +115,4 @@ module RubyXL
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'autoFilter'
   end
-
-end
+end

data/lib/rubyXL/objects/font.rb

@@ -1,10 +1,8 @@
 require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/container_nodes'
 require 'rubyXL/objects/color'
-require 'rubyXL/convenience_methods'
 
 module RubyXL
-
   # 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.
@@ -22,17 +20,15 @@ module RubyXL
     define_child_node(RubyXL::BooleanValue, :node_name => :extend)
     define_child_node(RubyXL::Color)
     define_child_node(RubyXL::FloatValue,   :node_name => :sz)
-    define_child_node(RubyXL::BooleanValue, :node_name => :u)
+    define_child_node(RubyXL::StringValue,  :node_name => :u) # ST_UnderlineValues (http://www.datypic.com/sc/ooxml/e-ssml_u-1.html)
     define_child_node(RubyXL::StringValue,  :node_name => :vertAlign)
     define_child_node(RubyXL::StringValue,  :node_name => :scheme)
     define_element_name 'font'
 
     def self.default(size = 10)
       self.new(:name => RubyXL::StringValue.new(:val => 'Verdana'),
-               :sz   => RubyXL::FloatValue.new(:val => size) )
+               :sz   => RubyXL::FloatValue.new(:val => size))
     end
-
-    include FontConvenienceMethods
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_fonts-1.html
@@ -44,5 +40,4 @@ module RubyXL
       self.new(:_ => [ RubyXL::Font.default(10), RubyXL::Font.default(8) ])
     end
   end
-
 end

data/lib/rubyXL/objects/formula.rb

@@ -2,12 +2,11 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/simple_types'
 
 module RubyXL
-
   # 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')
-    define_attribute(:aca,  :bool,   :default => false)
+    define_attribute(:aca,  :bool, :default => false)
     define_attribute(:ref,  :ref)
     define_attribute(:dt2D, :bool,   :default => false)
     define_attribute(:dtr,  :bool,   :default => false)
@@ -15,10 +14,9 @@ module RubyXL
     define_attribute(:del2, :bool,   :default => false)
     define_attribute(:r1,   :ref)
     define_attribute(:r2,   :ref)
-    define_attribute(:ca,   :bool,   :default => false)
+    define_attribute(:ca,   :bool, :default => false)
     define_attribute(:si,   :int)
-    define_attribute(:bx,   :bool,   :default => false)
+    define_attribute(:bx,   :bool, :default => false)
     define_element_name 'f'
   end
-
 end

data/lib/rubyXL/objects/ooxml_object.rb

@@ -12,16 +12,16 @@ module RubyXL
     # addressing variable by name creates it in the context of defining class, while calling
     # the setter/getter method addresses it in the context of descendant class,
     # which is what we need.
-    def obtain_class_variable(var_name, default = {})
+    def obtain_class_variable(var_name, default = nil)
       self.class_variable_get(var_name)
     rescue NameError
-      self.class_variable_set(var_name, default)
+      self.class_variable_set(var_name, default || {})
     end
 
     # Defines an attribute of OOXML object.
     # === Parameters
     # * +attribute_name+ - Name of the element attribute as seen in the source XML. Can be either <tt>"String"</tt> or <tt>:Symbol</tt>
-    #   * Special attibute name <tt>'_'</tt> (underscore) denotes the value of the element rather than attribute.
+    #   * Special attribute name <tt>'_'</tt> (underscore) denotes the value of the element rather than attribute.
     # * +attribute_type+ - Specifies the conversion type for the attribute when parsing. Available options are:
     #   * +:int+ - <tt>Integer</tt>
     #   * +:uint+ - Unsigned <tt>Integer</tt>
@@ -45,14 +45,20 @@ module RubyXL
     # The value of the element will be accessible as a <tt>String</tt> by calling +obj.expression+
     #   define_attribute(:errorStyle, %w{ stop warning information }, :default => 'stop',)
     # A <tt>String</tt> attribute named 'errorStyle' will be accessible as +obj.error_style+, valid values are <tt>"stop"</tt>, <tt>"warning"</tt>, <tt>"information"</tt>
-    def define_attribute(attr_name, attr_type, extra_params = {})
+    def define_attribute(attr_name, attr_type, extra_params = nil)
       attrs = obtain_class_variable(:@@ooxml_attributes)
-      attr_hash = extra_params.merge({ :attr_type => attr_type })
+      attr_hash = { :attr_type => attr_type }
+      attr_hash.merge!(extra_params) if extra_params
       attr_hash[:accessor] ||= accessorize(attr_name)
       attrs[attr_name.to_s] = attr_hash
       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.
@@ -79,7 +85,7 @@ module RubyXL
       accessor = (extra_params[:accessor] || accessorize(child_node_name)).to_sym
 
       child_nodes[child_node_name] = {
-        :class => klass,
+        :class    => klass,
         :is_array => extra_params[:collection],
         :accessor => accessor
       }
@@ -117,7 +123,9 @@ module RubyXL
       end
 
       obj = self.new
-      obj.local_namespaces = node.namespace_definitions
+      hsh = {}
+      node.namespace_definitions.each { |ns| hsh[ns.href] = ns.prefix }
+      obj.local_namespaces = hsh
 
       known_attributes = obtain_class_variable(:@@ooxml_attributes)
 
@@ -142,9 +150,11 @@ module RubyXL
         known_namespaces ||= obtain_class_variable(:@@ooxml_namespaces)
 
         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
@@ -178,21 +188,21 @@ module RubyXL
     private
     def accessorize(str)
       acc = str.to_s.dup
-      acc.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-      acc.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-      acc.gsub!(':','_')
+      acc.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+      acc.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+      acc.gsub!(':', '_')
       acc.downcase.to_sym
     end
 
     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)  # http://www.datypic.com/sc/xsd/t-xsd_boolean.html
+              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)
@@ -201,7 +211,6 @@ module RubyXL
               end
       obj.send("#{params[:accessor]}=", val)
     end
-
   end
 
 
@@ -217,8 +226,9 @@ module RubyXL
     end
     private :obtain_class_variable
 
-    def initialize(params = {})
+    def initialize(params = nil)
       @local_namespaces = nil
+      params ||= {}
 
       obtain_class_variable(:@@ooxml_attributes).each_value { |v|
         instance_variable_set("@#{v[:accessor]}", params[v[:accessor]]) unless v[:computed]
@@ -229,7 +239,6 @@ module RubyXL
 
     def init_child_nodes(params)
       obtain_class_variable(:@@ooxml_child_nodes).each_value { |v|
-
         initial_value =
           if params.has_key?(v[:accessor]) then params[v[:accessor]]
           elsif v[:is_array] then []
@@ -248,8 +257,8 @@ module RubyXL
 
     def ==(other)
       other.is_a?(self.class) &&
-        obtain_class_variable(:@@ooxml_attributes).all? { |k, v| self.send(v[:accessor]) == other.send(v[:accessor]) } &&
-        obtain_class_variable(:@@ooxml_child_nodes).all? { |k, v| self.send(v[:accessor]) == other.send(v[:accessor]) }
+        obtain_class_variable(:@@ooxml_attributes).all? { |_k, v| self.send(v[:accessor]) == other.send(v[:accessor]) } &&
+        obtain_class_variable(:@@ooxml_child_nodes).all? { |_k, v| self.send(v[:accessor]) == other.send(v[:accessor]) }
     end
 
     # Recursively write the OOXML object and all its children out as Nokogiri::XML. Immediately before the actual
@@ -270,6 +279,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
@@ -301,12 +315,11 @@ module RubyXL
       element_text = attrs.delete('_')
       elem = xml.create_element(node_name_override || obtain_class_variable(:@@ooxml_tag_name), attrs, element_text)
 
-      if @local_namespaces.nil? || @local_namespaces.empty? then # If no local namespaces provided in the original document,
-        # use the defaults
-        obtain_class_variable(:@@ooxml_namespaces).each_pair { |k, v| elem.add_namespace_definition(v, k) }
-      else # otherwise preserve the original ones
-        @local_namespaces.each { |ns| elem.add_namespace_definition(ns.prefix, ns.href) }
-      end
+      # First, populate namespaces from the original document
+      @local_namespaces&.each_pair { |href, prefix| elem.add_namespace_definition(prefix, href) }
+
+      # Then, add defaults. Note that if some namespace prefix was already set, Nokogiri will NOT change that namespace.
+      obtain_class_variable(:@@ooxml_namespaces).each_pair { |href, prefix| elem.add_namespace_definition(prefix, href) }
 
       child_nodes = obtain_class_variable(:@@ooxml_child_nodes)
       child_nodes.each_pair { |child_node_name, child_node_params|
@@ -344,12 +357,11 @@ module RubyXL
     def before_write_xml
       #TODO# This will go away once containers are fully implemented.
       child_nodes = obtain_class_variable(:@@ooxml_child_nodes)
-      child_nodes.each_pair { |child_node_name, child_node_params|
+      child_nodes.each_pair { |_child_node_name, child_node_params|
         self.count = self.send(child_node_params[:accessor]).size if child_node_params[:is_array] == :with_count
       }
       true
     end
-
   end
 
   # Parent class for defining OOXML based objects (not unlike Rails' +ActiveRecord+!)
@@ -359,7 +371,7 @@ module RubyXL
     include OOXMLObjectInstanceMethods
   end
 
-  # Parent class for OOXML conainer objects (for example,
+  # Parent class for OOXML container objects (for example,
   # <tt>&lt;fonts&gt;&lt;font&gt;...&lt;/font&gt;&lt;font&gt;...&lt;/font&gt;&lt;/fonts&gt;</tt>
   # that obscures the top-level container, allowing direct access to the contents as +Array+.
   class OOXMLContainerObject < Array
@@ -403,7 +415,6 @@ module RubyXL
       end
       protected :define_count_attribute
     end
-
   end
 
   # Extension class providing functionality for top-level OOXML objects that are represented by
@@ -454,7 +465,5 @@ module RubyXL
     def file_index
       root.rels_hash[self.class].index{ |f| f.equal?(self) }.to_i + 1
     end
-
   end
-
 end

data/lib/rubyXL/objects/query_table.rb

@@ -0,0 +1,106 @@
+require 'rubyXL/objects/ooxml_object'
+require 'rubyXL/objects/simple_types'
+require 'rubyXL/objects/extensions'
+require 'rubyXL/objects/relationships'
+require 'rubyXL/objects/sheet_common'
+
+# Query Tables
+# https://msdn.microsoft.com/en-us/library/hh643563(v=office.12).aspx
+
+module RubyXL
+  # http://www.datypic.com/sc/ooxml/e-ssml_queryTableField-1.html
+  class QueryTableField < OOXMLObject
+    define_attribute(:id,            :uint, :required => true)
+    define_attribute(:name,          RubyXL::ST_Xstring)
+    define_attribute(:dataBound,     :bool, :default => true)
+    define_attribute(:rowNumbers,    :bool, :default => false)
+    define_attribute(:fillFormulas,  :bool, :default => false)
+    define_attribute(:clipped,       :bool, :default => false)
+    define_attribute(:tableColumnId, :uint, :default => 0)
+
+    define_child_node(RubyXL::ExtensionStorageArea)
+
+    define_element_name 'queryTableField'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_queryTableFields-1.html
+  class QueryTableFields < OOXMLObject
+    define_child_node(RubyXL::QueryTableField, :collection => :with_count,
+                      :accessor => :fields, :node_name => :queryTableField)
+    define_element_name 'queryTableFields'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_deletedField-1.html
+  class QueryTableDeletedField < OOXMLObject
+    define_attribute(:name, RubyXL::ST_Xstring, :required => true)
+
+    define_element_name 'deletedField'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_queryTableDeletedFields-1.html
+  class QueryTableDeletedFields < OOXMLObject
+    define_child_node(RubyXL::QueryTableDeletedField, :collection => :with_count,
+                      :accessor => :deleted_fields, :node_name => :deletedField)
+    define_element_name 'queryTableDeletedFields'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_queryTableRefresh-1.html
+  class QueryTableRefresh < OOXMLObject
+    define_attribute(:preserveSortFilterLayout, :bool, :default => true)
+    define_attribute(:fieldIdWrapped,           :bool, :default => false)
+    define_attribute(:headersInLastRefresh,     :bool, :default => true)
+    define_attribute(:minimumVersion,           :uint, :default => 0)
+    define_attribute(:nextId,                   :uint, :default => 1)
+    define_attribute(:unboundColumnsLeft,       :uint, :default => 0)
+    define_attribute(:unboundColumnsRight,      :uint, :default => 0)
+
+    define_child_node(RubyXL::QueryTableFields) # [1..1]
+    define_child_node(RubyXL::QueryTableDeletedFields)
+    define_child_node(RubyXL::SortState)
+    define_child_node(RubyXL::ExtensionStorageArea)
+
+    define_element_name 'queryTableRefresh'
+  end
+
+  # http://www.datypic.com/sc/ooxml/e-ssml_queryTable.html
+  class QueryTable < OOXMLTopLevelObject
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.queryTable+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/queryTable'.freeze
+
+    include RubyXL::RelationshipSupport
+
+    define_attribute(:name,                    RubyXL::ST_Xstring, :required => true)
+    define_attribute(:headers,                 :bool, :default => true)
+    define_attribute(:rowNumbers,              :bool, :default => false)
+    define_attribute(:disableRefresh,          :bool, :default => false)
+    define_attribute(:backgroundRefresh,       :bool, :default => true)
+    define_attribute(:firstBackgroundRefresh,  :bool, :default => false)
+    define_attribute(:refreshOnLoad,           :bool, :default => false)
+    define_attribute(:growShrinkType,          RubyXL::ST_GrowShrinkType, :default => 'insertDelete')
+    define_attribute(:fillFormulas,            :bool, :default => false)
+    define_attribute(:removeDataOnSave,        :bool, :default => false)
+    define_attribute(:disableEdit,             :bool, :default => false)
+    define_attribute(:preserveFormatting,      :bool, :default => true)
+    define_attribute(:adjustColumnWidth,       :bool, :default => true)
+    define_attribute(:intermediate,            :bool, :default => false)
+    define_attribute(:connectionId,            :uint, :required => true)
+    define_attribute(:autoFormatId,            :uint)
+    define_attribute(:applyNumberFormats,      :bool)
+    define_attribute(:applyBorderFormats,      :bool)
+    define_attribute(:applyFontFormats,        :bool)
+    define_attribute(:applyPatternFormats,     :bool)
+    define_attribute(:applyAlignmentFormats,   :bool)
+    define_attribute(:applyWidthHeightFormats, :bool)
+
+    define_child_node(RubyXL::QueryTableRefresh)
+    define_child_node(RubyXL::ExtensionStorageArea)
+
+    define_element_name 'queryTable'
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main'           => nil,
+                   'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
+
+    def xlsx_path
+      ROOT.join('xl', 'queryTables', "queryTable#{file_index}.xml")
+    end
+  end
+end

data/lib/rubyXL/objects/reference.rb

@@ -1,6 +1,6 @@
 module RubyXL
   class Reference
-    ROW_MAX = 1024*1024
+    ROW_MAX = 1024 * 1024
     COL_MAX = 16393
 
     attr_reader :row_range, :col_range
@@ -8,6 +8,7 @@ module RubyXL
     # RubyXL::Reference.new(row, col)
     # RubyXL::Reference.new(row_from, row_to, col_from, col_to)
     # RubyXL::Reference.new(reference_string)
+    # RubyXL::Reference.new(row_from:, row_to:, col_from:, col_to:)
     def initialize(*params)
       row_from = row_to = col_from = col_to = nil
 
@@ -15,10 +16,16 @@ module RubyXL
       when 4 then row_from, row_to, col_from, col_to = params
       when 2 then row_from, col_from = params
       when 1 then
-        raise ArgumentError.new("invalid value for #{self.class}: #{params[0].inspect}") unless params[0].is_a?(String)
-        from, to = params[0].split(':')
-        row_from, col_from = self.class.ref2ind(from)
-        row_to, col_to = self.class.ref2ind(to) unless to.nil?
+        case params.first
+        when Hash then
+          row_from, row_to, col_from, col_to = params.first.fetch_values(:row_from, :row_to, :col_from, :col_to)
+        when String then
+          from, to = params[0].split(':')
+          row_from, col_from = self.class.ref2ind(from)
+          row_to, col_to = self.class.ref2ind(to) unless to.nil?
+        else
+          raise ArgumentError.new("invalid value for #{self.class}: #{params[0].inspect}") unless params[0].is_a?(String)
+        end
       end
 
       @row_range = Range.new(row_from || 0, row_to || row_from || ROW_MAX)
@@ -29,6 +36,10 @@ module RubyXL
       (@row_range.begin == @row_range.end) && (@col_range.begin == @col_range.end)
     end
 
+    def valid?
+      !(row_range.begin.negative? || col_range.begin.negative?)
+    end
+
     def first_row
       @row_range.begin
     end
@@ -50,15 +61,18 @@ module RubyXL
     end
 
     def cover?(other)
-      !other.nil? && (@row_range.cover?(other.row_range.begin) && @row_range.cover?(other.row_range.end) &&
-                      @col_range.cover?(other.col_range.begin) && @col_range.cover?(other.col_range.end))
+      !other.nil? && (@row_range.cover?(other.row_range.begin) &&
+                      @row_range.cover?(other.row_range.end) &&
+                      @col_range.cover?(other.col_range.begin) &&
+                      @col_range.cover?(other.col_range.end))
     end
 
     def to_s
       if single_cell? then
         self.class.ind2ref(@row_range.begin, @col_range.begin)
       else
-        self.class.ind2ref(@row_range.begin, @col_range.begin) + ':' + self.class.ind2ref(@row_range.end, @col_range.end)
+        self.class.ind2ref(@row_range.begin, @col_range.begin) + ':' +
+                           self.class.ind2ref(@row_range.end, @col_range.end)
       end
     end
 
@@ -71,7 +85,7 @@ module RubyXL
     end
 
     # Converts +row+ and +col+ zero-based indices to Excel-style cell reference
-    # (0) A...Z, AA...AZ, BA... ...ZZ, AAA... ...AZZ, BAA... ...XFD (16383)
+    # <0> A...Z, AA...AZ, BA... ...ZZ, AAA... ...AZZ, BAA... ...XFD <16383>
     def self.ind2ref(row = 0, col = 0)
       str = ''
 
@@ -88,23 +102,18 @@ module RubyXL
     # Converts Excel-style cell reference to +row+ and +col+ zero-based indices.
     def self.ref2ind(str)
       return [ -1, -1 ] unless str =~ /\A([A-Z]+)(\d+)\Z/
-
-      col = 0
-      $1.each_byte { |chr| col = col * 26 + (chr - 64) }
-      [ $2.to_i - 1, col - 1 ]
+      [ Regexp.last_match(2).to_i - 1,
+        Regexp.last_match(1).each_byte.inject(0) { |col, chr| (col * 26) + (chr - 64) } - 1 ]
     end
-
   end
 
   class Sqref < Array
-
     def initialize(str)
       str.split.each { |ref_str| self << RubyXL::Reference.new(ref_str) }
     end
 
     def to_s
-      self.collect{ |ref| ref.to_s }.join(' ')
+      self.collect(&:to_s).join(' ')
     end
-
   end
 end