csv_rails 0.6.0 → 0.6.1

data/README.rdoc

@@ -91,6 +91,17 @@ If you do not use :header option, header is using :fields and I18n transfer.
       end
     end
 
+And you can use tsv. Both tsv and csv can accept row_sep option.
+
+    # app/controllers/user_controller.rb
+    def index
+      @users = User.all
+      respond_to do |format|
+        format.csv{ render csv: @users, :row_sep => "\r\n" }
+        format.tsv{ render tsv: @users, :row_sep => "\r\n" }
+      end
+    end
+
 You also use i18n_scope option
     # config/locales/ja.yml
     ja:

data/lib/csv_rails/array.rb

@@ -11,7 +11,9 @@ module CsvRails
     # * <tt>:without_header</tt> - total_count
     # * <tt>:encoding</tt> - encoding
     # * <tt>:i18n_scope</tt> - i18n scope
-    def to_csv(opts={})
+
+    def separated_values(sep, opts)
+      row_sep = opts.delete(:row_sep) || :auto
       klass = first.class
       fields = if opts[:fields]
                  opts.delete(:fields)
@@ -33,7 +35,7 @@ module CsvRails
                    I18n.t(defaults.shift, :default => defaults)
                  }
                end
-      csv = CSV.generate do |_csv|
+      csv = CSV.generate(:col_sep => sep, :row_sep => row_sep) do |_csv|
         _csv << header if header && !opts[:without_header]
         each do |element|
           _csv << element.to_csv_ary(fields, opts)
@@ -41,5 +43,13 @@ module CsvRails
       end
       opts[:encoding] ? csv.encode(opts[:encoding]) : csv
     end
+
+    def to_csv(opts={})
+      separated_values(",", opts)
+    end
+
+    def to_tsv(opts={})
+      separated_values("\t", opts)
+    end
   end
 end

data/lib/csv_rails/version.rb

@@ -1,3 +1,3 @@
 module CsvRails
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/csv_rails.rb

@@ -13,8 +13,13 @@ if defined?(Mongoid)
   Mongoid::Document.send(:include, CsvRails::Mongoid)
 end
 
-ActionController::Renderers.add :csv do |obj, options|
-  filename = options[:filename] || File.basename(request.path)
-  send_data obj.to_csv(options), :type => Mime::CSV,
-  :disposition => "attachment; filename=#{filename}.csv"
+Mime::Type.register "text/tsv", :tsv
+
+[:csv, :tsv].each do |format|
+  ActionController::Renderers.add format do |obj, options|
+    filename = options[:filename] || File.basename(request.path)
+    send_data obj.send("to_#{format}", options), :type => Mime.const_get(format.to_s.upcase),
+    :disposition => "attachment; filename=#{filename}.#{format}"
+  end
 end
+

data/test/csv_rails/active_record_test.rb

@@ -93,4 +93,8 @@ class CsvRails::ActiveRecordTest < ActiveSupport::TestCase
   test ".to_csv with association using as_csv" do
     assert_equal @group.created_at_as_csv, User.includes(:groups).to_csv(:fields => [:"groups.first.created_at"], :without_header => true).chomp
   end
+
+  test ".to_csv with row_sep option" do
+    assert_match /\r\n/, User.all.to_csv(:row_sep => "\r\n")
+  end
 end

data/test/csv_rails/array_test.rb

@@ -29,6 +29,12 @@ class CsvRails::ArrayTest < ActiveSupport::TestCase
     assert_equal fields.join(','), [].to_csv(:fields => fields).chomp
   end
 
+  test ".to_tsv not stored i18n" do
+    fields = [:sum, :max]
+    assert_equal fields.join("\t"), [].to_tsv(:fields => fields).chomp
+  end
+
+
   test ".to_csv accept encoding" do
     name = "名前"
     assert_equal name.encode('SJIS'), [].to_csv(:header => [name], :encoding => 'SJIS').chomp
@@ -49,4 +55,10 @@ class CsvRails::ArrayTest < ActiveSupport::TestCase
 
     assert_equal " type,\"\",タイトル,本文\n#{post._type},#{post._id},#{post.title},\"#{post.body}\"\n", [post].to_csv
   end
+
+  test ".to_tsv only it includes Mongoid instance" do
+    post = Post.create(:title => 'this is csv_rails', :body => "line\nline\nline\n")
+
+    assert_equal " type\t\"\"\tタイトル\t本文\n#{post._type}\t#{post._id}\t#{post.title}\t\"#{post.body}\"\n", [post].to_tsv
+  end
 end

data/test/dummy/app/controllers/users_controller.rb

@@ -4,6 +4,7 @@ class UsersController < ApplicationController
     respond_to do |format|
       format.html
       format.csv { render csv: @users, fields: [:id, :name, :age, :"groups.first.name"], without_header: true }
+      format.tsv { render tsv: @users, fields: [:id, :name, :age, :"groups.first.name"], without_header: true }
     end
   end
 

data/test/dummy/log/development.log

@@ -1672,3 +1672,17 @@ Started GET "/users/sjis.csv" for 127.0.0.1 at 2012-03-28 18:56:29 +0900
 Rendered text template (0.0ms)
 Sent data  (1.5ms)
 Completed 200 OK in 401ms (Views: 186.9ms | ActiveRecord: 18.8ms)
+MONGODB [DEBUG] Logging level is currently :debug which could negatively impact client-side performance. You should set your logging level no lower than :info in production.
+MONGODB (0ms) admin['$cmd'].find({:ismaster=>1}).limit(-1)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.4ms)  select sqlite_version(*)
+   (23.4ms)  CREATE TABLE "groups" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (17.2ms)  CREATE TABLE "memberships" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer, "group_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (17.3ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "age" integer, "secret" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (17.5ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  PRAGMA index_list("schema_migrations")
+   (17.6ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (17.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20120328072740')
+   (17.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20120323112247')
+   (17.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20120328072253')