rubyXL 3.3.22 → 3.4.25

data/lib/rubyXL/objects/storage.rb

@@ -1,5 +1,4 @@
 module RubyXL
-
   class GenericStorageObject
     SAVE_ORDER = 0
 
@@ -24,13 +23,18 @@ module RubyXL
   end
 
   class PrinterSettingsFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings'.freeze
+  end
+
+  class CustomPropertyFile < GenericStorageObject
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.customProperty'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/customProperty'.freeze
   end
 
   class DrawingFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawing+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawing+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -41,12 +45,11 @@ module RubyXL
       else store_relationship(rf, :unknown)
       end
     end
-
   end
 
   class ChartFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -58,18 +61,17 @@ module RubyXL
       else store_relationship(rf, :unknown)
       end
     end
-
   end
 
   class BinaryImageFile < GenericStorageObject
-    CONTENT_TYPE = 'image/jpeg'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image'
+    CONTENT_TYPE = 'image/jpeg'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image'.freeze
   end
 
   class VMLDrawingFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.vmlDrawing'
-#    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'
-    REL_TYPE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.vmlDrawing'.freeze
+#    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'.freeze
+    REL_TYPE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -77,32 +79,33 @@ module RubyXL
   end
 
   class ChartColorsFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-office.chartcolorstyle+xml'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2011/relationships/chartColorStyle'
+    CONTENT_TYPE = 'application/vnd.ms-office.chartcolorstyle+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2011/relationships/chartColorStyle'.freeze
   end
 
   class ChartStyleFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-office.chartstyle+xml'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2011/relationships/chartStyle'
+    CONTENT_TYPE = 'application/vnd.ms-office.chartstyle+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2011/relationships/chartStyle'.freeze
   end
 
   class TableFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/table'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/table'.freeze
   end
 
   class ControlPropertiesFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp'
+    CONTENT_TYPE = 'application/vnd.ms-excel.controlproperties+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp'.freeze
   end
 
   class PivotCacheRecordsFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords'.freeze
   end
 
   class PivotCacheDefinitionFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -110,8 +113,8 @@ module RubyXL
   end
 
   class PivotTableFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -119,46 +122,67 @@ module RubyXL
   end
 
   class HyperlinkRelFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink'.freeze
   end
 
   class ThumbnailFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail'
-    CONTENT_TYPE = 'image/x-wmf'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail'.freeze
+    CONTENT_TYPE = 'image/x-wmf'.freeze
   end
 
   class ChartUserShapesFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartUserShapes'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartUserShapes'.freeze
   end
 
   class CustomPropertiesFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.custom-properties+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.custom-properties+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties'.freeze
   end
 
   class MacrosFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-office.vbaProject'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2006/relationships/vbaProject'
+    CONTENT_TYPE = 'application/vnd.ms-office.vbaProject'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2006/relationships/vbaProject'.freeze
   end
 
   class CustomXMLFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml'.freeze
   end
 
   class SlicerFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-excel.slicer+xml'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2007/relationships/slicer'
+    CONTENT_TYPE = 'application/vnd.ms-excel.slicer+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2007/relationships/slicer'.freeze
   end
 
   class SlicerCacheFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-excel.slicerCache+xml'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2007/relationships/slicerCache'
+    CONTENT_TYPE = 'application/vnd.ms-excel.slicerCache+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2007/relationships/slicerCache'.freeze
   end
 
   class OLEObjectFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject'
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.oleObject'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.oleObject'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject'.freeze
+  end
+
+  class SheetMetadata < GenericStorageObject
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMetadata+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sheetMetadata'.freeze
+  end
+
+  class ActiveX < GenericStorageObject
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/control'.freeze
+
+    include RubyXL::RelationshipSupport
+
+    def attach_relationship(rid, rf)
+      case rf
+      when RubyXL::ChartFile then store_relationship(rf) # TODO
+      else store_relationship(rf, :unknown)
+      end
+    end
   end
 
+  class ActiveXBinary < GenericStorageObject
+    REL_TYPE = 'http://schemas.microsoft.com/office/2006/relationships/activeXControlBinary'.freeze
+  end
 end

data/lib/rubyXL/objects/stylesheet.rb

@@ -6,8 +6,7 @@ require 'rubyXL/objects/border'
 require 'rubyXL/objects/extensions'
 
 module RubyXL
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_numFmt-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_numFmt-1.html
   class NumberFormat < OOXMLObject
     define_attribute(:numFmtId,   :int,    :required => true)
     define_attribute(:formatCode, :string, :required => true)
@@ -15,12 +14,11 @@ module RubyXL
 
     def is_date_format?
       #             v-------- Toss all the escaped chars -------v v--- and see if any date-related remained
-      !!(format_code.gsub(/(\"[^\"]*\"|\[[^\]]*\]|[\\_*].)/i, '') =~ /[dmyhs]/i)
+      !!(format_code.gsub(/("[^"]*"|\[[^\]]*\]|[\\_*].)/i, '') =~ /[dmyhs]/i)
     end
-
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_numFmts-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_numFmts-1.html
   class NumberFormats < OOXMLContainerObject
     define_child_node(RubyXL::NumberFormat, :collection => :with_count)
     define_element_name 'numFmts'
@@ -63,10 +61,9 @@ module RubyXL
     def find_by_format_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
+  # http://www.datypic.com/sc/ooxml/e-ssml_cellStyleXfs-1.html
   class CellStyleXFs < OOXMLContainerObject
     define_child_node(RubyXL::XF, :collection => :with_count)
     define_element_name 'cellStyleXfs'
@@ -76,21 +73,19 @@ module RubyXL
     end
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_cellXfs-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_cellXfs-1.html
   class CellXFs < OOXMLContainerObject
     define_child_node(RubyXL::XF, :collection => :with_count)
     define_element_name 'cellXfs'
 
     def self.default
       self.new(:_ => [
-                 RubyXL::XF.new(
-                   :num_fmt_id => 0, :font_id => 0, :fill_id => 0, :border_id => 0, :xfId => 0
-                 )
+                 RubyXL::XF.new(:num_fmt_id => 0, :font_id => 0, :fill_id => 0, :border_id => 0, :xfId => 0)
                ])
     end
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_cellStyles-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_cellStyles-1.html
   class CellStyles < OOXMLContainerObject
     define_child_node(RubyXL::CellStyle, :collection => :with_count)
     define_element_name 'cellStyles'
@@ -100,7 +95,7 @@ module RubyXL
     end
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_dxf-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_dxf-1.html
   class DXF < OOXMLObject
     define_child_node(RubyXL::Font)
     define_child_node(RubyXL::NumberFormat)
@@ -112,13 +107,13 @@ module RubyXL
     define_element_name 'dxf'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_dxfs-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_dxfs-1.html
   class DXFs < OOXMLContainerObject
     define_child_node(RubyXL::DXF, :collection => :with_count)
     define_element_name 'dxfs'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_tableStyle-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_tableStyle-1.html
   class TableStyle < OOXMLObject
     define_attribute(:name,  :string, :required => true)
     define_attribute(:pivot, :bool,   :default => true)
@@ -127,7 +122,7 @@ module RubyXL
     define_element_name 'tableStyle'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_tableStyles-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_tableStyles-1.html
   class TableStyles < OOXMLContainerObject
     define_attribute(:defaultTableStyle, :string)
     define_attribute(:defaultPivotStyle, :string)
@@ -135,34 +130,34 @@ module RubyXL
     define_element_name 'tableStyles'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_colors-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_colors-1.html
   class ColorSet < OOXMLObject
     define_child_node(RubyXL::Color, :collection => true)
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_colors-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_colors-1.html
   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
+  # http://www.datypic.com/sc/ooxml/e-ssml_mruColors-1.html
   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
+  # http://www.datypic.com/sc/ooxml/e-ssml_colors-1.html
   class Colors < OOXMLObject
     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
+  # http://www.datypic.com/sc/ooxml/e-ssml_styleSheet.html
   class Stylesheet < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles'.freeze
 
     define_child_node(RubyXL::NumberFormats, :accessor => :number_formats)
     define_child_node(RubyXL::Fonts)
@@ -176,11 +171,11 @@ module RubyXL
     define_child_node(RubyXL::Colors)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'styleSheet'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main'           => nil,
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r',
-                   'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
-                   'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac' => 'x14ac',
-                   'urn:schemas-microsoft-com:mac:vml' => 'mv')
+                   'http://schemas.openxmlformats.org/markup-compatibility/2006'         => 'mc',
+                   'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac'         => 'x14ac',
+                   'urn:schemas-microsoft-com:mac:vml'                                   => 'mv')
 
     def initialize(*args)
       super
@@ -226,7 +221,5 @@ module RubyXL
 
       return max_fmt_id
     end
-
   end
-
 end

data/lib/rubyXL/objects/text.rb

@@ -4,8 +4,7 @@ require 'rubyXL/objects/container_nodes'
 require 'rubyXL/objects/color'
 
 module RubyXL
-
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_t-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_t-1.html
   class Text < OOXMLObject
     define_attribute(:_,           :string, :accessor => :value)
     define_attribute(:'xml:space', %w{ preserve })
@@ -14,21 +13,21 @@ module RubyXL
     # http://www.w3.org/TR/REC-xml/#NT-Char:
     # Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
 
-    INVALID_XML10_CHARS = /([^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u10000-\u10FFFF])/
+    INVALID_XML10_CHARS = /([^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u{10000}-\u{10FFFF}])/
     ESCAPED_UNICODE = /_x([0-9A-F]{4})_/
 
     def before_write_xml
       preserve_whitespace
-      self.value.gsub!(INVALID_XML10_CHARS) { |c| "_x%04x_" % c.ord }
+      self.value.gsub!(INVALID_XML10_CHARS) { |c| '_x%04x_' % c.ord }
       true
     end
 
     def to_s
-      value.to_s.gsub(ESCAPED_UNICODE) { |m| $1.hex.chr(::Encoding::UTF_8) }
+      value.to_s.gsub(ESCAPED_UNICODE) { Regexp.last_match(1).hex.chr(::Encoding::UTF_8) }
     end
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_rPr-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_rPr-1.html
   class RunProperties < OOXMLObject
     define_child_node(RubyXL::StringValue,  :node_name => :rFont)
     define_child_node(RubyXL::IntegerValue, :node_name => :charset)
@@ -48,7 +47,7 @@ module RubyXL
     define_element_name 'rPr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_r-2.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_r-2.html
   class RichTextRun < OOXMLObject
     define_child_node(RubyXL::RunProperties)
     define_child_node(RubyXL::Text)
@@ -57,10 +56,9 @@ module RubyXL
     def to_s
       t.to_s
     end
-
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_rPh-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_rPh-1.html
   class PhoneticRun < OOXMLObject
     define_attribute(:sb, :int, :required => true)
     define_attribute(:eb, :int, :required => true)
@@ -68,15 +66,15 @@ module RubyXL
     define_element_name 'rPh'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_phoneticPr-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_phoneticPr-1.html
   class PhoneticProperties < OOXMLObject
-    define_attribute(:fontId,    :int,    :required => true)
+    define_attribute(:fontId,    :int, :required => true)
     define_attribute(:type,      RubyXL::ST_PhoneticType,      :default => 'fullwidthKatakana')
     define_attribute(:alignment, RubyXL::ST_PhoneticAlignment, :default => 'left')
     define_element_name 'phoneticPr'
   end
 
-  # http://www.schemacentral.com/sc/ooxml/e-ssml_is-1.html
+  # http://www.datypic.com/sc/ooxml/e-ssml_is-1.html
   class RichText < OOXMLObject
     define_child_node(RubyXL::Text)
     define_child_node(RubyXL::RichTextRun, :collection => true)
@@ -85,10 +83,10 @@ module RubyXL
     define_element_name 'is'
 
     def to_s
-      str = t.to_s
+      # `dup` here unfreezes the string since it's not a constant but initial value
+      str = if t.nil? then ''.dup else t.to_s end
       r && r.each { |rtr| str << rtr.to_s if rtr }
       str
     end
   end
-
 end