rubyXL 1.2.4 → 1.2.5
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/lib/rubyXL/parser.rb +1 -1
- data/lib/rubyXL/worksheet.rb +2 -1
- data/rubyXL.gemspec +2 -2
- metadata +4 -4
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.2.
|
1
|
+
1.2.5
|
data/lib/rubyXL/parser.rb
CHANGED
@@ -226,7 +226,7 @@ module RubyXL
|
|
226
226
|
|
227
227
|
wb.worksheets[i].row_styles[row_attributes['r'].content] = { :style => row_style }
|
228
228
|
|
229
|
-
if !row_attributes['ht'].nil? && !row_attributes['ht'].content.
|
229
|
+
if !row_attributes['ht'].nil? && (!row_attributes['ht'].content.nil? || row_attributes['ht'].content.strip != "" )
|
230
230
|
wb.worksheets[i].change_row_height(Integer(row_attributes['r'].content)-1,
|
231
231
|
Float(row_attributes['ht'].content))
|
232
232
|
end
|
data/lib/rubyXL/worksheet.rb
CHANGED
@@ -36,7 +36,7 @@ class Worksheet < PrivateClass
|
|
36
36
|
return @sheet_data.map {|row| row.map {|c| if c.is_a?(Cell) then c.value else nil end}}
|
37
37
|
end
|
38
38
|
|
39
|
-
def get_table(headers=[])
|
39
|
+
def get_table(headers=[],opts={})
|
40
40
|
validate_workbook
|
41
41
|
|
42
42
|
if !headers.is_a?(Array)
|
@@ -54,6 +54,7 @@ class Worksheet < PrivateClass
|
|
54
54
|
|
55
55
|
header_row = @sheet_data[row_num]
|
56
56
|
header_row.each_with_index do |header_cell, index|
|
57
|
+
break if index>0 && !opts[:last_header].nil? && !header_row[index-1].nil? && !header_row[index-1].value.nil? && header_row[index-1].value.to_s==opts[:last_header]
|
57
58
|
next if header_cell.nil? || header_cell.value.nil?
|
58
59
|
header = header_cell.value.to_s
|
59
60
|
table_hash[:sorted_headers]||=[]
|
data/rubyXL.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{rubyXL}
|
8
|
-
s.version = "1.2.
|
8
|
+
s.version = "1.2.5"
|
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"]
|
12
|
-
s.date = %q{2012-01-
|
12
|
+
s.date = %q{2012-01-25}
|
13
13
|
s.description = %q{rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents}
|
14
14
|
s.email = %q{bhagwat.vivek@gmail.com}
|
15
15
|
s.extra_rdoc_files = [
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rubyXL
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 21
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 2
|
9
|
-
-
|
9
|
+
- 5
|
10
10
|
segments_generated: true
|
11
|
-
version: 1.2.
|
11
|
+
version: 1.2.5
|
12
12
|
platform: ruby
|
13
13
|
authors:
|
14
14
|
- Vivek Bhagwat
|
@@ -16,7 +16,7 @@ autorequire:
|
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
18
|
|
19
|
-
date: 2012-01-
|
19
|
+
date: 2012-01-25 00:00:00 -05:00
|
20
20
|
default_executable:
|
21
21
|
dependencies:
|
22
22
|
- !ruby/object:Gem::Dependency
|