csv_rails 0.5.1 → 0.5.2

data/README.rdoc

@@ -86,4 +86,12 @@ If you do not use :header option, header is using :fields and I18n transfer.
       end
     end
 
+You also use i18n_scope option
+    # config/locales/ja.yml
+    ja:
+      csv:
+        name: なまえ
+
+    User.where("id < 1").all.to_csv(:i18n_scope => :csv) #=> "なまえ\n"
+
 Copyright (c) 2012 yalab, released under the MIT license

data/lib/csv_rails/active_record.rb

@@ -9,21 +9,26 @@ module CsvRails
 
     module ClassMethods
       def to_csv(opts={})
-        fields = if opts[:fields]
-                   opts.delete(:fields)
-                 elsif respond_to?(:attribute_names)
-                   attribute_names
-                 elsif self.is_a?(::ActiveRecord::Relation)
-                   @klass.new.attribute_names
-                 else
-                   new.attribute_names
-                 end
-        header = fields.map{|f| human_attribute_name(f) }
+        fields = opts[:fields] || csv_fields
+        scope = opts.delete(:i18n_scope)
+        header = fields.map{|f|
+          if scope
+            I18n.t("#{scope}.#{f}", :default => human_attribute_name(f))
+          else
+            human_attribute_name(f)
+          end
+        }
         all.to_csv(opts.update(:fields => fields, :header => header))
       end
 
-      def csv_header(names)
-        names.map{|n| human_attribute_name(n) }
+      def csv_fields
+        if respond_to?(:attribute_names)
+          attribute_names
+        elsif self.is_a?(::ActiveRecord::Relation)
+          @klass.new.attribute_names
+        else
+          new.attribute_names
+        end
       end
     end
 

data/lib/csv_rails/array.rb

@@ -12,17 +12,23 @@ module CsvRails
       # * <tt>:header</tt> - header
       # * <tt>:without_header</tt> - total_count
       # * <tt>:encoding</tt> - encoding
+      # * <tt>:i18n_scope</tt> - i18n scope
       def to_csv(opts={})
         fields = opts[:fields]
         header = if opts[:header]
                    opts.delete(:header)
-                 elsif (klass = first.class).respond_to?(:csv_header)
-                   klass.csv_header(fields)
+                 elsif (klass = first.class).respond_to?(:csv_fields)
+                   klass.csv_fields
                  else
-                   fields
+                   scopes = ['csv_rails']
+                   scopes << opts[:i18n_scope] if opts[:i18n_scope]
+                   fields.map{|f|
+                     defaults = scopes.map{|s| "#{s}.#{f}".to_sym }.push(f.to_s)
+                     I18n.t(defaults.shift, :default => defaults)
+                   } if fields
                  end
         csv = CSV.generate do |_csv|
-          _csv << header unless opts[:without_header]
+          _csv << header if header && !opts[:without_header]
           each do |element|
             _csv << element.to_csv_ary(fields, opts)
           end

data/lib/csv_rails/version.rb

@@ -1,3 +1,3 @@
 module CsvRails
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/test/csv_rails/active_record_test.rb

@@ -73,12 +73,6 @@ class CsvRails::ActiveRecordTest < ActiveSupport::TestCase
     I18n.locale = :en
   end
 
-  test ".csv_header with association" do
-    I18n.locale = :ja
-    assert_equal [User.human_attribute_name(:name), Group.human_attribute_name(:name)], User.csv_header([:name, :"groups.first.name"])
-    I18n.locale = :en
-  end
-
   test ".to_csv with association" do
     I18n.locale = :ja
     csv =<<-EOS.gsub(/^\s+/, '')
@@ -89,6 +83,13 @@ class CsvRails::ActiveRecordTest < ActiveSupport::TestCase
     I18n.locale = :en
   end
 
+  test ".to_csv with i18n option" do
+    I18n.locale = :ja
+    translated = [:id, :name].map{|f| I18n.t("csv_rails.#{f}") }.join(',')
+    assert_match /^#{translated}/, User.where('id < 1').to_csv(:i18n_scope => 'csv_rails')
+    I18n.locale = :en
+  end
+
   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

data/test/csv_rails/array_test.rb

@@ -2,13 +2,45 @@
 require 'test_helper'
 
 class CsvRails::ArrayTest < ActiveSupport::TestCase
+  setup do
+    I18n.locale = :ja
+    @csv_rails_scope = {name: "名前", age: "年齢"}
+    @human_scope = {sex: '性別'}
+    I18n.backend.store_translations(:ja, :csv_rails => @csv_rails_scope, :human => @human_scope)
+  end
+
+  teardown do
+    I18n.locale = :en
+  end
+
   test ".to_csv with header option" do
     header = ['foo', 'bar']
     assert_equal  header.join(','), [].to_csv(:header => header).chomp
   end
 
+  test ".to_csv using I18n csv_rails scope and accept i18n_scope option" do
+    translations = @csv_rails_scope.merge(@human_scope)
+    fields = translations.keys
+    assert_equal translations.values.join(','), [].to_csv(:fields => fields, :i18n_scope => :human).chomp
+  end
+
+  test ".to_csv not stored i18n" do
+    fields = [:sum, :max]
+    assert_equal fields.join(','), [].to_csv(:fields => fields).chomp
+  end
+
   test ".to_csv accept encoding" do
     name = "名前"
     assert_equal name.encode('SJIS'), [].to_csv(:header => [name], :encoding => 'SJIS').chomp
   end
+
+  test ".to_csv only it includes ActiveRecord instance" do
+    assert_nothing_raised do
+      [User.create(:name => 'satomicchy')].to_csv
+    end
+  end
+
+  test ".to_csv using empty array" do
+    assert_equal "", [].to_csv
+  end
 end

data/test/dummy/config/locales/ja.yml

@@ -1,4 +1,7 @@
 ja:
+  csv_rails:
+    id: あいでぃー
+    name: なまえ
   activerecord:
     attributes:
       group: &groupmodel