rubyXL 1.0.11 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.11
+1.1.0

data/lib/writer/styles_writer.rb

@@ -74,23 +74,55 @@ module Writer
             end
           end
 
-          offset = 0
+          if !@workbook.cell_xfs[:xf].is_a?(Array)
+            @workbook.cell_xfs[:xf] = [@workbook.cell_xfs[:xf]]
+          end
+          
+
+          
           style_id_corrector['0']=0
-          1.upto(@workbook.cell_xfs[:xf].size) do |i|
-            style_id_corrector[i.to_s]= i-offset
-            #style correction commented out until bug is fixed
-            # (i+1).upto(@workbook.cell_xfs[:xf].size) do |j|
-            #   unless i == j
-            #     if hash_equal(@workbook.cell_xfs[:xf][i],@workbook.cell_xfs[:xf][j])
-            #       @workbook.cell_xfs[:xf].delete_at(i)
-            #       style_id_corrector.delete(i.to_s)
-            #       offset += 1
-            #     end
-            #   end
-            # end
+          delete_list = []
+          i = 1
+          while(i < @workbook.cell_xfs[:xf].size) do
+            if style_id_corrector[i.to_s].nil?
+              style_id_corrector[i.to_s]= i
+            end
+            # style correction commented out until bug is fixed
+            j = i+1
+            while(j < @workbook.cell_xfs[:xf].size) do
+              if hash_equal(@workbook.cell_xfs[:xf][i],@workbook.cell_xfs[:xf][j]) #check if this is working
+                style_id_corrector[j.to_s] = i
+                delete_list << j
+              end
+              j += 1
+            end
+            i += 1
+          end
+          
+          #go through delete list, if before delete_list index 0, offset 0, if before delete_list index 1, offset 1, etc.
+          delete_list.sort!
+
+          i = 1
+          offset = 0
+          offset_corrector = 0
+          delete_list << @workbook.cell_xfs[:xf].size
+          while offset < delete_list.size do
+            delete_index = delete_list[offset] - offset
+
+            while i <= delete_list[offset] do #if <= instead of <, fixes odd border but adds random cells with fill              
+              if style_id_corrector[i.to_s] == i
+                style_id_corrector[i.to_s] -= offset# unless style_id_corrector[i.to_s].nil? #173 should equal 53, not 52?
+              end
+
+              i += 1
+            end
+            @workbook.cell_xfs[:xf].delete_at(delete_index)
+            offset += 1
           end
+          
           @workbook.style_corrector = style_id_corrector
 
+
           xml.fonts('count'=>@workbook.fonts.size) {
             0.upto(@workbook.fonts.size-1) do |i|
               font = @workbook.fonts[i.to_s]

data/lib/writer/worksheet_writer.rb

@@ -77,6 +77,9 @@ module Writer
 
           unless @worksheet.cols.nil? || @worksheet.cols.size==0
             xml.cols {
+              if !@worksheet.cols.is_a?(Array)
+                @worksheet.cols = [@worksheet.cols]
+              end
               @worksheet.cols.each do |col|
                 if col[:attributes][:customWidth].nil?
                   col[:attributes][:customWidth] = '0'
@@ -109,19 +112,19 @@ module Writer
                 custom_format = '0'
               end
 
+              @worksheet.row_styles[(i+1).to_s][:style] = @workbook.style_corrector[@worksheet.row_styles[(i+1).to_s][:style].to_s]
               xml.row('r'=>(i+1).to_s, 'spans'=>'1:'+row.size.to_s,
-                's'=>@workbook.style_corrector[@worksheet.row_styles[(i+1).to_s][:style].to_s].to_s,
+                's'=>@worksheet.row_styles[(i+1).to_s][:style].to_s,
                 'customFormat'=>custom_format,
                 'ht'=>@worksheet.row_styles[(i+1).to_s][:height].to_s,
                 'customHeight'=>@worksheet.row_styles[(i+1).to_s][:customHeight].to_s) {
                 row.each_with_index do |dat, j|
                   unless dat.nil?
-                      #TODO un-hardcode t value, needs to be other values too
-                      #TODO recalculate based on formula....?
                       #TODO do xml.c for all cases, inside specific.
                       # if dat.formula.nil?
+                      dat.style_index = @workbook.style_corrector[dat.style_index.to_s]
                       xml.c('r'=>Cell.convert_to_cell(i,j),
-                        's'=>@workbook.style_corrector[dat.style_index.to_s].to_s, 't'=>dat.datatype) {                          
+                        's'=>dat.style_index.to_s, 't'=>dat.datatype) {
                         unless dat.formula.nil?
                           if dat.formula_attributes.empty?
                             xml.f dat.formula.to_s

data/rubyXL.gemspec

@@ -5,23 +5,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.0.11"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]
-  s.date = %q{2011-08-10}
+  s.date = %q{2011-08-11}
   s.description = %q{rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents}
   s.email = %q{bhagwat.vivek@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README",
     "README.rdoc"
   ]
   s.files = [
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README",
     "README.rdoc",
     "Rakefile",
     "VERSION",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyXL
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 11
-  version: 1.0.11
+  version: 1.1.0
 platform: ruby
 authors: 
 - Vivek Bhagwat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 -04:00
+date: 2011-08-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -134,13 +134,11 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE.txt
-- README
 - README.rdoc
 files: 
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README
 - README.rdoc
 - Rakefile
 - VERSION

data/README

@@ -1,2 +0,0 @@
-To install:
-  gem install rubyXL