mymatrix 0.0.9 → 0.1.0

data/lib/loader_csv.rb

@@ -15,14 +15,14 @@ class LoaderCsv < FileIO
 		else
 			#1.9以上の場合
 			require 'csv'
-			Encoding.default_external = opts[:encode]
+			#Encoding.default_external = opts[:encode]
 			csv = CSV
 		end
 		out = []
 		i= 0
 		syspath = self.encodePath(file)
-		csv.foreach(syspath, {:row_sep => "\r\n", :encoding => opts[:encode]}) do |row|
-      p row
+		#csv.foreach(syspath, {:row_sep => "\r\n", :encoding => opts[:encode]}) do |row|
+    csv.foreach(syspath, {:encoding => opts[:encode]}) do |row|
 			if(opts[:offset])
 				if(opts[:offset] < i)
 					next
@@ -33,7 +33,8 @@ class LoaderCsv < FileIO
 			row.each do |cell|
 				cell = cell.to_s
 				cell ||= ''
-				cell = MyMatrix.toutf8(cell)
+        p cell
+				#cell = MyMatrix.toutf8(cell)
 				#cell = cell.gsub(/^\"/, "")
 				#cell = cell.gsub(/\"$/, "")
 				#"

data/lib/loader_txt.rb

@@ -15,7 +15,7 @@ class LoaderTxt < FileIO
 			end
 		end
     path = self.encodePath(file)
-		fi = open(path, "r:#{opts[:file_encode]}")
+		fi = open(path, "r:#{opts[:encode]}")
 		if(opts[:offset])
 			opts[:offset].times do |i|
 				fi.gets

data/lib/mymatrix/version.rb

@@ -1,3 +1,3 @@
 class MyMatrix
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/csv.csv

@@ -1,3 +1,2 @@
 a,b,c
-,�ޗ�,���
-"�_�u��""�N�I�[�e�[�V����","�J��,�}",aaa
+,奈良,大阪

data/spec/mymatrix_spec.rb

@@ -99,8 +99,12 @@ describe MyMatrix do
     mx[1][0].should == 'ダブル"クオーテーション'
     mx[1][1].should == 'カン,マ'
     mx[1][2].should == 'aaa'
-    
-		
+  end
+  it 'UTF-8形式のcsvファイルが読めること' do
+    mx = makecsv_utf
+    mx[0][0].should == ''
+    mx[0][2].should == '大阪'
+    mx.val(mx[0], 'b').should == '奈良'
   end
   it 'tsvファイルを読めること' do 
     mx = MyMatrix.new('spec/jptest.txt')
@@ -338,6 +342,15 @@ def makecsv
   mx = MyMatrix.new('spec/csv.csv')
   return mx
 end
+def makecsv_utf
+  open('spec/csv.csv', 'w')  do |fo|
+    fo.write("a,b,c\r\n")
+    fo.write(',奈良,大阪')
+    fo.write("\r\n")
+  end
+  mx = MyMatrix.new('spec/csv.csv', :encode => 'utf-8')
+  return mx
+end
 def makecsv_norow
   open('spec/csv.csv', 'w')  do |fo|
     fo.write("a,b,c\r\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymatrix
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -82,6 +82,7 @@ files:
 - pkg/mymatrix-0.0.4.gem
 - pkg/mymatrix-0.0.5.gem
 - pkg/mymatrix-0.0.8.gem
+- pkg/mymatrix-0.0.9.gem
 - spec/csv.csv
 - spec/csv.csv.txt
 - spec/csv_test.csv