Added logging to to_csv_file tasks

quirkey · Feb 6, 2009 · 5ee66fb · 5ee66fb
1 parent fed755c
commit 5ee66fb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/porterable.rb b/lib/porterable.rb
@@ -7,11 +7,11 @@
 
 module Porterable
 
-  def export_filename(prefix = nil)
+  def self.export_filename(prefix = nil)
     "#{prefix}_export-" + Time.now.strftime("%Y%m%d-%H%M%S") + ".csv"
   end
 
-  def export_content_type(user_agent = nil)
+  def self.export_content_type(user_agent = nil)
     if user_agent =~ /windows/i
       'application/vnd.ms-excel'
     else

diff --git a/lib/porterable/is_porterable.rb b/lib/porterable/is_porterable.rb
@@ -64,9 +64,17 @@ def to_csv(options = {}, &block)
       end
 
       def to_csv_file(filename, options = {}, &block)
-        csv_data = to_csv(options, &block)
+        csv_data = to_csv(options) do |count, total_rows|
+          pct = (count.to_f / total_rows.to_f) * 100.0
+          logger.info "Exported row #{count}/#{total_rows} - #{pct}%"
+          yield(count, total_rows) if block_given?
+        end
+        temp_file = Tempfile.new("#{rand Time.now.to_i}-#{rand(1000)}--")
+        temp_file.close
+        temp_path = temp_file.path
+        File.open(temp_path, 'w') {|f| f << csv_data }
         FileUtils.mkdir_p(File.dirname(filename))
-        File.open(filename, 'w') {|f| f << csv_data }
+        FileUtils.mv(temp_path, filename)
       end
 
       def load_csv_str(data)