easy_sheet_io 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da0f877aebbe7df805dcd3e627e85dda978db30b63e85c2e49f446de258241eb
-  data.tar.gz: dea47c880fc99009894030b554dd113c0debadca97d1a06117b305f14b9f8d28
+  metadata.gz: 68caca55b0bec68b8fba30c5d4d8e38d71bb1f28ddb6718b4eda26b9117ac739
+  data.tar.gz: c89f5b6d7a53c7e343c496509ab8b83bae15fe85eeb51fe1c2f0319243a5335a
 SHA512:
-  metadata.gz: d1d43fdceefa82ad36b731a832022bade5cb7260943c1541bac21bebdb69545f8bfa1766007020df8b67467914d5fc904f7fb5b67616924d8e91c0f74154f5cd
-  data.tar.gz: 29200743821a4c44182092155396894cb9463928849159d66544d64cb30ecf3a25782029515bb9f22381c53063ce44c5598297a0bba59dda3ba2d1580c5a87cf
+  metadata.gz: 58dbd5ddc679958103e92516460b9989b44a42fa27adccda8e9a09ae95d777c11932f778907d0a53396a4ceb0838989622f88579ad1db78e644216b59bbbf051
+  data.tar.gz: be78756f94a2d0449ed5a3644ab336448e5f2a7fa97560b3a626c69df76c3eb74f8b547147f87b1d6cabaaf9cdf677fa7b04e36dc729bf2fea8614162037f978

data/lib/easy_sheet_io/version.rb

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

data/lib/easy_sheet_io.rb

@@ -26,7 +26,7 @@ module EasySheetIo
 			csv = CSV.parse(File.open(path, encoding: encoding, &:read), col_sep: col_sep)
 		rescue
 			# Try Another Encoding
-			puts "Fail Encoding #{encoding}. Trying cp932..."
+			## puts "Fail Encoding #{encoding}. Trying cp932..."
 			csv = CSV.parse(File.open(path, encoding: "cp932", &:read), col_sep: col_sep)
 			encoding = "cp932"
 		end
@@ -35,7 +35,7 @@ module EasySheetIo
 			return csv
 		elsif format.to_s == "hash"
 			return to_hash(csv, **opt)
-		else # include format.nil?
+		else # include format.nil? ... convert to daru df.
 			ans = to_df(to_hash(csv, **opt), format: format)
 			ans.convert_enc!(from: encoding, to: "utf-8") # if encoding != "utf-8"
 			return ans

data/lib/to_csv.rb

@@ -25,15 +25,24 @@ class Daru::DataFrame
 		self.rename_vectors({vecname => vecname})
 	end
 
+	# vector_i番目のヘッダー名を読めるようにエンコード
+	def encode_vector_name(vector_i)
+		self.vectors.to_a[vector_i].encode Encoding::UTF_8, Encoding::Windows_31J
+	end
+  
+	# すべての列に対し実施
+	def encode_vectors
+		self.vectors = Daru::Index.new(Range.new(0, self.vectors.size-1).map {|i| encode_vector_name df, i })
+	end
+
 	# ver.0.3.8~ Convert Daru::DF encoding
 	def convert_enc!(from: "cp932", to: "utf-8")
 		self.vectors.each do |col|
-			if self[col][0].is_a?(String)
-				self[col] = self[col].each {|val| val.encode!(to, from_encoding: from) if !val.nil? }
-			end
+			self[col] = self[col].each {|val| val.encode!(to, from_encoding: from) if val.is_a?(String)}
 		end
 	end
 
+
 	alias_method :addvec, :add_vector
 end
 

metadata

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