pg_csv 0.1.1 → 0.1.2

data/.gitignore

@@ -11,3 +11,4 @@ test/dummy/.sass-cache
 tmp/*
 !tmp/.gitkeep
 *.gem
+todo

data/lib/pg_csv.rb

@@ -19,17 +19,17 @@ class PgCsv
   #               => :file - just save to file * default
   
   def initialize(opts = {})
-    @options = opts
+    @options = opts.symbolize_keys
   end
   
   # do export :to - filename or stream  
   def export(to, opts = {})
-    @local_options = opts
+    @local_options = opts.symbolize_keys
     
     raise ":connection should be" unless connection
-    raise ":sql should be" unless o(:sql)
+    raise ":sql should be" unless sql
 
-    with_temp_file(to, o(:temp_file), o(:temp_dir)) do |_to|
+    with_temp_file(to, temp_file, temp_dir) do |_to|
       export_to(_to)
     end        
   end
@@ -38,12 +38,12 @@ protected
 
   def with_temp_file(to, use_temp_file, tmp_dir)
     if use_temp_file
-      check_to_str(to)
+      check_str(to)
       
       require 'fileutils'
       require 'tempfile'
                     
-      tempfile = Tempfile.new("pg_csv", tmp_dir || '/tmp')
+      tempfile = Tempfile.new("pg_csv", tmp_dir)
       yield(tempfile.path)
       FileUtils.mv(tempfile.path, to)
       info "<=== moving export to #{to}"
@@ -53,8 +53,7 @@ protected
   end                                                            
 
   def export_to(to)
-    exporter = method(:export_to_stream).to_proc
-
+  
     start = Time.now
     info "===> start generate export #{to}, type: #{type}"
     
@@ -63,11 +62,11 @@ protected
     case type
     
       when :file
-        check_to_str(to)
+        check_str(to)
         File.open(to, 'w', &exporter)
         
       when :gzip
-        check_to_str(to)
+        check_str(to)
         Zlib::GzipWriter.open(to, &exporter)
         
       when :stream
@@ -86,13 +85,17 @@ protected
     result
   end
   
-  def check_to_str(to)
+  def check_str(to)
     raise "'to' should be an string" unless to.is_a?(String)
   end
   
+  def exporter
+    method(:export_to_stream).to_proc
+  end
+  
   def export_to_stream(stream)
     write_csv(stream)
-    stream.flush
+    stream.flush if stream.respond_to?(:flush)
   end
 
   def write_csv(stream)
@@ -129,7 +132,7 @@ protected
   def query
     <<-SQL
 COPY (
-  #{o(:sql)}
+  #{sql}
 ) TO STDOUT
 WITH CSV
 DELIMITER '#{delimiter}'
@@ -182,4 +185,16 @@ DELIMITER '#{delimiter}'
     o(:delimiter) || ','
   end
   
+  def sql
+    o(:sql)
+  end
+  
+  def temp_file
+    o(:temp_file)
+  end
+  
+  def temp_dir
+    o(:temp_dir) || '/tmp'
+  end
+  
 end

data/lib/pg_csv_version.rb

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

data/pg_csv.gemspec

@@ -23,4 +23,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
   
-end
+end

data/spec/pg_csv_spec.rb

@@ -135,4 +135,15 @@ describe PgCsv do
     end
   end
   
+  it "custom prepare row" do
+    e = PgCsv.new(:sql => @sql)
+      
+    def e.prepare_row(row)
+      row.split(",").join("-|-")
+    end
+      
+    e.export(@name)
+    with_file(@name){|d| d.should == "4-|-5-|-6\n1-|-2-|-3\n" }
+  end
+  
 end

data/spec/spec_support.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 
-conn = {'adapter' => 'postgresql', 'database' => 'pgcsv_test', 'encoding' => 'utf8', 'username' => 'kostya', 'password' => 'password'}
+conn = {'adapter' => 'postgresql', 'database' => 'pgcsv_test'}
 ActiveRecord::Base.establish_connection conn
 
 class Test < ActiveRecord::Base

metadata

@@ -1,88 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pg_csv
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Makarchev Konstantin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-12 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
@@ -98,36 +98,27 @@ files:
 - 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: []
-