vostok 0.0.1 → 0.0.2

data/lib/vostok/import.rb

@@ -2,10 +2,16 @@ require 'pg'
 
 module Vostok
   class Import
-    attr_reader :connection, :pg_connection, :table
+    attr_reader :pg_connection, :table
 
     def initialize(connection)
-      @connection = connection
+      raise ArgumentError, 'Connection can not be null' unless connection
+      raise ArgumentError, 'Connection must be a Hash or a PG::Connection' unless (connection.is_a?(::Hash) || connection.is_a?(PG::Connection))
+      if connection.is_a? ::Hash
+        @pg_connection = PG::Connection.new(connection)
+      else
+        @pg_connection = connection
+      end
       @options = {batch_size: 1000}
     end
 
@@ -13,7 +19,7 @@ module Vostok
       validate_args(columns, values)
       @table = table
       begin
-        @pg_connection = PG::Connection.open(@connection)
+        @pg_connection.reset
         values.each_slice(options[:batch_size]) do |slice|
           sql = generate_sql(table, columns, slice)
           @pg_connection.exec(sql)

data/lib/vostok/version.rb

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

data/spec/vostok_spec.rb

@@ -1,23 +1,43 @@
 require 'spec_helper'
 
 describe 'vostok' do
+  before {
+    connection_stub = stub 'connection', reset: true, 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)
+  }
+  let(:import){import =  Vostok::Import.new(host: 'localhost', dbname: 'db1')}
+
   it 'should return version' do
     Vostok::VERSION.should_not be_nil
   end
 
-  let(:import){import =  Vostok::Import.new(host: 'localhost', dbname: 'db1')}
-  it 'should take connection hash to constructor' do
+
+  it 'should throw argument error when no connection is given' do
+    ->{Vostok::Import.new(nil)}.should raise_error ArgumentError
+  end
+
+  it 'should throw argument error when given connection is not a hash or a PG::Connection' do
+    ->{Vostok::Import.new(1)}.should raise_error ArgumentError
+  end 
+
+  it 'should accept connection hash in constructor' do
+    import =  Vostok::Import.new(host: 'localhost', dbname: 'db1')
     import.should_not be_nil
   end
 
-  it 'should assign connection' do
-    import.connection.should_not be_nil
+  it 'should accept existing PG connection in constructor' do
+    pg_connection = PG::Connection.new(host: 'localhost', dbname: 'db1')
+    import = Vostok::Import.new(pg_connection)
+    import.should_not be_nil
   end
 
-  it 'should assign connection with hash' do
-    import.connection.should be_instance_of ::Hash
+  it 'should assign pg_connection' do
+    import.pg_connection.should_not be_nil
   end
 
+
   context 'importing' do
     it 'should throw argument error when no table name given' do
       ->{import.start(nil, nil, nil)}.should raise_error ArgumentError
@@ -36,10 +56,9 @@ describe 'vostok' do
       ->{import.start(:customers, [:a, :b], [[1,2,3], [1,2,3]])}.should raise_error ArgumentError
     end
 
-    it 'should open pg_connection if it is not yet open' do
-      mock_connection = mock 'connection', close: true
-      mock_connection.stub!(:exec)
-      PG::Connection.should_receive(:open).and_return mock_connection
+    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
 
@@ -47,9 +66,7 @@ describe 'vostok' do
       sql = <<-eos
         insert into "customers" ("a","b") values('1','2'),('3','4')
       eos
-      mock_connection = mock 'connection', close: true
-      PG::Connection.stub!(:open).and_return mock_connection
-      mock_connection.should_receive(:exec).with(sql.strip)
+      import.pg_connection.should_receive(:exec).with(sql.strip)
       import.start(:customers, [:a, :b], [[1,2], [3,4]])
     end
 
@@ -64,26 +81,20 @@ describe 'vostok' do
       sql3 = <<-eos
         insert into "customers" ("a","b") values('9','10')
       eos
-      mock_connection = mock 'connection', close: true
-      PG::Connection.stub!(:open).and_return mock_connection
-      mock_connection.should_receive(:exec).with(sql1.strip).ordered
-      mock_connection.should_receive(:exec).with(sql2.strip).ordered
-      mock_connection.should_receive(:exec).with(sql3.strip).ordered
+      import.pg_connection.should_receive(:exec).with(sql1.strip).ordered
+      import.pg_connection.should_receive(:exec).with(sql2.strip).ordered
+      import.pg_connection.should_receive(:exec).with(sql3.strip).ordered
       import.start(:customers, [:a, :b], data, batch_size: 2)
     end
 
     it 'should return number of inserted rows' do
-      mock_connection = mock 'connection', close: true
-      PG::Connection.stub!(:open).and_return mock_connection
-      mock_connection.stub!(:exec)
+      import.pg_connection.stub(:exec)
       import.start(:customers, [:a, :b], [[1,2]]).should == 1
     end
 
     it 'should close the connection' do
-      mock_connection = mock 'connection'
-      PG::Connection.stub!(:open).and_return mock_connection
-      mock_connection.stub!(:exec)
-      mock_connection.should_receive(:close)
+      import.pg_connection.stub(:exec)
+      import.pg_connection.should_receive(:close)
       import.start(:customers, [:a, :b], [[1,2]])
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vostok
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: