rubyXL 1.1.6 → 1.1.7

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

data/lib/rubyXL/workbook.rb

@@ -23,7 +23,7 @@ module RubyXL
     SHEET_NAME = 'Sheet1'
     def initialize(worksheets=[], filepath=nil, creator=nil, modifier=nil, created_at=nil,
                    company='', application=APPLICATION,
-                   appversion=APPVERSION, date_1904=0)
+                   appversion=APPVERSION, date1904=0)
       if worksheets.nil? || worksheets.empty?
         @worksheets       = [Worksheet.new(self,SHEET_NAME)]
       else
@@ -46,7 +46,7 @@ module RubyXL
       @calc_chain         = nil #unnecessary?
       @num_strings        = 0 #num strings total
       @size               = 0 #num strings in shared_strings array
-      @date_1904          = date_1904
+      @date1904          = date1904
       @external_links     = nil
       @style_corrector    = nil
       @drawings           = nil

data/lib/rubyXL/writer/worksheet_writer.rb

@@ -113,11 +113,21 @@ module Writer
               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'=>@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_opts = {
+                'r'=>(i+1).to_s,
+                'spans'=>'1:'+row.size.to_s,
+                'customFormat'=>custom_format
+              }
+              unless @worksheet.row_styles[(i+1).to_s][:style].to_s == ''
+                row_opts['s'] = @worksheet.row_styles[(i+1).to_s][:style].to_s
+              end
+              unless @worksheet.row_styles[(i+1).to_s][:height].to_s == ''
+                row_opts['ht'] = @worksheet.row_styles[(i+1).to_s][:height].to_s
+              end
+              unless @worksheet.row_styles[(i+1).to_s][:customheight].to_s == ''
+                row_opts['customHeight'] = @worksheet.row_styles[(i+1).to_s][:customHeight].to_s
+              end
+              xml.row(row_opts) {
                 row.each_with_index do |dat, j|
                   unless dat.nil?
                       #TODO do xml.c for all cases, inside specific.

data/rubyXL.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.1.6"
+  s.version = "1.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyXL
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 1
-  - 6
-  version: 1.1.6
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - Vivek Bhagwat