potatosalad-csv_builder 2.0.2 → 2.0.3

data/csv_builder.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.name          = "potatosalad-csv_builder"
   gem.require_paths = ['lib']
   gem.version       = CsvBuilder::VERSION
-  gem.requirements  = [%q{iconv}, %q{Ruby 1.9.x or FasterCSV}]
+  gem.requirements  = [%q{Ruby 1.9.x or FasterCSV}]
 
   gem.add_dependency "rails", ">= 3.0.0"
 end

data/lib/csv_builder.rb

@@ -11,7 +11,6 @@ module CsvBuilder
 end
 
 require 'action_view'
-require 'iconv'
 require 'csv_builder/proxy'
 require 'csv_builder/filter_proxy'
 require 'csv_builder/csv_proxy'

data/lib/csv_builder/filter_proxy.rb

@@ -1,33 +1,35 @@
 # encoding: utf-8
 
 module CsvBuilder
+
+  DEFAULT_INPUT_ENCODING  = Encoding::UTF_8
+  DEFAULT_OUTPUT_ENCODING = Encoding::ISO_8859_1
+
   class FilterProxy < Proxy
 
     # Transliterate into the required encoding if necessary
     def initialize(data, options = {})
       @options = options.dup
 
-      @options.reverse_merge!(:input_encoding => 'UTF-8', :output_encoding => 'LATIN1')
+      #@options.reverse_merge!(:input_encoding => 'UTF-8', :output_encoding => 'LATIN1')
+      @options.reverse_merge!(:input_encoding => DEFAULT_INPUT_ENCODING, :output_encoding => DEFAULT_OUTPUT_ENCODING)
 
       @input_encoding  = @options.delete(:input_encoding)
       @output_encoding = @options.delete(:output_encoding)
-
-      super(data, @options)
     end
 
     # Transliterate before passing to CSV so that the right characters (e.g. quotes) get escaped
     def <<(row)
-      if @input_encoding != @output_encoding
-        # 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//TRANSLIT because it raises
-        # Iconv::IllegalSequence for some inputs
-        @iconv = Iconv.new("#{@output_encoding}//TRANSLIT//IGNORE", @input_encoding)
+      begin
+        base << [*row].map do |value|
+          v = value.to_s
+          v.force_encoding(@input_encoding)
+          v.encode(@output_encoding, :undef => :replace)
+          v.encode!
+        end
+      rescue
+        base << [*row]
       end
-
-      base << if @iconv then row.map { |value| @iconv.iconv(value.to_s) } else row end
     end
 
     alias :add_row :<<

data/lib/csv_builder/template_handler.rb

@@ -2,46 +2,47 @@
 
 module CsvBuilder # :nodoc:
 
-    # Template handler for csv templates
-    #
-    # Add rows to your CSV file in the template by pushing arrays of columns into csv
-    #
-    #   # First row
-    #   csv << [ 'cell 1', 'cell 2' ]
-    #   # Second row
-    #   csv << [ 'another cell value', 'and another' ]
-    #   # etc...
-    #
-    # You can set the default filename for that a browser will use for 'save as' by
-    # setting <tt>@filename</tt> instance variable in your controller's action method
-    # e.g.
-    #
-    #   @filename = 'report.csv'
-    #
-    # You can also set the input encoding and output encoding by setting
-    # <tt>@input_encoding</tt> and <tt>@output_encoding</tt> instance variables.
-    # These default to 'UTF-8' and 'LATIN1' respectively. e.g.
-    #
-    #   @output_encoding = 'UTF-8'
-    class TemplateHandler
-      class_attribute :default_format
-      self.default_format = Mime::CSV
+  # Template handler for csv templates
+  #
+  # Add rows to your CSV file in the template by pushing arrays of columns into csv
+  #
+  #   # First row
+  #   csv << [ 'cell 1', 'cell 2' ]
+  #   # Second row
+  #   csv << [ 'another cell value', 'and another' ]
+  #   # etc...
+  #
+  # You can set the default filename for that a browser will use for 'save as' by
+  # setting <tt>@filename</tt> instance variable in your controller's action method
+  # e.g.
+  #
+  #   @filename = 'report.csv'
+  #
+  # You can also set the input encoding and output encoding by setting
+  # <tt>@input_encoding</tt> and <tt>@output_encoding</tt> instance variables.
+  # These default to 'UTF-8' and 'LATIN1' respectively. e.g.
+  #
+  #   @output_encoding = 'UTF-8'
+  class TemplateHandler
+    class_attribute :default_format
+    self.default_format = Mime::CSV
 
-      def call(template)
-        <<-EOV
-        begin
-          self.output_buffer = String.new;
-          csv = CsvBuilder::CsvProxy.new(self.output_buffer, @csv_builder || {});
-          #{template.source};
-          if @csv_filename;
-            controller.response.headers['Content-Disposition'] = %Q{attachment; filename="\#{@csv_filename}"};
-          end;
-          self.output_buffer;
-        rescue Exception => e
-          Rails.logger.warn("Exception \#{e} \#{e.message} with class \#{e.class.name} thrown when rendering CSV")
-          raise e
-        end
-        EOV
-      end
+    def call(template)
+      <<-EOV
+      begin;
+        self.output_buffer = String.new;
+        csv = CsvBuilder::CsvProxy.new(self.output_buffer, @csv_builder || {});
+        #{template.source};
+        if @csv_filename;
+          controller.response.headers['Content-Disposition'] = %Q{attachment; filename="\#{@csv_filename}"};
+        end;
+        self.output_buffer;
+      rescue Exception => e;
+        Rails.logger.warn("Exception \#{e} \#{e.message} with class \#{e.class.name} thrown when rendering CSV");
+        raise e;
+      end;
+      EOV
     end
+
+  end
 end

data/lib/csv_builder/version.rb

@@ -1,3 +1,3 @@
 module CsvBuilder
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/spec/controllers/csv_builder_spec.rb

@@ -52,8 +52,7 @@ describe CsvBuilderReportsController do
   describe "Layout with options" do
     it "sets output encoding correctly" do
       get 'encoding', :format => 'csv'
-      correct_output = generate({}, [Iconv.iconv('UTF-16//TRANSLIT//IGNORE', 'UTF-8', 'ąčęėįšųūž')])
-      response.body.to_s.should == correct_output
+      response.body.to_s.should == generate({ :output_encoding => 'UTF-8' }, ['ąčęėįšųūž'])
     end
 
     it "passes csv options" do

data/spec/spec_helper.rb

@@ -14,9 +14,11 @@ TEST_DATA = [
 ]
 
 def generate(options = {}, data = TEST_DATA)
-  CsvBuilder::CSV.generate(options) do |csv|
-    data.each do |row|
-      csv << row
-    end
+  output = String.new
+  output.force_encoding(options[:output_encoding] || CsvBuilder::DEFAULT_OUTPUT_ENCODING)
+  csv = CsvBuilder::CsvProxy.new(output, options)
+  data.each do |row|
+    csv << row
   end
+  output
 end

metadata

@@ -1,10 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: potatosalad-csv_builder
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.0.3
   prerelease: 
-  version: 2.0.2
 platform: ruby
-authors: 
+authors:
 - Econsultancy
 - Vidmantas Kabosis
 - Gabe da Silveira
@@ -12,31 +12,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2151896480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-description: CSV template handler for Rails.  Enables :format => 'csv' in controllers, with templates of the form report.csv.csvbuilder.
-email: 
+  prerelease: false
+  version_requirements: *2151896480
+description: CSV template handler for Rails.  Enables :format => 'csv' in controllers,
+  with templates of the form report.csv.csvbuilder.
+email:
 - andrew@delorum.com
 - gabe@websaviour.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - CHANGELOG.rdoc
@@ -77,34 +74,38 @@ files:
 - spec/templates/csv_builder_reports/simple.csv.csvbuilder
 - spec/templates/csv_builder_reports/simple.html.erb
 homepage: http://github.com/potatosalad/csv_builder
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 4278657704769142768
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-requirements: 
-- iconv
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 4278657704769142768
+requirements:
 - Ruby 1.9.x or FasterCSV
 rubyforge_project: 
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: CSV template handler for Rails
-test_files: 
+test_files:
 - spec/controllers/csv_builder_spec.rb
 - spec/rails_app/.gitignore
 - spec/rails_app/Gemfile