pg_csv 0.1 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_csv (0.1)
+    pg_csv (0.1.1)
       activerecord
       pg
 

data/README.md

@@ -22,9 +22,9 @@ Options:
 :delimiter  => ["\t", ",", ]
 :header     => boolean, use pg header for fields?
 :logger     => logger
-:columns    => manual array of column names, ignore :header option
+:columns    => array of column names, ignore :header option
 
-:temp_file  => boolean, generate throught temp file, final file appears by mv
+:temp_file  => boolean, generate throught temp file? final file appears by mv
 :temp_dir   => for :temp_file, ex: '/tmp'
 
 :type       => :plain - return full string

data/lib/pg_csv.rb

@@ -25,6 +25,9 @@ class PgCsv
   # do export :to - filename or stream  
   def export(to, opts = {})
     @local_options = opts
+    
+    raise ":connection should be" unless connection
+    raise ":sql should be" unless o(:sql)
 
     with_temp_file(to, o(:temp_file), o(:temp_dir)) do |_to|
       export_to(_to)
@@ -64,7 +67,7 @@ protected
         File.open(to, 'w', &exporter)
         
       when :gzip
-        check_to_str(to)        
+        check_to_str(to)
         Zlib::GzipWriter.open(to, &exporter)
         
       when :stream
@@ -84,7 +87,7 @@ protected
   end
   
   def check_to_str(to)
-    raise "to should be an string" unless to.is_a?(String)
+    raise "'to' should be an string" unless to.is_a?(String)
   end
   
   def export_to_stream(stream)
@@ -106,16 +109,16 @@ protected
 
   def load_data
     info "#{query}"
-    conn = connection.raw_connection
+    raw = connection.raw_connection
     
     info "=> query"
-    q = conn.exec(query)
+    q = raw.exec(query)
     info "<= query"
 
     info "=> write data"
     yield(columns_str) if columns_str
     
-    while row = conn.get_copy_data()
+    while row = raw.get_copy_data()
       yield row
     end
     info "<= write data"

data/lib/pg_csv_version.rb

@@ -1,3 +1,3 @@
 class PgCsv
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

data/spec/pg_csv_spec.rb

@@ -8,10 +8,7 @@ describe PgCsv do
     Test.create :a => 4, :b => 5, :c => 6
     
     @name = tmp_dir + "1.csv"
-    @gzname = tmp_dir + "1.gz"
-    
     FileUtils.rm(@name) rescue nil
-    FileUtils.rm(@gzname) rescue nil
 
     @sql0 = "select a,b,c from tests order by a asc"    
     @sql = "select a,b,c from tests order by a desc"
@@ -19,10 +16,8 @@ describe PgCsv do
   
   after :each do
     FileUtils.rm(@name) rescue nil
-    FileUtils.rm(@gzname) rescue nil            
   end
   
-  
   describe "simple export" do
   
     it "1" do
@@ -96,9 +91,9 @@ describe PgCsv do
 
   describe "different types of export" do
     it "gzip export" do
-      File.exists?(@gzname).should be_false
-      PgCsv.new(:sql => @sql, :type => :gzip).export(@gzname)
-      with_gzfile(@gzname){|d| d.should == "4,5,6\n1,2,3\n" }
+      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" }
     end
     
     it "plain export" do
@@ -120,5 +115,24 @@ describe PgCsv do
       with_file(@name){|d| d.should == "4,5,6\n1,2,3\n" }            
     end
   end
+
+  describe "integration specs" do
+    it "1" do
+      File.exists?(@name).should be_false
+      PgCsv.new(:sql => @sql, :type => :gzip).export(@name, :delimiter => "|", :columns => %w{q w e}, :temp_file => true, :temp_dir => tmp_dir)
+      with_gzfile(@name){|d| d.should == "q|w|e\n4|5|6\n1|2|3\n" }
+    end
+    
+    it "2" do
+      Zlib::GzipWriter.open(@name) do |gz|
+        e = PgCsv.new(:sql => @sql, :type => :stream)
+        
+        e.export(gz, :delimiter => "|", :columns => %w{q w e} )
+        e.export(gz, :delimiter => "*", :sql => @sql0)
+      end
+      
+      with_gzfile(@name){|d| d.should == "q|w|e\n4|5|6\n1|2|3\n1*2*3\n4*5*6\n" }
+    end
+  end
   
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pg_csv
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 1
-  version: "0.1"
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Makarchev Konstantin
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-31 00:00:00 +04:00
-default_executable: 
+date: 2012-05-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: pg
@@ -96,7 +96,6 @@ files:
 - spec/spec_helper.rb
 - spec/spec_support.rb
 - spec/tmp/.gitkeep
-has_rdoc: true
 homepage: http://github.com/kostya/pg_csv
 licenses: []
 
@@ -126,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Fast AR/PostgreSQL csv export. Used pg function 'copy to csv'. Effective on millions rows.