pg_csv 0.1.5 → 0.1.6

data/lib/pg_csv.rb

@@ -85,7 +85,7 @@ class PgCsv
     
     def export_to_stream(stream)
       count = write_csv(stream)
-      stream.flush if stream.respond_to?(:flush)
+      stream.flush if stream.respond_to?(:flush) && count > 0
       
       info "<= done exporting (#{count}) records."
     end
@@ -196,12 +196,11 @@ class PgCsv
 
   def self.with_temp_file(dest, tmp_dir = '/tmp', &block)
     require 'fileutils'
-    require 'tempfile'
-                                  
-    tempfile = Tempfile.new("pg_csv", tmp_dir)
-    yield(tempfile.path)
-        
-    FileUtils.mv(tempfile.path, dest)
+
+    filename = File.join(tmp_dir, "pg_csv_#{Time.now.to_f}_#{rand(1000000)}")
+    block[filename]
+
+    FileUtils.mv(filename, dest)
   end
 
-end
+end

data/lib/pg_csv_version.rb

@@ -1,3 +1,3 @@
 class PgCsv
-  VERSION = "0.1.5"
-end
+  VERSION = "0.1.6"
+end

data/spec/pg_csv_spec.rb

@@ -82,10 +82,18 @@ describe PgCsv do
   end
   
   describe "using temp file" do
-    it "at least file should return to target" do
+    it "at least file should return to target and set correct chmod" do
       File.exists?(@name).should be_false
       PgCsv.new(:sql => @sql, :temp_file => true, :temp_dir => tmp_dir).export(@name)
       with_file(@name){|d| d.should == "4,5,6\n1,2,3\n" }
+      sprintf("%o", File.stat(@name).mode).to_i.should >= 100660
+    end
+
+    it "same with gzip" do
+      File.exists?(@name).should be_false
+      PgCsv.new(:sql => @sql, :temp_file => true, :temp_dir => tmp_dir, :type => :gzip).export(@name)
+      with_gzfile(@name){|d| d.should == "4,5,6\n1,2,3\n" }
+      sprintf("%o", File.stat(@name).mode).to_i.should >= 100660
     end
   end
 
@@ -94,6 +102,7 @@ describe PgCsv do
       File.exists?(@name).should be_false
       PgCsv.new(:sql => @sql, :type => :gzip).export(@name)
       with_gzfile(@name){|d| d.should == "4,5,6\n1,2,3\n" }
+      sprintf("%o", File.stat(@name).mode).to_i.should >= 100660
     end
     
     it "plain export" do
@@ -113,6 +122,7 @@ describe PgCsv do
     it "file as default" do
       PgCsv.new(:sql => @sql, :type => :file).export(@name)
       with_file(@name){|d| d.should == "4,5,6\n1,2,3\n" }            
+      sprintf("%o", File.stat(@name).mode).to_i.should >= 100660
     end
     
     it "yield export" do
@@ -142,6 +152,12 @@ describe PgCsv do
       
       with_gzfile(@name){|d| d.should == "q|w|e\n4|5|6\n1|2|3\n1*2*3\n4*5*6\n" }
     end
+
+    it "gzip with empty content" do
+      File.exists?(@name).should be_false
+      PgCsv.new(:sql => "select a,b,c from tests where a = -1", :type => :gzip).export(@name, :temp_file => true, :temp_dir => tmp_dir)
+      with_gzfile(@name){|d| d.should == "" }
+    end
   end
   
   it "custom row proc" do
@@ -154,4 +170,4 @@ describe PgCsv do
     with_file(@name){|d| d.should == "4-|-5-|-6\n1-|-2-|-3\n" }
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_csv
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 933370835
+      hash: -2157019647217736024
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,10 +119,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 933370835
+      hash: -2157019647217736024
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Fast AR/PostgreSQL csv export. Used pg function 'copy to csv'. Effective