spreadsheet 0.8.4 → 0.8.5

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.8.5 / 24.04.2013
+
+* Applied Patch by Joao Almeida: When editing an existing sheet, cells merge was not working.
+* https://github.com/voraz/spreadsheet/pull/14.patch
+
 === 0.8.4 / 20.04.2013
 
 * Applied Patch by boss@airbladesoftware.com

data/lib/spreadsheet.rb

@@ -43,7 +43,7 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 
   ##
   # Default client Encoding. Change this value if your application uses a

data/lib/spreadsheet/excel/writer/worksheet.rb

@@ -245,7 +245,7 @@ class Worksheet
   def write_changes reader, endpos, sst_status
 
     ## FIXME this is not smart solution to update outline_level.
-    #        without this process, outlines in row disappear in MS Excel.       
+    #        without this process, outlines in row disappear in MS Excel.
     @worksheet.row_count.times do |i|
       if @worksheet.row(i).outline_level > 0
         @worksheet.row(i).outline_level = @worksheet.row(i).outline_level
@@ -309,9 +309,10 @@ and minimal code that generates this warning. Thanks!
       reader.seek lastpos
     end
 
-    # Necessary for outline (grouping) and hiding functions 
+    # Necessary for outline (grouping) and hiding functions
     # but these below are not necessary to run
     # if [Row|Column]#hidden? = false and [Row|Column]#outline_level == 0
+    write_merged_cells
     write_colinfos
     write_guts
 
@@ -840,7 +841,7 @@ and minimal code that generates this warning. Thanks!
     if @worksheet.selected
       flags |= 0x0200
     end
-    flags |= 0x0080 # Show outline symbols, 
+    flags |= 0x0080 # Show outline symbols,
                     # but if [Row|Column]#outline_level = 0 the symbols are not shown.
     data = [ flags, 0, 0, 0, 0, 0 ].pack binfmt(:window2)
     write_op opcode(:window2), data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole
-  requirement: &21959600 !ruby/object:Gem::Requirement
+  requirement: &12377560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21959600
+  version_requirements: *12377560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21975520 !ruby/object:Gem::Requirement
+  requirement: &12377140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *21975520
+  version_requirements: *12377140
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &21975040 !ruby/object:Gem::Requirement
+  requirement: &12376660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *21975040
+  version_requirements: *12376660
 description: ! 'The Spreadsheet Library is designed to read and write Spreadsheet
   Documents.