easy_sheet_io 0.4.8.2 → 0.4.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c96b508dacc94ed1f5627c6a5b40f2282d08178a54b9114201d818a88752984d
-  data.tar.gz: 3b028f6e872d98c4f9dd5405a5a9278e439893270442a87d35d50823ae756e29
+  metadata.gz: 68608659ae3ff0047c484023e40620ff8fe21a6e4a581bf5e8f8b4ff34f4b522
+  data.tar.gz: 1bbfe8f270b425dbdd7aa493e53e27e500561885fb96e93c01ba6682abdc5a49
 SHA512:
-  metadata.gz: ef3207db108cee37db118c5ec8e73b05bd43fd721f1a2685f88abf2e8a73d2ea780c42cdef37169b9bdfa221e7ca6afa53c67871f2e42e154b9f480e6b6a75b8
-  data.tar.gz: e3bc6a74cb7f4fca7602b5c4a9f1cb3d1eac21e35b492b0303080ee9fc700536b3fb0b7750b9ec1c8412203edca5e2579791926e02ec4f76fafbb168d11d3b0b
+  metadata.gz: 55127eb592a1e4ee2616d084dff54b87d10dbb22c63b845880b52a85f1c2c28c5cf6f064a02a5c970c54d56af6bc3b6e7d065a253a61f8e83a12dfc75dd2d68a
+  data.tar.gz: f83ef0ff3cd9b7554348613ac3cef1a5cebc6ea3f0e40ff66a6765bf2925d5baddeb83eb1bbf72418f27056704fe6efe2359fbcd8c2dc81d9a2c496adea136f1

data/lib/easy_sheet_io/version.rb

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

data/lib/easy_sheet_io.rb

@@ -37,14 +37,17 @@ module EasySheetIo
 		if format.to_s == "array"
 			return csv
 		elsif format.to_s == "hash"
-			return to_hash(csv, **opt)
+			h, i = to_hash(csv, **opt)
+			return h
 		else # include format.nil? (in this case, convert to Daru::DF).
-			ans = to_df(to_hash(csv, **opt), format: format)
+
+			h, ind_orig = to_hash(csv, index: index, **opt)
+			ans = to_df(h, format: format)
 			
 			# Converting Encode and Setting index.. rover not supported yet
 			if format.to_s == "daru" || format.nil?
 				ans.convert_enc!(from: encoding, to: "utf-8")
-				ans.set_index!(index) if index
+				ans.index = ind_orig if index
 			end
 			
 			return ans
@@ -59,11 +62,13 @@ module EasySheetIo
 		if format.to_s == "array"
 			return a2d
 		elsif format.to_s == "hash"
-			return to_hash(a2d, **opt)
+			h, i = to_hash(a2d, **opt)
+			return h
 		else # include format.nil?
-			ans = to_df(to_hash(a2d, **opt), format: format)
+			h, ind_orig = to_hash(a2d, index: index, **opt)
+			ans = to_df(h, format: format)
 			if format.to_s == "daru" || format.nil?
-				ans.set_index!(index) if index
+				ans.index = ind_orig if index
 			end
 			return ans
 		end
@@ -75,7 +80,8 @@ module EasySheetIo
 	def to_hash(array2d, line_from: 1, line_until: nil, line_ignored: nil,
 		                 column_from: nil, column_until: nil, 
 		                 header: 0, symbol_header: false,
-						 replaced_by_nil: [], analyze_type: true)
+						 replaced_by_nil: [], analyze_type: true,
+	                     index: nil)
 				## TODO.. column_from: , column_until:
 		
 		# Define Read Range------------		
@@ -91,6 +97,10 @@ module EasySheetIo
 		# And get originally array-----
 		output = array2d[lfrom...luntil]
 		# -----------------------------
+
+		# Then get data of index-------
+		ind_orig = index ? output.map{ _1[index] } : nil
+		# -----------------------------
 		
 		# Selecct Column---------------
 		output = output.map { _1[column_from...column_until] } if column_from || column_until
@@ -112,12 +122,16 @@ module EasySheetIo
 		# -----------------------------
 
 		# Make Hash(Header => Data Array)  
-		return hd.each_with_object({}).with_index {|(hdr, hash), i| hash[hdr]=output_transpose[i]}
+		return hd.each_with_object({}).with_index {|(hdr, hash), i| hash[hdr]=output_transpose[i]}, ind_orig
 	end
 	
 	# Convert Hash to DataFrame
 	def to_df(d, format: :daru)
-		return format.to_s == "daru" || format.nil? ? Daru::DataFrame.new(d) : Rover::DataFrame.new(d)
+		if format.to_s == "daru" || format.nil?
+			Daru::DataFrame.new(d)
+		else
+			Rover::DataFrame.new(d)
+		end
 	end
 	
 	#----------------------------

metadata

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