easy_sheet_io 0.2.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff453d19575a146798eccf86d2f5071e0e7fb404ad72280932d327f5a86ad589
-  data.tar.gz: a06d0d24db9e1e723164bd11f5aa63e0564d1e69a298369f57cd59d8d7b2863d
+  metadata.gz: 1883fab0e5e9b2314c463d6e09f293937a259939da884f204c12a587b5468b85
+  data.tar.gz: f6d670676aa90174b8c63823aa70662266d84333a1dc70b15e04e983fe9558fa
 SHA512:
-  metadata.gz: aa4f65e4d22bdec3f2435671a789cf72e8e4b528bd2b357585a6f0b0114edf4cb4209d549232fd4184853f6223e46a29278776a7949cb558fd24cb82455b9017
-  data.tar.gz: 5bd605a6b4d35e6e084a58bdc7172ccaf765984d4d1610c0bb5e01de3d30619cd5042ec944c45d24a768d6501a52b19b315a6d1d686830359953d64251748a0c
+  metadata.gz: f7fbc846a757c052948db4f3cd058d1aecac17c8fd9f521a4d97dbf631d721d6dae8f3701be50b82fcfadf4a85e0bf522f10783eb4adb1e891270dba50345c9a
+  data.tar.gz: a39b1ae932102f750363ec6f976118b9be7ed43ad8826d078f946e8924935f3fc09593d2ed4b7ee992c2e9b0c13ba03b3398edbc0ea9b8c9a3f45c3de0edaed2

data/Gemfile.lock

@@ -1,7 +1,15 @@
 PATH
   remote: .
   specs:
-    easy_sheet_io (0.2.2)
+    easy_sheet_io (0.3.0)
+      daru (>= 0.3)
+      rake (~> 13.0)
+      roo-xls (>= 1.2.0)
+      rover-df (>= 0.2.7)
+      rspec (~> 3.0)
+      rubocop (~> 0.80)
+      smarter_csv (>= 1.4.2)
+      spreadsheet (>= 1.3.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/easy_sheet_io/version.rb

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

data/lib/easy_sheet_io.rb

@@ -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,15 +129,47 @@ module EasySheetIo
 	def fix_array(array2d, replace_to_nil, analyze_type)
 		ans = array2d
 		
-		if replace_nil.length > 0
-			ans = ans.map { _1.map {|cell| replace_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
-
+		
+		## Replace Number Values to Integer or Float
 		if analyze_type
-			ans = ans.map do |column|
+			ans = ans.map.with_index do |column, i|
+				type_of_column = :any
+				column.each { |cell| type_of_column = recognize_type(cell, type_of_column) }
 				
+				# 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
@@ -147,7 +179,8 @@ module EasySheetIo
 			if item.nil?
 				"column#{i}"
 			elsif item.kind_of?(String)
-				/^\s*$/ === item ? "column#{i}" : item.gsub(/\s+/, "")
+				temp = /^\s*$/ === item ? "column#{i}" : item.gsub(/\s+/, "")
+				/^\d+$/ === temp ? "column#{i}" : temp
 			else
 				item
 			end

metadata

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