easy_sheet_io 0.2.4 → 0.3.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/easy_sheet_io/version.rb +1 -1
- data/lib/easy_sheet_io.rb +41 -10
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f4f7a9dd49dc973c3a928ff03daf2100caf8b5ebd230bd944097139620e8b9bc
|
4
|
+
data.tar.gz: 223e50284094338aa8ea2600c8fdeb1de51e1206322aa8e3d1dbeb2d6518b255
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c444ddd73593576667f929823e5ec5d51c789139eaaabf042b120d2dc9aa32d2c325f815a72912af807650a9202204ee93f46ee8b21e222862bdb11bac683344
|
7
|
+
data.tar.gz: 3a2011d6d9232a43fd67be57fe59799d792d07651d6381880c7ea602be8407c17772df140548ed28862ec4ed23f9d922c98508347c32524dbdcede18542aa95e
|
data/Gemfile.lock
CHANGED
data/lib/easy_sheet_io.rb
CHANGED
@@ -66,8 +66,8 @@ module EasySheetIo
|
|
66
66
|
|
67
67
|
# Define Data Array------------
|
68
68
|
output = array2d[lfrom...luntil]
|
69
|
-
output = fix_array(output, replace_to_nil, analyze_type)
|
70
69
|
output_transpose = output[0].zip(*output[1..])
|
70
|
+
output_transpose = fix_array(output_transpose, replace_to_nil, analyze_type)
|
71
71
|
# -----------------------------
|
72
72
|
|
73
73
|
# Define Header----------------
|
@@ -129,19 +129,49 @@ module EasySheetIo
|
|
129
129
|
def fix_array(array2d, replace_to_nil, analyze_type)
|
130
130
|
ans = array2d
|
131
131
|
|
132
|
-
|
133
|
-
|
132
|
+
## Replace Blank or User-Selected Value
|
133
|
+
ans = ans.map do |column|
|
134
|
+
column.map { |cell| replace_to_nil.include?(cell) || /^\s*$/ === cell ? nil : cell }
|
134
135
|
end
|
135
|
-
|
136
|
-
|
137
|
-
|
136
|
+
|
137
|
+
## Replace Number Values to Integer or Float
|
138
|
+
if analyze_type
|
139
|
+
ans = ans.map.with_index do |column, i|
|
140
|
+
type_of_column = :any
|
141
|
+
column.each { |cell| type_of_column = recognize_type(cell, type_of_column) }
|
138
142
|
|
139
|
-
|
140
|
-
|
143
|
+
# p type_of_column
|
144
|
+
case type_of_column
|
145
|
+
when :int
|
146
|
+
column.map { _1.nil? ? nil : _1.to_i }
|
147
|
+
when :float
|
148
|
+
column.map { _1.nil? ? nil : _1.to_f }
|
149
|
+
else
|
150
|
+
column
|
151
|
+
end
|
152
|
+
end
|
153
|
+
end
|
141
154
|
|
142
155
|
return ans
|
143
156
|
end
|
144
157
|
|
158
|
+
def recognize_type(str, expected)
|
159
|
+
return expected if str.nil?
|
160
|
+
|
161
|
+
order = {:any => 0, :int => 1, :float => 2, :string => 3}
|
162
|
+
if /^\s*(-|\+)?\d+\s*$/ === str
|
163
|
+
type_of_str = :int
|
164
|
+
elsif /^\s*(-|\+)?\d*\.\d*\s*$/ === str || /^\s*(-|\+)?(\d*\.\d+|\d+)(e|E)(-|\+)?\d+\s*$/ === str
|
165
|
+
type_of_str = :float
|
166
|
+
else
|
167
|
+
type_of_str = :string
|
168
|
+
end
|
169
|
+
|
170
|
+
# p "#{type_of_str}, #{str}" if order[type_of_str] > order[expected]
|
171
|
+
|
172
|
+
return order[type_of_str] > order[expected] ? type_of_str : expected
|
173
|
+
end
|
174
|
+
|
145
175
|
# Fix blank or duplicated header
|
146
176
|
def check_header(header_array)
|
147
177
|
# Check Blank
|
@@ -149,9 +179,10 @@ module EasySheetIo
|
|
149
179
|
if item.nil?
|
150
180
|
"column#{i}"
|
151
181
|
elsif item.kind_of?(String)
|
152
|
-
/^\s*$/ === item ? "column#{i}" : item.gsub(/\s+/, "")
|
182
|
+
temp = /^\s*$/ === item ? "column#{i}" : item.gsub(/\s+/, "")
|
183
|
+
/^\d+$/ === temp ? "column#{i}" : temp
|
153
184
|
else
|
154
|
-
item
|
185
|
+
item.to_s
|
155
186
|
end
|
156
187
|
end
|
157
188
|
|