* lib/csv/csv.rb: Improved the idea of whitespace and word characters used

jeg2 · jeg2 · commit f3ba845deb74 · 2008-09-23T14:40:24.000Z
in substitutions during header conversion as suggested by Michael Selig.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 23 23:39:25 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/csv/csv.rb:  Improved the idea of whitespace and word characters used
+	  in substitutions during header conversion as suggested by Michael Selig.
+
 Tue Sep 23 21:50:53 2008  Tanaka Akira  <akr@fsij.org>
 
 	* io.c (io_binwrite): allocate wbuf if nosync.
diff --git a/lib/csv.rb b/lib/csv.rb
@@ -199,7 +199,7 @@
 # 
 class CSV
   # The version of the installed library.
-  VERSION = "2.4.0".freeze
+  VERSION = "2.4.1".freeze
   
   # 
   # A CSV::Row is part Array and part Hash.  It retains an order for the fields
@@ -933,8 +933,8 @@ class MalformedCSVError < RuntimeError; end
   HeaderConverters = {
     :downcase => lambda { |h| h.encode(ConverterEncoding).downcase },
     :symbol   => lambda { |h|
-      h.encode(ConverterEncoding).
-        downcase.tr(" ", "_").delete("^a-z0-9_").to_sym
+      h.encode(ConverterEncoding).downcase.gsub(/\s+/, "_").
+                                           gsub(/\W+/, "").to_sym
     }
   }
   

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@`
`199`	`199`	`#`
`200`	`200`	`class CSV`
`201`	`201`	`# The version of the installed library.`
`202`		`- VERSION = "2.4.0".freeze`
	`202`	`+ VERSION = "2.4.1".freeze`
`203`	`203`
`204`	`204`	`#`
`205`	`205`	`# A CSV::Row is part Array and part Hash. It retains an order for the fields`
`@@ -933,8 +933,8 @@ class MalformedCSVError < RuntimeError; end`
`933`	`933`	`HeaderConverters = {`
`934`	`934`	`:downcase => lambda { \|h\| h.encode(ConverterEncoding).downcase },`
`935`	`935`	`:symbol => lambda { \|h\|`
`936`		`- h.encode(ConverterEncoding).`
`937`		`- downcase.tr(" ", "_").delete("^a-z0-9_").to_sym`
	`936`	`+ h.encode(ConverterEncoding).downcase.gsub(/\s+/, "_").`
	`937`	`+ gsub(/\W+/, "").to_sym`
`938`	`938`	`}`
`939`	`939`	`}`
`940`	`940`