vostok 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vostok (0.0.1)
+    vostok (0.0.3)
       pg
 
 GEM

data/lib/vostok/import.rb

@@ -3,6 +3,7 @@ require 'pg'
 module Vostok
   class Import
     attr_reader :pg_connection, :table
+    @connection_external = false
 
     def initialize(connection)
       raise ArgumentError, 'Connection can not be null' unless connection
@@ -11,6 +12,7 @@ module Vostok
         @pg_connection = PG::Connection.new(connection)
       else
         @pg_connection = connection
+        @connection_external = true
       end
       @options = {batch_size: 1000}
     end
@@ -19,14 +21,13 @@ module Vostok
       validate_args(columns, values)
       @table = table
       begin
-        @pg_connection.reset
         values.each_slice(options[:batch_size]) do |slice|
           sql = generate_sql(table, columns, slice)
           @pg_connection.exec(sql)
         end
         values.length
       ensure
-        @pg_connection.close
+        @pg_connection.close unless @connection_external
       end
     end
 

data/lib/vostok/version.rb

@@ -1,3 +1,3 @@
 module Vostok
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
-require 'bundler/setup'
-require_relative '../lib/vostok'
-
 require 'coveralls'
 Coveralls.wear!
 
+require 'bundler/setup'
+require_relative '../lib/vostok'
+
 
 
 

data/spec/vostok_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'vostok' do
   before {
-    connection_stub = stub 'connection', reset: true, close: true
+    connection_stub = stub 'connection', close: true
     connection_stub.stub(:is_a?).with(PG::Connection).and_return(true)
     connection_stub.stub(:is_a?).with(Hash).and_return(false)
     PG::Connection.stub(:new).and_return(connection_stub)
@@ -56,12 +56,6 @@ describe 'vostok' do
       ->{import.start(:customers, [:a, :b], [[1,2,3], [1,2,3]])}.should raise_error ArgumentError
     end
 
-    it 'should reset pg_connection if it is not yet open' do
-      import.pg_connection.stub(:exec)
-      import.pg_connection.should_receive(:reset)
-      import.start(:customers, [:a], [[1]])
-    end
-
     it 'should call PG library with correct sql in one go' do
       sql = <<-eos
         insert into "customers" ("a","b") values('1','2'),('3','4')
@@ -92,7 +86,15 @@ describe 'vostok' do
       import.start(:customers, [:a, :b], [[1,2]]).should == 1
     end
 
-    it 'should close the connection' do
+    it 'should not close the connection if it has come from outside' do
+      pg_connection = PG::Connection.new(dbname: 'db1', user: 'dev')
+      import = Vostok::Import.new(pg_connection)
+      import.pg_connection.stub(:exec)
+      import.pg_connection.should_not_receive(:close)
+      import.start(:customers, [:a, :b], [[1,2]])
+    end
+
+    it 'should close the connection if it was created internally' do
       import.pg_connection.stub(:exec)
       import.pg_connection.should_receive(:close)
       import.start(:customers, [:a, :b], [[1,2]])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vostok
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg