2 files changed, 37 insertions, 6 deletions
diff --git a/app/models/export/base.rb b/app/models/export/base.rb
index ae34be0d0..b078da273 100644
--- a/app/models/export/base.rb
+++ b/app/models/export/base.rb
@@ -61,6 +61,10 @@ class Export::Base < ActiveRecord::Base
     true
   end
 
+  def visible_options
+    options.select{|k, v| ! k.match  /^_/}
+  end
+
   def display_option_value option_name, context
     option = self.class.options[option_name.to_sym]
     val = self.options[option_name.to_s]
diff --git a/app/models/export/referential_companies.rb b/app/models/export/referential_companies.rb
index 7a796fb48..0b6187060 100644
--- a/app/models/export/referential_companies.rb
+++ b/app/models/export/referential_companies.rb
@@ -5,35 +5,62 @@ class Export::ReferentialCompanies < Export::Base
     required: true,
     display: ->(val){r = Referential.find(val); link_to(r.name, [r])}
 
-  after_commit :call_exporter, on: :create
+  after_create :call_exporter_async
 
   def referential
     Referential.find referential_id
   end
 
+  def call_exporter_async
+    SimpleExportWorker.perform_async(id)
+  end
+
+  def exporter
+    SimpleExporter.define :referential_companies do |config|
+      config.separator = ";"
+      config.encoding = 'ISO-8859-1'
+      config.add_column :name
+      config.add_column :registration_number
+    end
+
+    @exporter ||= begin
+      if options[:_exporter_id]
+        exporter = SimpleExporter.find options[:exporter_id]
+      else
+        exporter = SimpleExporter.create configuration_name: :referential_companies
+        options[:_exporter_id] = exporter.id
+      end
+      exporter
+    end
+  end
+
   def call_exporter
     tmp = Tempfile.new ["referential_companies", ".csv"]
-    exporter =  SimpleExporter.create configuration_name: :referential_companies, filepath: tmp.path
     referential.switch
     exporter.configure do |config|
       config.collection = referential.companies.order(:name)
     end
+    exporter.filepath = tmp.path
     exporter.export
+    set_status_from_exporter
+    convert_exporter_journal_to_messages
+    self.file = tmp
+    self.save!
+  end
+
+  def set_status_from_exporter
     if exporter.status == :error
       self.status = :failed
     else
-      self.file = tmp
       if exporter.status == :success
         self.status = :successful
       else
         self.status = :warning
       end
     end
-    convert_exporter_journal_to_messages exporter
-    self.save!
   end
 
-  def convert_exporter_journal_to_messages exporter
+  def convert_exporter_journal_to_messages
     self.messages.destroy_all
     exporter.journal.each do |journal_item|
       journal_item.symbolize_keys!