rubyXL 3.1.2 → 3.2.0

data/lib/rubyXL/objects/root.rb

@@ -13,8 +13,6 @@ module RubyXL
     attr_accessor :thumbnail, :core_properties, :document_properties, :custom_properties, :workbook
     attr_accessor :content_types, :rels_hash
 
-    REL_CLASS    = RubyXL::RootRelationships
-
     include RubyXL::RelationshipSupport
 
     define_relationship(RubyXL::ThumbnailFile,          :thumbnail)
@@ -31,7 +29,7 @@ module RubyXL
       obj = self.new
       obj.document_properties    = RubyXL::DocumentPropertiesFile.new
       obj.core_properties        = RubyXL::CorePropertiesFile.new
-      obj.relationship_container = RubyXL::RootRelationships.new
+      obj.relationship_container = RubyXL::OOXMLRelationshipsFile.new
       obj.content_types          = RubyXL::ContentTypes.new
       obj
     end
@@ -40,10 +38,9 @@ module RubyXL
       stream = Zip::OutputStream.write_buffer { |zipstream|
         self.rels_hash = {}
         self.relationship_container.owner = self
-        self.content_types.overrides = []
-        self.content_types.owner = self
         collect_related_objects.compact.each { |obj|
           puts "<-- DEBUG: adding relationship to #{obj.class}" if @@debug
+          obj.root = self if obj.respond_to?(:root=)
           self.rels_hash[obj.class] ||= []
           self.rels_hash[obj.class] << obj
         }
@@ -51,9 +48,7 @@ module RubyXL
         self.rels_hash.keys.sort_by{ |c| c::SAVE_ORDER }.each { |klass|
           puts "<-- DEBUG: saving related #{klass} files" if @@debug
           self.rels_hash[klass].each { |obj|
-            obj.workbook = workbook if obj.respond_to?(:workbook=)
             puts "<-- DEBUG:   > #{obj.xlsx_path}" if @@debug
-            self.content_types.add_override(obj)
             obj.add_to_zip(zipstream)
           }
         }
@@ -62,13 +57,17 @@ module RubyXL
       stream
     end
 
+    def xlsx_path
+      OOXMLTopLevelObject::ROOT
+    end
+
     def self.parse_file(xl_file_path, opts)
       begin
         ::Zip::File.open(xl_file_path) { |zip_file|
           root = self.new
           root.filepath = xl_file_path
           root.content_types = RubyXL::ContentTypes.parse_file(zip_file)
-          root.load_relationships(zip_file)
+          root.load_relationships(zip_file, OOXMLTopLevelObject::ROOT)
           root.workbook.root = root
           root
         }

data/lib/rubyXL/objects/shared_strings.rb

@@ -19,8 +19,8 @@ module RubyXL
 
     def initialize(*params)
       super
-      # So far, going by the structure that the original creator had in mind. However, 
-      # since the actual implementation is now extracted into a separate class, 
+      # So far, going by the structure that the original creator had in mind. However,
+      # since the actual implementation is now extracted into a separate class,
       # we will be able to transparrently change it later if needs be.
       @index_by_content = {}
     end
@@ -48,11 +48,11 @@ module RubyXL
     def get_index(str, add_if_missing = false)
       index = @index_by_content[str]
       index = add(str) if index.nil? && add_if_missing
-      index 
+      index
     end
 
     def xlsx_path
-      File.join('xl', 'sharedStrings.xml')
+      ROOT.join('xl', 'sharedStrings.xml')
     end
 
   end

data/lib/rubyXL/objects/sheet_data.rb

@@ -27,7 +27,7 @@ module RubyXL
     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::CellValue, :accessor => :value_container)
     define_child_node(RubyXL::RichText)    # is
     define_element_name 'c'
 
@@ -77,7 +77,7 @@ module RubyXL
       case datatype
       when RubyXL::DataType::SHARED_STRING then
         workbook.shared_strings_container[raw_value.to_i].to_s
-      else 
+      else
         if is_date? then workbook.num_to_date(raw_value.to_f)
         elsif raw_value.is_a?(String) && (raw_value =~ /\A-?\d+(\.\d+(?:e[+-]\d+)?)?\Z/i) # Numeric
           if $1 then raw_value.to_f

data/lib/rubyXL/objects/simple_types.rb

@@ -190,11 +190,11 @@ module RubyXL
                                 isometricOffAxis3Left isometricOffAxis3Right isometricOffAxis3Bottom
                                 isometricOffAxis4Left isometricOffAxis4Right isometricOffAxis4Bottom
                                 obliqueTopLeft obliqueTop obliqueTopRight obliqueLeft obliqueRight obliqueBottomLeft
-                                obliqueBottom obliqueBottomRight perspectiveFront perspectiveLeft perspectiveRight 
+                                obliqueBottom obliqueBottomRight perspectiveFront perspectiveLeft perspectiveRight
                                 perspectiveAbove perspectiveBelow perspectiveAboveLeftFacing perspectiveAboveRightFacing
                                 perspectiveContrastingLeftFacing perspectiveContrastingRightFacing
                                 perspectiveHeroicLeftFacing perspectiveHeroicRightFacing
-                                perspectiveHeroicExtremeLeftFacing perspectiveHeroicExtremeRightFacing 
+                                perspectiveHeroicExtremeLeftFacing perspectiveHeroicExtremeRightFacing
                                 perspectiveRelaxed perspectiveRelaxedModerately }
   ST_LightRigType         = %w{ legacyFlat1 legacyFlat2 legacyFlat3 legacyFlat4 legacyNormal1 legacyNormal2
                                 legacyNormal3 legacyNormal4 legacyHarsh1 legacyHarsh2 legacyHarsh3 legacyHarsh4

data/lib/rubyXL/objects/storage.rb

@@ -3,18 +3,17 @@ module RubyXL
   class GenericStorageObject
     SAVE_ORDER = 0
 
-    attr_accessor :xlsx_path, :data, :workbook, :generic_storage
+    attr_accessor :xlsx_path, :data, :generic_storage
 
-    def initialize
-      @workbook = nil
-      @xlsx_path = nil
+    def initialize(file_path)
+      @xlsx_path = file_path
       @data = nil
       @generic_storage = []
     end
 
     def self.parse_file(dirpath, file_path = nil)
       file_path ||= self.xlsx_path
-      obj = self.new
+      obj = self.new(file_path)
 
       case dirpath
       when String then
@@ -22,12 +21,12 @@ module RubyXL
         return nil unless File.exist?(full_path)
         obj.data = File.open(full_path, 'r') { |f| f.read }
       when Zip::File then
+        file_path = file_path.relative_path_from(::Pathname.new("/")) if file_path.absolute? # Zip doesn't like absolute paths.
         entry = dirpath.find_entry(file_path)
         return nil if entry.nil?
         obj.data = entry.get_input_stream { |f| f.read }
       end
 
-      obj.xlsx_path = file_path
       obj
     end
 
@@ -41,13 +40,13 @@ module RubyXL
   end
 
   class PrinterSettingsFile < GenericStorageObject
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings'
   end
 
   class DrawingFile < GenericStorageObject
     CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawing+xml'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing'
-    REL_CLASS    = RubyXL::DrawingRelationshipsFile
 
     include RubyXL::RelationshipSupport
 
@@ -64,7 +63,6 @@ module RubyXL
   class ChartFile < GenericStorageObject
     CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart'
-    REL_CLASS    = RubyXL::ChartRelationshipsFile
 
     include RubyXL::RelationshipSupport
 
@@ -80,9 +78,9 @@ module RubyXL
   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'
-
   end
 
   class ChartColorsFile < GenericStorageObject
@@ -112,7 +110,7 @@ module RubyXL
   end
 
   class BinaryImageFile < GenericStorageObject
-#    CONTENT_TYPE = 'image/jpeg'
+    CONTENT_TYPE = 'image/jpeg'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image'
   end
 
@@ -122,6 +120,7 @@ module RubyXL
 
   class ThumbnailFile < GenericStorageObject
     REL_TYPE     = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail'
+    CONTENT_TYPE = 'image/x-wmf'
   end
 
   class ChartUserShapesFile < GenericStorageObject

data/lib/rubyXL/objects/stylesheet.rb

@@ -81,7 +81,7 @@ module RubyXL
     define_element_name 'cellXfs'
 
     def self.defaults
-      self.new(:_ => [ 
+      self.new(:_ => [
                  RubyXL::XF.new(
                    :num_fmt_id => 0, :font_id => 0, :fill_id => 0, :border_id => 0, :xfId => 0
                  )
@@ -187,7 +187,7 @@ module RubyXL
     end
 
     def xlsx_path
-      File.join('xl', 'styles.xml')
+      ROOT.join('xl', 'styles.xml')
     end
 
     def self.default
@@ -201,7 +201,7 @@ module RubyXL
 
     def get_number_format_by_id(format_id)
       @format_hash ||= {}
-      
+
       if @format_hash[format_id].nil? then
         @format_hash[format_id] = NumberFormats::DEFAULT_NUMBER_FORMATS.find_by_format_id(format_id) ||
                                     (number_formats && number_formats.find_by_format_id(format_id))

data/lib/rubyXL/objects/theme.rb

@@ -1358,7 +1358,7 @@ module RubyXL
     define_child_node(RubyXL::CT_ColorSchemeAndMapping, :collection => [0..-1])
     define_element_name 'a:extraClrSchemeLst'
   end
-  
+
   # http://www.schemacentral.com/sc/ooxml/e-a_custClr-1.html
   class CustomColor < OOXMLObject
     define_child_node(RubyXL::CT_ScRgbColor)
@@ -1394,7 +1394,7 @@ module RubyXL
     set_namespaces('http://schemas.openxmlformats.org/drawingml/2006/main' => 'a')
 
     def xlsx_path
-      File.join('xl', 'theme', 'theme1.xml')
+      ROOT.join('xl', 'theme', 'theme1.xml')
     end
 
     def self.defaults

data/lib/rubyXL/objects/workbook.rb

@@ -297,7 +297,6 @@ module RubyXL
   class Workbook < OOXMLTopLevelObject
     CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument'
-    REL_CLASS    = RubyXL::WorkbookRelationships
 
     include RubyXL::RelationshipSupport
 
@@ -345,14 +344,13 @@ module RubyXL
                    'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
                    'http://schemas.microsoft.com/office/spreadsheetml/2010/11/main' => 'x15')
 
-    attr_accessor :root
     attr_accessor :calculation_chain, :theme, :stylesheet, :shared_strings_container, :worksheets
 
     def before_write_xml
       self.sheets = RubyXL::Sheets.new
 
       worksheets.each_with_index { |sheet, i|
-        rel = relationship_container.find_by_target(sheet.xlsx_path.gsub(/\Axl\//, ''))
+        rel = relationship_container.find_by_target(sheet.xlsx_path)
         sheets << RubyXL::Sheet.new(:name => sheet.sheet_name[0..30], # Max sheet name length is 31 char
                                     :sheet_id => sheet.sheet_id || (i + 1),
                                     :state => sheet.state, :r_id => rel.id)
@@ -429,7 +427,7 @@ module RubyXL
     end
 
     def xlsx_path
-      File.join('xl', 'workbook.xml')
+      ROOT.join('xl', 'workbook.xml')
     end
 
     include LegacyWorkbook

data/lib/rubyXL/objects/worksheet.rb

@@ -323,13 +323,13 @@ module RubyXL
     define_attribute(:shapeId,   :int, :required => true)
     define_attribute(:'r:id',    :string)
     define_element_name 'oleObject'
-  end                              
+  end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_oleObjects-1.html
   class OLEObjects < OOXMLContainerObject
     define_child_node(RubyXL::OLEObject, :collection => true)
     define_element_name 'oleObjects'
-  end                              
+  end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_dataRef-1.html
   class DataConsolidationReference < OOXMLObject
@@ -381,7 +381,7 @@ module RubyXL
         # But, things can be more complex:
         # <selection activeCell="E8" activeCellId="2" sqref="A4:B4 C6:D6 E8:F8"/>
         # Not using .reverse.each here to avoid memory reallocation.
-        @sqref.each_with_index { |ref, ind| @active_cell_id = ind if ref.cover?(@active_cell) } 
+        @sqref.each_with_index { |ref, ind| @active_cell_id = ind if ref.cover?(@active_cell) }
       end
       true
     end
@@ -611,7 +611,6 @@ module RubyXL
   class Worksheet < OOXMLTopLevelObject
     CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml'
     REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet'
-    REL_CLASS    = RubyXL::SheetRelationshipsFile
 
     include RubyXL::RelationshipSupport
 
@@ -675,7 +674,7 @@ module RubyXL
                    'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac' => 'x14ac',
                    'urn:schemas-microsoft-com:mac:vml' => 'mv')
 
-    attr_accessor :workbook, :state, :sheet_name, :sheet_id, :rels, :comments, :printer_settings
+    attr_accessor :workbook, :state, :sheet_name, :sheet_id, :rels
 
     def before_write_xml # This method may need to be moved higher in the hierarchy
       first_nonempty_row = nil
@@ -723,8 +722,9 @@ module RubyXL
     end
 
     def xlsx_path
-      File.join('xl', 'worksheets', "sheet#{file_index}.xml")
+      ROOT.join('xl', 'worksheets', "sheet#{file_index}.xml")
     end
+
     def self.parse(param)
       sheet_obj = super
       sheet_obj.sheet_data.rows.each { |r|

data/lib/rubyXL/workbook.rb

@@ -29,7 +29,7 @@ module RubyXL
       @theme                    = RubyXL::Theme.defaults
       @shared_strings_container = RubyXL::SharedStringsTable.new
       @stylesheet               = RubyXL::Stylesheet.default
-      @relationship_container   = RubyXL::WorkbookRelationships.new
+      @relationship_container   = RubyXL::OOXMLRelationshipsFile.new
       @root                     = RubyXL::WorkbookRoot.default
       @root.workbook            = self
       @root.filepath            = filepath
@@ -97,7 +97,7 @@ module RubyXL
     alias_method :write, :save
 
     def base_date
-      if date1904 then 
+      if date1904 then
         DateTime.new(1904, 1, 1)
       else
         # Subtracting one day to accomodate for erroneous 1900 leap year compatibility only for 1900 based dates
@@ -155,14 +155,14 @@ module RubyXL
     def modify_alignment(style_index, is_horizontal, alignment)
       xf = cell_xfs[style_index].dup
       xf.apply_alignment = true
-      xf.alignment = RubyXL::Alignment.new(:horizontal => is_horizontal ? alignment : nil, 
+      xf.alignment = RubyXL::Alignment.new(:horizontal => is_horizontal ? alignment : nil,
                                            :vertical   => is_horizontal ? nil : alignment)
       register_new_xf(xf, style_index)
     end
 
     def modify_fill(style_index, rgb)
       xf = cell_xfs[style_index].dup
-      new_fill = RubyXL::Fill.new(:pattern_fill => 
+      new_fill = RubyXL::Fill.new(:pattern_fill =>
                    RubyXL::PatternFill.new(:pattern_type => 'solid',
                                            :fg_color => RubyXL::Color.new(:rgb => rgb)))
       new_xf = register_new_fill(new_fill, xf)

data/lib/rubyXL/worksheet.rb

@@ -25,7 +25,7 @@ module LegacyWorksheet
 
   #returns 2d array of just the cell values (without style or formula information)
   def extract_data(args = {})
-    sheet_data.rows.map { |row| 
+    sheet_data.rows.map { |row|
       row.cells.map { |c| c && c.value(args) } unless row.nil?
     }
   end
@@ -66,7 +66,7 @@ module LegacyWorksheet
 
         if cell_test then
           table_hash[:table][table_index] ||= {}
-          table_hash[:table][table_index][header] = cell.value 
+          table_hash[:table][table_index][header] = cell.value
         end
 
         current_row += 1
@@ -369,7 +369,7 @@ module LegacyWorksheet
       c.raw_value = data
       c.datatype = RubyXL::DataType::RAW_STRING unless formula || data.is_a?(Numeric)
       c.formula = RubyXL::Formula.new(:expression => formula) if formula
-      
+
       range = cols && cols.find(column)
       c.style_index = sheet_data.rows[row].style_index || (range && range.style_index) || 0
 
@@ -406,7 +406,7 @@ module LegacyWorksheet
     if row_index > 0 then
       old_row = sheet_data.rows[row_index - 1]
       if old_row then
-        new_cells = old_row.cells.collect { |c| 
+        new_cells = old_row.cells.collect { |c|
                                             if c.nil? then nil
                                             else RubyXL::Cell.new(:style_index => c.style_index)
                                             end }
@@ -581,7 +581,7 @@ module LegacyWorksheet
 
   def get_row_border_left(row = 0)
     return get_row_border(row, :left)
-  end                         
+  end
 
   def get_row_border_right(row = 0)
     return get_row_border(row, :right)
@@ -817,10 +817,10 @@ module LegacyWorksheet
     # is less than +size+, then +.downto()+ will not execute, and if it equals +size+,
     # then the block will be invoked exactly once, which takes care of the case when
     # +row_index+ is greater than the current max index by exactly 1.
-    row_index.downto(existing_row_count) { |r| 
+    row_index.downto(existing_row_count) { |r|
       add_row(r, :cells => Array.new(col_size))
-    } 
-  end  
+    }
+  end
 
   # Helper method to get the style index for a column
   def get_col_style(column_index)

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.1.2</title>
+<title>README - rubyXL 3.2.0</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">
@@ -128,7 +128,7 @@ src="https://codeclimate.com/github/weshatheleopard/rubyXL.png"></a></p>
 
 <h2 id="label-To+Use%3A">To Use:<span><a href="#label-To+Use%3A">&para;</a> <a href="#documentation">&uarr;</a></span></h2>
 
-<pre class="ruby"><span class="ruby-identifier">require</span> <span class="ruby-string">'rubyXL'</span> <span class="ruby-comment"># Assuming rubygems is already required</span>
+<pre class="ruby"><span class="ruby-identifier">require</span> <span class="ruby-string">&#39;rubyXL&#39;</span> <span class="ruby-comment"># Assuming rubygems is already required</span>
 </pre>
 
 <h3 id="label-Parsing+an+existing+workbook">Parsing an existing workbook<span><a href="#label-Parsing+an+existing+workbook">&para;</a> <a href="#documentation">&uarr;</a></span></h3>
@@ -145,7 +145,7 @@ src="https://codeclimate.com/github/weshatheleopard/rubyXL.png"></a></p>
 
 <pre>workbook.worksheets[0] # Returns first worksheet
 workbook[0]            # Returns first worksheet
-workbook['Sheet1']     # Finds and returns worksheet titled &quot;Sheet1&quot;</pre>
+workbook[&#39;Sheet1&#39;]     # Finds and returns worksheet titled &quot;Sheet1&quot;</pre>
 
 <h4 id="label-Accessing+just+the+values">Accessing just the values<span><a href="#label-Accessing+just+the+values">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
@@ -229,16 +229,16 @@ worksheet.get_column_border_right(0)</pre>
 
 <h4 id="label-Adding+Worksheets">Adding Worksheets<span><a href="#label-Adding+Worksheets">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
-<pre>worksheet = workbook.add_worksheet('Sheet2')</pre>
+<pre>worksheet = workbook.add_worksheet(&#39;Sheet2&#39;)</pre>
 
 <h4 id="label-Renaming+Worksheets">Renaming Worksheets<span><a href="#label-Renaming+Worksheets">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
-<pre>worksheet.sheet_name = 'Cool New Name'</pre>
+<pre>worksheet.sheet_name = &#39;Cool New Name&#39;</pre>
 
 <h4 id="label-Adding+Cells">Adding Cells<span><a href="#label-Adding+Cells">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
-<pre>worksheet.add_cell(0, 0, 'A1')      # Sets cell A1 to string &quot;A1&quot;
-worksheet.add_cell(0, 1, '', 'A1')  # Sets formula in the cell B1 to '=A1'</pre>
+<pre>worksheet.add_cell(0, 0, &#39;A1&#39;)      # Sets cell A1 to string &quot;A1&quot;
+worksheet.add_cell(0, 1, &#39;&#39;, &#39;A1&#39;)  # Sets formula in the cell B1 to &#39;=A1&#39;</pre>
 
 <h4 id="label-Changing+Cells">Changing Cells<span><a href="#label-Changing+Cells">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
@@ -248,21 +248,21 @@ worksheet.add_cell(0, 1, '', 'A1')  # Sets formula in the cell B1 to '=A1'</pre>
 
 <pre>worksheet.sheet_data[0][0].change_font_bold(true) # Makes A1 bold
 worksheet.change_row_italics(0,true)              # Makes first row italicized
-worksheet.change_column_font_name(0, 'Courier')   # Makes first column have font Courier</pre>
+worksheet.change_column_font_name(0, &#39;Courier&#39;)   # Makes first column have font Courier</pre>
 
 <h4 id="label-Changing+Fills+++++">Changing Fills     <span><a href="#label-Changing+Fills+++++">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
-<pre>worksheet.sheet_data[0][0].change_fill('0ba53d')  # Sets A1 to have fill #0ba53d
-worksheet.change_row_fill(0, '0ba53d')            # Sets first row to have fill #0ba53d
-worksheet.change_column_fill(0, '0ba53d')         # Sets first column to have fill #0ba53d</pre>
+<pre>worksheet.sheet_data[0][0].change_fill(&#39;0ba53d&#39;)  # Sets A1 to have fill #0ba53d
+worksheet.change_row_fill(0, &#39;0ba53d&#39;)            # Sets first row to have fill #0ba53d
+worksheet.change_column_fill(0, &#39;0ba53d&#39;)         # Sets first column to have fill #0ba53d</pre>
 
 <h4 id="label-Changing+Borders">Changing Borders<span><a href="#label-Changing+Borders">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
 <pre># Possible weights: hairline, thin, medium, thick
 # Possible &quot;directions&quot;: top, bottom, left, right, diagonal
-worksheet.sheet_data[0][0].change_border(:top, 'thin')  # Sets A1 to have a top, thin border
-worksheet.change_row_border(0, :left, 'hairline')       # Sets first row to have a left, hairline border
-worksheet.change_column_border(0, :diagonal, 'medium')  # Sets first column to have diagonal, medium border</pre>
+worksheet.sheet_data[0][0].change_border(:top, &#39;thin&#39;)  # Sets A1 to have a top, thin border
+worksheet.change_row_border(0, :left, &#39;hairline&#39;)       # Sets first row to have a left, hairline border
+worksheet.change_column_border(0, :diagonal, &#39;medium&#39;)  # Sets first column to have diagonal, medium border</pre>
 
 <h4 id="label-Changing+Alignment">Changing Alignment<span><a href="#label-Changing+Alignment">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
@@ -270,17 +270,17 @@ worksheet.change_column_border(0, :diagonal, 'medium')  # Sets first column to h
 
 <p>center, distributed, justify, left, right</p>
 
-<pre>worksheet.sheet_data[0][0].change_horizontal_alignment('center') # Sets A1 to be centered
-worksheet.change_row_horizontal_alignment(0, 'justify')          # Sets first row to be justified
-worksheet.change_column_horizontal_alignment(0, 'right')         # Sets first column to be right-aligned</pre>
+<pre>worksheet.sheet_data[0][0].change_horizontal_alignment(&#39;center&#39;) # Sets A1 to be centered
+worksheet.change_row_horizontal_alignment(0, &#39;justify&#39;)          # Sets first row to be justified
+worksheet.change_column_horizontal_alignment(0, &#39;right&#39;)         # Sets first column to be right-aligned</pre>
 
 <h5 id="label-Vertical">Vertical<span><a href="#label-Vertical">&para;</a> <a href="#documentation">&uarr;</a></span></h5>
 
 <p>bottom, center, distributed, top</p>
 
-<pre>worksheet.sheet_data[0][0].change_vertical_alignment('bottom')  # Sets A1 to be bottom aligned
-worksheet.change_row_vertical_alignment(0, 'distributed')       # Sets first row to be distributed vertically
-worksheet.change_column_vertical_alignment(0, 'top')            # Sets first column to be top aligned</pre>
+<pre>worksheet.sheet_data[0][0].change_vertical_alignment(&#39;bottom&#39;)  # Sets A1 to be bottom aligned
+worksheet.change_row_vertical_alignment(0, &#39;distributed&#39;)       # Sets first row to be distributed vertically
+worksheet.change_column_vertical_alignment(0, &#39;top&#39;)            # Sets first column to be top aligned</pre>
 
 <h4 id="label-Changing+Row+Height">Changing Row Height<span><a href="#label-Changing+Row+Height">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
@@ -367,8 +367,8 @@ worksheet.delete_cell(0, 0)         # Deletes A1, does not shift cells</pre>
 
 <h3 id="label-Miscellaneous">Miscellaneous<span><a href="#label-Miscellaneous">&para;</a> <a href="#documentation">&uarr;</a></span></h3>
 
-<pre>Reference.ind2ref(0,0) == 'A1'    # Converts row and column index to Excel-style cell reference
-Reference.ref2ind('A1') == [0, 0] # Converts Excel-style cell reference to row and column index</pre>
+<pre>Reference.ind2ref(0,0) == &#39;A1&#39;    # Converts row and column index to Excel-style cell reference
+Reference.ref2ind(&#39;A1&#39;) == [0, 0] # Converts Excel-style cell reference to row and column index</pre>
 
 <h2 id="label-For+more+information">For more information<span><a href="#label-For+more+information">&para;</a> <a href="#documentation">&uarr;</a></span></h2>
 
@@ -376,11 +376,11 @@ Reference.ref2ind('A1') == [0, 0] # Converts Excel-style cell reference to row a
 
 <h2 id="label-Contributing+to+rubyXL">Contributing to rubyXL<span><a href="#label-Contributing+to+rubyXL">&para;</a> <a href="#documentation">&uarr;</a></span></h2>
 <ul><li>
-<p>Check out the latest master to make sure the feature hasn’t been
-implemented or the bug hasn’t been fixed yet</p>
+<p>Check out the latest master to make sure the feature hasn&#39;t been
+implemented or the bug hasn&#39;t been fixed yet</p>
 </li><li>
-<p>Check out the issue tracker to make sure someone already hasn’t requested
-it and/or contributed it</p>
+<p>Check out the issue tracker to make sure someone already hasn&#39;t
+requested it and/or contributed it</p>
 </li><li>
 <p>Fork the project</p>
 </li><li>
@@ -388,8 +388,8 @@ it and/or contributed it</p>
 </li><li>
 <p>Commit and push until you are happy with your contribution</p>
 </li><li>
-<p>Make sure to add tests for it. This is important so I don’t break it in a
-future version unintentionally.</p>
+<p>Make sure to add tests for it. This is important so I don&#39;t break it in
+a future version unintentionally.</p>
 </li><li>
 <p>Please try not to mess with the Rakefile, version, or history. If you want
 to have your own version, or is otherwise necessary, that is fine, but