easy_sheet_io 0.4.5 → 0.4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5836501206e6f5e817320e5b3902b8149320fb3298cd7aed7fc6e7d46c4abcf8
-  data.tar.gz: 9dcbc71d2fcc52869a576a67b511f70bffe92f2503287ba79cd8df7b507a42ac
+  metadata.gz: 685887cb42121abd31ee9247b6a6567853d69990b1e00ac8332a1e6a6b7f6eb7
+  data.tar.gz: 5b1871486be2cfce04639ec8ab49bd64c074f0cfd81f967c91f7242ce27d9b0a
 SHA512:
-  metadata.gz: 65b0d5662c5f48da2ac4335fe0900ba07469d3e77eb7efbd0f372e5a3403dfb0daa64f63e1ad72563c871054ce024210e711880844525a6debf0dd03bff3b4dd
-  data.tar.gz: 5ba3eac9ce9660853ba9f0e181504baf57a20c2a1041cc9d4e681be888946f5c23a53a31ec6eeeea230f1217b1adbdbf9a4ac06f426e8ed395282cb8f009e0d3
+  metadata.gz: 6509dce129c5732759c37ccdb8168666b1b39be910b56a9f175e076f5ea7c8d0924f891db0bfa2eb7810e1b631a88989b1d780baf8607039824c33398e14f504
+  data.tar.gz: e3135fe8dfb8601557fccd0a0c3b7185e86cc0e27a4b7cc43f230d42090e80a9b0003851c68731a6a66de2709b88a21bc4bea0a5d74a797e145c33252c67f503

data/lib/easy_sheet_io/version.rb

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

data/lib/easy_sheet_io.rb

@@ -21,6 +21,9 @@ module EasySheetIo
 	# **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)
+		## TODO.. index: option that designate column number to generate DF index.
+		## That is, revicing set_index method.
+
 		# Get 2D Array
 		begin
 			csv = CSV.parse(File.open(path, encoding: encoding, &:read), col_sep: col_sep)
@@ -35,9 +38,13 @@ module EasySheetIo
 			return csv
 		elsif format.to_s == "hash"
 			return to_hash(csv, **opt)
-		else # include format.nil? ... convert to daru df.
+		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") # if encoding != "utf-8"
+			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?
+			
 			return ans
 		end
 	end
@@ -62,6 +69,7 @@ module EasySheetIo
 	def to_hash(array2d, line_from: 1, line_until: nil, line_ignored: nil,
 		                 header: 0, symbol_header: false,
 						 replaced_by_nil: [], analyze_type: true)
+				## TODO.. column_from: , column_until:
 		
 		# Define Read Range------------		
 		lfrom, luntil = line_from, line_until

data/lib/to_csv.rb

@@ -27,21 +27,29 @@ class Daru::DataFrame
 
 	# vector_i番目のヘッダー名を読めるようにエンコード
 	def encode_vector_name(vector_i)
-		self.vectors.to_a[vector_i].encode Encoding::UTF_8, Encoding::Windows_31J
+		if self.vectors.to_a[vector_i].is_a?(String)
+			self.vectors.to_a[vector_i].encode Encoding::UTF_8, Encoding::Windows_31J
+		end
 	end
   
-	# すべての列に対し実施
-	def encode_vectors
+	# すべての列に対し上記を実施
+	def encode_vectors!
 		self.vectors = Daru::Index.new(Range.new(0, self.vectors.size-1).map {|i| encode_vector_name i })
 	end
 
 	# ver.0.3.8~ Convert Daru::DF encoding
-	def convert_enc!(from: "cp932", to: "utf-8")
+	def convert_enc!(from: "cp932", to: "utf-8", format: nil)
 		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?
 	end
 
+	# rover not suppoted yet
+	def set_index!
+		self.index = self[0]
+	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.5
+  version: 0.4.6.1
 platform: ruby
 authors:
 - show-o-atakun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daru