rubyXL 3.3.33 → 3.4.25

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,10 +12,10 @@ 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.
@@ -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
       }
@@ -142,9 +148,10 @@ 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 +185,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 +208,6 @@ module RubyXL
               end
       obj.send("#{params[:accessor]}=", val)
     end
-
   end
 
 
@@ -217,8 +223,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 +236,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 []
@@ -270,6 +276,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
@@ -349,7 +360,6 @@ module RubyXL
       }
       true
     end
-
   end
 
   # Parent class for defining OOXML based objects (not unlike Rails' +ActiveRecord+!)
@@ -403,7 +413,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 +463,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,104 @@
+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

@@ -29,6 +29,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
@@ -71,7 +75,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,16 +92,11 @@ 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
@@ -105,6 +104,5 @@ module RubyXL
     def to_s
       self.collect{ |ref| ref.to_s }.join(' ')
     end
-
   end
 end

data/lib/rubyXL/objects/relationships.rb

@@ -2,9 +2,8 @@ require 'pathname'
 require 'rubyXL/objects/ooxml_object'
 
 module RubyXL
-
   class RID < OOXMLObject
-    define_attribute(:'r:id', :string, :required => true)
+    define_relationship(:required => true)
   end
 
   class Relationship < OOXMLObject
@@ -16,7 +15,7 @@ module RubyXL
   end
 
   class OOXMLRelationshipsFile < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-package.relationships+xml'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-package.relationships+xml'.freeze
     SAVE_ORDER = 100
 
     define_child_node(RubyXL::Relationship, :collection => true, :accessor => :relationships)
@@ -28,8 +27,8 @@ module RubyXL
     @@debug_indent = ($DEBUG ? 0 : nil)
 
     def new_relationship(target, type)
-      RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}",
-                               :type => type,
+      RubyXL::Relationship.new(:id     => "rId#{relationships.size + 1}",
+                               :type   => type,
                                :target => target)
     end
     protected :new_relationship
@@ -37,8 +36,8 @@ module RubyXL
     def add_relationship(obj)
       return if obj.nil? || !defined?(obj.class::REL_TYPE) || (obj.respond_to?(:empty?) && obj.empty?)
 
-      relationships << RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}",
-                                                :type => obj.class::REL_TYPE,
+      relationships << RubyXL::Relationship.new(:id     => "rId#{relationships.size + 1}",
+                                                :type   => obj.class::REL_TYPE,
                                                 :target => obj.xlsx_path.relative_path_from(owner.xlsx_path.dirname))
     end
     protected :add_relationship
@@ -82,7 +81,10 @@ module RubyXL
         klass = RubyXL::OOXMLRelationshipsFile.get_class_by_rel_type(rel.type)
 
         if klass.nil? then
-          puts "*** WARNING: storage class not found for #{rel.target} (#{rel.type})"
+          if !RubyXL.class_variable_get(:@@suppress_warnings) then
+            puts "*** WARNING: storage class not found for #{rel.target} (#{rel.type})"
+          end
+
           klass = GenericStorageObject
         end
 
@@ -128,12 +130,10 @@ module RubyXL
       basename = base_file_path.root? ? '' : base_file_path.basename
       base_file_path.dirname.join('_rels', "#{basename}.rels").cleanpath
     end
-
   end
 
   # +RelationshipSupport+ module enables automatic loading and saving of _rels for the respective file
   module RelationshipSupport
-
     module ClassMehods
       def define_relationship(klass, accessor = nil)
         class_variable_get(:@@ooxml_relationships)[klass] = accessor
@@ -204,10 +204,10 @@ module RubyXL
 
     def store_relationship(related_file, unknown = false)
       self.generic_storage ||= []
-      puts "WARNING: #{self.class} is not aware what to do with #{related_file.class}" if unknown
+      if unknown && !RubyXL.class_variable_get(:@@suppress_warnings) then
+        puts "WARNING: #{self.class} is not aware how to process #{related_file.class}"
+      end
       self.generic_storage << related_file
     end
-
   end
-
 end

data/lib/rubyXL/objects/root.rb

@@ -5,7 +5,6 @@ require 'rubyXL/objects/content_types'
 require 'rubyXL/objects/workbook'
 
 module RubyXL
-
   class WorkbookRoot
     @@debug = $DEBUG
 
@@ -82,5 +81,4 @@ module RubyXL
       root
     end
   end
-
 end

data/lib/rubyXL/objects/shared_strings.rb

@@ -3,15 +3,14 @@ require 'rubyXL/objects/text'
 require 'rubyXL/objects/extensions'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_sst.html
   class SharedStringsTable < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings'.freeze
 
     # According to http://msdn.microsoft.com/en-us/library/office/gg278314.aspx,
     # +count+ and +uniqueCount+ may be either both missing, or both present. Need to validate.
-    define_attribute(:uniqueCount,  :int)
+    define_attribute(:uniqueCount, :int)
     define_child_node(RubyXL::RichText, :collection => :with_count, :node_name => 'si', :accessor => :strings)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'sst'
@@ -64,7 +63,5 @@ module RubyXL
     def xlsx_path
       ROOT.join('xl', 'sharedStrings.xml')
     end
-
   end
-
 end

data/lib/rubyXL/objects/sheet_common.rb

@@ -2,7 +2,6 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/storage'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_webPublishItem-1.html
   class WebPublishingItem < OOXMLObject
     define_attribute(:id,              :int,    :required => true)
@@ -12,7 +11,7 @@ module RubyXL
     define_attribute(:sourceObject,    :string)
     define_attribute(:destinationFile, :string, :required => true)
     define_attribute(:title,           :string)
-    define_attribute(:autoRepublish,   :bool,   :default => false)
+    define_attribute(:autoRepublish,   :bool, :default => false)
     define_element_name 'webPublishItem'
   end
 
@@ -47,5 +46,4 @@ module RubyXL
     define_child_node(RubyXL::StringNode, :node_name => :firstFooter)
     define_element_name 'headerFooter'
   end
-
 end

data/lib/rubyXL/objects/sheet_data.rb

@@ -3,9 +3,18 @@ require 'rubyXL/objects/simple_types'
 require 'rubyXL/objects/text'
 require 'rubyXL/objects/formula'
 require 'rubyXL/cell'
-require 'rubyXL/convenience_methods'
 
 module RubyXL
+  # http://msdn.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.cellvalues(v=office.14).aspx
+  module DataType
+    SHARED_STRING = 's'
+    RAW_STRING    = 'str'
+    INLINE_STRING = 'inlineStr'
+    ERROR         = 'e'
+    BOOLEAN       = 'b'
+    NUMBER        = 'n'
+    DATE          = 'd' # Only available in Office2010.
+  end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_v-1.html
   class CellValue < OOXMLObject
@@ -25,15 +34,17 @@ module RubyXL
 
     define_attribute(:r,   :ref)
     define_attribute(:s,   :int,  :default => 0, :accessor => :style_index)
-    define_attribute(:t,   RubyXL::ST_CellType,  :accessor => :datatype, :default => 'n' )
+    define_attribute(:t,   RubyXL::ST_CellType,  :accessor => :datatype, :default => 'n')
     define_attribute(:cm,  :int,  :default => 0)
     define_attribute(:vm,  :int,  :default => 0)
     define_attribute(:ph,  :bool, :default => false)
     define_child_node(RubyXL::Formula,   :accessor => :formula)
     define_child_node(RubyXL::CellValue, :accessor => :value_container)
-    define_child_node(RubyXL::RichText)    # is
+    define_child_node(RubyXL::RichText) # is
     define_element_name 'c'
 
+    attr_accessor :worksheet
+
     def index_in_collection
       r.col_range.begin
     end
@@ -63,12 +74,30 @@ module RubyXL
       value_container.value = v
     end
 
+    def get_cell_xf
+      workbook.stylesheet.cell_xfs[self.style_index || 0]
+    end
+
+    def get_cell_font
+      workbook.stylesheet.fonts[get_cell_xf.font_id]
+    end
+
+    def get_cell_border
+      workbook.stylesheet.borders[get_cell_xf.border_id]
+    end
+
     def number_format
       workbook.stylesheet.get_number_format_by_id(get_cell_xf.num_fmt_id)
     end
 
     def is_date?
-      return false unless raw_value =~ NUMBER_REGEXP # Only fully numeric values can be dates
+      return false unless # Only fully numeric values can be dates
+        case raw_value
+        when Numeric then true
+        when String  then raw_value =~ NUMBER_REGEXP
+        else false
+        end
+
       num_fmt = self.number_format
       num_fmt && num_fmt.is_date_format?
     end
@@ -83,9 +112,10 @@ module RubyXL
       when RubyXL::DataType::INLINE_STRING then is.to_s
       when RubyXL::DataType::RAW_STRING    then raw_value
       else
-        if is_date? then workbook.num_to_date(r.to_f)
+        if is then is.to_s
+        elsif is_date? then workbook.num_to_date(r.to_f)
         elsif r.is_a?(String) && (r =~ NUMBER_REGEXP) then # Numeric
-          if $1 != '' then r.to_f
+          if Regexp.last_match(1) != '' then r.to_f
           else r.to_i
           end
         else r
@@ -95,13 +125,12 @@ module RubyXL
 
     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}>"
+      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
 
 #TODO#<row r="1" spans="1:1" x14ac:dyDescent="0.25">
@@ -186,7 +215,5 @@ module RubyXL
     def size
       rows.size
     end
-
   end
-
 end