rubyXL 2.2.0 → 2.3.0

data/lib/rubyXL/objects/relationships.rb

@@ -30,8 +30,8 @@ module RubyXL
     def before_write_xml
       self.relationships = []
 
-      @workbook.worksheets.each_index { |i|
-        relationships << create_relationship("worksheets/sheet#{i + 1}.xml", 'worksheet')
+      @workbook.worksheets.each_with_index { |sheet, i|
+        relationships << create_relationship(sheet.filepath.gsub(/^xl\//, ''), sheet.rel_type)
       }
 
       @workbook.external_links.each_key { |k| 

data/lib/rubyXL/objects/sheet_common.rb

@@ -16,8 +16,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_webPublishItems-1.html
-  class WebPublishingItemContainer < OOXMLObject
-    define_child_node(RubyXL::WebPublishingItem, :collection => :with_count, :accessor => :web_items)
+  class WebPublishingItems < OOXMLContainerObject
+    define_child_node(RubyXL::WebPublishingItem, :collection => :with_count)
     define_element_name 'webPublishItems'
   end
 

data/lib/rubyXL/objects/stylesheet.rb

@@ -21,11 +21,11 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_numFmts-1.html
-  class NumberFormatContainer < OOXMLObject
-    define_child_node(RubyXL::NumberFormat, :collection => :with_count, :accessor => :number_formats)
+  class NumberFormats < OOXMLContainerObject
+    define_child_node(RubyXL::NumberFormat, :collection => :with_count)
     define_element_name 'numFmts'
 
-    DEFAULT_NUMBER_FORMATS = self.new(:number_formats => [
+    DEFAULT_NUMBER_FORMATS = self.new(:_ => [
       RubyXL::NumberFormat.new(:num_fmt_id => 1, :format_code => '0'),
       RubyXL::NumberFormat.new(:num_fmt_id => 2, :format_code => '0.00'),
       RubyXL::NumberFormat.new(:num_fmt_id => 3, :format_code => '#, ##0'),
@@ -60,28 +60,28 @@ module RubyXL
     ])
 
     def find_by_format_id(format_id)
-      number_formats.find { |fmt| fmt.num_fmt_id == format_id }
+      self.find { |fmt| fmt.num_fmt_id == format_id }
     end
 
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_cellStyleXfs-1.html
-  class CellStyleXFContainer < OOXMLObject
-    define_child_node(RubyXL::XF, :collection => :with_count, :accessor => :cell_style_xfs)
+  class CellStyleXFs < OOXMLContainerObject
+    define_child_node(RubyXL::XF, :collection => :with_count)
     define_element_name 'cellStyleXfs'
 
     def self.defaults
-      self.new(:cell_style_xfs => [ RubyXL::XF.new(:num_fmt_id => 0, :font_id => 0, :fill_id => 0, :border_id => 0) ])
+      self.new(:_ => [ RubyXL::XF.new(:num_fmt_id => 0, :font_id => 0, :fill_id => 0, :border_id => 0) ])
     end
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_cellXfs-1.html
-  class CellXFContainer < OOXMLObject
-    define_child_node(RubyXL::XF, :collection => :with_count, :accessor => :xfs)
+  class CellXFs < OOXMLContainerObject
+    define_child_node(RubyXL::XF, :collection => :with_count)
     define_element_name 'cellXfs'
 
     def self.defaults
-      self.new(:xfs => [ 
+      self.new(:_ => [ 
                  RubyXL::XF.new(
                    :num_fmt_id => 0, :font_id => 0, :fill_id => 0, :border_id => 0, :xfId => 0
                  )
@@ -90,12 +90,12 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_cellStyles-1.html
-  class CellStyleContainer < OOXMLObject
-    define_child_node(RubyXL::CellStyle, :collection => :with_count, :accessor => :cell_styles)
+  class CellStyles < OOXMLContainerObject
+    define_child_node(RubyXL::CellStyle, :collection => :with_count)
     define_element_name 'cellStyles'
 
     def self.defaults
-      self.new(:cell_styles => [ RubyXL::CellStyle.new(:builtin_id => 0, :name => 'Normal', :xf_id => 0) ])
+      self.new(:_ => [ RubyXL::CellStyle.new(:builtin_id => 0, :name => 'Normal', :xf_id => 0) ])
     end
   end
 
@@ -127,7 +127,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_tableStyles-1.html
-  class TableStyles < OOXMLObject
+  class TableStyles < OOXMLContainerObject
     define_attribute(:defaultTableStyle, :string)
     define_attribute(:defaultPivotStyle, :string)
     define_child_node(RubyXL::TableStyle, :collection => :with_count)
@@ -140,33 +140,33 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_colors-1.html
-  class IndexedColorContainer < OOXMLObject
-    define_child_node(RubyXL::Color, :collection => :true, :accessor => :indexed_colors, :node_name => :rgbColor)
+  class IndexedColors < OOXMLContainerObject
+    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 MRUColorContainer < OOXMLObject
-    define_child_node(RubyXL::Color, :collection => :true, :accessor => :mru_colors)
+  class MRUColors < OOXMLContainerObject
+    define_child_node(RubyXL::Color, :collection => :true)
     define_element_name 'mruColors'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_colors-1.html
   class Colors < OOXMLObject
-    define_child_node(RubyXL::IndexedColorContainer, :accessor => :indexed_color_container)
-    define_child_node(RubyXL::MRUColorContainer)
+    define_child_node(RubyXL::IndexedColors)
+    define_child_node(RubyXL::MRUColors)
     define_element_name 'colors'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_styleSheet.html
   class Stylesheet < OOXMLTopLevelObject
-    define_child_node(RubyXL::NumberFormatContainer, :accessor => :number_format_container)
-    define_child_node(RubyXL::FontContainer,         :accessor => :font_container)
-    define_child_node(RubyXL::FillContainer,         :accessor => :fill_container)
-    define_child_node(RubyXL::BorderContainer,       :accessor => :border_container)
-    define_child_node(RubyXL::CellStyleXFContainer,  :accessor => :cell_style_xf_container)
-    define_child_node(RubyXL::CellXFContainer,       :accessor => :cell_xf_container)
-    define_child_node(RubyXL::CellStyleContainer,    :accessor => :cell_style_container)
+    define_child_node(RubyXL::NumberFormats, :accessor => :number_formats)
+    define_child_node(RubyXL::Fonts)
+    define_child_node(RubyXL::Fills)
+    define_child_node(RubyXL::Borders)
+    define_child_node(RubyXL::CellStyleXFs)
+    define_child_node(RubyXL::CellXFs)
+    define_child_node(RubyXL::CellStyles)
     define_child_node(RubyXL::DXFs)
     define_child_node(RubyXL::TableStyles)
     define_child_node(RubyXL::Colors)
@@ -188,20 +188,20 @@ module RubyXL
     end
 
     def self.default
-      self.new(:cell_xf_container       => RubyXL::CellXFContainer.defaults,
-               :font_container          => RubyXL::FontContainer.defaults,
-               :fill_container          => RubyXL::FillContainer.defaults,
-               :border_container        => RubyXL::BorderContainer.defaults, 
-               :cell_style_container    => RubyXL::CellStyleContainer.defaults,
-               :cell_style_xf_container => RubyXL::CellStyleXFContainer.defaults)
+      self.new(:fonts          => RubyXL::Fonts.defaults,
+               :fills          => RubyXL::Fills.defaults,
+               :borders        => RubyXL::Borders.defaults,
+               :cell_xfs       => RubyXL::CellXFs.defaults,
+               :cell_styles    => RubyXL::CellStyles.defaults,
+               :cell_style_xfs => RubyXL::CellStyleXFs.defaults)
     end
 
     def get_number_format_by_id(format_id)
       @format_hash ||= {}
       
       if @format_hash[format_id].nil? then
-        @format_hash[format_id] = NumberFormatContainer::DEFAULT_NUMBER_FORMATS.find_by_format_id(format_id) ||
-                                    (number_format_container && number_format_container.find_by_format_id(format_id))
+        @format_hash[format_id] = NumberFormats::DEFAULT_NUMBER_FORMATS.find_by_format_id(format_id) ||
+                                    (number_formats && number_formats.find_by_format_id(format_id))
       end
 
       @format_hash[format_id]

data/lib/rubyXL/objects/workbook.rb

@@ -77,7 +77,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_bookViews-1.html
-  class WorkbookViews < OOXMLObject
+  class WorkbookViews < OOXMLContainerObject
     define_child_node(RubyXL::WorkbookView, :collection => true)
     define_element_name 'bookViews'
   end
@@ -92,8 +92,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_sheets-1.html
-  class Sheets < OOXMLObject
-    define_child_node(RubyXL::Sheet, :collection => true, :accessor => :sheets)
+  class Sheets < OOXMLContainerObject
+    define_child_node(RubyXL::Sheet, :collection => true)
     define_element_name 'sheets'
   end
 
@@ -104,8 +104,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_externalReferences-1.html
-  class ExternalReferences < OOXMLObject
-    define_child_node(RubyXL::ExternalReference, :collection => true, :accessor => :ext_refs)
+  class ExternalReferences < OOXMLContainerObject
+    define_child_node(RubyXL::ExternalReference, :collection => true)
     define_element_name 'externalReferences'
   end
 
@@ -134,8 +134,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_definedName-2.html
-  class DefinedNames < OOXMLObject
-    define_child_node(RubyXL::DefinedName, :collection => true, :accessor => :defined_names)
+  class DefinedNames < OOXMLContainerObject
+    define_child_node(RubyXL::DefinedName, :collection => true)
     define_element_name 'definedNames'
   end
 
@@ -147,8 +147,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_pivotCaches-1.html
-  class PivotCaches < OOXMLObject
-    define_child_node(RubyXL::PivotCache, :collection => true, :accessor => :pivot_caches)
+  class PivotCaches < OOXMLContainerObject
+    define_child_node(RubyXL::PivotCache, :collection => true)
     define_element_name 'pivotCaches'
   end
 
@@ -210,8 +210,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_webPublishObjects-1.html
-  class WebPublishObjectContainer < OOXMLObject
-    define_child_node(RubyXL::WebPublishObject, :collection => :with_count, :node_name => :web_publish_objects)
+  class WebPublishObjects < OOXMLContainerObject
+    define_child_node(RubyXL::WebPublishObject, :collection => :with_count)
     define_element_name 'webPublishObjects'
   end
 
@@ -231,8 +231,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_smartTagTypes-1.html
-  class SmartTagTypeContainer < OOXMLObject
-    define_child_node(RubyXL::SmartTagType, :collection => :true, :node_name => :smart_tag_types)
+  class SmartTagTypes < OOXMLContainerObject
+    define_child_node(RubyXL::SmartTagType, :collection => :true)
     define_element_name 'smartTagTypes'
   end
 
@@ -243,9 +243,9 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_functionGroups-1.html
-  class FunctionGroupContainer < OOXMLObject
+  class FunctionGroups < OOXMLContainerObject
     define_attribute(:builtInGroupCountpi, :int, :default => 16)
-    define_child_node(RubyXL::FunctionGroup, :collection => :true, :node_name => :function_group)
+    define_child_node(RubyXL::FunctionGroup, :collection => :true)
     define_element_name 'functionGroups'
   end
 
@@ -280,12 +280,11 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_customWorkbookViews-1.html
-  class CustomWorkbookViewContainer < OOXMLObject
-    define_child_node(RubyXL::CustomWorkbookView, :collection => true, :accessor => :custom_views)
+  class CustomWorkbookViews < OOXMLContainerObject
+    define_child_node(RubyXL::CustomWorkbookView, :collection => true)
     define_element_name 'customWorkbookView'
   end
-
-
+
   # http://www.schemacentral.com/sc/ooxml/e-ssml_workbook.html
   class Workbook < OOXMLTopLevelObject
     define_child_node(RubyXL::FileVersion)
@@ -293,19 +292,19 @@ module RubyXL
     define_child_node(RubyXL::WorkbookProperties, :accessor => :workbook_properties)
     define_child_node(RubyXL::WorkbookProtection)
     define_child_node(RubyXL::WorkbookViews)
-    define_child_node(RubyXL::Sheets,             :accessor => :worksheet_container)
-    define_child_node(RubyXL::FunctionGroupContainer, :accessor => :function_group_container)
-    define_child_node(RubyXL::ExternalReferences, :accessor => :ext_ref_container)
-    define_child_node(RubyXL::DefinedNames,       :accessor => :defined_name_container)
+    define_child_node(RubyXL::Sheets)
+    define_child_node(RubyXL::FunctionGroups)
+    define_child_node(RubyXL::ExternalReferences)
+    define_child_node(RubyXL::DefinedNames)
     define_child_node(RubyXL::CalculationProperties)
     define_child_node(RubyXL::OLESize)
-    define_child_node(RubyXL::CustomWorkbookViewContainer, :accessor => :custom_view_container)
-    define_child_node(RubyXL::PivotCaches, :accessor => :pivot_cache_container)
+    define_child_node(RubyXL::CustomWorkbookViews)
+    define_child_node(RubyXL::PivotCaches)
     define_child_node(RubyXL::SmartTagProperties)
-    define_child_node(RubyXL::SmartTagTypeContainer)
+    define_child_node(RubyXL::SmartTagTypes)
     define_child_node(RubyXL::WebPublishingProperties)
     define_child_node(RubyXL::FileRecoveryProperties)
-    define_child_node(RubyXL::WebPublishObjectContainer)
+    define_child_node(RubyXL::WebPublishObjects)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_child_node(RubyXL::AlternateContent)
 

data/lib/rubyXL/objects/worksheet.rb

@@ -87,7 +87,7 @@ module RubyXL
     define_element_name 'pageSetup'
   end
 
-  class TableParts < OOXMLObject
+  class TableParts < OOXMLContainerObject
     define_child_node(RubyXL::RID, :collection => :with_count, :node_name => :table_part)
     define_element_name 'tableParts'
   end
@@ -99,7 +99,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_mergeCells-1.html
-  class MergedCells < OOXMLObject
+  class MergedCells < OOXMLContainerObject
     define_child_node(RubyXL::MergedCell, :collection => :with_count)
     define_element_name 'mergeCells'
   end
@@ -130,7 +130,7 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_protectedRanges-1.html
-  class ProtectedRanges < OOXMLObject
+  class ProtectedRanges < OOXMLContainerObject
     define_child_node(RubyXL::ProtectedRange, :collection => true)
     define_element_name 'protectedRanges'
   end
@@ -227,16 +227,16 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_rowBreaks-1.html
-  class BreakList < OOXMLObject
+  class BreakList < OOXMLContainerObject
     define_attribute(:manualBreakCount, :int, :default => 0)
     define_child_node(RubyXL::Break, :collection => :with_count)
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_conditionalFormatting-1.html
-  class ConditionalFormatting < OOXMLObject
+  class ConditionalFormatting < OOXMLContainerObject
     define_attribute(:pivot, :bool, :default => false)
     define_attribute(:sqref, :sqref)
-    define_child_node(RubyXL::ConditionalFormattingRule, :collection => true, :accessor => :cf_rules)
+    define_child_node(RubyXL::ConditionalFormattingRule, :collection => true)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'conditionalFormatting'
   end
@@ -263,11 +263,11 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_scenarios-1.html
-  class ScenarioContainer < OOXMLObject
+  class Scenarios < OOXMLContainerObject
     define_attribute(:current, :int)
     define_attribute(:show,    :int)
     define_attribute(:sqref,   :sqref)
-    define_child_node(RubyXL::Scenario, :collection => true, :accessor => :scenarios)
+    define_child_node(RubyXL::Scenario, :collection => true)
     define_element_name 'scenarios'
   end
 
@@ -288,8 +288,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_ignoredErrors-1.html
-  class IgnoredErrorContainer < OOXMLObject
-    define_child_node(RubyXL::IgnoredError, :collection => true, :accessor => :ignored_errors)
+  class IgnoredErrors < OOXMLContainerObject
+    define_child_node(RubyXL::IgnoredError, :collection => true)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'ignoredErrors'
   end
@@ -305,8 +305,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_hyperlinks-1.html
-  class HyperlinkContainer < OOXMLObject
-    define_child_node(RubyXL::Hyperlink, :colection => true, :accessor => :hyperlinks)
+  class Hyperlinks < OOXMLContainerObject
+    define_child_node(RubyXL::Hyperlink, :colection => true)
     define_element_name 'hyperlinks'
   end
 
@@ -323,8 +323,8 @@ module RubyXL
   end                              
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_oleObjects-1.html
-  class OLEObjects < OOXMLObject
-    define_child_node(RubyXL::OLEObject, :colection => true, :accessor => :ole_objects)
+  class OLEObjects < OOXMLContainerObject
+    define_child_node(RubyXL::OLEObject, :colection => true)
     define_element_name 'oleObjects'
   end                              
 
@@ -338,8 +338,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_dataRefs-1.html
-  class DataConsolidationReferences < OOXMLObject
-    define_child_node(RubyXL::DataConsolidationReference, :collection => :with_count, :accessor => :data_cons_ref)
+  class DataConsolidationReferences < OOXMLContainerObject
+    define_child_node(RubyXL::DataConsolidationReference, :collection => :with_count)
     define_element_name 'dataRefs'
   end
 
@@ -349,7 +349,7 @@ module RubyXL
     define_attribute(:leftLabels, :bool, :default => false)
     define_attribute(:topLabels,  :bool, :default => false)
     define_attribute(:link,       :bool, :default => false)
-    define_child_node(RubyXL::DataConsolidationReferences, :accessor => :data_cons_ref_container)
+    define_child_node(RubyXL::DataConsolidationReferences)
     define_element_name 'dataConsolidate'
   end
 
@@ -420,8 +420,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_customSheetViews-1.html
-  class CustomSheetViews < OOXMLObject
-    define_child_node(RubyXL::CustomSheetView, :collection => true, :accessor => :custom_sheet_view)
+  class CustomSheetViews < OOXMLContainerObject
+    define_child_node(RubyXL::CustomSheetView, :collection => true)
     define_element_name 'customSheetViews'
   end
 
@@ -434,8 +434,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_controls-1.html
-  class EmbeddedControlContainer < OOXMLObject
-    define_child_node(RubyXL::EmbeddedControl, :collection => true, :accessor => :controls)
+  class EmbeddedControls < OOXMLContainerObject
+    define_child_node(RubyXL::EmbeddedControl, :collection => true)
     define_element_name 'controls'
   end
 
@@ -446,8 +446,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_cellWatches-1.html
-  class CellWatchContainer < OOXMLObject
-    define_child_node(RubyXL::CellWatch, :collection => true, :accessor => :cell_watches)
+  class CellWatches < OOXMLContainerObject
+    define_child_node(RubyXL::CellWatch, :collection => true)
     define_element_name 'cellWatches'
   end
 
@@ -468,15 +468,15 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_cellSmartTags-1.html
-  class CellSmartTagContainer < OOXMLObject
+  class CellSmartTags < OOXMLContainerObject
     define_attribute(:r, :ref, :accessor => :ref)
-    define_child_node(RubyXL::CellSmartTag, :collection => :true, :accessor => :cell_smart_tags)
+    define_child_node(RubyXL::CellSmartTag, :collection => :true)
     define_element_name 'cellSmartTags'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_smartTags-1.html
-  class SmartTagContainer < OOXMLObject
-    define_child_node(RubyXL::CellSmartTagContainer, :collection => :true, :accessor => :smart_tags)
+  class SmartTags < OOXMLContainerObject
+    define_child_node(RubyXL::CellSmartTags, :collection => :true)
     define_element_name 'smartTags'
   end
 
@@ -488,8 +488,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_customProperties-1.html
-  class CustomPropertyContainer < OOXMLObject
-    define_child_node(RubyXL::CustomProperty, :collection => :true, :accessor => :custom_props)
+  class CustomProperties < OOXMLContainerObject
+    define_child_node(RubyXL::CustomProperty, :collection => :true)
     define_element_name 'customProperties'
   end
 
@@ -522,8 +522,8 @@ module RubyXL
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_references-1.html
-  class PivotReferenceContainer < OOXMLObject
-    define_child_node(RubyXL::PivotReference, :collection => :with_count, :accessor => :pivot_references)
+  class PivotReferences < OOXMLContainerObject
+    define_child_node(RubyXL::PivotReference, :collection => :with_count)
     define_element_name 'references'
   end
 
@@ -541,7 +541,7 @@ module RubyXL
     define_attribute(:collapsedLevelsAreSubtotals, :bool,   :default => false)
     define_attribute(:axis,          RubyXL::ST_Axis)
     define_attribute(:fieldPosition, :int,    :default => 0)
-    define_child_node(RubyXL::PivotReferenceContainer, :accessor => :pivot_reference_container)
+    define_child_node(RubyXL::PivotReferences)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'pivotArea'
   end
@@ -591,57 +591,57 @@ module RubyXL
     define_attribute(:zoomScalePageLayoutView,  :bool,   :default => 0)
     define_attribute(:workbookViewId,           :int,    :required => true, :default => 0 )
     define_child_node(RubyXL::Pane)
-    define_child_node(RubyXL::Selection, :collection => true, :accessor => :selections )
+    define_child_node(RubyXL::Selection, :collection => true, :accessor => :selections)
     define_child_node(RubyXL::PivotTableSelection, :collection => true, :accessor => :pivot_table_selections )
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'sheetView'
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_sheetViews-3.html
-  class WorksheetViews < OOXMLObject
-    define_child_node(RubyXL::WorksheetView, :collection => true, :accessor => :sheet_views)
+  class WorksheetViews < OOXMLContainerObject
+    define_child_node(RubyXL::WorksheetView, :collection => true)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'sheetViews'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/s-sml-sheet.xsd.html
+  # http://www.schemacentral.com/sc/ooxml/e-ssml_worksheet.html
   class Worksheet < OOXMLTopLevelObject
     define_child_node(RubyXL::WorksheetProperties)
     define_child_node(RubyXL::WorksheetDimensions)
-    define_child_node(RubyXL::WorksheetViews,           :accessor => :sheet_view_container)
+    define_child_node(RubyXL::WorksheetViews)
     define_child_node(RubyXL::WorksheetFormatProperties)
     define_child_node(RubyXL::ColumnRanges)
     define_child_node(RubyXL::SheetData)
     define_child_node(RubyXL::SheetCalculationProperties)
     define_child_node(RubyXL::WorksheetProtection)
     define_child_node(RubyXL::ProtectedRanges)
-    define_child_node(RubyXL::ScenarioContainer)
+    define_child_node(RubyXL::Scenarios)
     define_child_node(RubyXL::AutoFilter)
     define_child_node(RubyXL::SortState)
     define_child_node(RubyXL::DataConsolidate)
-    define_child_node(RubyXL::CustomSheetViews,         :accessor => :custom_sheet_view_container)
-    define_child_node(RubyXL::MergedCells,              :accessor => :merged_cells_list)
-    define_child_node(RubyXL::PhoneticProperties,       :accessor => :custom_props_container)
+    define_child_node(RubyXL::CustomSheetViews)
+    define_child_node(RubyXL::MergedCells, :accessor => :merged_cells)
+    define_child_node(RubyXL::PhoneticProperties)
     define_child_node(RubyXL::ConditionalFormatting)
     define_child_node(RubyXL::DataValidations)
-    define_child_node(RubyXL::HyperlinkContainer)
+    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::CustomPropertyContainer)
-    define_child_node(RubyXL::CellWatchContainer,       :accessor => :cell_watch_container)
-    define_child_node(RubyXL::IgnoredErrorContainer)
-    define_child_node(RubyXL::SmartTagContainer,        :accessor => :smart_tag_container)
+    define_child_node(RubyXL::CustomProperties)
+    define_child_node(RubyXL::CellWatches)
+    define_child_node(RubyXL::IgnoredErrors)
+    define_child_node(RubyXL::SmartTags)
     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::OLEObjects, :accessor  => :ole_object_container)
-    define_child_node(RubyXL::EmbeddedControlContainer,   :accessor => :controls_container)
-    define_child_node(RubyXL::WebPublishingItemContainer, :accessor => :web_items_container)
+    define_child_node(RubyXL::OLEObjects)
+    define_child_node(RubyXL::EmbeddedControls)
+    define_child_node(RubyXL::WebPublishingItems)
     define_child_node(RubyXL::TableParts)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'worksheet'
@@ -696,8 +696,16 @@ module RubyXL
       true
     end
 
-    def merged_cells
-      (merged_cells_list && merged_cells_list.merge_cell) || []
+    def sheet_index
+      @workbook.worksheets.select{ |sheet| sheet.is_a?(self.class) }.index{ |sheet| sheet.equal?(self) }
+    end
+
+    def filepath
+      File.join('xl', 'worksheets', "sheet#{sheet_index + 1}.xml")
+    end
+
+    def rel_type
+      'worksheet'
     end
 
     include LegacyWorksheet