easy_sheet_io 0.3.6 → 0.3.8

data/lib/easy_sheet_io/version.rb

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

data/lib/easy_sheet_io.rb

@@ -19,7 +19,8 @@ module EasySheetIo
 	
 	# ##Generate Array from CSV File, and convert it to Hash or DataFrame.
 	# **opt candidate= line_from: 1, header: 0
-	def read_csv(path, format: nil, encoding: "utf-8", col_sep: ",", **opt)
+	# ver. 0.3.8~ default format=:daru
+	def read_csv(path, format: :daru, encoding: "utf-8", col_sep: ",", **opt)
 		# Get 2D Array
 		begin
 			csv = CSV.parse(File.open(path, encoding: encoding, &:read), col_sep: col_sep)
@@ -29,21 +30,29 @@ module EasySheetIo
 			csv = CSV.parse(File.open(path, encoding: "cp932", &:read), col_sep: col_sep)
 		end
 		
-		return csv if format.nil?
-
-		# Convert Hash or DataFrame
-		ans = to_hash(csv, **opt)
-		return format==:hash || format=="hash" ? ans : to_df(ans, format: format)
+		if format.to_s == "array"
+			return csv
+		elsif format.to_s == "hash"
+			return to_hash(csv, **opt)
+		else # include format.nil?
+			ans = to_df(to_hash(csv, **opt), format: format)
+			ans.convert_enc!(from: encoding, to: "utf-8") if encoding != "utf-8"
+			return ans
+		end
 	end
 
 	# ##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: nil, encoding: "utf-8", **opt)
 		a2d = open_excel(path, sheet_i, encoding: encoding) # Get 2D Array
-		return a2d if format.nil?
-		
-		ans = to_hash(a2d, **opt)
-		return format==:hash || format=="hash" ? ans : to_df(ans, format: format)
+
+		if format.to_s == "array"
+			return a2d
+		elsif format.to_s == "hash"
+			return to_hash(a2d, **opt)
+		else # include format.nil?
+			return to_df(to_hash(a2d, **opt), format: format)
+		end
 	end
 	
 	# Convert 2d Array to Hash

data/lib/to_csv.rb

@@ -14,15 +14,32 @@ class Daru::DataFrame
 		return ans
 	end
 	
-	def write_csv(path)
-		open(path, "w") { _1.write to_csv }
+	def write_csv(path, encoding: nil)
+		enc = encoding.nil? ? "" : ":#{encoding}"
+		open(path, "w#{enc}") { _1.write to_csv }
 	end
+
+	# To avoid bug about adding column to Daru::DataFrame
+	def add_vector(vecname, vec)
+		self[vecname] = vec
+		self.rename_vectors({vecname => vecname})
+	end
+
+	# ver.0.3.8~ Convert Daru::DF encoding
+	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 self[col][0].is_a?(String)
+		end
+	end
+
+	alias_method :addvec, :add_vector
 end
 
 class Rover::DataFrame
 	# Rover#to_csv is already exist.
 
-	def write_csv(path)
-		open(path, "w") {|f| f.write self.to_csv}
+	def write_csv(path, encoding: nil)
+		enc = encoding.nil? ? "" : ":#{encoding}"
+		open(path, "w#{enc}") {|f| f.write self.to_csv}
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_sheet_io
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - show-o-atakun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2023-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daru
@@ -97,6 +97,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Test.csv
 - bin/console
 - bin/setup
 - easy_sheet_io.gemspec