easy_sheet_io 0.4.6.1 → 0.4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 685887cb42121abd31ee9247b6a6567853d69990b1e00ac8332a1e6a6b7f6eb7
-  data.tar.gz: 5b1871486be2cfce04639ec8ab49bd64c074f0cfd81f967c91f7242ce27d9b0a
+  metadata.gz: a53b3053320aed73cc23e53314ddbad656a0d7567f9012a4bf1388c7e44958c0
+  data.tar.gz: 971ad3bfc3a5211493c31886a5487f5f19a4ddda8b7a71a5be3c4a6cf10d2761
 SHA512:
-  metadata.gz: 6509dce129c5732759c37ccdb8168666b1b39be910b56a9f175e076f5ea7c8d0924f891db0bfa2eb7810e1b631a88989b1d780baf8607039824c33398e14f504
-  data.tar.gz: e3135fe8dfb8601557fccd0a0c3b7185e86cc0e27a4b7cc43f230d42090e80a9b0003851c68731a6a66de2709b88a21bc4bea0a5d74a797e145c33252c67f503
+  metadata.gz: 4b24c4ffdb2c549ab9457362c0d16234808f3b98e8140e1a656771749203aee0fd2d8aafd90590c98ffc19358eda892cc45e4887702884560c92cc7950101a75
+  data.tar.gz: 952d816e49b326fb3b266a5ae00ff4d649b337e080451ca348068975b333384f311b59471db41084cdee584746e43fd9a88c34b2b91b6ec94834eb5147d1f875

data/lib/easy_sheet_io/version.rb

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

data/lib/easy_sheet_io.rb

@@ -20,7 +20,7 @@ module EasySheetIo
 	# ##Generate Array from CSV File, and convert it to Hash or DataFrame.
 	# **opt candidate= line_from: 1, header: 0
 	# ver. 0.3.8~ default format=:daru
-	def read_csv(path, format: :daru, encoding: "utf-8", col_sep: ",", **opt)
+	def read_csv(path, format: :daru, encoding: "utf-8", col_sep: ",", index: nil, **opt)
 		## TODO.. index: option that designate column number to generate DF index.
 		## That is, revicing set_index method.
 
@@ -40,10 +40,12 @@ module EasySheetIo
 			return to_hash(csv, **opt)
 		else # include format.nil? (in this case, convert to Daru::DF).
 			ans = to_df(to_hash(csv, **opt), format: format)
-			ans.convert_enc!(from: encoding, to: "utf-8", format: format) # if encoding != "utf-8"
 			
-			# Setting index.. rover not supported yet
-			ans.set_index! if format.to_s == "daru" || format.nil?
+			# 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
+			end
 			
 			return ans
 		end
@@ -51,7 +53,7 @@ module EasySheetIo
 
 	# ##Generate Array from EXCEL File, and convert it to Hash or DataFrame.
 	# **opt candidate= line_from: 1, header: 0)
-	def read_excel(path, sheet_i: 0, format: :daru, encoding: "utf-8", **opt)
+	def read_excel(path, sheet_i: 0, format: :daru, encoding: "utf-8", index: nil, **opt)
 		a2d = open_excel(path, sheet_i, encoding: encoding) # Get 2D Array
 
 		if format.to_s == "array"
@@ -59,7 +61,11 @@ module EasySheetIo
 		elsif format.to_s == "hash"
 			return to_hash(a2d, **opt)
 		else # include format.nil?
-			return to_df(to_hash(a2d, **opt), format: format)
+			ans = to_df(to_hash(a2d, **opt), format: format)
+			if format.to_s == "daru" || format.nil?
+				ans.set_index!(index) if index
+			end
+			return ans
 		end
 	end
 	

data/lib/to_csv.rb

@@ -25,6 +25,7 @@ class Daru::DataFrame
 		self.rename_vectors({vecname => vecname})
 	end
 
+	### エンコード関連 ###
 	# vector_i番目のヘッダー名を読めるようにエンコード
 	def encode_vector_name(vector_i)
 		if self.vectors.to_a[vector_i].is_a?(String)
@@ -38,17 +39,18 @@ class Daru::DataFrame
 	end
 
 	# ver.0.3.8~ Convert Daru::DF encoding
-	def convert_enc!(from: "cp932", to: "utf-8", format: nil)
+	def convert_enc!(from: "cp932", to: "utf-8")
 		self.vectors.each do |col|
 			self[col] = self[col].each {|val| val.encode!(to, from_encoding: from) if val.is_a?(String)}
 		end
 		
-		self.encode_vectors! if format.to_s == "daru" || format.nil?
+		self.encode_vectors!
 	end
+	#####################
 
-	# rover not suppoted yet
-	def set_index!
-		self.index = self[0]
+	# rover not suppoted yet about indexing
+	def set_index!(indexcolumn)
+		self.index = self[indexcolumn]
 	end 
 
 	alias_method :addvec, :add_vector

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_sheet_io
 version: !ruby/object:Gem::Version
-  version: 0.4.6.1
+  version: 0.4.7.1
 platform: ruby
 authors:
 - show-o-atakun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-10 00:00:00.000000000 Z
+date: 2023-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daru