updating to_csv for ruby 1.9

thoughtbot · Feb 1, 2011 · bb699f5 · bb699f5
1 parent 1eb2009
commit bb699f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/vendor/plugins/to_csv/init.rb b/vendor/plugins/to_csv/init.rb
@@ -1,7 +1 @@
-if RUBY_VERSION >= "1.9.0"
-  require 'csv'
-else
-  require 'fastercsv'
-end
-
 require 'to_csv'
diff --git a/vendor/plugins/to_csv/lib/to_csv.rb b/vendor/plugins/to_csv/lib/to_csv.rb
@@ -15,7 +15,15 @@ def to_csv(options = {})
 
     return '' if columns.empty?
 
-    output = CSV.generate do |csv|
+    this_csv = if RUBY_VERSION >= "1.9.0"
+      require 'csv'
+      CSV
+    else
+      require 'fastercsv'
+      FasterCSV
+    end
+
+    output = this_csv.generate do |csv|
       csv << columns.map { |column| klass.human_attribute_name(column) } unless options[:headers] == false
       self.each do |item|
         csv << columns.collect { |column| item.send(column) }