easy_sheet_io 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88df6087923b6ed328df091fa6f6fdf2b833e5a7d96af9a386db127b13b2e3cd
-  data.tar.gz: c841d5ed1f39467ee30a3904cb546951c23178343b3f019aa2c8fd9a8872d7a0
+  metadata.gz: ec3308eccf2e355a8c32cf0a3496425522f793633d84203fb6378b460c99b6e0
+  data.tar.gz: 0e00581c782acbbe52883dc0b7e298158854ac4fe992e2fc825c0c766b1f0c67
 SHA512:
-  metadata.gz: 2eb46d668a0e4465e1f93c6617fd0a2212f41b9b0e90b4d0e566d0f25129779914860f970cdf8491ca7fdbcdc5df598d0c5a496097ae3ee1cf62afed95daef2c
-  data.tar.gz: e0ec1d00e0852e70cc4be1ef90d981353803fa796fc9e763631687a4980421b650db1ac6e3c119460e7eabec4313374eee788b0b15768b8c12857f95f5d3a1e2
+  metadata.gz: 54a4b942475d211a2a5d6e9cd3621ed94366f6f4ea313c6eb338b9e10ee426f5bee961de91bab5d31e1b5f3cd3b84bd8636cd002af22122f5140c8303741605f
+  data.tar.gz: 76caa06c1a889fb1e70c6b6b2b5a8e8a483811d24380708443fc527305da8931b5c2f42728d4d82df0e426f7a48e8a992d52896ae77f9af4e7559b3fb7115b77

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easy_sheet_io (0.2.3)
+    easy_sheet_io (0.2.4)
       daru (>= 0.3)
       rake (~> 13.0)
       roo-xls (>= 1.2.0)

data/lib/easy_sheet_io/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EasySheetIo
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/lib/easy_sheet_io.rb

@@ -51,7 +51,7 @@ module EasySheetIo
 	## Option line_ignored is not implemented yet.
 	def to_hash(array2d, line_from: 1, line_until: nil, line_ignored: nil,
 		                 header: 0, symbol_header: false,
-						 replace_to_nil: [], analyze_type: false)
+						 replace_to_nil: [], analyze_type: true)
 		
 		# Define Read Range------------		
 		lfrom, luntil = line_from, line_until
@@ -66,8 +66,8 @@ module EasySheetIo
 			
 		# Define Data Array------------
 		output = array2d[lfrom...luntil]
-		output = fix_array(output, replace_to_nil, analyze_type)
 		output_transpose = output[0].zip(*output[1..])
+		output_transpose = fix_array(output_transpose, replace_to_nil, analyze_type)
 		# -----------------------------
 
 		# Define Header----------------
@@ -129,19 +129,49 @@ module EasySheetIo
 	def fix_array(array2d, replace_to_nil, analyze_type)
 		ans = array2d
 		
-		if replace_to_nil.length > 0
-			ans = ans.map { _1.map {|cell| replace_to_nil.include?(cell) ? nil : cell } }
+		## Replace Blank or User-Selected Value
+		ans = ans.map do |column| 
+			column.map { |cell| replace_to_nil.include?(cell) || /^\s*$/ === cell ? nil : cell }
 		end
-
-		# if analyze_type
-		# 	ans = ans.map do |column|
+		
+		## Replace Number Values to Integer or Float
+		if analyze_type
+			ans = ans.map.with_index do |column, i|
+				type_of_column = :any
+				column.each { |cell| type_of_column = recognize_type(cell, type_of_column) }
 				
-		# 	end
-		# end
+				# p type_of_column
+				case type_of_column
+				when :int
+					column.map { _1.nil? ? nil : _1.to_i }
+				when :float
+					column.map { _1.nil? ? nil : _1.to_f }
+				else
+					column
+				end
+			end
+		end
 
 		return ans
 	end
 
+	def recognize_type(str, expected)
+		return expected if str.nil?
+
+		order = {:any => 0, :int => 1, :float => 2, :string => 3}
+		if /^\s*(-|\+)?\d+\s*$/ === str
+			type_of_str = :int
+		elsif /^\s*(-|\+)?\d*\.\d*\s*$/ === str || /^\s*(-|\+)?(\d*\.\d+|\d+)(e|E)(-|\+)?\d+\s*$/ === str
+			type_of_str = :float
+		else
+			type_of_str = :string
+		end
+				
+		# p "#{type_of_str}, #{str}" if order[type_of_str] > order[expected]
+
+		return order[type_of_str] > order[expected] ? type_of_str : expected
+	end
+
 	# Fix blank or duplicated header
 	def check_header(header_array)
 		# Check Blank

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_sheet_io
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - show-o-atakun