pg_csv 0.1.4 → 0.1.5

data/.gitignore

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

data/lib/pg_csv.rb

@@ -2,201 +2,206 @@ require 'active_record'
 
 class PgCsv
 
-  def initialize(opts = {})
-    @options = opts.symbolize_keys
-  end
-  
-  # do export :to - filename or stream  
-  def export(to = nil, opts = {}, &row_proc)
-    @row_proc = row_proc
-    @local_options = opts.symbolize_keys
+  module Base
+
+    def initialize(opts = {})
+      @options = opts.symbolize_keys
+    end
     
-    raise ":connection should be" unless connection
-    raise ":sql should be" unless sql
+    # do export :to - filename or stream  
+    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 |dest|
-      export_to(dest)
-    end        
-  end
-  
-protected
+      with_temp_file?(to, temp_file, temp_dir) do |dest|
+        export_to(dest)
+      end        
+    end
+    
+  protected
 
-  def self.with_temp_file(dest, tmp_dir = '/tmp', &block)
-    require 'fileutils'
-    require 'tempfile'
-                                  
-    tempfile = Tempfile.new("pg_csv", tmp_dir)
-    yield(tempfile.path)
+    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
         
-    FileUtils.mv(tempfile.path, dest)
-  end
+        info "<=== moving export to #{to}"
+      else
+        yield(to)
+      end
+    end                                                            
 
-  def with_temp_file?(to, use_temp_file, tmp_dir)
-    if use_temp_file && [:file, :gzip].include?(type)
-      check_str(to)
+    def export_to(to)
+    
+      start = Time.now
+      info "===> start generate export #{to}, type: #{type}"
+      
+      result = nil
 
-      self.class.with_temp_file(to, tmp_dir) do |filename|
-        yield(filename)
+      case type
+      
+        when :file
+          check_str(to)
+          File.open(to, 'w', &exporter)
+          
+        when :gzip
+          check_str(to)
+          Zlib::GzipWriter.open(to, &exporter)
+          
+        when :stream
+          raise "'to' should be" unless to
+          exporter[to]
+          
+        when :plain
+          require 'stringio'
+          sio = StringIO.new
+          exporter[sio]
+          result = sio.string
+          
+        when :yield
+          # not real saving anywhere, just yield each record
+          raise "row_proc should be" unless @row_proc
+          result = load_data{|_|}
       end
       
-      info "<=== moving export to #{to}"
-    else
-      yield(to)
+      info "<=== finished write #{to} in #{Time.now - start}"
+      
+      result
     end
-  end                                                            
-
-  def export_to(to)
-  
-    start = Time.now
-    info "===> start generate export #{to}, type: #{type}"
-    
-    result = nil
-
-    case type
     
-      when :file
-        check_str(to)
-        File.open(to, 'w', &exporter)
-        
-      when :gzip
-        check_str(to)
-        Zlib::GzipWriter.open(to, &exporter)
-        
-      when :stream
-        raise "'to' should be" unless to
-        exporter[to]
-        
-      when :plain
-        require 'stringio'
-        sio = StringIO.new
-        exporter[sio]
-        result = sio.string
-        
-      when :yield
-        # not real saving anywhere, just yield each record
-        raise "row_proc should be" unless @row_proc
-        result = load_data{|_|}
+    def check_str(to)
+      raise "'to' should be an string" unless to.is_a?(String)
     end
     
-    info "<=== finished write #{to} in #{Time.now - start}"
-    
-    result
-  end
-  
-  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)
-    count = write_csv(stream)
-    stream.flush if stream.respond_to?(:flush)
-    
-    info "<= done exporting (#{count}) records."
-  end
-
-  def write_csv(stream)
-    load_data do |row|
-      stream.write(row)
+    def exporter
+      method(:export_to_stream).to_proc
     end
-  end
-  
-  def load_data
-    info "#{query}"
-    raw = connection.raw_connection
     
-    info "=> query"
-    q = raw.exec(query)
-    info "<= query"
+    def export_to_stream(stream)
+      count = write_csv(stream)
+      stream.flush if stream.respond_to?(:flush)
+      
+      info "<= done exporting (#{count}) records."
+    end
 
-    info "=> write data"
-    if columns_str
-      yield(@row_proc ? @row_proc[columns_str] : columns_str)
+    def write_csv(stream)
+      load_data do |row|
+        stream.write(row)
+      end
     end
+    
+    def load_data
+      info "#{query}"
+      raw = connection.raw_connection
+      
+      info "=> query"
+      q = raw.exec(query)
+      info "<= query"
 
-    count = 0    
-    if @row_proc
-      while row = raw.get_copy_data()
-        yield(@row_proc[row])
-        count += 1
+      info "=> write data"
+      if columns_str
+        yield(@row_proc ? @row_proc[columns_str] : columns_str)
       end
-    else
-      while row = raw.get_copy_data()
-        yield(row)
-        count += 1
+
+      count = 0    
+      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
-    end
-    info "<= write data"
+      info "<= write data"
 
-    q.clear
-    count
-  end
+      q.clear
+      count
+    end
 
-  def query
-    <<-SQL
-COPY (
-  #{sql}
-) TO STDOUT
-WITH CSV
-DELIMITER '#{delimiter}'
-#{use_pg_header? ? 'HEADER' : ''}
-    SQL
-  end
+    def query
+      <<-SQL
+  COPY (
+    #{sql}
+  ) TO STDOUT
+  WITH CSV
+  DELIMITER '#{delimiter}'
+  #{use_pg_header? ? 'HEADER' : ''}
+      SQL
+    end
 
-  def info(message)
-    logger.info(message) if logger
-  end
-  
-  # ==== options/defaults =============
-  
-  def o(key)
-    @local_options[key] || @options[key]
-  end
+    def info(message)
+      logger.info(message) if logger
+    end
+    
+    # ==== options/defaults =============
+    
+    def o(key)
+      @local_options[key] || @options[key]
+    end
 
-  def connection
-    o(:connection) || (defined?(ActiveRecord::Base) ? ActiveRecord::Base.connection : nil)
-  end
-  
-  def logger
-    o(:logger)
-  end
+    def connection
+      o(:connection) || (defined?(ActiveRecord::Base) ? ActiveRecord::Base.connection : nil)
+    end
+    
+    def logger
+      o(:logger)
+    end
 
-  def type
-    o(:type) || :file
-  end
+    def type
+      o(:type) || :file
+    end
 
-  def use_pg_header?
-    o(:header) && !o(:columns)
-  end
+    def use_pg_header?
+      o(:header) && !o(:columns)
+    end
 
-  def columns_str
-    if o(:columns)
-      col = o(:columns)
-      if col.is_a?(Array)
-        col.join(delimiter) + "\n"
-      else
-        col + "\n"
+    def columns_str
+      if o(:columns)
+        col = o(:columns)
+        if col.is_a?(Array)
+          col.join(delimiter) + "\n"
+        else
+          col + "\n"
+        end
       end
     end
-  end
 
-  def delimiter
-    o(:delimiter) || ','
-  end
-  
-  def sql
-    o(:sql)
-  end
-  
-  def temp_file
-    o(:temp_file)
+    def 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
-  
-  def temp_dir
-    o(:temp_dir) || '/tmp'
+
+  include Base
+
+  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
-  
+
 end

data/lib/pg_csv_version.rb

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

data/spec/pg_csv_spec.rb

@@ -97,7 +97,7 @@ describe PgCsv do
     end
     
     it "plain export" do
-      PgCsv.new(:sql => @sql, :type => :plain).export(nil).should == "4,5,6\n1,2,3\n"
+      PgCsv.new(:sql => @sql, :type => :plain).export.should == "4,5,6\n1,2,3\n"
     end
     
     it "custom stream" do
@@ -144,7 +144,7 @@ describe PgCsv do
     end
   end
   
-  it "custom prepare row" do
+  it "custom row proc" do
     e = PgCsv.new(:sql => @sql)
       
     e.export(@name) do |row|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_csv
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -85,7 +85,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -109,12 +108,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 933370835
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 933370835
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/Gemfile.lock

@@ -1,45 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pg_csv (0.1.4)
-      activerecord
-      pg
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    i18n (0.6.0)
-    multi_json (1.3.6)
-    pg (0.13.2)
-    rake (0.9.2.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  pg_csv!
-  rake
-  rspec