jro_apps/redmine Commit - r13921:3077ed8d3a79

Add BOM to UTF-8 encoded CSV (#7037)....

Jean-Philippe Lang -

r13921:3077ed8d3a79

parent child

Context file:

r13921:3077ed8d3a79

Collapse all files

test/unit/lib/redmine/export/csv_test.rb created 644 +31 0

@@ -0,0 +1,31
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2015 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../../../../../test_helper', __FILE__)
	19
	20	class CsvTest < ActiveSupport::TestCase
	21
	22	BOM = "\xEF\xBB\xBF".force_encoding('UTF-8')
	23
	24	def test_should_include_bom_when_utf8_encoded
	25	with_locale 'sk' do
	26	string = Redmine::Export::CSV.generate {\|csv\| csv << %w(Foo Bar)}
	27	assert_equal 'UTF-8', string.encoding.name
	28	assert string.starts_with?(BOM)
	29	end
	30	end
	31	end

lib/redmine/export/csv.rb +7 -1

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2015  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'csv'
             module Redmine
               module Export
                 module CSV
                   def self.generate(*args, &block)
                     Base.generate(*args, &block)
                   end
                   class Base < ::CSV
                     include Redmine::I18n
                     class << self
                       def generate(&block)
                         col_sep = l(:general_csv_separator)
                         encoding = l(:general_csv_encoding)
-                        super(:col_sep => col_sep, :encoding => encoding, &block)
+                        str = ''.force_encoding(encoding)
+                        if encoding == 'UTF-8'
+                          # BOM
+                          str = "\xEF\xBB\xBF".force_encoding(encoding)
+                        end
+                        super(str, :col_sep => col_sep, :encoding => encoding, &block)
                       end
                     end
                     def <<(row)
                       row = row.map do |field|
                         case field
                         when String
                           Redmine::CodesetUtil.from_utf8(field, self.encoding.name)
                         when Float
                           @decimal_separator ||= l(:general_csv_decimal_separator)
                           ("%.2f" % field).gsub('.', @decimal_separator)
                         else
                           field
                         end
                       end
                       super row
                     end
                   end
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages