cosvon 0.0.0.2 → 0.0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfe2240d43b01ac288d579f88b776459e29d7f60
-  data.tar.gz: 700563855505d0e54d4ba235713b2706450e7e2b
+  metadata.gz: 1ec2eded8df132928a91123bd716c38ac751e3eb
+  data.tar.gz: 2cd209470911f510ca04a3f5e7449e2f1d458b59
 SHA512:
-  metadata.gz: ac440d9c893f727f677bcd6588940ff4c5f0aec636e43d31d8431749e23faf459f55bde91a73f2aaae5c6bdb4d731e978ff540bebebe62a1f0afea67c7e8905f
-  data.tar.gz: 9e75777edb5a7546fb88356a4205e2f9993c5647eca200617578e3a511e7e62edb312b6a74af075570e6a7e59b6de09fd66c7a842bd26a3afc8ab127deedd239
+  metadata.gz: 6288ad48208cf41d91f8c88a7ac49993c4be3bc1d5f2bd210af9a9d30c6a16026f0fd48a9bc14e94d4761c7592e715e47d3d6468b7c951baee126578d12c837a
+  data.tar.gz: 4949e1dfb96784a6e7387139dd2113763cc9dae4f2293805e9df7629ce33881025c910f6cfe125b023848205223a4e0b3ef561edbb8cad4dec563b3bb32f59a1

data/.travis.yml

@@ -1,7 +1,4 @@
 language: ruby
-before_install:
-  - gem update --system 2.1.11
-  - gem --version
 rvm:
   - 1.8.7
   - ree
@@ -9,17 +6,22 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - 2.1.1
-  - 2.1.2
+  - 2.1.7
+  - 2.2.0
+  - 2.2.3
   - ruby-head
   - jruby-18mode
   - jruby-19mode
   - jruby-20mode
   - jruby-21mode
   - jruby-head
-  - rbx-2.1.1
-  - rbx-2.2.3
+  - rbx-2
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: jruby-20mode
+    - rvm: jruby-21mode
+    - rvm: rbx-2

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # ChangeLog
 
+# 0.0.0.3 (20160519)
+Line-break can be either LF/CR/CRLF (must be the same within a file).
+
 # 0.0.0.2 (20150621)
 Some CSVs are broken due to SJIS dame-moji.
 I have added a workaround into CoSVON.csv().

data/lib/cosvon.rb

@@ -8,7 +8,7 @@ class CoSVON
 	HSALSKCAB='―ソЫ噂浬欺圭構蚕十申曾箪貼能表暴予禄兔喀媾彌拿杤歃濬畚秉綵臀藹觸軆鐔饅鷭偆砡'
 
 	# VERSION string
-	VERSION='0.0.0.2'
+	VERSION='0.0.0.3'
 
 	# parses csv string into 2D array. quoted commas/LFs and escaped quotations are supported.
 	def self.csv(s,__opt=Hash.new)
@@ -19,9 +19,10 @@ class CoSVON
 		quote=false
 		backslash=0
 		cur=''
-		(s+(s.end_with?("\n") ? "" : "\n")).each_char{|c|
-			if c=="\r" #ignore CR
-			elsif c==opt[:quote_char]
+		linebreak=nil
+		s.each_char{|c|
+			#if c=="\r" #ignore CR
+			if c==opt[:quote_char]
 				if !quoted #start of quote
 					quoted=true
 				elsif !quote #end of quote? Let's determine using next char
@@ -45,11 +46,14 @@ class CoSVON
 						quoted=false
 					end
 				end
-				if c=="\n"&&!quoted
-					line<<cur
-					cur=''
-					csv<<line
-					line=[]
+				if (c=="\n"||c=="\r")&&!quoted
+					if !linebreak||linebreak==c
+						line<<cur
+						cur=''
+						csv<<line
+						line=[]
+						linebreak=c
+					end
 				elsif c==opt[:col_sep]&&!quoted
 					line<<cur
 					cur=''
@@ -63,6 +67,8 @@ class CoSVON
 				end
 			end
 		}
+		line<<cur if !cur.empty?
+		csv<<line if !line.empty?
 		csv
 	end
 

data/spec/cosvon_spec.rb

@@ -1,3 +1,4 @@
+#coding:utf-8
 SPEC_DIR=File.expand_path(File.dirname(__FILE__))
 require SPEC_DIR+'/spec_helper'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cosvon
 version: !ruby/object:Gem::Version
-  version: 0.0.0.2
+  version: 0.0.0.3
 platform: ruby
 authors:
 - cielavenir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Comma Separated Value Object Notation