rubyXL 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffb91460026cf30dfbf10d1d1461f7e31ed08ab4
-  data.tar.gz: f2252518b4746190e8b9961de5c7e8cd7144ab06
+  metadata.gz: 5b3e7eb25a62c6d11a50274d25c256a31892d801
+  data.tar.gz: 8f385b590cb94e26b71d81940fe49162f84f2815
 SHA512:
-  metadata.gz: 1547a5b7923c072f332e2ac7dbb73b0cdbd7af5ce2b1bc15f8b19552ebbfd62fd6fe1bcabb54970b73409d8eecf4fca5a3b1921b83170d736fdd11dce1b8b33f
-  data.tar.gz: d8ecbc5d39b25f04f80358c5932f09e170957d7f5f4ccc88f257a9229c3e470325ff0bcdf6883e1db98f102f1c2a70c0143528a701fe4258d9f3df1451115d98
+  metadata.gz: 5cf9100fdf96e26460366bf8c51ca272466cdc95bf00b2774b814815e89bba14e75bd4e4f7af12af56f8214ec70118ba455021328029df3573ff9d786410f2fb
+  data.tar.gz: ca5f226ce40149f4ff34cc74cc50c0cf667955f7b361e7b491beeca8168f3170966515020c612b610693721b688b856436fa0f679874547288a2f0c37cb04fe9

data/README.rdoc

@@ -1,5 +1,6 @@
 = rubyXL
-{<img src="https://codeclimate.com/github/weshatheleopard/rubyXL.png">}[https://codeclimate.com/github/weshatheleopard/rubyXL]
+{<img src="https://badge.fury.io/rb/rubyXL.svg" alt="Gem Version" />}[http://badge.fury.io/rb/rubyXL]
+{<img src="https://codeclimate.com/github/weshatheleopard/rubyXL.png" alt="Code Climate" />}[https://codeclimate.com/github/weshatheleopard/rubyXL]
 
 == To Install:
   gem install rubyXL

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.2.1

data/lib/rubyXL.rb

@@ -1,6 +1,11 @@
 require 'rubyXL/objects/root'
-require 'rubyXL/objects/reference'
 require 'rubyXL/parser'
 
 module RubyXL
+
+  def self.from_root(path)
+    return path unless path.absolute?
+    path.relative_path_from(OOXMLTopLevelObject::ROOT)
+  end
+
 end

data/lib/rubyXL/objects/border.rb

@@ -6,12 +6,8 @@ module RubyXL
   class BorderEdge < OOXMLObject
     define_attribute(:style, RubyXL::ST_BorderStyle, :default => 'none')
     define_child_node(RubyXL::Color)
-
-    def ==(other)
-      style == other.style
-    end
   end
-
+
   # http://www.schemacentral.com/sc/ooxml/e-ssml_border-2.html
   class Border < OOXMLObject
     define_attribute(:diagonalUp,   :bool)
@@ -25,7 +21,7 @@ module RubyXL
     define_child_node(RubyXL::BorderEdge, :node_name => :vertical)
     define_child_node(RubyXL::BorderEdge, :node_name => :horizontal)
     define_element_name 'border'
-
+
     def get_edge_style(direction)
       edge = self.send(direction)
       edge && edge.style
@@ -34,31 +30,17 @@ module RubyXL
     def set_edge_style(direction, style)
       self.send("#{direction}=", RubyXL::BorderEdge.new(:style => style))
     end
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_borders-1.html
+  class Borders < OOXMLContainerObject
+    define_child_node(RubyXL::Border, :collection => :with_count)
+    define_element_name 'borders'
 
-    def ==(other)
-      (diagonal_up == other.diagonal_up) &&
-        (diagonal_down == other.diagonal_down) &&
-        (outline == other.outline) &&
-        (left == other.left) &&
-        (right == other.right) &&
-        (top == other.top) &&
-        (bottom == other.bottom) &&
-        (diagonal == other.diagonal) &&
-        (vertical == other.vertical) &&
-        (horizontal == other.horizontal)
+    def self.defaults
+      self.new(:_ => [ RubyXL::Border.new ])
     end
 
-  end
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_borders-1.html
-  class Borders < OOXMLContainerObject
-    define_child_node(RubyXL::Border, :collection => :with_count)
-    define_element_name 'borders'
-
-    def self.defaults
-      self.new(:_ => [ RubyXL::Border.new ])
-    end
-
-  end
-
-end
+  end
+
+end

data/lib/rubyXL/objects/calculation_chain.rb

@@ -1,31 +1,31 @@
-require 'rubyXL/objects/ooxml_object'
-require 'rubyXL/objects/extensions'
-
-module RubyXL
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_c-1.html
-  class CalculationChainCell < OOXMLObject
-    define_attribute(:r, :ref,  :accessor => :ref)
-    define_attribute(:i, :int,  :accessor => :sheet_id,    :default => 0)
-    define_attribute(:s, :bool, :accessor => :child_chain, :default => false)
-    define_attribute(:l, :bool, :accessor => :new_dep_lvl, :default => false)
-    define_attribute(:t, :bool, :accessor => :new_thread,  :default => false)
-    define_attribute(:a, :bool, :accessor => :array,       :default => false)
-    define_element_name 'c'
-  end
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_calcChain.html
-  class CalculationChain < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/calcChain'
-
-    define_child_node(RubyXL::CalculationChainCell, :collection => true, :accessor => :cells)
-    define_child_node(RubyXL::ExtensionStorageArea)
-
-    define_element_name 'calcChain'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '')
-
-    def xlsx_path
-      ROOT.join('xl', 'calcChain.xml')
-    end
-  end
-end
+require 'rubyXL/objects/ooxml_object'
+require 'rubyXL/objects/extensions'
+
+module RubyXL
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_c-1.html
+  class CalculationChainCell < OOXMLObject
+    define_attribute(:r, :ref,  :accessor => :ref)
+    define_attribute(:i, :int,  :accessor => :sheet_id,    :default => 0)
+    define_attribute(:s, :bool, :accessor => :child_chain, :default => false)
+    define_attribute(:l, :bool, :accessor => :new_dep_lvl, :default => false)
+    define_attribute(:t, :bool, :accessor => :new_thread,  :default => false)
+    define_attribute(:a, :bool, :accessor => :array,       :default => false)
+    define_element_name 'c'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_calcChain.html
+  class CalculationChain < OOXMLTopLevelObject
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/calcChain'
+
+    define_child_node(RubyXL::CalculationChainCell, :collection => true, :accessor => :cells)
+    define_child_node(RubyXL::ExtensionStorageArea)
+
+    define_element_name 'calcChain'
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '')
+
+    def xlsx_path
+      ROOT.join('xl', 'calcChain.xml')
+    end
+  end
+end

data/lib/rubyXL/objects/cell_style.rb

@@ -1,79 +1,65 @@
-require 'rubyXL/objects/ooxml_object'
-require 'rubyXL/objects/simple_types'
-
-module RubyXL
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_cellStyle-1.html
-  class CellStyle < OOXMLObject
-    define_attribute(:name,          :string)
-    define_attribute(:xfId,          :int,  :required => true)
-    define_attribute(:builtinId,     :int)
-    define_attribute(:iLevel,        :int)
-    define_attribute(:hidden,        :bool)
-    define_attribute(:customBuiltin, :bool)
-    define_element_name 'cellStyle'
-  end
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_alignment-1.html
-  class Alignment < OOXMLObject
-    define_attribute(:horizontal,      RubyXL::ST_HorizontalAlignment)
-    define_attribute(:vertical,        RubyXL::ST_VerticalAlignment)
-    define_attribute(:textRotation,    :int)
-    define_attribute(:wrapText,        :bool)
-    define_attribute(:indent,          :int)
-    define_attribute(:relativeIndent,  :int)
-    define_attribute(:justifyLastLine, :bool)
-    define_attribute(:shrinkToFit,     :bool)
-    define_attribute(:readingOrder,    :int)
-    define_element_name 'alignment'
-  end
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_protection-1.html
-  class Protection < OOXMLObject
-    define_attribute(:locked, :bool)
-    define_attribute(:hidden, :bool)
-    define_element_name 'protection'
-  end
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_xf-1.html
-  class XF < OOXMLObject
-    define_attribute(:numFmtId,          :int)
-    define_attribute(:fontId,            :int)
-    define_attribute(:fillId,            :int)
-    define_attribute(:borderId,          :int)
-    define_attribute(:xfId,              :int)
-    define_attribute(:quotePrefix,       :bool, :default => false )
-    define_attribute(:pivotButton,       :bool, :default => false )
-    define_attribute(:applyNumberFormat, :bool)
-    define_attribute(:applyFont,         :bool)
-    define_attribute(:applyFill,         :bool)
-    define_attribute(:applyBorder,       :bool)
-    define_attribute(:applyAlignment,    :bool)
-    define_attribute(:applyProtection,   :bool)
-    define_child_node(RubyXL::Alignment)
-    define_child_node(RubyXL::Protection)
-    define_element_name 'xf'
-
-    def ==(other)
-      (self.num_fmt_id == other.num_fmt_id) &&
-        (self.font_id    == other.font_id) &&
-        (self.fill_id    == other.fill_id) &&
-        (self.border_id  == other.border_id) &&
-        (self.apply_number_format == other.apply_number_format) &&
-        (self.apply_font          == other.apply_font) &&
-        (self.apply_fill          == other.apply_fill) &&
-        (self.apply_border        == other.apply_border) &&
-        (self.apply_alignment     == other.apply_alignment) &&
-        (self.apply_protection    == other.apply_protection) &&
-        (self.xf_id               == other.xf_id)
-    end
-  end
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_numFmt-1.html
-  class NumFmt < OOXMLObject
-    define_attribute(:numFmtId,   :int,    :required => true)
-    define_attribute(:formatCode, :string, :required => true)
-    define_element_name 'numFmt'
-  end
-
-end
+require 'rubyXL/objects/ooxml_object'
+require 'rubyXL/objects/simple_types'
+
+module RubyXL
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_cellStyle-1.html
+  class CellStyle < OOXMLObject
+    define_attribute(:name,          :string)
+    define_attribute(:xfId,          :int,  :required => true)
+    define_attribute(:builtinId,     :int)
+    define_attribute(:iLevel,        :int)
+    define_attribute(:hidden,        :bool)
+    define_attribute(:customBuiltin, :bool)
+    define_element_name 'cellStyle'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_alignment-1.html
+  class Alignment < OOXMLObject
+    define_attribute(:horizontal,      RubyXL::ST_HorizontalAlignment)
+    define_attribute(:vertical,        RubyXL::ST_VerticalAlignment)
+    define_attribute(:textRotation,    :int)
+    define_attribute(:wrapText,        :bool)
+    define_attribute(:indent,          :int)
+    define_attribute(:relativeIndent,  :int)
+    define_attribute(:justifyLastLine, :bool)
+    define_attribute(:shrinkToFit,     :bool)
+    define_attribute(:readingOrder,    :int)
+    define_element_name 'alignment'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_protection-1.html
+  class Protection < OOXMLObject
+    define_attribute(:locked, :bool)
+    define_attribute(:hidden, :bool)
+    define_element_name 'protection'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_xf-1.html
+  class XF < OOXMLObject
+    define_attribute(:numFmtId,          :int)
+    define_attribute(:fontId,            :int)
+    define_attribute(:fillId,            :int)
+    define_attribute(:borderId,          :int)
+    define_attribute(:xfId,              :int)
+    define_attribute(:quotePrefix,       :bool, :default => false )
+    define_attribute(:pivotButton,       :bool, :default => false )
+    define_attribute(:applyNumberFormat, :bool)
+    define_attribute(:applyFont,         :bool)
+    define_attribute(:applyFill,         :bool)
+    define_attribute(:applyBorder,       :bool)
+    define_attribute(:applyAlignment,    :bool)
+    define_attribute(:applyProtection,   :bool)
+    define_child_node(RubyXL::Alignment)
+    define_child_node(RubyXL::Protection)
+    define_element_name 'xf'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_numFmt-1.html
+  class NumFmt < OOXMLObject
+    define_attribute(:numFmtId,   :int,    :required => true)
+    define_attribute(:formatCode, :string, :required => true)
+    define_element_name 'numFmt'
+  end
+
+end

data/lib/rubyXL/objects/chartsheet.rb

@@ -5,88 +5,88 @@ require 'rubyXL/objects/relationships'
 require 'rubyXL/objects/sheet_common'
 
 module RubyXL
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetProtection-4.html
-  class ChartsheetProtection < OOXMLObject
-    define_attribute(:password, :string)
-    define_attribute(:content,  :bool, :default => false)
-    define_attribute(:objects,  :bool, :default => false)
-    define_element_name 'sheetProtection'
-  end
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetPr-4.html
-  class ChartsheetProperties < OOXMLObject
-    define_attribute(:published,                         :bool, :default => true)
-    define_attribute(:codeName,                          :string)
-    define_child_node(RubyXL::Color, :node_name => :tabColor)
-    define_element_name 'sheetPr'
-  end
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_pageSetup-5.html
-  class ChartsheetPageSetup < OOXMLObject
-    define_attribute(:paperSize,          :int,    :default => 1)
-    define_attribute(:firstPageNumber,    :int,    :default => 1)
-    define_attribute(:orientation,        RubyXL::ST_Orientation, :default => 'default')
-    define_attribute(:usePrinterDefaults, :bool,   :default => true)
-    define_attribute(:blackAndWhite,      :bool,   :default => false)
-    define_attribute(:draft,              :bool,   :default => false)
-    define_attribute(:useFirstPageNumber, :bool,   :default => false)
-    define_attribute(:horizontalDpi,      :int,    :default => 600)
-    define_attribute(:verticalDpi,        :int,    :default => 600)
-    define_attribute(:copies,             :int,    :default => 1)
-    define_attribute(:'r:id',             :string)
-    define_element_name 'pageSetup'
-  end
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetView-2.html
-  class ChartsheetView < OOXMLObject
-    define_attribute(:tabSelected,    :bool,  :default => false)
-    define_attribute(:zoomScale,      :int,   :default => 100)
-    define_attribute(:workbookViewId, :int,   :required => true, :default => 0 )
-    define_attribute(:zoomToFit,      :bool,  :default => false)
-    define_child_node(RubyXL::ExtensionStorageArea)
-    define_element_name 'sheetView'
-  end
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetViews-4.html
-  class ChartsheetViews < OOXMLObject
-    define_child_node(RubyXL::ChartsheetView, :collection => true)
-    define_child_node(RubyXL::ExtensionStorageArea)
-    define_element_name 'sheetViews'
-  end
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_chartsheet.html
-  class Chartsheet < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartsheet'
-
-    include RubyXL::RelationshipSupport
-    define_relationship(RubyXL::DrawingFile)
-
-    attr_accessor :state, :rels
-    attr_accessor :workbook, :sheet_name, :sheet_id
-
-    define_child_node(RubyXL::ChartsheetProperties)
-    define_child_node(RubyXL::ChartsheetViews)
-    define_child_node(RubyXL::ChartsheetProtection)
-    define_child_node(RubyXL::CustomSheetViews)
-    define_child_node(RubyXL::PageMargins)
-    define_child_node(RubyXL::ChartsheetPageSetup)
-    define_child_node(RubyXL::HeaderFooterSettings)
-    define_child_node(RubyXL::RID, :node_name => :drawing)
-    define_child_node(RubyXL::RID, :node_name => :legacyDrawing)
-    define_child_node(RubyXL::RID, :node_name => :legacyDrawingHF)
-    define_child_node(RubyXL::RID, :node_name => :picture)
-    define_child_node(RubyXL::WebPublishingItems)
-    define_child_node(RubyXL::ExtensionStorageArea)
-    define_element_name 'chartsheet'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
-                   'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
-
-    def xlsx_path
-      ROOT.join('xl', 'chartsheets', "sheet#{file_index}.xml")
-    end
-
-  end
-
-end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetProtection-4.html
+  class ChartsheetProtection < OOXMLObject
+    define_attribute(:password, :string)
+    define_attribute(:content,  :bool, :default => false)
+    define_attribute(:objects,  :bool, :default => false)
+    define_element_name 'sheetProtection'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetPr-4.html
+  class ChartsheetProperties < OOXMLObject
+    define_attribute(:published,                         :bool, :default => true)
+    define_attribute(:codeName,                          :string)
+    define_child_node(RubyXL::Color, :node_name => :tabColor)
+    define_element_name 'sheetPr'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_pageSetup-5.html
+  class ChartsheetPageSetup < OOXMLObject
+    define_attribute(:paperSize,          :int,    :default => 1)
+    define_attribute(:firstPageNumber,    :int,    :default => 1)
+    define_attribute(:orientation,        RubyXL::ST_Orientation, :default => 'default')
+    define_attribute(:usePrinterDefaults, :bool,   :default => true)
+    define_attribute(:blackAndWhite,      :bool,   :default => false)
+    define_attribute(:draft,              :bool,   :default => false)
+    define_attribute(:useFirstPageNumber, :bool,   :default => false)
+    define_attribute(:horizontalDpi,      :int,    :default => 600)
+    define_attribute(:verticalDpi,        :int,    :default => 600)
+    define_attribute(:copies,             :int,    :default => 1)
+    define_attribute(:'r:id',             :string)
+    define_element_name 'pageSetup'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetView-2.html
+  class ChartsheetView < OOXMLObject
+    define_attribute(:tabSelected,    :bool,  :default => false)
+    define_attribute(:zoomScale,      :int,   :default => 100)
+    define_attribute(:workbookViewId, :int,   :required => true, :default => 0 )
+    define_attribute(:zoomToFit,      :bool,  :default => false)
+    define_child_node(RubyXL::ExtensionStorageArea)
+    define_element_name 'sheetView'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetViews-4.html
+  class ChartsheetViews < OOXMLObject
+    define_child_node(RubyXL::ChartsheetView, :collection => true)
+    define_child_node(RubyXL::ExtensionStorageArea)
+    define_element_name 'sheetViews'
+  end
+
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_chartsheet.html
+  class Chartsheet < OOXMLTopLevelObject
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartsheet'
+
+    include RubyXL::RelationshipSupport
+    define_relationship(RubyXL::DrawingFile)
+
+    attr_accessor :state, :rels
+    attr_accessor :workbook, :sheet_name, :sheet_id
+
+    define_child_node(RubyXL::ChartsheetProperties)
+    define_child_node(RubyXL::ChartsheetViews)
+    define_child_node(RubyXL::ChartsheetProtection)
+    define_child_node(RubyXL::CustomSheetViews)
+    define_child_node(RubyXL::PageMargins)
+    define_child_node(RubyXL::ChartsheetPageSetup)
+    define_child_node(RubyXL::HeaderFooterSettings)
+    define_child_node(RubyXL::RID, :node_name => :drawing)
+    define_child_node(RubyXL::RID, :node_name => :legacyDrawing)
+    define_child_node(RubyXL::RID, :node_name => :legacyDrawingHF)
+    define_child_node(RubyXL::RID, :node_name => :picture)
+    define_child_node(RubyXL::WebPublishingItems)
+    define_child_node(RubyXL::ExtensionStorageArea)
+    define_element_name 'chartsheet'
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => '',
+                   'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
+
+    def xlsx_path
+      ROOT.join('xl', 'chartsheets', "sheet#{file_index}.xml")
+    end
+
+  end
+
+end