easy_sheet_io 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7081b6e357ed4f81ee5d68b2d5f9badc8ec78d011baa913fcb82bd6e7791ff7
-  data.tar.gz: '083d8baed1ca480c30395649e1c8e9c528052a70d428ec99149ef659ee51ce12'
+  metadata.gz: 6a90d815666a67c59552eea1992bead1ba2ae6303db79e3f833a543eebc57963
+  data.tar.gz: b817dcb25b5042d76d269f2da8bf86ec1653d5b10f7ee7461b08ae4935b008b1
 SHA512:
-  metadata.gz: 1692e122e054a9931fa0fe95196429f25a7395763b2c27d748b22ef56bbc4409318553d1b23f80fb839058d6dcd0362fa98f12ef268873b0602846829974b816
-  data.tar.gz: 6e59b2f33ed3aeb1629c08b373e004407eedec315507df96eb2ecd4ca10b7584fbd940ca10ed4cf8c9e479e65a87bd971dba4e03657b9073780d02b751655709
+  metadata.gz: d22d32dc15813a3dd040e8a9f863336d412aa59c8b650c87d71e2e77f77517bc3199a1cdad793f641943c4d67be3e8e494825bc2835066276ca181326a295ca0
+  data.tar.gz: 8606cb6bcbe63cb7c7407e752003bf594689c405756975e867df63764ecb58eb0547320d503e7c414385462230d7c396f52c0c3352d0a3c287c6227593b5c0c2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easy_sheet_io (0.3.8)
+    easy_sheet_io (0.3.9)
       daru (>= 0.3)
       roo-xls (>= 1.2.0)
       rover-df (>= 0.2.7)

data/lib/easy_sheet_io/version.rb

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

data/lib/easy_sheet_io.rb

@@ -28,6 +28,7 @@ module EasySheetIo
 			# Try Another Encoding
 			puts "Fail Encoding #{encoding}. Trying cp932..."
 			csv = CSV.parse(File.open(path, encoding: "cp932", &:read), col_sep: col_sep)
+			encoding = "cp932"
 		end
 		
 		if format.to_s == "array"
@@ -36,14 +37,14 @@ module EasySheetIo
 			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"
+			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)
+	def read_excel(path, sheet_i: 0, format: :daru, encoding: "utf-8", **opt)
 		a2d = open_excel(path, sheet_i, encoding: encoding) # Get 2D Array
 
 		if format.to_s == "array"
@@ -89,14 +90,10 @@ module EasySheetIo
 	end
 	
 	# Convert Hash to DataFrame
-	def to_df(data, format: :daru)
-		if format == :daru || format == "daru"
-			return Daru::DataFrame.new(data)
-		else #Rover
-			return Rover::DataFrame.new(data)
-		end
+	def to_df(d, format: :daru)
+		return format.to_s == "daru" || format.nil? ? Daru::DataFrame.new(d) : Rover::DataFrame.new(d)
 	end
-
+	
 	#----------------------------
 	# Private metods from here
 	#----------------------------

metadata

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