lib/transliterating_filter.rb @@ -24,9 +24,7 @@ module ActionView # :nodoc: # These default to 'UTF-8' and 'LATIN1' respectively. e.g. # # @output_encoding = 'UTF-8' - class CsvBuilder < TemplateHandler - include Compilable def self.line_offset @@ -36,42 +34,22 @@ module ActionView # :nodoc: def compile(template) <<-EOV begin - unless defined?(ActionMailer) && defined?(ActionMailer::Base) && controller.is_a?(ActionMailer::Base) @filename ||= "\#{controller.action_name}.csv" controller.response.headers["Content-Type"] ||= 'text/csv' controller.response.headers['Content-Disposition'] = "attachment; filename=\#{@filename}" end - result = FasterCSV.generate(@csv_options || {}) do |csv| + FasterCSV.generate do |faster_csv| + csv = TransliteratingFilter.new(faster_csv) #{template.source} end - - # Transliterate into the required encoding if necessary - # TODO: make defaults configurable - @input_encoding ||= 'UTF-8' - @output_encoding ||= 'LATIN1' - - if @input_encoding == @output_encoding - result - else - # TODO: do some checking to make sure iconv works correctly in - # current environment. See ActiveSupport::Inflector#transliterate - # definition for details - # - # Not using the more standard //IGNORE//TRANLIST because it raises - # Iconv::IllegalSequence for some inputs - c = Iconv.new("\#{@output_encoding}//TRANSLIT//IGNORE", @input_encoding) - c.iconv(result) - end - rescue Exception => e RAILS_DEFAULT_LOGGER.warn("Exception \#{e} \#{e.message} with class \#{e.class.name} thrown when rendering CSV") raise e end EOV end - end end end lib/csv_builder.rb 871f276ad884862c9363851464cc80ebd71e8408 Tom Stuart tom.stuart@econsultancy.com http://github.com/DefV/csv_builder/commit/44301c848706535f63929719649b3ef69e74b676 44301c848706535f63929719649b3ef69e74b676 2009-11-04T06:31:10-08:00 2009-10-08T02:55:48-07:00 Do transliteration before exporting to CSV, not after e775a453d3bb3b584ac3a88ba287fc50be6424f7 Jan De Poorter jan@defv.be