rubyXL 1.1.6 → 1.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.1.6
1
+ 1.1.7
@@ -23,7 +23,7 @@ module RubyXL
23
23
  SHEET_NAME = 'Sheet1'
24
24
  def initialize(worksheets=[], filepath=nil, creator=nil, modifier=nil, created_at=nil,
25
25
  company='', application=APPLICATION,
26
- appversion=APPVERSION, date_1904=0)
26
+ appversion=APPVERSION, date1904=0)
27
27
  if worksheets.nil? || worksheets.empty?
28
28
  @worksheets = [Worksheet.new(self,SHEET_NAME)]
29
29
  else
@@ -46,7 +46,7 @@ module RubyXL
46
46
  @calc_chain = nil #unnecessary?
47
47
  @num_strings = 0 #num strings total
48
48
  @size = 0 #num strings in shared_strings array
49
- @date_1904 = date_1904
49
+ @date1904 = date1904
50
50
  @external_links = nil
51
51
  @style_corrector = nil
52
52
  @drawings = nil
@@ -113,11 +113,21 @@ module Writer
113
113
  end
114
114
 
115
115
  @worksheet.row_styles[(i+1).to_s][:style] = @workbook.style_corrector[@worksheet.row_styles[(i+1).to_s][:style].to_s]
116
- xml.row('r'=>(i+1).to_s, 'spans'=>'1:'+row.size.to_s,
117
- 's'=>@worksheet.row_styles[(i+1).to_s][:style].to_s,
118
- 'customFormat'=>custom_format,
119
- 'ht'=>@worksheet.row_styles[(i+1).to_s][:height].to_s,
120
- 'customHeight'=>@worksheet.row_styles[(i+1).to_s][:customHeight].to_s) {
116
+ row_opts = {
117
+ 'r'=>(i+1).to_s,
118
+ 'spans'=>'1:'+row.size.to_s,
119
+ 'customFormat'=>custom_format
120
+ }
121
+ unless @worksheet.row_styles[(i+1).to_s][:style].to_s == ''
122
+ row_opts['s'] = @worksheet.row_styles[(i+1).to_s][:style].to_s
123
+ end
124
+ unless @worksheet.row_styles[(i+1).to_s][:height].to_s == ''
125
+ row_opts['ht'] = @worksheet.row_styles[(i+1).to_s][:height].to_s
126
+ end
127
+ unless @worksheet.row_styles[(i+1).to_s][:customheight].to_s == ''
128
+ row_opts['customHeight'] = @worksheet.row_styles[(i+1).to_s][:customHeight].to_s
129
+ end
130
+ xml.row(row_opts) {
121
131
  row.each_with_index do |dat, j|
122
132
  unless dat.nil?
123
133
  #TODO do xml.c for all cases, inside specific.
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{rubyXL}
8
- s.version = "1.1.6"
8
+ s.version = "1.1.7"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Vivek Bhagwat"]
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rubyXL
3
3
  version: !ruby/object:Gem::Version
4
- hash: 31
4
+ hash: 29
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 1
9
- - 6
10
- version: 1.1.6
9
+ - 7
10
+ version: 1.1.7
11
11
  platform: ruby
12
12
  authors:
13
13
  - Vivek Bhagwat