active-list 4.1.8 → 4.2.0

data/VERSION

@@ -1 +1 @@
-4.1.8
+4.2.0

data/lib/active-list/exporters.rb

@@ -38,7 +38,7 @@ module ActiveList
       headers, columns = [], table.exportable_columns
       for column in columns
         datum = column.header_code
-        headers << (options[:iconv] ? "#{options[:iconv]}.iconv("+datum+".to_s)" : datum)
+        headers << (options[:encoding] ? datum+".to_s.encode('#{options[:encoding]}')" : datum)
       end
       return headers
     end
@@ -55,7 +55,7 @@ module ActiveList
           else
             datum = column.exporting_datum_code(record)
           end
-          array << (options[:iconv] ? "#{options[:iconv]}.iconv("+datum+".to_s)" : datum)
+          array << (options[:encoding] ? datum+".to_s.encode('#{options[:encoding]}')" : datum)
         end
       end
       return array

data/lib/active-list/exporters/excel_csv_exporter.rb

@@ -18,14 +18,14 @@ module ActiveList
     def send_data_code(table)
       record = "r"
       code  = table.select_data_code(:paginate => false)
-      code += "ic = Iconv.new('cp1252', 'utf-8')\n"
-      code += "data = ActiveList::CSV.generate(:col_sep=>';') do |csv|\n"
-      code += "  csv << [#{columns_to_array(table, :header, :iconv=>'ic').join(', ')}]\n"
-      code += "  for #{record} in #{table.records_variable_name}\n"  
-      code += "    csv << [#{columns_to_array(table, :body, :record=>record, :iconv=>'ic').join(', ')}]\n"
-      code += "  end\n"
-      code += "end\n"
-      code += "send_data(data, :type=>#{self.mime_type.to_s.inspect}, :disposition=>'inline', :filename=>#{table.model.name}.model_name.human.gsub(/[^a-z0-9]/i,'_')+'.#{self.file_extension}')\n"
+      encoding = "CP1252"
+      code << "data = ActiveList::CSV.generate(:col_sep=>';') do |csv|\n"
+      code << "  csv << [#{columns_to_array(table, :header, :encoding => '#{encoding}').join(', ')}]\n"
+      code << "  for #{record} in #{table.records_variable_name}\n"  
+      code << "    csv << [#{columns_to_array(table, :body, :record=>record, :encoding => '#{encoding}').join(', ')}]\n"
+      code << "  end\n"
+      code << "end\n"
+      code << "send_data(data, :type => #{self.mime_type.to_s.inspect}, :disposition => 'inline', :filename => #{table.model.name}.model_name.human.gsub(/[^a-z0-9]/i,'_')+'.#{self.file_extension}')\n"
       return code
     end
 

metadata

@@ -2,7 +2,7 @@
 name: active-list
 version: !ruby/object:Gem::Version
   version: !binary |-
-    NC4xLjg=
+    NC4yLjA=
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails