em-pg-client 0.3.0 → 0.3.1

data/spec/em_synchrony_client_autoreconnect.rb

@@ -5,8 +5,10 @@ require 'date'
 require 'em-synchrony'
 require 'pg/em'
 
-$pgserver_cmd_stop = %Q[sudo -i -u postgres pg_ctl -D "#{ENV['PGDATA']}" stop -s -m fast]
-$pgserver_cmd_start = %Q[sudo -i -u postgres pg_ctl -D "#{ENV['PGDATA']}" start -s -w]
+$pgserver_cmd_stop = ENV['PG_CTL_STOP_CMD'] || %Q[sudo -i -u postgres pg_ctl -D "#{ENV['PGDATA']}" stop -s -m fast]
+$pgserver_cmd_start = ENV['PG_CTL_START_CMD'] || %Q[sudo -i -u postgres pg_ctl -D "#{ENV['PGDATA']}" start -s -w]
+
+DISCONNECTED_ERROR = ENV['PGHOST'].include?('/') ? PG::UnableToSend : PG::ConnectionBad
 
 shared_context 'em-synchrony-pg common' do
   around(:each) do |testcase|
@@ -42,7 +44,7 @@ describe 'em-synchrony-pg default autoreconnect' do
     system($pgserver_cmd_stop).should be_true
     expect {
       @tested_proc.call
-    }.to raise_error(@client.host.include?('/') ? PG::UnableToSend : PG::ConnectionBad)
+    }.to raise_error DISCONNECTED_ERROR
   end
 
   it "should get database size using query after server startup" do
@@ -57,10 +59,40 @@ describe 'em-synchrony-pg default autoreconnect' do
         system($pgserver_cmd_start).should be_true
         @tested_proc.call
       end
-    end.to raise_error(@client.host.include?('/') ? PG::UnableToSend : PG::ConnectionBad)
+    end.to raise_error DISCONNECTED_ERROR
     @tested_proc.call
   end
 
+  it "should fail to get last result asynchronously after server restart" do
+    @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    expect do
+      @client.get_last_result
+    end.to raise_error PG::ConnectionBad
+    @client.status.should be PG::CONNECTION_OK
+    @client.get_last_result.should be_nil
+    EM.stop
+  end
+
+  it "should fail to get each result asynchronously after server restart" do
+    @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    result = @client.get_result
+    result.should be_an_instance_of PG::Result
+    expect do
+      result.check
+    end.to raise_error PG::Error
+    @client.status.should be PG::CONNECTION_OK
+    expect do
+      @client.get_result
+    end.to raise_error PG::ConnectionBad
+    @client.status.should be PG::CONNECTION_OK
+    @client.get_result.should be_nil
+    EM.stop
+  end
+
   before(:all) do
     @tested_proc = proc do
       @client.query('SELECT pg_database_size(current_database());') do |result|
@@ -98,10 +130,44 @@ describe 'em-synchrony-pg autoreconnect with on_autoreconnect' do
         system($pgserver_cmd_start).should be_true
         @tested_proc.call
       end
-    end.to raise_error(@client.host.include?('/') ? PG::UnableToSend : PG::ConnectionBad)
+    end.to raise_error DISCONNECTED_ERROR
     @tested_proc.call
   end
 
+  it "should fail to get last result asynchronously after server restart" do
+    @client.on_autoreconnect = proc {
+      EM::DefaultDeferrable.new.tap {|df| df.succeed }
+    }
+    @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    expect do
+      @client.get_last_result
+    end.to raise_error PG::ConnectionBad
+    @client.status.should be PG::CONNECTION_OK
+    @client.get_last_result.should be_nil
+    EM.stop
+  end
+
+  it "should fail to get each result asynchronously after server restart" do
+    @client.on_autoreconnect = proc { true }
+    @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    result = @client.get_result
+    result.should be_an_instance_of PG::Result
+    expect do
+      result.check
+    end.to raise_error PG::Error
+    @client.status.should be PG::CONNECTION_OK
+    expect do
+      @client.get_result
+    end.to raise_error PG::ConnectionBad
+    @client.status.should be PG::CONNECTION_OK
+    @client.get_result.should be_nil
+    EM.stop
+  end
+
   before(:all) do
     @tested_proc = proc do
       @client.exec_prepared('get_db_size') do |result|
@@ -131,7 +197,7 @@ describe 'em-synchrony-pg with autoreconnect disabled' do
     system($pgserver_cmd_start).should be_true
     expect {
       @tested_proc.call
-    }.to raise_error(@client.host.include?('/') ? PG::UnableToSend : PG::ConnectionBad)
+    }.to raise_error DISCONNECTED_ERROR
   end
 
   it "should get database size using query after manual connection reset" do
@@ -141,6 +207,54 @@ describe 'em-synchrony-pg with autoreconnect disabled' do
     @tested_proc.call
   end
 
+  it "should fail to get last result asynchronously after server restart" do
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    begin
+      @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
+    rescue PG::UnableToSend
+    end
+    expect do
+      @client.get_last_result
+    end.to raise_error PG::ConnectionBad
+    @client.status.should be PG::CONNECTION_BAD
+    expect do
+      @client.get_last_result
+    end.to raise_error PG::ConnectionBad
+    @client.reset
+    @client.status.should be PG::CONNECTION_OK
+    @client.get_last_result.should be_nil
+    EM.stop
+  end
+
+  it "should fail to get each result asynchronously after server restart" do
+    system($pgserver_cmd_stop).should be_true
+    system($pgserver_cmd_start).should be_true
+    begin
+      @client.send_query('SELECT pg_sleep(5); SELECT pg_database_size(current_database());')
+    rescue PG::UnableToSend
+      expect do
+        @client.get_result
+      end.to raise_error PG::ConnectionBad
+      @client.status.should be PG::CONNECTION_BAD
+    else
+      result = @client.get_result
+      result.should be_an_instance_of PG::Result
+      expect do
+        result.check
+      end.to raise_error PG::Error
+      @client.status.should be PG::CONNECTION_OK
+    end
+    expect do
+      @client.get_result
+    end.to raise_error PG::ConnectionBad
+    @client.status.should be PG::CONNECTION_BAD
+    @client.reset
+    @client.status.should be PG::CONNECTION_OK
+    @client.get_result.should be_nil
+    EM.stop
+  end
+
   before(:all) do
     @tested_proc = proc do
       @client.query('SELECT pg_database_size(current_database());') do |result|

data/spec/pg_em_client_connect_finish.rb

@@ -47,7 +47,7 @@ describe 'connect failure and finished? status' do
   end
 
   describe 'with unix socket' do
-    let(:options)  { {host: '/tmp', port: bogus_port} }
+    let(:options)  { {host: ENV['PGHOST_UNIX'] || '/tmp', port: bogus_port} }
     include_context 'test deferred'
     include_context 'test blocking'
   end unless RSpec.windows_os?

data/spec/pg_em_client_options.rb

@@ -9,14 +9,18 @@ describe 'em-pg-client options' do
   subject                   { PG::EM::Client }
 
   let(:callback)            { proc {|c, e| false } }
-  let(:args)                { [{async_autoreconnect: true, connect_timeout: 10, host: 'foo'}] }
-  let(:str_key_args)        { [{'async_autoreconnect'=>true, 'connect_timeout'=>10, 'host'=>'foo'}] }
+  let(:args)                { [{
+     query_timeout: 1,   async_autoreconnect: true,   connect_timeout: 10,   host: 'foo'
+  }]}
+  let(:str_key_args)        { [{
+    'query_timeout'=>1, 'async_autoreconnect'=>true, 'connect_timeout'=>10, 'host'=>'foo'
+  }]}
   let(:pgconn_args)         { [{connect_timeout: 10, host: 'foo'}] }
   let(:str_key_pgconn_args) { [{'connect_timeout'=>10, 'host'=>'foo'}] }
   let(:async_options)       { {
                                 :@async_autoreconnect => true,
                                 :@connect_timeout => 10,
-                                :@query_timeout=>0,
+                                :@query_timeout=>1,
                                 :@on_autoreconnect=>nil,
                                 :@async_command_aborted=>false} }
 
@@ -82,4 +86,10 @@ describe 'em-pg-client options' do
     options[:@on_autoreconnect].should be callback
   end
 
+  it "should raise error with obsolete argument" do
+    expect do
+      subject.parse_async_options [on_reconnect: true]
+    end.to raise_error ArgumentError
+  end
+
 end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+if ENV["COVERAGE"]
+  require 'simplecov'
+  require 'coveralls'
+
+  SimpleCov.start do
+    add_filter "/spec/"
+  end
+  SimpleCov.command_name ENV['COVNAME'] || 'RSpec'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-pg-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.2
 description: PostgreSQL asynchronous EventMachine client, based on pg interface (PG::Connection)
 email: rafal@yeondir.com
 executables: []
@@ -85,14 +117,18 @@ extra_rdoc_files:
 - LICENSE
 - HISTORY.md
 files:
+- .rspec
+- .travis.yml
 - .yardopts
 - BENCHMARKS.md
+- Gemfile
 - HISTORY.md
 - LICENSE
 - README.md
 - Rakefile
 - benchmarks/em_pg.rb
 - em-pg-client.gemspec
+- examples/single_row_mode.rb
 - lib/em-pg-client.rb
 - lib/em-synchrony/pg.rb
 - lib/pg/em-version.rb
@@ -112,6 +148,7 @@ files:
 - spec/pg_em_client_options.rb
 - spec/pg_em_connection_pool.rb
 - spec/pg_em_featured_deferrable.rb
+- spec/spec_helper.rb
 homepage: http://github.com/royaltm/ruby-em-pg-client
 licenses:
 - MIT
@@ -144,6 +181,7 @@ specification_version: 3
 summary: EventMachine PostgreSQL client
 test_files:
 - spec/pg_em_client_connect_timeout.rb
+- spec/spec_helper.rb
 - spec/em_client.rb
 - spec/connection_pool_helpers.rb
 - spec/pg_em_client_options.rb