pg_csv 0.1.3 → 0.1.4

data/Gemfile

@@ -1,5 +1,3 @@
 source "http://rubygems.org"
 
-gemspec
-
-gem 'activerecord', :require => "active_record"
+gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_csv (0.1.3)
+    pg_csv (0.1.4)
       activerecord
       pg
 
@@ -40,7 +40,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
   pg_csv!
   rake
   rspec

data/README.md

@@ -40,7 +40,7 @@ PgCsv.new(:sql => User.good.to_sql).export('a1.csv')
 PgCsv.new(:sql => sql).export('a2.gz', :type => :gzip)
 PgCsv.new(:sql => sql).export('a3.csv', :temp_file => true)
 PgCsv.new(:sql => sql, :type => :plain).export
-File.open("a4.csv", 'a'){|f| FastPgCsv.new(:sql => "select * from users").\
+File.open("a4.csv", 'a'){|f| PgCsv.new(:sql => "select * from users").\
     export(f, :type => :stream) }
 PgCsv.new(:sql => sql).export('a5.csv', :delimiter => "\t")
 PgCsv.new(:sql => sql).export('a6.csv', :header => true)

data/lib/pg_csv.rb

@@ -7,30 +7,38 @@ class PgCsv
   end
   
   # do export :to - filename or stream  
-  def export(to = nil, opts = {}, &block)
-    @block = block || Proc.new{|x|x}
+  def export(to = nil, opts = {}, &row_proc)
+    @row_proc = row_proc
     @local_options = opts.symbolize_keys
     
     raise ":connection should be" unless connection
     raise ":sql should be" unless sql
 
-    with_temp_file(to, temp_file, temp_dir) do |_to|
-      export_to(_to)
+    with_temp_file?(to, temp_file, temp_dir) do |dest|
+      export_to(dest)
     end        
   end
   
 protected
 
-  def with_temp_file(to, use_temp_file, tmp_dir)
+  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)
+  end
+
+  def with_temp_file?(to, use_temp_file, tmp_dir)
     if use_temp_file && [:file, :gzip].include?(type)
       check_str(to)
+
+      self.class.with_temp_file(to, tmp_dir) do |filename|
+        yield(filename)
+      end
       
-      require 'fileutils'
-      require 'tempfile'
-                    
-      tempfile = Tempfile.new("pg_csv", tmp_dir)
-      yield(tempfile.path)
-      FileUtils.mv(tempfile.path, to)
       info "<=== moving export to #{to}"
     else
       yield(to)
@@ -66,7 +74,7 @@ protected
         
       when :yield
         # not real saving anywhere, just yield each record
-        raise "block should be" unless @block
+        raise "row_proc should be" unless @row_proc
         result = load_data{|_|}
     end
     
@@ -105,12 +113,21 @@ protected
     info "<= query"
 
     info "=> write data"
-    yield(@block[columns_str]) if columns_str
+    if columns_str
+      yield(@row_proc ? @row_proc[columns_str] : columns_str)
+    end
 
     count = 0    
-    while row = raw.get_copy_data()
-      yield(@block[row])
-      count += 1
+    if @row_proc
+      while row = raw.get_copy_data()
+        yield(@row_proc[row])
+        count += 1
+      end
+    else
+      while row = raw.get_copy_data()
+        yield(row)
+        count += 1
+      end
     end
     info "<= write data"
 

data/lib/pg_csv_version.rb

@@ -1,3 +1,3 @@
 class PgCsv
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/{benchmark → spec/benchmark}/bench.rb

@@ -20,9 +20,16 @@ class PgCsv
   def load_data
     n = o(:times).to_i
     c = 0
-    n.times do
-      c += 1
-      yield(@block["#{c},#{c*2},#{c * 249},#{rand(100)},#{rand(n)},blablabla,hahah,ahah,ahaha,ahahah,ah,1.55234143\n"])
+    if @row_proc
+      n.times do
+        c += 1
+        yield(@row_proc["#{c},#{c*2},#{c * 249},#{rand(100)},#{rand(n)},blablabla,hahah,ahah,ahaha,ahahah,ah,1.55234143\n"])
+      end
+    else
+      n.times do
+        c += 1
+        yield("#{c},#{c*2},#{c * 249},#{rand(100)},#{rand(n)},blablabla,hahah,ahah,ahaha,ahahah,ah,1.55234143\n")
+      end
     end
   end
 end

metadata

@@ -1,134 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pg_csv
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Makarchev Konstantin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: pg
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: Fast AR/PostgreSQL csv export. Used pg function 'copy to csv'. Effective on millions rows.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Fast AR/PostgreSQL csv export. Used pg function 'copy to csv'. Effective
+  on millions rows.
+email:
 - kostya27@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
-- benchmark/bench.rb
 - lib/pg_csv.rb
 - lib/pg_csv_version.rb
 - pg_csv.gemspec
+- spec/benchmark/bench.rb
 - spec/pg_csv_spec.rb
 - spec/spec_helper.rb
 - spec/spec_support.rb
 - spec/tmp/.gitkeep
 homepage: http://github.com/kostya/pg_csv
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 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.
+summary: Fast AR/PostgreSQL csv export. Used pg function 'copy to csv'. Effective
+  on millions rows.
 test_files: []
-